Skip to content

Commit

Permalink
Network Peers
Browse files Browse the repository at this point in the history
Add [D]: pi_network_peers
Update [D]: pi_network, pi_networks
Update [R]: pi_network

Network Peer

Network Peers

Add [D]: pi_network_peers
Update [D]: pi_network, pi_networks
Update [R]: pi_network
Add require option

Add vsn functionality

Add comment to docs

test fixes

Add stop to update

Update ibm/service/power/resource_ibm_pi_virtual_serial_number_test.go

Co-authored-by: michaelkad <45772690+michaelkad@users.noreply.github.com>

Code cleanup

fixes from testing

doc fixes

doc fixes, delete fixes on instance
  • Loading branch information
michaelkad committed Nov 5, 2024
1 parent 03caa9e commit f5b17b2
Show file tree
Hide file tree
Showing 31 changed files with 1,660 additions and 28 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ toolchain go1.22.5
require (
github.com/IBM-Cloud/bluemix-go v0.0.0-20240926024252-81b3928fd062
github.com/IBM-Cloud/container-services-go-sdk v0.0.0-20240725064144-454a2ae23113
github.com/IBM-Cloud/power-go-client v1.8.3
github.com/IBM-Cloud/power-go-client v1.9.0-beta6
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-20240926024252-81b3928fd062/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.8.3 h1:QsBuIS6KvKsiEpe0yiHYKhWgXlqkcJ7XqFHtATj8Yh4=
github.com/IBM-Cloud/power-go-client v1.8.3/go.mod h1:UDyXeIKEp6r7yWUXYu3r0ZnFSlNZ2YeQTHwM2Tmlgv0=
github.com/IBM-Cloud/power-go-client v1.9.0-beta6 h1:UOcCmM16R2fNGJWpie1gBZhq1T/zRzwbcLVaMmX4Uj8=
github.com/IBM-Cloud/power-go-client v1.9.0-beta6/go.mod h1:UDyXeIKEp6r7yWUXYu3r0ZnFSlNZ2YeQTHwM2Tmlgv0=
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 @@ -235,6 +235,7 @@ var (
Pi_spp_placement_group_id string
Pi_storage_connection string
Pi_target_storage_tier string
Pi_virtual_serial_number string
Pi_volume_clone_task_id string
Pi_volume_group_id string
Pi_volume_group_name string
Expand Down Expand Up @@ -1283,6 +1284,12 @@ func init() {
fmt.Println("[INFO] Set the environment variable PI_VOLUME_CLONE_TASK_ID for testing Pi_volume_clone_task_id resource else it is set to default value 'terraform-test-volume-clone-task-id'")
}

Pi_virtual_serial_number = os.Getenv("PI_VIRTUAL_SERIAL_NUMBER")
if Pi_volume_clone_task_id == "" {
Pi_volume_clone_task_id = "terraform_test_power"
fmt.Println("[INFO] Set the environment variable PI_VIRTUAL_SERIAL_NUMBER for testing ibm_pi_virtual_serial_number data source else it is set to default value 'terraform-test-power'")
}

Pi_resource_group_id = os.Getenv("PI_RESOURCE_GROUP_ID")
if Pi_resource_group_id == "" {
Pi_resource_group_id = ""
Expand Down
4 changes: 4 additions & 0 deletions ibm/provider/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -668,6 +668,7 @@ func Provider() *schema.Provider {
"ibm_pi_network_address_groups": power.DataSourceIBMPINetworkAddressGroups(),
"ibm_pi_network_interface": power.DataSourceIBMPINetworkInterface(),
"ibm_pi_network_interfaces": power.DataSourceIBMPINetworkInterfaces(),
"ibm_pi_network_peers": power.DataSourceIBMPINetworkPeers(),
"ibm_pi_network_port": power.DataSourceIBMPINetworkPort(),
"ibm_pi_network_security_group": power.DataSourceIBMPINetworkSecurityGroup(),
"ibm_pi_network_security_groups": power.DataSourceIBMPINetworkSecurityGroups(),
Expand All @@ -690,6 +691,8 @@ func Provider() *schema.Provider {
"ibm_pi_storage_types_capacity": power.DataSourceIBMPIStorageTypesCapacity(),
"ibm_pi_system_pools": power.DataSourceIBMPISystemPools(),
"ibm_pi_tenant": power.DataSourceIBMPITenant(),
"ibm_pi_virtual_serial_number": power.DataSourceIBMPIVirtualSerialNumber(),
"ibm_pi_virtual_serial_numbers": power.DataSourceIBMPIVirtualSerialNumbers(),
"ibm_pi_volume_clone": power.DataSourceIBMPIVolumeClone(),
"ibm_pi_volume_flash_copy_mappings": power.DataSourceIBMPIVolumeFlashCopyMappings(),
"ibm_pi_volume_group_details": power.DataSourceIBMPIVolumeGroupDetails(),
Expand Down Expand Up @@ -1342,6 +1345,7 @@ func Provider() *schema.Provider {
"ibm_pi_shared_processor_pool": power.ResourceIBMPISharedProcessorPool(),
"ibm_pi_snapshot": power.ResourceIBMPISnapshot(),
"ibm_pi_spp_placement_group": power.ResourceIBMPISPPPlacementGroup(),
"ibm_pi_virtual_serial_number": power.ResourceIBMPIVirtualSerialNumber(),
"ibm_pi_volume_attach": power.ResourceIBMPIVolumeAttach(),
"ibm_pi_volume_clone": power.ResourceIBMPIVolumeClone(),
"ibm_pi_volume_group_action": power.ResourceIBMPIVolumeGroupAction(),
Expand Down
22 changes: 22 additions & 0 deletions ibm/service/power/data_source_ibm_pi_instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,25 @@ func DataSourceIBMPIInstance() *schema.Resource {
Description: "The virtual cores that are assigned to the instance.",
Type: schema.TypeInt,
},
Attr_VirtualSerialNumber: {
Computed: true,
Description: "Virtual Serial Number information",
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
Attr_Description: {
Computed: true,
Description: "Description of the Virtual Serial Number",
Type: schema.TypeString,
},
Attr_Serial: {
Computed: true,
Description: "Virtual serial number.",
Type: schema.TypeString,
},
},
},
Type: schema.TypeList,
},
Attr_Volumes: {
Computed: true,
Description: "List of volume IDs that are attached to the instance.",
Expand Down Expand Up @@ -311,6 +330,9 @@ func dataSourceIBMPIInstancesRead(ctx context.Context, d *schema.ResourceData, m
if powervmdata.Fault != nil {
d.Set(Attr_Fault, flattenPvmInstanceFault(powervmdata.Fault))
}
if powervmdata.VirtualSerialNumber != nil {
d.Set(Attr_VirtualSerialNumber, flattenVirtualSerialNumberToList(powervmdata.VirtualSerialNumber))
}

return nil
}
23 changes: 23 additions & 0 deletions ibm/service/power/data_source_ibm_pi_instances.go
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,25 @@ func DataSourceIBMPIInstances() *schema.Resource {
Description: "The virtual cores that are assigned to the instance.",
Type: schema.TypeInt,
},
Attr_VirtualSerialNumber: {
Computed: true,
Description: "Virtual Serial Number information",
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
Attr_Description: {
Computed: true,
Description: "Description of the Virtual Serial Number",
Type: schema.TypeString,
},
Attr_Serial: {
Computed: true,
Description: "Virtual serial number.",
Type: schema.TypeString,
},
},
},
Type: schema.TypeList,
},
},
},
Type: schema.TypeList,
Expand Down Expand Up @@ -290,6 +309,10 @@ func flattenPvmInstances(list []*models.PVMInstanceReference, meta interface{})
l[Attr_Fault] = flattenPvmInstanceFault(i.Fault)
}

