Address a few bugs

Signed-off-by: Kobi Samoray <[email protected]>

Author: ksamoray

Diff for: nsxt/data_source_nsxt_policy_context_profile_test.go

@@ -83,7 +83,7 @@ func TestAccDataSourceNsxtPolicyContextProfile_multitenancyProvider(t *testing.T
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck: func() {
 			testAccPreCheck(t)
-			testAccOnlyMultitenancy(t)
+			testAccOnlyMultitenancyProvider(t)
 		},
 		Providers: testAccProviders,
 		Steps: []resource.TestStep{
@@ -111,7 +111,7 @@ func testAccNsxtPolicyContextProfileMultitenancyTemplate(name string, withContex
 	if withContext {
 		context = testAccNsxtPolicyMultitenancyContext()
 	}
-	return fmt.Sprintf(`
+	s := fmt.Sprintf(`
 resource "nsxt_policy_context_profile" "test" {
 %s
   display_name = "%s"
@@ -133,4 +133,5 @@ data "nsxt_policy_context_profile" "test" {
 %s
   display_name = nsxt_policy_context_profile.test.display_name
 }`, context, name, context)
+	return s
 }

Diff for: nsxt/provider.go

@@ -243,7 +243,18 @@ func Provider() *schema.Provider {
 				Description: "Avoid initializing NSX connection on startup",
 				DefaultFunc: schema.EnvDefaultFunc("NSXT_ON_DEMAND_CONNECTION", false),
 			},
-			"context": getContextSchema(false, false, true),
+			"project_id": {
+				Type:        schema.TypeString,
+				Description: "Id of the project which the plan executes in its context.",
+				Optional:    true,
+				DefaultFunc: schema.EnvDefaultFunc("NSXT_PROVIDER_PROJECT_ID", ""),
+			},
+			"vpc_id": {
+				Type:        schema.TypeString,
+				Description: "Id of the VPC which the plan executes in its context.",
+				Optional:    true,
+				DefaultFunc: schema.EnvDefaultFunc("NSXT_PROVIDER_VPC_ID", ""),
+			},
 		},
 
 		DataSourcesMap: map[string]*schema.Resource{
@@ -785,10 +796,8 @@ func configurePolicyConnectorData(d *schema.ResourceData, clients *nsxtClients)
 	clientAuthDefined := (len(clientAuthCertFile) > 0) || (len(clientAuthCert) > 0)
 	policyEnforcementPoint := d.Get("enforcement_point").(string)
 	policyGlobalManager := d.Get("global_manager").(bool)
-	projectID, vpcID, err := getContextDataFromSchema(d, *clients)
-	if err != nil {
-		return err
-	}
+	projectID := d.Get("project_id").(string)
+	vpcID := d.Get("vpc_id").(string)
 	vmcInfo := getVmcAuthInfo(d)
 
 	isVMC := false
@@ -1221,10 +1230,10 @@ func getGlobalPolicyEnforcementPointPath(m interface{}, sitePath *string) string
 func getContextDataFromSchema(d *schema.ResourceData, m interface{}) (string, string, error) {
 	ctxPtr := d.Get("context")
 	if ctxPtr != nil {
-		if m.(nsxtClients).ProjectID != "" || m.(nsxtClients).VPCID != "" {
+		contexts := ctxPtr.([]interface{})
+		if (m.(nsxtClients).ProjectID != "" || m.(nsxtClients).VPCID != "") && len(contexts) > 0 {
 			return "", "", fmt.Errorf("cannot specify context in both provider level and object level")
 		}
-		contexts := ctxPtr.([]interface{})
 		for _, context := range contexts {
 			data := context.(map[string]interface{})
 			vpcID := ""

Diff for: nsxt/utils.go

@@ -681,10 +681,6 @@ func handlePagination(lister func(*paginationInfo) error) (int64, error) {
 }
 
 func getContextSchema(isRequired, isComputed, isVPC bool) *schema.Schema {
-	return getContextExtendedSchema(isRequired, isComputed, isVPC, false)
-}
-
-func getContextExtendedSchema(isRequired, isComputed, isVPC, isProvider bool) *schema.Schema {
 	elemSchema := map[string]*schema.Schema{
 		"project_id": {
 			Type:         schema.TypeString,
@@ -703,10 +699,6 @@ func getContextExtendedSchema(isRequired, isComputed, isVPC, isProvider bool) *s
 			ValidateFunc: validation.StringIsNotWhiteSpace,
 		}
 	}
-	if isProvider {
-		elemSchema["project_id"].DefaultFunc = schema.EnvDefaultFunc("NSXT_PROVIDER_PROJECT_ID", false)
-		elemSchema["vpc_id"].DefaultFunc = schema.EnvDefaultFunc("NSXT_PROVIDER_VPC_ID", false)
-	}
 	return &schema.Schema{
 		Type:        schema.TypeList,
 		Description: "Resource context",

Diff for: website/docs/index.html.markdown

@@ -251,9 +251,8 @@ The following arguments are used to configure the VMware NSX-T Provider:
   for VMC environments, and is not supported with deprecated NSX manager resources and
   data sources. Note - this setting is useful when NSX manager is not yet available at 
   time of provider evaluation, and not recommended to be turned on otherwise.
-* `context` - (Optional) The context which the object belongs to
-  * `project_id` - (Optional) The ID of the project which the object belongs to
-  * `vpc_id` - (Optional) The ID of the VPC which the object belongs to
+* `project_id` - (Optional) ID of the project which the plan executes in its context.
+* `vpc_id` - (Optional) ID of the VPC which the plan executes in its context.
 
 ## NSX Logical Networking