Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor datacenter and datacenters data source and documentation #26

Closed
wants to merge 4 commits into from
Closed

Refactor datacenter and datacenters data source and documentation #26

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
553aac5
datacenter
Diptipowervs Dec 29, 2023
c594acf
Pull ibm_ pi_constants.go from constant-refactor
Diptipowervs Jan 5, 2024
3cf945f
Merge branch 'master' into data-center-refactor
ismirlia Jan 30, 2024
91ab289
Merge branch 'master' into data-center-refactor
Diptipowervs Jan 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 20 additions & 22 deletions ibm/service/power/data_source_ibm_pi_datacenter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,54 +15,52 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
)

const (
DatacenterRegion = "region"
DatacenterType = "type"
DatacenterUrl = "url"
)

func DataSourceIBMPIDatacenter() *schema.Resource {
return &schema.Resource{
ReadContext: dataSourceIBMPIDatacenterRead,
Schema: map[string]*schema.Schema{
// Arguments
Arg_DatacenterZone: {
Type: schema.TypeString,
Description: "Datacenter zone you want to retrieve.",
Optional: true,
Type: schema.TypeString,
ValidateFunc: validation.NoZeroValues,
},

// Attributes
Attr_DatacenterCapabilities: {
Type: schema.TypeMap,
Computed: true,
Description: "Datacenter Capabilities",
Description: "Datacenter Capabilities.",
Elem: &schema.Schema{
Type: schema.TypeBool,
},
Type: schema.TypeMap,
},
Attr_DatacenterHref: {
Type: schema.TypeString,
Computed: true,
Description: "Datacenter href",
Description: "Datacenter href.",
Type: schema.TypeString,
},
Attr_DatacenterLocation: {
Type: schema.TypeMap,
Computed: true,
Description: "Datacenter location",
Description: "Datacenter location.",
Type: schema.TypeMap,
},
Attr_DatacenterStatus: {
Type: schema.TypeString,
Computed: true,
Description: "Datacenter status",
Description: "Datacenter status, active,maintenance or down.",
Type: schema.TypeString,
},
Attr_DatacenterType: {
Type: schema.TypeString,
Computed: true,
Description: "Datacenter type",
Description: "Datacenter type, off-premises or on-premises.",
Type: schema.TypeString,
},
},
}
}

func dataSourceIBMPIDatacenterRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
// session
sess, err := meta.(conns.ClientSession).IBMPISession()
if err != nil {
return diag.FromErr(err)
Expand All @@ -81,14 +79,14 @@ func dataSourceIBMPIDatacenterRead(ctx context.Context, d *schema.ResourceData,
d.SetId(genID)
d.Set(Attr_DatacenterCapabilities, dcData.Capabilities)
dclocation := map[string]interface{}{
DatacenterRegion: *dcData.Location.Region,
DatacenterType: *dcData.Location.Type,
DatacenterUrl: *dcData.Location.URL,
Attr_Region: *dcData.Location.Region,
Attr_Type: *dcData.Location.Type,
Attr_URL: *dcData.Location.URL,
}
d.Set(Attr_DatacenterHref, dcData.Href)
d.Set(Attr_DatacenterLocation, flex.Flatten(dclocation))
d.Set(Attr_DatacenterStatus, dcData.Status)
d.Set(Attr_DatacenterType, dcData.Type)
d.Set(Attr_DatacenterHref, dcData.Href)

return nil
}
6 changes: 2 additions & 4 deletions ibm/service/power/data_source_ibm_pi_datacenter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
package power_test

import (
"fmt"
"testing"

acc "github.com/IBM-Cloud/terraform-provider-ibm/ibm/acctest"
Expand All @@ -27,9 +26,8 @@ func TestAccIBMPIDatacenterDataSourceBasic(t *testing.T) {
}

func testAccCheckIBMPIDatacenterDataSourceConfig() string {
return fmt.Sprintf(`
return `
data "ibm_pi_datacenter" "test" {
pi_datacenter_zone = "dal12"
}
`)
}`
}
36 changes: 16 additions & 20 deletions ibm/service/power/data_source_ibm_pi_datacenters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,56 +13,53 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

const (
Datacenters = "datacenters"
)

func DataSourceIBMPIDatacenters() *schema.Resource {
return &schema.Resource{
ReadContext: dataSourceIBMPIDatacentersRead,
Schema: map[string]*schema.Schema{
Datacenters: {
Type: schema.TypeList,
Computed: true,
// Attributes
Attr_Datacenters: {
Type: schema.TypeList,
Computed: true,
Description: "List of Datacenters",
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{

Attr_DatacenterCapabilities: {
Type: schema.TypeMap,
Computed: true,
Description: "Datacenter Capabilities",
Elem: &schema.Schema{
Type: schema.TypeBool,
},
Type: schema.TypeMap,
},
Attr_DatacenterHref: {
Type: schema.TypeString,
Computed: true,
Description: "Datacenter href",
Type: schema.TypeString,
},
Attr_DatacenterLocation: {
Type: schema.TypeMap,
Computed: true,
Description: "Datacenter location",
Type: schema.TypeMap,
},
Attr_DatacenterStatus: {
Type: schema.TypeString,
Computed: true,
Description: "Datacenter status",
Type: schema.TypeString,
},
Attr_DatacenterType: {
Type: schema.TypeString,
Computed: true,
Description: "Datacenter type",
Type: schema.TypeString,
},
},
},
},
},
}
}

func dataSourceIBMPIDatacentersRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
// session
sess, err := meta.(conns.ClientSession).IBMPISession()
if err != nil {
return diag.FromErr(err)
Expand All @@ -77,21 +74,20 @@ func dataSourceIBMPIDatacentersRead(ctx context.Context, d *schema.ResourceData,
if datacenter != nil {
dc := map[string]interface{}{
Attr_DatacenterCapabilities: datacenter.Capabilities,
Attr_DatacenterHref: datacenter.Href,
Attr_DatacenterLocation: map[string]interface{}{
DatacenterRegion: datacenter.Location.Region,
DatacenterType: datacenter.Location.Type,
DatacenterUrl: datacenter.Location.URL,
Attr_Region: datacenter.Location.Region,
Attr_Type: datacenter.Location.Type,
Attr_URL: datacenter.Location.URL,
},
Attr_DatacenterStatus: datacenter.Status,
Attr_DatacenterType: datacenter.Type,
Attr_DatacenterHref: datacenter.Href,
}
datacenters = append(datacenters, dc)
}

}
var clientgenU, _ = uuid.GenerateUUID()
d.SetId(clientgenU)
d.Set(Datacenters, datacenters)
d.Set(Attr_Datacenters, datacenters)
return nil
}
3 changes: 1 addition & 2 deletions ibm/service/power/data_source_ibm_pi_datacenters_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
package power_test

import (
"fmt"
"testing"

acc "github.com/IBM-Cloud/terraform-provider-ibm/ibm/acctest"
Expand All @@ -27,5 +26,5 @@ func TestAccIBMPIDatacentersDataSourceBasic(t *testing.T) {
}

func testAccCheckIBMPIDatacentersDataSourceConfig() string {
return fmt.Sprintf(`data "ibm_pi_datacenters" "test" {}`)
return `data "ibm_pi_datacenters" "test" {}`
}
Loading
Loading