-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #262 from HewlettPackard/add_controller
Add storage controller
- Loading branch information
Showing
14 changed files
with
271 additions
and
80 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| acc: | ||
| - config: | | ||
| instance_id = 23989 | ||
| controller_type = "scsi" | ||
| bus_number = 0 | ||
| interface_number = 3 |
12 changes: 12 additions & 0 deletions
12
examples/data-sources/hpegl_vmaas_instance_storage_controller/data-source.tf
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| # (C) Copyright 2024 Hewlett Packard Enterprise Development LP | ||
|
|
||
| variable "instance_id" { | ||
| type = number | ||
| default = 0 | ||
| } | ||
| data "hpegl_vmaas_instance_storage_controller" "scsi3" { | ||
| instance_id = var.instance_id | ||
| controller_type = "scsi" | ||
| bus_number = 0 | ||
| interface_number = 3 | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 29 additions & 0 deletions
29
internal/acceptance_test/data_source_instance_storage_controller_test.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| // (C) Copyright 2024 Hewlett Packard Enterprise Development LP | ||
|
|
||
| package acceptancetest | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| api_client "github.com/HewlettPackard/hpegl-vmaas-cmp-go-sdk/pkg/client" | ||
| "github.com/HewlettPackard/hpegl-vmaas-terraform-resources/pkg/atf" | ||
| ) | ||
|
|
||
| func TestAccDataSourceInstanceStorageController(t *testing.T) { | ||
| acc := &atf.Acc{ | ||
| PreCheck: testAccPreCheck, | ||
| Providers: testAccProviders, | ||
| ResourceName: "hpegl_vmaas_instance_storage_controller", | ||
| GetAPI: func(attr map[string]string) (interface{}, error) { | ||
| cl, cfg := getAPIClient() | ||
| iClient := api_client.InstancesAPIService{ | ||
| Client: cl, | ||
| Cfg: cfg, | ||
| } | ||
|
|
||
| return iClient.GetStorageControllerMount(getAccContext(), toInt(attr["instance_id"]), attr["controller_type"], toInt(attr["bus_number"]), toInt(attr["interface_number"])) | ||
| }, | ||
| } | ||
|
|
||
| acc.RunDataSourceTests(t) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| // (C) Copyright 2024 Hewlett Packard Enterprise Development LP | ||
|
|
||
| package cmp | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "log" | ||
| "slices" | ||
| "strings" | ||
|
|
||
| "github.com/HewlettPackard/hpegl-vmaas-cmp-go-sdk/pkg/client" | ||
| "github.com/HewlettPackard/hpegl-vmaas-terraform-resources/internal/utils" | ||
| ) | ||
|
|
||
| type instanceStorageController struct { | ||
| iClient *client.InstancesAPIService | ||
| } | ||
|
|
||
| func newInstanceStorageController(instanceClient *client.InstancesAPIService) *instanceStorageController { | ||
| return &instanceStorageController{iClient: instanceClient} | ||
| } | ||
|
|
||
| func (i *instanceStorageController) Read(ctx context.Context, d *utils.Data, meta interface{}) error { | ||
| setMeta(meta, i.iClient.Client) | ||
| log.Printf("[DEBUG] Get Instance Storage Controller") | ||
| instanceID := d.GetInt("instance_id") | ||
| if instanceID == 0 { | ||
| return nil | ||
| } | ||
| controllerType := d.GetString("controller_type") | ||
| busNumber := d.GetInt("bus_number") | ||
| unitNumber := d.GetInt("interface_number") | ||
|
|
||
| // Pre check | ||
| if err := d.Error(); err != nil { | ||
| return err | ||
| } | ||
| controllerType = strings.TrimSpace(strings.ToLower(controllerType)) | ||
| supportedControllerType := []string{"ide", "scsi"} | ||
| if !slices.Contains(supportedControllerType, controllerType) { | ||
| err := fmt.Errorf("storage controller '%s' is not supported", controllerType) | ||
| return err | ||
| } | ||
| controllerMount, err := i.iClient.GetStorageControllerMount(ctx, instanceID, controllerType, busNumber, unitNumber) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| d.SetID(controllerMount) | ||
|
|
||
| return nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
63 changes: 63 additions & 0 deletions
63
internal/resources/data_source_instance_storage_controller.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| // (C) Copyright 2024 Hewlett Packard Enterprise Development LP | ||
|
|
||
| package resources | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| "github.com/HewlettPackard/hpegl-vmaas-terraform-resources/internal/utils" | ||
| "github.com/HewlettPackard/hpegl-vmaas-terraform-resources/pkg/client" | ||
| "github.com/hashicorp/terraform-plugin-sdk/v2/diag" | ||
| "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" | ||
| ) | ||
|
|
||
| func ReadInstanceStorageController() *schema.Resource { | ||
| return &schema.Resource{ | ||
| Schema: map[string]*schema.Schema{ | ||
| "instance_id": { | ||
| Type: schema.TypeInt, | ||
| Required: true, | ||
| Description: "Unique ID to identify an instance", | ||
| }, | ||
| "controller_type": { | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| Description: "The storage controller name displayed in an instance. Supported values are `IDE`, `SCSI`", | ||
| }, | ||
| "bus_number": { | ||
| Type: schema.TypeInt, | ||
| Required: true, | ||
| Description: "The Bus sequence for a storage controller type", | ||
| }, | ||
| "interface_number": { | ||
| Type: schema.TypeInt, | ||
| Required: true, | ||
| Description: "The interface number to be allocated", | ||
| }, | ||
| }, | ||
| ReadContext: readInstanceStorageControllerContext, | ||
| Description: `The ` + DSInstanceStorageController + ` data source can be used to discover the ID of a storage controller mount. | ||
| This can then be used with resources or data sources that require a ` + DSInstanceStorageType + `, | ||
| such as the ` + ResInstance + ` resource.`, | ||
| SchemaVersion: 0, | ||
| StateUpgraders: nil, | ||
| Importer: &schema.ResourceImporter{ | ||
| StateContext: schema.ImportStatePassthroughContext, | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| func readInstanceStorageControllerContext(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { | ||
| c, err := client.GetClientFromMetaMap(meta) | ||
| if err != nil { | ||
| return diag.FromErr(err) | ||
| } | ||
|
|
||
| data := utils.NewData(d) | ||
| err = c.CmpClient.InstanceStorageController.Read(ctx, data, meta) | ||
| if err != nil { | ||
| return diag.FromErr(err) | ||
| } | ||
|
|
||
| return nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.