updates

Author: poddm

cloudstack/data_source_cloudstack_physicalnetwork.go renamed to cloudstack/data_source_cloudstack_physical_network.go

@@ -34,9 +34,9 @@ func TestAccDataSourceCloudStackPhysicalNetwork_basic(t *testing.T) {
 				Config: testAccDataSourceCloudStackPhysicalNetwork_basic,
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr(
-						"data.cloudstack_physicalnetwork.foo", "name", "terraform-physical-network"),
+						"data.cloudstack_physical_network.foo", "name", "terraform-physical-network"),
 					resource.TestCheckResourceAttr(
-						"data.cloudstack_physicalnetwork.foo", "broadcast_domain_range", "ZONE"),
+						"data.cloudstack_physical_network.foo", "broadcast_domain_range", "ZONE"),
 				),
 			},
 		},
@@ -51,17 +51,17 @@ resource "cloudstack_zone" "foo" {
   network_type = "Advanced"
 }
 
-resource "cloudstack_physicalnetwork" "foo" {
+resource "cloudstack_physical_network" "foo" {
   name = "terraform-physical-network"
-  zone = cloudstack_zone.foo.name
+  zone_id = cloudstack_zone.foo.id
   broadcast_domain_range = "ZONE"
   isolation_methods = ["VLAN"]
 }
 
-data "cloudstack_physicalnetwork" "foo" {
+data "cloudstack_physical_network" "foo" {
   filter {
     name = "name"
     value = "terraform-physical-network"
   }
-  depends_on = [cloudstack_physicalnetwork.foo]
-}`
+  depends_on = [cloudstack_physical_network.foo]
+`

cloudstack/data_source_cloudstack_physicalnetwork_test.go renamed to cloudstack/data_source_cloudstack_physical_network_test.go

@@ -91,7 +91,7 @@ func Provider() *schema.Provider {
 			"cloudstack_vpn_connection":   dataSourceCloudstackVPNConnection(),
 			"cloudstack_pod":              dataSourceCloudstackPod(),
 			"cloudstack_domain":           dataSourceCloudstackDomain(),
-			"cloudstack_physicalnetwork":  dataSourceCloudStackPhysicalNetwork(),
+			"cloudstack_physical_network": dataSourceCloudStackPhysicalNetwork(),
 			"cloudstack_role":             dataSourceCloudstackRole(),
 		},
 
@@ -142,7 +142,6 @@ func Provider() *schema.Provider {
 			"cloudstack_account":                        resourceCloudStackAccount(),
 			"cloudstack_user":                           resourceCloudStackUser(),
 			"cloudstack_domain":                         resourceCloudStackDomain(),
-			"cloudstack_physicalnetwork":                resourceCloudStackPhysicalNetwork(),
 			"cloudstack_network_service_provider":       resourceCloudStackNetworkServiceProvider(),
 			"cloudstack_role":                           resourceCloudStackRole(),
 		},

cloudstack/provider.go

@@ -64,7 +64,7 @@ resource "cloudstack_zone" "test" {
 }
 resource "cloudstack_physical_network" "test" {
 	broadcast_domain_range = "ZONE"
-	isolation_methods      = "VLAN"
+	isolation_methods      = ["VLAN"]
 	name                   = "test01"
 	network_speed          = "1G"
 	tags                   = "vlan"
@@ -104,7 +104,7 @@ resource "cloudstack_zone" "test" {
 }
 resource "cloudstack_physical_network" "test" {
 	broadcast_domain_range = "ZONE"
-	isolation_methods      = "VLAN"
+	isolation_methods      = ["VLAN"]
 	name                   = "test01"
 	network_speed          = "1G"
 	tags                   = "vlan"

cloudstack/resource_cloudstack_network_service_provider_state_test.go

@@ -200,7 +200,7 @@ resource "cloudstack_zone" "foo" {
   network_type = "Advanced"
 }
 
-resource "cloudstack_physicalnetwork" "foo" {
+resource "cloudstack_physical_network" "foo" {
   name = "terraform-physical-network"
   zone = cloudstack_zone.foo.name
   broadcast_domain_range = "ZONE"
@@ -209,7 +209,7 @@ resource "cloudstack_physicalnetwork" "foo" {
 
 resource "cloudstack_network_service_provider" "foo" {
   name = "VirtualRouter"
-  physical_network_id = cloudstack_physicalnetwork.foo.id
+  physical_network_id = cloudstack_physical_network.foo.id
   service_list = ["Dhcp", "Dns"]
   # Note: We don't set state for VirtualRouter as it requires configuration first
 }`
@@ -222,7 +222,7 @@ resource "cloudstack_zone" "foo" {
   network_type = "Advanced"
 }
 
-resource "cloudstack_physicalnetwork" "foo" {
+resource "cloudstack_physical_network" "foo" {
   name = "terraform-physical-network"
   zone = cloudstack_zone.foo.name
   broadcast_domain_range = "ZONE"
@@ -231,6 +231,6 @@ resource "cloudstack_physicalnetwork" "foo" {
 
 resource "cloudstack_network_service_provider" "security_group" {
   name = "SecurityGroupProvider"
-  physical_network_id = cloudstack_physicalnetwork.foo.id
+  physical_network_id = cloudstack_physical_network.foo.id
   # Note: We don't set service_list for SecurityGroupProvider as it doesn't support updating
 }`

cloudstack/resource_cloudstack_network_service_provider_test.go

@@ -51,9 +51,10 @@ func resourceCloudStackPhysicalNetwork() *schema.Resource {
 			},
 			"isolation_methods": {
 				Description: "the isolation method for the physical network[VLAN/L3/GRE]",
-				Type:        schema.TypeString,
+				Type:        schema.TypeList,
 				Optional:    true,
 				ForceNew:    true,
+				Elem:        &schema.Schema{Type: schema.TypeString},
 			},
 			"name": {
 				Description: "the name of the physical network",
@@ -93,18 +94,27 @@ func resourceCloudStackPhysicalNetworkCreate(d *schema.ResourceData, meta interf
 	if v, ok := d.GetOk("broadcast_domain_range"); ok {
 		p.SetBroadcastdomainrange(strings.ToUpper(v.(string)))
 	}
+
 	if v, ok := d.GetOk("domain_id"); ok {
 		p.SetDomainid(v.(string))
 	}
-	if v, ok := d.GetOk("isolation_methods"); ok {
-		p.SetIsolationmethods([]string{v.(string)})
+
+	if isolationMethods, ok := d.GetOk("isolation_methods"); ok {
+		methods := make([]string, len(isolationMethods.([]interface{})))
+		for i, v := range isolationMethods.([]interface{}) {
+			methods[i] = v.(string)
+		}
+		p.SetIsolationmethods(methods)
 	}
+
 	if v, ok := d.GetOk("network_speed"); ok {
 		p.SetNetworkspeed(v.(string))
 	}
+
 	if v, ok := d.GetOk("tags"); ok {
 		p.SetTags([]string{v.(string)})
 	}
+
 	if v, ok := d.GetOk("vlan"); ok {
 		p.SetVlan(v.(string))
 	}
@@ -129,7 +139,11 @@ func resourceCloudStackPhysicalNetworkRead(d *schema.ResourceData, meta interfac
 
 	d.Set("broadcast_domain_range", p.Broadcastdomainrange)
 	d.Set("domain_id", p.Domainid)
-	d.Set("isolation_methods", p.Isolationmethods)
+	// Set isolation methods
+	if p.Isolationmethods != "" {
+		methods := strings.Split(p.Isolationmethods, ",")
+		d.Set("isolation_methods", methods)
+	}
 	d.Set("name", p.Name)
 	d.Set("network_speed", p.Networkspeed)
 	d.Set("tags", p.Tags)

cloudstack/resource_cloudstack_physical_network.go

@@ -40,7 +40,7 @@ func TestAccCloudStackPhysicalNetwork_basic(t *testing.T) {
 				Config: testAccCloudStackPhysicalNetwork_basic,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckCloudStackPhysicalNetworkExists(
-						"cloudstack_physicalnetwork.foo", &physicalNetwork),
+						"cloudstack_physical_network.foo", &physicalNetwork),
 					testAccCheckCloudStackPhysicalNetworkBasicAttributes(&physicalNetwork),
 				),
 			},
@@ -58,7 +58,7 @@ func TestAccCloudStackPhysicalNetwork_import(t *testing.T) {
 				Config: testAccCloudStackPhysicalNetwork_basic,
 			},
 			{
-				ResourceName:      "cloudstack_physicalnetwork.foo",
+				ResourceName:      "cloudstack_physical_network.foo",
 				ImportState:       true,
 				ImportStateVerify: true,
 			},
@@ -113,7 +113,7 @@ func testAccCheckCloudStackPhysicalNetworkDestroy(s *terraform.State) error {
 	cs := testAccProvider.Meta().(*cloudstack.CloudStackClient)
 
 	for _, rs := range s.RootModule().Resources {
-		if rs.Type != "cloudstack_physicalnetwork" {
+		if rs.Type != "cloudstack_physical_network" {
 			continue
 		}
 
@@ -138,7 +138,7 @@ resource "cloudstack_zone" "foo" {
   network_type = "Advanced"
 }
 
-resource "cloudstack_physicalnetwork" "foo" {
+resource "cloudstack_physical_network" "foo" {
   name = "terraform-physical-network"
   zone_id = cloudstack_zone.foo.id
   broadcast_domain_range = "ZONE"

cloudstack/resource_cloudstack_physical_network_test.go

@@ -43,7 +43,7 @@ func TestAccCloudStackTrafficType_basic(t *testing.T) {
 						"cloudstack_traffic_type.foo", &trafficType),
 					testAccCheckCloudStackTrafficTypeBasicAttributes(&trafficType),
 					resource.TestCheckResourceAttrSet(
-						"cloudstack_traffic_type.foo", "type"),
+						"cloudstack_traffic_type.foo", "traffic_type"),
 					resource.TestCheckResourceAttr(
 						"cloudstack_traffic_type.foo", "kvm_network_label", "cloudbr0"),
 				),
@@ -160,16 +160,16 @@ resource "cloudstack_zone" "foo" {
   network_type = "Advanced"
 }
 
-resource "cloudstack_physicalnetwork" "foo" {
+resource "cloudstack_physical_network" "foo" {
   name = "terraform-physical-network"
   zone_id = cloudstack_zone.foo.id
   broadcast_domain_range = "ZONE"
   isolation_methods = ["VLAN"]
 }
 
 resource "cloudstack_traffic_type" "foo" {
-  physical_network_id = cloudstack_physicalnetwork.foo.id
-  type = "Management"
+  physical_network_id = cloudstack_physical_network.foo.id
+  traffic_type = "Management"
   kvm_network_label = "cloudbr0"
   xen_network_label = "xenbr0"
 }`