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

test: add acceptance tests for fabric connection resource/data_source and update port data_source tests #547

Merged
merged 5 commits into from
Jan 31, 2024
Merged

test: add acceptance tests for fabric connection resource/data_source and update port data_source tests #547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4c407bb
Add acceptance tests for ports and connection
thogarty Jan 30, 2024
77dbeee
Add more attr checks and connection vd2network test
thogarty Jan 30, 2024
8642f77
Finish full testing for acceptance tests
thogarty Jan 31, 2024
ac4ddbf
Only run tests when ENV returns valid data
thogarty Jan 31, 2024
a724c52
Fix Go Tests failure by allowing acceptance tests to be skipped when …
thogarty 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
4 changes: 4 additions & 0 deletions .github/workflows/fabric_acctest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,8 @@ jobs:
env:
TF_ACC: "1"
TF_ACC_TERRAFORM_VERSION: ${{ matrix.terraform }}
TF_ACC_FABRIC_CONNECTIONS_TEST_DATA: ${{ secrets.TF_ACC_FABRIC_CONNECTIONS_TEST_DATA }}
TF_ACC_FABRIC_DEDICATED_PORTS: ${{ secrets.TF_ACC_FABRIC_DEDICATED_PORTS }}
EQUINIX_API_CLIENTID: ${{ secrets.EQUINIX_API_CLIENTID_PNFV }}
EQUINIX_API_CLIENTSECRET: ${{ secrets.EQUINIX_API_CLIENTSECRET_PNFV }}
METAL_AUTH_TOKEN: ${{ secrets.METAL_AUTH_TOKEN }}
Expand Down Expand Up @@ -166,6 +168,8 @@ jobs:
env:
TF_ACC: "1"
TF_ACC_TERRAFORM_VERSION: ${{ matrix.terraform }}
TF_ACC_FABRIC_CONNECTIONS_TEST_DATA: ${{ secrets.TF_ACC_FABRIC_CONNECTIONS_TEST_DATA }}
TF_ACC_FABRIC_DEDICATED_PORTS: ${{ secrets.TF_ACC_FABRIC_DEDICATED_PORTS }}
EQUINIX_API_CLIENTID: ${{ secrets.EQUINIX_API_CLIENTID_PFCR }}
EQUINIX_API_CLIENTSECRET: ${{ secrets.EQUINIX_API_CLIENTSECRET_PFCR }}
METAL_AUTH_TOKEN: ${{ secrets.METAL_AUTH_TOKEN }}
Expand Down
102 changes: 102 additions & 0 deletions equinix/data_source_fabric_connection_acc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
package equinix_test

import (
"fmt"
"github.com/equinix/terraform-provider-equinix/internal/acceptance"
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
"testing"
)

func TestAccFabricDataSourceConnection_PFCR(t *testing.T) {
ports := GetFabricEnvPorts(t)
var aSidePortUuid, zSidePortUuid string
if len(ports) > 0 {
aSidePortUuid = ports["pfcr"]["dot1q"][0].Uuid
zSidePortUuid = ports["pfcr"]["dot1q"][1].Uuid
}
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acceptance.TestAccPreCheck(t) },
Providers: acceptance.TestAccProviders,
CheckDestroy: CheckConnectionDelete,
Steps: []resource.TestStep{
{
Config: testAccFabricDataSourceConnectionConfig(50, aSidePortUuid, zSidePortUuid),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttrSet("data.equinix_fabric_connection.test", "id"),
resource.TestCheckResourceAttr(
"data.equinix_fabric_connection.test", "name", "ds_con_test_PFCR"),
resource.TestCheckResourceAttr(
"data.equinix_fabric_connection.test", "bandwidth", "50"),
resource.TestCheckResourceAttr(
"data.equinix_fabric_connection.test", "type", "EVPL_VC"),
resource.TestCheckResourceAttr(
"data.equinix_fabric_connection.test", "redundancy.0.priority", "PRIMARY"),
resource.TestCheckResourceAttr(
"data.equinix_fabric_connection.test", "order.0.purchase_order_number", "1-129105284100"),
resource.TestCheckResourceAttr(
"data.equinix_fabric_connection.test", "a_side.0.access_point.0.type", "COLO"),
resource.TestCheckResourceAttr(
"data.equinix_fabric_connection.test", "a_side.0.access_point.0.link_protocol.0.type", "DOT1Q"),
resource.TestCheckResourceAttr(
"data.equinix_fabric_connection.test", "a_side.0.access_point.0.link_protocol.0.vlan_tag", "2444"),
resource.TestCheckResourceAttr(
"data.equinix_fabric_connection.test", "a_side.0.access_point.0.location.0.metro_code", "DC"),
resource.TestCheckResourceAttr(
"data.equinix_fabric_connection.test", "z_side.0.access_point.0.type", "COLO"),
resource.TestCheckResourceAttr(
"data.equinix_fabric_connection.test", "z_side.0.access_point.0.link_protocol.0.type", "DOT1Q"),
resource.TestCheckResourceAttr(
"data.equinix_fabric_connection.test", "z_side.0.access_point.0.link_protocol.0.vlan_tag", "2555"),
resource.TestCheckResourceAttr(
"data.equinix_fabric_connection.test", "z_side.0.access_point.0.location.0.metro_code", "SV"),
),
ExpectNonEmptyPlan: true,
},
},
})
}

