Skip to content

Commit 431c8e9

Browse files
amstutaamstuta
authored
Merge pull request #931 from ovh/dev/aamstutz/update-cloud-instance
feat: Allow creating an instance on a private network
2 parents a4d89af + 6af9c2a commit 431c8e9

12 files changed

+470
-5
lines changed

‎docs/data-sources/cloud_project_instance.md

+1
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,4 @@ The following attributes are exported:
4343
* `image_id` - Image id
4444
* `task_state` - Instance task state
4545
* `ssh_key` - SSH Keypair
46+
* `status` - Instance status

‎docs/data-sources/cloud_project_instances.md

+1
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,4 @@ The following attributes are exported:
4343
* `image_id` - Image id
4444
* `task_state` - Instance task state
4545
* `ssh_key` - SSH Keypair
46+
* `status` - Instance status

‎docs/resources/cloud_project_instance.md

+23-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,28 @@ The following arguments are supported:
3939
* `region` - (Required, Forces new resource) Instance region
4040
* `billing_period` - (Required, Forces new resource) Billing period - hourly or monthly
4141
* `network` - (Required, Forces new resource) Create network interfaces
42-
* `public` - (Optional, Forces new resource) Set the new instance as public boolean
42+
* `public` - (Optional, Forces new resource) Set the new instance as public
43+
* `private` - (Optional, Forces new resource) Private network information
44+
* `floating_ip` - (Optional, Forces new resource) Existing floating IP
45+
* `id` - (Optional, Forces new resource) Floating IP ID
46+
* `floating_ip_create` - (Optional, Forces new resource) Information to create a new floating IP
47+
* `description` - (Optional, Forces new resource) Floating IP description
48+
* `gateway` - (Optional, Forces new resource) Existing gateway
49+
* `id` - (Optional, Forces new resource) Gateway ID
50+
* `gateway_create` - (Optional, Forces new resource) Information to create a new gateway
51+
* `model` - (Optional, Forces new resource) Gateway model (s | m | l)
52+
* `name` - (Optional, Forces new resource) Gateway name
53+
* `ip` - (Optional, Forces new resource) Instance IP in the private network
54+
* `network` - (Optional, Forces new resource) Existing private network
55+
* `id` - (Optional, Forces new resource) Network ID
56+
* `subnet_id` - (Optional, Forces new resource) Existing subnet ID
57+
* network_create - (Optional, Forces new resource) Information to create a new private network
58+
* `name` - (Optional, Forces new resource) Network name
59+
* `vlan_id` - (Optional, Forces new resource) Network vlan ID
60+
* `subnet` - (Optional, Forces new resource) New subnet information
61+
* `cidr` - (Optional, Forces new resource) Subnet range in CIDR notation
62+
* `enable_dhcp` - (Optional, Forces new resource) Whether to enable DHCP
63+
* `ip_version` - (Optional, Forces new resource) IP version
4364
* `flavor` - (Required, Forces new resource) Flavor information
4465
* `flavor_id` - (Required, Forces new resource) Flavor ID. Flavors can be retrieved using `GET /cloud/project/{serviceName}/flavor`
4566
* `boot_from` - (Required, Forces new resource) Boot the instance from an image or a volume
@@ -74,3 +95,4 @@ The following attributes are exported:
7495
* `name` - Instance name
7596
* `image_id` - Image id
7697
* `task_state` - Instance task state
98+
* `status` - Instance status

‎ovh/data_cloud_project_instance.go

+6
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,11 @@ func dataSourceCloudProjectInstance() *schema.Resource {
9898
Description: "Instance task state",
9999
Computed: true,
100100
},
101+
"status": {
102+
Type: schema.TypeString,
103+
Description: "Instance status",
104+
Computed: true,
105+
},
101106
},
102107
}
103108
}
@@ -146,6 +151,7 @@ func dataSourceCloudProjectInstanceRead(d *schema.ResourceData, meta interface{}
146151
d.Set("availability_zone", res.AvailabilityZone)
147152
d.Set("task_state", res.TaskState)
148153
d.Set("attached_volumes", attachedVolumes)
154+
d.Set("status", res.Status)
149155

150156
return nil
151157
}

