feat(instance) public cloud instances with multiple interfaces

Author: thekrauss

env.sh

@@ -1,12 +1,2 @@
 #!/usr/bin/env bash
 
-export OVH_ENDPOINT="ovh-eu"    
-export OVH_APPLICATION_KEY="000693a9655db1b5"
-export OVH_APPLICATION_SECRET="dda3dcae9b4fbd41461c07d100da6586"
-export OVH_CONSUMER_KEY="055d118f9c3ca88b4fba9ae1b984fdf8"
-
-export OVH_DOMAIN_TEST="syk-edu.com"
-
-export TF_ACC=1
-
-echo "[OK] OVH environment variables exported for acceptance tests."

examples/resources/cloud_project_instance/example_1.tf

@@ -16,3 +16,61 @@ resource "ovh_cloud_project_instance" "instance" {
         public = true
     }  
 }
+
+
+##  with Multiple Network Interfaces
+
+resource "ovh_cloud_project_network_private" "net_front" {
+  service_name = "XXX"
+  name         = "public-front"
+  regions      = ["GRA11"]
+}
+
+resource "ovh_cloud_project_subnet" "subnet_front" {
+  service_name = "XXX"
+  network_id   = ovh_cloud_project_network_private.net_front.id
+  region       = "GRA11"
+  network      = "10.0.1.0/24"
+  dhcp         = true
+}
+
+resource "ovh_cloud_project_network_private" "net_back" {
+  service_name = "XXX"
+  name         = "private-back"
+  regions      = ["GRA11"]
+}
+
+resource "ovh_cloud_project_subnet" "subnet_back" {
+  service_name = "XXX"
+  network_id   = private.net_back.id
+  region       = "GRA11"
+  network      = "10.0.2.0/24"
+  dhcp         = true
+}
+
+resource "ovh_cloud_project_instance" "multinic_instance" {
+  service_name   = "XXX"
+  region         = "GRA11"
+  name           = "multi-nic-instance"
+  flavor_id      = "UUID"
+  image_id       = "UUID"
+
+  network {
+    public = true
+
+    private {
+      network {
+        id        = private.net_front.id
+        subnet_id = subnet.subnet_front.id
+      }
+      ip = "10.0.1.10"
+    }
+
+    private {
+      network {
+        id        = private.net_back.id
+        subnet_id = subnet.subnet_back.id
+      }
+    }
+  }
+}

ovh/resource_cloud_project_instance.go

