Change test to suit older version NSX

Signed-off-by: graysonwu <[email protected]>
vmware · Sep 28, 2023 · 98a2147 · 98a2147
1 parent 7e25a0d
commit 98a2147
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/nsxt/data_source_nsxt_transport_zone_test.go b/nsxt/data_source_nsxt_transport_zone_test.go
@@ -15,7 +15,12 @@ func TestAccDataSourceNsxtTransportZone_basic(t *testing.T) {
 	testResourceName := "data.nsxt_transport_zone.test"
 
 	resource.ParallelTest(t, resource.TestCase{
-		PreCheck:  func() { testAccOnlyLocalManager(t); testAccTestDeprecated(t); testAccPreCheck(t) },
+		PreCheck: func() {
+			testAccOnlyLocalManager(t)
+			testAccTestDeprecated(t)
+			testAccPreCheck(t)
+			testAccNSXVersion(t, "4.0.0")
+		},
 		Providers: testAccProviders,
 		Steps: []resource.TestStep{
 			{

diff --git a/nsxt/resource_nsxt_logical_dhcp_server.go b/nsxt/resource_nsxt_logical_dhcp_server.go
@@ -85,6 +85,7 @@ func getDhcpOptions121Schema() *schema.Schema {
 		Type:        schema.TypeList,
 		Description: "DHCP classless static routes",
 		Optional:    true,
+		Computed:    true,
 		Elem: &schema.Resource{
 			Schema: map[string]*schema.Schema{
 				"network": {

diff --git a/nsxt/utils_test.go b/nsxt/utils_test.go
@@ -27,7 +27,7 @@ import (
 // Default names or prefixed of NSX backend existing objects used in the acceptance tests.
 // Those defaults can be overridden using environment parameters
 const tier0RouterDefaultName string = "PLR-1 LogicalRouterTier0"
-const edgeClusterDefaultName string = "edgecluster1"
+const edgeClusterDefaultName string = "EDGECLUSTER1"
 const vlanTransportZoneName string = "transportzone2"
 const overlayTransportZoneNamePrefix string = "1-transportzone"
 const macPoolDefaultName string = "DefaultMacPool"

diff --git a/website/docs/r/dhcp_server_ip_pool.html.markdown b/website/docs/r/dhcp_server_ip_pool.html.markdown
@@ -14,7 +14,7 @@ Provides a resource to configure IP Pool for logical DHCP server on NSX-T manage
 
 ```hcl
 data "nsxt_edge_cluster" "edgecluster" {
-  display_name = "edgecluster1"
+  display_name = "EDGECLUSTER1"
 }
 
 resource "nsxt_dhcp_server_profile" "serverprofile" {

diff --git a/website/docs/r/logical_dhcp_server.html.markdown b/website/docs/r/logical_dhcp_server.html.markdown
@@ -14,7 +14,7 @@ Provides a resource to configure logical DHCP server on NSX-T manager
 
 ```hcl
 data "nsxt_edge_cluster" "edgecluster" {
-  display_name = "edgecluster1"
+  display_name = "EDGECLUSTER1"
 }
 
 resource "nsxt_dhcp_server_profile" "serverprofile" {