Skip to content

Commit

Permalink
[Datasource] network address groups
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelkad committed Aug 9, 2024
1 parent a9a4a10 commit d8e0af1
Show file tree
Hide file tree
Showing 11 changed files with 446 additions and 3 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ toolchain go1.22.5

require (
github.com/IBM-Cloud/container-services-go-sdk v0.0.0-20240725064144-454a2ae23113
github.com/IBM-Cloud/power-go-client v1.7.0
github.com/IBM-Cloud/power-go-client v1.8.0-beta5
github.com/IBM/apigateway-go-sdk v0.0.0-20210714141226-a5d5d49caaca
github.com/IBM/appconfiguration-go-admin-sdk v0.3.0
github.com/IBM/appid-management-go-sdk v0.0.0-20210908164609-dd0e0eaf732f
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,8 @@ github.com/IBM-Cloud/bluemix-go v0.0.0-20240719075425-078fcb3a55be/go.mod h1:/7h
github.com/IBM-Cloud/container-services-go-sdk v0.0.0-20240725064144-454a2ae23113 h1:f2Erqfea1dKpaTFagTJM6W/wnD3JGq/Vn9URh8nuRwk=
github.com/IBM-Cloud/container-services-go-sdk v0.0.0-20240725064144-454a2ae23113/go.mod h1:xUQL9SGAjoZFd4GNjrjjtEpjpkgU7RFXRyHesbKTjiY=
github.com/IBM-Cloud/ibm-cloud-cli-sdk v0.5.3/go.mod h1:RiUvKuHKTBmBApDMUQzBL14pQUGKcx/IioKQPIcRQjs=
github.com/IBM-Cloud/power-go-client v1.7.0 h1:/GuGwPMTKoCZACfnwt7b6wKr4v32q1VO1AMFGNETRN4=
github.com/IBM-Cloud/power-go-client v1.7.0/go.mod h1:9izycYAmNQ+NAdVPXDC3fHYxqWLjlR2YiwqKYveMv5Y=
github.com/IBM-Cloud/power-go-client v1.8.0-beta5 h1:23FxbCYsE4vqBMAQO/8tkksmFu57oXSITVFcyRVgtpg=
github.com/IBM-Cloud/power-go-client v1.8.0-beta5/go.mod h1:oAkZiHX25cmr2Yun5V0q6CpnUemegvSrpcEy/oQcjzU=
github.com/IBM-Cloud/softlayer-go v1.0.5-tf h1:koUAyF9b6X78lLLruGYPSOmrfY2YcGYKOj/Ug9nbKNw=
github.com/IBM-Cloud/softlayer-go v1.0.5-tf/go.mod h1:6HepcfAXROz0Rf63krk5hPZyHT6qyx2MNvYyHof7ik4=
github.com/IBM/apigateway-go-sdk v0.0.0-20210714141226-a5d5d49caaca h1:crniVcf+YcmgF03NmmfonXwSQ73oJF+IohFYBwknMxs=
Expand Down
7 changes: 7 additions & 0 deletions ibm/acctest/acctest.go
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ var (
Pi_image_bucket_secret_key string
Pi_instance_name string
Pi_key_name string
Pi_network_address_group_id string
Pi_network_name string
Pi_placement_group_name string
Pi_replication_volume_name string
Expand Down Expand Up @@ -1202,6 +1203,12 @@ func init() {
Pi_host_id = ""
fmt.Println("[WARN] Set the environment variable PI_HOST_ID for testing ibm_pi_host resource else it is set to default value ''")
}
Pi_network_address_group_id = os.Getenv("PI_NETWORK_ADDRESS_GROUP_ID")
if Pi_network_address_group_id == "" {
Pi_network_address_group_id = "terraform-test-power"
fmt.Println("[INFO] Set the environment variable PI_NETWORK_ADDRESS_GROUP_ID for testing ibm_pi_network_address_group data source else it is set to default value 'terraform-test-power'")
}

WorkspaceID = os.Getenv("SCHEMATICS_WORKSPACE_ID")
if WorkspaceID == "" {
WorkspaceID = "us-south.workspace.tf-acc-test-schematics-state-test.392cd99f"
Expand Down
2 changes: 2 additions & 0 deletions ibm/provider/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -649,6 +649,8 @@ func Provider() *schema.Provider {
"ibm_pi_instances": power.DataSourceIBMPIInstances(),
"ibm_pi_key": power.DataSourceIBMPIKey(),
"ibm_pi_keys": power.DataSourceIBMPIKeys(),
"ibm_pi_network_address_group": power.DataSourceIBMPINetworkAddressGroup(),
"ibm_pi_network_address_groups": power.DataSourceIBMPINetworkAddressGroups(),
"ibm_pi_network_port": power.DataSourceIBMPINetworkPort(),
"ibm_pi_network": power.DataSourceIBMPINetwork(),
"ibm_pi_networks": power.DataSourceIBMPINetworks(),
Expand Down
110 changes: 110 additions & 0 deletions ibm/service/power/data_source_ibm_pi_network_address_group.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
// Copyright IBM Corp. 2024 All Rights Reserved.
// Licensed under the Mozilla Public License v2.0

package power

import (
"context"

"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"

"github.com/IBM-Cloud/power-go-client/clients/instance"
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns"
)

func DataSourceIBMPINetworkAddressGroup() *schema.Resource {
return &schema.Resource{
ReadContext: dataSourceIBMPINetworkAddressGroupRead,

Schema: map[string]*schema.Schema{
// Arguments
Arg_CloudInstanceID: {
Description: "The GUID of the service instance associated with an account.",
Required: true,
Type: schema.TypeString,
ValidateFunc: validation.NoZeroValues,
},

Arg_NetworkAddressGroupID: {
Description: "Network Address Group ID.",
Required: true,
Type: schema.TypeString,
},
// Attributes
Attr_CRN: {
Type: schema.TypeString,
Computed: true,
Description: "The Network Address Group's crn.",
},

Attr_Members: {
Computed: true,
Description: "The list of IP addresses in CIDR notation (for example 192.168.66.2/32) in the Network Address Group.",
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
Attr_CIDR: {
Computed: true,
Description: "The IP addresses in CIDR notation for example 192.168.1.5/32.",
Type: schema.TypeString,
},
Attr_ID: {
Computed: true,
Description: "The id of the Network Address Group member IP addresses.",
Type: schema.TypeString,
},
},
},
Type: schema.TypeList,
},
Attr_Name: {
Computed: true,
Description: "The name of the Network Address Group.",
Type: schema.TypeString,
},
Attr_UserTags: {
Computed: true,
Description: "The user tags associated with this resource.",
Elem: &schema.Schema{
Type: schema.TypeString,
},
Type: schema.TypeList,
},
},
}
}

func dataSourceIBMPINetworkAddressGroupRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
sess, err := meta.(conns.ClientSession).IBMPISession()
if err != nil {
return diag.FromErr(err)
}

cloudInstanceID := d.Get(Arg_CloudInstanceID).(string)
nagID := d.Get(Arg_NetworkAddressGroupID).(string)
nagC := instance.NewIBMPINetworkAddressGroupClient(ctx, sess, cloudInstanceID)
networkAddressGroup, err := nagC.Get(nagID)
if err != nil {
return diag.FromErr(err)
}

d.SetId(*networkAddressGroup.ID)

d.Set(Attr_CRN, networkAddressGroup.Crn)

members := []map[string]interface{}{}
if networkAddressGroup.Members != nil {
for _, mbr := range networkAddressGroup.Members {
member := memberToMap(mbr)
members = append(members, member)
}
}
d.Set(Attr_Members, members)
d.Set(Attr_Name, networkAddressGroup.Name)
if len(networkAddressGroup.UserTags) > 0 {
d.Set(Attr_UserTags, networkAddressGroup.UserTags)
}

return nil
}
36 changes: 36 additions & 0 deletions ibm/service/power/data_source_ibm_pi_network_address_group_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
// Copyright IBM Corp. 2024 All Rights Reserved.
// Licensed under the Mozilla Public License v2.0

package power_test

import (
"fmt"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"

acc "github.com/IBM-Cloud/terraform-provider-ibm/ibm/acctest"
)

func TestAccIBMPINetworkAddressGroupDataSourceBasic(t *testing.T) {
resource.Test(t, resource.TestCase{
PreCheck: func() { acc.TestAccPreCheck(t) },
Providers: acc.TestAccProviders,
Steps: []resource.TestStep{
{
Config: testAccCheckIBMPINetworkAddressGroupDataSourceConfigBasic(),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttrSet("data.ibm_pi_network_address_group.network_address_group", "id"),
),
},
},
})
}