@@ -187,7 +187,8 @@ func resourceCloudProjectInstance() *schema.Resource {
 				Type:        schema.TypeList,
 				Required:    true,
 				ForceNew:    true,
-				Description: "Network information(multiple NICs)",
+				MaxItems:    1,
+				Description: "Network information",
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"public": {
@@ -205,7 +206,6 @@ func resourceCloudProjectInstance() *schema.Resource {
 									"floating_ip": {
 										Type:        schema.TypeSet,
 										Optional:    true,
-										MaxItems:    1,
 										Description: "Existing floating IP",
 										ForceNew:    true,
 										Elem: &schema.Resource{
@@ -430,6 +430,7 @@ func resourceCloudProjectInstanceCreate(ctx context.Context, d *schema.ResourceD
 	config := meta.(*Config)
 	serviceName := d.Get("service_name").(string)
 	region := d.Get("region").(string)
+
 	params := new(CloudProjectInstanceCreateOpts)
 	params.FromResource(d)
 
@@ -438,24 +439,9 @@ func resourceCloudProjectInstanceCreate(ctx context.Context, d *schema.ResourceD
 		url.PathEscape(region),
 	)
 
-	payload := map[string]interface{}{
-		"auto_backup":      params.AutoBackup,
-		"availabilityZone": params.AvailabilityZone,
-		"billingPeriod":    params.BillingPeriod,
-		"bootFrom":         params.BootFrom,
-		"bulk":             params.Bulk,
-		"flavor":           params.Flavor,
-		"group":            params.Group,
-		"name":             params.Name,
-		"sshKey":           params.SshKey,
-		"sshKeyCreate":     params.SshKeyCreate,
-		"userData":         params.UserData,
-		"network":          networksToPayload(params.Networks), // multi NIC
-	}
-
 	r := &CloudProjectOperationResponse{}
-	if err := config.OVHClient.Post(endpoint, payload, r); err != nil {
-		return diag.Errorf("calling %s with params %v:\n\t %q", endpoint, payload, err)
+	if err := config.OVHClient.Post(endpoint, params, r); err != nil {
+		return diag.Errorf("calling %s with params %v:\n\t %q", endpoint, params, err)
 	}
 
 	instanceID, err := waitForCloudProjectOperation(ctx, config.OVHClient, serviceName, r.Id, "instance#create", d.Timeout(schema.TimeoutCreate))
@@ -542,76 +528,3 @@ func resourceCloudProjectInstanceDelete(ctx context.Context, d *schema.ResourceD
 	log.Printf("[DEBUG] Deleted Public Cloud %s Instance %s", serviceName, id)
 	return nil
 }
-
-func networksToPayload(networks []*Network) []interface{} {
-	payload := make([]interface{}, 0, len(networks))
-	for _, net := range networks {
-		netMap := map[string]interface{}{
-			"public": net.Public,
-		}
-
-		if len(net.Private) > 0 {
-			privateList := make([]interface{}, 0, len(net.Private))
-			for _, p := range net.Private {
-				pMap := map[string]interface{}{}
-
-				if p.FloatingIP != nil {
-					pMap["floating_ip"] = []map[string]interface{}{
-						{"id": p.FloatingIP.ID},
-					}
-				}
-
-				if p.FloatingIPCreate != nil {
-					pMap["floating_ip_create"] = []map[string]interface{}{
-						{"description": p.FloatingIPCreate.Description},
-					}
-				}
-
-				if p.Gateway != nil {
-					pMap["gateway"] = []map[string]interface{}{
-						{"id": p.Gateway.ID},
-					}
-				}
-
-				if p.GatewayCreate != nil {
-					pMap["gateway_create"] = []map[string]interface{}{
-						{"model": p.GatewayCreate.Model, "name": p.GatewayCreate.Name},
-					}
-				}
-
-				if p.IP != "" {
-					pMap["ip"] = p.IP
-				}
-
-				if p.Network != nil {
-					pMap["network"] = []map[string]interface{}{
-						{"id": p.Network.ID, "subnet_id": p.Network.SubnetID},
-					}
-				}
-
-				if p.NetworkCreate != nil {
-					subnetList := []map[string]interface{}{
-						{
-							"cidr":        p.NetworkCreate.Subnet.CIDR,
-							"enable_dhcp": p.NetworkCreate.Subnet.EnableDHCP,
-							"ip_version":  p.NetworkCreate.Subnet.IPVersion,
-						},
-					}
-					pMap["network_create"] = []map[string]interface{}{
-						{
-							"name":    p.NetworkCreate.Name,
-							"vlan_id": p.NetworkCreate.VlanId,
-							"subnet":  subnetList,
-						},
-					}
-				}
-
-				privateList = append(privateList, pMap)
-			}
-			netMap["private"] = privateList
-		}
-
-		payload = append(payload, netMap)
-	}
-	return payload
-}

ovh/resource_cloud_project_instance_test.go

@@ -380,3 +380,118 @@ func TestAccCloudProjectInstance_privateNetworkAlreadyExists(t *testing.T) {
 		},
 	})
 }
+
+func TestAccCloudProjectInstance_multiNIC(t *testing.T) {
+	serviceName := os.Getenv("OVH_CLOUD_PROJECT_SERVICE_TEST")
+	region := os.Getenv("OVH_CLOUD_PROJECT_REGION_TEST")
+	flavor, image, err := getFlavorAndImage(serviceName, region)
+	if err != nil {
+		t.Skipf("failed to retrieve a flavor and an image: %s", err)
+	}
+
+	rName := acctest.RandomWithPrefix(test_prefix)
+	netName1 := fmt.Sprintf("%s_net1", rName)
+	netName2 := fmt.Sprintf("%s_net2", rName)
+
+	vlanID1 := rand.Intn(2000) + 2
+	vlanID2 := vlanID1 + 1
+
+	var testCreateInstanceMultiNIC = fmt.Sprintf(`
+		resource "private" "net1" {
+			service_name = "%s"
+			name         = "%s"
+			regions      = ["%s"]
+			vlan_id      = %d
+		}
+
+		resource "ovh_cloud_project_subnet" "sub1" {
+			service_name = "%s"
+			network_id   = private.net1.id
+			region       = "%s"
+			network      = "192.168.1.0/24"
+			dhcp         = true
+			start        = "192.168.1.100"
+			end          = "192.168.1.200"
+			no_gateway   = false
+		}
+
+		resource "private" "net2" {
+			service_name = "%s"
+			name         = "%s"
+			regions      = ["%s"]
+			vlan_id      = %d
+		}
+
+		resource "ovh_cloud_project_subnet" "sub2" {
+			service_name = "%s"
+			network_id   = private.net2.id
+			region       = "%s"
+			network      = "192.168.2.0/24"
+			dhcp         = true
+			start        = "192.168.2.100"
+			end          = "192.168.2.200"
+			no_gateway   = false
+		}
+
+		resource "ovh_cloud_project_instance" "multi_nic" {
+			service_name = "%s"
+			region       = "%s"
+			name         = "%s"
+            billing_period = "hourly"
+			
+			flavor {
+				flavor_id = "%s"
+			}
+            boot_from {
+                image_id = "%s"
+            }
+
+			network {
+                # Interface Publique
+				public = true
+
+                # Interface Privée 1
+				private {
+					network {
+						id        = private.net1.id
+						subnet_id = ovh_cloud_project_subnet.sub1.id
+					}
+				}
+
+                # Interface Privée 2
+				private {
+					network {
+						id        = private.net2.id
+						subnet_id = ovh_cloud_project_subnet.sub2.id
+					}
+				}
+			}
+		}
+	`,
+		serviceName, netName1, region, vlanID1,
+		serviceName, region,
+		serviceName, netName2, region, vlanID2,
+		serviceName, region,
+		serviceName, region, rName, flavor, image,
+	)
+
+	resource.Test(t, resource.TestCase{
+		PreCheck: func() {
+			testAccPreCheckCloud(t)
+			testAccCheckCloudProjectExists(t)
+		},
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testCreateInstanceMultiNIC,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrSet("ovh_cloud_project_instance.multi_nic", "id"),
+					resource.TestCheckResourceAttr("ovh_cloud_project_instance.multi_nic", "network.0.private.#", "2"),
+					resource.TestCheckResourceAttrSet("ovh_cloud_project_instance.multi_nic", "addresses.0.ip"),
+					resource.TestCheckResourceAttrSet("ovh_cloud_project_instance.multi_nic", "addresses.1.ip"),
+					resource.TestCheckResourceAttrSet("ovh_cloud_project_instance.multi_nic", "addresses.2.ip"),
+				),
+			},
+		},
+	})
+}