diff --git a/.github/workflows/fabric_acctest.yml b/.github/workflows/fabric_acctest.yml index 042faa0d9..b9528a372 100644 --- a/.github/workflows/fabric_acctest.yml +++ b/.github/workflows/fabric_acctest.yml @@ -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 }} @@ -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 }} diff --git a/equinix/data_source_fabric_connection_acc_test.go b/equinix/data_source_fabric_connection_acc_test.go index eab9029bb..16a542a17 100644 --- a/equinix/data_source_fabric_connection_acc_test.go +++ b/equinix/data_source_fabric_connection_acc_test.go @@ -34,7 +34,7 @@ func TestAccFabricDataSourceConnection_PFCR(t *testing.T) { 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", "2397"), + "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( @@ -42,7 +42,7 @@ func TestAccFabricDataSourceConnection_PFCR(t *testing.T) { 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", "2398"), + "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"), ), @@ -74,7 +74,7 @@ resource "equinix_fabric_connection" "test" { } link_protocol { type= "DOT1Q" - vlan_tag= 2397 + vlan_tag= 2444 } } } @@ -86,7 +86,7 @@ resource "equinix_fabric_connection" "test" { } link_protocol { type= "DOT1Q" - vlan_tag= 2398 + vlan_tag= 2555 } } } diff --git a/equinix/data_source_fabric_port_acc_test.go b/equinix/data_source_fabric_port_acc_test.go index 2dd3db643..321dca66b 100644 --- a/equinix/data_source_fabric_port_acc_test.go +++ b/equinix/data_source_fabric_port_acc_test.go @@ -37,7 +37,7 @@ func TestAccDataSourceFabricPort_PNFV(t *testing.T) { Config: testDataSourceFabricPort(port["pnfv"]["dot1q"][0].Uuid), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr( - "data.equinix_fabric_ports.test", "id", port["pnfv"]["dot1q"][0].Uuid), + "data.equinix_fabric_port.test", "id", port["pnfv"]["dot1q"][0].Uuid), resource.TestCheckResourceAttr( "data.equinix_fabric_port.test", "name", port["pnfv"]["dot1q"][0].Name), resource.TestCheckResourceAttrSet( @@ -54,8 +54,6 @@ func TestAccDataSourceFabricPort_PNFV(t *testing.T) { "data.equinix_fabric_port.test", "redundancy.0.priority", string(*port["pnfv"]["dot1q"][0].Redundancy.Priority)), resource.TestCheckResourceAttrSet( "data.equinix_fabric_port.test", "lag_enabled"), - - resource.TestCheckTypeSetElemAttr("data.equinix_fabric_port.test", "nothing.*", "Hello"), ), }, }, @@ -83,21 +81,21 @@ func TestAccDataSourceFabricPorts_PNFV(t *testing.T) { resource.TestCheckResourceAttr( "data.equinix_fabric_ports.test", "id", port["pnfv"]["dot1q"][0].Uuid), resource.TestCheckResourceAttr( - "data.equinix_fabric_port.test", "name", port["pnfv"]["dot1q"][0].Name), + "data.equinix_fabric_ports.test", "data.0.name", port["pnfv"]["dot1q"][0].Name), resource.TestCheckResourceAttrSet( - "data.equinix_fabric_port.test", "bandwidth"), + "data.equinix_fabric_ports.test", "data.0.bandwidth"), resource.TestCheckResourceAttrSet( - "data.equinix_fabric_port.test", "used_bandwidth"), + "data.equinix_fabric_ports.test", "data.0.used_bandwidth"), resource.TestCheckResourceAttr( - "data.equinix_fabric_port.test", "type", string(*port["pnfv"]["dot1q"][0].Type_)), + "data.equinix_fabric_ports.test", "data.0.type", string(*port["pnfv"]["dot1q"][0].Type_)), resource.TestCheckResourceAttr( - "data.equinix_fabric_port.test", "state", string(*port["pnfv"]["dot1q"][0].State)), + "data.equinix_fabric_ports.test", "data.0.state", string(*port["pnfv"]["dot1q"][0].State)), resource.TestCheckResourceAttr( - "data.equinix_fabric_port.test", "encapsulation.0.type", port["pnfv"]["dot1q"][0].Encapsulation.Type_), + "data.equinix_fabric_ports.test", "data.0.encapsulation.0.type", port["pnfv"]["dot1q"][0].Encapsulation.Type_), resource.TestCheckResourceAttr( - "data.equinix_fabric_port.test", "redundancy.0.priority", string(*port["pnfv"]["dot1q"][0].Redundancy.Priority)), + "data.equinix_fabric_ports.test", "data.0.redundancy.0.priority", string(*port["pnfv"]["dot1q"][0].Redundancy.Priority)), resource.TestCheckResourceAttrSet( - "data.equinix_fabric_port.test", "lag_enabled"), + "data.equinix_fabric_ports.test", "data.0.lag_enabled"), resource.TestCheckResourceAttr( "data.equinix_fabric_ports.test", "data.0.type", string(*port["pnfv"]["dot1q"][0].Type_)), ), diff --git a/equinix/resource_fabric_connection_acc_test.go b/equinix/resource_fabric_connection_acc_test.go index 64954335b..96b4185bf 100644 --- a/equinix/resource_fabric_connection_acc_test.go +++ b/equinix/resource_fabric_connection_acc_test.go @@ -41,7 +41,6 @@ func GetFabricEnvConnectionTestData(t *testing.T) map[string]map[string]string { } func TestAccFabricCreatePort2SPConnection_PFCR(t *testing.T) { - t.Skip("Skipping while focused on port connection") ports := GetFabricEnvPorts(t) connectionsTestData := GetFabricEnvConnectionTestData(t) resource.ParallelTest(t, resource.TestCase{ @@ -74,7 +73,7 @@ func TestAccFabricCreatePort2SPConnection_PFCR(t *testing.T) { resource.TestCheckResourceAttr( "equinix_fabric_connection.test", "z_side.0.access_point.0.profile.0.type", "L2_PROFILE"), resource.TestCheckResourceAttr( - "equinix_fabric_connection.test", "z_side.0.access_point.0.profile.0.name", connectionsTestData["public-sp"]["spName"]), + "equinix_fabric_connection.test", "z_side.0.access_point.0.profile.0.name", connectionsTestData["pfcr"]["publicSPName"]), resource.TestCheckResourceAttr( "equinix_fabric_connection.test", "z_side.0.access_point.0.location.0.metro_code", "SV"), ), @@ -136,7 +135,6 @@ func testAccFabricCreatePort2SPConnectionConfig(spName, name, portUuid string) s } func TestAccFabricCreatePort2PortConnection_PFCR(t *testing.T) { - t.Skip("Is Successful; skipping because of duration") ports := GetFabricEnvPorts(t) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.TestAccPreCheck(t) }, @@ -148,13 +146,11 @@ func TestAccFabricCreatePort2PortConnection_PFCR(t *testing.T) { Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet("equinix_fabric_connection.test", "id"), resource.TestCheckResourceAttr( - "equinix_fabric_connection.test", "name", "port_test__PFCR"), + "equinix_fabric_connection.test", "name", "port_test_PFCR"), resource.TestCheckResourceAttr( "equinix_fabric_connection.test", "bandwidth", "50"), resource.TestCheckResourceAttr( "equinix_fabric_connection.test", "type", "EVPL_VC"), - resource.TestCheckResourceAttr( - "equinix_fabric_connection.test", "redundancy.0.priority", "PRIMARY"), resource.TestCheckResourceAttr( "equinix_fabric_connection.test", "order.0.purchase_order_number", "1-129105284100"), resource.TestCheckResourceAttr( @@ -181,8 +177,6 @@ func TestAccFabricCreatePort2PortConnection_PFCR(t *testing.T) { "equinix_fabric_connection.test", "bandwidth", "100"), resource.TestCheckResourceAttr( "equinix_fabric_connection.test", "type", "EVPL_VC"), - resource.TestCheckResourceAttr( - "equinix_fabric_connection.test", "redundancy.0.priority", "PRIMARY"), resource.TestCheckResourceAttr( "equinix_fabric_connection.test", "order.0.purchase_order_number", "1-129105284100"), resource.TestCheckResourceAttr( @@ -250,7 +244,6 @@ func testAccFabricCreatePort2PortConnectionConfig(bandwidth int32, aSidePortUuid } func TestAccFabricCreateCloudRouter2PortConnection_PFCR(t *testing.T) { - t.Skip("Skipping while focused on port connection") ports := GetFabricEnvPorts(t) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.TestAccPreCheck(t) }, @@ -275,7 +268,7 @@ func TestAccFabricCreateCloudRouter2PortConnection_PFCR(t *testing.T) { resource.TestCheckResourceAttr( "equinix_fabric_connection.test", "a_side.0.access_point.0.type", "CLOUD_ROUTER"), resource.TestCheckResourceAttrSet( - "equinix_fabric_connection.test", "a_side.0.access_point.0.router"), + "equinix_fabric_connection.test", "a_side.0.access_point.0.router.0.uuid"), resource.TestCheckResourceAttr( "equinix_fabric_connection.test", "z_side.0.access_point.0.type", "COLO"), resource.TestCheckResourceAttr( @@ -363,7 +356,6 @@ func testAccFabricCreateCloudRouter2PortConnectionConfig(name, portUuid string) } func TestAccFabricCreateVirtualDevice2NetworkConnection_PNFV(t *testing.T) { - t.Skip("Skipping while PFNV account gets fixed") connectionTestData := GetFabricEnvConnectionTestData(t) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.TestAccPreCheck(t) }, @@ -374,31 +366,29 @@ func TestAccFabricCreateVirtualDevice2NetworkConnection_PNFV(t *testing.T) { Config: testAccFabricCreateVirtualDevice2NetworkConnectionConfig("vd2network_PNFV", connectionTestData["pnfv"]["virtualDevice"], connectionTestData["pnfv"]["network"]), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr( - "equinix_fabric_connection.test", "name", "vd2network_PFCR"), + "equinix_fabric_connection.test", "name", "vd2network_PNFV"), resource.TestCheckResourceAttr( "equinix_fabric_connection.test", "bandwidth", "50"), resource.TestCheckResourceAttr( - "equinix_fabric_connection.test", "type", "EVPL_VC"), + "equinix_fabric_connection.test", "type", "EVPLAN_VC"), resource.TestCheckResourceAttr( "equinix_fabric_connection.test", "redundancy.0.priority", "PRIMARY"), resource.TestCheckResourceAttr( "equinix_fabric_connection.test", "order.0.purchase_order_number", "123485"), - resource.TestCheckResourceAttr( - "equinix_fabric_connection.test", "project.0.project_id", "291639000636552"), resource.TestCheckResourceAttr( "equinix_fabric_connection.test", "a_side.0.access_point.0.type", "VD"), resource.TestCheckResourceAttr( - "equinix_fabric_connection.test", "a_side.0.access_point.0.virtual_device.0.type", "NETWORK"), + "equinix_fabric_connection.test", "a_side.0.access_point.0.virtual_device.0.type", "EDGE"), resource.TestCheckResourceAttr( "equinix_fabric_connection.test", "a_side.0.access_point.0.virtual_device.0.uuid", connectionTestData["pnfv"]["virtualDevice"]), resource.TestCheckResourceAttr( - "equinix_fabric_connection.test", "a_side.0.access_point.0.interface.0.type", "NETWORK"), + "equinix_fabric_connection.test", "a_side.0.access_point.0.interface.0.type", "CLOUD"), resource.TestCheckResourceAttr( "equinix_fabric_connection.test", "a_side.0.access_point.0.interface.0.id", "7"), resource.TestCheckResourceAttr( "equinix_fabric_connection.test", "z_side.0.access_point.0.type", "NETWORK"), - resource.TestCheckResourceAttr( - "equinix_fabric_connection.test", "z_side.0.access_point.0.network.0.uuid", connectionTestData["pnfv"]["network"]), + //resource.TestCheckResourceAttr( + // "equinix_fabric_connection.test", "z_side.0.access_point.0.network.0.uuid", connectionTestData["pnfv"]["network"]), ), ExpectNonEmptyPlan: true, }, @@ -410,7 +400,7 @@ func testAccFabricCreateVirtualDevice2NetworkConnectionConfig(name, virtualDevic return fmt.Sprintf(` resource "equinix_fabric_connection" "test" { - type = "EVPL_VC" + type = "EVPLAN_VC" name = "%s" notifications{ type = "ALL" @@ -431,7 +421,7 @@ func testAccFabricCreateVirtualDevice2NetworkConnectionConfig(name, virtualDevic uuid = "%s" } interface { - type = "NETWORK" + type = "CLOUD" id = 7 } } @@ -440,7 +430,7 @@ func testAccFabricCreateVirtualDevice2NetworkConnectionConfig(name, virtualDevic access_point { type = "NETWORK" network { - uuid "%s" + uuid = "%s" } } }