func testAccCheckIBMPINetworkAddressGroupDataSourceConfigBasic() string {
return fmt.Sprintf(`
data "ibm_pi_network_address_group" "network_address_group" {
pi_cloud_instance_id = "%s"
pi_network_address_group_id = "%s"
}`, acc.Pi_cloud_instance_id, acc.Pi_network_address_group_id)
}
138 changes: 138 additions & 0 deletions ibm/service/power/data_source_ibm_pi_network_address_groups.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
// Copyright IBM Corp. 2024 All Rights Reserved.
// Licensed under the Mozilla Public License v2.0

package power

import (
"context"

"github.com/IBM-Cloud/power-go-client/clients/instance"
"github.com/IBM-Cloud/power-go-client/power/models"
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns"
"github.com/hashicorp/go-uuid"
"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"
)

func DataSourceIBMPINetworkAddressGroups() *schema.Resource {
return &schema.Resource{
ReadContext: dataSourceIBMPINetworkAddressGroupsRead,

Schema: map[string]*schema.Schema{
// Arguments
Arg_CloudInstanceID: {
Description: "The GUID of the service instance associated with an account.",
Required: true,
Type: schema.TypeString,
ValidateFunc: validation.NoZeroValues,
},
// Attributes
Attr_NetworkAddressGroups: {
Computed: true,
Description: "list of Network Address Groups.",
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
Attr_CRN: {
Type: schema.TypeString,
Computed: true,
Description: "The Network Address Group's crn.",
},
Attr_ID: {
Type: schema.TypeString,
Computed: true,
Description: "The id of the Network Address Group.",
},
Attr_Members: {
Computed: true,
Description: "The list of IP addresses in CIDR notation (for example 192.168.66.2/32) in the Network Address Group.",
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
Attr_CIDR: {
Computed: true,
Description: "The IP addresses in CIDR notation for example 192.168.1.5/32.",
Type: schema.TypeString,
},
Attr_ID: {
Computed: true,
Description: "The id of the Network Address Group member IP addresses.",
Type: schema.TypeString,
},
},
},
Type: schema.TypeList,
},
Attr_Name: {
Computed: true,
Description: "The name of the Network Address Group.",
Type: schema.TypeString,
},
Attr_UserTags: {
Computed: true,
Description: "The user tags associated with this resource.",
Elem: &schema.Schema{
Type: schema.TypeString,
},
Type: schema.TypeList,
},
},
},
Type: schema.TypeList,
},
},
}
}

