Merge branch 'master' into version-check

Author: poojav25

api/infra/policy_context_profile.go

@@ -159,15 +159,16 @@ func (c PolicyContextProfileClientContext) Delete(contextProfileIdParam string,
 	return err
 }
 
-func (c PolicyContextProfileClientContext) List(cursorParam *string, includeMarkForDeleteObjectsParam *bool, includedFieldsParam *string, pageSizeParam *int64, sortAscendingParam *bool, sortByParam *string) (model0.PolicyContextProfileListResult, error) {
+func (c PolicyContextProfileClientContext) List(cursorParam *string, hasUnsupportedAppIdsParam *bool, includeMarkForDeleteObjectsParam *bool, includedFieldsParam *string, pageSizeParam *int64, sortAscendingParam *bool, sortByParam *string) (model0.PolicyContextProfileListResult, error) {
 	var err error
 	var obj model0.PolicyContextProfileListResult
 
 	switch c.ClientType {
 
 	case utl.Local:
 		client := c.Client.(client0.ContextProfilesClient)
-		obj, err = client.List(cursorParam, includeMarkForDeleteObjectsParam, includedFieldsParam, pageSizeParam, sortAscendingParam, sortByParam)
+
+		obj, err = client.List(cursorParam, hasUnsupportedAppIdsParam, includeMarkForDeleteObjectsParam, includedFieldsParam, pageSizeParam, sortAscendingParam, sortByParam)
 
 	case utl.Global:
 		client := c.Client.(client1.ContextProfilesClient)
@@ -183,7 +184,7 @@ func (c PolicyContextProfileClientContext) List(cursorParam *string, includeMark
 
 	case utl.Multitenancy:
 		client := c.Client.(client2.ContextProfilesClient)
-		obj, err = client.List(utl.DefaultOrgID, c.ProjectID, cursorParam, includeMarkForDeleteObjectsParam, includedFieldsParam, pageSizeParam, sortAscendingParam, sortByParam)
+		obj, err = client.List(utl.DefaultOrgID, c.ProjectID, cursorParam, hasUnsupportedAppIdsParam, includeMarkForDeleteObjectsParam, includedFieldsParam, pageSizeParam, sortAscendingParam, sortByParam)
 
 	default:
 		err = errors.New("invalid infrastructure for model")

docs/resources/policy_edge_transport_node.md

@@ -127,7 +127,7 @@ The following arguments are supported:
         * `server` - (Required) Server IP or fqdn.
 * `credentials` - (Optional) Username and password settings for the node.
     * `audit_password` - (Optional) Node audit user password.
-    * `audit_username` - (Optional) CLI "audit" username.
+    * `audit_username` - (Optional) CLI "audit" username. Defaults to `audit` when `audit_password` is set.
     * `cli_password` - (Required) Node cli password.
     * `cli_username` - (Optional) CLI "admin" username.
     * `root_password` - (Required) Node root user password.

docs/resources/policy_project.md

@@ -45,6 +45,7 @@ The following arguments are supported:
 * `default_span_path` - (Optional) Policy path of the Cluster based default Span object of type NetworkSpan. Available since NSX 9.1.0.
 * `non_default_span_paths` - (Optional) List of non default policy paths of the Span objects of type NetworkSpan.
 * `zone_external_ids` - (Optional) An array of Zone object's external IDs.
+* `id_suffix` - (Optional) A suffix appended to the IDs of the project's default objects. This attribute is supported only in NSX 9.1.0 and later, and cannot be modified after creation.
 
 ## Attributes Reference
 

go.mod

@@ -13,7 +13,7 @@ require (
 	github.com/vmware/go-vmware-nsxt v0.0.0-20220328155605-f49a14c1ef5f
 	github.com/vmware/vsphere-automation-sdk-go/lib v0.8.0
 	github.com/vmware/vsphere-automation-sdk-go/runtime v0.8.0
-	github.com/vmware/vsphere-automation-sdk-go/services/nsxt v0.12.1-0.20250805134840-91d7e047bd3a
+	github.com/vmware/vsphere-automation-sdk-go/services/nsxt v0.12.1-0.20251021071509-9526add9a400
 	github.com/vmware/vsphere-automation-sdk-go/services/nsxt-gm v0.9.1-0.20241118070726-666c7cd6e466
 	github.com/vmware/vsphere-automation-sdk-go/services/nsxt-mp v0.6.1-0.20241118070726-666c7cd6e466
 	golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b

go.sum

@@ -166,8 +166,8 @@ github.com/vmware/vsphere-automation-sdk-go/lib v0.8.0 h1:u1SXOTM6D4Ygb3jeidj2Rd
 github.com/vmware/vsphere-automation-sdk-go/lib v0.8.0/go.mod h1:8d5JTwjpM/Z03n/IZb0fwmXkJNWvWwuLXBqoakqYio4=
 github.com/vmware/vsphere-automation-sdk-go/runtime v0.8.0 h1:KnDIX9LY0nru7iMQTg0sy9vChhyorPo5OdASM2MaAcI=
 github.com/vmware/vsphere-automation-sdk-go/runtime v0.8.0/go.mod h1:DzLetYAmw1+vj7bqElRWEpuy40WYE/woL3alsymYa/c=
-github.com/vmware/vsphere-automation-sdk-go/services/nsxt v0.12.1-0.20250805134840-91d7e047bd3a h1:LvSpakrRj+dxYzWf/ETNbtvhlinEOsMpn89a/LXPb8I=
-github.com/vmware/vsphere-automation-sdk-go/services/nsxt v0.12.1-0.20250805134840-91d7e047bd3a/go.mod h1:C3JVOHRVLrGBQ8kTWAiGYlRz5UQC5qAcTdt3tvA+5P0=
+github.com/vmware/vsphere-automation-sdk-go/services/nsxt v0.12.1-0.20251021071509-9526add9a400 h1:tCIBk/7y1rtWDcQQyR1jQCKz1SPNRL2i/2vL0CwAsDw=
+github.com/vmware/vsphere-automation-sdk-go/services/nsxt v0.12.1-0.20251021071509-9526add9a400/go.mod h1:C3JVOHRVLrGBQ8kTWAiGYlRz5UQC5qAcTdt3tvA+5P0=
 github.com/vmware/vsphere-automation-sdk-go/services/nsxt-gm v0.9.1-0.20241118070726-666c7cd6e466 h1:SYBECpviZBcp/cUHKTDPQP7CSQb0lUfPPOClpGOFH44=
 github.com/vmware/vsphere-automation-sdk-go/services/nsxt-gm v0.9.1-0.20241118070726-666c7cd6e466/go.mod h1:gcEvyczWPFMZX2gkBiBVpOwvUGSNXSpxU19Sx9aiouY=
 github.com/vmware/vsphere-automation-sdk-go/services/nsxt-mp v0.6.1-0.20241118070726-666c7cd6e466 h1:yXUKHP/XDGp7Wrcbfl5BHV1VreCNPHRLUj2RQ5qDEmE=

nsxt/policy_errors.go

@@ -104,7 +104,7 @@ func logVapiErrorData(message string, vapiMessages []std.LocalizableMessage, vap
 	if len(apiError.RelatedErrors) > 0 {
 		details += "\nRelated errors:\n"
 		for _, relatedErr := range apiError.RelatedErrors {
-			details += fmt.Sprintf("%s ", printRelatedAPIError(relatedErr))
+			details += fmt.Sprintf("%s\n", printRelatedAPIError(relatedErr))
 		}
 	}
 	log.Printf("[ERROR]: %s", details)

nsxt/provider.go

@@ -69,6 +69,7 @@ type nsxtClients struct {
 	Host                   string
 	PolicyEnforcementPoint string
 	PolicyGlobalManager    bool
+	DefaultSpanPath        string
 }
 
 // Provider for VMWare NSX-T
@@ -1168,6 +1169,13 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {
 	if err != nil {
 		return nil, err
 	}
+	connector := getPolicyConnector(clients)
+	if util.NsxVersionHigherOrEqual("9.1.0") {
+		clients.DefaultSpanPath, err = getDefaultSpan(connector)
+		if err != nil {
+			return nil, err
+		}
+	}
 
 	return clients, nil
 }

nsxt/resource_nsxt_policy_dhcp_relay.go

@@ -37,7 +37,7 @@ func resourceNsxtPolicyDhcpRelayConfig() *schema.Resource {
 			"tag":          getTagsSchema(),
 			"context":      getContextSchema(false, false, false),
 			"server_addresses": {
-				Type:     schema.TypeList,
+				Type:     schema.TypeSet,
 				Required: true,
 				Elem: &schema.Schema{
 					Type:         schema.TypeString,
@@ -82,7 +82,7 @@ func resourceNsxtPolicyDhcpRelayConfigCreate(d *schema.ResourceData, m interface
 	displayName := d.Get("display_name").(string)
 	description := d.Get("description").(string)
 	tags := getPolicyTagsFromSchema(d)
-	serverAddresses := getStringListFromSchemaList(d, "server_addresses")
+	serverAddresses := getStringListFromSchemaSet(d, "server_addresses")
 
 	obj := model.DhcpRelayConfig{
 		DisplayName:     &displayName,
@@ -151,7 +151,7 @@ func resourceNsxtPolicyDhcpRelayConfigUpdate(d *schema.ResourceData, m interface
 	tags := getPolicyTagsFromSchema(d)
 	revision := int64(d.Get("revision").(int))
 
-	serverAddresses := getStringListFromSchemaList(d, "server_addresses")
+	serverAddresses := getStringListFromSchemaSet(d, "server_addresses")
 
 	obj := model.DhcpRelayConfig{
 		DisplayName:     &displayName,

nsxt/resource_nsxt_policy_edge_transport_node.go

@@ -434,8 +434,8 @@ func resourceNsxtPolicyEdgeTransportNode() *schema.Resource {
 						"audit_username": {
 							Type:        schema.TypeString,
 							Optional:    true,
-							Default:     "audit",
 							Description: "CLI \"audit\" username",
+							Computed:    true,
 						},
 						"cli_password": {
 							Type:        schema.TypeString,

nsxt/resource_nsxt_policy_project.go

@@ -5,10 +5,12 @@
 package nsxt
 
 import (
+	"context"
 	"fmt"
 	"log"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 	"github.com/vmware/terraform-provider-nsxt/nsxt/util"
 	"github.com/vmware/vsphere-automation-sdk-go/runtime/protocol/client"
 	infra2 "github.com/vmware/vsphere-automation-sdk-go/services/nsxt/infra"
@@ -27,6 +29,19 @@ func resourceNsxtPolicyProject() *schema.Resource {
 			State: schema.ImportStatePassthrough,
 		},
 
+		CustomizeDiff: func(ctx context.Context, d *schema.ResourceDiff, m interface{}) error {
+			if util.NsxVersionHigherOrEqual("9.1.0") {
+				c := m.(nsxtClients)
+				raw := d.GetRawConfig()
+				newAttr := raw.GetAttr("default_span_path")
+
+				if newAttr.IsNull() {
+					d.SetNew("default_span_path", c.DefaultSpanPath)
+					return nil
+				}
+			}
+			return nil
+		},
 		Schema: map[string]*schema.Schema{
 			"nsx_id":       getNsxIDSchema(),
 			"path":         getPathSchema(),
@@ -136,6 +151,12 @@ func resourceNsxtPolicyProject() *schema.Resource {
 					Type: schema.TypeString,
 				},
 			},
+			"id_suffix": {
+				Type:         schema.TypeString,
+				Description:  "Suffix to be appended to the IDs of the project's default objects.",
+				Optional:     true,
+				ValidateFunc: validation.StringLenBetween(0, 246),
+			},
 		},
 	}
 }
@@ -211,22 +232,17 @@ func resourceNsxtPolicyProjectPatch(connector client.Connector, d *schema.Resour
 	}
 
 	if util.NsxVersionHigherOrEqual("9.1.0") {
-		// There should be just one object here
 		var spanReferences []model.SpanReference
-		defaultSpanPathinterface, isDefaultSet := d.GetOkExists("default_span_path")
+
+		isDefault := true
+		defaultSpanPathInterface, isDefaultSet := d.GetOkExists("default_span_path")
 		var defaultSpanPath string
-		if !isDefaultSet {
-			var err error
-			defaultSpanPath, err = getDefaultSpan(connector)
-			if err != nil {
-				return err
-			}
+		if isDefaultSet {
+			defaultSpanPath = defaultSpanPathInterface.(string)
 		} else {
-			defaultSpanPath = defaultSpanPathinterface.(string)
+			defaultSpanPath = m.(nsxtClients).DefaultSpanPath
 		}
-		// default_span_path will never be empty, since it has a default value and the validator will make sure that
-		// user will not assign an empty string or such.
-		isDefault := true
+
 		spanReferences = append(spanReferences, model.SpanReference{
 			SpanPath:  &defaultSpanPath,
 			IsDefault: &isDefault,
@@ -248,6 +264,11 @@ func resourceNsxtPolicyProjectPatch(connector client.Connector, d *schema.Resour
 			ZoneExternalIds: zoneExternalIds,
 		}
 		obj.VpcDeploymentScope = &vpcDeploymentScope
+
+		// Set id_suffix if provided
+		if idSuffix := d.Get("id_suffix").(string); idSuffix != "" {
+			obj.IdSuffix = &idSuffix
+		}
 	}
 
 	log.Printf("[INFO] Patching Project with ID %s", id)
@@ -410,20 +431,24 @@ func resourceNsxtPolicyProjectRead(d *schema.ResourceData, m interface{}) error
 		d.Set("quotas", obj.Limits)
 	}
 
-	if util.NsxVersionHigherOrEqual("9.1.0") && obj.VpcDeploymentScope != nil {
-		var nonDefaultSpanPaths []interface{}
-		var defaultSpanRefs *string
-		for _, spanRef := range obj.VpcDeploymentScope.SpanReferences {
-			if *spanRef.IsDefault {
-				defaultSpanRefs = spanRef.SpanPath
-			} else {
-				nonDefaultSpanPaths = append(nonDefaultSpanPaths, *spanRef.SpanPath)
+	if util.NsxVersionHigherOrEqual("9.1.0") {
+		// Set id_suffix if available
+		d.Set("id_suffix", obj.IdSuffix)
+
+		if obj.VpcDeploymentScope != nil {
+			var nonDefaultSpanPaths []interface{}
+			var defaultSpanRefs *string
+			for _, spanRef := range obj.VpcDeploymentScope.SpanReferences {
+				if *spanRef.IsDefault {
+					defaultSpanRefs = spanRef.SpanPath
+				} else {
+					nonDefaultSpanPaths = append(nonDefaultSpanPaths, *spanRef.SpanPath)
+				}
 			}
+			d.Set("default_span_path", defaultSpanRefs)
+			d.Set("non_default_span_paths", nonDefaultSpanPaths)
+			d.Set("zone_external_ids", stringList2Interface(obj.VpcDeploymentScope.ZoneExternalIds))
 		}
-		d.Set("default_span_path", defaultSpanRefs)
-		d.Set("non_default_span_paths", nonDefaultSpanPaths)
-		d.Set("zone_external_ids", stringList2Interface(obj.VpcDeploymentScope.ZoneExternalIds))
-
 	}
 	return nil
 }