if i.VirtualSerialNumber != nil {
l[Attr_VirtualSerialNumber] = flattenVirtualSerialNumberToList(i.VirtualSerialNumber)
}

result = append(result, l)
}
return result
Expand Down
29 changes: 28 additions & 1 deletion ibm/service/power/data_source_ibm_pi_network.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ func DataSourceIBMPINetwork() *schema.Resource {
// Attributes
Attr_AccessConfig: {
Computed: true,
Description: "The network communication configuration option of the network (for satellite locations only).",
Deprecated: "This field is deprecated please use peer_id instead.",
Description: "The network communication configuration option of the network (for on prem locations only). Use `peer_id` instead.",
Type: schema.TypeString,
},
Attr_AvailableIPCount: {
Expand Down Expand Up @@ -83,6 +84,25 @@ func DataSourceIBMPINetwork() *schema.Resource {
Description: "The unique identifier or name of a network.",
Type: schema.TypeString,
},
Attr_NetworkAddressTranslation: {
Computed: true,
Description: "Contains the network address translation details (for on prem locations only).",
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
Attr_SourceIP: {
Computed: true,
Description: "source IP address.",
Type: schema.TypeString,
},
},
},
Type: schema.TypeList,
},
Attr_PeerID: {
Computed: true,
Description: "Network peer ID (for on prem locations only).",
Type: schema.TypeString,
},
Attr_Type: {
Computed: true,
Description: "The type of network.",
Expand Down Expand Up @@ -153,6 +173,13 @@ func dataSourceIBMPINetworkRead(ctx context.Context, d *schema.ResourceData, met
if networkdata.Name != nil {
d.Set(Attr_Name, networkdata.Name)
}
networkAddressTranslation := []map[string]interface{}{}
if networkdata.NetworkAddressTranslation != nil {
natMap := networkAddressTranslationToMap(networkdata.NetworkAddressTranslation)
networkAddressTranslation = append(networkAddressTranslation, natMap)
}
d.Set(Attr_NetworkAddressTranslation, networkAddressTranslation)
d.Set(Attr_PeerID, networkdata.PeerID)
if networkdata.Type != nil {
d.Set(Attr_Type, networkdata.Type)
}
Expand Down
109 changes: 109 additions & 0 deletions ibm/service/power/data_source_ibm_pi_network_peers.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
// Copyright IBM Corp. 2024 All Rights Reserved.
// Licensed under the Mozilla Public License v2.0

package power

import (
"context"

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

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

func DataSourceIBMPINetworkPeers() *schema.Resource {
return &schema.Resource{
ReadContext: dataSourceIBMPINetworkPeersRead,

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_NetworkPeers: {
Computed: true,
Description: "List of network peers.",
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
Attr_Description: {
Computed: true,
Description: "Description of the network peer.",
Type: schema.TypeString,
},
Attr_ID: {
Computed: true,
Description: "ID of the network peer.",
Type: schema.TypeString,
},
Attr_Name: {
Computed: true,
Description: "Name of the network peer.",
Type: schema.TypeString,
},
Attr_Type: {
Computed: true,
Description: "Type of the network peer.",
Type: schema.TypeString,
},
},
},
Type: schema.TypeList,
},
},
}
}