func dataSourceIBMPINetworkAddressGroupsRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
sess, err := meta.(conns.ClientSession).IBMPISession()
if err != nil {
return diag.FromErr(err)
}

cloudInstanceID := d.Get(Arg_CloudInstanceID).(string)
nagC := instance.NewIBMPINetworkAddressGroupClient(ctx, sess, cloudInstanceID)
networkAddressGroups, err := nagC.GetAll()
if err != nil {
return diag.FromErr(err)
}

var genID, _ = uuid.GenerateUUID()
d.SetId(genID)

nags := []map[string]interface{}{}
if networkAddressGroups.NetworkAddressGroups != nil {
for _, nag := range networkAddressGroups.NetworkAddressGroups {
modelMap := networkAddressGroupsNetworkAddressGroupToMap(nag)
nags = append(nags, modelMap)
}
}
d.Set(Attr_NetworkAddressGroups, nags)

return nil
}

func networkAddressGroupsNetworkAddressGroupToMap(networkAddressGroup *models.NetworkAddressGroup) map[string]interface{} {
nag := make(map[string]interface{})
nag[Attr_CRN] = networkAddressGroup.Crn
nag[Attr_ID] = networkAddressGroup.ID
if networkAddressGroup.Members != nil {
members := []map[string]interface{}{}
for _, membersItem := range networkAddressGroup.Members {
member := memberToMap(membersItem)
members = append(members, member)
}
nag[Attr_Members] = members
}
nag[Attr_Name] = networkAddressGroup.Name
if networkAddressGroup.UserTags != nil {
nag[Attr_UserTags] = networkAddressGroup.UserTags
}
return nag
}