‎ovh/data_cloud_project_instances.go

+5
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,11 @@ func dataSourceCloudProjectInstances() *schema.Resource {
101101
Description: "SSH Key pair name",
102102
Computed: true,
103103
},
104+
"status": {
105+
Type: schema.TypeString,
106+
Description: "Instance status",
107+
Computed: true,
108+
},
104109
"task_state": {
105110
Type: schema.TypeString,
106111
Description: "Instance task state",

‎ovh/resource_cloud_project_instance.go

+171-1
Original file line numberDiff line numberDiff line change
@@ -182,14 +182,174 @@ func resourceCloudProjectInstance() *schema.Resource {
182182
Required: true,
183183
ForceNew: true,
184184
MaxItems: 1,
185-
Description: "Create network interfaces",
185+
Description: "Network information",
186186
Elem: &schema.Resource{
187187
Schema: map[string]*schema.Schema{
188188
"public": {
189189
Type: schema.TypeBool,
190190
Description: "Set the new instance as public",
191191
Optional: true,
192192
},
193+
"private": {
194+
Type: schema.TypeSet,
195+
Optional: true,
196+
ForceNew: true,
197+
MaxItems: 1,
198+
Description: "Private network information",
199+
Elem: &schema.Resource{
200+
Schema: map[string]*schema.Schema{
201+
"floating_ip": {
202+
Type: schema.TypeSet,
203+
Optional: true,
204+
MaxItems: 1,
205+
Description: "Existing floating IP",
206+
ForceNew: true,
207+
Elem: &schema.Resource{
208+
Schema: map[string]*schema.Schema{
209+
"id": {
210+
Type: schema.TypeString,
211+
Description: "Floating IP ID",
212+
Optional: true,
213+
},
214+
},
215+
},
216+
},
217+
218+
"floating_ip_create": {
219+
Type: schema.TypeSet,
220+
Optional: true,
221+
MaxItems: 1,
222+
Description: "Information to create a new floating IP",
223+
ForceNew: true,
224+
Elem: &schema.Resource{
225+
Schema: map[string]*schema.Schema{
226+
"description": {
227+
Type: schema.TypeString,
228+
Description: "Floating IP description",
229+
Optional: true,
230+
},
231+
},
232+
},
233+
},
234+
235+
"gateway": {
236+
Type: schema.TypeSet,
237+
Optional: true,
238+
MaxItems: 1,
239+
Description: "Existing gateway",
240+
ForceNew: true,
241+
Elem: &schema.Resource{
242+
Schema: map[string]*schema.Schema{
243+
"id": {
244+
Type: schema.TypeString,
245+
Description: "Existing gateway ID",
246+
Optional: true,
247+
},
248+
},
249+
},
250+
},
251+
252+
"gateway_create": {
253+
Type: schema.TypeSet,
254+
Optional: true,
255+
MaxItems: 1,
256+
Description: "Information to create a new gateway",
257+
ForceNew: true,
258+
Elem: &schema.Resource{
259+
Schema: map[string]*schema.Schema{
260+
"model": {
261+
Type: schema.TypeString,
262+
Description: "Gateway model",
263+
Optional: true,
264+
ValidateFunc: helpers.ValidateEnum([]string{"s", "m", "l"}),
265+
},
266+
"name": {
267+
Type: schema.TypeString,
268+
Description: "Gateway name",
269+
Optional: true,
270+
},
271+
},
272+
},
273+
},
274+
275+
"ip": {
276+
Type: schema.TypeString,
277+
Optional: true,
278+
Description: "Instance IP in the private network",
279+
ForceNew: true,
280+
},
281+
282+
"network": {
283+
Type: schema.TypeSet,
284+
Optional: true,
285+
MaxItems: 1,
286+
Description: "Existing private network",
287+
ForceNew: true,
288+
Elem: &schema.Resource{
289+
Schema: map[string]*schema.Schema{
290+
"id": {
291+
Type: schema.TypeString,
292+
Description: "Existing network ID",
293+
Optional: true,
294+
},
295+
"subnet_id": {
296+
Type: schema.TypeString,
297+
Description: "Existing subnet ID",
298+
Optional: true,
299+
},
300+
},
301+
},
302+
},
303+
304+
"network_create": {
305+
Type: schema.TypeSet,
306+
Optional: true,
307+
MaxItems: 1,
308+
Description: "Information to create a new private network",
309+
ForceNew: true,
310+
Elem: &schema.Resource{
311+
Schema: map[string]*schema.Schema{
312+
"name": {
313+
Type: schema.TypeString,
314+
Description: "Network name",
315+
Optional: true,
316+
},
317+
"subnet": {
318+
Type: schema.TypeSet,
319+
Optional: true,
320+
MaxItems: 1,
321+
Description: "New subnet information",
322+
ForceNew: true,
323+
Elem: &schema.Resource{
324+
Schema: map[string]*schema.Schema{
325+
"cidr": {
326+
Type: schema.TypeString,
327+
Description: "Subnet range in CIDR notation",
328+
Optional: true,
329+
},
330+
"enable_dhcp": {
331+
Type: schema.TypeBool,
332+
Optional: true,
333+
},
334+
"ip_version": {
335+
Type: schema.TypeInt,
336+
Description: "IP version",
337+
Optional: true,
338+
},
339+
},
340+
},
341+
},
342+
"vlan_id": {
343+
Type: schema.TypeInt,
344+
Description: "Network vlan ID",
345+
Optional: true,
346+
},
347+
},
348+
},
349+
},
350+
},
351+
},
352+
},
193353
},
194354
},
195355
},
@@ -252,6 +412,11 @@ func resourceCloudProjectInstance() *schema.Resource {
252412
Description: "Instance task state",
253413
Computed: true,
254414
},
415+
"status": {
416+
Type: schema.TypeString,
417+
Description: "Instance status",
418+
Computed: true,
419+
},
255420
},
256421
}
257422
}
@@ -280,6 +445,10 @@ func resourceCloudProjectInstanceCreate(ctx context.Context, d *schema.ResourceD
280445

281446
d.SetId(instanceID)
282447

448+
if err := waitForCloudProjectInstance(ctx, config.OVHClient, serviceName, region, instanceID); err != nil {
449+
return diag.Errorf("error waiting for instance to be ready: %s", err)
450+
}
451+
283452
return resourceCloudProjectInstanceRead(ctx, d, meta)
284453
}
285454