func dataSourceIBMPINetworkPeersRead(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)

networkC := instance.NewIBMPINetworkPeerClient(ctx, sess, cloudInstanceID)
networkdata, err := networkC.GetNetworkPeers()
if err != nil {
return diag.FromErr(err)
}
var clientgenU, _ = uuid.GenerateUUID()
d.SetId(clientgenU)

networkPeers := []map[string]interface{}{}
if networkdata.NetworkPeers != nil {
for _, np := range networkdata.NetworkPeers {
npMap := dataSourceIBMPINetworkPeersNetworkPeerToMap(np)

networkPeers = append(networkPeers, npMap)
}
}
d.Set(Attr_NetworkPeers, networkPeers)

return nil
}

func dataSourceIBMPINetworkPeersNetworkPeerToMap(np *models.NetworkPeer) map[string]interface{} {
npMap := make(map[string]interface{})
if np.Description != nil {
npMap[Attr_Description] = np.Description
}
if np.ID != nil {
npMap[Attr_ID] = np.ID
}
if np.Name != nil {
npMap[Attr_Name] = np.Name
}
if np.Type != nil {
npMap[Attr_Type] = np.Type
}
return npMap
}
37 changes: 37 additions & 0 deletions ibm/service/power/data_source_ibm_pi_network_peers_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
// 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 TestAccIBMPINetworkPeersDataSourceBasic(t *testing.T) {
networksResData := "data.ibm_pi_network_peers.network_peers"
resource.Test(t, resource.TestCase{
PreCheck: func() { acc.TestAccPreCheck(t) },
Providers: acc.TestAccProviders,
Steps: []resource.TestStep{
{
Config: testAccCheckIBMPINetworkPeersDataSourceConfigBasic(),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttrSet(networksResData, "id"),
resource.TestCheckResourceAttrSet(networksResData, "network_peers.#"),
),
},
},
})
}

func testAccCheckIBMPINetworkPeersDataSourceConfigBasic() string {
return fmt.Sprintf(`
data "ibm_pi_network_peers" "network_peers" {
pi_cloud_instance_id = "%s"
}`, acc.Pi_cloud_instance_id)
}
9 changes: 8 additions & 1 deletion ibm/service/power/data_source_ibm_pi_networks.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ func DataSourceIBMPINetworks() *schema.Resource {
Schema: map[string]*schema.Schema{
Attr_AccessConfig: {
Computed: true,
Description: "The network communication configuration option of the network (for satellite locations only).",
Deprecated: "This field is deprecated please use peer_id instead.",
Description: "The network communication configuration option of the network (for on-prem locations only). Use `peer_id` instead.",
Type: schema.TypeString,
},
Attr_CRN: {
Expand Down Expand Up @@ -70,6 +71,11 @@ func DataSourceIBMPINetworks() *schema.Resource {
Description: "The unique identifier of a network.",
Type: schema.TypeString,
},
Attr_PeerID: {
Computed: true,
Description: "Network Peer ID.",
Type: schema.TypeString,
},
Attr_Type: {
Computed: true,
Description: "The type of network.",
Expand Down Expand Up @@ -126,6 +132,7 @@ func flattenNetworks(list []*models.NetworkReference, meta interface{}) []map[st
Attr_MTU: i.Mtu,
Attr_Name: *i.Name,
Attr_NetworkID: *i.NetworkID,
Attr_PeerID: i.PeerID,
Attr_Type: *i.Type,
Attr_VLanID: *i.VlanID,
}
Expand Down
Loading

0 comments on commit f5b17b2

Please sign in to comment.