Merge pull request #452 from vmware/fix-vmc-region-enumeration

Fix VMC region enumeration data source

Author: frodenas

examples/cloud_account_vmc/main.tf

@@ -13,6 +13,7 @@ data "vra_data_collector" "this" {
 data "vra_region_enumeration_vmc" "this" {
   api_token = var.api_token
   sddc_name = var.sddc_name
+  nsx_hostname = var.nsx_hostname
 
   vcenter_hostname = var.vcenter_hostname
   vcenter_password = var.vcenter_password

vra/content_source_repository_config.go

@@ -36,7 +36,7 @@ func expandContentSourceRepositoryConfig(repoConfigs []interface{}) []*ContentSo
 	return configs
 }
 
-//Convert from json back to an array
+// Convert from json back to an array
 func flattenContentsourceRepositoryConfig(list interface{}) []map[string]interface{} {
 	l := map[string]interface{}{}
 	v := reflect.ValueOf(list)

vra/data_source_region_enumeration_vmc.go

@@ -32,6 +32,11 @@ func dataSourceRegionEnumerationVMC() *schema.Resource {
 				Optional:    true,
 				Description: "Identifier of a data collector vm deployed in the on premise infrastructure.",
 			},
+			"nsx_hostname": {
+				Type:        schema.TypeString,
+				Required:    true,
+				Description: "The IP address of the NSX Manager server in the specified SDDC / FQDN.",
+			},
 			"sddc_name": {
 				Type:        schema.TypeString,
 				Required:    true,
@@ -77,6 +82,7 @@ func dataSourceRegionEnumerationVMCRead(ctx context.Context, d *schema.ResourceD
 				APIKey:                      d.Get("api_token").(string),
 				DcID:                        d.Get("dc_id").(string),
 				HostName:                    d.Get("vcenter_hostname").(string),
+				NsxHostName:                 d.Get("nsx_hostname").(string),
 				Password:                    d.Get("vcenter_password").(string),
 				SddcID:                      d.Get("sddc_name").(string),
 				Username:                    d.Get("vcenter_username").(string),

vra/resource_deployment.go

@@ -941,7 +941,7 @@ func getInputsByType(inputs map[string]interface{}, inputTypesMap map[string]str
 }
 
 // Returns a map of string, string with input variables and their types defined in the given schema map.
-//Used for getting map of inputs and their types for Catalog item and Deployment actions
+// Used for getting map of inputs and their types for Catalog item and Deployment actions
 func getInputTypesMapFromSchema(schema map[string]interface{}) (map[string]string, error) {
 	log.Printf("Getting the map of inputs and their types")
 	inputTypesMap := make(map[string]string, len(schema))

website/docs/d/vra_region_enumeration_vmc.html.markdown

@@ -19,7 +19,8 @@ data "vra_region_enumeration_vmc" "this" {
 
   api_token = var.api_token
   sddc_name = var.sddc_name
-  
+  nsx_hostname = var.nsx_hostname
+
   vcenter_hostname = var.vcenter_hostname
   vcenter_password = var.vcenter_password
   vcenter_username = var.vcenter_username
@@ -35,6 +36,8 @@ The region enumeration data source for VMC cloud account supports the following
 
 * `dc_id` - (Optional) ID of a data collector vm deployed in the on premise infrastructure. Refer to the data-collector API to create or list data collectors.
 
+* `nsx_hostname` - (Required) The IP address of the NSX Manager server in the specified SDDC / FQDN.
+
 * `sddc_name` - (Required) Identifier of the on-premise SDDC to be used by this cloud account.
 
 * `vcenter_hostname` - (Required) The IP address or FQDN of the vCenter Server in the specified SDDC. The cloud proxy belongs on this vCenter.