func testAccFabricDataSourceConnectionConfig(bandwidth int32, aSidePortUuid, zSidePortUuid string) string {
return fmt.Sprintf(`

resource "equinix_fabric_connection" "test" {
type = "EVPL_VC"
name = "ds_con_test_PFCR"
notifications{
type = "ALL"
emails = ["[email protected]","[email protected]"]
}
order {
purchase_order_number = "1-129105284100"
}
bandwidth = %d
a_side {
access_point {
type = "COLO"
port {
uuid = "%s"
}
link_protocol {
type= "DOT1Q"
vlan_tag= 2444
}
}
}
z_side {
access_point {
type = "COLO"
port {
uuid = "%s"
}
link_protocol {
type= "DOT1Q"
vlan_tag= 2555
}
}
}
}

data "equinix_fabric_connection" "test" {
uuid = equinix_fabric_connection.test.id
}`, bandwidth, aSidePortUuid, zSidePortUuid)
}
78 changes: 72 additions & 6 deletions equinix/data_source_fabric_port_acc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,68 @@
package equinix_test

import (
"encoding/json"
"fmt"
v4 "github.com/equinix-labs/fabric-go/fabric/v4"
"os"
"testing"

"github.com/equinix/terraform-provider-equinix/internal/acceptance"
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
)

const (
FabricDedicatedPortEnvVar = "TF_ACC_FABRIC_DEDICATED_PORTS"
)

type EnvPorts map[string]map[string][]v4.Port

func GetFabricEnvPorts(t *testing.T) EnvPorts {
var ports EnvPorts
portJson := os.Getenv(FabricDedicatedPortEnvVar)
if err := json.Unmarshal([]byte(portJson), &ports); portJson != "" && err != nil {
t.Fatalf("Failed reading port data from environment: %v, %s", err, portJson)
}
return ports
}

func TestAccDataSourceFabricPort_PNFV(t *testing.T) {
ports := GetFabricEnvPorts(t)
var port v4.Port
var portType, portState, portEncapsulationType, portRedundancyPriority string
if len(ports) > 0 {
port = ports["pnfv"]["dot1q"][0]
portType = string(*port.Type_)
portState = string(*port.State)
portEncapsulationType = port.Encapsulation.Type_
portRedundancyPriority = string(*port.Redundancy.Priority)
}
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acceptance.TestAccPreCheck(t) },
ExternalProviders: acceptance.TestExternalProviders,
Providers: acceptance.TestAccProviders,
Steps: []resource.TestStep{
{
Config: testDataSourceFabricPort("c4d85dbe-fa99-a999-f7e0-306a5c00af26"),
Config: testDataSourceFabricPort(port.Uuid),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr(
"data.equinix_fabric_port.test", "name", "eqx-nfv-201091-CX-SV1-L-Dot1q-BO-20G-PRI-JP-395"),
"data.equinix_fabric_port.test", "id", port.Uuid),
resource.TestCheckResourceAttr(
"data.equinix_fabric_port.test", "name", port.Name),
resource.TestCheckResourceAttrSet(
"data.equinix_fabric_port.test", "bandwidth"),
resource.TestCheckResourceAttrSet(
"data.equinix_fabric_port.test", "used_bandwidth"),
resource.TestCheckResourceAttr(
"data.equinix_fabric_port.test", "type", portType),
resource.TestCheckResourceAttr(
"data.equinix_fabric_port.test", "type", "XF_PORT"),
"data.equinix_fabric_port.test", "encapsulation.0.type", portEncapsulationType),
resource.TestCheckResourceAttr(
"data.equinix_fabric_port.test", "state", portState),
resource.TestCheckResourceAttr(
"data.equinix_fabric_port.test", "redundancy.0.priority", portRedundancyPriority),
resource.TestCheckResourceAttrSet(
"data.equinix_fabric_port.test", "lag_enabled"),
),
},
},
Expand All @@ -36,18 +78,42 @@ func testDataSourceFabricPort(port_uuid string) string {
}

