Added resource 'cloudtemple_compute_iaas_opensource_network_adapter'

docs/resources/compute_iaas_opensource_virtual_disk.md

@@ -36,6 +36,6 @@ To manage this resource you will need the following roles:
 ### Read-Only
 
 - `id` (String) The ID of the virtual disk.
-- `usage` (String) The usage of the virtual disk.
+- `usage` (Number) The usage of the virtual disk.
 
 

internal/client/compute_openiaas_network_adapter.go

@@ -25,6 +25,18 @@ type OpenIaaSNetworkAdapter struct {
 	} `terraform:"network"`
 }
 
+type CreateOpenIaasNetworkAdapterRequest struct {
+	VirtualMachineID string `json:"virtualMachineId"`
+	NetworkID        string `json:"networkId"`
+	MAC              string `json:"mac,omitempty"`
+}
+
+func (v *OpenIaaSNetworkAdapterClient) Create(ctx context.Context, req *CreateOpenIaasNetworkAdapterRequest) (string, error) {
+	r := v.c.newRequest("POST", "/compute/v1/open_iaas/network_adapters")
+	r.obj = req
+	return v.c.doRequestAndReturnActivity(ctx, r)
+}
+
 func (v *OpenIaaSNetworkAdapterClient) Read(ctx context.Context, id string) (*OpenIaaSNetworkAdapter, error) {
 	r := v.c.newRequest("GET", "/compute/v1/open_iaas/network_adapters/%s", id)
 	resp, err := v.c.doRequest(ctx, r)
@@ -65,3 +77,30 @@ func (v *OpenIaaSNetworkAdapterClient) List(ctx context.Context, virtualMachineI
 
 	return out, nil
 }
+
+type UpdateOpenIaasNetworkAdapterRequest struct {
+	NetworkID string `json:"networkId"`
+	MAC       string `json:"mac,omitempty"`
+	Attached  bool   `json:"attached,omitempty"`
+}
+
+func (v *OpenIaaSNetworkAdapterClient) Update(ctx context.Context, id string, req *UpdateOpenIaasNetworkAdapterRequest) (string, error) {
+	r := v.c.newRequest("PATCH", "/compute/v1/open_iaas/network_adapters/%s", id)
+	r.obj = req
+	return v.c.doRequestAndReturnActivity(ctx, r)
+}
+
+func (v *OpenIaaSNetworkAdapterClient) Connect(ctx context.Context, id string) (string, error) {
+	r := v.c.newRequest("PATCH", "/compute/v1/open_iaas/network_adapters/%s/connect", id)
+	return v.c.doRequestAndReturnActivity(ctx, r)
+}
+
+func (v *OpenIaaSNetworkAdapterClient) Disconnect(ctx context.Context, id string) (string, error) {
+	r := v.c.newRequest("PATCH", "/compute/v1/open_iaas/network_adapters/%s/disconnect", id)
+	return v.c.doRequestAndReturnActivity(ctx, r)
+}
+
+func (v *OpenIaaSNetworkAdapterClient) Delete(ctx context.Context, id string) (string, error) {
+	r := v.c.newRequest("DELETE", "/compute/v1/open_iaas/network_adapters/%s", id)
+	return v.c.doRequestAndReturnActivity(ctx, r)
+}

internal/client/compute_openiaas_pool.go

@@ -11,8 +11,12 @@ func (c *ComputeOpenIaaSClient) Pool() *OpenIaasPoolClient {
 }
 
 type OpenIaasPool struct {
-	ID                      string   `terraform:"id"`
-	MachineManager          string   `terraform:"machine_manager_id"`
+	ID             string `terraform:"id"`
+	MachineManager struct {
+		ID   string `terraform:"id"`
+		Name string `terraform:"name"`
+		Type string `terraform:"type"`
+	} `terraform:"machine_manager"`
 	InternalID              string   `terraform:"internal_id"`
 	Name                    string   `terraform:"name"`
 	HighAvailabilityEnabled bool     `terraform:"high_availability_enabled"`

internal/provider/data_source_compute_openiaas_pool.go

@@ -2,9 +2,9 @@ package provider
 
 import (
 	"context"
-	"fmt"
 
 	"github.com/cloud-temple/terraform-provider-cloudtemple/internal/client"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 )
@@ -13,30 +13,50 @@ func dataSourceOpenIaasPool() *schema.Resource {
 	return &schema.Resource{
 		Description: "Used to retrieve a specific pool from an Open IaaS infrastructure.",
 
-		ReadContext: readFullResource(func(ctx context.Context, c *client.Client, d *schema.ResourceData, sw *stateWriter) (interface{}, error) {
+		ReadContext: func(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
+			c := getClient(meta)
+			var pool *client.OpenIaasPool
 			name := d.Get("name").(string)
 			if name != "" {
 				pools, err := c.Compute().OpenIaaS().Pool().List(ctx, &client.OpenIaasPoolFilter{
 					MachineManagerId: d.Get("machine_manager_id").(string),
 				})
 				if err != nil {
-					return nil, fmt.Errorf("failed to find pool named %q: %s", name, err)
+					diag.Errorf("failed to find pool named %q: %s", name, err)
 				}
-				for _, pool := range pools {
-					if pool.Name == name {
-						return pool, nil
+				for _, currPool := range pools {
+					if currPool.Name == name {
+						pool = currPool
 					}
 				}
-				return nil, fmt.Errorf("failed to find pool named %q", name)
+				diag.Errorf("failed to find pool named %q", name)
+			} else {
+				id := d.Get("id").(string)
+				pool, err := c.Compute().OpenIaaS().Pool().Read(ctx, id)
+				if err == nil && pool == nil {
+					diag.Errorf("failed to find pool with id %q", id)
+				}
 			}
 
-			id := d.Get("id").(string)
-			pool, err := c.Compute().OpenIaaS().Pool().Read(ctx, id)
-			if err == nil && pool == nil {
-				return nil, fmt.Errorf("failed to find pool with id %q", id)
-			}
-			return pool, err
-		}),
+			sw := newStateWriter(d)
+
+			d.SetId(pool.ID)
+
+			d.Set("name", pool.Name)
+			d.Set("machine_manager_id", pool.MachineManager.ID)
+			d.Set("internal_id", pool.InternalID)
+			d.Set("high_availability_enabled", pool.HighAvailabilityEnabled)
+			d.Set("cpu", []interface{}{
+				map[string]interface{}{
+					"cores":   pool.Cpu.Cores,
+					"sockets": pool.Cpu.Sockets,
+				},
+			})
+			d.Set("master", pool.Master)
+			d.Set("hosts", pool.Hosts)
+
+			return sw.diags
+		},
 
 		Schema: map[string]*schema.Schema{
 			// In

internal/provider/provider.go

@@ -162,6 +162,7 @@ func New(version string) func() *schema.Provider {
 				// Compute - Open IaaS
 				"cloudtemple_compute_iaas_opensource_virtual_machine": documentResource(resourceOpenIaasVirtualMachine(), "compute_iaas_opensource_management", "compute_iaas_opensource_read", "compute_iaas_opensource_virtual_machine_power", "backup_iaas_opensource_read", "backup_iaas_opensource_write", "activity_read", "tag_read", "tag_write"),
 				"cloudtemple_compute_iaas_opensource_virtual_disk":    documentResource(resourceOpenIaasVirtualDisk(), "compute_iaas_opensource_management", "compute_iaas_opensource_read", "activity_read"),
+				"cloudtemple_compute_iaas_opensource_network_adapter": documentResource(resourceOpenIaasNetworkAdapter(), "compute_iaas_opensource_management", "compute_iaas_opensource_read", "activity_read"),
 			},
 		}
 

internal/provider/resource_compute_openiaas_virtual_disk.go

@@ -13,7 +13,7 @@ func resourceOpenIaasVirtualDisk() *schema.Resource {
 	return &schema.Resource{
 		CreateContext: openIaasVirtualDiskCreate,
 		ReadContext:   openIaasVirtualDiskRead,
-		UpdateContext: openIaasVirtualDiskUpdate,
+		//UpdateContext: openIaasVirtualDiskUpdate,
 		DeleteContext: openIaasVirtualDiskDelete,
 
 		Schema: map[string]*schema.Schema{
@@ -66,7 +66,7 @@ func resourceOpenIaasVirtualDisk() *schema.Resource {
 				Description: "The ID of the virtual disk.",
 			},
 			"usage": {
-				Type:        schema.TypeString,
+				Type:        schema.TypeInt,
 				Computed:    true,
 				Description: "The usage of the virtual disk.",
 			},
@@ -94,7 +94,7 @@ func openIaasVirtualDiskCreate(ctx context.Context, d *schema.ResourceData, meta
 		return diag.Errorf("the virtual disk could not be created: %s", err)
 	}
 
-	return openIaasVirtualDiskUpdate(ctx, d, meta)
+	return openIaasVirtualDiskRead(ctx, d, meta) // DevNote : Call update instead when it will be implemented
 }
 
 func openIaasVirtualDiskRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
@@ -108,12 +108,13 @@ func openIaasVirtualDiskRead(ctx context.Context, d *schema.ResourceData, meta i
 	}
 
 	// Set the retrieved data to the schema
-	d.Set("name", virtualDisk.Name)
-	d.Set("size", virtualDisk.Size)
-	d.Set("usage", virtualDisk.Usage)
-	d.Set("storage_repository_id", virtualDisk.StorageRepository.ID)
+	sw := newStateWriter(d)
+	sw.set("name", virtualDisk.Name)
+	sw.set("size", virtualDisk.Size)
+	sw.set("usage", virtualDisk.Usage)
+	sw.set("storage_repository_id", virtualDisk.StorageRepository.ID)
 
-	return nil
+	return sw.diags
 }
 
 func openIaasVirtualDiskUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {