Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import org.junit.BeforeClass;
import org.junit.Test;

import java.util.Arrays;
import java.util.UUID;

import static com.equinix.openapi.fabric.tests.helpers.Apis.*;
Expand Down Expand Up @@ -155,8 +156,8 @@ public void getCloudRouterByUuid() throws ApiException {
@Test
public void getCloudRouterPackageByCode() throws ApiException {
Code routerPackageCode = Code.STANDARD;
CloudRouterPackage cloudRouterPackage = cloudRoutersApi.getCloudRouterPackageByCode(RouterPackageCode.STANDARD);
assertEquals(200, cloudRoutersApi.getApiClient().getStatusCode());
CloudRouterPackage cloudRouterPackage = cloudRouterPackagesApi.getCloudRouterPackageByCode(RouterPackageCode.STANDARD);
assertEquals(200, cloudRouterPackagesApi.getApiClient().getStatusCode());
assertEquals(cloudRouterPackage.getCode(), routerPackageCode);
}

Expand All @@ -165,8 +166,8 @@ public void getCloudRouterPackageByCode() throws ApiException {
*/
@Test
public void getCloudRouterPackages() throws ApiException {
PackageResponse packageResponse = cloudRoutersApi.getCloudRouterPackages(10, 10);
assertEquals(200, cloudRoutersApi.getApiClient().getStatusCode());
PackageResponse packageResponse = cloudRouterPackagesApi.getCloudRouterPackages(10, 10);
assertEquals(200, cloudRouterPackagesApi.getApiClient().getStatusCode());
assertNotNull(packageResponse.getData());
}

Expand Down Expand Up @@ -203,21 +204,18 @@ public void searchCloudRouterRoutes() throws ApiException {
public void searchCloudRouters() throws ApiException {
CloudRouterReadResponse cloudRouter = createRouter();

CloudRouterSimpleExpression cloudRouterSimpleExpression = new CloudRouterSimpleExpression();
cloudRouterSimpleExpression.setOperator(SearchExpression.OperatorEnum.EQUAL.getValue());
cloudRouterSimpleExpression.setProperty(CloudRouterSortBy.NAME.getValue());
cloudRouterSimpleExpression.values(singletonList(cloudRouter.getName()));

CloudRouterSimpleExpression cloudRouterSimpleExpression2 = new CloudRouterSimpleExpression();
cloudRouterSimpleExpression2.setOperator(SearchExpression.OperatorEnum.EQUAL.getValue());
cloudRouterSimpleExpression2.setProperty(CloudRouterSortBy.STATE.getValue());
cloudRouterSimpleExpression2.values(singletonList(cloudRouter.getState().getValue()));

CloudRouterFilters cloudRouterFilters = new CloudRouterFilters();
CloudRouterFilter cloudRouterFilter = new CloudRouterFilter(cloudRouterSimpleExpression);
CloudRouterFilter cloudRouterFilter2 = new CloudRouterFilter(cloudRouterSimpleExpression2);
cloudRouterFilters.addAndItem(cloudRouterFilter);
cloudRouterFilters.addAndItem(cloudRouterFilter2);
CloudRouterExpression nameExpression = new CloudRouterExpression()
.operator(SearchExpression.OperatorEnum.EQUAL.getValue())
.property(CloudRouterSortBy.NAME.getValue())
.values(singletonList(cloudRouter.getName()));

CloudRouterExpression stateExpression = new CloudRouterExpression()
.operator(SearchExpression.OperatorEnum.EQUAL.getValue())
.property(CloudRouterSortBy.STATE.getValue())
.values(singletonList(cloudRouter.getState().getValue()));

CloudRouterExpression cloudRouterFilters = new CloudRouterExpression()
.and(Arrays.asList(nameExpression, stateExpression));

CloudRouterSearchRequest cloudRouterSearchRequest = new CloudRouterSearchRequest()
.filter(cloudRouterFilters)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ public void searchServiceProfiles() throws ApiException {
}

public ServiceProfiles getServiceProfilesByQueryResponse(String viewPointQuery) throws ApiException {
return serviceProfilesApi.getServiceProfiles(1, 10, viewPointQuery);
return serviceProfilesApi.listServiceProfiles(1, 10, viewPointQuery);
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@
import static com.equinix.openapi.fabric.tests.helpers.TokenGenerator.generate;

public class Apis {
public static CloudRouterPackagesApi cloudRouterPackagesApi;
public static CloudRoutersApi cloudRoutersApi;
public static ConnectionsApi connectionsApi;
public static HealthApi healthApi;
public static MetrosApi metrosApi;
public static NetworksApi networksApi;
public static PortsApi portsApi;
public static PrecisionTimeApi precisionTimeApi;
public static PrecisionTimePackagesApi precisionTimePackagesApi;
public static PrecisionTimeServicesApi precisionTimeServicesApi;
public static PricesApi pricesApi;
public static RouteFilterRulesApi routeFilterRulesApi;
public static RouteFiltersApi routeFiltersApi;
Expand Down Expand Up @@ -40,13 +42,15 @@ public static UsersItem.UserName getCurrentUser() {
}

private static void setApis() {
cloudRouterPackagesApi = new CloudRouterPackagesApi(TokenGenerator.getApiClient(currentUser));
cloudRoutersApi = new CloudRoutersApi(TokenGenerator.getApiClient(currentUser));
connectionsApi = new ConnectionsApi(TokenGenerator.getApiClient(currentUser));
healthApi = new HealthApi(TokenGenerator.getApiClient(currentUser));
metrosApi = new MetrosApi(TokenGenerator.getApiClient(currentUser));
networksApi = new NetworksApi(TokenGenerator.getApiClient(currentUser));
portsApi = new PortsApi(TokenGenerator.getApiClient(currentUser));
precisionTimeApi = new PrecisionTimeApi(TokenGenerator.getApiClient(currentUser));
precisionTimePackagesApi = new PrecisionTimePackagesApi(TokenGenerator.getApiClient(currentUser));
precisionTimeServicesApi = new PrecisionTimeServicesApi(TokenGenerator.getApiClient(currentUser));
pricesApi = new PricesApi(TokenGenerator.getApiClient(currentUser));
routeFiltersApi = new RouteFiltersApi(TokenGenerator.getApiClient(currentUser));
routeFilterRulesApi = new RouteFilterRulesApi(TokenGenerator.getApiClient(currentUser));
Expand Down
Loading
Loading