Updated files based on comments on PR

Author: anvitha-jain

examples/aci_vmm_domain/microsoft_domain/main.tf

@@ -7,9 +7,9 @@ terraform {
 }
 
 provider "aci" {
-  username = "admin"
-  password = "ins3965!"
-  url      = "https://10.23.248.103"
+  username = ""
+  password = ""
+  url      = ""
   insecure = true
 }
 

examples/aci_vmm_domain/microsoft_domain/variables.tf

@@ -3,7 +3,7 @@ variable "microsoft_domain" {
 }
 // Microsoft vmm domain resources
 variable "vmm_domain" {
-  default = "ESX0-leaf102"
+  default = "microsoft_domain"
 }
 
 variable "aci_vmm_controller" {

examples/aci_vmm_domain/vmware_domain_ave/main.tf

@@ -7,7 +7,7 @@ terraform {
 }
 
 provider "aci" {
-  username = "admin"
+  username = ""
   password = ""
   url      = ""
   insecure = true
@@ -27,7 +27,6 @@ resource "aci_vmm_domain" "ave" {
   enable_ave = "yes"
   mcast_addr = "239.10.10.10"
   // create a multicast address pool and add that to below relationship.
-  // dn ="comp/prov-{name}/ctrlr-{[domName]}-{name}/addrinstdef-{name}"
   relation_vmm_rs_dom_mcast_addr_ns = "uni/infra/maddrns-testo"
 }
 
@@ -65,10 +64,10 @@ resource "aci_cdp_interface_policy" "foocdp_interface_policy" {
 
 resource "aci_vswitch_policy" "vmware_switch_policy" {
   vmm_domain_dn = aci_vmm_domain.ave.id
-  // relation_vmm_rs_vswitch_override_fw_pol = "uni/infra/fwP-firewallPolicy"
-  // // STP_Policy is available for higher versions of ACI only (>5.1(2e))
-  // relation_vmm_rs_vswitch_override_stp_pol = "uni/infra/ifPol-stpPolicy"
-  // relation_vmm_rs_vswitch_override_mtu_pol = "uni/fabric/l2pol-l2InstPolicy"
+  relation_vmm_rs_vswitch_override_fw_pol = "uni/infra/fwP-firewallPolicy"
+  // STP_Policy is available for higher versions of ACI only (>5.1(2e))
+  relation_vmm_rs_vswitch_override_stp_pol = "uni/infra/ifPol-stpPolicy"
+  relation_vmm_rs_vswitch_override_mtu_pol = "uni/fabric/l2pol-l2InstPolicy"
   relation_vmm_rs_vswitch_exporter_pol {
     target_dn = "uni/infra/vmmexporterpol-exporter_policy"
     active_flow_time_out = 60

examples/aci_vmm_domain/vmware_domain_ave/variables.tf

@@ -3,7 +3,7 @@ variable "ave" {
 }
 // vmware ave
 variable "vmm_domain" {
-  default = "ESX0-leaf102-ave"
+  default = "vmware_ave_domain"
 }
 
 variable "aci_vmm_controller" {

examples/aci_vmm_domain/vmware_domain_vds/main.tf

@@ -7,7 +7,7 @@ terraform {
 }
 
 provider "aci" {
-  username = "admin"
+  username = ""
   password = ""
   url      = ""
   insecure = true

examples/aci_vmm_domain/vmware_domain_vds/variables.tf

@@ -3,7 +3,7 @@ variable "vds" {
 }
 // vmware vds
 variable "vmm_domain" {
-  default = "ESX0-leaf102-vds"
+  default = "vmware_vds_domain"
 }
 
 variable "aci_vmm_controller" {

examples/aci_vmm_domain/vmware_vds/main.tf

@@ -7,7 +7,7 @@ terraform {
 }
 
 provider "aci" {
-  username = "admin"
+  username = ""
   password = ""
   url      = ""
   insecure = true
@@ -39,10 +39,10 @@ resource "aci_vlan_pool" "vmm_vlan_pool" {
   alloc_mode = "dynamic"
 }
 
-// // VMWare vmm domain resources
-// resource "aci_vmm_domain" "vds" {
-//   provider_profile_dn = var.vds
-//   relation_infra_rs_vlan_ns = aci_vlan_pool.vmm_vlan_pool.id
-//   name                = var.vmm_domain
-// }
+// VMWare vmm domain resources
+resource "aci_vmm_domain" "vds" {
+  provider_profile_dn = var.vds
+  relation_infra_rs_vlan_ns = aci_vlan_pool.vmm_vlan_pool.id
+  name                = var.vmm_domain
+}
 

examples/aci_vmm_domain/vmware_vds/variables.tf

@@ -3,21 +3,5 @@ variable "vds" {
 }
 
 variable "vmm_domain" {
-  default = "ESX0-leaf102"
+  default = "vds_domain"
 }
-
-variable "aci_vmm_controller" {
-  default = "vmm_ctrl"
-}
-
-variable "aci_vmm_credential" {
-  default = "vmm_cred"
-}
-
-variable "microsoft_domain" {
-  default = "uni/vmmp-Microsoft"
-}
-
-variable "ave" {
-  default = "uni/vmmp-VMware"
-}

website/docs/d/vmmctrlrp.html.markdown

@@ -6,7 +6,7 @@ description: |-
   Data source for ACI VMM Controller
 ---
 
-# aci_vmm_controller #
+# vmm_controller #
 
 Data source for ACI VMM Controller
 
@@ -18,7 +18,7 @@ Data source for ACI VMM Controller
 
 ## GUI Information ##
 
-* `Location` - 
+* `Location` - Virtual Networking -> VMM Domain -> VmmController
 
 
 
@@ -44,7 +44,7 @@ data "aci_vmm_controller" "example" {
 * `host_or_ip` - (Optional) Hostname or IP Address. Host or IP
 * `inventory_trig_st` - (Optional) Triggered Inventory Sync Status. 
 * `mode` - (Optional) Mode. The mode of operation.
-* `msft_config_err_msg` - (Optional) msftConfigErrMsg. Deployment Error Message of Mirosoft Plugin SCVM Controller.
+* `msft_config_err_msg` - (Optional) Deployment Error Message of Microsoft Plugin SCVMM Controller.
                     It captures error message encountered in SCVMM Controller 
                     plugin.This error message represents specific details for bitmask 
                     based msftConfigIssues fault.

website/docs/d/vmmusraccp.html.markdown

@@ -6,7 +6,7 @@ description: |-
   Data source for ACI VMM Credential
 ---
 
-# aci_vmm_credential #
+# vmm_credential #
 
 Data source for ACI VMM Credential
 
@@ -18,7 +18,7 @@ Data source for ACI VMM Credential
 
 ## GUI Information ##
 
-* `Location` - 
+* `Location` - Virtual Networking -> VMM Domain -> VmmController -> vCenterCredentials