From 397b0c9ba4267ce991ea4ad2118f40d800e9888b Mon Sep 17 00:00:00 2001 From: Ignasi Barrera Date: Wed, 6 Apr 2016 23:16:46 +0200 Subject: [PATCH] Azure ARM fixes --- providers/azurecompute-arm/README.md | 58 +++---------------- providers/azurecompute-arm/pom.xml | 12 ++-- .../arm}/AzureComputeApi.java | 0 .../arm}/AzureComputeProviderMetadata.java | 4 +- .../arm}/AzureManagementApiMetadata.java | 0 .../config/AzureComputeHttpApiModule.java | 2 +- .../arm}/config/AzureComputeParserModule.java | 0 .../arm}/config/AzureComputeProperties.java | 0 .../arm}/domain/ResourceGroup.java | 0 .../arm}/features/JobApi.java | 0 .../arm}/features/ResourceGroupApi.java | 0 .../arm}/functions/ParseJobStatus.java | 0 .../arm}/functions/URIParser.java | 0 .../handlers/AzureComputeErrorHandler.java | 0 .../AzureComputeProviderMetadataTest.java | 0 .../arm}/features/JobApiMockTest.java | 0 .../features/ResourceGroupApiLiveTest.java | 0 .../features/ResourceGroupApiMockTest.java | 0 .../arm}/functions/URIParserTest.java | 0 .../AbstractAzureComputeApiLiveTest.java | 0 .../arm}/internal/AzureLiveTestUtils.java | 0 .../internal/BaseAzureComputeApiLiveTest.java | 0 .../internal/BaseAzureComputeApiMockTest.java | 14 ++--- 23 files changed, 20 insertions(+), 70 deletions(-) rename providers/azurecompute-arm/src/main/java/org/jclouds/{azurecompute.arm => azurecompute/arm}/AzureComputeApi.java (100%) rename providers/azurecompute-arm/src/main/java/org/jclouds/{azurecompute.arm => azurecompute/arm}/AzureComputeProviderMetadata.java (96%) rename providers/azurecompute-arm/src/main/java/org/jclouds/{azurecompute.arm => azurecompute/arm}/AzureManagementApiMetadata.java (100%) rename providers/azurecompute-arm/src/main/java/org/jclouds/{azurecompute.arm => azurecompute/arm}/config/AzureComputeHttpApiModule.java (95%) rename providers/azurecompute-arm/src/main/java/org/jclouds/{azurecompute.arm => azurecompute/arm}/config/AzureComputeParserModule.java (100%) rename providers/azurecompute-arm/src/main/java/org/jclouds/{azurecompute.arm => azurecompute/arm}/config/AzureComputeProperties.java (100%) rename providers/azurecompute-arm/src/main/java/org/jclouds/{azurecompute.arm => azurecompute/arm}/domain/ResourceGroup.java (100%) rename providers/azurecompute-arm/src/main/java/org/jclouds/{azurecompute.arm => azurecompute/arm}/features/JobApi.java (100%) rename providers/azurecompute-arm/src/main/java/org/jclouds/{azurecompute.arm => azurecompute/arm}/features/ResourceGroupApi.java (100%) rename providers/azurecompute-arm/src/main/java/org/jclouds/{azurecompute.arm => azurecompute/arm}/functions/ParseJobStatus.java (100%) rename providers/azurecompute-arm/src/main/java/org/jclouds/{azurecompute.arm => azurecompute/arm}/functions/URIParser.java (100%) rename providers/azurecompute-arm/src/main/java/org/jclouds/{azurecompute.arm => azurecompute/arm}/handlers/AzureComputeErrorHandler.java (100%) rename providers/azurecompute-arm/src/test/java/org/jclouds/{azurecompute.arm => azurecompute/arm}/AzureComputeProviderMetadataTest.java (100%) rename providers/azurecompute-arm/src/test/java/org/jclouds/{azurecompute.arm => azurecompute/arm}/features/JobApiMockTest.java (100%) rename providers/azurecompute-arm/src/test/java/org/jclouds/{azurecompute.arm => azurecompute/arm}/features/ResourceGroupApiLiveTest.java (100%) rename providers/azurecompute-arm/src/test/java/org/jclouds/{azurecompute.arm => azurecompute/arm}/features/ResourceGroupApiMockTest.java (100%) rename providers/azurecompute-arm/src/test/java/org/jclouds/{azurecompute.arm => azurecompute/arm}/functions/URIParserTest.java (100%) rename providers/azurecompute-arm/src/test/java/org/jclouds/{azurecompute.arm => azurecompute/arm}/internal/AbstractAzureComputeApiLiveTest.java (100%) rename providers/azurecompute-arm/src/test/java/org/jclouds/{azurecompute.arm => azurecompute/arm}/internal/AzureLiveTestUtils.java (100%) rename providers/azurecompute-arm/src/test/java/org/jclouds/{azurecompute.arm => azurecompute/arm}/internal/BaseAzureComputeApiLiveTest.java (100%) rename providers/azurecompute-arm/src/test/java/org/jclouds/{azurecompute.arm => azurecompute/arm}/internal/BaseAzureComputeApiMockTest.java (95%) diff --git a/providers/azurecompute-arm/README.md b/providers/azurecompute-arm/README.md index a3abe63c85..85e39e5f82 100644 --- a/providers/azurecompute-arm/README.md +++ b/providers/azurecompute-arm/README.md @@ -2,7 +2,8 @@ jclouds Labs - Azure Compute ARM Provider ============ Build status for azurecomputearm module: -[![Build Status](http://devopsfunjenkins.westus.cloudapp.azure.com:8080/buildStatus/icon?job=jclouds-labs-azurecompute-arm/org.apache.jclouds.labs:azurecomputearm)](http://devopsfunjenkins.westus.cloudapp.azure.com:8080/job/jclouds-labs-azurecompute-arm/org.apache.jclouds.labs$azurecomputearm/) +[![Build Status](https://jclouds.ci.cloudbees.com/buildStatus/icon?job=jclouds-labs/org.apache.jclouds.labs$azurecompute-arm)](https://jclouds.ci.cloudbees.com/buildStatus/icon?job=jclouds-labs/org.apache.jclouds.labs$azurecompute-arm) + ## Setting Up Test Credentials @@ -42,68 +43,23 @@ Run the following commands to assign roles to the service principal ```bash # Assign roles for this service principal azure role assignment create --objectId -o Contributor -c /subscriptions// - ``` Verify service principal ```bash azure login -u -p --service-principal --tenant - ``` ## Run Live Tests - Use the following to run the live tests ```bash -# ResourceGroupApiLiveTest: - -mvn -Dtest=ResourceGroupApiLiveTest -Dtest.azurecompute-arm.identity= -Dtest.azurecompute-arm.subscriptionid= -Dtest.azurecompute-arm.credential= -Dtest.azurecompute-arm.endpoint="https://management.azure.com" -Dtest.jclouds.oauth.resource="https://management.azure.com/" -Dtest.oauth.endpoint="https://login.microsoftonline.com//oauth2/token" test - -# AuthorizationApiLiveTest: - -mvn -Dtest=AuthorizationApiLiveTest -Dtest.oauth.identity= -Dtest.oauth.credential= -Dtest.jclouds.oauth.resource="https://management.azure.com/" -Dtest.oauth.endpoint="https://login.microsoftonline.com//oauth2/token" -Dtest.jclouds.oauth.audience="https://management.azure.com/" test - -# LocationApiLiveTest: - -mvn -Dtest=LocationApiLiveTest -Dtest.azurecompute-arm.identity= -Dtest.azurecompute-arm.subscriptionid= -Dtest.azurecompute-arm.credential= -Dtest.azurecompute-arm.endpoint="https://management.azure.com" -Dtest.jclouds.oauth.resource="https://management.azure.com/" -Dtest.oauth.endpoint="https://login.microsoftonline.com//oauth2/token" test - -# StorageAccountApiLiveTest: - -mvn -Dtest=StorageAccountApiLiveTest -Dtest.azurecompute-arm.identity= -Dtest.azurecompute-arm.subscriptionid= -Dtest.azurecompute-arm.credential= -Dtest.azurecompute-arm.endpoint="https://management.azure.com" -Dtest.jclouds.oauth.resource="https://management.azure.com/" -Dtest.oauth.endpoint="https://login.microsoftonline.com//oauth2/token" test - -# VirtualNetworkApiLiveTest: - -mvn -Dtest=VirtualNetworkApiLiveTest -Dtest.azurecompute-arm.identity= -Dtest.azurecompute-arm.subscriptionid= -Dtest.azurecompute-arm.credential= -Dtest.azurecompute-arm.resourcegroup="jcloudstest" -Dtest.azurecompute-arm.endpoint="https://management.azure.com" -Dtest.jclouds.oauth.resource="https://management.azure.com/" -Dtest.oauth.endpoint="https://login.microsoftonline.com//oauth2/token" test - -# SubnetApiLiveTest - -mvn -Dtest=SubnetApiLiveTest -Dtest.azurecompute-arm.identity= -Dtest.azurecompute-arm.subscriptionid= -Dtest.azurecompute-arm.credential= -Dtest.azurecompute-arm.resourcegroup="jcloudstest" -Dtest.azurecompute-arm.endpoint="https://management.azure.com" -Dtest.jclouds.oauth.resource="https://management.azure.com/" -Dtest.oauth.endpoint="https://login.microsoftonline.com//oauth2/token" test - -# NetworkInterfaceCardApiLiveTest - -mvn -Dtest=NetworkInterfaceCardApiLiveTest -Dtest.azurecompute-arm.identity= -Dtest.azurecompute-arm.subscriptionid= -Dtest.azurecompute-arm.credential= -Dtest.azurecompute-arm.resourcegroup="jcloudstest" -Dtest.azurecompute-arm.endpoint="https://management.azure.com" -Dtest.jclouds.oauth.resource="https://management.azure.com/" -Dtest.oauth.endpoint="https://login.microsoftonline.com//oauth2/token" test - -# VirtualMachineApiLiveTest: - -mvn -Dtest=VirtualMachineApiLiveTest -Dtest.azurecompute-arm.identity= -Dtest.azurecompute-arm.subscriptionid= -Dtest.azurecompute-arm.credential= -Dtest.azurecompute-arm.endpoint="https://management.azure.com" -Dtest.jclouds.oauth.resource="https://management.azure.com/" -Dtest.oauth.endpoint="https://login.microsoftonline.com//oauth2/token" test - -# VMSizeApiLiveTest: - -mvn -Dtest=VMSizeApiLiveTest -Dtest.azurecompute-arm.identity= -Dtest.azurecompute-arm.subscriptionid= -Dtest.azurecompute-arm.credential= -Dtest.azurecompute-arm.endpoint="https://management.azure.com" -Dtest.jclouds.oauth.resource="https://management.azure.com/" -Dtest.oauth.endpoint="https://login.microsoftonline.com//oauth2/token" test - -# PublicIPAddressApiLiveTest - -mvn -Dtest=PublicIPAddressApiLiveTest -Dtest.azurecompute-arm.identity= -Dtest.azurecompute-arm.subscriptionid= -Dtest.azurecompute-arm.credential= -Dtest.azurecompute-arm.endpoint="https://management.azure.com" -Dtest.jclouds.oauth.resource="https://management.azure.com/" -Dtest.oauth.endpoint="https://login.microsoftonline.com//oauth2/token" test - -# OSImageApiLiveTest: - -mvn -Dtest=OSImageApiLiveTest -Dtest.azurecompute-arm.identity= -Dtest.azurecompute-arm.subscriptionid= -Dtest.azurecompute-arm.credential= -Dtest.azurecompute-arm.endpoint="https://management.azure.com" -Dtest.jclouds.oauth.resource="https://management.azure.com/" -Dtest.oauth.endpoint="https://login.microsoftonline.com//oauth2/token" test - -# DeploymentApiLiveTest: - -mvn -Dtest=DeploymentApiLiveTest -Dtest.azurecompute-arm.identity= -Dtest.azurecompute-arm.subscriptionid= -Dtest.azurecompute-arm.credential= -Dtest.azurecompute-arm.endpoint="https://management.azure.com/" -Dtest.jclouds.oauth.resource="https://management.azure.com/" -Dtest.oauth.endpoint="https://login.microsoftonline.com//oauth2/token" test +mvn clean verify -Plive \ + -Dtest.azurecompute-arm.identity= \ + -Dtest.azurecompute-arm.credential= \ + -Dtest.azurecompute-arm.endpoint=https://management.azure.com/subscriptions/ \ + -Dtest.oauth.endpoint=https://login.microsoftonline.com//oauth2/token ``` \ No newline at end of file diff --git a/providers/azurecompute-arm/pom.xml b/providers/azurecompute-arm/pom.xml index 807ab2066e..33251fded1 100644 --- a/providers/azurecompute-arm/pom.xml +++ b/providers/azurecompute-arm/pom.xml @@ -31,10 +31,10 @@ bundle - FIXME_subscription-id - FIXME_tenant-id - https://management.azure.com/subscriptions/${test.jclouds.azurecompute-arm.subscription-id} - 2014-04-01-preview + https://management.azure.com/ + https://login.microsoftonline.com/FIXME_tenant-id/oauth2/token + https://management.azure.com/subscriptions/FIXME_subscription-id + app id app password @@ -162,8 +162,8 @@ ${test.azurecompute-arm.build-version} ${test.azurecompute-arm.identity} ${test.azurecompute-arm.credential} - ${test.jclouds.azurecompute-arm.subscription-id} - ${test.jclouds.azurecompute-arm.tenant-id} + ${test.jclouds.oauth.resource} + ${test.oauth.endpoint} diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute.arm/AzureComputeApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/AzureComputeApi.java similarity index 100% rename from providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute.arm/AzureComputeApi.java rename to providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/AzureComputeApi.java diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute.arm/AzureComputeProviderMetadata.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/AzureComputeProviderMetadata.java similarity index 96% rename from providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute.arm/AzureComputeProviderMetadata.java rename to providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/AzureComputeProviderMetadata.java index 68d7a869fe..958a6ddfee 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute.arm/AzureComputeProviderMetadata.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/AzureComputeProviderMetadata.java @@ -55,7 +55,6 @@ public class AzureComputeProviderMetadata extends BaseProviderMetadata { properties.setProperty(OPERATION_POLL_MAX_PERIOD, "15"); properties.setProperty(TCP_RULE_FORMAT, "tcp_%s-%s"); properties.setProperty(TCP_RULE_REGEXP, "tcp_\\d{1,5}-\\d{1,5}"); - properties.put("oauth.endpoint", "https://login.microsoftonline.com/oauth2/token"); properties.put(RESOURCE, "https://management.azure.com"); properties.put(CREDENTIAL_TYPE, CLIENT_CREDENTIALS_SECRET.toString()); return properties; @@ -69,9 +68,8 @@ public class AzureComputeProviderMetadata extends BaseProviderMetadata { protected Builder() { super(); - id("azurecompute-arm") - .name("Azure Resource Management ") + .name("Azure Resource Management") .apiMetadata(new AzureManagementApiMetadata()) .endpoint("https://management.azure.com/subscriptions/SUBSCRIPTION_ID") .homepage(URI.create("https://www.windowsazure.com/")) diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute.arm/AzureManagementApiMetadata.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/AzureManagementApiMetadata.java similarity index 100% rename from providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute.arm/AzureManagementApiMetadata.java rename to providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/AzureManagementApiMetadata.java diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute.arm/config/AzureComputeHttpApiModule.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/config/AzureComputeHttpApiModule.java similarity index 95% rename from providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute.arm/config/AzureComputeHttpApiModule.java rename to providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/config/AzureComputeHttpApiModule.java index 9041d960aa..eb6a6d6d71 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute.arm/config/AzureComputeHttpApiModule.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/config/AzureComputeHttpApiModule.java @@ -52,6 +52,6 @@ public class AzureComputeHttpApiModule extends HttpApiModule { protected void configure() { install(new AzureComputeParserModule()); super.configure(); - bind(OAuthScopes.class).toInstance(OAuthScopes.ReadOrWriteScopes.create("read", "read write")); + bind(OAuthScopes.class).toInstance(OAuthScopes.NoScopes.create()); } } diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute.arm/config/AzureComputeParserModule.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/config/AzureComputeParserModule.java similarity index 100% rename from providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute.arm/config/AzureComputeParserModule.java rename to providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/config/AzureComputeParserModule.java diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute.arm/config/AzureComputeProperties.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/config/AzureComputeProperties.java similarity index 100% rename from providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute.arm/config/AzureComputeProperties.java rename to providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/config/AzureComputeProperties.java diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute.arm/domain/ResourceGroup.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/ResourceGroup.java similarity index 100% rename from providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute.arm/domain/ResourceGroup.java rename to providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/ResourceGroup.java diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute.arm/features/JobApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/JobApi.java similarity index 100% rename from providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute.arm/features/JobApi.java rename to providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/JobApi.java diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute.arm/features/ResourceGroupApi.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/ResourceGroupApi.java similarity index 100% rename from providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute.arm/features/ResourceGroupApi.java rename to providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/ResourceGroupApi.java diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute.arm/functions/ParseJobStatus.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/functions/ParseJobStatus.java similarity index 100% rename from providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute.arm/functions/ParseJobStatus.java rename to providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/functions/ParseJobStatus.java diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute.arm/functions/URIParser.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/functions/URIParser.java similarity index 100% rename from providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute.arm/functions/URIParser.java rename to providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/functions/URIParser.java diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute.arm/handlers/AzureComputeErrorHandler.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/handlers/AzureComputeErrorHandler.java similarity index 100% rename from providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute.arm/handlers/AzureComputeErrorHandler.java rename to providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/handlers/AzureComputeErrorHandler.java diff --git a/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute.arm/AzureComputeProviderMetadataTest.java b/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/AzureComputeProviderMetadataTest.java similarity index 100% rename from providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute.arm/AzureComputeProviderMetadataTest.java rename to providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/AzureComputeProviderMetadataTest.java diff --git a/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute.arm/features/JobApiMockTest.java b/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/JobApiMockTest.java similarity index 100% rename from providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute.arm/features/JobApiMockTest.java rename to providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/JobApiMockTest.java diff --git a/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute.arm/features/ResourceGroupApiLiveTest.java b/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/ResourceGroupApiLiveTest.java similarity index 100% rename from providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute.arm/features/ResourceGroupApiLiveTest.java rename to providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/ResourceGroupApiLiveTest.java diff --git a/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute.arm/features/ResourceGroupApiMockTest.java b/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/ResourceGroupApiMockTest.java similarity index 100% rename from providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute.arm/features/ResourceGroupApiMockTest.java rename to providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/ResourceGroupApiMockTest.java diff --git a/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute.arm/functions/URIParserTest.java b/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/functions/URIParserTest.java similarity index 100% rename from providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute.arm/functions/URIParserTest.java rename to providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/functions/URIParserTest.java diff --git a/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute.arm/internal/AbstractAzureComputeApiLiveTest.java b/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/internal/AbstractAzureComputeApiLiveTest.java similarity index 100% rename from providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute.arm/internal/AbstractAzureComputeApiLiveTest.java rename to providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/internal/AbstractAzureComputeApiLiveTest.java diff --git a/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute.arm/internal/AzureLiveTestUtils.java b/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/internal/AzureLiveTestUtils.java similarity index 100% rename from providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute.arm/internal/AzureLiveTestUtils.java rename to providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/internal/AzureLiveTestUtils.java diff --git a/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute.arm/internal/BaseAzureComputeApiLiveTest.java b/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/internal/BaseAzureComputeApiLiveTest.java similarity index 100% rename from providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute.arm/internal/BaseAzureComputeApiLiveTest.java rename to providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/internal/BaseAzureComputeApiLiveTest.java diff --git a/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute.arm/internal/BaseAzureComputeApiMockTest.java b/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/internal/BaseAzureComputeApiMockTest.java similarity index 95% rename from providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute.arm/internal/BaseAzureComputeApiMockTest.java rename to providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/internal/BaseAzureComputeApiMockTest.java index fdbdf7036e..f6dbee3d51 100644 --- a/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute.arm/internal/BaseAzureComputeApiMockTest.java +++ b/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/internal/BaseAzureComputeApiMockTest.java @@ -16,20 +16,18 @@ */ package org.jclouds.azurecompute.arm.internal; import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor; -import static org.testng.Assert.assertEquals; import static org.jclouds.oauth.v2.config.CredentialType.BEARER_TOKEN_CREDENTIALS; import static org.jclouds.oauth.v2.config.OAuthProperties.CREDENTIAL_TYPE; +import static org.testng.Assert.assertEquals; import java.io.IOException; import java.util.Properties; import java.util.Set; import org.jclouds.ContextBuilder; -import org.jclouds.concurrent.config.ExecutorServiceModule; import org.jclouds.azurecompute.arm.AzureComputeApi; import org.jclouds.azurecompute.arm.AzureComputeProviderMetadata; -import org.jclouds.json.Json; -import org.jclouds.rest.ApiContext; +import org.jclouds.concurrent.config.ExecutorServiceModule; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -52,7 +50,6 @@ public class BaseAzureComputeApiMockTest { protected MockWebServer server; protected AzureComputeApi api; - private Json json; // So that we can ignore formatting. private final JsonParser parser = new JsonParser(); @@ -63,15 +60,14 @@ public class BaseAzureComputeApiMockTest { server.play(); Properties properties = new Properties(); properties.put(CREDENTIAL_TYPE, BEARER_TOKEN_CREDENTIALS.toString()); + properties.put("oauth.endpoint", "https://login.microsoftonline.com/tenant-id/oauth2/token"); AzureComputeProviderMetadata pm = AzureComputeProviderMetadata.builder().build(); - ApiContext ctx = ContextBuilder.newBuilder(pm) + api = ContextBuilder.newBuilder(pm) .credentials("", MOCK_BEARER_TOKEN) .endpoint(server.getUrl("/").toString() + "subscriptions/12345678-1234-1234-1234-123456789012") .modules(modules) .overrides(properties) - .build(); - json = ctx.utils().injector().getInstance(Json.class); - api = ctx.getApi(); + .buildApi(AzureComputeApi.class); } @AfterMethod(alwaysRun = true)