@@ -305,6 +474,7 @@ func resourceCloudProjectInstanceRead(ctx context.Context, d *schema.ResourceDat
305474
d.Set("image_id", r.ImageId)
306475
d.Set("region", r.Region)
307476
d.Set("task_state", r.TaskState)
477+
d.Set("status", r.Status)
308478
d.Set("id", r.Id)
309479

310480
addresses := make([]map[string]interface{}, 0, len(r.Addresses))

‎ovh/resource_cloud_project_instance_test.go

+75
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ func getFlavorAndImage(project, region string) (string, string, error) {
2020
ID string `json:"id"`
2121
Type string `json:"type"`
2222
OSType string `json:"osType"`
23+
Name string `json:"name"`
2324
}
2425

2526
endpoint := fmt.Sprintf("/cloud/project/%s/flavor?region=%s", url.PathEscape(project), url.QueryEscape(region))
@@ -30,6 +31,10 @@ func getFlavorAndImage(project, region string) (string, string, error) {
3031
}
3132

3233
for _, flav := range response {
34+
if flav.Name != "b2-7" {
35+
continue
36+
}
37+
3338
endpoint = fmt.Sprintf("/cloud/project/%s/image?region=%s&osType=%s&flavorType=%s",
3439
url.PathEscape(project),
3540
url.QueryEscape(region),
@@ -224,3 +229,73 @@ func TestAccCloudProjectInstance_withSSHKeyCreate(t *testing.T) {
224229
},
225230
})
226231
}
232+
233+
func TestAccCloudProjectInstance_privateNetwork(t *testing.T) {
234+
serviceName := os.Getenv("OVH_CLOUD_PROJECT_SERVICE_TEST")
235+
region := os.Getenv("OVH_CLOUD_PROJECT_REGION_TEST")
236+
flavor, image, err := getFlavorAndImage(serviceName, region)
237+
if err != nil {
238+
t.Skipf("failed to retrieve a flavor and an image: %s", err)
239+
}
240+
241+
networkName := acctest.RandomWithPrefix(test_prefix)
242+
243+
var testCreateInstance = fmt.Sprintf(`
244+
resource "ovh_cloud_project_instance" "instance" {
245+
service_name = "%s"
246+
region = "%s"
247+
billing_period = "hourly"
248+
boot_from {
249+
image_id = "%s"
250+
}
251+
flavor {
252+
flavor_id = "%s"
253+
}
254+
name = "TestInstance"
255+
ssh_key {
256+
name = "%s"
257+
}
258+
network {
259+
private {
260+
network_create {
261+
name = "%s"
262+
vlan_id = 1237
263+
subnet{
264+
ip_version = 4
265+
cidr = "10.0.0.1/20"
266+
enable_dhcp = true
267+
}
268+
}
269+
}
270+
}
271+
}
272+
`,
273+
serviceName,
274+
region,
275+
image,
276+
flavor,
277+
os.Getenv("OVH_CLOUD_PROJECT_SSH_NAME_TEST"),
278+
networkName)
279+
280+
resource.Test(t, resource.TestCase{
281+
PreCheck: func() {
282+
testAccPreCheckCloud(t)
283+
testAccCheckCloudProjectExists(t)
284+
},
285+
Providers: testAccProviders,
286+
Steps: []resource.TestStep{
287+
{
288+
Config: testCreateInstance,
289+
Check: resource.ComposeTestCheckFunc(
290+
resource.TestCheckResourceAttrSet("ovh_cloud_project_instance.instance", "id"),
291+
resource.TestCheckResourceAttr("ovh_cloud_project_instance.instance", "flavor_name", "b2-7"),
292+
resource.TestCheckResourceAttr("ovh_cloud_project_instance.instance", "flavor_id", flavor),
293+
resource.TestCheckResourceAttr("ovh_cloud_project_instance.instance", "image_id", image),
294+
resource.TestCheckResourceAttr("ovh_cloud_project_instance.instance", "region", region),
295+
resource.TestCheckResourceAttr("ovh_cloud_project_instance.instance", "name", "TestInstance"),
296+
resource.TestCheckResourceAttrSet("ovh_cloud_project_instance.instance", "addresses.0.ip"),
297+
),
298+
},
299+
},
300+
})
301+
}

‎ovh/types_cloud.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ type CloudProjectSubOperation struct {
7575
func waitForCloudProjectOperation(ctx context.Context, c *ovh.Client, serviceName, operationId, actionType string) (string, error) {
7676
endpoint := fmt.Sprintf("/cloud/project/%s/operation/%s", url.PathEscape(serviceName), url.PathEscape(operationId))
7777
resourceID := ""
78-
err := retry.RetryContext(ctx, 10*time.Minute, func() *retry.RetryError {
78+
err := retry.RetryContext(ctx, 60*time.Minute, func() *retry.RetryError {
7979
ro := &CloudProjectOperationResponse{}
8080
if err := c.GetWithContext(ctx, endpoint, ro); err != nil {
8181
return retry.NonRetryableError(err)

0 commit comments

Comments
 (0)