Skip to content

CXF 116818: Fix Acceptance Tests #962

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

Draft
d-bhola wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

CXF 116818: Fix Acceptance Tests #962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
75e7362
CXF-116818: Fix acceptance tests
d-bhola Oct 2, 2025
e643793
CXF-116818:Fix tests
d-bhola Oct 6, 2025
a3f3aa6
CXF-116818: Fix vlan tag errors
d-bhola Oct 6, 2025
e2f9cb6
CXF-116818: Add equinix asn in test
d-bhola Oct 6, 2025
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
6 changes: 0 additions & 6 deletions equinix/resource_fabric_routing_protocol.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,12 +484,6 @@ func routingProtocolPayloadFromType(type_ string, d *schema.ResourceData) (fabri
bgpRP.SetCustomerAsn(customerASN)
}

equinixASNSchema := d.Get("equinix_asn")
if equinixASNSchema != nil {
equinixASN := int64(equinixASNSchema.(int))
bgpRP.SetEquinixAsn(equinixASN)
}

bgpAuthKey := d.Get("bgp_auth_key").(string)
if bgpAuthKey != "" {
bgpRP.SetBgpAuthKey(bgpAuthKey)
Expand Down
4 changes: 3 additions & 1 deletion equinix/resource_fabric_routing_protocol_acc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ func TestAccFabricCreateRoutingProtocols_PFCR(t *testing.T) {
resource.TestCheckResourceAttr("equinix_fabric_routing_protocol.bgp", "bgp_ipv6.0.inbound_med", "4"),
resource.TestCheckResourceAttr("equinix_fabric_routing_protocol.bgp", "bgp_ipv6.0.outbound_med", "7"),
resource.TestCheckResourceAttr("equinix_fabric_routing_protocol.bgp", "customer_asn", "100"),
resource.TestCheckResourceAttrSet("equinix_fabric_routing_protocol.bgp", "equinix_asn"),

resource.TestCheckResourceAttrSet("data.equinix_fabric_routing_protocol.direct", "id"),
resource.TestCheckResourceAttr("data.equinix_fabric_routing_protocol.direct", "type", "DIRECT"),
Expand All @@ -85,6 +86,7 @@ func TestAccFabricCreateRoutingProtocols_PFCR(t *testing.T) {
resource.TestCheckResourceAttr("data.equinix_fabric_routing_protocol.bgp", "bgp_ipv6.0.equinix_peer_ip", "190::1:1"),
resource.TestCheckResourceAttr("data.equinix_fabric_routing_protocol.bgp", "bgp_ipv6.0.enabled", "true"),
resource.TestCheckResourceAttr("data.equinix_fabric_routing_protocol.bgp", "customer_asn", "100"),
resource.TestCheckResourceAttrSet("data.equinix_fabric_routing_protocol.bgp", "equinix_asn"),
),
},
},
Expand Down Expand Up @@ -153,7 +155,7 @@ resource "equinix_fabric_connection" "this" {
}
link_protocol {
type= "DOT1Q"
vlan_tag= 1501
vlan_tag= 1600
}
location {
metro_code = "SV"
Expand Down
12 changes: 6 additions & 6 deletions internal/resources/fabric/connection/datasources_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ 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", "1350"),
"data.equinix_fabric_connection.test", "a_side.0.access_point.0.link_protocol.0.vlan_tag", "123"),
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", "1360"),
"data.equinix_fabric_connection.test", "z_side.0.access_point.0.link_protocol.0.vlan_tag", "456"),
resource.TestCheckResourceAttr(
"data.equinix_fabric_connection.test", "z_side.0.access_point.0.location.0.metro_code", "SV"),
resource.TestCheckResourceAttrSet("data.equinix_fabric_connections.connections", "id"),
Expand All @@ -67,15 +67,15 @@ func TestAccFabricDataSourceConnection_PFCR(t *testing.T) {
resource.TestCheckResourceAttr(
"data.equinix_fabric_connections.connections", "data.0.a_side.0.access_point.0.link_protocol.0.type", "DOT1Q"),
resource.TestCheckResourceAttr(
"data.equinix_fabric_connections.connections", "data.0.a_side.0.access_point.0.link_protocol.0.vlan_tag", "1350"),
"data.equinix_fabric_connections.connections", "data.0.a_side.0.access_point.0.link_protocol.0.vlan_tag", "123"),
resource.TestCheckResourceAttr(
"data.equinix_fabric_connections.connections", "data.0.a_side.0.access_point.0.location.0.metro_code", "DC"),
resource.TestCheckResourceAttr(
"data.equinix_fabric_connections.connections", "data.0.z_side.0.access_point.0.type", "COLO"),
resource.TestCheckResourceAttr(
"data.equinix_fabric_connections.connections", "data.0.z_side.0.access_point.0.link_protocol.0.type", "DOT1Q"),
resource.TestCheckResourceAttr(
"data.equinix_fabric_connections.connections", "data.0.z_side.0.access_point.0.link_protocol.0.vlan_tag", "1360"),
"data.equinix_fabric_connections.connections", "data.0.z_side.0.access_point.0.link_protocol.0.vlan_tag", "456"),
resource.TestCheckResourceAttr(
"data.equinix_fabric_connections.connections", "data.0.z_side.0.access_point.0.location.0.metro_code", "SV"),
),
Expand Down Expand Up @@ -107,7 +107,7 @@ resource "equinix_fabric_connection" "test" {
}
link_protocol {
type= "DOT1Q"
vlan_tag= 1350
vlan_tag= 123
}
}
}
Expand All @@ -119,7 +119,7 @@ resource "equinix_fabric_connection" "test" {
}
link_protocol {
type= "DOT1Q"
vlan_tag= 1360
vlan_tag= 456
}
}
}
Expand Down
14 changes: 7 additions & 7 deletions internal/resources/fabric/connection/resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ func TestAccFabricCreatePort2SPConnection_PFCR(t *testing.T) {
CheckDestroy: CheckConnectionDelete,
Steps: []resource.TestStep{
{
Config: testAccFabricCreatePort2SPConnectionConfig(publicSPName, "port2sp_PFCR", portUUID, "SV"),
Config: testAccFabricCreatePort2SPConnectionConfig(publicSPName, "port2sp_PFCR", portUUID, "DC"),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttrSet("equinix_fabric_connection.test", "id"),
resource.TestCheckResourceAttr(
Expand All @@ -96,15 +96,15 @@ func TestAccFabricCreatePort2SPConnection_PFCR(t *testing.T) {
resource.TestCheckResourceAttr(
"equinix_fabric_connection.test", "a_side.0.access_point.0.link_protocol.0.type", "DOT1Q"),
resource.TestCheckResourceAttr(
"equinix_fabric_connection.test", "a_side.0.access_point.0.link_protocol.0.vlan_tag", "1500"),
"equinix_fabric_connection.test", "a_side.0.access_point.0.link_protocol.0.vlan_tag", "1230"),
resource.TestCheckResourceAttr(
"equinix_fabric_connection.test", "z_side.0.access_point.0.type", "SP"),
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", publicSPName),
resource.TestCheckResourceAttr(
"equinix_fabric_connection.test", "z_side.0.access_point.0.location.0.metro_code", "SV"),
"equinix_fabric_connection.test", "z_side.0.access_point.0.location.0.metro_code", "DC"),
),
ExpectNonEmptyPlan: true,
},
Expand Down Expand Up @@ -145,7 +145,7 @@ func testAccFabricCreatePort2SPConnectionConfig(spName, name, portUUID, zSideMet
}
link_protocol {
type= "DOT1Q"
vlan_tag= "1500"
vlan_tag= "1230"
}
}
}
Expand Down Expand Up @@ -314,7 +314,7 @@ func TestAccFabricCreateCloudRouter2PortConnection_PFCR(t *testing.T) {
resource.TestCheckResourceAttr(
"equinix_fabric_connection.test", "z_side.0.access_point.0.link_protocol.0.type", "DOT1Q"),
resource.TestCheckResourceAttr(
"equinix_fabric_connection.test", "z_side.0.access_point.0.link_protocol.0.vlan_tag", "1270"),
"equinix_fabric_connection.test", "z_side.0.access_point.0.link_protocol.0.vlan_tag", "101"),
),
ExpectNonEmptyPlan: true,
},
Expand Down Expand Up @@ -385,7 +385,7 @@ func testAccFabricCreateCloudRouter2PortConnectionConfig(name, portUUID string)
}
link_protocol {
type= "DOT1Q"
vlan_tag= 1270
vlan_tag= 101
}
location {
metro_code = "SV"
Expand Down Expand Up @@ -610,7 +610,7 @@ func CheckConnectionDelete(s *terraform.State) error {

err := connection.WaitUntilConnectionDeprovisioned(rs.Primary.ID, acceptance.TestAccProvider.Meta(), &schema.ResourceData{}, ctx, 10*time.Minute)
if err != nil {
return fmt.Errorf("API call failed while waiting for resource deletion")
return fmt.Errorf("connection %s was not properly deprovisioned: %v", rs.Primary.ID, err)
}
}
return nil
Expand Down
5 changes: 3 additions & 2 deletions internal/resources/fabric/connection_route_filter/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

func Resource() *schema.Resource {

Check failure on line 19 in internal/resources/fabric/connection_route_filter/resource.go

View workflow job for this annotation

GitHub Actions / lint 

exported: exported function Resource should have comment or be unexported (revive)
return &schema.Resource{
Timeouts: &schema.ResourceTimeout{
Create: schema.DefaultTimeout(10 * time.Minute),
Expand All @@ -42,7 +42,7 @@

func resourceRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
client := meta.(*config.Config).NewFabricClientForSDK(ctx, d)
connectionId := d.Get("connection_id").(string)

Check failure on line 45 in internal/resources/fabric/connection_route_filter/resource.go

View workflow job for this annotation

GitHub Actions / lint 

var-naming: var connectionId should be connectionID (revive)
connectionRouteFilter, _, err := client.RouteFiltersApi.GetConnectionRouteFilterByUuid(ctx, d.Id(), connectionId).Execute()
if err != nil {
log.Printf("[WARN] Route Filter Policy %s not found on Connection %s, error %s", d.Id(), connectionId, err)
Expand All @@ -57,8 +57,8 @@

func resourceCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
client := meta.(*config.Config).NewFabricClientForSDK(ctx, d)
connectionId := d.Get("connection_id").(string)

Check failure on line 60 in internal/resources/fabric/connection_route_filter/resource.go

View workflow job for this annotation

GitHub Actions / lint 

var-naming: var connectionId should be connectionID (revive)
routeFilterId := d.Get("route_filter_id").(string)

Check failure on line 61 in internal/resources/fabric/connection_route_filter/resource.go

View workflow job for this annotation

GitHub Actions / lint 

var-naming: var routeFilterId should be routeFilterID (revive)
direction := d.Get("direction").(string)

start := time.Now()
Expand Down Expand Up @@ -88,8 +88,8 @@

func resourceUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
client := meta.(*config.Config).NewFabricClientForSDK(ctx, d)
connectionId := d.Get("connection_id").(string)

Check failure on line 91 in internal/resources/fabric/connection_route_filter/resource.go

View workflow job for this annotation

GitHub Actions / lint 

var-naming: var connectionId should be connectionID (revive)
routeFilterId := d.Get("route_filter_id").(string)

Check failure on line 92 in internal/resources/fabric/connection_route_filter/resource.go

View workflow job for this annotation

GitHub Actions / lint 

var-naming: var routeFilterId should be routeFilterID (revive)
oldDirection, newDirection := d.GetChange("direction")
if oldDirection.(string) == newDirection.(string) {
return diag.Diagnostics{}
Expand Down Expand Up @@ -118,7 +118,7 @@
func resourceDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
diags := diag.Diagnostics{}
client := meta.(*config.Config).NewFabricClientForSDK(ctx, d)
connectionId := d.Get("connection_id").(string)

Check failure on line 121 in internal/resources/fabric/connection_route_filter/resource.go

View workflow job for this annotation

GitHub Actions / lint 

var-naming: var connectionId should be connectionID (revive)

start := time.Now()
_, _, err := client.RouteFiltersApi.DetachConnectionRouteFilter(ctx, d.Id(), connectionId).Execute()
Expand All @@ -141,7 +141,7 @@
return diags
}

func waitForStability(connectionId, routeFilterId string, meta interface{}, d *schema.ResourceData, ctx context.Context, timeout time.Duration) error {

Check failure on line 144 in internal/resources/fabric/connection_route_filter/resource.go

View workflow job for this annotation

GitHub Actions / lint 

var-naming: func parameter connectionId should be connectionID (revive)
log.Printf("Waiting for route filter policy (%x) attachment to connection (%s) to be stable", connectionId, routeFilterId)
stateConf := &retry.StateChangeConf{
Pending: []string{
Expand Down Expand Up @@ -169,7 +169,7 @@
return err
}

func WaitForDeletion(connectionId, routeFilterId string, meta interface{}, d *schema.ResourceData, ctx context.Context, timeout time.Duration) error {

Check failure on line 172 in internal/resources/fabric/connection_route_filter/resource.go

View workflow job for this annotation

GitHub Actions / lint 

exported: exported function WaitForDeletion should have comment or be unexported (revive)
log.Printf("Waiting for route filter policy (%s) to be detached from connection (%s)", routeFilterId, connectionId)
stateConf := &retry.StateChangeConf{
Pending: []string{
Expand All @@ -179,13 +179,14 @@
},
Target: []string{
string(fabricv4.CONNECTIONROUTEAGGREGATIONDATAATTACHMENTSTATUS_DETACHED),
string(fabricv4.ROUTEFILTERSTATE_DEPROVISIONED),
},
Refresh: func() (interface{}, string, error) {
client := meta.(*config.Config).NewFabricClientForSDK(ctx, d)
connectionRouteFilter, body, err := client.RouteFiltersApi.GetConnectionRouteFilterByUuid(ctx, routeFilterId, connectionId).Execute()
if err != nil {
if body.StatusCode >= 400 && body.StatusCode <= 499 {
// Already deleted resource
if body != nil && body.StatusCode >= 400 && body.StatusCode <= 499 {
// Already deleted resource - return DEPROVISIONED state
return connectionRouteFilter, string(fabricv4.ROUTEFILTERSTATE_DEPROVISIONED), nil
}
return "", "", equinix_errors.FormatFabricError(err)
Expand Down
2 changes: 1 addition & 1 deletion internal/resources/fabric/connection_route_filter/resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ func testAccFabricConnectionRouteFilterConfig(portUUID string) string {
}
link_protocol {
type= "DOT1Q"
vlan_tag= 2100
vlan_tag= 1000
}
location {
metro_code = "DC"
Expand Down
4 changes: 2 additions & 2 deletions internal/resources/fabric/precision_time/resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ func testAccFabricCreatePort2EPTNPTConfig(spName, name, portUuid, zSideMetro str
}
link_protocol {
type= "DOT1Q"
vlan_tag= 1700
vlan_tag= 101
}
}
}
Expand Down Expand Up @@ -246,7 +246,7 @@ func testAccFabricCreatePort2EPTPTPConfig(spName, name, portUuid, zSideMetro str
}
link_protocol {
type= "DOT1Q"
vlan_tag= "1355"
vlan_tag= "100"
}
}
}
Expand Down
Loading