Merge branch 'master' into sub-cluster

ksamoray · Apr 10, 2024 · 05806c1 · 05806c1
2 parents 2262a09 + 11170d4
commit 05806c1
Show file tree

Hide file tree

Showing 8 changed files with 617 additions and 7 deletions.
diff --git a/nsxt/provider.go b/nsxt/provider.go
@@ -491,6 +491,7 @@ func Provider() *schema.Provider {
 			"nsxt_policy_gateway_flood_protection_profile":             resourceNsxtPolicyGatewayFloodProtectionProfile(),
 			"nsxt_policy_gateway_flood_protection_profile_binding":     resourceNsxtPolicyGatewayFloodProtectionProfileBinding(),
 			"nsxt_policy_compute_sub_cluster":                          resourceNsxtPolicyComputeSubCluster(),
+			"nsxt_policy_tier0_inter_vrf_routing":                      resourceNsxtPolicyTier0InterVRFRouting(),
 		},
 
 		ConfigureFunc: providerConfigure,

diff --git a/nsxt/resource_nsxt_edge_cluster_test.go b/nsxt/resource_nsxt_edge_cluster_test.go
@@ -102,7 +102,7 @@ func testAccNSXEdgeClusterCheckDestroy(state *terraform.State, displayName strin
 	connector := getPolicyConnector(testAccProvider.Meta().(nsxtClients))
 
 	// This addresses the fact that object is retrieved even though it had been deleted
-	time.Sleep(1 * time.Second)
+	time.Sleep(10 * time.Second)
 
 	for _, rs := range state.RootModule().Resources {
 		if rs.Type != "nsxt_edge_cluster" {

diff --git a/nsxt/resource_nsxt_policy_metadata_proxy.go b/nsxt/resource_nsxt_policy_metadata_proxy.go
@@ -169,6 +169,7 @@ func resourceNsxtPolicyMetadataProxyRead(d *schema.ResourceData, m interface{})
 	d.Set("path", obj.Path)
 	d.Set("revision", obj.Revision)
 	d.Set("crypto_protocols", stringList2Interface(obj.CryptoProtocols))
+	d.Set("secret", obj.Secret)
 	d.Set("edge_cluster_path", obj.EdgeClusterPath)
 	d.Set("enable_standby_relocation", obj.EnableStandbyRelocation)
 	d.Set("preferred_edge_paths", stringList2Interface(obj.PreferredEdgePaths))

diff --git a/nsxt/resource_nsxt_policy_metadata_proxy_test.go b/nsxt/resource_nsxt_policy_metadata_proxy_test.go
@@ -90,10 +90,9 @@ func TestAccResourceNsxtPolicyMetadataProxy_importBasic(t *testing.T) {
 				Config: testAccNsxtPolicyMetadataProxyTemplate(true),
 			},
 			{
-				ResourceName:            testResourceName,
-				ImportState:             true,
-				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"secret"}, // Secret isn't returned by NSX as it's a secret...
+				ResourceName:      testResourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
 			},
 		},
 	})