func TestAccDataSourceFabricPorts_PNFV(t *testing.T) {
ports := GetFabricEnvPorts(t)
var port v4.Port
var portType, portState, portEncapsulationType, portRedundancyPriority string
if len(ports) > 0 {
port = ports["pnfv"]["dot1q"][0]
portType = string(*port.Type_)
portState = string(*port.State)
portEncapsulationType = port.Encapsulation.Type_
portRedundancyPriority = string(*port.Redundancy.Priority)
}
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acceptance.TestAccPreCheck(t) },
ExternalProviders: acceptance.TestExternalProviders,
Providers: acceptance.TestAccProviders,
Steps: []resource.TestStep{
{
Config: testDataSourceFabricPorts("eqx-nfv-201091-CX-SV1-L-Dot1q-BO-20G-PRI-JP-395"),
Config: testDataSourceFabricPorts(port.Name),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr(
"data.equinix_fabric_ports.test", "id", "c4d85dbe-fa99-a999-f7e0-306a5c00af26"),
"data.equinix_fabric_ports.test", "id", port.Uuid),
resource.TestCheckResourceAttr(
"data.equinix_fabric_ports.test", "data.0.name", port.Name),
resource.TestCheckResourceAttrSet(
"data.equinix_fabric_ports.test", "data.0.bandwidth"),
resource.TestCheckResourceAttrSet(
"data.equinix_fabric_ports.test", "data.0.used_bandwidth"),
resource.TestCheckResourceAttr(
"data.equinix_fabric_ports.test", "data.0.type", portType),
resource.TestCheckResourceAttr(
"data.equinix_fabric_ports.test", "data.0.state", portState),
resource.TestCheckResourceAttr(
"data.equinix_fabric_ports.test", "data.0.encapsulation.0.type", portEncapsulationType),
resource.TestCheckResourceAttr(
"data.equinix_fabric_ports.test", "data.0.type", "XF_PORT"),
"data.equinix_fabric_ports.test", "data.0.redundancy.0.priority", portRedundancyPriority),
resource.TestCheckResourceAttrSet(
"data.equinix_fabric_ports.test", "data.0.lag_enabled"),
),
},
},
Expand Down
4 changes: 2 additions & 2 deletions equinix/resource_fabric_connection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,14 +394,14 @@ func resourceFabricConnectionDelete(ctx context.Context, d *schema.ResourceData,
return diag.FromErr(equinix_errors.FormatFabricError(err))
}

err = waitUntilConnectionDeprovisioned(d.Id(), meta, ctx)
err = WaitUntilConnectionDeprovisioned(d.Id(), meta, ctx)
if err != nil {
return diag.FromErr(fmt.Errorf("API call failed while waiting for resource deletion. Error %v", err))
}
return diags
}

func waitUntilConnectionDeprovisioned(uuid string, meta interface{}, ctx context.Context) error {
func WaitUntilConnectionDeprovisioned(uuid string, meta interface{}, ctx context.Context) error {
log.Printf("Waiting for connection to be deprovisioned, uuid %s", uuid)
stateConf := &retry.StateChangeConf{
Pending: []string{
Expand Down
Loading
Loading