diff --git a/.github/workflows/test_runner.yml b/.github/workflows/test_runner.yml index 75dd8e79..ceabd447 100644 --- a/.github/workflows/test_runner.yml +++ b/.github/workflows/test_runner.yml @@ -24,14 +24,13 @@ jobs: - name: Tests shell: bash run: |- - cd equinix-openapi-fabric mvn clean test -DenvUrl=${{ env.TEST_HOST_URL }} - name: Generate report if: always() shell: bash run: |- - cd equinix-openapi-fabric + cd equinix-openapi-fabric-tests mvn surefire-report:report -DskipTests - name: attach report as attachment @@ -39,4 +38,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: test report - path: ./equinix-openapi-fabric/target/reports + path: ./equinix-openapi-fabric-tests/target/reports diff --git a/.gitignore b/.gitignore index 7c2c284c..e49868d2 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,5 @@ hs_err_pid* # JetBrains project directory files *.idea *.idea/ +equinix-openapi-fabric/target +equinix-openapi-fabric-tests/target diff --git a/equinix-openapi-fabric-tests/README.md b/equinix-openapi-fabric-tests/README.md index 9a3904a3..8c6a25a8 100644 --- a/equinix-openapi-fabric-tests/README.md +++ b/equinix-openapi-fabric-tests/README.md @@ -1,24 +1,5 @@ # equinix-openapi-fabric-tests -Equinix Fabric API v4 - -- API version: 4.15 - -Equinix Fabric is an advanced software-defined interconnection solution that enables you to directly, securely and -dynamically connect to distributed infrastructure and digital ecosystems on platform Equinix via a single port, -Customers can use Fabric to connect to:
1. Cloud Service Providers - Clouds, network and other service -providers.
2. Enterprises - Other Equinix customers, vendors and partners.
3. Myself - Another customer -instance deployed at Equinix.