func memberToMap(mbr *models.NetworkAddressGroupMember) map[string]interface{} {
member := make(map[string]interface{})
member[Attr_CIDR] = mbr.Cidr
member[Attr_ID] = mbr.ID
return member
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
// Copyright IBM Corp. 2024 All Rights Reserved.
// Licensed under the Mozilla Public License v2.0

package power_test

import (
"fmt"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"

acc "github.com/IBM-Cloud/terraform-provider-ibm/ibm/acctest"
)

func TestAccIBMPINetworkAddressGroupsDataSourceBasic(t *testing.T) {
resource.Test(t, resource.TestCase{
PreCheck: func() { acc.TestAccPreCheck(t) },
Providers: acc.TestAccProviders,
Steps: []resource.TestStep{
{
Config: testAccCheckIBMPINetworkAddressGroupsDataSourceConfigBasic(),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttrSet("data.ibm_pi_network_address_groups.network_address_groups", "id"),
),
},
},
})
}

func testAccCheckIBMPINetworkAddressGroupsDataSourceConfigBasic() string {
return fmt.Sprintf(`
data "ibm_pi_network_address_groups" "network_address_groups" {
pi_cloud_instance_id = "%s"
}`, acc.Pi_cloud_instance_id)
}
3 changes: 3 additions & 0 deletions ibm/service/power/ibm_pi_constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ const (
Arg_Memory = "pi_memory"
Arg_Name = "pi_name"
Arg_Network = "pi_network"
Arg_NetworkAddressGroupID = "network_address_group_id"
Arg_NetworkName = "pi_network_name"
Arg_PIInstanceSharedProcessorPool = "pi_shared_processor_pool"
Arg_PinPolicy = "pi_pin_policy"
Expand Down Expand Up @@ -248,6 +249,7 @@ const (
Attr_MirroringState = "mirroring_state"
Attr_MTU = "mtu"
Attr_Name = "name"
Attr_NetworkAddressGroups = "network_address_groups"
Attr_NetworkID = "network_id"
Attr_NetworkName = "network_name"
Attr_NetworkPorts = "network_ports"
Expand Down Expand Up @@ -366,6 +368,7 @@ const (
Attr_UsedIPPercent = "used_ip_percent"
Attr_UsedMemory = "used_memory"
Attr_UserIPAddress = "user_ip_address"
Attr_UserTags = "user_tags"
Attr_VCPUs = "vcpus"
Attr_Vendor = "vendor"
Attr_VirtualCoresAssigned = "virtual_cores_assigned"
Expand Down
Loading

0 comments on commit d8e0af1

Please sign in to comment.