Integrations (SDKs, Tools) links:
Fabric Java SDK
Fabric Go SDK
Equinix Terraform Provider
Fabric Terraform Modules
Equinix Pulumi Provider
- -For more information, please visit [https://equinix.com/about/](https://equinix.com/about/) - -*Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)* - ## Requirements Building the API client library requires: diff --git a/equinix-openapi-fabric-tests/equinix-openapi-fabric-tests.iml b/equinix-openapi-fabric-tests/equinix-openapi-fabric-tests.iml index 219cba0f..2feb230e 100644 --- a/equinix-openapi-fabric-tests/equinix-openapi-fabric-tests.iml +++ b/equinix-openapi-fabric-tests/equinix-openapi-fabric-tests.iml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/equinix-openapi-fabric-tests/pom.xml b/equinix-openapi-fabric-tests/pom.xml index 10068564..7e60afc1 100644 --- a/equinix-openapi-fabric-tests/pom.xml +++ b/equinix-openapi-fabric-tests/pom.xml @@ -1,9 +1,9 @@ 4.0.0 + com.equinix - equinix-openapi-fabric-tests - pom + openapi-fabric-tests equinix-openapi-fabric-tests 0.5.0 @@ -15,142 +15,23 @@ - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - true - 128m - 512m - - -Xlint:all - -J-Xss4m - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - 3.1.0 - - - enforce-maven - - enforce - - - - - 2.2.0 - - - - - - org.apache.maven.plugins maven-surefire-plugin 2.22.2 - - - - - - - - - - -Xms512m -Xmx1500m - methods - 10 + + MetrosApiTest.java + - - - - org.junit.jupiter - junit-jupiter-engine - ${junit-version} - - - - - com.google.code.findbugs - jsr305 - 3.0.2 - - - - - - - - com.squareup.okhttp3 - logging-interceptor - ${okhttp-version} - - - com.google.code.gson - gson - ${gson-version} - - - io.gsonfire - gson-fire - ${gson-fire-version} - - - org.apache.commons - commons-lang3 - ${commons-lang3-version} - - - jakarta.annotation - jakarta.annotation-api - ${jakarta-annotation-version} - provided - - - org.openapitools - jackson-databind-nullable - ${jackson-databind-nullable-version} - - - - javax.ws.rs - jsr311-api - ${jsr311-api-version} - - - javax.ws.rs - javax.ws.rs-api - ${javax.ws.rs-api-version} - - - - org.junit.jupiter - junit-jupiter-engine - ${junit-version} - test - - - org.junit.platform - junit-platform-runner - ${junit-platform-runner.version} - test - - org.mockito - mockito-core - ${mockito-core-version} - test + junit + junit + 4.13.2 com.equinix @@ -158,23 +39,4 @@ 0.5.0 - - 1.8 - ${java.version} - ${java.version} - 1.8.5 - 1.6.6 - 4.10.0 - 2.9.1 - 3.12.0 - 0.2.4 - 1.3.5 - 5.9.1 - 1.9.1 - 3.12.4 - 2.1.1 - 1.1.1 - UTF-8 - 2.27.2 - diff --git a/equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/CloudRoutersApiTest.java b/equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/CloudRoutersApiTest.java similarity index 94% rename from equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/CloudRoutersApiTest.java rename to equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/CloudRoutersApiTest.java index da119f03..38708a67 100644 --- a/equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/CloudRoutersApiTest.java +++ b/equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/CloudRoutersApiTest.java @@ -8,23 +8,22 @@ * Do not edit the class manually. */ -package com.equinix.openapi.fabric.v4.api; +package com.equinix.openapi.fabric.tests; import com.equinix.openapi.fabric.ApiException; - +import com.equinix.openapi.fabric.tests.dto.users.UsersItem; +import com.equinix.openapi.fabric.tests.helpers.Utils; import com.equinix.openapi.fabric.v4.model.*; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; -import com.equinix.openapi.fabric.v4.api.dto.users.UsersItem; -import com.equinix.openapi.fabric.v4.api.helpers.Utils; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; import java.util.UUID; +import static com.equinix.openapi.fabric.tests.helpers.Apis.*; +import static com.equinix.openapi.fabric.tests.helpers.TokenGenerator.users; import static java.util.Collections.singletonList; -import static org.junit.jupiter.api.Assertions.*; -import static com.equinix.openapi.fabric.v4.api.helpers.Apis.*; -import static com.equinix.openapi.fabric.v4.api.helpers.TokenGenerator.users; +import static org.junit.Assert.*; /** * API tests for CloudRoutersApi @@ -41,12 +40,12 @@ public static void removeCloudRouters(UsersItem.UserName userName) { }); } - @BeforeAll + @BeforeClass public static void setUp() { setUserName(userName); } - @AfterAll + @AfterClass public static void removeResources() { removeCloudRouters(userName); } @@ -274,7 +273,6 @@ private static void waitForCloudRouterIsProvisioned(UUID cloudRouterUuid) { } } - assertTrue(result, - "Cloud Router has not reached the expected state: " + CloudRouterAccessPointState.PROVISIONED + " current state: " + currentState.getValue()); + assertTrue("Cloud Router has not reached the expected state: " + CloudRouterAccessPointState.PROVISIONED + " current state: " + currentState.getValue(), result); } } diff --git a/equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/ConnectionsApiTest.java b/equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/ConnectionsApiTest.java similarity index 95% rename from equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/ConnectionsApiTest.java rename to equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/ConnectionsApiTest.java index c3e1d0e6..1f238c72 100644 --- a/equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/ConnectionsApiTest.java +++ b/equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/ConnectionsApiTest.java @@ -8,30 +8,29 @@ * Do not edit the class manually. */ -package com.equinix.openapi.fabric.v4.api; +package com.equinix.openapi.fabric.tests; import com.equinix.openapi.fabric.ApiException; - +import com.equinix.openapi.fabric.tests.dto.port.PortDto; +import com.equinix.openapi.fabric.tests.dto.users.UsersItem; +import com.equinix.openapi.fabric.tests.helpers.Utils; import com.equinix.openapi.fabric.v4.model.*; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; -import com.equinix.openapi.fabric.v4.api.dto.port.PortDto; -import com.equinix.openapi.fabric.v4.api.dto.users.UsersItem; -import com.equinix.openapi.fabric.v4.api.helpers.Utils; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; import java.util.List; import java.util.Random; import java.util.UUID; import java.util.stream.Collectors; +import static com.equinix.openapi.fabric.tests.CloudRoutersApiTest.createRouter; +import static com.equinix.openapi.fabric.tests.PortsApiTest.getPorts; +import static com.equinix.openapi.fabric.tests.helpers.Apis.*; +import static com.equinix.openapi.fabric.tests.helpers.TokenGenerator.users; +import static com.equinix.openapi.fabric.tests.helpers.Utils.getRandomVlanNumber; import static java.util.Collections.singletonList; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static com.equinix.openapi.fabric.v4.api.CloudRoutersApiTest.createRouter; -import static com.equinix.openapi.fabric.v4.api.PortsApiTest.getPorts; -import static com.equinix.openapi.fabric.v4.api.helpers.Apis.*; -import static com.equinix.openapi.fabric.v4.api.helpers.TokenGenerator.users; -import static com.equinix.openapi.fabric.v4.api.helpers.Utils.getRandomVlanNumber; +import static org.junit.Assert.assertEquals; public class ConnectionsApiTest { private static final UsersItem.UserName userName = UsersItem.UserName.PANTHERS_FCR; @@ -51,12 +50,12 @@ public static void removeConnections(UsersItem.UserName userName) { }); } - @BeforeAll + @BeforeClass public static void setUp() { setUserName(userName); } - @AfterAll + @AfterClass public static void removeResources() { removeConnections(userName); CloudRoutersApiTest.removeCloudRouters(userName); diff --git a/equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/MetrosApiTest.java b/equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/MetrosApiTest.java similarity index 81% rename from equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/MetrosApiTest.java rename to equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/MetrosApiTest.java index f4f21419..e21e939d 100644 --- a/equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/MetrosApiTest.java +++ b/equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/MetrosApiTest.java @@ -8,17 +8,17 @@ * Do not edit the class manually. */ -package com.equinix.openapi.fabric.v4.api; +package com.equinix.openapi.fabric.tests; import com.equinix.openapi.fabric.ApiException; import com.equinix.openapi.fabric.v4.model.Metro; import com.equinix.openapi.fabric.v4.model.MetroResponse; import com.equinix.openapi.fabric.v4.model.Presence; -import org.junit.jupiter.api.Test; +import org.junit.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static com.equinix.openapi.fabric.v4.api.helpers.Apis.metrosApi; +import static com.equinix.openapi.fabric.tests.helpers.Apis.metrosApi; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; /** * API tests for MetrosApi diff --git a/equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/NetworksApiTest.java b/equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/NetworksApiTest.java similarity index 88% rename from equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/NetworksApiTest.java rename to equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/NetworksApiTest.java index 4b6e4ec3..f1960881 100644 --- a/equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/NetworksApiTest.java +++ b/equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/NetworksApiTest.java @@ -8,41 +8,41 @@ * Do not edit the class manually. */ -package com.equinix.openapi.fabric.v4.api; +package com.equinix.openapi.fabric.tests; import com.equinix.openapi.fabric.ApiException; +import com.equinix.openapi.fabric.tests.dto.users.UsersItem; +import com.equinix.openapi.fabric.tests.helpers.Utils; import com.equinix.openapi.fabric.v4.model.*; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; -import com.equinix.openapi.fabric.v4.api.dto.users.UsersItem; -import com.equinix.openapi.fabric.v4.api.helpers.Utils; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; import java.util.UUID; +import static com.equinix.openapi.fabric.tests.helpers.Apis.networksApi; +import static com.equinix.openapi.fabric.tests.helpers.Apis.setUserName; +import static com.equinix.openapi.fabric.tests.helpers.TokenGenerator.users; import static java.util.Collections.singletonList; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static com.equinix.openapi.fabric.v4.api.helpers.Apis.networksApi; -import static com.equinix.openapi.fabric.v4.api.helpers.Apis.setUserName; -import static com.equinix.openapi.fabric.v4.api.helpers.TokenGenerator.users; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; /** * API tests for NetworksApi */ -class NetworksApiTest { +public class NetworksApiTest { private static final UsersItem.UserName userName = UsersItem.UserName.PANTHERS_FNV; public static void removeNetworks(UsersItem.UserName userName) { users.get(userName).getUserResources().getNetworksUuid().forEach(NetworksApiTest::deleteNetwork); } - @BeforeAll + @BeforeClass public static void setUp() { setUserName(userName); } - @AfterAll + @AfterClass public static void removeResources() { removeNetworks(userName); } diff --git a/equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/PortsApiTest.java b/equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/PortsApiTest.java similarity index 83% rename from equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/PortsApiTest.java rename to equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/PortsApiTest.java index 040a37a1..de534eb0 100644 --- a/equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/PortsApiTest.java +++ b/equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/PortsApiTest.java @@ -8,23 +8,23 @@ * Do not edit the class manually. */ -package com.equinix.openapi.fabric.v4.api; +package com.equinix.openapi.fabric.tests; import com.equinix.openapi.fabric.ApiException; +import com.equinix.openapi.fabric.tests.dto.port.PortDto; +import com.equinix.openapi.fabric.tests.dto.users.UsersItem; +import com.equinix.openapi.fabric.tests.helpers.Utils; import com.equinix.openapi.fabric.v4.model.*; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; -import com.equinix.openapi.fabric.v4.api.dto.port.PortDto; -import com.equinix.openapi.fabric.v4.api.dto.users.UsersItem; -import com.equinix.openapi.fabric.v4.api.helpers.Utils; +import org.junit.BeforeClass; +import org.junit.Test; import java.util.List; +import static com.equinix.openapi.fabric.tests.helpers.Apis.portsApi; +import static com.equinix.openapi.fabric.tests.helpers.Apis.setUserName; import static java.util.Collections.singletonList; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static com.equinix.openapi.fabric.v4.api.helpers.Apis.portsApi; -import static com.equinix.openapi.fabric.v4.api.helpers.Apis.setUserName; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; /** * API tests for PortsApi @@ -32,7 +32,7 @@ public class PortsApiTest { private static final UsersItem.UserName userName = UsersItem.UserName.PANTHERS_FCR; - @BeforeAll + @BeforeClass public static void setUp() { setUserName(userName); } diff --git a/equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/PricesApiTest.java b/equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/PricesApiTest.java similarity index 82% rename from equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/PricesApiTest.java rename to equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/PricesApiTest.java index 1b7ff865..5f322f82 100644 --- a/equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/PricesApiTest.java +++ b/equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/PricesApiTest.java @@ -8,31 +8,31 @@ * Do not edit the class manually. */ -package com.equinix.openapi.fabric.v4.api; +package com.equinix.openapi.fabric.tests; import com.equinix.openapi.fabric.ApiException; import com.equinix.openapi.fabric.v4.model.FilterBody; import com.equinix.openapi.fabric.v4.model.PriceSearchResponse; import com.equinix.openapi.fabric.v4.model.SearchExpression; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; -import com.equinix.openapi.fabric.v4.api.dto.users.UsersItem; +import com.equinix.openapi.fabric.tests.dto.users.UsersItem; +import org.junit.BeforeClass; +import org.junit.Test; import java.util.Arrays; import java.util.Collections; -import static com.equinix.openapi.fabric.v4.api.helpers.Apis.pricesApi; -import static com.equinix.openapi.fabric.v4.api.helpers.Apis.setUserName; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static com.equinix.openapi.fabric.tests.helpers.Apis.pricesApi; +import static com.equinix.openapi.fabric.tests.helpers.Apis.setUserName; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; /** * API tests for PricesApi */ public class PricesApiTest { - @BeforeAll + @BeforeClass public static void setUp() { setUserName(UsersItem.UserName.PANTHERS_FCR); } diff --git a/equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/RoutingProtocolsApiTest.java b/equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/RoutingProtocolsApiTest.java similarity index 78% rename from equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/RoutingProtocolsApiTest.java rename to equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/RoutingProtocolsApiTest.java index 3bada845..fc47ec09 100644 --- a/equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/RoutingProtocolsApiTest.java +++ b/equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/RoutingProtocolsApiTest.java @@ -8,25 +8,25 @@ * Do not edit the class manually. */ -package com.equinix.openapi.fabric.v4.api; +package com.equinix.openapi.fabric.tests; import com.equinix.openapi.fabric.ApiException; +import com.equinix.openapi.fabric.tests.dto.users.UserResources; +import com.equinix.openapi.fabric.tests.dto.users.UsersItem; import com.equinix.openapi.fabric.v4.model.*; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; -import com.equinix.openapi.fabric.v4.api.dto.users.UserResources; -import com.equinix.openapi.fabric.v4.api.dto.users.UsersItem; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; import java.util.UUID; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static com.equinix.openapi.fabric.v4.api.CloudRoutersApiTest.removeCloudRouters; -import static com.equinix.openapi.fabric.v4.api.ConnectionsApiTest.createConnectionFCR2ToPort; -import static com.equinix.openapi.fabric.v4.api.ConnectionsApiTest.removeConnections; -import static com.equinix.openapi.fabric.v4.api.helpers.Apis.*; -import static com.equinix.openapi.fabric.v4.api.helpers.TokenGenerator.users; +import static com.equinix.openapi.fabric.tests.CloudRoutersApiTest.removeCloudRouters; +import static com.equinix.openapi.fabric.tests.ConnectionsApiTest.createConnectionFCR2ToPort; +import static com.equinix.openapi.fabric.tests.ConnectionsApiTest.removeConnections; +import static com.equinix.openapi.fabric.tests.helpers.Apis.*; +import static com.equinix.openapi.fabric.tests.helpers.TokenGenerator.users; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; /** * API tests for RoutingProtocolsApi @@ -38,12 +38,12 @@ public static void removeRoutingInstances(UsersItem.UserName userName) { users.get(userName).getUserResources().getRoutingProtocolsUuid().forEach(RoutingProtocolsApiTest::deleteRoutingProtocol); } - @BeforeAll + @BeforeClass public static void setUp() { setUserName(userName); } - @AfterAll + @AfterClass public static void removeResources() { try { Thread.sleep(15000); @@ -115,7 +115,7 @@ private static void waitForDirectTypeIsProvisioned(UUID routingProtocolUuid, Str } } - assertTrue(result, "Routing Protocol has not reached the expected state: " + RoutingProtocolDirectData.StateEnum.PROVISIONED + " current state: " + currentState.getValue() + " for connection " + "uuid " + connectionUuid); + assertTrue("Routing Protocol has not reached the expected state: " + RoutingProtocolDirectData.StateEnum.PROVISIONED + " current state: " + currentState.getValue() + " for connection " + "uuid " + connectionUuid, result); } private static void waitForBGPTypeIsProvisioned(UUID routingProtocolUuid, String connectionUuid) throws ApiException { @@ -136,6 +136,6 @@ private static void waitForBGPTypeIsProvisioned(UUID routingProtocolUuid, String } } - assertTrue(result, "Routing Protocol has not reached the expected state: " + RoutingProtocolBGPData.StateEnum.PROVISIONED + " current state: " + currentState.getValue() + " for connection " + "uuid " + connectionUuid); + assertTrue("Routing Protocol has not reached the expected state: " + RoutingProtocolBGPData.StateEnum.PROVISIONED + " current state: " + currentState.getValue() + " for connection " + "uuid " + connectionUuid, result); } } diff --git a/equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/ServiceProfilesApiTest.java b/equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/ServiceProfilesApiTest.java similarity index 93% rename from equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/ServiceProfilesApiTest.java rename to equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/ServiceProfilesApiTest.java index a411704c..25181c69 100644 --- a/equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/ServiceProfilesApiTest.java +++ b/equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/ServiceProfilesApiTest.java @@ -8,34 +8,34 @@ * Do not edit the class manually. */ -package com.equinix.openapi.fabric.v4.api; +package com.equinix.openapi.fabric.tests; import com.equinix.openapi.fabric.ApiException; +import com.equinix.openapi.fabric.tests.dto.users.UsersItem; +import com.equinix.openapi.fabric.tests.helpers.Utils; import com.equinix.openapi.fabric.v4.model.*; import org.apache.commons.lang3.RandomStringUtils; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; -import com.equinix.openapi.fabric.v4.api.dto.users.UsersItem; -import com.equinix.openapi.fabric.v4.api.helpers.Utils; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.UUID; +import static com.equinix.openapi.fabric.tests.PortsApiTest.getPorts; +import static com.equinix.openapi.fabric.tests.helpers.Apis.serviceProfilesApi; +import static com.equinix.openapi.fabric.tests.helpers.Apis.setUserName; +import static com.equinix.openapi.fabric.tests.helpers.TokenGenerator.users; import static com.equinix.openapi.fabric.v4.model.Expression.OperatorEnum.EQUAL; import static java.util.Collections.singletonList; -import static org.junit.jupiter.api.Assertions.*; -import static com.equinix.openapi.fabric.v4.api.PortsApiTest.getPorts; -import static com.equinix.openapi.fabric.v4.api.helpers.Apis.serviceProfilesApi; -import static com.equinix.openapi.fabric.v4.api.helpers.Apis.setUserName; -import static com.equinix.openapi.fabric.v4.api.helpers.TokenGenerator.users; +import static org.junit.Assert.*; /** * API tests for ServiceProfilesApi */ -class ServiceProfilesApiTest { +public class ServiceProfilesApiTest { private static final UsersItem.UserName userName = UsersItem.UserName.PANTHERS_FCR; public static void removeServiceProfiles(UsersItem.UserName userName) { @@ -50,12 +50,12 @@ public static void removeServiceProfiles(UsersItem.UserName userName) { }); } - @BeforeAll + @BeforeClass public static void setUp() { setUserName(userName); } - @AfterAll + @AfterClass public static void removeResources() { removeServiceProfiles(userName); try { @@ -191,7 +191,7 @@ private static void waitForSpIsInState(UUID uuid, ServiceProfileStateEnum state) } } - assertTrue(result, "Service profile has not reached the expected state: " + state + " current state: " + currentState.getValue()); + assertTrue("Service profile has not reached the expected state: " + state + " current state: " + currentState.getValue(), result); } private ServiceProfile createServiceProfile() throws ApiException { diff --git a/equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/dto/TokenRequestDto.java b/equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/dto/TokenRequestDto.java similarity index 94% rename from equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/dto/TokenRequestDto.java rename to equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/dto/TokenRequestDto.java index 8b5f35ff..0395b6cf 100644 --- a/equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/dto/TokenRequestDto.java +++ b/equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/dto/TokenRequestDto.java @@ -1,4 +1,4 @@ -package com.equinix.openapi.fabric.v4.api.dto; +package com.equinix.openapi.fabric.tests.dto; import com.google.gson.annotations.SerializedName; diff --git a/equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/dto/TokenResponseDto.java b/equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/dto/TokenResponseDto.java similarity index 93% rename from equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/dto/TokenResponseDto.java rename to equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/dto/TokenResponseDto.java index 085f408c..ef90cccd 100644 --- a/equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/dto/TokenResponseDto.java +++ b/equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/dto/TokenResponseDto.java @@ -1,4 +1,4 @@ -package com.equinix.openapi.fabric.v4.api.dto; +package com.equinix.openapi.fabric.tests.dto; import com.google.gson.annotations.SerializedName; diff --git a/equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/dto/port/Location.java b/equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/dto/port/Location.java similarity index 91% rename from equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/dto/port/Location.java rename to equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/dto/port/Location.java index 07edbeec..0669348c 100644 --- a/equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/dto/port/Location.java +++ b/equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/dto/port/Location.java @@ -1,4 +1,4 @@ -package com.equinix.openapi.fabric.v4.api.dto.port; +package com.equinix.openapi.fabric.tests.dto.port; import com.google.gson.annotations.SerializedName; diff --git a/equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/dto/port/PortDto.java b/equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/dto/port/PortDto.java similarity index 93% rename from equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/dto/port/PortDto.java rename to equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/dto/port/PortDto.java index 86f6a527..44db24e5 100644 --- a/equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/dto/port/PortDto.java +++ b/equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/dto/port/PortDto.java @@ -1,4 +1,4 @@ -package com.equinix.openapi.fabric.v4.api.dto.port; +package com.equinix.openapi.fabric.tests.dto.port; import com.google.gson.annotations.SerializedName; diff --git a/equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/dto/port/UsersItem.java b/equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/dto/port/UsersItem.java similarity index 95% rename from equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/dto/port/UsersItem.java rename to equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/dto/port/UsersItem.java index 47c2612e..55ee2bb5 100644 --- a/equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/dto/port/UsersItem.java +++ b/equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/dto/port/UsersItem.java @@ -1,4 +1,4 @@ -package com.equinix.openapi.fabric.v4.api.dto.port; +package com.equinix.openapi.fabric.tests.dto.port; import java.util.List; diff --git a/equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/dto/port/VirtualDevicesItem.java b/equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/dto/port/VirtualDevicesItem.java similarity index 90% rename from equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/dto/port/VirtualDevicesItem.java rename to equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/dto/port/VirtualDevicesItem.java index 5d8e7db2..ccae2959 100644 --- a/equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/dto/port/VirtualDevicesItem.java +++ b/equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/dto/port/VirtualDevicesItem.java @@ -1,4 +1,4 @@ -package com.equinix.openapi.fabric.v4.api.dto.port; +package com.equinix.openapi.fabric.tests.dto.port; import com.google.gson.annotations.SerializedName; diff --git a/equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/dto/users/UserResources.java b/equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/dto/users/UserResources.java similarity index 97% rename from equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/dto/users/UserResources.java rename to equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/dto/users/UserResources.java index ed5a81c5..9078e600 100644 --- a/equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/dto/users/UserResources.java +++ b/equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/dto/users/UserResources.java @@ -1,4 +1,4 @@ -package com.equinix.openapi.fabric.v4.api.dto.users; +package com.equinix.openapi.fabric.tests.dto.users; import java.util.ArrayList; import java.util.List; diff --git a/equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/dto/users/UserUsedDto.java b/equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/dto/users/UserUsedDto.java similarity index 93% rename from equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/dto/users/UserUsedDto.java rename to equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/dto/users/UserUsedDto.java index 165f7e6d..7f872d01 100644 --- a/equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/dto/users/UserUsedDto.java +++ b/equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/dto/users/UserUsedDto.java @@ -1,4 +1,4 @@ -package com.equinix.openapi.fabric.v4.api.dto.users; +package com.equinix.openapi.fabric.tests.dto.users; import com.equinix.openapi.fabric.ApiClient; diff --git a/equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/dto/users/UsersDto.java b/equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/dto/users/UsersDto.java similarity index 85% rename from equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/dto/users/UsersDto.java rename to equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/dto/users/UsersDto.java index 51d59e81..eb86e0a5 100644 --- a/equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/dto/users/UsersDto.java +++ b/equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/dto/users/UsersDto.java @@ -1,4 +1,4 @@ -package com.equinix.openapi.fabric.v4.api.dto.users; +package com.equinix.openapi.fabric.tests.dto.users; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/dto/users/UsersItem.java b/equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/dto/users/UsersItem.java similarity index 91% rename from equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/dto/users/UsersItem.java rename to equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/dto/users/UsersItem.java index 08db3e87..0a90439e 100644 --- a/equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/dto/users/UsersItem.java +++ b/equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/dto/users/UsersItem.java @@ -1,8 +1,8 @@ -package com.equinix.openapi.fabric.v4.api.dto.users; +package com.equinix.openapi.fabric.tests.dto.users; import com.fasterxml.jackson.annotation.JsonProperty; -import com.equinix.openapi.fabric.v4.api.dto.port.PortDto; -import com.equinix.openapi.fabric.v4.api.dto.port.VirtualDevicesItem; +import com.equinix.openapi.fabric.tests.dto.port.PortDto; +import com.equinix.openapi.fabric.tests.dto.port.VirtualDevicesItem; import java.util.List; diff --git a/equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/dto/users/VirtualDevicesItem.java b/equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/dto/users/VirtualDevicesItem.java similarity index 93% rename from equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/dto/users/VirtualDevicesItem.java rename to equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/dto/users/VirtualDevicesItem.java index 6b2822f0..ebc6ee73 100644 --- a/equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/dto/users/VirtualDevicesItem.java +++ b/equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/dto/users/VirtualDevicesItem.java @@ -1,4 +1,4 @@ -package com.equinix.openapi.fabric.v4.api.dto.users; +package com.equinix.openapi.fabric.tests.dto.users; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/helpers/Apis.java b/equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/helpers/Apis.java similarity index 92% rename from equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/helpers/Apis.java rename to equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/helpers/Apis.java index 23e4069f..b8e1b725 100644 --- a/equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/helpers/Apis.java +++ b/equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/helpers/Apis.java @@ -1,9 +1,9 @@ -package com.equinix.openapi.fabric.v4.api.helpers; +package com.equinix.openapi.fabric.tests.helpers; import com.equinix.openapi.fabric.v4.api.*; -import com.equinix.openapi.fabric.v4.api.dto.users.UsersItem; +import com.equinix.openapi.fabric.tests.dto.users.UsersItem; -import static com.equinix.openapi.fabric.v4.api.helpers.TokenGenerator.generate; +import static com.equinix.openapi.fabric.tests.helpers.TokenGenerator.generate; public class Apis { public static CloudRoutersApi cloudRoutersApi; diff --git a/equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/helpers/TokenGenerator.java b/equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/helpers/TokenGenerator.java similarity index 91% rename from equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/helpers/TokenGenerator.java rename to equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/helpers/TokenGenerator.java index 103c18b8..ef4879d0 100644 --- a/equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/helpers/TokenGenerator.java +++ b/equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/helpers/TokenGenerator.java @@ -8,7 +8,7 @@ * Do not edit the class manually. */ -package com.equinix.openapi.fabric.v4.api.helpers; +package com.equinix.openapi.fabric.tests.helpers; import com.equinix.openapi.fabric.ApiClient; import com.equinix.openapi.fabric.ApiException; @@ -16,10 +16,10 @@ import com.equinix.openapi.fabric.Pair; import com.google.gson.reflect.TypeToken; -import com.equinix.openapi.fabric.v4.api.dto.TokenRequestDto; -import com.equinix.openapi.fabric.v4.api.dto.TokenResponseDto; -import com.equinix.openapi.fabric.v4.api.dto.users.UserUsedDto; -import com.equinix.openapi.fabric.v4.api.dto.users.UsersItem; +import com.equinix.openapi.fabric.tests.dto.TokenRequestDto; +import com.equinix.openapi.fabric.tests.dto.TokenResponseDto; +import com.equinix.openapi.fabric.tests.dto.users.UserUsedDto; +import com.equinix.openapi.fabric.tests.dto.users.UsersItem; import java.lang.reflect.Type; import java.util.ArrayList; diff --git a/equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/helpers/Utils.java b/equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/helpers/Utils.java similarity index 89% rename from equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/helpers/Utils.java rename to equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/helpers/Utils.java index 7675fe21..53d32a23 100644 --- a/equinix-openapi-fabric-tests/src/test/com/equinix/openapi/fabric/v4/api/helpers/Utils.java +++ b/equinix-openapi-fabric-tests/src/test/java/com/equinix/openapi/fabric/tests/helpers/Utils.java @@ -1,9 +1,9 @@ -package com.equinix.openapi.fabric.v4.api.helpers; +package com.equinix.openapi.fabric.tests.helpers; import com.equinix.openapi.fabric.JSON; import com.fasterxml.jackson.databind.ObjectMapper; -import com.equinix.openapi.fabric.v4.api.dto.users.UsersDto; -import com.equinix.openapi.fabric.v4.api.dto.users.UsersItem; +import com.equinix.openapi.fabric.tests.dto.users.UsersDto; +import com.equinix.openapi.fabric.tests.dto.users.UsersItem; import java.io.IOException; import java.util.NoSuchElementException;