From 87f8e3f0597b49f2202ffac8fbff3879424aaa92 Mon Sep 17 00:00:00 2001 From: Tanyi Chen Date: Mon, 21 Sep 2020 15:46:23 +0800 Subject: [PATCH] Mgmt: Azure -> AzureResourceManager (#15409) * Azure -> AzureResourceManager * fix checkstyle * update link * update link --- .../samples/ManageSpringCloud.java | 38 ++-- .../samples/ManageFunctionAppBasic.java | 42 ++-- .../samples/ManageFunctionAppLogs.java | 20 +- .../ManageFunctionAppSourceControl.java | 42 ++-- .../ManageFunctionAppWithAuthentication.java | 30 +-- .../ManageFunctionAppWithDomainSsl.java | 28 +-- .../ManageLinuxFunctionAppSourceControl.java | 32 +-- .../samples/ManageLinuxWebAppBasic.java | 42 ++-- .../ManageLinuxWebAppCosmosDbByMsi.java | 12 +- .../ManageLinuxWebAppSourceControl.java | 34 ++-- .../ManageLinuxWebAppSqlConnection.java | 26 +-- ...geLinuxWebAppStorageAccountConnection.java | 26 +-- ...anageLinuxWebAppWithContainerRegistry.java | 26 +-- .../ManageLinuxWebAppWithDomainSsl.java | 30 +-- .../ManageLinuxWebAppWithTrafficManager.java | 52 ++--- .../appservice/samples/ManageWebAppBasic.java | 42 ++-- .../samples/ManageWebAppCosmosDbByMsi.java | 28 +-- .../ManageWebAppCosmosDbThroughKeyVault.java | 28 +-- .../appservice/samples/ManageWebAppLogs.java | 20 +- .../appservice/samples/ManageWebAppSlots.java | 34 ++-- .../samples/ManageWebAppSourceControl.java | 50 ++--- .../ManageWebAppSourceControlAsync.java | 36 ++-- .../samples/ManageWebAppSqlConnection.java | 26 +-- .../ManageWebAppStorageAccountConnection.java | 26 +-- .../ManageWebAppWithAuthentication.java | 34 ++-- .../samples/ManageWebAppWithDomainSsl.java | 30 +-- .../ManageWebAppWithTrafficManager.java | 52 ++--- .../ManageServicePrincipalCredentials.java | 16 +- .../samples/ManageUsersGroupsAndRoles.java | 6 +- .../ManageCdnProfileWithCustomDomain.java | 30 +-- .../samples/ManageCdnProfileWithWebApp.java | 46 ++--- .../ConvertVirtualMachineToManagedDisks.java | 20 +- ...VirtualMachineUsingCustomImageFromVHD.java | 40 ++-- ...eVirtualMachineUsingCustomImageFromVM.java | 40 ++-- ...chineUsingSpecializedDiskFromSnapshot.java | 58 +++--- ...ualMachineUsingSpecializedDiskFromVhd.java | 40 ++-- ...MachinesAsyncTrackingRelatedResources.java | 54 +++--- .../CreateVirtualMachinesInParallel.java | 36 ++-- ...hinesUsingCustomImageOrSpecializedVHD.java | 32 +-- .../compute/samples/ListComputeSkus.java | 16 +- .../ListVirtualMachineExtensionImages.java | 12 +- .../samples/ListVirtualMachineImages.java | 12 +- .../samples/ManageAvailabilitySet.java | 40 ++-- .../compute/samples/ManageManagedDisks.java | 122 ++++++------ ...nabledVirtualMachineBelongsToAADGroup.java | 36 ++-- ...etUserAssignedMSIFromServicePrincipal.java | 22 +-- ...geStorageFromMSIEnabledVirtualMachine.java | 26 +-- ...eUserAssignedMSIEnabledVirtualMachine.java | 42 ++-- .../compute/samples/ManageVirtualMachine.java | 34 ++-- .../samples/ManageVirtualMachineAsync.java | 36 ++-- .../ManageVirtualMachineExtension.java | 28 +-- .../samples/ManageVirtualMachineScaleSet.java | 30 +-- .../ManageVirtualMachineScaleSetAsync.java | 32 +-- ...tualMachineScaleSetWithUnmanagedDisks.java | 36 ++-- .../samples/ManageVirtualMachineWithDisk.java | 36 ++-- ...anageVirtualMachineWithUnmanagedDisks.java | 28 +-- .../ManageVirtualMachinesInParallel.java | 30 +-- .../samples/ManageZonalVirtualMachine.java | 34 ++-- .../ManageZonalVirtualMachineScaleSet.java | 34 ++-- ...tainerInstanceWithAzureFileShareMount.java | 28 +-- ...WithManualAzureFileShareMountCreation.java | 30 +-- ...erInstanceWithMultipleContainerImages.java | 22 +-- ...ManyUsingContainerServiceOrchestrator.java | 32 +-- .../samples/ManageContainerRegistry.java | 22 +-- .../ManageContainerRegistryWithWebhooks.java | 22 +-- ...teCosmosDBTableWithVirtualNetworkRule.java | 28 +-- ...CreateCosmosDBWithEventualConsistency.java | 22 +-- .../samples/CreateCosmosDBWithIPRange.java | 22 +-- .../CreateCosmosDBWithKindMongoDB.java | 22 +-- .../cosmos/samples/ManageHACosmosDB.java | 22 +-- .../dns/samples/ManageDns.java | 40 ++-- .../eventhubs/samples/ManageEventHub.java | 38 ++-- .../samples/ManageEventHubEvents.java | 28 +-- .../ManageEventHubGeoDisasterRecovery.java | 36 ++-- .../keyvault/samples/ManageKeyVault.java | 30 +-- ...mageFromContainerRegistryToKubernetes.java | 28 +-- .../samples/ManageKubernetesCluster.java | 20 +- ...bernetesClusterWithAdvancedNetworking.java | 24 +-- ...eSettingsBasedOnPerformanceOrSchedule.java | 26 +-- .../samples/QueryMetricsAndActivityLogs.java | 26 +-- ...SecurityBreachOrRiskActivityLogAlerts.java | 30 +-- .../WebAppPerformanceMonitoringAlerts.java | 24 +-- ...reateSimpleInternetFacingLoadBalancer.java | 36 ++-- .../samples/ManageApplicationGateway.java | 40 ++-- .../network/samples/ManageExpressRoute.java | 30 +-- .../ManageExpressRouteCrossConnection.java | 16 +- .../network/samples/ManageIPAddress.java | 34 ++-- .../samples/ManageInternalLoadBalancer.java | 54 +++--- .../ManageInternetFacingLoadBalancer.java | 52 ++--- .../samples/ManageNetworkInterface.java | 48 ++--- ...anageNetworkPeeringInSameSubscription.java | 28 +-- .../samples/ManageNetworkSecurityGroup.java | 48 ++--- .../network/samples/ManageNetworkWatcher.java | 44 ++--- .../ManageSimpleApplicationGateway.java | 18 +- ...eVirtualMachinesInParallelWithNetwork.java | 42 ++-- .../network/samples/ManageVirtualNetwork.java | 42 ++-- .../samples/ManageVirtualNetworkAsync.java | 40 ++-- .../ManageVpnGatewayPoint2SiteConnection.java | 24 +-- .../ManageVpnGatewaySite2SiteConnection.java | 30 +-- .../ManageVpnGatewayVNet2VNetConnection.java | 54 +++--- ...erifyNetworkPeeringWithNetworkWatcher.java | 38 ++-- .../privatedns/samples/ManagePrivateDns.java | 38 ++-- .../rediscache/samples/ManageRedisCache.java | 36 ++-- .../samples/DeployUsingARMTemplate.java | 30 +-- .../samples/DeployUsingARMTemplateAsync.java | 18 +- ...ngARMTemplateWithDeploymentOperations.java | 18 +- .../DeployUsingARMTemplateWithProgress.java | 32 +-- .../DeployUsingARMTemplateWithTags.java | 32 +-- .../DeployVirtualMachineUsingARMTemplate.java | 30 +-- .../resources/samples/ManageResource.java | 28 +-- .../samples/ManageResourceGroup.java | 28 +-- .../resourcemanager/samples/DockerUtils.java | 18 +- ...iceBusPublishSubscribeAdvanceFeatures.java | 32 +-- .../ServiceBusPublishSubscribeBasic.java | 28 +-- .../ServiceBusQueueAdvanceFeatures.java | 26 +-- .../samples/ServiceBusQueueBasic.java | 28 +-- ...ServiceBusWithClaimBasedAuthorization.java | 30 +-- .../sql/samples/GettingSqlServerMetrics.java | 28 +-- .../sql/samples/ManageSqlDatabase.java | 22 +-- .../ManageSqlDatabaseInElasticPool.java | 22 +-- ...qlDatabasesAcrossDifferentDataCenters.java | 42 ++-- .../sql/samples/ManageSqlFailoverGroups.java | 30 +-- .../sql/samples/ManageSqlFirewallRules.java | 22 +-- .../ManageSqlImportExportDatabase.java | 30 +-- .../samples/ManageSqlServerDnsAliases.java | 30 +-- ...nageSqlServerKeysWithAzureKeyVaultKey.java | 30 +-- .../ManageSqlServerSecurityAlertPolicy.java | 26 +-- .../samples/ManageSqlVirtualNetworkRules.java | 28 +-- ...ageSqlWithRecoveredOrRestoredDatabase.java | 22 +-- .../storage/samples/ManageStorageAccount.java | 32 +-- .../samples/ManageStorageAccountAsync.java | 28 +-- .../ManageStorageAccountNetworkRules.java | 32 +-- .../samples/ManageSimpleTrafficManager.java | 30 +-- .../samples/ManageTrafficManager.java | 36 ++-- .../samples/AppPlatformLiveOnlyTests.java | 2 +- .../AppServiceSampleLiveOnlyTests.java | 36 ++-- .../samples/AppServiceSampleTests.java | 14 +- .../samples/CdnSampleLiveOnlyTests.java | 2 +- .../samples/CdnSampleTests.java | 2 +- .../samples/ComputeSampleTests.java | 54 +++--- .../samples/ContainerInstanceTests.java | 8 +- .../samples/ContainerRegistryTests.java | 4 +- .../samples/CosmosDBTests.java | 10 +- .../samples/DnsSampleTests.java | 2 +- .../samples/EventHubsSampleTests.java | 6 +- .../samples/GraphRbacTests.java | 6 +- .../samples/KeyVaultSampleTests.java | 2 +- .../samples/KubernetesClusterTests.java | 6 +- .../resourcemanager/samples/MonitorTests.java | 8 +- .../samples/NetworkSampleTests.java | 30 +-- .../NetworkWatcherSampleLiveOnlyTests.java | 2 +- .../samples/PrivateDnsSampleTests.java | 2 +- .../samples/RedisCacheSampleTests.java | 2 +- .../samples/ResourceSampleTests.java | 18 +- .../samples/SamplesTestBase.java | 6 +- .../ServiceBusSampleLiveOnlyTests.java | 10 +- .../samples/SqlSampleTests.java | 24 +-- .../samples/StorageSampleTests.java | 6 +- .../samples/TrafficManagerSampleTests.java | 4 +- .../{Azure.java => AzureResourceManager.java} | 20 +- .../ApplicationGatewayTests.java | 76 ++++---- ...ts.java => AzureResourceManagerTests.java} | 182 +++++++++--------- .../VirtualNetworkGatewayTests.java | 34 ++-- sdk/resourcemanager/docs/AUTH.md | 2 +- 164 files changed, 2427 insertions(+), 2425 deletions(-) rename sdk/resourcemanager/azure-resourcemanager/src/main/java/com/azure/resourcemanager/{Azure.java => AzureResourceManager.java} (97%) rename sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/{AzureTests.java => AzureResourceManagerTests.java} (85%) diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appplatform/samples/ManageSpringCloud.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appplatform/samples/ManageSpringCloud.java index 1323816cf03d8..f3486d40d4af2 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appplatform/samples/ManageSpringCloud.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appplatform/samples/ManageSpringCloud.java @@ -8,7 +8,7 @@ import com.azure.core.management.AzureEnvironment; import com.azure.core.util.Configuration; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.appplatform.models.SpringApp; import com.azure.resourcemanager.appplatform.models.SpringService; import com.azure.resourcemanager.appservice.models.AppServiceCertificateOrder; @@ -66,22 +66,22 @@ public class ManageSpringCloud { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @param clientId the aad client id in azure instance * @return true if sample runs successfully * @throws IllegalStateException unexcepted state */ - public static boolean runSample(Azure azure, String clientId) throws IOException, KeyStoreException, CertificateException, NoSuchAlgorithmException { - final String rgName = azure.sdkContext().randomResourceName("rg", 24); - final String serviceName = azure.sdkContext().randomResourceName("service", 24); + public static boolean runSample(AzureResourceManager azureResourceManager, String clientId) throws IOException, KeyStoreException, CertificateException, NoSuchAlgorithmException { + final String rgName = azureResourceManager.sdkContext().randomResourceName("rg", 24); + final String serviceName = azureResourceManager.sdkContext().randomResourceName("service", 24); final Region region = Region.US_EAST; - final String domainName = azure.sdkContext().randomResourceName("jsdkdemo-", 20) + ".com"; - final String certOrderName = azure.sdkContext().randomResourceName("cert", 15); - final String vaultName = azure.sdkContext().randomResourceName("vault", 15); - final String certName = azure.sdkContext().randomResourceName("cert", 15); + final String domainName = azureResourceManager.sdkContext().randomResourceName("jsdkdemo-", 20) + ".com"; + final String certOrderName = azureResourceManager.sdkContext().randomResourceName("cert", 15); + final String vaultName = azureResourceManager.sdkContext().randomResourceName("vault", 15); + final String certName = azureResourceManager.sdkContext().randomResourceName("cert", 15); try { - azure.resourceGroups().define(rgName) + azureResourceManager.resourceGroups().define(rgName) .withRegion(region) .create(); @@ -90,7 +90,7 @@ public static boolean runSample(Azure azure, String clientId) throws IOException System.out.printf("Creating spring cloud service %s in resource group %s ...%n", serviceName, rgName); - SpringService service = azure.springServices().define(serviceName) + SpringService service = azureResourceManager.springServices().define(serviceName) .withRegion(region) .withExistingResourceGroup(rgName) .create(); @@ -159,7 +159,7 @@ public static boolean runSample(Azure azure, String clientId) throws IOException System.out.println("Purchasing a domain " + domainName + "..."); - AppServiceDomain domain = azure.appServiceDomains().define(domainName) + AppServiceDomain domain = azureResourceManager.appServiceDomains().define(domainName) .withExistingResourceGroup(rgName) .defineRegistrantContact() .withFirstName("Jon") @@ -179,7 +179,7 @@ public static boolean runSample(Azure azure, String clientId) throws IOException System.out.println("Purchased domain " + domain.name()); Utils.print(domain); - DnsZone dnsZone = azure.dnsZones().getById(domain.dnsZoneId()); + DnsZone dnsZone = azureResourceManager.dnsZones().getById(domain.dnsZoneId()); gateway.refresh(); System.out.printf("Updating dns with CNAME ssl.%s to %s%n", domainName, gateway.fqdn()); @@ -188,7 +188,7 @@ public static boolean runSample(Azure azure, String clientId) throws IOException .apply(); System.out.printf("Purchasing a certificate for *.%s and save to %s in key vault named %s ...%n", domainName, certOrderName, vaultName); - AppServiceCertificateOrder certificateOrder = azure.appServiceCertificateOrders().define(certOrderName) + AppServiceCertificateOrder certificateOrder = azureResourceManager.appServiceCertificateOrders().define(certOrderName) .withExistingResourceGroup(rgName) .withHostName(String.format("*.%s", domainName)) .withWildcardSku() @@ -200,7 +200,7 @@ public static boolean runSample(Azure azure, String clientId) throws IOException Utils.print(certificateOrder); System.out.printf("Updating key vault %s with access from %s, %s%n", vaultName, clientId, SPRING_CLOUD_SERVICE_PRINCIPAL); - Vault vault = azure.vaults().getByResourceGroup(rgName, vaultName); + Vault vault = azureResourceManager.vaults().getByResourceGroup(rgName, vaultName); vault.update() .defineAccessPolicy() .forServicePrincipal(clientId) @@ -261,7 +261,7 @@ public static boolean runSample(Azure azure, String clientId) throws IOException } finally { try { System.out.println("Delete Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); } catch (Exception g) { @@ -284,16 +284,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure, Configuration.getGlobalConfiguration().get(Configuration.PROPERTY_AZURE_CLIENT_ID)); + runSample(azureResourceManager, Configuration.getGlobalConfiguration().get(Configuration.PROPERTY_AZURE_CLIENT_ID)); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppBasic.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppBasic.java index 9c64b4477dec8..a44790fee96cc 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppBasic.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppBasic.java @@ -6,7 +6,7 @@ import com.azure.core.credential.TokenCredential; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.appservice.models.AppServicePlan; import com.azure.resourcemanager.appservice.models.FunctionApp; import com.azure.resourcemanager.appservice.models.FunctionAppBasic; @@ -28,16 +28,16 @@ public final class ManageFunctionAppBasic { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { + public static boolean runSample(AzureResourceManager azureResourceManager) { // New resources - final String app1Name = azure.sdkContext().randomResourceName("webapp1-", 20); - final String app2Name = azure.sdkContext().randomResourceName("webapp2-", 20); - final String app3Name = azure.sdkContext().randomResourceName("webapp3-", 20); - final String rg1Name = azure.sdkContext().randomResourceName("rg1NEMV_", 24); - final String rg2Name = azure.sdkContext().randomResourceName("rg2NEMV_", 24); + final String app1Name = azureResourceManager.sdkContext().randomResourceName("webapp1-", 20); + final String app2Name = azureResourceManager.sdkContext().randomResourceName("webapp2-", 20); + final String app3Name = azureResourceManager.sdkContext().randomResourceName("webapp3-", 20); + final String rg1Name = azureResourceManager.sdkContext().randomResourceName("rg1NEMV_", 24); + final String rg2Name = azureResourceManager.sdkContext().randomResourceName("rg2NEMV_", 24); try { @@ -47,7 +47,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating function app " + app1Name + " in resource group " + rg1Name + "..."); - FunctionApp app1 = azure.functionApps() + FunctionApp app1 = azureResourceManager.functionApps() .define(app1Name) .withRegion(Region.US_WEST) .withNewResourceGroup(rg1Name) @@ -60,8 +60,8 @@ public static boolean runSample(Azure azure) { // Create a second function app with the same app service plan System.out.println("Creating another function app " + app2Name + " in resource group " + rg1Name + "..."); - AppServicePlan plan = azure.appServicePlans().getById(app1.appServicePlanId()); - FunctionApp app2 = azure.functionApps() + AppServicePlan plan = azureResourceManager.appServicePlans().getById(app1.appServicePlanId()); + FunctionApp app2 = azureResourceManager.functionApps() .define(app2Name) .withRegion(Region.US_WEST) .withExistingResourceGroup(rg1Name) @@ -76,7 +76,7 @@ public static boolean runSample(Azure azure) { // in a different resource group System.out.println("Creating another function app " + app3Name + " in resource group " + rg2Name + "..."); - FunctionApp app3 = azure.functionApps() + FunctionApp app3 = azureResourceManager.functionApps() .define(app3Name) .withExistingAppServicePlan(plan) .withNewResourceGroup(rg2Name) @@ -105,13 +105,13 @@ public static boolean runSample(Azure azure) { System.out.println("Printing list of function apps in resource group " + rg1Name + "..."); - for (FunctionAppBasic functionApp : azure.functionApps().listByResourceGroup(rg1Name)) { + for (FunctionAppBasic functionApp : azureResourceManager.functionApps().listByResourceGroup(rg1Name)) { Utils.print(functionApp); } System.out.println("Printing list of function apps in resource group " + rg2Name + "..."); - for (FunctionAppBasic functionApp : azure.functionApps().listByResourceGroup(rg2Name)) { + for (FunctionAppBasic functionApp : azureResourceManager.functionApps().listByResourceGroup(rg2Name)) { Utils.print(functionApp); } @@ -119,21 +119,21 @@ public static boolean runSample(Azure azure) { // Delete a function app System.out.println("Deleting function app " + app1Name + "..."); - azure.functionApps().deleteByResourceGroup(rg1Name, app1Name); + azureResourceManager.functionApps().deleteByResourceGroup(rg1Name, app1Name); System.out.println("Deleted function app " + app1Name + "..."); System.out.println("Printing list of function apps in resource group " + rg1Name + " again..."); - for (FunctionAppBasic functionApp : azure.functionApps().listByResourceGroup(rg1Name)) { + for (FunctionAppBasic functionApp : azureResourceManager.functionApps().listByResourceGroup(rg1Name)) { Utils.print(functionApp); } return true; } finally { try { System.out.println("Deleting Resource Group: " + rg1Name); - azure.resourceGroups().beginDeleteByName(rg1Name); + azureResourceManager.resourceGroups().beginDeleteByName(rg1Name); System.out.println("Deleted Resource Group: " + rg1Name); System.out.println("Deleting Resource Group: " + rg2Name); - azure.resourceGroups().beginDeleteByName(rg2Name); + azureResourceManager.resourceGroups().beginDeleteByName(rg2Name); System.out.println("Deleted Resource Group: " + rg2Name); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -158,15 +158,15 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); - runSample(azure); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppLogs.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppLogs.java index 2d92b13ebea5a..457cf620fc0f0 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppLogs.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppLogs.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.appservice.models.FunctionApp; import com.azure.resourcemanager.appservice.models.LogLevel; import com.azure.resourcemanager.resources.fluentcore.arm.Region; @@ -34,15 +34,15 @@ public final class ManageFunctionAppLogs { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) throws IOException { + public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException { // New resources final String suffix = ".azurewebsites.net"; - final String appName = azure.sdkContext().randomResourceName("webapp1-", 20); + final String appName = azureResourceManager.sdkContext().randomResourceName("webapp1-", 20); final String appUrl = appName + suffix; - final String rgName = azure.sdkContext().randomResourceName("rg1NEMV_", 24); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rg1NEMV_", 24); try { @@ -52,7 +52,7 @@ public static boolean runSample(Azure azure) throws IOException { System.out.println("Creating function app " + appName + " in resource group " + rgName + "..."); - FunctionApp app = azure.functionApps().define(appName) + FunctionApp app = azureResourceManager.functionApps().define(appName) .withRegion(Region.US_WEST) .withNewResourceGroup(rgName) .defineDiagnosticLogsConfiguration() @@ -143,7 +143,7 @@ protected void hookOnError(Throwable throwable) { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -167,16 +167,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppSourceControl.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppSourceControl.java index 3b05434f8e8e5..3ca4317a770d7 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppSourceControl.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppSourceControl.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.appservice.models.AppServicePlan; import com.azure.resourcemanager.appservice.models.FunctionApp; import com.azure.resourcemanager.appservice.models.PublishingProfile; @@ -38,25 +38,25 @@ public final class ManageFunctionAppSourceControl { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) throws GitAPIException { + public static boolean runSample(AzureResourceManager azureResourceManager) throws GitAPIException { // New resources final String suffix = ".azurewebsites.net"; - final String app1Name = azure.sdkContext().randomResourceName("webapp1-", 20); - final String app2Name = azure.sdkContext().randomResourceName("webapp2-", 20); - final String app3Name = azure.sdkContext().randomResourceName("webapp3-", 20); - final String app4Name = azure.sdkContext().randomResourceName("webapp4-", 20); - final String app5Name = azure.sdkContext().randomResourceName("webapp5-", 20); - final String app6Name = azure.sdkContext().randomResourceName("webapp6-", 20); + final String app1Name = azureResourceManager.sdkContext().randomResourceName("webapp1-", 20); + final String app2Name = azureResourceManager.sdkContext().randomResourceName("webapp2-", 20); + final String app3Name = azureResourceManager.sdkContext().randomResourceName("webapp3-", 20); + final String app4Name = azureResourceManager.sdkContext().randomResourceName("webapp4-", 20); + final String app5Name = azureResourceManager.sdkContext().randomResourceName("webapp5-", 20); + final String app6Name = azureResourceManager.sdkContext().randomResourceName("webapp6-", 20); final String app1Url = app1Name + suffix; final String app2Url = app2Name + suffix; final String app3Url = app3Name + suffix; final String app4Url = app4Name + suffix; final String app5Url = app5Name + suffix; final String app6Url = app6Name + suffix; - final String rgName = azure.sdkContext().randomResourceName("rg1NEMV_", 24); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rg1NEMV_", 24); try { @@ -66,7 +66,7 @@ public static boolean runSample(Azure azure) throws GitAPIException { System.out.println("Creating function app " + app1Name + " in resource group " + rgName + "..."); - FunctionApp app1 = azure.functionApps().define(app1Name) + FunctionApp app1 = azureResourceManager.functionApps().define(app1Name) .withRegion(Region.US_WEST) .withNewResourceGroup(rgName) .create(); @@ -100,8 +100,8 @@ public static boolean runSample(Azure azure) throws GitAPIException { // Create a second function app with local git source control System.out.println("Creating another function app " + app2Name + " in resource group " + rgName + "..."); - AppServicePlan plan = azure.appServicePlans().getById(app1.appServicePlanId()); - FunctionApp app2 = azure.functionApps().define(app2Name) + AppServicePlan plan = azureResourceManager.appServicePlans().getById(app1.appServicePlanId()); + FunctionApp app2 = azureResourceManager.functionApps().define(app2Name) .withExistingAppServicePlan(plan) .withExistingResourceGroup(rgName) .withExistingStorageAccount(app1.storageAccount()) @@ -144,7 +144,7 @@ public static boolean runSample(Azure azure) throws GitAPIException { // Create a 3rd function app with a public GitHub repo in Azure-Samples System.out.println("Creating another function app " + app3Name + "..."); - FunctionApp app3 = azure.functionApps().define(app3Name) + FunctionApp app3 = azureResourceManager.functionApps().define(app3Name) .withExistingAppServicePlan(plan) .withNewResourceGroup(rgName) .withExistingStorageAccount(app2.storageAccount()) @@ -168,7 +168,7 @@ public static boolean runSample(Azure azure) throws GitAPIException { // Create a 4th function app with a personal GitHub repo and turn on continuous integration System.out.println("Creating another function app " + app4Name + "..."); - FunctionApp app4 = azure.functionApps() + FunctionApp app4 = azureResourceManager.functionApps() .define(app4Name) .withExistingAppServicePlan(plan) .withExistingResourceGroup(rgName) @@ -195,7 +195,7 @@ public static boolean runSample(Azure azure) throws GitAPIException { // Create a 5th function app with web deploy System.out.println("Creating another function app " + app5Name + "..."); - FunctionApp app5 = azure.functionApps() + FunctionApp app5 = azureResourceManager.functionApps() .define(app5Name) .withExistingAppServicePlan(plan) .withExistingResourceGroup(rgName) @@ -221,7 +221,7 @@ public static boolean runSample(Azure azure) throws GitAPIException { // Create a 6th function app with zip deploy System.out.println("Creating another function app " + app6Name + "..."); - FunctionApp app6 = azure.functionApps() + FunctionApp app6 = azureResourceManager.functionApps() .define(app6Name) .withExistingAppServicePlan(plan) .withExistingResourceGroup(rgName) @@ -247,7 +247,7 @@ public static boolean runSample(Azure azure) throws GitAPIException { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -271,16 +271,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppWithAuthentication.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppWithAuthentication.java index 464f0132918c3..13c02a1460f69 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppWithAuthentication.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppWithAuthentication.java @@ -6,7 +6,7 @@ import com.azure.core.credential.TokenCredential; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.appservice.models.AppServicePlan; import com.azure.resourcemanager.appservice.models.FunctionApp; import com.azure.resourcemanager.appservice.models.NameValuePair; @@ -41,19 +41,19 @@ public final class ManageFunctionAppWithAuthentication { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) throws GitAPIException { + public static boolean runSample(AzureResourceManager azureResourceManager) throws GitAPIException { // New resources final String suffix = ".azurewebsites.net"; - final String app1Name = azure.sdkContext().randomResourceName("webapp1-", 20); - final String app2Name = azure.sdkContext().randomResourceName("webapp2-", 20); - final String app3Name = azure.sdkContext().randomResourceName("webapp3-", 20); + final String app1Name = azureResourceManager.sdkContext().randomResourceName("webapp1-", 20); + final String app2Name = azureResourceManager.sdkContext().randomResourceName("webapp2-", 20); + final String app3Name = azureResourceManager.sdkContext().randomResourceName("webapp3-", 20); final String app1Url = app1Name + suffix; final String app2Url = app2Name + suffix; final String app3Url = app3Name + suffix; - final String rgName = azure.sdkContext().randomResourceName("rg1NEMV_", 24); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rg1NEMV_", 24); try { @@ -63,7 +63,7 @@ public static boolean runSample(Azure azure) throws GitAPIException { System.out.println("Creating function app " + app1Name + " in resource group " + rgName + " with admin level auth..."); - FunctionApp app1 = azure.functionApps().define(app1Name) + FunctionApp app1 = azureResourceManager.functionApps().define(app1Name) .withRegion(Region.US_WEST) .withNewResourceGroup(rgName) .withLocalGitSourceControl() @@ -76,8 +76,8 @@ public static boolean runSample(Azure azure) throws GitAPIException { // Create a second function app with function level auth System.out.println("Creating another function app " + app2Name + " in resource group " + rgName + " with function level auth..."); - AppServicePlan plan = azure.appServicePlans().getById(app1.appServicePlanId()); - FunctionApp app2 = azure.functionApps().define(app2Name) + AppServicePlan plan = azureResourceManager.appServicePlans().getById(app1.appServicePlanId()); + FunctionApp app2 = azureResourceManager.functionApps().define(app2Name) .withExistingAppServicePlan(plan) .withExistingResourceGroup(rgName) .withExistingStorageAccount(app1.storageAccount()) @@ -91,7 +91,7 @@ public static boolean runSample(Azure azure) throws GitAPIException { // Create a thrid function app with function level auth System.out.println("Creating another function app " + app3Name + " in resource group " + rgName + " with function level auth..."); - FunctionApp app3 = azure.functionApps().define(app3Name) + FunctionApp app3 = azureResourceManager.functionApps().define(app3Name) .withExistingAppServicePlan(plan) .withExistingResourceGroup(rgName) .withExistingStorageAccount(app1.storageAccount()) @@ -197,7 +197,7 @@ public static boolean runSample(Azure azure) throws GitAPIException { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -221,16 +221,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppWithDomainSsl.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppWithDomainSsl.java index 634b9c335b3f5..c2a7d4dc83634 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppWithDomainSsl.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageFunctionAppWithDomainSsl.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.appservice.models.AppServiceDomain; import com.azure.resourcemanager.appservice.models.CustomHostnameDnsRecordType; import com.azure.resourcemanager.appservice.models.FunctionApp; @@ -36,15 +36,15 @@ public final class ManageFunctionAppWithDomainSsl { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) throws IOException { + public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException { // New resources - final String app1Name = azure.sdkContext().randomResourceName("webapp1-", 20); - final String app2Name = azure.sdkContext().randomResourceName("webapp2-", 20); - final String rgName = azure.sdkContext().randomResourceName("rgNEMV_", 24); - final String domainName = azure.sdkContext().randomResourceName("jsdkdemo-", 20) + ".com"; + final String app1Name = azureResourceManager.sdkContext().randomResourceName("webapp1-", 20); + final String app2Name = azureResourceManager.sdkContext().randomResourceName("webapp2-", 20); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgNEMV_", 24); + final String domainName = azureResourceManager.sdkContext().randomResourceName("jsdkdemo-", 20) + ".com"; final String certPassword = Utils.password(); try { @@ -53,7 +53,7 @@ public static boolean runSample(Azure azure) throws IOException { System.out.println("Creating function app " + app1Name + "..."); - FunctionApp app1 = azure.functionApps().define(app1Name) + FunctionApp app1 = azureResourceManager.functionApps().define(app1Name) .withRegion(Region.US_EAST2) .withNewResourceGroup(rgName) .create(); @@ -65,7 +65,7 @@ public static boolean runSample(Azure azure) throws IOException { // Create a second function app with the same app service plan System.out.println("Creating another function app " + app2Name + "..."); - FunctionApp app2 = azure.functionApps().define(app2Name) + FunctionApp app2 = azureResourceManager.functionApps().define(app2Name) .withRegion(Region.US_EAST2) .withExistingResourceGroup(rgName) .create(); @@ -78,7 +78,7 @@ public static boolean runSample(Azure azure) throws IOException { System.out.println("Purchasing a domain " + domainName + "..."); - AppServiceDomain domain = azure.appServiceDomains().define(domainName) + AppServiceDomain domain = azureResourceManager.appServiceDomains().define(domainName) .withExistingResourceGroup(rgName) .defineRegistrantContact() .withFirstName("Jon") @@ -161,7 +161,7 @@ public static boolean runSample(Azure azure) throws IOException { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -187,16 +187,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxFunctionAppSourceControl.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxFunctionAppSourceControl.java index ab66b75cd37b1..b4d934e432383 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxFunctionAppSourceControl.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxFunctionAppSourceControl.java @@ -6,7 +6,7 @@ import com.azure.core.credential.TokenCredential; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.appservice.models.FunctionApp; import com.azure.resourcemanager.appservice.models.FunctionRuntimeStack; import com.azure.resourcemanager.appservice.models.PricingTier; @@ -31,19 +31,19 @@ public class ManageLinuxFunctionAppSourceControl { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { + public static boolean runSample(AzureResourceManager azureResourceManager) { final String suffix = ".azurewebsites.net"; - final String app1Name = azure.sdkContext().randomResourceName("webapp1-", 20); - final String app2Name = azure.sdkContext().randomResourceName("webapp2-", 20); + final String app1Name = azureResourceManager.sdkContext().randomResourceName("webapp1-", 20); + final String app2Name = azureResourceManager.sdkContext().randomResourceName("webapp2-", 20); final String app1Url = app1Name + suffix; final String app2Url = app2Name + suffix; - final String plan1Name = azure.sdkContext().randomResourceName("plan1-", 20); - final String plan2Name = azure.sdkContext().randomResourceName("plan2-", 20); - final String storage1Name = azure.sdkContext().randomResourceName("storage1", 20); - final String rgName = azure.sdkContext().randomResourceName("rg1NEMV_", 24); + final String plan1Name = azureResourceManager.sdkContext().randomResourceName("plan1-", 20); + final String plan2Name = azureResourceManager.sdkContext().randomResourceName("plan2-", 20); + final String storage1Name = azureResourceManager.sdkContext().randomResourceName("storage1", 20); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rg1NEMV_", 24); try { @@ -52,7 +52,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating function app " + app1Name + " in resource group " + rgName + "..."); - FunctionApp app1 = azure.functionApps().define(app1Name) + FunctionApp app1 = azureResourceManager.functionApps().define(app1Name) .withRegion(Region.US_WEST) .withNewResourceGroup(rgName) .withNewLinuxAppServicePlan(plan1Name, PricingTier.STANDARD_S1) @@ -89,12 +89,12 @@ public static boolean runSample(Azure azure) { System.out.println("Creating function app " + app2Name + " in resource group " + rgName + "..."); - FunctionApp app2 = azure.functionApps().define(app2Name) + FunctionApp app2 = azureResourceManager.functionApps().define(app2Name) .withRegion(Region.US_EAST) .withExistingResourceGroup(rgName) .withNewLinuxConsumptionPlan(plan2Name) .withBuiltInImage(FunctionRuntimeStack.JAVA_8) - .withExistingStorageAccount(azure.storageAccounts().getByResourceGroup(rgName, storage1Name)) + .withExistingStorageAccount(azureResourceManager.storageAccounts().getByResourceGroup(rgName, storage1Name)) .withHttpsOnly(true) .withAppSetting("WEBSITE_RUN_FROM_PACKAGE", FUNCTION_APP_PACKAGE_URL) .create(); @@ -124,7 +124,7 @@ public static boolean runSample(Azure azure) { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -149,15 +149,15 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); - runSample(azure); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppBasic.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppBasic.java index 4858124107997..f11e4f561e5f2 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppBasic.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppBasic.java @@ -6,7 +6,7 @@ import com.azure.core.credential.TokenCredential; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.appservice.models.AppServicePlan; import com.azure.resourcemanager.appservice.models.JavaVersion; import com.azure.resourcemanager.appservice.models.PricingTier; @@ -32,16 +32,16 @@ public final class ManageLinuxWebAppBasic { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { + public static boolean runSample(AzureResourceManager azureResourceManager) { // New resources - final String app1Name = azure.sdkContext().randomResourceName("webapp1-", 20); - final String app2Name = azure.sdkContext().randomResourceName("webapp2-", 20); - final String app3Name = azure.sdkContext().randomResourceName("webapp3-", 20); - final String rg1Name = azure.sdkContext().randomResourceName("rg1NEMV_", 24); - final String rg2Name = azure.sdkContext().randomResourceName("rg2NEMV_", 24); + final String app1Name = azureResourceManager.sdkContext().randomResourceName("webapp1-", 20); + final String app2Name = azureResourceManager.sdkContext().randomResourceName("webapp2-", 20); + final String app3Name = azureResourceManager.sdkContext().randomResourceName("webapp3-", 20); + final String rg1Name = azureResourceManager.sdkContext().randomResourceName("rg1NEMV_", 24); + final String rg2Name = azureResourceManager.sdkContext().randomResourceName("rg2NEMV_", 24); try { @@ -51,7 +51,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating web app " + app1Name + " in resource group " + rg1Name + "..."); - WebApp app1 = azure.webApps() + WebApp app1 = azureResourceManager.webApps() .define(app1Name) .withRegion(Region.US_WEST) .withNewResourceGroup(rg1Name) @@ -66,8 +66,8 @@ public static boolean runSample(Azure azure) { // Create a second web app with the same app service plan System.out.println("Creating another web app " + app2Name + " in resource group " + rg1Name + "..."); - AppServicePlan plan = azure.appServicePlans().getById(app1.appServicePlanId()); - WebApp app2 = azure.webApps() + AppServicePlan plan = azureResourceManager.appServicePlans().getById(app1.appServicePlanId()); + WebApp app2 = azureResourceManager.webApps() .define(app2Name) .withExistingLinuxPlan(plan) .withExistingResourceGroup(rg1Name) @@ -82,7 +82,7 @@ public static boolean runSample(Azure azure) { // in a different resource group System.out.println("Creating another web app " + app3Name + " in resource group " + rg2Name + "..."); - WebApp app3 = azure.webApps() + WebApp app3 = azureResourceManager.webApps() .define(app3Name) .withExistingLinuxPlan(plan) .withNewResourceGroup(rg2Name) @@ -121,13 +121,13 @@ public static boolean runSample(Azure azure) { System.out.println("Printing list of web apps in resource group " + rg1Name + "..."); - for (WebAppBasic webApp : azure.webApps().listByResourceGroup(rg1Name)) { + for (WebAppBasic webApp : azureResourceManager.webApps().listByResourceGroup(rg1Name)) { Utils.print(webApp); } System.out.println("Printing list of web apps in resource group " + rg2Name + "..."); - for (WebAppBasic webApp : azure.webApps().listByResourceGroup(rg2Name)) { + for (WebAppBasic webApp : azureResourceManager.webApps().listByResourceGroup(rg2Name)) { Utils.print(webApp); } @@ -135,21 +135,21 @@ public static boolean runSample(Azure azure) { // Delete a web app System.out.println("Deleting web app " + app1Name + "..."); - azure.webApps().deleteByResourceGroup(rg1Name, app1Name); + azureResourceManager.webApps().deleteByResourceGroup(rg1Name, app1Name); System.out.println("Deleted web app " + app1Name + "..."); System.out.println("Printing list of web apps in resource group " + rg1Name + " again..."); - for (WebAppBasic webApp : azure.webApps().listByResourceGroup(rg1Name)) { + for (WebAppBasic webApp : azureResourceManager.webApps().listByResourceGroup(rg1Name)) { Utils.print(webApp); } return true; } finally { try { System.out.println("Deleting Resource Group: " + rg1Name); - azure.resourceGroups().beginDeleteByName(rg1Name); + azureResourceManager.resourceGroups().beginDeleteByName(rg1Name); System.out.println("Deleted Resource Group: " + rg1Name); System.out.println("Deleting Resource Group: " + rg2Name); - azure.resourceGroups().beginDeleteByName(rg2Name); + azureResourceManager.resourceGroups().beginDeleteByName(rg2Name); System.out.println("Deleted Resource Group: " + rg2Name); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -174,15 +174,15 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); - runSample(azure); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppCosmosDbByMsi.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppCosmosDbByMsi.java index f12147a326071..51cff97549f97 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppCosmosDbByMsi.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppCosmosDbByMsi.java @@ -6,7 +6,7 @@ import com.azure.core.credential.TokenCredential; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; //import com.azure.management.containerregistry.AccessKeyType; //import com.azure.management.containerregistry.Registry; //import com.azure.management.containerregistry.RegistryCredentials; @@ -26,10 +26,10 @@ public final class ManageLinuxWebAppCosmosDbByMsi { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { + public static boolean runSample(AzureResourceManager azureResourceManager) { System.out.println("removed later"); return true; // // New resources @@ -199,15 +199,15 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); - runSample(azure); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppSourceControl.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppSourceControl.java index 92c5e1644a5c0..0b26bce7fd1d2 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppSourceControl.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppSourceControl.java @@ -6,7 +6,7 @@ import com.azure.core.credential.TokenCredential; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.appservice.models.AppServicePlan; import com.azure.resourcemanager.appservice.models.PricingTier; import com.azure.resourcemanager.appservice.models.PublishingProfile; @@ -38,21 +38,21 @@ public final class ManageLinuxWebAppSourceControl { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) throws GitAPIException { + public static boolean runSample(AzureResourceManager azureResourceManager) throws GitAPIException { // New resources final String suffix = ".azurewebsites.net"; - final String app1Name = azure.sdkContext().randomResourceName("webapp1-", 20); - final String app2Name = azure.sdkContext().randomResourceName("webapp2-", 20); - final String app3Name = azure.sdkContext().randomResourceName("webapp3-", 20); - final String app4Name = azure.sdkContext().randomResourceName("webapp4-", 20); + final String app1Name = azureResourceManager.sdkContext().randomResourceName("webapp1-", 20); + final String app2Name = azureResourceManager.sdkContext().randomResourceName("webapp2-", 20); + final String app3Name = azureResourceManager.sdkContext().randomResourceName("webapp3-", 20); + final String app4Name = azureResourceManager.sdkContext().randomResourceName("webapp4-", 20); final String app1Url = app1Name + suffix; final String app2Url = app2Name + suffix; final String app3Url = app3Name + suffix; final String app4Url = app4Name + suffix; - final String rgName = azure.sdkContext().randomResourceName("rg1NEMV_", 24); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rg1NEMV_", 24); try { @@ -62,7 +62,7 @@ public static boolean runSample(Azure azure) throws GitAPIException { System.out.println("Creating web app " + app1Name + " in resource group " + rgName + "..."); - WebApp app1 = azure.webApps().define(app1Name) + WebApp app1 = azureResourceManager.webApps().define(app1Name) .withRegion(Region.US_WEST) .withNewResourceGroup(rgName) .withNewLinuxPlan(PricingTier.STANDARD_S1) @@ -93,8 +93,8 @@ public static boolean runSample(Azure azure) throws GitAPIException { // Create a second web app with local git source control System.out.println("Creating another web app " + app2Name + " in resource group " + rgName + "..."); - AppServicePlan plan = azure.appServicePlans().getById(app1.appServicePlanId()); - WebApp app2 = azure.webApps().define(app2Name) + AppServicePlan plan = azureResourceManager.appServicePlans().getById(app1.appServicePlanId()); + WebApp app2 = azureResourceManager.webApps().define(app2Name) .withExistingLinuxPlan(plan) .withExistingResourceGroup(rgName) .withBuiltInImage(RuntimeStack.TOMCAT_8_5_JRE8) @@ -137,7 +137,7 @@ public static boolean runSample(Azure azure) throws GitAPIException { // Create a 3rd web app with a public GitHub repo in Azure-Samples System.out.println("Creating another web app " + app3Name + "..."); - WebApp app3 = azure.webApps().define(app3Name) + WebApp app3 = azureResourceManager.webApps().define(app3Name) .withExistingLinuxPlan(plan) .withNewResourceGroup(rgName) .withBuiltInImage(RuntimeStack.TOMCAT_8_5_JRE8) @@ -161,7 +161,7 @@ public static boolean runSample(Azure azure) throws GitAPIException { // Create a 4th web app with a personal GitHub repo and turn on continuous integration System.out.println("Creating another web app " + app4Name + "..."); - WebApp app4 = azure.webApps() + WebApp app4 = azureResourceManager.webApps() .define(app4Name) .withExistingLinuxPlan(plan) .withExistingResourceGroup(rgName) @@ -188,7 +188,7 @@ public static boolean runSample(Azure azure) throws GitAPIException { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -212,16 +212,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppSqlConnection.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppSqlConnection.java index 5f0516a492e8b..612355005f6a3 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppSqlConnection.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppSqlConnection.java @@ -6,7 +6,7 @@ import com.azure.core.credential.TokenCredential; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.appservice.models.PricingTier; import com.azure.resourcemanager.appservice.models.RuntimeStack; import com.azure.resourcemanager.appservice.models.WebApp; @@ -32,19 +32,19 @@ public final class ManageLinuxWebAppSqlConnection { /** * Main function which runs the actual sample. * - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) throws IOException { + public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException { // New resources final String suffix = ".azurewebsites.net"; - final String appName = azure.sdkContext().randomResourceName("webapp1-", 20); + final String appName = azureResourceManager.sdkContext().randomResourceName("webapp1-", 20); final String appUrl = appName + suffix; - final String sqlServerName = azure.sdkContext().randomResourceName("jsdkserver", 20); - final String sqlDbName = azure.sdkContext().randomResourceName("jsdkdb", 20); + final String sqlServerName = azureResourceManager.sdkContext().randomResourceName("jsdkserver", 20); + final String sqlDbName = azureResourceManager.sdkContext().randomResourceName("jsdkdb", 20); final String admin = "jsdkadmin"; final String password = Utils.password(); - final String rgName = azure.sdkContext().randomResourceName("rg1NEMV_", 24); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rg1NEMV_", 24); try { @@ -54,7 +54,7 @@ public static boolean runSample(Azure azure) throws IOException { System.out.println("Creating SQL server " + sqlServerName + "..."); - SqlServer server = azure.sqlServers().define(sqlServerName) + SqlServer server = azureResourceManager.sqlServers().define(sqlServerName) .withRegion(Region.US_WEST) .withNewResourceGroup(rgName) .withAdministratorLogin(admin) @@ -77,7 +77,7 @@ public static boolean runSample(Azure azure) throws IOException { System.out.println("Creating web app " + appName + "..."); - WebApp app = azure.webApps().define(appName) + WebApp app = azureResourceManager.webApps().define(appName) .withRegion(Region.US_WEST) .withExistingResourceGroup(rgName) .withNewLinuxPlan(PricingTier.STANDARD_S1) @@ -117,7 +117,7 @@ public static boolean runSample(Azure azure) throws IOException { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -143,16 +143,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppStorageAccountConnection.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppStorageAccountConnection.java index 3dcc90a0f8666..a6dea358bf04a 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppStorageAccountConnection.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppStorageAccountConnection.java @@ -7,7 +7,7 @@ import com.azure.core.http.HttpClient; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.appservice.models.ConnectionStringType; import com.azure.resourcemanager.appservice.models.PricingTier; import com.azure.resourcemanager.appservice.models.RuntimeStack; @@ -44,17 +44,17 @@ public final class ManageLinuxWebAppStorageAccountConnection { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { + public static boolean runSample(AzureResourceManager azureResourceManager) { // New resources final String suffix = ".azurewebsites.net"; - final String app1Name = azure.sdkContext().randomResourceName("webapp1-", 20); + final String app1Name = azureResourceManager.sdkContext().randomResourceName("webapp1-", 20); final String app1Url = app1Name + suffix; - final String storageName = azure.sdkContext().randomResourceName("jsdkstore", 20); - final String containerName = azure.sdkContext().randomResourceName("jcontainer", 20); - final String rgName = azure.sdkContext().randomResourceName("rg1NEMV_", 24); + final String storageName = azureResourceManager.sdkContext().randomResourceName("jsdkstore", 20); + final String containerName = azureResourceManager.sdkContext().randomResourceName("jcontainer", 20); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rg1NEMV_", 24); try { @@ -63,7 +63,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating storage account " + storageName + "..."); - StorageAccount storageAccount = azure.storageAccounts().define(storageName) + StorageAccount storageAccount = azureResourceManager.storageAccounts().define(storageName) .withRegion(Region.US_WEST) .withNewResourceGroup(rgName) .create(); @@ -92,7 +92,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating web app " + app1Name + "..."); // note: the env variable will not work in linux since dot is not allowed in env variable name - WebApp app1 = azure.webApps().define(app1Name) + WebApp app1 = azureResourceManager.webApps().define(app1Name) .withRegion(Region.US_WEST) .withExistingResourceGroup(rgName) .withNewLinuxPlan(PricingTier.STANDARD_S1) @@ -126,7 +126,7 @@ public static boolean runSample(Azure azure) { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -151,16 +151,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppWithContainerRegistry.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppWithContainerRegistry.java index 115ef7e5c1e98..dbc208e158fec 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppWithContainerRegistry.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppWithContainerRegistry.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.appservice.models.PricingTier; import com.azure.resourcemanager.appservice.models.WebApp; import com.azure.resourcemanager.containerregistry.models.AccessKeyType; @@ -45,13 +45,13 @@ public class ManageLinuxWebAppWithContainerRegistry { /** * Main function which runs the actual sample. * - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) throws IOException, InterruptedException { - final String rgName = azure.sdkContext().randomResourceName("rgACR", 15); - final String acrName = azure.sdkContext().randomResourceName("acrsample", 20); - final String appName = azure.sdkContext().randomResourceName("webapp", 20); + public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException, InterruptedException { + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgACR", 15); + final String acrName = azureResourceManager.sdkContext().randomResourceName("acrsample", 20); + final String appName = azureResourceManager.sdkContext().randomResourceName("webapp", 20); final String appUrl = appName + ".azurewebsites.net"; final Region region = Region.US_EAST; final String dockerImageName = "tomcat"; @@ -66,7 +66,7 @@ public static boolean runSample(Azure azure) throws IOException, InterruptedExce Date t1 = new Date(); - Registry azureRegistry = azure.containerRegistries().define(acrName) + Registry azureRegistry = azureResourceManager.containerRegistries().define(acrName) .withRegion(region) .withNewResourceGroup(rgName) .withBasicSku() @@ -82,7 +82,7 @@ public static boolean runSample(Azure azure) throws IOException, InterruptedExce // Create a Docker client that will be used to push/pull images to/from the Azure Container Registry RegistryCredentials acrCredentials = azureRegistry.getCredentials(); - DockerClient dockerClient = DockerUtils.createDockerClient(azure, rgName, region, + DockerClient dockerClient = DockerUtils.createDockerClient(azureResourceManager, rgName, region, azureRegistry.loginServerUrl(), acrCredentials.username(), acrCredentials.accessKeys().get(AccessKeyType.PRIMARY)); //============================================================= @@ -136,7 +136,7 @@ public static boolean runSample(Azure azure) throws IOException, InterruptedExce System.out.println("Creating web app " + appName + " in resource group " + rgName + "..."); - WebApp app = azure.webApps().define(appName) + WebApp app = azureResourceManager.webApps().define(appName) .withRegion(Region.US_WEST) .withExistingResourceGroup(rgName) .withNewLinuxPlan(PricingTier.STANDARD_S1) @@ -159,7 +159,7 @@ public static boolean runSample(Azure azure) throws IOException, InterruptedExce } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -184,16 +184,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppWithDomainSsl.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppWithDomainSsl.java index aad08930a0e9f..d9875a835de45 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppWithDomainSsl.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppWithDomainSsl.java @@ -6,7 +6,7 @@ import com.azure.core.credential.TokenCredential; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.appservice.models.AppServiceDomain; import com.azure.resourcemanager.appservice.models.AppServicePlan; import com.azure.resourcemanager.appservice.models.CustomHostnameDnsRecordType; @@ -39,15 +39,15 @@ public final class ManageLinuxWebAppWithDomainSsl { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) throws IOException { + public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException { // New resources - final String app1Name = azure.sdkContext().randomResourceName("webapp1-", 20); - final String app2Name = azure.sdkContext().randomResourceName("webapp2-", 20); - final String rgName = azure.sdkContext().randomResourceName("rgNEMV_", 24); - final String domainName = azure.sdkContext().randomResourceName("jsdkdemo-", 20) + ".com"; + final String app1Name = azureResourceManager.sdkContext().randomResourceName("webapp1-", 20); + final String app2Name = azureResourceManager.sdkContext().randomResourceName("webapp2-", 20); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgNEMV_", 24); + final String domainName = azureResourceManager.sdkContext().randomResourceName("jsdkdemo-", 20) + ".com"; final String certPassword = Utils.password(); try { @@ -56,7 +56,7 @@ public static boolean runSample(Azure azure) throws IOException { System.out.println("Creating web app " + app1Name + "..."); - WebApp app1 = azure.webApps().define(app1Name) + WebApp app1 = azureResourceManager.webApps().define(app1Name) .withRegion(Region.US_WEST) .withNewResourceGroup(rgName) .withNewLinuxPlan(PricingTier.STANDARD_S1) @@ -70,8 +70,8 @@ public static boolean runSample(Azure azure) throws IOException { // Create a second web app with the same app service plan System.out.println("Creating another web app " + app2Name + "..."); - AppServicePlan plan = azure.appServicePlans().getById(app1.appServicePlanId()); - WebApp app2 = azure.webApps().define(app2Name) + AppServicePlan plan = azureResourceManager.appServicePlans().getById(app1.appServicePlanId()); + WebApp app2 = azureResourceManager.webApps().define(app2Name) .withExistingLinuxPlan(plan) .withExistingResourceGroup(rgName) .withBuiltInImage(RuntimeStack.NODEJS_6_9) @@ -85,7 +85,7 @@ public static boolean runSample(Azure azure) throws IOException { System.out.println("Purchasing a domain " + domainName + "..."); - AppServiceDomain domain = azure.appServiceDomains().define(domainName) + AppServiceDomain domain = azureResourceManager.appServiceDomains().define(domainName) .withExistingResourceGroup(rgName) .defineRegistrantContact() .withFirstName("Jon") @@ -168,7 +168,7 @@ public static boolean runSample(Azure azure) throws IOException { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -194,16 +194,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppWithTrafficManager.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppWithTrafficManager.java index 114d839f45a4e..418ab919b74db 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppWithTrafficManager.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageLinuxWebAppWithTrafficManager.java @@ -8,7 +8,7 @@ import com.azure.core.management.AzureEnvironment; import com.azure.core.management.profile.AzureProfile; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.appservice.models.AppServiceDomain; import com.azure.resourcemanager.appservice.models.AppServicePlan; import com.azure.resourcemanager.appservice.models.OperatingSystem; @@ -42,33 +42,33 @@ public final class ManageLinuxWebAppWithTrafficManager { private static final String CERT_PASSWORD = "StrongPass!12"; - private static Azure azure; + private static AzureResourceManager azureResourceManager; private static AppServiceDomain domain; private static String pfxPath; /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) throws IOException { - rgName = azure.sdkContext().randomResourceName("rgNEMV_", 24); + public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException { + rgName = azureResourceManager.sdkContext().randomResourceName("rgNEMV_", 24); - if (ManageLinuxWebAppWithTrafficManager.azure == null) { - ManageLinuxWebAppWithTrafficManager.azure = azure; + if (ManageLinuxWebAppWithTrafficManager.azureResourceManager == null) { + ManageLinuxWebAppWithTrafficManager.azureResourceManager = azureResourceManager; } // New resources - final String app1Name = azure.sdkContext().randomResourceName("webapp1-", 20); - final String app2Name = azure.sdkContext().randomResourceName("webapp2-", 20); - final String app3Name = azure.sdkContext().randomResourceName("webapp3-", 20); - final String app4Name = azure.sdkContext().randomResourceName("webapp4-", 20); - final String app5Name = azure.sdkContext().randomResourceName("webapp5-", 20); - final String plan1Name = azure.sdkContext().randomResourceName("jplan1_", 15); - final String plan2Name = azure.sdkContext().randomResourceName("jplan2_", 15); - final String plan3Name = azure.sdkContext().randomResourceName("jplan3_", 15); - final String domainName = azure.sdkContext().randomResourceName("jsdkdemo-", 20) + ".com"; - final String tmName = azure.sdkContext().randomResourceName("jsdktm-", 20); + final String app1Name = azureResourceManager.sdkContext().randomResourceName("webapp1-", 20); + final String app2Name = azureResourceManager.sdkContext().randomResourceName("webapp2-", 20); + final String app3Name = azureResourceManager.sdkContext().randomResourceName("webapp3-", 20); + final String app4Name = azureResourceManager.sdkContext().randomResourceName("webapp4-", 20); + final String app5Name = azureResourceManager.sdkContext().randomResourceName("webapp5-", 20); + final String plan1Name = azureResourceManager.sdkContext().randomResourceName("jplan1_", 15); + final String plan2Name = azureResourceManager.sdkContext().randomResourceName("jplan2_", 15); + final String plan3Name = azureResourceManager.sdkContext().randomResourceName("jplan3_", 15); + final String domainName = azureResourceManager.sdkContext().randomResourceName("jsdkdemo-", 20) + ".com"; + final String tmName = azureResourceManager.sdkContext().randomResourceName("jsdktm-", 20); try { @@ -77,11 +77,11 @@ public static boolean runSample(Azure azure) throws IOException { System.out.println("Purchasing a domain " + domainName + "..."); - azure.resourceGroups().define(rgName) + azureResourceManager.resourceGroups().define(rgName) .withRegion(Region.US_WEST) .create(); - domain = azure.appServiceDomains().define(domainName) + domain = azureResourceManager.appServiceDomains().define(domainName) .withExistingResourceGroup(rgName) .defineRegistrantContact() .withFirstName("Jon") @@ -174,7 +174,7 @@ public static boolean runSample(Azure azure) throws IOException { System.out.println("Creating a traffic manager " + tmName + " for the web apps..."); - TrafficManagerProfile trafficManager = azure.trafficManagerProfiles().define(tmName) + TrafficManagerProfile trafficManager = azureResourceManager.trafficManagerProfiles().define(tmName) .withExistingResourceGroup(rgName) .withLeafDomainLabel(tmName) .withTrafficRoutingMethod(TrafficRoutingMethod.PRIORITY) @@ -229,7 +229,7 @@ public static boolean runSample(Azure azure) throws IOException { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -240,7 +240,7 @@ public static boolean runSample(Azure azure) throws IOException { } private static AppServicePlan createAppServicePlan(String name, Region region) { - return azure.appServicePlans().define(name) + return azureResourceManager.appServicePlans().define(name) .withRegion(region) .withExistingResourceGroup(rgName) .withPricingTier(PricingTier.STANDARD_S2) @@ -249,7 +249,7 @@ private static AppServicePlan createAppServicePlan(String name, Region region) { } private static WebApp createWebApp(String name, AppServicePlan plan) { - return azure.webApps().define(name) + return azureResourceManager.webApps().define(name) .withExistingLinuxPlan(plan) .withExistingResourceGroup(rgName) .withBuiltInImage(RuntimeStack.NODEJS_4_5) @@ -280,16 +280,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppBasic.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppBasic.java index fd17f81259715..cb375f06bca2a 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppBasic.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppBasic.java @@ -6,7 +6,7 @@ import com.azure.core.credential.TokenCredential; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.appservice.models.AppServicePlan; import com.azure.resourcemanager.appservice.models.JavaVersion; import com.azure.resourcemanager.appservice.models.PricingTier; @@ -31,16 +31,16 @@ public final class ManageWebAppBasic { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { + public static boolean runSample(AzureResourceManager azureResourceManager) { // New resources - final String app1Name = azure.sdkContext().randomResourceName("webapp1-", 20); - final String app2Name = azure.sdkContext().randomResourceName("webapp2-", 20); - final String app3Name = azure.sdkContext().randomResourceName("webapp3-", 20); - final String rg1Name = azure.sdkContext().randomResourceName("rg1NEMV_", 24); - final String rg2Name = azure.sdkContext().randomResourceName("rg2NEMV_", 24); + final String app1Name = azureResourceManager.sdkContext().randomResourceName("webapp1-", 20); + final String app2Name = azureResourceManager.sdkContext().randomResourceName("webapp2-", 20); + final String app3Name = azureResourceManager.sdkContext().randomResourceName("webapp3-", 20); + final String rg1Name = azureResourceManager.sdkContext().randomResourceName("rg1NEMV_", 24); + final String rg2Name = azureResourceManager.sdkContext().randomResourceName("rg2NEMV_", 24); try { @@ -50,7 +50,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating web app " + app1Name + " in resource group " + rg1Name + "..."); - WebApp app1 = azure.webApps() + WebApp app1 = azureResourceManager.webApps() .define(app1Name) .withRegion(Region.US_WEST) .withNewResourceGroup(rg1Name) @@ -64,8 +64,8 @@ public static boolean runSample(Azure azure) { // Create a second web app with the same app service plan System.out.println("Creating another web app " + app2Name + " in resource group " + rg1Name + "..."); - AppServicePlan plan = azure.appServicePlans().getById(app1.appServicePlanId()); - WebApp app2 = azure.webApps() + AppServicePlan plan = azureResourceManager.appServicePlans().getById(app1.appServicePlanId()); + WebApp app2 = azureResourceManager.webApps() .define(app2Name) .withExistingWindowsPlan(plan) .withExistingResourceGroup(rg1Name) @@ -79,7 +79,7 @@ public static boolean runSample(Azure azure) { // in a different resource group System.out.println("Creating another web app " + app3Name + " in resource group " + rg2Name + "..."); - WebApp app3 = azure.webApps() + WebApp app3 = azureResourceManager.webApps() .define(app3Name) .withExistingWindowsPlan(plan) .withNewResourceGroup(rg2Name) @@ -117,13 +117,13 @@ public static boolean runSample(Azure azure) { System.out.println("Printing list of web apps in resource group " + rg1Name + "..."); - for (WebAppBasic webApp : azure.webApps().listByResourceGroup(rg1Name)) { + for (WebAppBasic webApp : azureResourceManager.webApps().listByResourceGroup(rg1Name)) { Utils.print(webApp); } System.out.println("Printing list of web apps in resource group " + rg2Name + "..."); - for (WebAppBasic webApp : azure.webApps().listByResourceGroup(rg2Name)) { + for (WebAppBasic webApp : azureResourceManager.webApps().listByResourceGroup(rg2Name)) { Utils.print(webApp); } @@ -131,21 +131,21 @@ public static boolean runSample(Azure azure) { // Delete a web app System.out.println("Deleting web app " + app1Name + "..."); - azure.webApps().deleteByResourceGroup(rg1Name, app1Name); + azureResourceManager.webApps().deleteByResourceGroup(rg1Name, app1Name); System.out.println("Deleted web app " + app1Name + "..."); System.out.println("Printing list of web apps in resource group " + rg1Name + " again..."); - for (WebAppBasic webApp : azure.webApps().listByResourceGroup(rg1Name)) { + for (WebAppBasic webApp : azureResourceManager.webApps().listByResourceGroup(rg1Name)) { Utils.print(webApp); } return true; } finally { try { System.out.println("Deleting Resource Group: " + rg1Name); - azure.resourceGroups().beginDeleteByName(rg1Name); + azureResourceManager.resourceGroups().beginDeleteByName(rg1Name); System.out.println("Deleted Resource Group: " + rg1Name); System.out.println("Deleting Resource Group: " + rg2Name); - azure.resourceGroups().beginDeleteByName(rg2Name); + azureResourceManager.resourceGroups().beginDeleteByName(rg2Name); System.out.println("Deleted Resource Group: " + rg2Name); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -170,15 +170,15 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); - runSample(azure); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppCosmosDbByMsi.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppCosmosDbByMsi.java index 8a0b817f0424a..e9d50261933cc 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppCosmosDbByMsi.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppCosmosDbByMsi.java @@ -8,10 +8,10 @@ import com.azure.core.util.Configuration; import com.azure.identity.DefaultAzureCredentialBuilder; import com.azure.core.management.profile.AzureProfile; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.security.keyvault.secrets.SecretClient; import com.azure.security.keyvault.secrets.SecretClientBuilder; import com.azure.security.keyvault.secrets.models.KeyVaultSecret; -import com.azure.resourcemanager.Azure; import com.azure.resourcemanager.appservice.models.JavaVersion; import com.azure.resourcemanager.appservice.models.PricingTier; import com.azure.resourcemanager.appservice.models.WebApp; @@ -37,18 +37,18 @@ public final class ManageWebAppCosmosDbByMsi { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @param credential the credential to use * @param clientId the client ID * @return true if sample runs successfully */ - public static boolean runSample(Azure azure, TokenCredential credential, String clientId) { + public static boolean runSample(AzureResourceManager azureResourceManager, TokenCredential credential, String clientId) { // New resources final Region region = Region.US_WEST; - final String appName = azure.sdkContext().randomResourceName("webapp1-", 20); - final String rgName = azure.sdkContext().randomResourceName("rg1NEMV_", 24); - final String vaultName = azure.sdkContext().randomResourceName("vault", 20); - final String cosmosName = azure.sdkContext().randomResourceName("cosmosdb", 20); + final String appName = azureResourceManager.sdkContext().randomResourceName("webapp1-", 20); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rg1NEMV_", 24); + final String vaultName = azureResourceManager.sdkContext().randomResourceName("vault", 20); + final String cosmosName = azureResourceManager.sdkContext().randomResourceName("cosmosdb", 20); final String appUrl = appName + ".azurewebsites.net"; try { @@ -56,7 +56,7 @@ public static boolean runSample(Azure azure, TokenCredential credential, String // Create a CosmosDB System.out.println("Creating a CosmosDB..."); - CosmosDBAccount cosmosDBAccount = azure.cosmosDBAccounts().define(cosmosName) + CosmosDBAccount cosmosDBAccount = azureResourceManager.cosmosDBAccounts().define(cosmosName) .withRegion(region) .withNewResourceGroup(rgName) .withKind(DatabaseAccountKind.GLOBAL_DOCUMENT_DB) @@ -71,7 +71,7 @@ public static boolean runSample(Azure azure, TokenCredential credential, String //============================================================ // Create a key vault - Vault vault = azure.vaults() + Vault vault = azureResourceManager.vaults() .define(vaultName) .withRegion(region) .withExistingResourceGroup(rgName) @@ -101,7 +101,7 @@ public static boolean runSample(Azure azure, TokenCredential credential, String System.out.println("Creating web app " + appName + " in resource group " + rgName + "..."); - WebApp app = azure.webApps() + WebApp app = azureResourceManager.webApps() .define(appName) .withRegion(Region.US_WEST) .withNewResourceGroup(rgName) @@ -148,7 +148,7 @@ public static boolean runSample(Azure azure, TokenCredential credential, String } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -174,15 +174,15 @@ public static void main(String[] args) { .build(); final Configuration configuration = Configuration.getGlobalConfiguration(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); - runSample(azure, credential, configuration.get(Configuration.PROPERTY_AZURE_CLIENT_ID)); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); + runSample(azureResourceManager, credential, configuration.get(Configuration.PROPERTY_AZURE_CLIENT_ID)); } catch (Exception e) { System.out.println(e.getMessage()); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppCosmosDbThroughKeyVault.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppCosmosDbThroughKeyVault.java index 5b11044b15815..95f588c1c0e4e 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppCosmosDbThroughKeyVault.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppCosmosDbThroughKeyVault.java @@ -7,7 +7,7 @@ import com.azure.core.management.AzureEnvironment; import com.azure.core.util.Configuration; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.appservice.models.JavaVersion; import com.azure.resourcemanager.appservice.models.PricingTier; import com.azure.resourcemanager.appservice.models.WebApp; @@ -34,17 +34,17 @@ public final class ManageWebAppCosmosDbThroughKeyVault { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @param clientId the client ID * @return true if sample runs successfully */ - public static boolean runSample(Azure azure, String clientId) { + public static boolean runSample(AzureResourceManager azureResourceManager, String clientId) { // New resources final Region region = Region.US_WEST; - final String appName = azure.sdkContext().randomResourceName("webapp1-", 20); - final String rgName = azure.sdkContext().randomResourceName("rg1NEMV_", 24); - final String vaultName = azure.sdkContext().randomResourceName("vault", 20); - final String cosmosName = azure.sdkContext().randomResourceName("cosmosdb", 20); + final String appName = azureResourceManager.sdkContext().randomResourceName("webapp1-", 20); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rg1NEMV_", 24); + final String vaultName = azureResourceManager.sdkContext().randomResourceName("vault", 20); + final String cosmosName = azureResourceManager.sdkContext().randomResourceName("cosmosdb", 20); final String appUrl = appName + ".azurewebsites.net"; try { @@ -52,7 +52,7 @@ public static boolean runSample(Azure azure, String clientId) { // Create a CosmosDB System.out.println("Creating a CosmosDB..."); - CosmosDBAccount cosmosDBAccount = azure.cosmosDBAccounts().define(cosmosName) + CosmosDBAccount cosmosDBAccount = azureResourceManager.cosmosDBAccounts().define(cosmosName) .withRegion(region) .withNewResourceGroup(rgName) .withKind(DatabaseAccountKind.GLOBAL_DOCUMENT_DB) @@ -67,7 +67,7 @@ public static boolean runSample(Azure azure, String clientId) { //============================================================ // Create a key vault - Vault vault = azure.vaults() + Vault vault = azureResourceManager.vaults() .define(vaultName) .withRegion(region) .withExistingResourceGroup(rgName) @@ -100,7 +100,7 @@ public static boolean runSample(Azure azure, String clientId) { System.out.println("Creating web app " + appName + " in resource group " + rgName + "..."); - WebApp app = azure.webApps() + WebApp app = azureResourceManager.webApps() .define(appName) .withRegion(Region.US_WEST) .withNewResourceGroup(rgName) @@ -147,7 +147,7 @@ public static boolean runSample(Azure azure, String clientId) { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -173,15 +173,15 @@ public static void main(String[] args) { .build(); final Configuration configuration = Configuration.getGlobalConfiguration(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); - runSample(azure, configuration.get(Configuration.PROPERTY_AZURE_CLIENT_ID)); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); + runSample(azureResourceManager, configuration.get(Configuration.PROPERTY_AZURE_CLIENT_ID)); } catch (Exception e) { System.out.println(e.getMessage()); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppLogs.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppLogs.java index 19af85b850a30..d8a1684bf069d 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppLogs.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppLogs.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.appservice.models.JavaVersion; import com.azure.resourcemanager.appservice.models.PricingTier; import com.azure.resourcemanager.appservice.models.WebApp; @@ -38,15 +38,15 @@ public final class ManageWebAppLogs { /** * Main function which runs the actual sample. * - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) throws IOException { + public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException { // New resources final String suffix = ".azurewebsites.net"; - final String appName = azure.sdkContext().randomResourceName("webapp1-", 20); + final String appName = azureResourceManager.sdkContext().randomResourceName("webapp1-", 20); final String appUrl = appName + suffix; - final String rgName = azure.sdkContext().randomResourceName("rg1NEMV_", 24); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rg1NEMV_", 24); try { @@ -55,7 +55,7 @@ public static boolean runSample(Azure azure) throws IOException { System.out.println("Creating web app " + appName + " in resource group " + rgName + "..."); - final WebApp app = azure.webApps().define(appName) + final WebApp app = azureResourceManager.webApps().define(appName) .withRegion(Region.US_WEST) .withNewResourceGroup(rgName) .withNewWindowsPlan(PricingTier.BASIC_B1) @@ -155,7 +155,7 @@ protected void hookOnError(Throwable throwable) { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -181,16 +181,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppSlots.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppSlots.java index 7f6f022a19dd4..9747a3e127df7 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppSlots.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppSlots.java @@ -6,7 +6,7 @@ import com.azure.core.credential.TokenCredential; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.appservice.models.DeploymentSlot; import com.azure.resourcemanager.appservice.models.JavaVersion; import com.azure.resourcemanager.appservice.models.PricingTier; @@ -32,29 +32,29 @@ public final class ManageWebAppSlots { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { + public static boolean runSample(AzureResourceManager azureResourceManager) { // New resources - final String resourceGroupName = azure.sdkContext().randomResourceName("rg", 24); - final String app1Name = azure.sdkContext().randomResourceName("webapp1-", 20); - final String app2Name = azure.sdkContext().randomResourceName("webapp2-", 20); - final String app3Name = azure.sdkContext().randomResourceName("webapp3-", 20); + final String resourceGroupName = azureResourceManager.sdkContext().randomResourceName("rg", 24); + final String app1Name = azureResourceManager.sdkContext().randomResourceName("webapp1-", 20); + final String app2Name = azureResourceManager.sdkContext().randomResourceName("webapp2-", 20); + final String app3Name = azureResourceManager.sdkContext().randomResourceName("webapp3-", 20); final String slotName = "staging"; try { - azure.resourceGroups().define(resourceGroupName) + azureResourceManager.resourceGroups().define(resourceGroupName) .withRegion(Region.US_EAST) .create(); //============================================================ // Create 3 web apps with 3 new app service plans in different regions - WebApp app1 = createWebApp(azure, app1Name, Region.US_EAST, resourceGroupName); - WebApp app2 = createWebApp(azure, app2Name, Region.EUROPE_WEST, resourceGroupName); - WebApp app3 = createWebApp(azure, app3Name, Region.ASIA_EAST, resourceGroupName); + WebApp app1 = createWebApp(azureResourceManager, app1Name, Region.US_EAST, resourceGroupName); + WebApp app2 = createWebApp(azureResourceManager, app2Name, Region.EUROPE_WEST, resourceGroupName); + WebApp app3 = createWebApp(azureResourceManager, app3Name, Region.ASIA_EAST, resourceGroupName); //============================================================ @@ -80,7 +80,7 @@ public static boolean runSample(Azure azure) { } finally { try { System.out.println("Deleting Resource Group: " + resourceGroupName); - azure.resourceGroups().beginDeleteByName(resourceGroupName); + azureResourceManager.resourceGroups().beginDeleteByName(resourceGroupName); System.out.println("Deleted Resource Group: " + resourceGroupName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -105,16 +105,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); @@ -122,12 +122,12 @@ public static void main(String[] args) { } } - private static WebApp createWebApp(Azure azure, String appName, Region region, String resourceGroupName) { + private static WebApp createWebApp(AzureResourceManager azureResourceManager, String appName, Region region, String resourceGroupName) { final String appUrl = appName + SUFFIX; System.out.println("Creating web app " + appName + " with master branch..."); - WebApp app = azure.webApps() + WebApp app = azureResourceManager.webApps() .define(appName) .withRegion(region) .withExistingResourceGroup(resourceGroupName) diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppSourceControl.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppSourceControl.java index df284d81cdf01..adfdd08689731 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppSourceControl.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppSourceControl.java @@ -6,7 +6,7 @@ import com.azure.core.credential.TokenCredential; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.appservice.models.AppServicePlan; import com.azure.resourcemanager.appservice.models.JavaVersion; import com.azure.resourcemanager.appservice.models.PricingTier; @@ -43,19 +43,19 @@ public final class ManageWebAppSourceControl { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) throws GitAPIException { + public static boolean runSample(AzureResourceManager azureResourceManager) throws GitAPIException { // New resources final String suffix = ".azurewebsites.net"; - final String app1Name = azure.sdkContext().randomResourceName("webapp1-", 20); - final String app2Name = azure.sdkContext().randomResourceName("webapp2-", 20); - final String app3Name = azure.sdkContext().randomResourceName("webapp3-", 20); - final String app4Name = azure.sdkContext().randomResourceName("webapp4-", 20); - final String app5Name = azure.sdkContext().randomResourceName("webapp5-", 20); - final String app6Name = azure.sdkContext().randomResourceName("webapp6-", 20); - final String app7Name = azure.sdkContext().randomResourceName("webapp7-", 20); + final String app1Name = azureResourceManager.sdkContext().randomResourceName("webapp1-", 20); + final String app2Name = azureResourceManager.sdkContext().randomResourceName("webapp2-", 20); + final String app3Name = azureResourceManager.sdkContext().randomResourceName("webapp3-", 20); + final String app4Name = azureResourceManager.sdkContext().randomResourceName("webapp4-", 20); + final String app5Name = azureResourceManager.sdkContext().randomResourceName("webapp5-", 20); + final String app6Name = azureResourceManager.sdkContext().randomResourceName("webapp6-", 20); + final String app7Name = azureResourceManager.sdkContext().randomResourceName("webapp7-", 20); final String app1Url = app1Name + suffix; final String app2Url = app2Name + suffix; final String app3Url = app3Name + suffix; @@ -63,8 +63,8 @@ public static boolean runSample(Azure azure) throws GitAPIException { final String app5Url = app5Name + suffix; final String app6Url = app6Name + suffix; final String app7Url = app7Name + suffix; - final String rgName = azure.sdkContext().randomResourceName("rg1NEMV_", 24); - final String rg7Name = azure.sdkContext().randomResourceName("rg7NEMV_", 24); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rg1NEMV_", 24); + final String rg7Name = azureResourceManager.sdkContext().randomResourceName("rg7NEMV_", 24); try { @@ -73,7 +73,7 @@ public static boolean runSample(Azure azure) throws GitAPIException { System.out.println("Creating web app " + app1Name + " in resource group " + rgName + "..."); - WebApp app1 = azure.webApps().define(app1Name) + WebApp app1 = azureResourceManager.webApps().define(app1Name) .withRegion(Region.US_WEST) .withNewResourceGroup(rgName) .withNewWindowsPlan(PricingTier.STANDARD_S1) @@ -105,8 +105,8 @@ public static boolean runSample(Azure azure) throws GitAPIException { // Create a second web app with local git source control System.out.println("Creating another web app " + app2Name + " in resource group " + rgName + "..."); - AppServicePlan plan = azure.appServicePlans().getById(app1.appServicePlanId()); - WebApp app2 = azure.webApps().define(app2Name) + AppServicePlan plan = azureResourceManager.appServicePlans().getById(app1.appServicePlanId()); + WebApp app2 = azureResourceManager.webApps().define(app2Name) .withExistingWindowsPlan(plan) .withExistingResourceGroup(rgName) .withLocalGitSourceControl() @@ -150,7 +150,7 @@ public static boolean runSample(Azure azure) throws GitAPIException { // Create a 3rd web app with a public GitHub repo in Azure-Samples System.out.println("Creating another web app " + app3Name + "..."); - WebApp app3 = azure.webApps().define(app3Name) + WebApp app3 = azureResourceManager.webApps().define(app3Name) .withExistingWindowsPlan(plan) .withNewResourceGroup(rgName) .defineSourceControl() @@ -173,7 +173,7 @@ public static boolean runSample(Azure azure) throws GitAPIException { // Create a 4th web app with a personal GitHub repo and turn on continuous integration System.out.println("Creating another web app " + app4Name + "..."); - WebApp app4 = azure.webApps() + WebApp app4 = azureResourceManager.webApps() .define(app4Name) .withExistingWindowsPlan(plan) .withExistingResourceGroup(rgName) @@ -200,7 +200,7 @@ public static boolean runSample(Azure azure) throws GitAPIException { System.out.println("Creating web app " + app5Name + " in resource group " + rgName + "..."); - WebApp app5 = azure.webApps().define(app5Name) + WebApp app5 = azureResourceManager.webApps().define(app5Name) .withExistingWindowsPlan(plan) .withExistingResourceGroup(rgName) .withJavaVersion(JavaVersion.JAVA_8_NEWEST) @@ -244,7 +244,7 @@ public static boolean runSample(Azure azure) throws GitAPIException { System.out.println("Creating web app " + app6Name + " in resource group " + rgName + "..."); - WebApp app6 = azure.webApps().define(app6Name) + WebApp app6 = azureResourceManager.webApps().define(app6Name) .withExistingWindowsPlan(plan) .withExistingResourceGroup(rgName) .withJavaVersion(JavaVersion.JAVA_8_NEWEST) @@ -287,7 +287,7 @@ public static boolean runSample(Azure azure) throws GitAPIException { System.out.println("Creating web app " + app7Name + " in resource group " + rgName + "..."); - WebApp app7 = azure.webApps().define(app7Name) + WebApp app7 = azureResourceManager.webApps().define(app7Name) .withRegion(Region.US_WEST) .withNewResourceGroup(rg7Name) .withNewLinuxPlan(PricingTier.STANDARD_S2) @@ -321,8 +321,8 @@ public static boolean runSample(Azure azure) throws GitAPIException { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); - azure.resourceGroups().beginDeleteByName(rg7Name); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rg7Name); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -346,16 +346,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppSourceControlAsync.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppSourceControlAsync.java index 073fa4f1e536b..6fd32f94e02e7 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppSourceControlAsync.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppSourceControlAsync.java @@ -8,7 +8,7 @@ import com.azure.core.management.AzureEnvironment; import com.azure.core.management.profile.AzureProfile; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.appservice.models.JavaVersion; import com.azure.resourcemanager.appservice.models.PricingTier; import com.azure.resourcemanager.appservice.models.WebContainer; @@ -37,22 +37,22 @@ public final class ManageWebAppSourceControlAsync { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(final Azure azure) { + public static boolean runSample(final AzureResourceManager azureResourceManager) { // New resources final String suffix = ".azurewebsites.net"; - final String app1Name = azure.sdkContext().randomResourceName("webapp1-", 20); - final String app2Name = azure.sdkContext().randomResourceName("webapp2-", 20); - final String app3Name = azure.sdkContext().randomResourceName("webapp3-", 20); - final String app4Name = azure.sdkContext().randomResourceName("webapp4-", 20); + final String app1Name = azureResourceManager.sdkContext().randomResourceName("webapp1-", 20); + final String app2Name = azureResourceManager.sdkContext().randomResourceName("webapp2-", 20); + final String app3Name = azureResourceManager.sdkContext().randomResourceName("webapp3-", 20); + final String app4Name = azureResourceManager.sdkContext().randomResourceName("webapp4-", 20); final String app1Url = app1Name + suffix; final String app2Url = app2Name + suffix; final String app3Url = app3Name + suffix; final String app4Url = app4Name + suffix; - final String planName = azure.sdkContext().randomResourceName("jplan_", 15); - final String rgName = azure.sdkContext().randomResourceName("rg1NEMV_", 24); + final String planName = azureResourceManager.sdkContext().randomResourceName("jplan_", 15); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rg1NEMV_", 24); try { @@ -62,7 +62,7 @@ public static boolean runSample(final Azure azure) { System.out.println("Creating web app " + app1Name + " in resource group " + rgName + "..."); - Flux app1Observable = azure.webApps().define(app1Name) + Flux app1Observable = azureResourceManager.webApps().define(app1Name) .withRegion(Region.US_WEST) .withNewResourceGroup(rgName) .withNewWindowsPlan(PricingTier.STANDARD_S1) @@ -89,18 +89,18 @@ public static boolean runSample(final Azure azure) { System.out.println("Creating another web app " + app3Name + "..."); System.out.println("Creating another web app " + app4Name + "..."); - Flux app234Observable = azure.appServicePlans() + Flux app234Observable = azureResourceManager.appServicePlans() .getByResourceGroupAsync(rgName, planName) .flatMapMany(plan -> { return Flux.merge( - azure.webApps().define(app2Name) + azureResourceManager.webApps().define(app2Name) .withExistingWindowsPlan(plan) .withExistingResourceGroup(rgName) .withLocalGitSourceControl() .withJavaVersion(JavaVersion.JAVA_8_NEWEST) .withWebContainer(WebContainer.TOMCAT_8_0_NEWEST) .createAsync(), - azure.webApps().define(app3Name) + azureResourceManager.webApps().define(app3Name) .withExistingWindowsPlan(plan) .withNewResourceGroup(rgName) .defineSourceControl() @@ -109,7 +109,7 @@ public static boolean runSample(final Azure azure) { .withBranch("master") .attach() .createAsync(), - azure.webApps() + azureResourceManager.webApps() .define(app4Name) .withExistingWindowsPlan(plan) .withExistingResourceGroup(rgName) @@ -179,7 +179,7 @@ public static boolean runSample(final Azure azure) { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -203,16 +203,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppSqlConnection.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppSqlConnection.java index 3802454840b0c..ccf6d95603606 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppSqlConnection.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppSqlConnection.java @@ -6,7 +6,7 @@ import com.azure.core.credential.TokenCredential; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.appservice.models.PhpVersion; import com.azure.resourcemanager.appservice.models.PricingTier; import com.azure.resourcemanager.appservice.models.WebApp; @@ -31,19 +31,19 @@ public final class ManageWebAppSqlConnection { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) throws IOException { + public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException { // New resources final String suffix = ".azurewebsites.net"; - final String appName = azure.sdkContext().randomResourceName("webapp1-", 20); + final String appName = azureResourceManager.sdkContext().randomResourceName("webapp1-", 20); final String appUrl = appName + suffix; - final String sqlServerName = azure.sdkContext().randomResourceName("jsdkserver", 20); - final String sqlDbName = azure.sdkContext().randomResourceName("jsdkdb", 20); + final String sqlServerName = azureResourceManager.sdkContext().randomResourceName("jsdkserver", 20); + final String sqlDbName = azureResourceManager.sdkContext().randomResourceName("jsdkdb", 20); final String admin = "jsdkadmin"; final String password = Utils.password(); - final String rgName = azure.sdkContext().randomResourceName("rg1NEMV_", 24); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rg1NEMV_", 24); try { @@ -53,7 +53,7 @@ public static boolean runSample(Azure azure) throws IOException { System.out.println("Creating SQL server " + sqlServerName + "..."); - SqlServer server = azure.sqlServers().define(sqlServerName) + SqlServer server = azureResourceManager.sqlServers().define(sqlServerName) .withRegion(Region.US_WEST) .withNewResourceGroup(rgName) .withAdministratorLogin(admin) @@ -76,7 +76,7 @@ public static boolean runSample(Azure azure) throws IOException { System.out.println("Creating web app " + appName + "..."); - WebApp app = azure.webApps().define(appName) + WebApp app = azureResourceManager.webApps().define(appName) .withRegion(Region.US_WEST) .withExistingResourceGroup(rgName) .withNewWindowsPlan(PricingTier.STANDARD_S1) @@ -116,7 +116,7 @@ public static boolean runSample(Azure azure) throws IOException { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -140,16 +140,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppStorageAccountConnection.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppStorageAccountConnection.java index ad39d388783cb..214e5e6c552c2 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppStorageAccountConnection.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppStorageAccountConnection.java @@ -7,7 +7,7 @@ import com.azure.core.http.HttpClient; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.appservice.models.ConnectionStringType; import com.azure.resourcemanager.appservice.models.JavaVersion; import com.azure.resourcemanager.appservice.models.PricingTier; @@ -45,17 +45,17 @@ public final class ManageWebAppStorageAccountConnection { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { + public static boolean runSample(AzureResourceManager azureResourceManager) { // New resources final String suffix = ".azurewebsites.net"; - final String app1Name = azure.sdkContext().randomResourceName("webapp1-", 20); + final String app1Name = azureResourceManager.sdkContext().randomResourceName("webapp1-", 20); final String app1Url = app1Name + suffix; - final String storageName = azure.sdkContext().randomResourceName("jsdkstore", 20); - final String containerName = azure.sdkContext().randomResourceName("jcontainer", 20); - final String rgName = azure.sdkContext().randomResourceName("rg1NEMV_", 24); + final String storageName = azureResourceManager.sdkContext().randomResourceName("jsdkstore", 20); + final String containerName = azureResourceManager.sdkContext().randomResourceName("jcontainer", 20); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rg1NEMV_", 24); try { @@ -64,7 +64,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating storage account " + storageName + "..."); - StorageAccount storageAccount = azure.storageAccounts().define(storageName) + StorageAccount storageAccount = azureResourceManager.storageAccounts().define(storageName) .withRegion(Region.US_WEST) .withNewResourceGroup(rgName) .create(); @@ -92,7 +92,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating web app " + app1Name + "..."); - WebApp app1 = azure.webApps().define(app1Name) + WebApp app1 = azureResourceManager.webApps().define(app1Name) .withRegion(Region.US_WEST) .withExistingResourceGroup(rgName) .withNewWindowsPlan(PricingTier.STANDARD_S1) @@ -127,7 +127,7 @@ public static boolean runSample(Azure azure) { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -152,16 +152,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppWithAuthentication.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppWithAuthentication.java index 19f736609c2da..280138a06adf1 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppWithAuthentication.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppWithAuthentication.java @@ -6,7 +6,7 @@ import com.azure.core.credential.TokenCredential; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.appservice.models.AppServicePlan; import com.azure.resourcemanager.appservice.models.BuiltInAuthenticationProvider; import com.azure.resourcemanager.appservice.models.JavaVersion; @@ -32,21 +32,21 @@ public final class ManageWebAppWithAuthentication { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { + public static boolean runSample(AzureResourceManager azureResourceManager) { // New resources final String suffix = ".azurewebsites.net"; - final String app1Name = azure.sdkContext().randomResourceName("webapp1-", 20); - final String app2Name = azure.sdkContext().randomResourceName("webapp2-", 20); - final String app3Name = azure.sdkContext().randomResourceName("webapp3-", 20); - final String app4Name = azure.sdkContext().randomResourceName("webapp4-", 20); + final String app1Name = azureResourceManager.sdkContext().randomResourceName("webapp1-", 20); + final String app2Name = azureResourceManager.sdkContext().randomResourceName("webapp2-", 20); + final String app3Name = azureResourceManager.sdkContext().randomResourceName("webapp3-", 20); + final String app4Name = azureResourceManager.sdkContext().randomResourceName("webapp4-", 20); final String app1Url = app1Name + suffix; final String app2Url = app2Name + suffix; final String app3Url = app3Name + suffix; final String app4Url = app4Name + suffix; - final String rgName = azure.sdkContext().randomResourceName("rg1NEMV_", 24); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rg1NEMV_", 24); try { @@ -56,7 +56,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating web app " + app1Name + " in resource group " + rgName + "..."); - WebApp app1 = azure.webApps().define(app1Name) + WebApp app1 = azureResourceManager.webApps().define(app1Name) .withRegion(Region.US_WEST) .withNewResourceGroup(rgName) .withNewWindowsPlan(PricingTier.STANDARD_S1) @@ -93,8 +93,8 @@ public static boolean runSample(Azure azure) { // Create a second web app System.out.println("Creating another web app " + app2Name + " in resource group " + rgName + "..."); - AppServicePlan plan = azure.appServicePlans().getById(app1.appServicePlanId()); - WebApp app2 = azure.webApps().define(app2Name) + AppServicePlan plan = azureResourceManager.appServicePlans().getById(app1.appServicePlanId()); + WebApp app2 = azureResourceManager.webApps().define(app2Name) .withExistingWindowsPlan(plan) .withExistingResourceGroup(rgName) .withJavaVersion(JavaVersion.JAVA_8_NEWEST) @@ -129,7 +129,7 @@ public static boolean runSample(Azure azure) { // Create a 3rd web app with a public GitHub repo in Azure-Samples System.out.println("Creating another web app " + app3Name + "..."); - WebApp app3 = azure.webApps().define(app3Name) + WebApp app3 = azureResourceManager.webApps().define(app3Name) .withExistingWindowsPlan(plan) .withNewResourceGroup(rgName) .defineSourceControl() @@ -166,7 +166,7 @@ public static boolean runSample(Azure azure) { // Create a 4th web app System.out.println("Creating another web app " + app4Name + "..."); - WebApp app4 = azure.webApps() + WebApp app4 = azureResourceManager.webApps() .define(app4Name) .withExistingWindowsPlan(plan) .withExistingResourceGroup(rgName) @@ -200,7 +200,7 @@ public static boolean runSample(Azure azure) { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -224,16 +224,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppWithDomainSsl.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppWithDomainSsl.java index 97f49b136ef24..998baea33eeb1 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppWithDomainSsl.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppWithDomainSsl.java @@ -6,7 +6,7 @@ import com.azure.core.credential.TokenCredential; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.appservice.models.AppServiceDomain; import com.azure.resourcemanager.appservice.models.AppServicePlan; import com.azure.resourcemanager.appservice.models.CustomHostnameDnsRecordType; @@ -38,15 +38,15 @@ public final class ManageWebAppWithDomainSsl { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) throws IOException { + public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException { // New resources - final String app1Name = azure.sdkContext().randomResourceName("webapp1-", 20); - final String app2Name = azure.sdkContext().randomResourceName("webapp2-", 20); - final String rgName = azure.sdkContext().randomResourceName("rgNEMV_", 24); - final String domainName = azure.sdkContext().randomResourceName("jsdkdemo-", 20) + ".com"; + final String app1Name = azureResourceManager.sdkContext().randomResourceName("webapp1-", 20); + final String app2Name = azureResourceManager.sdkContext().randomResourceName("webapp2-", 20); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgNEMV_", 24); + final String domainName = azureResourceManager.sdkContext().randomResourceName("jsdkdemo-", 20) + ".com"; final String certPassword = Utils.password(); try { @@ -55,7 +55,7 @@ public static boolean runSample(Azure azure) throws IOException { System.out.println("Creating web app " + app1Name + "..."); - WebApp app1 = azure.webApps().define(app1Name) + WebApp app1 = azureResourceManager.webApps().define(app1Name) .withRegion(Region.US_WEST) .withNewResourceGroup(rgName) .withNewWindowsPlan(PricingTier.STANDARD_S1) @@ -68,8 +68,8 @@ public static boolean runSample(Azure azure) throws IOException { // Create a second web app with the same app service plan System.out.println("Creating another web app " + app2Name + "..."); - AppServicePlan plan = azure.appServicePlans().getById(app1.appServicePlanId()); - WebApp app2 = azure.webApps().define(app2Name) + AppServicePlan plan = azureResourceManager.appServicePlans().getById(app1.appServicePlanId()); + WebApp app2 = azureResourceManager.webApps().define(app2Name) .withExistingWindowsPlan(plan) .withExistingResourceGroup(rgName) .create(); @@ -82,7 +82,7 @@ public static boolean runSample(Azure azure) throws IOException { System.out.println("Purchasing a domain " + domainName + "..."); - AppServiceDomain domain = azure.appServiceDomains().define(domainName) + AppServiceDomain domain = azureResourceManager.appServiceDomains().define(domainName) .withExistingResourceGroup(rgName) .defineRegistrantContact() .withFirstName("Jon") @@ -165,7 +165,7 @@ public static boolean runSample(Azure azure) throws IOException { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -190,16 +190,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppWithTrafficManager.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppWithTrafficManager.java index 90e0270736a18..0961be79ee04d 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppWithTrafficManager.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/appservice/samples/ManageWebAppWithTrafficManager.java @@ -8,7 +8,7 @@ import com.azure.core.management.AzureEnvironment; import com.azure.core.management.profile.AzureProfile; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.appservice.models.AppServiceDomain; import com.azure.resourcemanager.appservice.models.AppServicePlan; import com.azure.resourcemanager.appservice.models.OperatingSystem; @@ -40,33 +40,33 @@ public final class ManageWebAppWithTrafficManager { private static final String CERT_PASSWORD = "StrongPass!12"; - private static Azure azure; + private static AzureResourceManager azureResourceManager; private static AppServiceDomain domain; private static String pfxPath; /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) throws IOException { - rgName = azure.sdkContext().randomResourceName("rgNEMV_", 24); + public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException { + rgName = azureResourceManager.sdkContext().randomResourceName("rgNEMV_", 24); - if (ManageWebAppWithTrafficManager.azure == null) { - ManageWebAppWithTrafficManager.azure = azure; + if (ManageWebAppWithTrafficManager.azureResourceManager == null) { + ManageWebAppWithTrafficManager.azureResourceManager = azureResourceManager; } // New resources - final String app1Name = azure.sdkContext().randomResourceName("webapp1-", 20); - final String app2Name = azure.sdkContext().randomResourceName("webapp2-", 20); - final String app3Name = azure.sdkContext().randomResourceName("webapp3-", 20); - final String app4Name = azure.sdkContext().randomResourceName("webapp4-", 20); - final String app5Name = azure.sdkContext().randomResourceName("webapp5-", 20); - final String plan1Name = azure.sdkContext().randomResourceName("jplan1_", 15); - final String plan2Name = azure.sdkContext().randomResourceName("jplan2_", 15); - final String plan3Name = azure.sdkContext().randomResourceName("jplan3_", 15); - final String domainName = azure.sdkContext().randomResourceName("jsdkdemo-", 20) + ".com"; - final String tmName = azure.sdkContext().randomResourceName("jsdktm-", 20); + final String app1Name = azureResourceManager.sdkContext().randomResourceName("webapp1-", 20); + final String app2Name = azureResourceManager.sdkContext().randomResourceName("webapp2-", 20); + final String app3Name = azureResourceManager.sdkContext().randomResourceName("webapp3-", 20); + final String app4Name = azureResourceManager.sdkContext().randomResourceName("webapp4-", 20); + final String app5Name = azureResourceManager.sdkContext().randomResourceName("webapp5-", 20); + final String plan1Name = azureResourceManager.sdkContext().randomResourceName("jplan1_", 15); + final String plan2Name = azureResourceManager.sdkContext().randomResourceName("jplan2_", 15); + final String plan3Name = azureResourceManager.sdkContext().randomResourceName("jplan3_", 15); + final String domainName = azureResourceManager.sdkContext().randomResourceName("jsdkdemo-", 20) + ".com"; + final String tmName = azureResourceManager.sdkContext().randomResourceName("jsdktm-", 20); try { @@ -75,11 +75,11 @@ public static boolean runSample(Azure azure) throws IOException { System.out.println("Purchasing a domain " + domainName + "..."); - azure.resourceGroups().define(rgName) + azureResourceManager.resourceGroups().define(rgName) .withRegion(Region.US_WEST) .create(); - domain = azure.appServiceDomains().define(domainName) + domain = azureResourceManager.appServiceDomains().define(domainName) .withExistingResourceGroup(rgName) .defineRegistrantContact() .withFirstName("Jon") @@ -172,7 +172,7 @@ public static boolean runSample(Azure azure) throws IOException { System.out.println("Creating a traffic manager " + tmName + " for the web apps..."); - TrafficManagerProfile trafficManager = azure.trafficManagerProfiles().define(tmName) + TrafficManagerProfile trafficManager = azureResourceManager.trafficManagerProfiles().define(tmName) .withExistingResourceGroup(rgName) .withLeafDomainLabel(tmName) .withTrafficRoutingMethod(TrafficRoutingMethod.PRIORITY) @@ -227,7 +227,7 @@ public static boolean runSample(Azure azure) throws IOException { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -238,7 +238,7 @@ public static boolean runSample(Azure azure) throws IOException { } private static AppServicePlan createAppServicePlan(String name, Region region) { - return azure.appServicePlans().define(name) + return azureResourceManager.appServicePlans().define(name) .withRegion(region) .withExistingResourceGroup(rgName) .withPricingTier(PricingTier.STANDARD_S1) @@ -247,7 +247,7 @@ private static AppServicePlan createAppServicePlan(String name, Region region) { } private static WebApp createWebApp(String name, AppServicePlan plan) { - return azure.webApps().define(name) + return azureResourceManager.webApps().define(name) .withExistingWindowsPlan(plan) .withExistingResourceGroup(rgName) .withManagedHostnameBindings(domain, name) @@ -277,16 +277,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/authorization/samples/ManageServicePrincipalCredentials.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/authorization/samples/ManageServicePrincipalCredentials.java index 3f5ece3a869b5..0e00b89dfbc7a 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/authorization/samples/ManageServicePrincipalCredentials.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/authorization/samples/ManageServicePrincipalCredentials.java @@ -10,8 +10,8 @@ import com.azure.identity.ClientSecretCredentialBuilder; import com.azure.identity.DefaultAzureCredentialBuilder; import com.azure.core.management.profile.AzureProfile; +import com.azure.resourcemanager.AzureResourceManager; import com.google.common.io.ByteStreams; -import com.azure.resourcemanager.Azure; import com.azure.resourcemanager.authorization.models.BuiltInRole; import com.azure.resourcemanager.authorization.models.RoleAssignment; import com.azure.resourcemanager.authorization.models.ServicePrincipal; @@ -39,7 +39,7 @@ public final class ManageServicePrincipalCredentials { * @param profile the profile the sample is running in * @return true if sample runs successfully */ - public static boolean runSample(Azure.Authenticated authenticated, AzureProfile profile) throws IOException { + public static boolean runSample(AzureResourceManager.Authenticated authenticated, AzureProfile profile) throws IOException { final String spName = authenticated.sdkContext().randomResourceName("sp", 20); final String appName = authenticated.sdkContext().randomResourceName("app", 20); final String appUrl = "https://" + appName; @@ -105,7 +105,7 @@ public static boolean runSample(Azure.Authenticated authenticated, AzureProfile .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); try { - Azure.authenticate(testCredential, profile).withDefaultSubscription(); + AzureResourceManager.authenticate(testCredential, profile).withDefaultSubscription(); System.out.println("Verified " + passwordName1 + " is valid."); } catch (Exception e) { @@ -121,7 +121,7 @@ public static boolean runSample(Azure.Authenticated authenticated, AzureProfile .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); try { - Azure.authenticate(testCredential, profile).withDefaultSubscription(); + AzureResourceManager.authenticate(testCredential, profile).withDefaultSubscription(); System.out.println("Verified " + passwordName2 + " is valid."); } catch (Exception e) { @@ -137,7 +137,7 @@ public static boolean runSample(Azure.Authenticated authenticated, AzureProfile .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); try { - Azure.authenticate(testCredential, profile).withDefaultSubscription(); + AzureResourceManager.authenticate(testCredential, profile).withDefaultSubscription(); System.out.println("Verified " + certName1 + " is valid."); } catch (Exception e) { @@ -168,7 +168,7 @@ public static boolean runSample(Azure.Authenticated authenticated, AzureProfile .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); try { - Azure.authenticate(testCredential, profile).withDefaultSubscription(); + AzureResourceManager.authenticate(testCredential, profile).withDefaultSubscription(); System.out.println("Failed to verify " + passwordName1 + " is revoked."); } catch (Exception e) { @@ -196,7 +196,7 @@ public static boolean runSample(Azure.Authenticated authenticated, AzureProfile .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); try { - Azure.authenticate(testCredential, profile).withDefaultSubscription() + AzureResourceManager.authenticate(testCredential, profile).withDefaultSubscription() .resourceGroups().list(); System.out.println("Failed to verify " + passwordName2 + " has no access to subscription."); @@ -229,7 +229,7 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure.Authenticated authenticated = Azure + AzureResourceManager.Authenticated authenticated = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/authorization/samples/ManageUsersGroupsAndRoles.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/authorization/samples/ManageUsersGroupsAndRoles.java index 984664c26776f..49ee8a63bc9be 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/authorization/samples/ManageUsersGroupsAndRoles.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/authorization/samples/ManageUsersGroupsAndRoles.java @@ -8,7 +8,7 @@ import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; import com.azure.core.management.profile.AzureProfile; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.authorization.models.ActiveDirectoryGroup; import com.azure.resourcemanager.authorization.models.ActiveDirectoryUser; import com.azure.resourcemanager.authorization.models.BuiltInRole; @@ -37,7 +37,7 @@ public final class ManageUsersGroupsAndRoles { * @param profile the profile works with sample * @return true if sample runs successfully */ - public static boolean runSample(Azure.Authenticated authenticated, AzureProfile profile) { + public static boolean runSample(AzureResourceManager.Authenticated authenticated, AzureProfile profile) { final String userEmail = authenticated.sdkContext().randomResourceName("test", 15); final String userName = userEmail.replace("test", "Test "); final String spName = authenticated.sdkContext().randomResourceName("sp", 15); @@ -166,7 +166,7 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure.Authenticated authenticated = Azure + AzureResourceManager.Authenticated authenticated = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cdn/samples/ManageCdnProfileWithCustomDomain.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cdn/samples/ManageCdnProfileWithCustomDomain.java index 6c8d03c44a799..4ba6e6b482570 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cdn/samples/ManageCdnProfileWithCustomDomain.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cdn/samples/ManageCdnProfileWithCustomDomain.java @@ -8,7 +8,7 @@ import com.azure.core.management.AzureEnvironment; import com.azure.core.management.profile.AzureProfile; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.appservice.models.AppServiceDomain; import com.azure.resourcemanager.cdn.models.CdnEndpoint; import com.azure.resourcemanager.cdn.models.CdnProfile; @@ -31,20 +31,20 @@ public class ManageCdnProfileWithCustomDomain { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String rgName = azure.sdkContext().randomResourceName("rgNEMV", 24); - final String domainName = azure.sdkContext().randomResourceName("jsdkcdn", 15) + ".com"; - final String cdnProfileName = azure.sdkContext().randomResourceName("jsdkcdnp", 24); - final String cdnEndpointName = azure.sdkContext().randomResourceName("jsdkcdne", 24); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgNEMV", 24); + final String domainName = azureResourceManager.sdkContext().randomResourceName("jsdkcdn", 15) + ".com"; + final String cdnProfileName = azureResourceManager.sdkContext().randomResourceName("jsdkcdnp", 24); + final String cdnEndpointName = azureResourceManager.sdkContext().randomResourceName("jsdkcdne", 24); final Region region = Region.US_WEST; final String cnameRecordName = "sample"; String customDomain = cnameRecordName + "." + domainName; try { - azure.resourceGroups().define(rgName) + azureResourceManager.resourceGroups().define(rgName) .withRegion(region) .create(); @@ -52,7 +52,7 @@ public static boolean runSample(Azure azure) { // Purchase a domain System.out.println("Purchasing a domain " + domainName + "..."); - AppServiceDomain domain = azure.appServiceDomains().define(domainName) + AppServiceDomain domain = azureResourceManager.appServiceDomains().define(domainName) .withExistingResourceGroup(rgName) .defineRegistrantContact() .withFirstName("Jon") @@ -75,7 +75,7 @@ public static boolean runSample(Azure azure) { // Create root DNS zone System.out.println("Creating root DNS zone " + domainName + "..."); - DnsZone dnsZone = azure.dnsZones().define(domainName) + DnsZone dnsZone = azureResourceManager.dnsZones().define(domainName) .withExistingResourceGroup(rgName) .create(); System.out.println("Created root DNS zone " + dnsZone.name()); @@ -93,7 +93,7 @@ public static boolean runSample(Azure azure) { // Create CDN profile System.out.println("Creating CDN profile " + cdnProfileName + "..."); - CdnProfile cdnProfile = azure.cdnProfiles().define(cdnProfileName) + CdnProfile cdnProfile = azureResourceManager.cdnProfiles().define(cdnProfileName) .withRegion(region) .withExistingResourceGroup(rgName) .withStandardAkamaiSku() @@ -139,7 +139,7 @@ public static boolean runSample(Azure azure) { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -162,16 +162,16 @@ public static void main(String[] args) { final TokenCredential credential = new DefaultAzureCredentialBuilder() .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cdn/samples/ManageCdnProfileWithWebApp.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cdn/samples/ManageCdnProfileWithWebApp.java index 5eda8ed3a293e..cac1913425649 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cdn/samples/ManageCdnProfileWithWebApp.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cdn/samples/ManageCdnProfileWithWebApp.java @@ -8,7 +8,7 @@ import com.azure.core.management.AzureEnvironment; import com.azure.core.management.profile.AzureProfile; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.appservice.models.JavaVersion; import com.azure.resourcemanager.appservice.models.PricingTier; import com.azure.resourcemanager.appservice.models.WebApp; @@ -40,44 +40,44 @@ public class ManageCdnProfileWithWebApp { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String resourceGroupName = azure.sdkContext().randomResourceName("rg", 20); - final String cdnProfileName = azure.sdkContext().randomResourceName("cdnStandardProfile", 20); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String resourceGroupName = azureResourceManager.sdkContext().randomResourceName("rg", 20); + final String cdnProfileName = azureResourceManager.sdkContext().randomResourceName("cdnStandardProfile", 20); String[] appNames = new String[8]; try { // ============================================================ // Create a resource group for holding all the created resources - azure.resourceGroups().define(resourceGroupName) + azureResourceManager.resourceGroups().define(resourceGroupName) .withRegion(Region.US_CENTRAL) .create(); // ============================================================ // Create 8 websites for (int i = 0; i < 8; i++) { - appNames[i] = azure.sdkContext().randomResourceName("webapp" + (i + 1) + "-", 20); + appNames[i] = azureResourceManager.sdkContext().randomResourceName("webapp" + (i + 1) + "-", 20); } // 2 in US - createWebApp(appNames[0], Region.US_WEST, azure, resourceGroupName); - createWebApp(appNames[1], Region.US_EAST, azure, resourceGroupName); + createWebApp(appNames[0], Region.US_WEST, azureResourceManager, resourceGroupName); + createWebApp(appNames[1], Region.US_EAST, azureResourceManager, resourceGroupName); // 2 in EU - createWebApp(appNames[2], Region.EUROPE_WEST, azure, resourceGroupName); - createWebApp(appNames[3], Region.EUROPE_NORTH, azure, resourceGroupName); + createWebApp(appNames[2], Region.EUROPE_WEST, azureResourceManager, resourceGroupName); + createWebApp(appNames[3], Region.EUROPE_NORTH, azureResourceManager, resourceGroupName); // 2 in Southeast - createWebApp(appNames[4], Region.ASIA_SOUTHEAST, azure, resourceGroupName); - createWebApp(appNames[5], Region.AUSTRALIA_SOUTHEAST, azure, resourceGroupName); + createWebApp(appNames[4], Region.ASIA_SOUTHEAST, azureResourceManager, resourceGroupName); + createWebApp(appNames[5], Region.AUSTRALIA_SOUTHEAST, azureResourceManager, resourceGroupName); // 1 in Brazil - createWebApp(appNames[6], Region.BRAZIL_SOUTH, azure, resourceGroupName); + createWebApp(appNames[6], Region.BRAZIL_SOUTH, azureResourceManager, resourceGroupName); // 1 in Japan - createWebApp(appNames[7], Region.JAPAN_WEST, azure, resourceGroupName); + createWebApp(appNames[7], Region.JAPAN_WEST, azureResourceManager, resourceGroupName); // ======================================================================================= // Create CDN profile using Standard Verizon SKU with endpoints in each region of Web apps. @@ -85,7 +85,7 @@ public static boolean runSample(Azure azure) { // Create CDN Profile definition object that will let us do a for loop // to define all 8 endpoints and then parallelize their creation - CdnProfile.DefinitionStages.WithStandardCreate profileDefinition = azure.cdnProfiles().define(cdnProfileName) + CdnProfile.DefinitionStages.WithStandardCreate profileDefinition = azureResourceManager.cdnProfiles().define(cdnProfileName) .withRegion(Region.US_CENTRAL) .withExistingResourceGroup(resourceGroupName) .withStandardVerizonSku(); @@ -117,9 +117,9 @@ public static boolean runSample(Azure azure) { } return true; } finally { - if (azure.resourceGroups().getByName(resourceGroupName) != null) { + if (azureResourceManager.resourceGroups().getByName(resourceGroupName) != null) { System.out.println("Deleting Resource Group: " + resourceGroupName); - azure.resourceGroups().deleteByName(resourceGroupName); + azureResourceManager.resourceGroups().deleteByName(resourceGroupName); System.out.println("Deleted Resource Group: " + resourceGroupName); } else { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -140,28 +140,28 @@ public static void main(String[] args) { final TokenCredential credential = new DefaultAzureCredentialBuilder() .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); } } - private static WebApp createWebApp(String appName, Region region, Azure azure, String resourceGroupName) { + private static WebApp createWebApp(String appName, Region region, AzureResourceManager azureResourceManager, String resourceGroupName) { final String appUrl = appName + SUFFIX; System.out.println("Creating web app " + appName + " with master branch..."); - WebApp app = azure.webApps() + WebApp app = azureResourceManager.webApps() .define(appName) .withRegion(region) .withExistingResourceGroup(resourceGroupName) diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ConvertVirtualMachineToManagedDisks.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ConvertVirtualMachineToManagedDisks.java index 26990f712108c..f6f4d6c2b6fc8 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ConvertVirtualMachineToManagedDisks.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ConvertVirtualMachineToManagedDisks.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.KnownLinuxVirtualMachineImage; import com.azure.resourcemanager.compute.models.VirtualMachine; import com.azure.resourcemanager.compute.models.VirtualMachineSizeTypes; @@ -26,12 +26,12 @@ public final class ConvertVirtualMachineToManagedDisks { /** * Main function which runs the actual sample. * - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String linuxVMName = azure.sdkContext().randomResourceName("VM1", 15); - final String rgName = azure.sdkContext().randomResourceName("rgCOMV", 15); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String linuxVMName = azureResourceManager.sdkContext().randomResourceName("VM1", 15); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgCOMV", 15); final String userName = "tirekicker"; final String password = Utils.password(); final Region region = Region.US_WEST; @@ -42,7 +42,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating an un-managed Linux VM"); - VirtualMachine linuxVM = azure.virtualMachines().define(linuxVMName) + VirtualMachine linuxVM = azureResourceManager.virtualMachines().define(linuxVMName) .withRegion(region) .withNewResourceGroup(rgName) .withNewPrimaryNetwork("10.0.0.0/28") @@ -88,7 +88,7 @@ public static boolean runSample(Azure azure) { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -112,16 +112,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachineUsingCustomImageFromVHD.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachineUsingCustomImageFromVHD.java index 48f057e142cb8..c6fc4681b0314 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachineUsingCustomImageFromVHD.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachineUsingCustomImageFromVHD.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.KnownLinuxVirtualMachineImage; import com.azure.resourcemanager.compute.models.VirtualMachine; import com.azure.resourcemanager.resources.fluentcore.arm.Region; @@ -41,16 +41,16 @@ public final class CreateVirtualMachineUsingCustomImageFromVHD { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String linuxVMName1 = azure.sdkContext().randomResourceName("VM1", 10); - final String linuxVMName2 = azure.sdkContext().randomResourceName("VM2", 10); - final String linuxVMName3 = azure.sdkContext().randomResourceName("VM3", 10); - final String customImageName = azure.sdkContext().randomResourceName("img", 10); - final String rgName = azure.sdkContext().randomResourceName("rgCOMV", 15); - final String publicIPDnsLabel = azure.sdkContext().randomResourceName("pip", 10); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String linuxVMName1 = azureResourceManager.sdkContext().randomResourceName("VM1", 10); + final String linuxVMName2 = azureResourceManager.sdkContext().randomResourceName("VM2", 10); + final String linuxVMName3 = azureResourceManager.sdkContext().randomResourceName("VM3", 10); + final String customImageName = azureResourceManager.sdkContext().randomResourceName("img", 10); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgCOMV", 15); + final String publicIPDnsLabel = azureResourceManager.sdkContext().randomResourceName("pip", 10); final String userName = "tirekicker"; final String password = Utils.password(); final Region region = Region.US_WEST_CENTRAL; @@ -67,7 +67,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating a un-managed Linux VM"); - VirtualMachine linuxVM = azure.virtualMachines().define(linuxVMName1) + VirtualMachine linuxVM = azureResourceManager.virtualMachines().define(linuxVMName1) .withRegion(region) .withNewResourceGroup(rgName) .withNewPrimaryNetwork("10.0.0.0/28") @@ -127,7 +127,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating virtual machine custom image from un-managed disk VHDs: " + linuxVM.id()); - VirtualMachineCustomImage virtualMachineCustomImage = azure.virtualMachineCustomImages() + VirtualMachineCustomImage virtualMachineCustomImage = azureResourceManager.virtualMachineCustomImages() .define(customImageName) .withRegion(region) .withExistingResourceGroup(rgName) @@ -156,7 +156,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating a Linux VM using custom image: " + virtualMachineCustomImage.id()); - VirtualMachine linuxVM2 = azure.virtualMachines().define(linuxVMName2) + VirtualMachine linuxVM2 = azureResourceManager.virtualMachines().define(linuxVMName2) .withRegion(region) .withExistingResourceGroup(rgName) .withNewPrimaryNetwork("10.0.0.0/28") @@ -175,7 +175,7 @@ public static boolean runSample(Azure azure) { // Create another Linux VM using custom image and configure the data disks from image and // add another data disk - VirtualMachine linuxVM3 = azure.virtualMachines().define(linuxVMName3) + VirtualMachine linuxVM3 = azureResourceManager.virtualMachines().define(linuxVMName3) .withRegion(region) .withExistingResourceGroup(rgName) .withNewPrimaryNetwork("10.0.0.0/28") @@ -206,7 +206,7 @@ public static boolean runSample(Azure azure) { System.out.println("Getting OS and data disks SAS Uris"); // OS Disk SAS Uri - Disk osDisk = azure.disks().getById(linuxVM3.osDiskId()); + Disk osDisk = azureResourceManager.disks().getById(linuxVM3.osDiskId()); String osDiskSasUri = osDisk.grantAccess(24 * 60); @@ -214,7 +214,7 @@ public static boolean runSample(Azure azure) { // Data Disks SAS Uri for (VirtualMachineDataDisk disk : linuxVM3.dataDisks().values()) { - Disk dataDisk = azure.disks().getById(disk.id()); + Disk dataDisk = azureResourceManager.disks().getById(disk.id()); String dataDiskSasUri = dataDisk.grantAccess(24 * 60); System.out.println(String.format("Data disk (lun: %d) SAS Uri: %s", disk.lun(), dataDiskSasUri)); } @@ -223,14 +223,14 @@ public static boolean runSample(Azure azure) { // Deleting the custom image System.out.println("Deleting custom Image: " + virtualMachineCustomImage.id()); - azure.virtualMachineCustomImages().deleteById(virtualMachineCustomImage.id()); + azureResourceManager.virtualMachineCustomImages().deleteById(virtualMachineCustomImage.id()); System.out.println("Deleted custom image"); return true; } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -254,16 +254,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachineUsingCustomImageFromVM.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachineUsingCustomImageFromVM.java index 281c8f112ff50..8e23935d720c7 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachineUsingCustomImageFromVM.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachineUsingCustomImageFromVM.java @@ -9,7 +9,7 @@ import com.azure.identity.DefaultAzureCredentialBuilder; import com.azure.core.management.profile.AzureProfile; import com.jcraft.jsch.JSchException; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.CachingTypes; import com.azure.resourcemanager.compute.models.Disk; import com.azure.resourcemanager.compute.models.KnownLinuxVirtualMachineImage; @@ -39,16 +39,16 @@ public final class CreateVirtualMachineUsingCustomImageFromVM { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String linuxVMName1 = azure.sdkContext().randomResourceName("VM1", 15); - final String linuxVMName2 = azure.sdkContext().randomResourceName("VM2", 15); - final String linuxVMName3 = azure.sdkContext().randomResourceName("VM3", 15); - final String customImageName = azure.sdkContext().randomResourceName("img", 15); - final String rgName = azure.sdkContext().randomResourceName("rgCOMV", 15); - final String publicIpDnsLabel = azure.sdkContext().randomResourceName("pip", 15); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String linuxVMName1 = azureResourceManager.sdkContext().randomResourceName("VM1", 15); + final String linuxVMName2 = azureResourceManager.sdkContext().randomResourceName("VM2", 15); + final String linuxVMName3 = azureResourceManager.sdkContext().randomResourceName("VM3", 15); + final String customImageName = azureResourceManager.sdkContext().randomResourceName("img", 15); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgCOMV", 15); + final String publicIpDnsLabel = azureResourceManager.sdkContext().randomResourceName("pip", 15); final String userName = "tirekicker"; final String password = Utils.password(); final Region region = Region.US_WEST_CENTRAL; @@ -65,7 +65,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating a un-managed Linux VM"); - VirtualMachine linuxVM = azure.virtualMachines().define(linuxVMName1) + VirtualMachine linuxVM = azureResourceManager.virtualMachines().define(linuxVMName1) .withRegion(region) .withNewResourceGroup(rgName) .withNewPrimaryNetwork("10.0.0.0/28") @@ -121,7 +121,7 @@ public static boolean runSample(Azure azure) { System.out.println("Capturing VM as custom image: " + linuxVM.id()); - VirtualMachineCustomImage virtualMachineCustomImage = azure.virtualMachineCustomImages() + VirtualMachineCustomImage virtualMachineCustomImage = azureResourceManager.virtualMachineCustomImages() .define(customImageName) .withRegion(region) .withExistingResourceGroup(rgName) @@ -137,7 +137,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating a Linux VM using custom image - " + virtualMachineCustomImage.id()); - VirtualMachine linuxVM2 = azure.virtualMachines().define(linuxVMName2) + VirtualMachine linuxVM2 = azureResourceManager.virtualMachines().define(linuxVMName2) .withRegion(region) .withExistingResourceGroup(rgName) .withNewPrimaryNetwork("10.0.0.0/28") @@ -157,7 +157,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating another Linux VM with additional data disks using custom image - " + virtualMachineCustomImage.id()); - VirtualMachine linuxVM3 = azure.virtualMachines().define(linuxVMName3) + VirtualMachine linuxVM3 = azureResourceManager.virtualMachines().define(linuxVMName3) .withRegion(region) .withExistingResourceGroup(rgName) .withNewPrimaryNetwork("10.0.0.0/28") @@ -187,14 +187,14 @@ public static boolean runSample(Azure azure) { System.out.println("Getting OS and data disks SAS Uris"); // OS Disk SAS Uri - Disk osDisk = azure.disks().getById(linuxVM3.osDiskId()); + Disk osDisk = azureResourceManager.disks().getById(linuxVM3.osDiskId()); String osDiskSasUri = osDisk.grantAccess(24 * 60); System.out.println("OS disk SAS Uri: " + osDiskSasUri); // Data disks SAS Uri for (VirtualMachineDataDisk disk : linuxVM3.dataDisks().values()) { - Disk dataDisk = azure.disks().getById(disk.id()); + Disk dataDisk = azureResourceManager.disks().getById(disk.id()); String dataDiskSasUri = dataDisk.grantAccess(24 * 60); System.out.println(String.format("Data disk (lun: %d) SAS Uri: %s", disk.lun(), dataDiskSasUri)); } @@ -203,14 +203,14 @@ public static boolean runSample(Azure azure) { // Deleting the custom image System.out.println("Deleting custom Image: " + virtualMachineCustomImage.id()); - azure.virtualMachineCustomImages().deleteById(virtualMachineCustomImage.id()); + azureResourceManager.virtualMachineCustomImages().deleteById(virtualMachineCustomImage.id()); System.out.println("Deleted custom image"); return true; } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -236,16 +236,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachineUsingSpecializedDiskFromSnapshot.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachineUsingSpecializedDiskFromSnapshot.java index 4970f8f6d40f9..9bda689681938 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachineUsingSpecializedDiskFromSnapshot.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachineUsingSpecializedDiskFromSnapshot.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.CachingTypes; import com.azure.resourcemanager.compute.models.Disk; import com.azure.resourcemanager.compute.models.DiskSkuTypes; @@ -35,19 +35,19 @@ public final class CreateVirtualMachineUsingSpecializedDiskFromSnapshot { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String linuxVMName1 = azure.sdkContext().randomResourceName("VM1", 15); - final String linuxVMName2 = azure.sdkContext().randomResourceName("VM2", 15); - final String managedOSSnapshotName = azure.sdkContext().randomResourceName("ss-os-", 15); - final String managedDataDiskSnapshotPrefix = azure.sdkContext().randomResourceName("ss-data-", 15); - final String managedNewOSDiskName = azure.sdkContext().randomResourceName("ds-os-nw-", 15); - final String managedNewDataDiskNamePrefix = azure.sdkContext().randomResourceName("ds-data-nw-", 15); - - final String rgName = azure.sdkContext().randomResourceName("rgCOMV", 15); - final String publicIpDnsLabel = azure.sdkContext().randomResourceName("pip", 15); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String linuxVMName1 = azureResourceManager.sdkContext().randomResourceName("VM1", 15); + final String linuxVMName2 = azureResourceManager.sdkContext().randomResourceName("VM2", 15); + final String managedOSSnapshotName = azureResourceManager.sdkContext().randomResourceName("ss-os-", 15); + final String managedDataDiskSnapshotPrefix = azureResourceManager.sdkContext().randomResourceName("ss-data-", 15); + final String managedNewOSDiskName = azureResourceManager.sdkContext().randomResourceName("ds-os-nw-", 15); + final String managedNewDataDiskNamePrefix = azureResourceManager.sdkContext().randomResourceName("ds-data-nw-", 15); + + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgCOMV", 15); + final String publicIpDnsLabel = azureResourceManager.sdkContext().randomResourceName("pip", 15); final String userName = "tirekicker"; final String password = Utils.password(); final Region region = Region.US_WEST_CENTRAL; @@ -64,7 +64,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating a un-managed Linux VM"); - VirtualMachine linuxVM = azure.virtualMachines().define(linuxVMName1) + VirtualMachine linuxVM = azureResourceManager.virtualMachines().define(linuxVMName1) .withRegion(region) .withNewResourceGroup(rgName) .withNewPrimaryNetwork("10.0.0.0/28") @@ -91,10 +91,10 @@ public static boolean runSample(Azure azure) { // Gets the specialized managed OS and Data disks of the virtual machine // - Disk osDisk = azure.disks().getById(linuxVM.osDiskId()); + Disk osDisk = azureResourceManager.disks().getById(linuxVM.osDiskId()); List dataDisks = new ArrayList<>(); for (VirtualMachineDataDisk disk : linuxVM.dataDisks().values()) { - Disk dataDisk = azure.disks().getById(disk.id()); + Disk dataDisk = azureResourceManager.disks().getById(disk.id()); dataDisks.add(dataDisk); } @@ -102,7 +102,7 @@ public static boolean runSample(Azure azure) { // Delete the virtual machine System.out.println("Deleting VM: " + linuxVM.id()); - azure.virtualMachines().deleteById(linuxVM.id()); + azureResourceManager.virtualMachines().deleteById(linuxVM.id()); System.out.println("Deleted the VM"); @@ -111,7 +111,7 @@ public static boolean runSample(Azure azure) { System.out.println(String.format("Creating managed snapshot from the managed disk (holding specialized OS): %s ", osDisk.id())); - Snapshot osSnapshot = azure.snapshots().define(managedOSSnapshotName) + Snapshot osSnapshot = azureResourceManager.snapshots().define(managedOSSnapshotName) .withRegion(region) .withExistingResourceGroup(rgName) .withLinuxFromDisk(osDisk) @@ -128,7 +128,7 @@ public static boolean runSample(Azure azure) { for (Disk dataDisk : dataDisks) { System.out.println(String.format("Creating managed snapshot from the managed disk (holding data): %s ", dataDisk.id())); - Snapshot dataSnapshot = azure.snapshots().define(managedDataDiskSnapshotPrefix + "-" + i) + Snapshot dataSnapshot = azureResourceManager.snapshots().define(managedDataDiskSnapshotPrefix + "-" + i) .withRegion(region) .withExistingResourceGroup(rgName) .withDataFromDisk(dataDisk) @@ -146,7 +146,7 @@ public static boolean runSample(Azure azure) { System.out.println(String.format("Creating managed disk from the snapshot holding OS: %s ", osSnapshot.id())); - Disk newOSDisk = azure.disks().define(managedNewOSDiskName) + Disk newOSDisk = azureResourceManager.disks().define(managedNewOSDiskName) .withRegion(region) .withExistingResourceGroup(rgName) .withLinuxFromSnapshot(osSnapshot) @@ -164,7 +164,7 @@ public static boolean runSample(Azure azure) { for (Snapshot dataSnapshot : dataSnapshots) { System.out.println(String.format("Creating managed disk from the Data snapshot: %s ", dataSnapshot.id())); - Disk dataDisk = azure.disks().define(managedNewDataDiskNamePrefix + "-" + i) + Disk dataDisk = azureResourceManager.disks().define(managedNewDataDiskNamePrefix + "-" + i) .withRegion(region) .withExistingResourceGroup(rgName) .withData() @@ -183,7 +183,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating a Linux VM using specialized OS and data disks"); - VirtualMachine linuxVM2 = azure.virtualMachines().define(linuxVMName2) + VirtualMachine linuxVM2 = azureResourceManager.virtualMachines().define(linuxVMName2) .withRegion(region) .withExistingResourceGroup(rgName) .withNewPrimaryNetwork("10.0.0.0/28") @@ -201,14 +201,14 @@ public static boolean runSample(Azure azure) { // System.out.println("Deleting OS snapshot - " + osSnapshot.id()); - azure.snapshots().deleteById(osSnapshot.id()); + azureResourceManager.snapshots().deleteById(osSnapshot.id()); System.out.println("Deleted OS snapshot"); for (Snapshot dataSnapshot : dataSnapshots) { System.out.println("Deleting data snapshot - " + dataSnapshot.id()); - azure.snapshots().deleteById(dataSnapshot.id()); + azureResourceManager.snapshots().deleteById(dataSnapshot.id()); System.out.println("Deleted data snapshot"); } @@ -226,7 +226,7 @@ public static boolean runSample(Azure azure) { System.out.println("Getting OS and data disks SAS Uris"); // OS Disk SAS Uri - osDisk = azure.disks().getById(linuxVM2.osDiskId()); + osDisk = azureResourceManager.disks().getById(linuxVM2.osDiskId()); String osDiskSasUri = osDisk.grantAccess(24 * 60); @@ -234,7 +234,7 @@ public static boolean runSample(Azure azure) { // Data disks SAS Uri for (VirtualMachineDataDisk disk : linuxVM2.dataDisks().values()) { - Disk dataDisk = azure.disks().getById(disk.id()); + Disk dataDisk = azureResourceManager.disks().getById(disk.id()); String dataDiskSasUri = dataDisk.grantAccess(24 * 60); System.out.println(String.format("Data disk (lun: %d) SAS Uri: %s", disk.lun(), dataDiskSasUri)); } @@ -242,7 +242,7 @@ public static boolean runSample(Azure azure) { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -267,16 +267,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachineUsingSpecializedDiskFromVhd.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachineUsingSpecializedDiskFromVhd.java index cddcc16ac11c3..acfb47686bd32 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachineUsingSpecializedDiskFromVhd.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachineUsingSpecializedDiskFromVhd.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.CachingTypes; import com.azure.resourcemanager.compute.models.Disk; import com.azure.resourcemanager.compute.models.DiskSkuTypes; @@ -34,17 +34,17 @@ public class CreateVirtualMachineUsingSpecializedDiskFromVhd { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String linuxVMName1 = azure.sdkContext().randomResourceName("VM1", 15); - final String linuxVMName2 = azure.sdkContext().randomResourceName("VM2", 15); - final String managedOSDiskName = azure.sdkContext().randomResourceName("ds-os-", 15); - final String managedDataDiskNamePrefix = azure.sdkContext().randomResourceName("ds-data-", 15); - final String rgName = azure.sdkContext().randomResourceName("rgCOMV", 15); - final String publicIpDnsLabel = azure.sdkContext().randomResourceName("pip", 15); - final String storageAccountName = azure.sdkContext().randomResourceName("stg", 15); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String linuxVMName1 = azureResourceManager.sdkContext().randomResourceName("VM1", 15); + final String linuxVMName2 = azureResourceManager.sdkContext().randomResourceName("VM2", 15); + final String managedOSDiskName = azureResourceManager.sdkContext().randomResourceName("ds-os-", 15); + final String managedDataDiskNamePrefix = azureResourceManager.sdkContext().randomResourceName("ds-data-", 15); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgCOMV", 15); + final String publicIpDnsLabel = azureResourceManager.sdkContext().randomResourceName("pip", 15); + final String storageAccountName = azureResourceManager.sdkContext().randomResourceName("stg", 15); final String userName = "tirekicker"; final String password = Utils.password(); final Region region = Region.US_WEST_CENTRAL; @@ -59,7 +59,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating a un-managed Linux VM"); - VirtualMachine linuxVM = azure.virtualMachines().define(linuxVMName1) + VirtualMachine linuxVM = azureResourceManager.virtualMachines().define(linuxVMName1) .withRegion(region) .withNewResourceGroup(rgName) .withNewPrimaryNetwork("10.0.0.0/28") @@ -104,7 +104,7 @@ public static boolean runSample(Azure azure) { // Delete the virtual machine System.out.println("Deleting VM: " + linuxVM.id()); - azure.virtualMachines().deleteById(linuxVM.id()); + azureResourceManager.virtualMachines().deleteById(linuxVM.id()); System.out.println("Deleted the VM"); @@ -113,7 +113,7 @@ public static boolean runSample(Azure azure) { System.out.println(String.format("Creating managed disk from the specialized OS VHD: %s ", specializedOSVhdUri)); - Disk osDisk = azure.disks().define(managedOSDiskName) + Disk osDisk = azureResourceManager.disks().define(managedOSDiskName) .withRegion(region) .withExistingResourceGroup(rgName) .withLinuxFromVhd(specializedOSVhdUri) @@ -132,7 +132,7 @@ public static boolean runSample(Azure azure) { for (String dataVhdUri : dataVhdUris) { System.out.println(String.format("Creating managed disk from the Data VHD: %s ", dataVhdUri)); - Disk dataDisk = azure.disks().define(managedDataDiskNamePrefix + "-" + i) + Disk dataDisk = azureResourceManager.disks().define(managedDataDiskNamePrefix + "-" + i) .withRegion(region) .withExistingResourceGroup(rgName) .withData() @@ -153,7 +153,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating a Linux VM using specialized OS and data disks"); - VirtualMachine linuxVM2 = azure.virtualMachines().define(linuxVMName2) + VirtualMachine linuxVM2 = azureResourceManager.virtualMachines().define(linuxVMName2) .withRegion(region) .withExistingResourceGroup(rgName) .withNewPrimaryNetwork("10.0.0.0/28") @@ -189,7 +189,7 @@ public static boolean runSample(Azure azure) { System.out.println("Getting data disks SAS Uris"); for (String diskId : dataDiskIds) { - Disk dataDisk = azure.disks().getById(diskId); + Disk dataDisk = azureResourceManager.disks().getById(diskId); String dataDiskSasUri = dataDisk.grantAccess(24 * 60); System.out.println(String.format("Data disk SAS Uri: %s", dataDiskSasUri)); } @@ -197,7 +197,7 @@ public static boolean runSample(Azure azure) { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -221,16 +221,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachinesAsyncTrackingRelatedResources.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachinesAsyncTrackingRelatedResources.java index 552a14eaf5011..96d2305fa5358 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachinesAsyncTrackingRelatedResources.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachinesAsyncTrackingRelatedResources.java @@ -8,7 +8,7 @@ import com.azure.core.management.AzureEnvironment; import com.azure.core.management.exception.ManagementException; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.AvailabilitySet; import com.azure.resourcemanager.compute.models.KnownLinuxVirtualMachineImage; import com.azure.resourcemanager.compute.models.VirtualMachine; @@ -55,19 +55,19 @@ public final class CreateVirtualMachinesAsyncTrackingRelatedResources { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { + public static boolean runSample(AzureResourceManager azureResourceManager) { final int desiredVMCount = 6; final Region region = Region.US_WEST; - final String resourceGroupName = azure.sdkContext().randomResourceName("rg", 15); + final String resourceGroupName = azureResourceManager.sdkContext().randomResourceName("rg", 15); final List errors = new ArrayList<>(); try { // Create one resource group for everything for easier cleanup later System.out.println(String.format("Creating the resource group (`%s`)...", resourceGroupName)); - ResourceGroup resourceGroup = azure.resourceGroups().define(resourceGroupName) + ResourceGroup resourceGroup = azureResourceManager.resourceGroups().define(resourceGroupName) .withRegion(region) .create(); System.out.println("Resource group created."); @@ -95,23 +95,23 @@ public static boolean runSample(Azure azure) { Collection> relatedDefinitions = new ArrayList<>(); // Define a network for each VM - String networkName = azure.sdkContext().randomResourceName("net", 14); - Creatable networkDefinition = azure.networks().define(networkName) + String networkName = azureResourceManager.sdkContext().randomResourceName("net", 14); + Creatable networkDefinition = azureResourceManager.networks().define(networkName) .withRegion(region) .withExistingResourceGroup(resourceGroup) .withAddressSpace("10.0." + i + ".0/29"); // Make the address space unique relatedDefinitions.add(networkDefinition); // Define a PIP for each VM - String pipName = azure.sdkContext().randomResourceName("pip", 14); - Creatable pipDefinition = azure.publicIpAddresses().define(pipName) + String pipName = azureResourceManager.sdkContext().randomResourceName("pip", 14); + Creatable pipDefinition = azureResourceManager.publicIpAddresses().define(pipName) .withRegion(region) .withExistingResourceGroup(resourceGroup); relatedDefinitions.add(pipDefinition); // Define a NIC for each VM - String nicName = azure.sdkContext().randomResourceName("nic", 14); - Creatable nicDefinition = azure.networkInterfaces().define(nicName) + String nicName = azureResourceManager.sdkContext().randomResourceName("nic", 14); + Creatable nicDefinition = azureResourceManager.networkInterfaces().define(nicName) .withRegion(region) .withExistingResourceGroup(resourceGroup) .withNewPrimaryNetwork(networkDefinition) @@ -119,13 +119,13 @@ public static boolean runSample(Azure azure) { .withNewPrimaryPublicIPAddress(pipDefinition); // Define an availability set for each VM - String availabilitySetName = azure.sdkContext().randomResourceName("as", 14); - Creatable availabilitySetDefinition = azure.availabilitySets().define(availabilitySetName) + String availabilitySetName = azureResourceManager.sdkContext().randomResourceName("as", 14); + Creatable availabilitySetDefinition = azureResourceManager.availabilitySets().define(availabilitySetName) .withRegion(region) .withExistingResourceGroup(resourceGroup); relatedDefinitions.add(availabilitySetDefinition); - String vmName = azure.sdkContext().randomResourceName("vm", 14); + String vmName = azureResourceManager.sdkContext().randomResourceName("vm", 14); // Define a VM String userName; @@ -136,7 +136,7 @@ public static boolean runSample(Azure azure) { userName = "tester"; } - Creatable vmDefinition = azure.virtualMachines().define(vmName) + Creatable vmDefinition = azureResourceManager.virtualMachines().define(vmName) .withRegion(region) .withExistingResourceGroup(resourceGroup) .withNewPrimaryNetworkInterface(nicDefinition) @@ -156,7 +156,7 @@ public static boolean runSample(Azure azure) { // Start the parallel creation of everything asynchronously // System.out.println("Creating the virtual machines and related required resources in parallel..."); - azure + azureResourceManager .virtualMachines() .createAsync(new ArrayList<>(vmDefinitions.values())) .map(virtualMachine -> { @@ -210,7 +210,7 @@ public static boolean runSample(Azure azure) { } if (!nicIdsToDelete.isEmpty()) { // Delete the NICs in parallel for better performance - azure.networkInterfaces().deleteByIds(nicIdsToDelete); + azureResourceManager.networkInterfaces().deleteByIds(nicIdsToDelete); } // Delete remaining successfully created resources of failed VM creations in parallel @@ -220,7 +220,7 @@ public static boolean runSample(Azure azure) { String createdResourceId = createdResourceIds.get(resource.key()); if (createdResourceId != null) { // Prepare the deletion of each related resource (treating it as a generic resource) as a multi-threaded Observable - deleteObservables.add(azure.genericResources().deleteByIdAsync(createdResourceId)); + deleteObservables.add(azureResourceManager.genericResources().deleteByIdAsync(createdResourceId)); } } } @@ -231,26 +231,26 @@ public static boolean runSample(Azure azure) { System.out.println("Number of failed/cleaned up VM creations: " + vmNonNicResourceDefinitions.size()); // Verifications - final int actualVMCount = Utils.getSize(azure.virtualMachines().listByResourceGroup(resourceGroupName)); + final int actualVMCount = Utils.getSize(azureResourceManager.virtualMachines().listByResourceGroup(resourceGroupName)); System.out.println("Number of successful VMs: " + actualVMCount); - final int actualNicCount = Utils.getSize(azure.networkInterfaces().listByResourceGroup(resourceGroupName)); + final int actualNicCount = Utils.getSize(azureResourceManager.networkInterfaces().listByResourceGroup(resourceGroupName)); System.out.println(String.format("Remaining network interfaces (should be %d): %d", actualVMCount, actualNicCount)); - final int actualNetworkCount = Utils.getSize(azure.networks().listByResourceGroup(resourceGroupName)); + final int actualNetworkCount = Utils.getSize(azureResourceManager.networks().listByResourceGroup(resourceGroupName)); System.out.println(String.format("Remaining virtual networks (should be %d): %d", actualVMCount, actualNetworkCount)); - final int actualPipCount = Utils.getSize(azure.publicIpAddresses().listByResourceGroup(resourceGroupName)); + final int actualPipCount = Utils.getSize(azureResourceManager.publicIpAddresses().listByResourceGroup(resourceGroupName)); System.out.println(String.format("Remaining public IP addresses (should be %d): %d", actualVMCount, actualPipCount)); - final int actualAvailabilitySetCount = Utils.getSize(azure.availabilitySets().listByResourceGroup(resourceGroupName)); + final int actualAvailabilitySetCount = Utils.getSize(azureResourceManager.availabilitySets().listByResourceGroup(resourceGroupName)); System.out.println(String.format("Remaining availability sets (should be %d): %d", actualVMCount, actualAvailabilitySetCount)); return true; } finally { try { System.out.println("Starting the deletion of resource group: " + resourceGroupName); - azure.resourceGroups().beginDeleteByName(resourceGroupName); + azureResourceManager.resourceGroups().beginDeleteByName(resourceGroupName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); } catch (Exception g) { @@ -274,16 +274,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachinesInParallel.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachinesInParallel.java index e4edd731db332..95972819a08a8 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachinesInParallel.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachinesInParallel.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.KnownLinuxVirtualMachineImage; import com.azure.resourcemanager.compute.models.VirtualMachine; import com.azure.resourcemanager.compute.models.VirtualMachineSizeTypes; @@ -33,11 +33,11 @@ public final class CreateVirtualMachinesInParallel { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String rgName = azure.sdkContext().randomResourceName("rgCOPD", 24); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgCOPD", 24); final String userName = "tirekicker"; final String sshKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfSPC2K7LZcFKEO+/t3dzmQYtrJFZNxOsbVgOVKietqHyvmYGHEC0J2wPdAqQ/63g/hhAEFRoyehM+rbeDri4txB3YFfnOK58jqdkyXzupWqXzOrlKY4Wz9SKjjN765+dqUITjKRIaAip1Ri137szRg71WnrmdP3SphTRlCx1Bk2nXqWPsclbRDCiZeF8QOTi4JqbmJyK5+0UqhqYRduun8ylAwKKQJ1NJt85sYIHn9f1Rfr6Tq2zS0wZ7DHbZL+zB5rSlAr8QyUdg/GQD+cmSs6LvPJKL78d6hMGk84ARtFo4A79ovwX/Fj01znDQkU6nJildfkaolH2rWFG/qttD azjava@javalib.com"; @@ -68,7 +68,7 @@ public static boolean runSample(Azure azure) { //============================================================= // Create a resource group (Where all resources gets created) // - ResourceGroup resourceGroup = azure.resourceGroups().define(rgName) + ResourceGroup resourceGroup = azureResourceManager.resourceGroups().define(rgName) .withRegion(Region.US_EAST) .create(); @@ -87,8 +87,8 @@ public static boolean runSample(Azure azure) { // Create 1 network creatable per region // Prepare Creatable Network definition (Where all the virtual machines get added to) // - String networkName = azure.sdkContext().randomResourceName("vnetCOPD-", 20); - Creatable networkCreatable = azure.networks().define(networkName) + String networkName = azureResourceManager.sdkContext().randomResourceName("vnetCOPD-", 20); + Creatable networkCreatable = azureResourceManager.networks().define(networkName) .withRegion(region) .withExistingResourceGroup(resourceGroup) .withAddressSpace("172.16.0.0/16"); @@ -96,28 +96,28 @@ public static boolean runSample(Azure azure) { //============================================================= // Create 1 storage creatable per region (For storing VMs disk) // - String storageAccountName = azure.sdkContext().randomResourceName("stgcopd", 20); - Creatable storageAccountCreatable = azure.storageAccounts().define(storageAccountName) + String storageAccountName = azureResourceManager.sdkContext().randomResourceName("stgcopd", 20); + Creatable storageAccountCreatable = azureResourceManager.storageAccounts().define(storageAccountName) .withRegion(region) .withExistingResourceGroup(resourceGroup); - String linuxVMNamePrefix = azure.sdkContext().randomResourceName("vm-", 15); + String linuxVMNamePrefix = azureResourceManager.sdkContext().randomResourceName("vm-", 15); for (int i = 1; i <= vmCount; i++) { //============================================================= // Create 1 public IP address creatable // - Creatable publicIPAddressCreatable = azure.publicIpAddresses() + Creatable publicIPAddressCreatable = azureResourceManager.publicIpAddresses() .define(String.format("%s-%d", linuxVMNamePrefix, i)) .withRegion(region) .withExistingResourceGroup(resourceGroup) - .withLeafDomainLabel(azure.sdkContext().randomResourceName("pip", 10)); + .withLeafDomainLabel(azureResourceManager.sdkContext().randomResourceName("pip", 10)); // publicIpCreatableKeys.add(publicIPAddressCreatable.key()); //============================================================= // Create 1 virtual machine creatable - Creatable virtualMachineCreatable = azure.virtualMachines() + Creatable virtualMachineCreatable = azureResourceManager.virtualMachines() .define(String.format("%s-%d", linuxVMNamePrefix, i)) .withRegion(region) .withExistingResourceGroup(resourceGroup) @@ -141,7 +141,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating the virtual machines"); stopwatch.start(); - CreatedResources virtualMachines = azure.virtualMachines().create(creatableVirtualMachines); + CreatedResources virtualMachines = azureResourceManager.virtualMachines().create(creatableVirtualMachines); stopwatch.stop(); System.out.println("Created virtual machines"); @@ -198,7 +198,7 @@ public static boolean runSample(Azure azure) { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -223,16 +223,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachinesUsingCustomImageOrSpecializedVHD.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachinesUsingCustomImageOrSpecializedVHD.java index fb7bff2e46818..b42b91955d7e1 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachinesUsingCustomImageOrSpecializedVHD.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/CreateVirtualMachinesUsingCustomImageOrSpecializedVHD.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.KnownLinuxVirtualMachineImage; import com.azure.resourcemanager.compute.models.OperatingSystemTypes; import com.azure.resourcemanager.compute.models.VirtualMachine; @@ -39,15 +39,15 @@ public final class CreateVirtualMachinesUsingCustomImageOrSpecializedVHD { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String linuxVMName1 = azure.sdkContext().randomResourceName("VM1", 15); - final String linuxVMName2 = azure.sdkContext().randomResourceName("VM2", 15); - final String linuxVMName3 = azure.sdkContext().randomResourceName("VM3", 15); - final String rgName = azure.sdkContext().randomResourceName("rgCOMV", 15); - final String publicIPDnsLabel = azure.sdkContext().randomResourceName("pip", 15); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String linuxVMName1 = azureResourceManager.sdkContext().randomResourceName("VM1", 15); + final String linuxVMName2 = azureResourceManager.sdkContext().randomResourceName("VM2", 15); + final String linuxVMName3 = azureResourceManager.sdkContext().randomResourceName("VM3", 15); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgCOMV", 15); + final String publicIPDnsLabel = azureResourceManager.sdkContext().randomResourceName("pip", 15); final String userName = "tirekicker"; final String password = Utils.password(); @@ -62,7 +62,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating a Linux VM"); - VirtualMachine linuxVM = azure.virtualMachines().define(linuxVMName1) + VirtualMachine linuxVM = azureResourceManager.virtualMachines().define(linuxVMName1) .withRegion(Region.US_EAST) .withNewResourceGroup(rgName) .withNewPrimaryNetwork("10.0.0.0/28") @@ -119,7 +119,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating a Linux VM using captured image - " + capturedImageUri); - VirtualMachine linuxVM2 = azure.virtualMachines().define(linuxVMName2) + VirtualMachine linuxVM2 = azureResourceManager.virtualMachines().define(linuxVMName2) .withRegion(Region.US_EAST) .withExistingResourceGroup(rgName) .withNewPrimaryNetwork("10.0.0.0/28") @@ -138,7 +138,7 @@ public static boolean runSample(Azure azure) { // Deleting the virtual machine System.out.println("Deleting VM: " + linuxVM2.id()); - azure.virtualMachines().deleteById(linuxVM2.id()); // VM required to be deleted to be able to attach it's + azureResourceManager.virtualMachines().deleteById(linuxVM2.id()); // VM required to be deleted to be able to attach it's // OS Disk VHD to another VM (Deallocate is not sufficient) System.out.println("Deleted VM"); @@ -150,7 +150,7 @@ public static boolean runSample(Azure azure) { + specializedVhd + " of deleted VM"); - VirtualMachine linuxVM3 = azure.virtualMachines().define(linuxVMName3) + VirtualMachine linuxVM3 = azureResourceManager.virtualMachines().define(linuxVMName3) .withRegion(Region.US_EAST) .withExistingResourceGroup(rgName) .withNewPrimaryNetwork("10.0.0.0/28") @@ -166,7 +166,7 @@ public static boolean runSample(Azure azure) { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -190,16 +190,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ListComputeSkus.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ListComputeSkus.java index 8ecd1c7b53b03..1582d0bbe01ea 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ListComputeSkus.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ListComputeSkus.java @@ -8,7 +8,7 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.ComputeResourceType; import com.azure.resourcemanager.compute.models.ComputeSku; import com.azure.resourcemanager.resources.fluentcore.arm.AvailabilityZoneId; @@ -29,10 +29,10 @@ public final class ListComputeSkus { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { + public static boolean runSample(AzureResourceManager azureResourceManager) { //================================================================= // List all compute SKUs in the subscription @@ -43,7 +43,7 @@ public static boolean runSample(Azure azure) { System.out.println(String.format(format, "Name", "ResourceType", "Size", "Regions [zones]")); System.out.println("============================================================================"); - PagedIterable skus = azure.computeSkus().list(); + PagedIterable skus = azureResourceManager.computeSkus().list(); for (ComputeSku sku : skus) { String size = null; if (sku.resourceType().equals(ComputeResourceType.VIRTUALMACHINES)) { @@ -67,7 +67,7 @@ public static boolean runSample(Azure azure) { System.out.println(String.format(format, "Name", "Size", "Regions [zones]")); System.out.println("============================================================================"); - skus = azure.computeSkus() + skus = azureResourceManager.computeSkus() .listByRegionAndResourceType(Region.US_EAST2, ComputeResourceType.VIRTUALMACHINES); for (ComputeSku sku : skus) { final String line = String.format(format, sku.name(), sku.virtualMachineSizeType(), regionZoneToString(sku.zones())); @@ -83,7 +83,7 @@ public static boolean runSample(Azure azure) { System.out.println(String.format(format, "Name", "Size", "Regions [zones]")); System.out.println("============================================================================"); - skus = azure.computeSkus() + skus = azureResourceManager.computeSkus() .listByResourceType(ComputeResourceType.DISKS); for (ComputeSku sku : skus) { final String line = String.format(format, sku.name(), sku.diskSkuType(), regionZoneToString(sku.zones())); @@ -121,13 +121,13 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ListVirtualMachineExtensionImages.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ListVirtualMachineExtensionImages.java index 1451277771a98..95c0e8743f447 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ListVirtualMachineExtensionImages.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ListVirtualMachineExtensionImages.java @@ -8,7 +8,7 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.VirtualMachineExtensionImage; import com.azure.resourcemanager.compute.models.VirtualMachineExtensionImageType; import com.azure.resourcemanager.compute.models.VirtualMachineExtensionImageVersion; @@ -25,10 +25,10 @@ public final class ListVirtualMachineExtensionImages { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { + public static boolean runSample(AzureResourceManager azureResourceManager) { final Region region = Region.US_WEST_CENTRAL; //================================================================= @@ -37,7 +37,7 @@ public static boolean runSample(Azure azure) { // published by Microsoft.OSTCExtensions and Microsoft.Azure.Extensions // by browsing through extension image publishers, types, and versions - PagedIterable publishers = azure + PagedIterable publishers = azureResourceManager .virtualMachineImages() .publishers() .listByRegion(region); @@ -95,13 +95,13 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ListVirtualMachineImages.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ListVirtualMachineImages.java index f9b22da294554..d016b3dffb60f 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ListVirtualMachineImages.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ListVirtualMachineImages.java @@ -8,7 +8,7 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.VirtualMachineImage; import com.azure.resourcemanager.compute.models.VirtualMachineOffer; import com.azure.resourcemanager.compute.models.VirtualMachinePublisher; @@ -25,10 +25,10 @@ public final class ListVirtualMachineImages { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { + public static boolean runSample(AzureResourceManager azureResourceManager) { final Region region = Region.US_WEST_CENTRAL; //================================================================= @@ -37,7 +37,7 @@ public static boolean runSample(Azure azure) { // published by Canonical, Red Hat and SUSE // by browsing through locations, publishers, offers, SKUs and images - PagedIterable publishers = azure + PagedIterable publishers = azureResourceManager .virtualMachineImages() .publishers() .listByRegion(region); @@ -98,13 +98,13 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageAvailabilitySet.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageAvailabilitySet.java index 902e5b1ba03f4..34e9853057dd4 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageAvailabilitySet.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageAvailabilitySet.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.AvailabilitySet; import com.azure.resourcemanager.compute.models.AvailabilitySetSkuTypes; import com.azure.resourcemanager.compute.models.KnownLinuxVirtualMachineImage; @@ -35,17 +35,17 @@ public final class ManageAvailabilitySet { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { + public static boolean runSample(AzureResourceManager azureResourceManager) { final Region region = Region.US_WEST_CENTRAL; - final String rgName = azure.sdkContext().randomResourceName("rgCOMA", 15); - final String availSetName1 = azure.sdkContext().randomResourceName("av1", 15); - final String availSetName2 = azure.sdkContext().randomResourceName("av2", 15); - final String vm1Name = azure.sdkContext().randomResourceName("vm1", 15); - final String vm2Name = azure.sdkContext().randomResourceName("vm2", 15); - final String vnetName = azure.sdkContext().randomResourceName("vnet", 15); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgCOMA", 15); + final String availSetName1 = azureResourceManager.sdkContext().randomResourceName("av1", 15); + final String availSetName2 = azureResourceManager.sdkContext().randomResourceName("av2", 15); + final String vm1Name = azureResourceManager.sdkContext().randomResourceName("vm1", 15); + final String vm2Name = azureResourceManager.sdkContext().randomResourceName("vm2", 15); + final String vnetName = azureResourceManager.sdkContext().randomResourceName("vnet", 15); final String userName = "tirekicker"; final String password = Utils.password(); @@ -57,7 +57,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating an availability set"); - AvailabilitySet availSet1 = azure.availabilitySets().define(availSetName1) + AvailabilitySet availSet1 = azureResourceManager.availabilitySets().define(availSetName1) .withRegion(region) .withNewResourceGroup(rgName) .withFaultDomainCount(2) @@ -73,7 +73,7 @@ public static boolean runSample(Azure azure) { //============================================================= // Define a virtual network for the VMs in this availability set - Creatable networkDefinition = azure.networks().define(vnetName) + Creatable networkDefinition = azureResourceManager.networks().define(vnetName) .withRegion(region) .withExistingResourceGroup(rgName) .withAddressSpace("10.0.0.0/28"); @@ -84,7 +84,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating a Windows VM in the availability set"); - VirtualMachine vm1 = azure.virtualMachines().define(vm1Name) + VirtualMachine vm1 = azureResourceManager.virtualMachines().define(vm1Name) .withRegion(region) .withExistingResourceGroup(rgName) .withNewPrimaryNetwork(networkDefinition) @@ -107,7 +107,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating a Linux VM in the availability set"); - VirtualMachine vm2 = azure.virtualMachines().define(vm2Name) + VirtualMachine vm2 = azureResourceManager.virtualMachines().define(vm2Name) .withRegion(region) .withExistingResourceGroup(rgName) .withNewPrimaryNetwork(networkDefinition) @@ -141,7 +141,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating an availability set"); - AvailabilitySet availSet2 = azure.availabilitySets().define(availSetName2) + AvailabilitySet availSet2 = azureResourceManager.availabilitySets().define(availSetName2) .withRegion(region) .withExistingResourceGroup(rgName) .create(); @@ -157,7 +157,7 @@ public static boolean runSample(Azure azure) { System.out.println("Printing list of availability sets ======="); - for (AvailabilitySet availabilitySet : azure.availabilitySets().listByResourceGroup(resourceGroupName)) { + for (AvailabilitySet availabilitySet : azureResourceManager.availabilitySets().listByResourceGroup(resourceGroupName)) { Utils.print(availabilitySet); } @@ -167,7 +167,7 @@ public static boolean runSample(Azure azure) { System.out.println("Deleting an availability set: " + availSet2.id()); - azure.availabilitySets().deleteById(availSet2.id()); + azureResourceManager.availabilitySets().deleteById(availSet2.id()); System.out.println("Deleted availability set: " + availSet2.id()); return true; @@ -175,7 +175,7 @@ public static boolean runSample(Azure azure) { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -200,16 +200,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageManagedDisks.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageManagedDisks.java index 0fa022f8acfc6..3b020e9257a3d 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageManagedDisks.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageManagedDisks.java @@ -8,9 +8,9 @@ import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; import com.azure.core.management.profile.AzureProfile; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.samples.Utils; import com.jcraft.jsch.JSchException; -import com.azure.resourcemanager.Azure; import com.azure.resourcemanager.compute.models.CachingTypes; import com.azure.resourcemanager.compute.models.Disk; import com.azure.resourcemanager.compute.models.DiskSkuTypes; @@ -41,12 +41,12 @@ public final class ManageManagedDisks { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { + public static boolean runSample(AzureResourceManager azureResourceManager) { final Region region = Region.US_SOUTH_CENTRAL; - final String rgName = azure.sdkContext().randomResourceName("rgCOMV", 15); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgCOMV", 15); final String userName = "tirekicker"; final String sshkey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfSPC2K7LZcFKEO+/t3dzmQYtrJFZNxOsbVgOVKietqHyvmYGHEC0J2wPdAqQ/63g/hhAEFRoyehM+rbeDri4txB3YFfnOK58jqdkyXzupWqXzOrlKY4Wz9SKjjN765+dqUITjKRIaAip1Ri137szRg71WnrmdP3SphTRlCx1Bk2nXqWPsclbRDCiZeF8QOTi4JqbmJyK5+0UqhqYRduun8ylAwKKQJ1NJt85sYIHn9f1Rfr6Tq2zS0wZ7DHbZL+zB5rSlAr8QyUdg/GQD+cmSs6LvPJKL78d6hMGk84ARtFo4A79ovwX/Fj01znDQkU6nJildfkaolH2rWFG/qttD azjava@javalib.com"; @@ -57,9 +57,9 @@ public static boolean runSample(Azure azure) { System.out.println("Creating VM [with an implicit Managed OS disk and explicit Managed data disk]"); - final String linuxVM1Name = azure.sdkContext().randomResourceName("vm" + "-", 18); - final String linuxVM1Pip = azure.sdkContext().randomResourceName("pip" + "-", 18); - VirtualMachine linuxVM1 = azure.virtualMachines() + final String linuxVM1Name = azureResourceManager.sdkContext().randomResourceName("vm" + "-", 18); + final String linuxVM1Pip = azureResourceManager.sdkContext().randomResourceName("pip" + "-", 18); + VirtualMachine linuxVM1 = azureResourceManager.virtualMachines() .define(linuxVM1Name) .withRegion(region) .withNewResourceGroup(rgName) @@ -81,14 +81,14 @@ public static boolean runSample(Azure azure) { System.out.println("Creating VMSS [with implicit managed OS disks and explicit managed data disks]"); - final String vmScaleSetName = azure.sdkContext().randomResourceName("vmss" + "-", 18); - VirtualMachineScaleSet vmScaleSet = azure.virtualMachineScaleSets() + final String vmScaleSetName = azureResourceManager.sdkContext().randomResourceName("vmss" + "-", 18); + VirtualMachineScaleSet vmScaleSet = azureResourceManager.virtualMachineScaleSets() .define(vmScaleSetName) .withRegion(region) .withExistingResourceGroup(rgName) .withSku(VirtualMachineScaleSetSkuTypes.STANDARD_D5_V2) - .withExistingPrimaryNetworkSubnet(prepareNetwork(azure, region, rgName), "subnet1") - .withExistingPrimaryInternetFacingLoadBalancer(prepareLoadBalancer(azure, region, rgName)) + .withExistingPrimaryNetworkSubnet(prepareNetwork(azureResourceManager, region, rgName), "subnet1") + .withExistingPrimaryInternetFacingLoadBalancer(prepareLoadBalancer(azureResourceManager, region, rgName)) .withoutPrimaryInternalLoadBalancer() .withPopularLinuxImage(KnownLinuxVirtualMachineImage.UBUNTU_SERVER_16_04_LTS) .withRootUsername("tirekicker") @@ -102,14 +102,14 @@ public static boolean runSample(Azure azure) { System.out.println("Created VMSS [with implicit managed OS disks and explicit managed data disks]"); System.out.println("Created VMSS [with implicit managed OS disks and explicit managed data disks]"); - azure.virtualMachineScaleSets().deleteById(vmScaleSet.id()); + azureResourceManager.virtualMachineScaleSets().deleteById(vmScaleSet.id()); // Create an empty disk and attach to a VM (Manage Virtual Machine With Disk) System.out.println("Creating empty data disk [to attach to a VM]"); - final String diskName = azure.sdkContext().randomResourceName("dsk" + "-", 18); - Disk dataDisk = azure.disks().define(diskName) + final String diskName = azureResourceManager.sdkContext().randomResourceName("dsk" + "-", 18); + Disk dataDisk = azureResourceManager.disks().define(diskName) .withRegion(region) .withExistingResourceGroup(rgName) .withData() @@ -120,9 +120,9 @@ public static boolean runSample(Azure azure) { System.out.println("Creating VM [with new managed data disks and disk attached]"); - final String linuxVM2Name = azure.sdkContext().randomResourceName("vm" + "-", 10); - final String linuxVM2Pip = azure.sdkContext().randomResourceName("pip" + "-", 18); - VirtualMachine linuxVM2 = azure.virtualMachines().define(linuxVM2Name) + final String linuxVM2Name = azureResourceManager.sdkContext().randomResourceName("vm" + "-", 10); + final String linuxVM2Pip = azureResourceManager.sdkContext().randomResourceName("pip" + "-", 18); + VirtualMachine linuxVM2 = azureResourceManager.virtualMachines().define(linuxVM2Name) .withRegion(region) .withExistingResourceGroup(rgName) .withNewPrimaryNetwork("10.0.0.0/28") @@ -156,14 +156,14 @@ public static boolean runSample(Azure azure) { System.out.println("Preparing specialized virtual machine with un-managed disk"); - final VirtualMachine linuxVM = prepareSpecializedUnmanagedVirtualMachine(azure, region, rgName); + final VirtualMachine linuxVM = prepareSpecializedUnmanagedVirtualMachine(azureResourceManager, region, rgName); System.out.println("Prepared specialized virtual machine with un-managed disk"); System.out.println("Creating custom image from specialized virtual machine"); - final String customImageName = azure.sdkContext().randomResourceName("cimg" + "-", 10); - VirtualMachineCustomImage virtualMachineCustomImage = azure.virtualMachineCustomImages() + final String customImageName = azureResourceManager.sdkContext().randomResourceName("cimg" + "-", 10); + VirtualMachineCustomImage virtualMachineCustomImage = azureResourceManager.virtualMachineCustomImages() .define(customImageName) .withRegion(region) .withExistingResourceGroup(rgName) @@ -174,8 +174,8 @@ public static boolean runSample(Azure azure) { System.out.println("Creating VM [from custom image]"); - final String linuxVM3Name = azure.sdkContext().randomResourceName("vm" + "-", 10); - VirtualMachine linuxVM3 = azure.virtualMachines().define(linuxVM3Name) + final String linuxVM3Name = azureResourceManager.sdkContext().randomResourceName("vm" + "-", 10); + VirtualMachine linuxVM3 = azureResourceManager.virtualMachines().define(linuxVM3Name) .withRegion(region) .withExistingResourceGroup(rgName) .withNewPrimaryNetwork("10.0.0.0/28") @@ -191,14 +191,14 @@ public static boolean runSample(Azure azure) { // Create a VM from a VHD (Create Virtual Machine Using Specialized VHD) - final String linuxVMName4 = azure.sdkContext().randomResourceName("vm" + "-", 10); + final String linuxVMName4 = azureResourceManager.sdkContext().randomResourceName("vm" + "-", 10); final String specializedVhd = linuxVM.osUnmanagedDiskVhdUri(); - azure.virtualMachines().deleteById(linuxVM.id()); + azureResourceManager.virtualMachines().deleteById(linuxVM.id()); System.out.println("Creating VM [by attaching un-managed disk]"); - VirtualMachine linuxVM4 = azure.virtualMachines().define(linuxVMName4) + VirtualMachine linuxVM4 = azureResourceManager.virtualMachines().define(linuxVMName4) .withRegion(region) .withExistingResourceGroup(rgName) .withNewPrimaryNetwork("10.0.0.0/28") @@ -214,25 +214,25 @@ public static boolean runSample(Azure azure) { System.out.println("Preparing specialized virtual machine with managed disks"); - final VirtualMachine linuxVM5 = prepareSpecializedManagedVirtualMachine(azure, region, rgName); - Disk osDisk = azure.disks().getById(linuxVM5.osDiskId()); + final VirtualMachine linuxVM5 = prepareSpecializedManagedVirtualMachine(azureResourceManager, region, rgName); + Disk osDisk = azureResourceManager.disks().getById(linuxVM5.osDiskId()); List dataDisks = new ArrayList<>(); for (VirtualMachineDataDisk disk : linuxVM5.dataDisks().values()) { - Disk d = azure.disks().getById(disk.id()); + Disk d = azureResourceManager.disks().getById(disk.id()); dataDisks.add(d); } System.out.println("Prepared specialized virtual machine with managed disks"); System.out.println("Deleting VM: " + linuxVM5.id()); - azure.virtualMachines().deleteById(linuxVM5.id()); + azureResourceManager.virtualMachines().deleteById(linuxVM5.id()); System.out.println("Deleted the VM: " + linuxVM5.id()); System.out.println("Creating snapshot [from managed OS disk]"); // Create a managed snapshot for an OS disk - final String managedOSSnapshotName = azure.sdkContext().randomResourceName("snp" + "-", 10); - Snapshot osSnapshot = azure.snapshots().define(managedOSSnapshotName) + final String managedOSSnapshotName = azureResourceManager.sdkContext().randomResourceName("snp" + "-", 10); + Snapshot osSnapshot = azureResourceManager.snapshots().define(managedOSSnapshotName) .withRegion(region) .withExistingResourceGroup(rgName) .withLinuxFromDisk(osDisk) @@ -243,8 +243,8 @@ public static boolean runSample(Azure azure) { System.out.println("Creating managed OS disk [from snapshot]"); // Create a managed disk from the managed snapshot for the OS disk - final String managedNewOSDiskName = azure.sdkContext().randomResourceName("dsk" + "-", 10); - Disk newOSDisk = azure.disks().define(managedNewOSDiskName) + final String managedNewOSDiskName = azureResourceManager.sdkContext().randomResourceName("dsk" + "-", 10); + Disk newOSDisk = azureResourceManager.disks().define(managedNewOSDiskName) .withRegion(region) .withExistingResourceGroup(rgName) .withLinuxFromSnapshot(osSnapshot) @@ -256,8 +256,8 @@ public static boolean runSample(Azure azure) { System.out.println("Creating managed data snapshot [from managed data disk]"); // Create a managed snapshot for a data disk - final String managedDataDiskSnapshotName = azure.sdkContext().randomResourceName("dsk" + "-", 10); - Snapshot dataSnapshot = azure.snapshots().define(managedDataDiskSnapshotName) + final String managedDataDiskSnapshotName = azureResourceManager.sdkContext().randomResourceName("dsk" + "-", 10); + Snapshot dataSnapshot = azureResourceManager.snapshots().define(managedDataDiskSnapshotName) .withRegion(region) .withExistingResourceGroup(rgName) .withDataFromDisk(dataDisks.get(0)) @@ -269,8 +269,8 @@ public static boolean runSample(Azure azure) { System.out.println("Creating managed data disk [from managed snapshot]"); // Create a managed disk from the managed snapshot for the data disk - final String managedNewDataDiskName = azure.sdkContext().randomResourceName("dsk" + "-", 10); - Disk newDataDisk = azure.disks().define(managedNewDataDiskName) + final String managedNewDataDiskName = azureResourceManager.sdkContext().randomResourceName("dsk" + "-", 10); + Disk newDataDisk = azureResourceManager.disks().define(managedNewDataDiskName) .withRegion(region) .withExistingResourceGroup(rgName) .withData() @@ -281,8 +281,8 @@ public static boolean runSample(Azure azure) { System.out.println("Creating VM [with specialized OS managed disk]"); - final String linuxVM6Name = azure.sdkContext().randomResourceName("vm" + "-", 10); - VirtualMachine linuxVM6 = azure.virtualMachines().define(linuxVM6Name) + final String linuxVM6Name = azureResourceManager.sdkContext().randomResourceName("vm" + "-", 10); + VirtualMachine linuxVM6 = azureResourceManager.virtualMachines().define(linuxVM6Name) .withRegion(region) .withExistingResourceGroup(rgName) .withNewPrimaryNetwork("10.0.0.0/28") @@ -299,9 +299,9 @@ public static boolean runSample(Azure azure) { System.out.println("Creating VM [with un-managed disk for migration]"); - final String linuxVM7Name = azure.sdkContext().randomResourceName("vm" + "-", 10); - final String linuxVM7Pip = azure.sdkContext().randomResourceName("pip" + "-", 18); - VirtualMachine linuxVM7 = azure.virtualMachines().define(linuxVM7Name) + final String linuxVM7Name = azureResourceManager.sdkContext().randomResourceName("vm" + "-", 10); + final String linuxVM7Pip = azureResourceManager.sdkContext().randomResourceName("pip" + "-", 18); + VirtualMachine linuxVM7 = azureResourceManager.virtualMachines().define(linuxVM7Name) .withRegion(region) .withNewResourceGroup(rgName) .withNewPrimaryNetwork("10.0.0.0/28") @@ -334,7 +334,7 @@ public static boolean runSample(Azure azure) { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -359,29 +359,29 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); } } - private static VirtualMachine prepareSpecializedUnmanagedVirtualMachine(Azure azure, Region region, String rgName) { + private static VirtualMachine prepareSpecializedUnmanagedVirtualMachine(AzureResourceManager azureResourceManager, Region region, String rgName) { final String userName = "tirekicker"; final String password = Utils.password(); - final String linuxVMName1 = azure.sdkContext().randomResourceName("vm" + "-", 10); - final String publicIpDnsLabel = azure.sdkContext().randomResourceName("pip" + "-", 20); + final String linuxVMName1 = azureResourceManager.sdkContext().randomResourceName("vm" + "-", 10); + final String publicIpDnsLabel = azureResourceManager.sdkContext().randomResourceName("pip" + "-", 20); - VirtualMachine linuxVM = azure.virtualMachines().define(linuxVMName1) + VirtualMachine linuxVM = azureResourceManager.virtualMachines().define(linuxVMName1) .withRegion(region) .withNewResourceGroup(rgName) .withNewPrimaryNetwork("10.0.0.0/28") @@ -413,13 +413,13 @@ private static VirtualMachine prepareSpecializedUnmanagedVirtualMachine(Azure az return linuxVM; } - private static VirtualMachine prepareSpecializedManagedVirtualMachine(Azure azure, Region region, String rgName) { + private static VirtualMachine prepareSpecializedManagedVirtualMachine(AzureResourceManager azureResourceManager, Region region, String rgName) { final String userName = "tirekicker"; final String password = Utils.password(); - final String linuxVMName1 = azure.sdkContext().randomResourceName("vm" + "-", 10); - final String publicIPDnsLabel = azure.sdkContext().randomResourceName("pip" + "-", 20); + final String linuxVMName1 = azureResourceManager.sdkContext().randomResourceName("vm" + "-", 10); + final String publicIPDnsLabel = azureResourceManager.sdkContext().randomResourceName("pip" + "-", 20); - VirtualMachine linuxVM = azure.virtualMachines().define(linuxVMName1) + VirtualMachine linuxVM = azureResourceManager.virtualMachines().define(linuxVMName1) .withRegion(region) .withNewResourceGroup(rgName) .withNewPrimaryNetwork("10.0.0.0/28") @@ -466,10 +466,10 @@ private static void deprovisionAgentInLinuxVM(String host, int port, String user } } - private static Network prepareNetwork(Azure azure, Region region, String rgName) { - final String vnetName = azure.sdkContext().randomResourceName("vnet", 24); + private static Network prepareNetwork(AzureResourceManager azureResourceManager, Region region, String rgName) { + final String vnetName = azureResourceManager.sdkContext().randomResourceName("vnet", 24); - Network network = azure.networks().define(vnetName) + Network network = azureResourceManager.networks().define(vnetName) .withRegion(region) .withNewResourceGroup(rgName) .withAddressSpace("172.16.0.0/16") @@ -480,8 +480,8 @@ private static Network prepareNetwork(Azure azure, Region region, String rgName) return network; } - private static LoadBalancer prepareLoadBalancer(Azure azure, Region region, String rgName) { - final String loadBalancerName1 = azure.sdkContext().randomResourceName("intlb" + "-", 18); + private static LoadBalancer prepareLoadBalancer(AzureResourceManager azureResourceManager, Region region, String rgName) { + final String loadBalancerName1 = azureResourceManager.sdkContext().randomResourceName("intlb" + "-", 18); final String frontendName = loadBalancerName1 + "-FE1"; final String backendPoolName1 = loadBalancerName1 + "-BAP1"; final String backendPoolName2 = loadBalancerName1 + "-BAP2"; @@ -493,12 +493,12 @@ private static LoadBalancer prepareLoadBalancer(Azure azure, Region region, Stri final String natPool60XXto23 = "natPool60XXto23"; final String publicIpName = "pip-" + loadBalancerName1; - PublicIpAddress publicIPAddress = azure.publicIpAddresses().define(publicIpName) + PublicIpAddress publicIPAddress = azureResourceManager.publicIpAddresses().define(publicIpName) .withRegion(region) .withExistingResourceGroup(rgName) .withLeafDomainLabel(publicIpName) .create(); - LoadBalancer loadBalancer = azure.loadBalancers().define(loadBalancerName1) + LoadBalancer loadBalancer = azureResourceManager.loadBalancers().define(loadBalancerName1) .withRegion(region) .withExistingResourceGroup(rgName) // Add two rules that uses above backend and probe diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageResourceFromMSIEnabledVirtualMachineBelongsToAADGroup.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageResourceFromMSIEnabledVirtualMachineBelongsToAADGroup.java index 315c1b67df42e..f7940b6dd82f6 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageResourceFromMSIEnabledVirtualMachineBelongsToAADGroup.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageResourceFromMSIEnabledVirtualMachineBelongsToAADGroup.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.CachingTypes; import com.azure.resourcemanager.compute.models.KnownLinuxVirtualMachineImage; import com.azure.resourcemanager.compute.models.VirtualMachine; @@ -39,15 +39,15 @@ public final class ManageResourceFromMSIEnabledVirtualMachineBelongsToAADGroup { /** * Main function which runs the actual sample. * - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - String groupName = azure.sdkContext().randomResourceName("group", 15); - final String rgName = azure.sdkContext().randomResourceName("rgCOMV", 15); - String roleAssignmentName = azure.sdkContext().randomUuid(); - final String linuxVMName = azure.sdkContext().randomResourceName("VM1", 15); - final String pipName = azure.sdkContext().randomResourceName("pip1", 15); + public static boolean runSample(AzureResourceManager azureResourceManager) { + String groupName = azureResourceManager.sdkContext().randomResourceName("group", 15); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgCOMV", 15); + String roleAssignmentName = azureResourceManager.sdkContext().randomUuid(); + final String linuxVMName = azureResourceManager.sdkContext().randomResourceName("VM1", 15); + final String pipName = azureResourceManager.sdkContext().randomResourceName("pip1", 15); final String userName = "tirekicker"; final String password = Utils.password(); final Region region = Region.US_SOUTH_CENTRAL; @@ -64,7 +64,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating a AAD security group"); - ActiveDirectoryGroup activeDirectoryGroup = azure.accessManagement() + ActiveDirectoryGroup activeDirectoryGroup = azureResourceManager.accessManagement() .activeDirectoryGroups() .define(groupName) .withEmailAlias(groupName) @@ -73,7 +73,7 @@ public static boolean runSample(Azure azure) { //============================================================= // Assign AAD security group Contributor role at a resource group - ResourceGroup resourceGroup = azure.resourceGroups() + ResourceGroup resourceGroup = azureResourceManager.resourceGroups() .define(rgName) .withRegion(region) .create(); @@ -82,7 +82,7 @@ public static boolean runSample(Azure azure) { System.out.println("Assigning AAD security group Contributor role to the resource group"); - azure.accessManagement() + azureResourceManager.accessManagement() .roleAssignments() .define(roleAssignmentName) .forGroup(activeDirectoryGroup) @@ -97,7 +97,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating a Linux VM with MSI enabled"); - VirtualMachine virtualMachine = azure.virtualMachines() + VirtualMachine virtualMachine = azureResourceManager.virtualMachines() .define(linuxVMName) .withRegion(region) .withNewResourceGroup(rgName) @@ -132,7 +132,7 @@ public static boolean runSample(Azure azure) { // Prepare custom script t install az cli that uses MSI to create a storage account // - final String stgName = azure.sdkContext().randomResourceName("st44", 15); + final String stgName = azureResourceManager.sdkContext().randomResourceName("st44", 15); installCommand = installCommand.replace("{stgName}", stgName) .replace("{rgName}", rgName) .replace("{location}", region.name()); @@ -156,7 +156,7 @@ public static boolean runSample(Azure azure) { // Retrieve the storage account created by az cli using MSI credentials // - StorageAccount storageAccount = azure.storageAccounts() + StorageAccount storageAccount = azureResourceManager.storageAccounts() .getByResourceGroup(rgName, stgName); System.out.println("Storage account created by az cli using MSI credential"); @@ -165,7 +165,7 @@ public static boolean runSample(Azure azure) { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); } catch (Exception g) { @@ -188,16 +188,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageScaleSetUserAssignedMSIFromServicePrincipal.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageScaleSetUserAssignedMSIFromServicePrincipal.java index fffa854d5a7a1..09f7c7dcd31d5 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageScaleSetUserAssignedMSIFromServicePrincipal.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageScaleSetUserAssignedMSIFromServicePrincipal.java @@ -11,7 +11,7 @@ import com.azure.identity.ClientSecretCredential; import com.azure.identity.ClientSecretCredentialBuilder; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.KnownLinuxVirtualMachineImage; import com.azure.resourcemanager.compute.models.VirtualMachineScaleSet; import com.azure.resourcemanager.compute.models.VirtualMachineScaleSetSkuTypes; @@ -39,7 +39,7 @@ public final class ManageScaleSetUserAssignedMSIFromServicePrincipal { * @param authenticated instance of Authenticated * @return true if sample runs successfully */ - public static boolean runSample(Azure.Authenticated authenticated) { + public static boolean runSample(AzureResourceManager.Authenticated authenticated) { Region region = Region.US_WEST_CENTRAL; String vmssName = authenticated.sdkContext().randomResourceName("vmss", 15); String spName1 = authenticated.sdkContext().randomResourceName("sp1", 21); @@ -52,16 +52,16 @@ public static boolean runSample(Azure.Authenticated authenticated) { final String userName = "tirekicker"; final String password = com.azure.resourcemanager.samples.Utils.password(); - Azure azure = null; + AzureResourceManager azureResourceManager = null; try { - azure = authenticated.withDefaultSubscription(); + azureResourceManager = authenticated.withDefaultSubscription(); System.out.println("Creating network for virtual machine scale sets"); // ============================================================ // Create Virtual Machine Scale Set - Network network = azure.networks() + Network network = azureResourceManager.networks() .define("vmssvnet") .withRegion(region) .withNewResourceGroup(rgName) @@ -69,7 +69,7 @@ public static boolean runSample(Azure.Authenticated authenticated) { .withSubnet("subnet1", "10.0.0.0/28") .create(); - VirtualMachineScaleSet virtualMachineScaleSet1 = azure.virtualMachineScaleSets() + VirtualMachineScaleSet virtualMachineScaleSet1 = azureResourceManager.virtualMachineScaleSets() .define(vmssName) .withRegion(region) .withExistingResourceGroup(rgName) @@ -92,7 +92,7 @@ public static boolean runSample(Azure.Authenticated authenticated) { .withNewRole(BuiltInRole.CONTRIBUTOR, Utils.resourceGroupId(virtualMachineScaleSet1.id())) .create(); - Identity identity1 = azure.identities().define(identityName1) + Identity identity1 = azureResourceManager.identities().define(identityName1) .withRegion(region) .withExistingResourceGroup(rgName) .create(); @@ -103,7 +103,7 @@ public static boolean runSample(Azure.Authenticated authenticated) { // ============================================================ // Create a managed service identity #2 - Identity identity2 = azure.identities().define(identityName2) + Identity identity2 = azureResourceManager.identities().define(identityName2) .withRegion(region) .withNewResourceGroup(rgName + "2") .create(); @@ -138,8 +138,8 @@ public static boolean runSample(Azure.Authenticated authenticated) { } return true; } finally { - if (azure != null) { - azure.resourceGroups().beginDeleteByName(rgName); + if (azureResourceManager != null) { + azureResourceManager.resourceGroups().beginDeleteByName(rgName); try { authenticated.servicePrincipals().deleteById(servicePrincipal.id()); } catch (Exception e) { @@ -170,7 +170,7 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure.Authenticated authenticated = Azure + AzureResourceManager.Authenticated authenticated = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageStorageFromMSIEnabledVirtualMachine.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageStorageFromMSIEnabledVirtualMachine.java index 9d19e0486d383..50c1b64719595 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageStorageFromMSIEnabledVirtualMachine.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageStorageFromMSIEnabledVirtualMachine.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.CachingTypes; import com.azure.resourcemanager.compute.models.KnownLinuxVirtualMachineImage; import com.azure.resourcemanager.compute.models.VirtualMachine; @@ -33,13 +33,13 @@ public final class ManageStorageFromMSIEnabledVirtualMachine { /** * Main function which runs the actual sample. * - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String linuxVMName = azure.sdkContext().randomResourceName("VM1", 15); - final String rgName = azure.sdkContext().randomResourceName("rgCOMV", 15); - final String pipName = azure.sdkContext().randomResourceName("pip1", 15); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String linuxVMName = azureResourceManager.sdkContext().randomResourceName("VM1", 15); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgCOMV", 15); + final String pipName = azureResourceManager.sdkContext().randomResourceName("pip1", 15); final String userName = "tirekicker"; final String password = Utils.password(); final Region region = Region.US_WEST_CENTRAL; @@ -55,7 +55,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating a Linux VM with MSI enabled"); - VirtualMachine virtualMachine = azure.virtualMachines() + VirtualMachine virtualMachine = azureResourceManager.virtualMachines() .define(linuxVMName) .withRegion(region) .withNewResourceGroup(rgName) @@ -76,7 +76,7 @@ public static boolean runSample(Azure azure) { // Prepare custom script t install az cli that uses MSI to create a storage account // - final String stgName = azure.sdkContext().randomResourceName("st44", 15); + final String stgName = azureResourceManager.sdkContext().randomResourceName("st44", 15); installCommand = installCommand.replace("{stgName}", stgName) .replace("{rgName}", rgName) .replace("{location}", region.name()); @@ -100,7 +100,7 @@ public static boolean runSample(Azure azure) { // Retrieve the storage account created by az cli using MSI credentials // - StorageAccount storageAccount = azure.storageAccounts() + StorageAccount storageAccount = azureResourceManager.storageAccounts() .getByResourceGroup(rgName, stgName); System.out.println("Storage account created by az cli using MSI credential"); @@ -109,7 +109,7 @@ public static boolean runSample(Azure azure) { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); } catch (Exception g) { @@ -132,16 +132,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageUserAssignedMSIEnabledVirtualMachine.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageUserAssignedMSIEnabledVirtualMachine.java index 591052fc98127..be4b1b4b56fdf 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageUserAssignedMSIEnabledVirtualMachine.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageUserAssignedMSIEnabledVirtualMachine.java @@ -8,7 +8,7 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.KnownLinuxVirtualMachineImage; import com.azure.resourcemanager.compute.models.RunCommandInput; import com.azure.resourcemanager.compute.models.RunCommandResult; @@ -37,15 +37,15 @@ public final class ManageUserAssignedMSIEnabledVirtualMachine { /** * Main function which runs the actual sample. * - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String rgName1 = azure.sdkContext().randomResourceName("uamsi-rg-1", 15); - final String rgName2 = azure.sdkContext().randomResourceName("uamsi-rg-2", 15); - final String identityName = azure.sdkContext().randomResourceName("id", 15); - final String linuxVMName = azure.sdkContext().randomResourceName("VM1", 15); - final String pipName = azure.sdkContext().randomResourceName("pip1", 15); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String rgName1 = azureResourceManager.sdkContext().randomResourceName("uamsi-rg-1", 15); + final String rgName2 = azureResourceManager.sdkContext().randomResourceName("uamsi-rg-2", 15); + final String identityName = azureResourceManager.sdkContext().randomResourceName("id", 15); + final String linuxVMName = azureResourceManager.sdkContext().randomResourceName("VM1", 15); + final String pipName = azureResourceManager.sdkContext().randomResourceName("pip1", 15); final String userName = "tirekicker"; final String password = Utils.password(); final Region region = Region.US_WEST_CENTRAL; @@ -58,12 +58,12 @@ public static boolean runSample(Azure azure) { System.out.println("Creating a Resource Group and User Assigned MSI with CONTRIBUTOR access to the resource group"); - ResourceGroup resourceGroup1 = azure.resourceGroups() + ResourceGroup resourceGroup1 = azureResourceManager.resourceGroups() .define(rgName1) .withRegion(region) .create(); - Identity identity = azure.identities() + Identity identity = azureResourceManager.identities() .define(identityName) .withRegion(region) .withNewResourceGroup(rgName2) @@ -88,7 +88,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating a Linux VM with MSI associated and install Java8, Maven and Git"); - VirtualMachine virtualMachine = azure.virtualMachines() + VirtualMachine virtualMachine = azureResourceManager.virtualMachines() .define(linuxVMName) .withRegion(region) .withExistingResourceGroup(rgName2) @@ -122,9 +122,9 @@ public static boolean runSample(Azure azure) { List commands = new ArrayList<>(); commands.add("git clone https://github.com/Azure-Samples/compute-java-manage-vm-from-vm-with-msi-credentials.git"); commands.add("cd compute-java-manage-vm-from-vm-with-msi-credentials"); - commands.add(String.format("mvn clean compile exec:java -Dexec.args='%s %s %s'", azure.subscriptionId(), resourceGroup1.name(), identity.clientId())); + commands.add(String.format("mvn clean compile exec:java -Dexec.args='%s %s %s'", azureResourceManager.subscriptionId(), resourceGroup1.name(), identity.clientId())); - runCommandOnVM(azure, virtualMachine, commands); + runCommandOnVM(azureResourceManager, virtualMachine, commands); System.out.println("Java application executed"); @@ -133,7 +133,7 @@ public static boolean runSample(Azure azure) { System.out.println("Retrieving the virtual machine created from the MSI enabled Linux VM"); - PagedIterable virtualMachines = azure.virtualMachines().listByResourceGroup(resourceGroup1.name()); + PagedIterable virtualMachines = azureResourceManager.virtualMachines().listByResourceGroup(resourceGroup1.name()); for (VirtualMachine vm : virtualMachines) { Utils.print(vm); } @@ -142,9 +142,9 @@ public static boolean runSample(Azure azure) { } finally { try { System.out.println("Deleting Resource Group: " + rgName1); - azure.resourceGroups().deleteByName(rgName1); + azureResourceManager.resourceGroups().deleteByName(rgName1); System.out.println("Deleting Resource Group: " + rgName2); - azure.resourceGroups().deleteByName(rgName2); + azureResourceManager.resourceGroups().deleteByName(rgName2); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); } catch (Exception g) { @@ -153,12 +153,12 @@ public static boolean runSample(Azure azure) { } } - private static RunCommandResult runCommandOnVM(Azure azure, VirtualMachine virtualMachine, List commands) { + private static RunCommandResult runCommandOnVM(AzureResourceManager azureResourceManager, VirtualMachine virtualMachine, List commands) { RunCommandInput runParams = new RunCommandInput() .withCommandId("RunShellScript") .withScript(commands); - return azure.virtualMachines().runCommand(virtualMachine.resourceGroupName(), virtualMachine.name(), runParams); + return azureResourceManager.virtualMachines().runCommand(virtualMachine.resourceGroupName(), virtualMachine.name(), runParams); } /** @@ -175,16 +175,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachine.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachine.java index 9b7f1ad59086d..d70bd8f33e057 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachine.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachine.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.Disk; import com.azure.resourcemanager.compute.models.KnownLinuxVirtualMachineImage; import com.azure.resourcemanager.compute.models.KnownWindowsVirtualMachineImage; @@ -38,14 +38,14 @@ public final class ManageVirtualMachine { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { + public static boolean runSample(AzureResourceManager azureResourceManager) { final Region region = Region.US_WEST_CENTRAL; - final String windowsVMName = azure.sdkContext().randomResourceName("wVM", 15); - final String linuxVMName = azure.sdkContext().randomResourceName("lVM", 15); - final String rgName = azure.sdkContext().randomResourceName("rgCOMV", 15); + final String windowsVMName = azureResourceManager.sdkContext().randomResourceName("wVM", 15); + final String linuxVMName = azureResourceManager.sdkContext().randomResourceName("lVM", 15); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgCOMV", 15); final String userName = "tirekicker"; final String password = Utils.password(); @@ -56,7 +56,7 @@ public static boolean runSample(Azure azure) { // Prepare a creatable data disk for VM // - Creatable dataDiskCreatable = azure.disks().define(azure.sdkContext().randomResourceName("dsk-", 15)) + Creatable dataDiskCreatable = azureResourceManager.disks().define(azureResourceManager.sdkContext().randomResourceName("dsk-", 15)) .withRegion(region) .withExistingResourceGroup(rgName) .withData() @@ -64,8 +64,8 @@ public static boolean runSample(Azure azure) { // Create a data disk to attach to VM // - Disk dataDisk = azure.disks() - .define(azure.sdkContext().randomResourceName("dsk-", 15)) + Disk dataDisk = azureResourceManager.disks() + .define(azureResourceManager.sdkContext().randomResourceName("dsk-", 15)) .withRegion(region) .withNewResourceGroup(rgName) .withData() @@ -76,7 +76,7 @@ public static boolean runSample(Azure azure) { Date t1 = new Date(); - VirtualMachine windowsVM = azure.virtualMachines() + VirtualMachine windowsVM = azureResourceManager.virtualMachines() .define(windowsVMName) .withRegion(region) .withNewResourceGroup(rgName) @@ -159,7 +159,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating a Linux VM in the network"); - VirtualMachine linuxVM = azure.virtualMachines() + VirtualMachine linuxVM = azureResourceManager.virtualMachines() .define(linuxVMName) .withRegion(region) .withExistingResourceGroup(rgName) @@ -183,7 +183,7 @@ public static boolean runSample(Azure azure) { System.out.println("Printing list of VMs ======="); - for (VirtualMachine virtualMachine : azure.virtualMachines().listByResourceGroup(resourceGroupName)) { + for (VirtualMachine virtualMachine : azureResourceManager.virtualMachines().listByResourceGroup(resourceGroupName)) { Utils.print(virtualMachine); } @@ -191,7 +191,7 @@ public static boolean runSample(Azure azure) { // Delete the virtual machine System.out.println("Deleting VM: " + windowsVM.id()); - azure.virtualMachines().deleteById(windowsVM.id()); + azureResourceManager.virtualMachines().deleteById(windowsVM.id()); System.out.println("Deleted VM: " + windowsVM.id()); return true; @@ -199,7 +199,7 @@ public static boolean runSample(Azure azure) { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -224,16 +224,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineAsync.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineAsync.java index 89945cf5ee1e1..dfca151e82f23 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineAsync.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineAsync.java @@ -8,7 +8,7 @@ import com.azure.core.management.AzureEnvironment; import com.azure.core.management.profile.AzureProfile; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.Disk; import com.azure.resourcemanager.compute.models.KnownLinuxVirtualMachineImage; import com.azure.resourcemanager.compute.models.KnownWindowsVirtualMachineImage; @@ -41,14 +41,14 @@ public final class ManageVirtualMachineAsync { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(final Azure azure) { + public static boolean runSample(final AzureResourceManager azureResourceManager) { final Region region = Region.US_WEST_CENTRAL; - final String windowsVMName = azure.sdkContext().randomResourceName("wVM", 15); - final String linuxVMName = azure.sdkContext().randomResourceName("lVM", 15); - final String rgName = azure.sdkContext().randomResourceName("rgCOMV", 15); + final String windowsVMName = azureResourceManager.sdkContext().randomResourceName("wVM", 15); + final String linuxVMName = azureResourceManager.sdkContext().randomResourceName("lVM", 15); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgCOMV", 15); final String userName = "tirekicker"; final String password = Utils.password(); final String windowsVmKey = "WindowsVM"; @@ -63,7 +63,7 @@ public static boolean runSample(final Azure azure) { // final Date t1 = new Date(); - final Creatable dataDiskCreatable = azure.disks().define(azure.sdkContext().randomResourceName("dsk-", 15)) + final Creatable dataDiskCreatable = azureResourceManager.disks().define(azureResourceManager.sdkContext().randomResourceName("dsk-", 15)) .withRegion(region) .withExistingResourceGroup(rgName) .withData() @@ -71,7 +71,7 @@ public static boolean runSample(final Azure azure) { // Create a data disk to attach to VM // - Mono dataDiskMono = azure.disks().define(azure.sdkContext().randomResourceName("dsk-", 15)) + Mono dataDiskMono = azureResourceManager.disks().define(azureResourceManager.sdkContext().randomResourceName("dsk-", 15)) .withRegion(region) .withNewResourceGroup(rgName) .withData() @@ -80,7 +80,7 @@ public static boolean runSample(final Azure azure) { final Map createdVms = new TreeMap<>(); - Mono nicMono = azure.networkInterfaces().define(azure.sdkContext().randomResourceName("nic", 20)) + Mono nicMono = azureResourceManager.networkInterfaces().define(azureResourceManager.sdkContext().randomResourceName("nic", 20)) .withRegion(region) .withNewResourceGroup(rgName) .withNewPrimaryNetwork("10.0.0.0/28") @@ -92,7 +92,7 @@ public static boolean runSample(final Azure azure) { tuple -> Flux.merge( Mono.defer(() -> { System.out.println("Creating a Windows VM"); - return azure.virtualMachines().define(windowsVMName) + return azureResourceManager.virtualMachines().define(windowsVMName) .withRegion(region) .withExistingResourceGroup(rgName) .withExistingPrimaryNetworkInterface(tuple.getT2()) @@ -107,7 +107,7 @@ public static boolean runSample(final Azure azure) { }), Mono.defer(() -> { System.out.println("Creating a Linux VM in the same network"); - return azure.virtualMachines().define(linuxVMName) + return azureResourceManager.virtualMachines().define(linuxVMName) .withRegion(region) .withExistingResourceGroup(rgName) .withExistingPrimaryNetworkInterface(tuple.getT2()) @@ -162,7 +162,7 @@ public static boolean runSample(final Azure azure) { //============================================================= // List virtual machines and print details - azure.virtualMachines().listByResourceGroupAsync(rgName) + azureResourceManager.virtualMachines().listByResourceGroupAsync(rgName) .map(virtualMachine -> { System.out.println("Retrieved details for VM: " + virtualMachine.id()); return virtualMachine; @@ -171,15 +171,15 @@ public static boolean runSample(final Azure azure) { //============================================================= // Delete the virtual machines in parallel Flux.merge( - azure.virtualMachines().deleteByIdAsync(windowsVM.id()), - azure.virtualMachines().deleteByIdAsync(linuxVM.id())) + azureResourceManager.virtualMachines().deleteByIdAsync(windowsVM.id()), + azureResourceManager.virtualMachines().deleteByIdAsync(linuxVM.id())) .singleOrEmpty().block(); return true; } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().deleteByNameAsync(rgName) + azureResourceManager.resourceGroups().deleteByNameAsync(rgName) .block(); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { @@ -211,16 +211,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineExtension.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineExtension.java index afa2581c1ace6..29138fa7aba75 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineExtension.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineExtension.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.KnownWindowsVirtualMachineImage; import com.azure.resourcemanager.compute.models.VirtualMachine; import com.azure.resourcemanager.compute.models.VirtualMachineSizeTypes; @@ -30,16 +30,16 @@ public final class ManageVirtualMachineExtension { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { + public static boolean runSample(AzureResourceManager azureResourceManager) { final Region region = Region.US_WEST_CENTRAL; - final String linuxVMName = azure.sdkContext().randomResourceName("lVM", 10); - final String windowsVMName = azure.sdkContext().randomResourceName("wVM", 10); - final String rgName = azure.sdkContext().randomResourceName("rgCOVE", 15); - final String pipDnsLabelLinuxVM = azure.sdkContext().randomResourceName("rgPip1", 25); - final String pipDnsLabelWindowsVM = azure.sdkContext().randomResourceName("rgPip2", 25); + final String linuxVMName = azureResourceManager.sdkContext().randomResourceName("lVM", 10); + final String windowsVMName = azureResourceManager.sdkContext().randomResourceName("wVM", 10); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgCOVE", 15); + final String pipDnsLabelLinuxVM = azureResourceManager.sdkContext().randomResourceName("rgPip1", 25); + final String pipDnsLabelWindowsVM = azureResourceManager.sdkContext().randomResourceName("rgPip2", 25); // Linux configurations // @@ -104,7 +104,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating a Linux VM"); - VirtualMachine linuxVM = azure.virtualMachines().define(linuxVMName) + VirtualMachine linuxVM = azureResourceManager.virtualMachines().define(linuxVMName) .withRegion(region) .withNewResourceGroup(rgName) .withNewPrimaryNetwork("10.0.0.0/28") @@ -203,7 +203,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating a Windows VM"); - VirtualMachine windowsVM = azure.virtualMachines().define(windowsVMName) + VirtualMachine windowsVM = azureResourceManager.virtualMachines().define(windowsVMName) .withRegion(region) .withExistingResourceGroup(rgName) .withNewPrimaryNetwork("10.0.0.0/28") @@ -277,7 +277,7 @@ public static boolean runSample(Azure azure) { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -302,16 +302,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineScaleSet.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineScaleSet.java index c8603e2b5472a..534bfe9964a83 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineScaleSet.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineScaleSet.java @@ -8,7 +8,7 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.CachingTypes; import com.azure.resourcemanager.compute.models.ImageReference; import com.azure.resourcemanager.compute.models.StorageAccountTypes; @@ -46,14 +46,14 @@ public final class ManageVirtualMachineScaleSet { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { + public static boolean runSample(AzureResourceManager azureResourceManager) { final Region region = Region.US_EAST2; - final String rgName = azure.sdkContext().randomResourceName("rgCOVS", 15); - final String vnetName = azure.sdkContext().randomResourceName("vnet", 24); - final String loadBalancerName1 = azure.sdkContext().randomResourceName("intlb" + "-", 18); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgCOVS", 15); + final String vnetName = azureResourceManager.sdkContext().randomResourceName("vnet", 24); + final String loadBalancerName1 = azureResourceManager.sdkContext().randomResourceName("intlb" + "-", 18); final String publicIpName = "pip-" + loadBalancerName1; final String frontendName = loadBalancerName1 + "-FE1"; final String backendPoolName1 = loadBalancerName1 + "-BAP1"; @@ -65,7 +65,7 @@ public static boolean runSample(Azure azure) { final String httpsLoadBalancingRule = "httpsRule"; final String natPool50XXto22 = "natPool50XXto22"; final String natPool60XXto23 = "natPool60XXto23"; - final String vmssName = azure.sdkContext().randomResourceName("vmss", 24); + final String vmssName = azureResourceManager.sdkContext().randomResourceName("vmss", 24); final String userName = "tirekicker"; final String sshKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfSPC2K7LZcFKEO+/t3dzmQYtrJFZNxOsbVgOVKietqHyvmYGHEC0J2wPdAqQ/63g/hhAEFRoyehM+rbeDri4txB3YFfnOK58jqdkyXzupWqXzOrlKY4Wz9SKjjN765+dqUITjKRIaAip1Ri137szRg71WnrmdP3SphTRlCx1Bk2nXqWPsclbRDCiZeF8QOTi4JqbmJyK5+0UqhqYRduun8ylAwKKQJ1NJt85sYIHn9f1Rfr6Tq2zS0wZ7DHbZL+zB5rSlAr8QyUdg/GQD+cmSs6LvPJKL78d6hMGk84ARtFo4A79ovwX/Fj01znDQkU6nJildfkaolH2rWFG/qttD azjava@javalib.com"; @@ -80,7 +80,7 @@ public static boolean runSample(Azure azure) { // Create a virtual network with a frontend subnet System.out.println("Creating virtual network with a frontend subnet ..."); - Network network = azure.networks().define(vnetName) + Network network = azureResourceManager.networks().define(vnetName) .withRegion(region) .withNewResourceGroup(rgName) .withAddressSpace("172.16.0.0/16") @@ -97,7 +97,7 @@ public static boolean runSample(Azure azure) { // Create a public IP address System.out.println("Creating a public IP address..."); - PublicIpAddress publicIPAddress = azure.publicIpAddresses().define(publicIpName) + PublicIpAddress publicIPAddress = azureResourceManager.publicIpAddresses().define(publicIpName) .withRegion(region) .withExistingResourceGroup(rgName) .withLeafDomainLabel(publicIpName) @@ -132,7 +132,7 @@ public static boolean runSample(Azure azure) { + " balancer to a port for a specific virtual machine in the backend address pool\n" + " - this provides direct VM connectivity for SSH to port 22 and TELNET to port 23"); - LoadBalancer loadBalancer1 = azure.loadBalancers().define(loadBalancerName1) + LoadBalancer loadBalancer1 = azureResourceManager.loadBalancers().define(loadBalancerName1) .withRegion(region) .withExistingResourceGroup(rgName) // Add two rules that uses above backend and probe @@ -203,7 +203,7 @@ public static boolean runSample(Azure azure) { .withSku("18.04-LTS") .withVersion("latest"); - VirtualMachineScaleSet virtualMachineScaleSet = azure.virtualMachineScaleSets().define(vmssName) + VirtualMachineScaleSet virtualMachineScaleSet = azureResourceManager.virtualMachineScaleSets().define(vmssName) .withRegion(region) .withExistingResourceGroup(rgName) .withSku(VirtualMachineScaleSetSkuTypes.STANDARD_D3_V2) @@ -331,7 +331,7 @@ public static boolean runSample(Azure azure) { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -357,16 +357,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineScaleSetAsync.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineScaleSetAsync.java index bca7358dfd814..9d1b05ce25e50 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineScaleSetAsync.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineScaleSetAsync.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.CachingTypes; import com.azure.resourcemanager.compute.models.KnownLinuxVirtualMachineImage; import com.azure.resourcemanager.compute.models.StorageAccountTypes; @@ -44,14 +44,14 @@ public final class ManageVirtualMachineScaleSetAsync { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(final Azure azure) { + public static boolean runSample(final AzureResourceManager azureResourceManager) { final Region region = Region.US_WEST_CENTRAL; - final String rgName = azure.sdkContext().randomResourceName("rgCOVS", 15); - final String vnetName = azure.sdkContext().randomResourceName("vnet", 24); - final String loadBalancerName1 = azure.sdkContext().randomResourceName("intlb" + "-", 18); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgCOVS", 15); + final String vnetName = azureResourceManager.sdkContext().randomResourceName("vnet", 24); + final String loadBalancerName1 = azureResourceManager.sdkContext().randomResourceName("intlb" + "-", 18); final String publicIpName = "pip-" + loadBalancerName1; final String frontendName = loadBalancerName1 + "-FE1"; final String backendPoolName1 = loadBalancerName1 + "-BAP1"; @@ -63,7 +63,7 @@ public static boolean runSample(final Azure azure) { final String httpsLoadBalancingRule = "httpsRule"; final String natPool50XXto22 = "natPool50XXto22"; final String natPool60XXto23 = "natPool60XXto23"; - final String vmssName = azure.sdkContext().randomResourceName("vmss", 24); + final String vmssName = azureResourceManager.sdkContext().randomResourceName("vmss", 24); final String userName = "tirekicker"; final String sshKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfSPC2K7LZcFKEO+/t3dzmQYtrJFZNxOsbVgOVKietqHyvmYGHEC0J2wPdAqQ/63g/hhAEFRoyehM+rbeDri4txB3YFfnOK58jqdkyXzupWqXzOrlKY4Wz9SKjjN765+dqUITjKRIaAip1Ri137szRg71WnrmdP3SphTRlCx1Bk2nXqWPsclbRDCiZeF8QOTi4JqbmJyK5+0UqhqYRduun8ylAwKKQJ1NJt85sYIHn9f1Rfr6Tq2zS0wZ7DHbZL+zB5rSlAr8QyUdg/GQD+cmSs6LvPJKL78d6hMGk84ARtFo4A79ovwX/Fj01znDQkU6nJildfkaolH2rWFG/qttD azjava@javalib.com"; @@ -82,12 +82,12 @@ public static boolean runSample(final Azure azure) { final List createdResources = new ArrayList<>(); - azure.resourceGroups().define(rgName) + azureResourceManager.resourceGroups().define(rgName) .withRegion(region) .create(); Flux.merge( - azure.networks().define(vnetName) + azureResourceManager.networks().define(vnetName) .withRegion(region) .withExistingResourceGroup(rgName) .withAddressSpace("172.16.0.0/16") @@ -96,7 +96,7 @@ public static boolean runSample(final Azure azure) { .attach() .createAsync() .cast(Indexable.class), - azure.publicIpAddresses().define(publicIpName) + azureResourceManager.publicIpAddresses().define(publicIpName) .withRegion(region) .withExistingResourceGroup(rgName) .withLeafDomainLabel(publicIpName) @@ -132,7 +132,7 @@ public static boolean runSample(final Azure azure) { return Flux.merge( Flux.just(indexable), - azure.loadBalancers().define(loadBalancerName1) + azureResourceManager.loadBalancers().define(loadBalancerName1) .withRegion(region) .withExistingResourceGroup(rgName) // Add two rules that uses above backend and probe @@ -221,7 +221,7 @@ public static boolean runSample(final Azure azure) { final Date t1 = new Date(); - VirtualMachineScaleSet virtualMachineScaleSet = azure.virtualMachineScaleSets() + VirtualMachineScaleSet virtualMachineScaleSet = azureResourceManager.virtualMachineScaleSets() .define(vmssName) .withRegion(region) .withExistingResourceGroup(rgName) @@ -321,7 +321,7 @@ public static boolean runSample(final Azure azure) { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -347,16 +347,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineScaleSetWithUnmanagedDisks.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineScaleSetWithUnmanagedDisks.java index 103fa408b2606..94f219b00eef1 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineScaleSetWithUnmanagedDisks.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineScaleSetWithUnmanagedDisks.java @@ -8,7 +8,7 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.ImageReference; import com.azure.resourcemanager.compute.models.VirtualMachineScaleSetVM; import com.azure.resourcemanager.network.models.LoadBalancerInboundNatRule; @@ -44,14 +44,14 @@ public final class ManageVirtualMachineScaleSetWithUnmanagedDisks { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { + public static boolean runSample(AzureResourceManager azureResourceManager) { final Region region = Region.US_EAST2; - final String rgName = azure.sdkContext().randomResourceName("rgCOVS", 15); - final String vnetName = azure.sdkContext().randomResourceName("vnet", 24); - final String loadBalancerName1 = azure.sdkContext().randomResourceName("intlb" + "-", 18); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgCOVS", 15); + final String vnetName = azureResourceManager.sdkContext().randomResourceName("vnet", 24); + final String loadBalancerName1 = azureResourceManager.sdkContext().randomResourceName("intlb" + "-", 18); final String publicIpName = "pip-" + loadBalancerName1; final String frontendName = loadBalancerName1 + "-FE1"; final String backendPoolName1 = loadBalancerName1 + "-BAP1"; @@ -64,10 +64,10 @@ public static boolean runSample(Azure azure) { final String natPool50XXto22 = "natPool50XXto22"; final String natPool60XXto23 = "natPool60XXto23"; - final String vmssName = azure.sdkContext().randomResourceName("vmss", 24); - final String storageAccountName1 = azure.sdkContext().randomResourceName("stg1", 24); - final String storageAccountName2 = azure.sdkContext().randomResourceName("stg2", 24); - final String storageAccountName3 = azure.sdkContext().randomResourceName("stg3", 24); + final String vmssName = azureResourceManager.sdkContext().randomResourceName("vmss", 24); + final String storageAccountName1 = azureResourceManager.sdkContext().randomResourceName("stg1", 24); + final String storageAccountName2 = azureResourceManager.sdkContext().randomResourceName("stg2", 24); + final String storageAccountName3 = azureResourceManager.sdkContext().randomResourceName("stg3", 24); final String userName = "tirekicker"; final String sshKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfSPC2K7LZcFKEO+/t3dzmQYtrJFZNxOsbVgOVKietqHyvmYGHEC0J2wPdAqQ/63g/hhAEFRoyehM+rbeDri4txB3YFfnOK58jqdkyXzupWqXzOrlKY4Wz9SKjjN765+dqUITjKRIaAip1Ri137szRg71WnrmdP3SphTRlCx1Bk2nXqWPsclbRDCiZeF8QOTi4JqbmJyK5+0UqhqYRduun8ylAwKKQJ1NJt85sYIHn9f1Rfr6Tq2zS0wZ7DHbZL+zB5rSlAr8QyUdg/GQD+cmSs6LvPJKL78d6hMGk84ARtFo4A79ovwX/Fj01znDQkU6nJildfkaolH2rWFG/qttD azjava@javalib.com"; @@ -81,7 +81,7 @@ public static boolean runSample(Azure azure) { // Create a virtual network with a frontend subnet System.out.println("Creating virtual network with a frontend subnet ..."); - Network network = azure.networks().define(vnetName) + Network network = azureResourceManager.networks().define(vnetName) .withRegion(region) .withNewResourceGroup(rgName) .withAddressSpace("172.16.0.0/16") @@ -98,7 +98,7 @@ public static boolean runSample(Azure azure) { // Create a public IP address System.out.println("Creating a public IP address..."); - PublicIpAddress publicIPAddress = azure.publicIpAddresses().define(publicIpName) + PublicIpAddress publicIPAddress = azureResourceManager.publicIpAddresses().define(publicIpName) .withRegion(region) .withExistingResourceGroup(rgName) .withLeafDomainLabel(publicIpName) @@ -133,7 +133,7 @@ public static boolean runSample(Azure azure) { + " balancer to a port for a specific virtual machine in the backend address pool\n" + " - this provides direct VM connectivity for SSH to port 22 and TELNET to port 23"); - LoadBalancer loadBalancer1 = azure.loadBalancers().define(loadBalancerName1) + LoadBalancer loadBalancer1 = azureResourceManager.loadBalancers().define(loadBalancerName1) .withRegion(region) .withExistingResourceGroup(rgName) @@ -205,7 +205,7 @@ public static boolean runSample(Azure azure) { .withSku("18.04-LTS") .withVersion("latest"); - VirtualMachineScaleSet virtualMachineScaleSet = azure.virtualMachineScaleSets().define(vmssName) + VirtualMachineScaleSet virtualMachineScaleSet = azureResourceManager.virtualMachineScaleSets().define(vmssName) .withRegion(region) .withExistingResourceGroup(rgName) .withSku(VirtualMachineScaleSetSkuTypes.STANDARD_D3_V2) @@ -317,7 +317,7 @@ public static boolean runSample(Azure azure) { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -343,16 +343,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineWithDisk.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineWithDisk.java index dc915e57e4032..0a10d35a98f4f 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineWithDisk.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineWithDisk.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.CachingTypes; import com.azure.resourcemanager.compute.models.Disk; import com.azure.resourcemanager.compute.models.DiskSkuTypes; @@ -40,13 +40,13 @@ public final class ManageVirtualMachineWithDisk { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String linuxVMName1 = azure.sdkContext().randomResourceName("VM1", 15); - final String rgName = azure.sdkContext().randomResourceName("rgCOMV", 15); - final String publicIPDnsLabel = azure.sdkContext().randomResourceName("pip", 15); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String linuxVMName1 = azureResourceManager.sdkContext().randomResourceName("VM1", 15); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgCOMV", 15); + final String publicIPDnsLabel = azureResourceManager.sdkContext().randomResourceName("pip", 15); final String userName = "tirekicker"; final String password = Utils.password(); final Region region = Region.US_WEST_CENTRAL; @@ -56,7 +56,7 @@ public static boolean runSample(Azure azure) { // System.out.println("Creating an empty managed disk"); - Disk dataDisk1 = azure.disks().define(azure.sdkContext().randomResourceName("dsk-", 15)) + Disk dataDisk1 = azureResourceManager.disks().define(azureResourceManager.sdkContext().randomResourceName("dsk-", 15)) .withRegion(region) .withNewResourceGroup(rgName) .withData() @@ -67,7 +67,7 @@ public static boolean runSample(Azure azure) { // Prepare first creatable data disk // - Creatable dataDiskCreatable1 = azure.disks().define(azure.sdkContext().randomResourceName("dsk-", 15)) + Creatable dataDiskCreatable1 = azureResourceManager.disks().define(azureResourceManager.sdkContext().randomResourceName("dsk-", 15)) .withRegion(region) .withExistingResourceGroup(rgName) .withData() @@ -75,7 +75,7 @@ public static boolean runSample(Azure azure) { // Prepare second creatable data disk // - Creatable dataDiskCreatable2 = azure.disks().define(azure.sdkContext().randomResourceName("dsk-", 15)) + Creatable dataDiskCreatable2 = azureResourceManager.disks().define(azureResourceManager.sdkContext().randomResourceName("dsk-", 15)) .withRegion(region) .withExistingResourceGroup(rgName) .withData() @@ -87,7 +87,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating a managed Linux VM"); - VirtualMachine linuxVM = azure.virtualMachines().define(linuxVMName1) + VirtualMachine linuxVM = azureResourceManager.virtualMachines().define(linuxVMName1) .withRegion(region) .withNewResourceGroup(rgName) .withNewPrimaryNetwork("10.0.0.0/28") @@ -130,10 +130,10 @@ public static boolean runSample(Azure azure) { // ====================================================================== // Delete a managed disk - Disk disk = azure.disks().getById(lun3DiskId); + Disk disk = azureResourceManager.disks().getById(lun3DiskId); System.out.println("Delete managed disk: " + disk.id()); - azure.disks().deleteByResourceGroup(disk.resourceGroupName(), disk.name()); + azureResourceManager.disks().deleteByResourceGroup(disk.resourceGroupName(), disk.name()); System.out.println("Deleted managed disk"); @@ -149,10 +149,10 @@ public static boolean runSample(Azure azure) { //====================================================================== // Resize the OS and Data Disks - Disk osDisk = azure.disks().getById(linuxVM.osDiskId()); + Disk osDisk = azureResourceManager.disks().getById(linuxVM.osDiskId()); List dataDisks = new ArrayList<>(); for (VirtualMachineDataDisk vmDataDisk : linuxVM.dataDisks().values()) { - Disk dataDisk = azure.disks().getById(vmDataDisk.id()); + Disk dataDisk = azureResourceManager.disks().getById(vmDataDisk.id()); dataDisks.add(dataDisk); } @@ -187,7 +187,7 @@ public static boolean runSample(Azure azure) { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -212,16 +212,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineWithUnmanagedDisks.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineWithUnmanagedDisks.java index 2c0c70d531400..6df136610f9ff 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineWithUnmanagedDisks.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachineWithUnmanagedDisks.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.CachingTypes; import com.azure.resourcemanager.compute.models.KnownLinuxVirtualMachineImage; import com.azure.resourcemanager.compute.models.KnownWindowsVirtualMachineImage; @@ -39,14 +39,14 @@ public final class ManageVirtualMachineWithUnmanagedDisks { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { + public static boolean runSample(AzureResourceManager azureResourceManager) { final Region region = Region.US_WEST_CENTRAL; - final String windowsVMName = azure.sdkContext().randomResourceName("wVM", 15); - final String linuxVMName = azure.sdkContext().randomResourceName("lVM", 15); - final String rgName = azure.sdkContext().randomResourceName("rgCOMV", 15); + final String windowsVMName = azureResourceManager.sdkContext().randomResourceName("wVM", 15); + final String linuxVMName = azureResourceManager.sdkContext().randomResourceName("lVM", 15); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgCOMV", 15); final String userName = "tirekicker"; final String password = Utils.password(); final String dataDiskName = "disk2"; @@ -60,7 +60,7 @@ public static boolean runSample(Azure azure) { Date t1 = new Date(); - VirtualMachine windowsVM = azure.virtualMachines().define(windowsVMName) + VirtualMachine windowsVM = azureResourceManager.virtualMachines().define(windowsVMName) .withRegion(region) .withNewResourceGroup(rgName) .withNewPrimaryNetwork("10.0.0.0/28") @@ -193,7 +193,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating a Linux VM in the network"); - VirtualMachine linuxVM = azure.virtualMachines().define(linuxVMName) + VirtualMachine linuxVM = azureResourceManager.virtualMachines().define(linuxVMName) .withRegion(region) .withExistingResourceGroup(rgName) .withExistingPrimaryNetwork(network) @@ -217,7 +217,7 @@ public static boolean runSample(Azure azure) { System.out.println("Printing list of VMs ======="); - for (VirtualMachine virtualMachine : azure.virtualMachines().listByResourceGroup(resourceGroupName)) { + for (VirtualMachine virtualMachine : azureResourceManager.virtualMachines().listByResourceGroup(resourceGroupName)) { Utils.print(virtualMachine); } @@ -225,7 +225,7 @@ public static boolean runSample(Azure azure) { // Delete the virtual machine System.out.println("Deleting VM: " + windowsVM.id()); - azure.virtualMachines().deleteById(windowsVM.id()); + azureResourceManager.virtualMachines().deleteById(windowsVM.id()); System.out.println("Deleted VM: " + windowsVM.id()); return true; @@ -233,7 +233,7 @@ public static boolean runSample(Azure azure) { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -258,16 +258,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachinesInParallel.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachinesInParallel.java index b86817194f44b..b66480eaa71c1 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachinesInParallel.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageVirtualMachinesInParallel.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.KnownLinuxVirtualMachineImage; import com.azure.resourcemanager.compute.models.VirtualMachine; import com.azure.resourcemanager.compute.models.VirtualMachineSizeTypes; @@ -32,32 +32,32 @@ public final class ManageVirtualMachinesInParallel { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { + public static boolean runSample(AzureResourceManager azureResourceManager) { final int vmCount = 10; final Region region = Region.US_SOUTH_CENTRAL; - final String rgName = azure.sdkContext().randomResourceName("rgCOPP", 24); - final String networkName = azure.sdkContext().randomResourceName("vnetCOMV", 24); - final String storageAccountName = azure.sdkContext().randomResourceName("stgCOMV", 20); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgCOPP", 24); + final String networkName = azureResourceManager.sdkContext().randomResourceName("vnetCOMV", 24); + final String storageAccountName = azureResourceManager.sdkContext().randomResourceName("stgCOMV", 20); final String userName = "tirekicker"; final String password = Utils.password(); try { // Create a resource group [Where all resources gets created] - ResourceGroup resourceGroup = azure.resourceGroups() + ResourceGroup resourceGroup = azureResourceManager.resourceGroups() .define(rgName) .withRegion(region) .create(); // Prepare Creatable Network definition [Where all the virtual machines get added to] - Creatable creatableNetwork = azure.networks().define(networkName) + Creatable creatableNetwork = azureResourceManager.networks().define(networkName) .withRegion(region) .withExistingResourceGroup(resourceGroup) .withAddressSpace("172.16.0.0/16"); // Prepare Creatable Storage account definition [For storing VMs disk] - Creatable creatableStorageAccount = azure.storageAccounts().define(storageAccountName) + Creatable creatableStorageAccount = azureResourceManager.storageAccounts().define(storageAccountName) .withRegion(region) .withExistingResourceGroup(resourceGroup); @@ -65,7 +65,7 @@ public static boolean runSample(Azure azure) { List> creatableVirtualMachines = new ArrayList<>(); for (int i = 0; i < vmCount; i++) { - Creatable creatableVirtualMachine = azure.virtualMachines().define("VM-" + i) + Creatable creatableVirtualMachine = azureResourceManager.virtualMachines().define("VM-" + i) .withRegion(region) .withExistingResourceGroup(resourceGroup) .withNewPrimaryNetwork(creatableNetwork) @@ -83,7 +83,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating the virtual machines"); stopwatch.start(); - Collection virtualMachines = azure.virtualMachines().create(creatableVirtualMachines).values(); + Collection virtualMachines = azureResourceManager.virtualMachines().create(creatableVirtualMachines).values(); stopwatch.stop(); System.out.println("Created virtual machines"); @@ -98,7 +98,7 @@ public static boolean runSample(Azure azure) { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); } catch (Exception g) { @@ -121,16 +121,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageZonalVirtualMachine.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageZonalVirtualMachine.java index ed17db47c4531..8280e0865dcad 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageZonalVirtualMachine.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageZonalVirtualMachine.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.Disk; import com.azure.resourcemanager.compute.models.KnownLinuxVirtualMachineImage; import com.azure.resourcemanager.compute.models.VirtualMachine; @@ -29,17 +29,17 @@ public final class ManageZonalVirtualMachine { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { + public static boolean runSample(AzureResourceManager azureResourceManager) { final Region region = Region.US_EAST2; - final String rgName = azure.sdkContext().randomResourceName("rgCOMV", 15); - final String vmName1 = azure.sdkContext().randomResourceName("lVM1", 15); - final String vmName2 = azure.sdkContext().randomResourceName("lVM2", 15); - final String pipName1 = azure.sdkContext().randomResourceName("pip1", 15); - final String pipName2 = azure.sdkContext().randomResourceName("pip2", 15); - final String diskName = azure.sdkContext().randomResourceName("ds", 15); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgCOMV", 15); + final String vmName1 = azureResourceManager.sdkContext().randomResourceName("lVM1", 15); + final String vmName2 = azureResourceManager.sdkContext().randomResourceName("lVM2", 15); + final String pipName1 = azureResourceManager.sdkContext().randomResourceName("pip1", 15); + final String pipName2 = azureResourceManager.sdkContext().randomResourceName("pip2", 15); + final String diskName = azureResourceManager.sdkContext().randomResourceName("ds", 15); final String userName = "tirekicker"; final String password = Utils.password(); @@ -50,7 +50,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating a zonal VM with implicitly zoned related resources (PublicIP, Disk)"); - VirtualMachine virtualMachine1 = azure.virtualMachines() + VirtualMachine virtualMachine1 = azureResourceManager.virtualMachines() .define(vmName1) .withRegion(region) .withNewResourceGroup(rgName) @@ -74,7 +74,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating a zonal public ip address"); - PublicIpAddress publicIPAddress = azure.publicIpAddresses() + PublicIpAddress publicIPAddress = azureResourceManager.publicIpAddresses() .define(pipName2) .withRegion(region) .withExistingResourceGroup(rgName) @@ -93,7 +93,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating a zonal data disk"); - Disk dataDisk = azure.disks() + Disk dataDisk = azureResourceManager.disks() .define(diskName) .withRegion(region) .withExistingResourceGroup(rgName) @@ -112,7 +112,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating a zonal VM with implicitly zoned related resources (PublicIP, Disk)"); - VirtualMachine virtualMachine2 = azure.virtualMachines() + VirtualMachine virtualMachine2 = azureResourceManager.virtualMachines() .define(vmName2) .withRegion(region) .withNewResourceGroup(rgName) @@ -137,7 +137,7 @@ public static boolean runSample(Azure azure) { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -162,16 +162,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageZonalVirtualMachineScaleSet.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageZonalVirtualMachineScaleSet.java index 7b4d40a7dad5f..d38b4401b521f 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageZonalVirtualMachineScaleSet.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/compute/samples/ManageZonalVirtualMachineScaleSet.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.KnownLinuxVirtualMachineImage; import com.azure.resourcemanager.compute.models.VirtualMachineScaleSet; import com.azure.resourcemanager.compute.models.VirtualMachineScaleSetSkuTypes; @@ -37,27 +37,27 @@ public final class ManageZonalVirtualMachineScaleSet { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { + public static boolean runSample(AzureResourceManager azureResourceManager) { final Region region = Region.US_EAST2; - final String rgName = azure.sdkContext().randomResourceName("rgCOMV", 15); - final String loadBalancerName = azure.sdkContext().randomResourceName("extlb", 15); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgCOMV", 15); + final String loadBalancerName = azureResourceManager.sdkContext().randomResourceName("extlb", 15); final String publicIPName = "pip-" + loadBalancerName; final String frontendName = loadBalancerName + "-FE1"; final String backendPoolName1 = loadBalancerName + "-BAP1"; final String backendPoolName2 = loadBalancerName + "-BAP2"; final String natPoolName1 = loadBalancerName + "-INP1"; final String natPoolName2 = loadBalancerName + "-INP2"; - final String vmssName1 = azure.sdkContext().randomResourceName("vmss1", 15); - final String vmssName2 = azure.sdkContext().randomResourceName("vmss2", 15); + final String vmssName1 = azureResourceManager.sdkContext().randomResourceName("vmss1", 15); + final String vmssName2 = azureResourceManager.sdkContext().randomResourceName("vmss2", 15); final String userName = "tirekicker"; final String password = Utils.password(); try { - ResourceGroup resourceGroup = azure.resourceGroups() + ResourceGroup resourceGroup = azureResourceManager.resourceGroups() .define(rgName) .withRegion(region) .create(); @@ -67,7 +67,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating a zone resilient public ip address"); - PublicIpAddress publicIPAddress = azure.publicIpAddresses() + PublicIpAddress publicIPAddress = azureResourceManager.publicIpAddresses() .define(publicIPName) .withRegion(region) .withExistingResourceGroup(resourceGroup) @@ -86,7 +86,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating a zone resilient load balancer"); - LoadBalancer loadBalancer = azure.loadBalancers() + LoadBalancer loadBalancer = azureResourceManager.loadBalancers() .define(loadBalancerName) .withRegion(region) .withExistingResourceGroup(resourceGroup) @@ -147,7 +147,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating network for virtual machine scale sets"); - Network network = azure + Network network = azureResourceManager .networks() .define("vmssvnet") .withRegion(region) @@ -166,7 +166,7 @@ public static boolean runSample(Azure azure) { // HTTP goes to this virtual machine scale set // - VirtualMachineScaleSet virtualMachineScaleSet1 = azure.virtualMachineScaleSets() + VirtualMachineScaleSet virtualMachineScaleSet1 = azureResourceManager.virtualMachineScaleSets() .define(vmssName1) .withRegion(region) .withExistingResourceGroup(resourceGroup) @@ -191,7 +191,7 @@ public static boolean runSample(Azure azure) { // HTTPS goes to this virtual machine scale set // - VirtualMachineScaleSet virtualMachineScaleSet2 = azure.virtualMachineScaleSets() + VirtualMachineScaleSet virtualMachineScaleSet2 = azureResourceManager.virtualMachineScaleSets() .define(vmssName2) .withRegion(region) .withExistingResourceGroup(resourceGroup) @@ -213,7 +213,7 @@ public static boolean runSample(Azure azure) { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -238,16 +238,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceWithAzureFileShareMount.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceWithAzureFileShareMount.java index a32552c85237a..29e3bcdb1c416 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceWithAzureFileShareMount.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceWithAzureFileShareMount.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.containerinstance.models.ContainerGroup; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.core.management.profile.AzureProfile; @@ -28,13 +28,13 @@ public class ManageContainerInstanceWithAzureFileShareMount { /** * Main function which runs the actual sample. * - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String rgName = azure.sdkContext().randomResourceName("rgACI", 15); - final String aciName = azure.sdkContext().randomResourceName("acisample", 20); - final String shareName = azure.sdkContext().randomResourceName("fileshare", 20); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgACI", 15); + final String aciName = azureResourceManager.sdkContext().randomResourceName("acisample", 20); + final String shareName = azureResourceManager.sdkContext().randomResourceName("fileshare", 20); final String containerImageName = "seanmckenna/aci-hellofiles"; final String volumeMountName = "aci-helloshare"; @@ -45,7 +45,7 @@ public static boolean runSample(Azure azure) { // using public Docker image "seanmckenna/aci-hellofiles" which mounts the file share created previously // as read/write shared container volume. - ContainerGroup containerGroup = azure.containerGroups().define(aciName) + ContainerGroup containerGroup = azureResourceManager.containerGroups().define(aciName) .withRegion(Region.US_WEST) .withNewResourceGroup(rgName) .withLinux() @@ -81,12 +81,12 @@ public static boolean runSample(Azure azure) { // List the file share content String storageAccountName = containerGroup.volumes().get(volumeMountName).azureFile().storageAccountName(); - StorageAccount storageAccount = azure.storageAccounts().getByResourceGroup(rgName, storageAccountName); + StorageAccount storageAccount = azureResourceManager.storageAccounts().getByResourceGroup(rgName, storageAccountName); ShareClient shareClient = new ShareClientBuilder() .connectionString(com.azure.resourcemanager.resources.fluentcore.utils.Utils.getStorageConnectionString( storageAccountName, storageAccount.getKeys().get(0).value(), - azure.containerGroups().manager().environment() + azureResourceManager.containerGroups().manager().environment() )) .shareName(shareName) .buildClient(); @@ -100,13 +100,13 @@ public static boolean runSample(Azure azure) { //============================================================= // Remove the container group - azure.containerGroups().deleteById(containerGroup.id()); + azureResourceManager.containerGroups().deleteById(containerGroup.id()); return true; } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -131,16 +131,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceWithManualAzureFileShareMountCreation.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceWithManualAzureFileShareMountCreation.java index 9e77361d2f7d1..1e80e64ea6835 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceWithManualAzureFileShareMountCreation.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceWithManualAzureFileShareMountCreation.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.containerinstance.models.ContainerGroup; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.core.management.profile.AzureProfile; @@ -30,14 +30,14 @@ public class ManageContainerInstanceWithManualAzureFileShareMountCreation { /** * Main function which runs the actual sample. * - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String rgName = azure.sdkContext().randomResourceName("rgACI", 15); - final String aciName = azure.sdkContext().randomResourceName("acisample", 20); - final String saName = azure.sdkContext().randomResourceName("sa", 20); - final String shareName = azure.sdkContext().randomResourceName("fileshare", 20); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgACI", 15); + final String aciName = azureResourceManager.sdkContext().randomResourceName("acisample", 20); + final String saName = azureResourceManager.sdkContext().randomResourceName("sa", 20); + final String shareName = azureResourceManager.sdkContext().randomResourceName("fileshare", 20); final String containerImageName = "seanmckenna/aci-hellofiles"; final String volumeMountName = "aci-helloshare"; @@ -46,7 +46,7 @@ public static boolean runSample(Azure azure) { //============================================================= // Create a new storage account and an Azure file share resource - StorageAccount storageAccount = azure.storageAccounts().define(saName) + StorageAccount storageAccount = azureResourceManager.storageAccounts().define(saName) .withRegion(Region.US_WEST) .withNewResourceGroup(rgName) .create(); @@ -57,7 +57,7 @@ public static boolean runSample(Azure azure) { .connectionString(com.azure.resourcemanager.resources.fluentcore.utils.Utils.getStorageConnectionString( saName, storageAccountKey.value(), - azure.containerGroups().manager().environment() + azureResourceManager.containerGroups().manager().environment() )) .shareName(shareName) .buildClient(); @@ -68,7 +68,7 @@ public static boolean runSample(Azure azure) { // using public Docker image "seanmckenna/aci-hellofiles" which mounts the file share created previously // as read/write shared container volume. - ContainerGroup containerGroup = azure.containerGroups().define(aciName) + ContainerGroup containerGroup = azureResourceManager.containerGroups().define(aciName) .withRegion(Region.US_WEST) .withExistingResourceGroup(rgName) .withLinux() @@ -107,7 +107,7 @@ public static boolean runSample(Azure azure) { //============================================================= // Remove the container group - azure.containerGroups().deleteById(containerGroup.id()); + azureResourceManager.containerGroups().deleteById(containerGroup.id()); //============================================================= // List the file share content @@ -122,7 +122,7 @@ public static boolean runSample(Azure azure) { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -147,16 +147,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceWithMultipleContainerImages.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceWithMultipleContainerImages.java index 3e67e681d846c..48f1fe27bb66a 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceWithMultipleContainerImages.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceWithMultipleContainerImages.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.containerinstance.models.ContainerGroup; import com.azure.resourcemanager.containerinstance.models.ContainerGroupRestartPolicy; import com.azure.resourcemanager.resources.fluentcore.arm.Region; @@ -27,12 +27,12 @@ public class ManageContainerInstanceWithMultipleContainerImages { /** * Main function which runs the actual sample. * - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String rgName = azure.sdkContext().randomResourceName("rgACI", 15); - final String aciName = azure.sdkContext().randomResourceName("acisample", 20); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgACI", 15); + final String aciName = azureResourceManager.sdkContext().randomResourceName("acisample", 20); final String containerImageName1 = "microsoft/aci-helloworld"; final String containerImageName2 = "microsoft/aci-tutorial-sidecar"; @@ -40,7 +40,7 @@ public static boolean runSample(Azure azure) { //============================================================= // Create a container group with two container instances - ContainerGroup containerGroup = azure.containerGroups().define(aciName) + ContainerGroup containerGroup = azureResourceManager.containerGroups().define(aciName) .withRegion(Region.US_WEST) .withNewResourceGroup(rgName) .withLinux() @@ -85,13 +85,13 @@ public static boolean runSample(Azure azure) { //============================================================= // Remove the container group - azure.containerGroups().deleteById(containerGroup.id()); + azureResourceManager.containerGroups().deleteById(containerGroup.id()); return true; } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -116,16 +116,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceZeroToOneAndOneToManyUsingContainerServiceOrchestrator.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceZeroToOneAndOneToManyUsingContainerServiceOrchestrator.java index e869fdb69d23c..8fb3c1608a647 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceZeroToOneAndOneToManyUsingContainerServiceOrchestrator.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerinstance/samples/ManageContainerInstanceZeroToOneAndOneToManyUsingContainerServiceOrchestrator.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.containerinstance.models.ContainerGroup; import com.azure.resourcemanager.containerregistry.models.AccessKeyType; import com.azure.resourcemanager.containerregistry.models.Registry; @@ -82,23 +82,23 @@ public class ManageContainerInstanceZeroToOneAndOneToManyUsingContainerServiceOr /** * Main function which runs the actual sample. * - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @param clientId secondary service principal client ID * @param secret secondary service principal secret * @return true if sample runs successfully */ - public static boolean runSample(Azure azure, String clientId, String secret) throws IOException, InterruptedException, JSchException { - final String rgName = azure.sdkContext().randomResourceName("rgaci", 15); + public static boolean runSample(AzureResourceManager azureResourceManager, String clientId, String secret) throws IOException, InterruptedException, JSchException { + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgaci", 15); final Region region = Region.US_EAST2; - final String acrName = azure.sdkContext().randomResourceName("acr", 20); + final String acrName = azureResourceManager.sdkContext().randomResourceName("acr", 20); - final String aciName = azure.sdkContext().randomResourceName("acisample", 20); + final String aciName = azureResourceManager.sdkContext().randomResourceName("acisample", 20); final String containerImageName = "microsoft/aci-helloworld"; final String containerImageTag = "latest"; final String dockerContainerName = "sample-hello"; - final String acsName = azure.sdkContext().randomResourceName("acssample", 30); + final String acsName = azureResourceManager.sdkContext().randomResourceName("acssample", 30); String servicePrincipalClientId = clientId; // replace with a real service principal client id String servicePrincipalSecret = secret; // and corresponding secret final String rootUserName = "acsuser"; @@ -114,7 +114,7 @@ public static boolean runSample(Azure azure, String clientId, String secret) thr Date t1 = new Date(); - Registry azureRegistry = azure.containerRegistries().define(acrName) + Registry azureRegistry = azureResourceManager.containerRegistries().define(acrName) .withRegion(region) .withNewResourceGroup(rgName) .withBasicSku() @@ -130,7 +130,7 @@ public static boolean runSample(Azure azure, String clientId, String secret) thr // Create a Docker client that will be used to push/pull images to/from the Azure Container Registry RegistryCredentials acrCredentials = azureRegistry.getCredentials(); - DockerClient dockerClient = DockerUtils.createDockerClient(azure, rgName, region, + DockerClient dockerClient = DockerUtils.createDockerClient(azureResourceManager, rgName, region, azureRegistry.loginServerUrl(), acrCredentials.username(), acrCredentials.accessKeys().get(AccessKeyType.PRIMARY)); //============================================================= @@ -191,7 +191,7 @@ public static boolean runSample(Azure azure, String clientId, String secret) thr // using public Docker image "microsoft/aci-helloworld" and mounts a new file share as read/write // shared container volume. - ContainerGroup containerGroup = azure.containerGroups().define(aciName) + ContainerGroup containerGroup = azureResourceManager.containerGroups().define(aciName) .withRegion(region) .withNewResourceGroup(rgName) .withLinux() @@ -261,7 +261,7 @@ public static boolean runSample(Azure azure, String clientId, String secret) thr t1 = new Date(); - KubernetesCluster azureKubernetesCluster = azure.kubernetesClusters().define(acsName) + KubernetesCluster azureKubernetesCluster = azureResourceManager.kubernetesClusters().define(acsName) .withRegion(region) .withNewResourceGroup(rgName) .withDefaultVersion() @@ -287,7 +287,7 @@ public static boolean runSample(Azure azure, String clientId, String secret) thr //============================================================= // Download the Kubernetes config file from one of the master virtual machines - azureKubernetesCluster = azure.kubernetesClusters().getByResourceGroup(rgName, acsName); + azureKubernetesCluster = azureResourceManager.kubernetesClusters().getByResourceGroup(rgName, acsName); System.out.println("Found Kubernetes master at: " + azureKubernetesCluster.fqdn()); byte[] kubeConfigContent = azureKubernetesCluster.adminKubeConfigContent(); @@ -482,7 +482,7 @@ public static boolean runSample(Azure azure, String clientId, String secret) thr } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -507,16 +507,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure, "", ""); + runSample(azureResourceManager, "", ""); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerregistry/samples/ManageContainerRegistry.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerregistry/samples/ManageContainerRegistry.java index 880fbc4b14203..68f6f6d3a2be9 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerregistry/samples/ManageContainerRegistry.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerregistry/samples/ManageContainerRegistry.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.containerregistry.models.AccessKeyType; import com.azure.resourcemanager.containerregistry.models.Registry; import com.azure.resourcemanager.containerregistry.models.RegistryCredentials; @@ -43,12 +43,12 @@ public class ManageContainerRegistry { /** * Main function which runs the actual sample. * - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) throws IOException { - final String rgName = azure.sdkContext().randomResourceName("rgACR", 15); - final String acrName = azure.sdkContext().randomResourceName("acrsample", 20); + public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException { + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgACR", 15); + final String acrName = azureResourceManager.sdkContext().randomResourceName("acrsample", 20); final Region region = Region.US_EAST; final String dockerImageName = "hello-world"; final String dockerImageTag = "latest"; @@ -62,7 +62,7 @@ public static boolean runSample(Azure azure) throws IOException { Date t1 = new Date(); - Registry azureRegistry = azure.containerRegistries().define(acrName) + Registry azureRegistry = azureResourceManager.containerRegistries().define(acrName) .withRegion(region) .withNewResourceGroup(rgName) .withBasicSku() @@ -78,7 +78,7 @@ public static boolean runSample(Azure azure) throws IOException { // Create a Docker client that will be used to push/pull images to/from the Azure Container Registry RegistryCredentials acrCredentials = azureRegistry.getCredentials(); - DockerClient dockerClient = DockerUtils.createDockerClient(azure, rgName, region, + DockerClient dockerClient = DockerUtils.createDockerClient(azureResourceManager, rgName, region, azureRegistry.loginServerUrl(), acrCredentials.username(), acrCredentials.accessKeys().get(AccessKeyType.PRIMARY)); //============================================================= @@ -162,7 +162,7 @@ public static boolean runSample(Azure azure) throws IOException { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -187,16 +187,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerregistry/samples/ManageContainerRegistryWithWebhooks.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerregistry/samples/ManageContainerRegistryWithWebhooks.java index 19b65d085a405..89218a9808576 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerregistry/samples/ManageContainerRegistryWithWebhooks.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/containerregistry/samples/ManageContainerRegistryWithWebhooks.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.containerregistry.models.AccessKeyType; import com.azure.resourcemanager.containerregistry.models.Registry; import com.azure.resourcemanager.containerregistry.models.RegistryCredentials; @@ -46,12 +46,12 @@ public class ManageContainerRegistryWithWebhooks { /** * Main function which runs the actual sample. * - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) throws IOException, InterruptedException { - final String rgName = azure.sdkContext().randomResourceName("rgACR", 15); - final String acrName = azure.sdkContext().randomResourceName("acrsample", 20); + public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException, InterruptedException { + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgACR", 15); + final String acrName = azureResourceManager.sdkContext().randomResourceName("acrsample", 20); final Region region = Region.US_WEST_CENTRAL; final String dockerImageName = "hello-world"; final String dockerImageTag = "latest"; @@ -70,7 +70,7 @@ public static boolean runSample(Azure azure) throws IOException, InterruptedExce Date t1 = new Date(); - Registry azureRegistry = azure.containerRegistries().define(acrName) + Registry azureRegistry = azureResourceManager.containerRegistries().define(acrName) .withRegion(region) .withNewResourceGroup(rgName) .withBasicSku() @@ -110,7 +110,7 @@ public static boolean runSample(Azure azure) throws IOException, InterruptedExce // Create a Docker client that will be used to push/pull images to/from the Azure Container Registry RegistryCredentials acrCredentials = azureRegistry.getCredentials(); - DockerClient dockerClient = DockerUtils.createDockerClient(azure, rgName, region, + DockerClient dockerClient = DockerUtils.createDockerClient(azureResourceManager, rgName, region, azureRegistry.loginServerUrl(), acrCredentials.username(), acrCredentials.accessKeys().get(AccessKeyType.PRIMARY)); //============================================================= @@ -181,7 +181,7 @@ public static boolean runSample(Azure azure) throws IOException, InterruptedExce } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -206,16 +206,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cosmos/samples/CreateCosmosDBTableWithVirtualNetworkRule.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cosmos/samples/CreateCosmosDBTableWithVirtualNetworkRule.java index 2c8f91a73f565..28fa523f5c124 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cosmos/samples/CreateCosmosDBTableWithVirtualNetworkRule.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cosmos/samples/CreateCosmosDBTableWithVirtualNetworkRule.java @@ -9,7 +9,7 @@ import com.azure.core.management.AzureEnvironment; import com.azure.core.management.exception.ManagementException; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.cosmos.models.CosmosDBAccount; import com.azure.resourcemanager.cosmos.models.VirtualNetworkRule; import com.azure.resourcemanager.network.models.Network; @@ -32,20 +32,20 @@ public class CreateCosmosDBTableWithVirtualNetworkRule { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String docDBName = azure.sdkContext().randomResourceName("cosmosdb", 15); - final String rgName = azure.sdkContext().randomResourceName("rgcosmosdb", 24); - final String vnetName = azure.sdkContext().randomResourceName("vnetcosmosdb", 20); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String docDBName = azureResourceManager.sdkContext().randomResourceName("cosmosdb", 15); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgcosmosdb", 24); + final String vnetName = azureResourceManager.sdkContext().randomResourceName("vnetcosmosdb", 20); try { // ============================================================ // Create a virtual network with two subnets. System.out.println("Create a virtual network with two subnets: subnet1 and subnet2"); - Network virtualNetwork = azure.networks().define(vnetName) + Network virtualNetwork = azureResourceManager.networks().define(vnetName) .withRegion(Region.US_EAST) .withNewResourceGroup(rgName) .withAddressSpace("192.168.0.0/16") @@ -67,7 +67,7 @@ public static boolean runSample(Azure azure) { //============================================================ // Create a CosmosDB System.out.println("Creating a CosmosDB..."); - CosmosDBAccount cosmosDBAccount = azure.cosmosDBAccounts().define(docDBName) + CosmosDBAccount cosmosDBAccount = azureResourceManager.cosmosDBAccounts().define(docDBName) .withRegion(Region.US_EAST) .withNewResourceGroup(rgName) .withDataModelAzureTable() @@ -112,7 +112,7 @@ public static boolean runSample(Azure azure) { .withVirtualNetworkRules(null) .apply(); - azure.networks().deleteById(virtualNetwork.id()); + azureResourceManager.networks().deleteById(virtualNetwork.id()); //============================================================ @@ -120,7 +120,7 @@ public static boolean runSample(Azure azure) { System.out.println("Deleting the CosmosDB"); // work around CosmosDB service issue returning 404 ManagementException on delete operation try { - azure.cosmosDBAccounts().deleteById(cosmosDBAccount.id()); + azureResourceManager.cosmosDBAccounts().deleteById(cosmosDBAccount.id()); } catch (ManagementException e) { } System.out.println("Deleted the CosmosDB"); @@ -129,7 +129,7 @@ public static boolean runSample(Azure azure) { } finally { try { System.out.println("Deleting resource group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted resource group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -154,16 +154,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cosmos/samples/CreateCosmosDBWithEventualConsistency.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cosmos/samples/CreateCosmosDBWithEventualConsistency.java index ca076e1970bfe..d3bfd11aa8b4e 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cosmos/samples/CreateCosmosDBWithEventualConsistency.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cosmos/samples/CreateCosmosDBWithEventualConsistency.java @@ -15,7 +15,7 @@ import com.azure.cosmos.DirectConnectionConfig; import com.azure.cosmos.models.ThroughputProperties; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.cosmos.models.CosmosDBAccount; import com.azure.resourcemanager.cosmos.models.DatabaseAccountKind; import com.azure.resourcemanager.cosmos.models.DatabaseAccountListKeysResult; @@ -36,19 +36,19 @@ public final class CreateCosmosDBWithEventualConsistency { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String docDBName = azure.sdkContext().randomResourceName("docDb", 10); - final String rgName = azure.sdkContext().randomResourceName("rgNEMV", 24); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String docDBName = azureResourceManager.sdkContext().randomResourceName("docDb", 10); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgNEMV", 24); try { //============================================================ // Create a CosmosDB. System.out.println("Creating a CosmosDB..."); - CosmosDBAccount cosmosDBAccount = azure.cosmosDBAccounts().define(docDBName) + CosmosDBAccount cosmosDBAccount = azureResourceManager.cosmosDBAccounts().define(docDBName) .withRegion(Region.US_WEST) .withNewResourceGroup(rgName) .withKind(DatabaseAccountKind.GLOBAL_DOCUMENT_DB) @@ -79,7 +79,7 @@ public static boolean runSample(Azure azure) { System.out.println("Deleting the CosmosDB"); // work around CosmosDB service issue returning 404 ManagementException on delete operation try { - azure.cosmosDBAccounts().deleteById(cosmosDBAccount.id()); + azureResourceManager.cosmosDBAccounts().deleteById(cosmosDBAccount.id()); } catch (ManagementException e) { } System.out.println("Deleted the CosmosDB"); @@ -88,7 +88,7 @@ public static boolean runSample(Azure azure) { } finally { try { System.out.println("Deleting resource group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted resource group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -136,16 +136,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cosmos/samples/CreateCosmosDBWithIPRange.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cosmos/samples/CreateCosmosDBWithIPRange.java index 47feeb4d2eb2a..e1a61bfd8870c 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cosmos/samples/CreateCosmosDBWithIPRange.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cosmos/samples/CreateCosmosDBWithIPRange.java @@ -8,7 +8,7 @@ import com.azure.core.management.AzureEnvironment; import com.azure.core.management.exception.ManagementException; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.cosmos.models.CosmosDBAccount; import com.azure.resourcemanager.cosmos.models.DatabaseAccountKind; import com.azure.resourcemanager.resources.fluentcore.arm.Region; @@ -23,19 +23,19 @@ public final class CreateCosmosDBWithIPRange { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String docDBName = azure.sdkContext().randomResourceName("docDb", 10); - final String rgName = azure.sdkContext().randomResourceName("rgNEMV", 24); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String docDBName = azureResourceManager.sdkContext().randomResourceName("docDb", 10); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgNEMV", 24); try { //============================================================ // Create a CosmosDB System.out.println("Creating a CosmosDB..."); - CosmosDBAccount cosmosDBAccount = azure.cosmosDBAccounts().define(docDBName) + CosmosDBAccount cosmosDBAccount = azureResourceManager.cosmosDBAccounts().define(docDBName) .withRegion(Region.US_EAST) .withNewResourceGroup(rgName) .withKind(DatabaseAccountKind.GLOBAL_DOCUMENT_DB) @@ -53,7 +53,7 @@ public static boolean runSample(Azure azure) { System.out.println("Deleting the CosmosDB"); // work around CosmosDB service issue returning 404 ManagementException on delete operation try { - azure.cosmosDBAccounts().deleteById(cosmosDBAccount.id()); + azureResourceManager.cosmosDBAccounts().deleteById(cosmosDBAccount.id()); } catch (ManagementException e) { } System.out.println("Deleted the CosmosDB"); @@ -62,7 +62,7 @@ public static boolean runSample(Azure azure) { } finally { try { System.out.println("Deleting resource group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted resource group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -87,16 +87,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cosmos/samples/CreateCosmosDBWithKindMongoDB.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cosmos/samples/CreateCosmosDBWithKindMongoDB.java index 9cb1bb8440151..65c25b975f2d6 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cosmos/samples/CreateCosmosDBWithKindMongoDB.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cosmos/samples/CreateCosmosDBWithKindMongoDB.java @@ -9,7 +9,7 @@ import com.azure.core.management.AzureEnvironment; import com.azure.core.management.exception.ManagementException; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.cosmos.models.CosmosDBAccount; import com.azure.resourcemanager.cosmos.models.DatabaseAccountKind; import com.azure.resourcemanager.cosmos.models.DatabaseAccountListConnectionStringsResult; @@ -29,19 +29,19 @@ public final class CreateCosmosDBWithKindMongoDB { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String docDBName = azure.sdkContext().randomResourceName("docDb", 10); - final String rgName = azure.sdkContext().randomResourceName("rgNEMV", 24); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String docDBName = azureResourceManager.sdkContext().randomResourceName("docDb", 10); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgNEMV", 24); try { //============================================================ // Create a CosmosDB System.out.println("Creating a CosmosDB..."); - CosmosDBAccount cosmosDBAccount = azure.cosmosDBAccounts().define(docDBName) + CosmosDBAccount cosmosDBAccount = azureResourceManager.cosmosDBAccounts().define(docDBName) .withRegion(Region.US_EAST) .withNewResourceGroup(rgName) .withKind(DatabaseAccountKind.MONGO_DB) @@ -63,7 +63,7 @@ public static boolean runSample(Azure azure) { System.out.println("Deleting the CosmosDB"); // work around CosmosDB service issue returning 404 ManagementException on delete operation try { - azure.cosmosDBAccounts().deleteById(cosmosDBAccount.id()); + azureResourceManager.cosmosDBAccounts().deleteById(cosmosDBAccount.id()); } catch (ManagementException e) { } System.out.println("Deleted the CosmosDB"); @@ -72,7 +72,7 @@ public static boolean runSample(Azure azure) { } finally { try { System.out.println("Deleting resource group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted resource group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -97,16 +97,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cosmos/samples/ManageHACosmosDB.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cosmos/samples/ManageHACosmosDB.java index ce0ad9afd3b0b..0d1e8d5b83e62 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cosmos/samples/ManageHACosmosDB.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/cosmos/samples/ManageHACosmosDB.java @@ -15,7 +15,7 @@ import com.azure.cosmos.DirectConnectionConfig; import com.azure.cosmos.models.ThroughputProperties; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.cosmos.models.CosmosDBAccount; import com.azure.resourcemanager.cosmos.models.DatabaseAccountKind; import com.azure.resourcemanager.cosmos.models.DatabaseAccountListKeysResult; @@ -37,19 +37,19 @@ public final class ManageHACosmosDB { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String docDBName = azure.sdkContext().randomResourceName("docDb", 10); - final String rgName = azure.sdkContext().randomResourceName("rgNEMV", 24); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String docDBName = azureResourceManager.sdkContext().randomResourceName("docDb", 10); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgNEMV", 24); try { //============================================================ // Create a CosmosDB System.out.println("Creating a CosmosDB..."); - CosmosDBAccount cosmosDBAccount = azure.cosmosDBAccounts().define(docDBName) + CosmosDBAccount cosmosDBAccount = azureResourceManager.cosmosDBAccounts().define(docDBName) .withRegion(Region.US_EAST) .withNewResourceGroup(rgName) .withKind(DatabaseAccountKind.GLOBAL_DOCUMENT_DB) @@ -93,7 +93,7 @@ public static boolean runSample(Azure azure) { System.out.println("Deleting the docuemntdb"); // work around CosmosDB service issue returning 404 ManagementException on delete operation try { - azure.cosmosDBAccounts().deleteById(cosmosDBAccount.id()); + azureResourceManager.cosmosDBAccounts().deleteById(cosmosDBAccount.id()); } catch (ManagementException e) { } System.out.println("Deleted the CosmosDB"); @@ -102,7 +102,7 @@ public static boolean runSample(Azure azure) { } finally { try { System.out.println("Deleting resource group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted resource group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -150,16 +150,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/dns/samples/ManageDns.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/dns/samples/ManageDns.java index 0a7a5814a8932..5c2c45ffbfe24 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/dns/samples/ManageDns.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/dns/samples/ManageDns.java @@ -8,7 +8,7 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.appservice.models.PricingTier; import com.azure.resourcemanager.appservice.models.CustomHostnameDnsRecordType; import com.azure.resourcemanager.appservice.models.WebApp; @@ -45,16 +45,16 @@ public class ManageDns { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) throws IOException { + public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException { final String customDomainName = "THE CUSTOM DOMAIN THAT YOU OWN (e.g. contoso.com)"; - final String rgName = azure.sdkContext().randomResourceName("rgNEMV_", 24); - final String webAppName = azure.sdkContext().randomResourceName("webapp1-", 20); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgNEMV_", 24); + final String webAppName = azureResourceManager.sdkContext().randomResourceName("webapp1-", 20); try { - ResourceGroup resourceGroup = azure.resourceGroups().define(rgName) + ResourceGroup resourceGroup = azureResourceManager.resourceGroups().define(rgName) .withRegion(Region.US_EAST2) .create(); @@ -62,7 +62,7 @@ public static boolean runSample(Azure azure) throws IOException { // Creates root DNS Zone System.out.println("Creating root DNS zone " + customDomainName + "..."); - DnsZone rootDnsZone = azure.dnsZones().define(customDomainName) + DnsZone rootDnsZone = azureResourceManager.dnsZones().define(customDomainName) .withExistingResourceGroup(resourceGroup) .create(); @@ -85,7 +85,7 @@ public static boolean runSample(Azure azure) throws IOException { // Creates a web App System.out.println("Creating Web App " + webAppName + "..."); - WebApp webApp = azure.webApps().define(webAppName) + WebApp webApp = azureResourceManager.webApps().define(webAppName) .withRegion(Region.US_EAST2) .withExistingResourceGroup(rgName) .withNewWindowsPlan(PricingTier.BASIC_B1) @@ -132,13 +132,13 @@ public static boolean runSample(Azure azure) throws IOException { // Creates a virtual machine with public IP System.out.println("Creating a virtual machine with public IP..."); - VirtualMachine virtualMachine1 = azure.virtualMachines() - .define(azure.sdkContext().randomResourceName("employeesvm-", 20)) + VirtualMachine virtualMachine1 = azureResourceManager.virtualMachines() + .define(azureResourceManager.sdkContext().randomResourceName("employeesvm-", 20)) .withRegion(Region.US_EAST) .withExistingResourceGroup(resourceGroup) .withNewPrimaryNetwork("10.0.0.0/28") .withPrimaryPrivateIPAddressDynamic() - .withNewPrimaryPublicIPAddress(azure.sdkContext().randomResourceName("empip-", 20)) + .withNewPrimaryPublicIPAddress(azureResourceManager.sdkContext().randomResourceName("empip-", 20)) .withPopularWindowsImage(KnownWindowsVirtualMachineImage.WINDOWS_SERVER_2012_R2_DATACENTER) .withAdminUsername("testuser") .withAdminPassword("12NewPA$$w0rd!") @@ -187,7 +187,7 @@ public static boolean runSample(Azure azure) throws IOException { String partnerSubDomainName = "partners." + customDomainName; System.out.println("Creating child DNS zone " + partnerSubDomainName + "..."); - DnsZone partnersDnsZone = azure.dnsZones().define(partnerSubDomainName) + DnsZone partnersDnsZone = azureResourceManager.dnsZones().define(partnerSubDomainName) .withExistingResourceGroup(resourceGroup) .create(); System.out.println("Created child DNS zone " + partnersDnsZone.name()); @@ -214,13 +214,13 @@ public static boolean runSample(Azure azure) throws IOException { // Creates a virtual machine with public IP System.out.println("Creating a virtual machine with public IP..."); - VirtualMachine virtualMachine2 = azure.virtualMachines() - .define(azure.sdkContext().randomResourceName("partnersvm-", 20)) + VirtualMachine virtualMachine2 = azureResourceManager.virtualMachines() + .define(azureResourceManager.sdkContext().randomResourceName("partnersvm-", 20)) .withRegion(Region.US_EAST) .withExistingResourceGroup(resourceGroup) .withNewPrimaryNetwork("10.0.0.0/28") .withPrimaryPrivateIPAddressDynamic() - .withNewPrimaryPublicIPAddress(azure.sdkContext().randomResourceName("ptnerpip-", 20)) + .withNewPrimaryPublicIPAddress(azureResourceManager.sdkContext().randomResourceName("ptnerpip-", 20)) .withPopularWindowsImage(KnownWindowsVirtualMachineImage.WINDOWS_SERVER_2012_R2_DATACENTER) .withAdminUsername("testuser") .withAdminPassword("12NewPA$$w0rd!") @@ -255,14 +255,14 @@ public static boolean runSample(Azure azure) throws IOException { // Deletes the DNS zone System.out.println("Deleting child DNS zone " + partnersDnsZone.name() + "..."); - azure.dnsZones().deleteById(partnersDnsZone.id()); + azureResourceManager.dnsZones().deleteById(partnersDnsZone.id()); System.out.println("Deleted child DNS zone " + partnersDnsZone.name()); return true; } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -286,16 +286,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/eventhubs/samples/ManageEventHub.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/eventhubs/samples/ManageEventHub.java index 992d8d3cdc067..62c7ed91010ef 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/eventhubs/samples/ManageEventHub.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/eventhubs/samples/ManageEventHub.java @@ -7,7 +7,7 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.eventhubs.models.EventHub; import com.azure.resourcemanager.eventhubs.models.EventHubConsumerGroup; import com.azure.resourcemanager.eventhubs.models.EventHubNamespace; @@ -31,16 +31,16 @@ public class ManageEventHub { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String rgName = azure.sdkContext().randomResourceName("rgNEMV_", 24); - final String namespaceName1 = azure.sdkContext().randomResourceName("ns", 14); - final String namespaceName2 = azure.sdkContext().randomResourceName("ns", 14); - final String storageAccountName = azure.sdkContext().randomResourceName("stg", 14); - final String eventHubName1 = azure.sdkContext().randomResourceName("eh", 14); - final String eventHubName2 = azure.sdkContext().randomResourceName("eh", 14); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgNEMV_", 24); + final String namespaceName1 = azureResourceManager.sdkContext().randomResourceName("ns", 14); + final String namespaceName2 = azureResourceManager.sdkContext().randomResourceName("ns", 14); + final String storageAccountName = azureResourceManager.sdkContext().randomResourceName("stg", 14); + final String eventHubName1 = azureResourceManager.sdkContext().randomResourceName("eh", 14); + final String eventHubName2 = azureResourceManager.sdkContext().randomResourceName("eh", 14); try { //============================================================ @@ -48,7 +48,7 @@ public static boolean runSample(Azure azure) { // System.out.println("Creating a namespace"); - EventHubNamespace namespace1 = azure.eventHubNamespaces() + EventHubNamespace namespace1 = azureResourceManager.eventHubNamespaces() .define(namespaceName1) .withRegion(Region.US_EAST2) .withNewResourceGroup(rgName) @@ -60,7 +60,7 @@ public static boolean runSample(Azure azure) { // Create an event hub in the namespace with data capture enabled, with consumer group and auth rule // - Creatable storageAccountCreatable = azure.storageAccounts() + Creatable storageAccountCreatable = azureResourceManager.storageAccounts() .define(storageAccountName) .withRegion(Region.US_EAST2) .withExistingResourceGroup(rgName) @@ -68,7 +68,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating an event hub with data capture enabled with a consumer group and rule in it"); - EventHub eventHub1 = azure.eventHubs() + EventHub eventHub1 = azureResourceManager.eventHubs() .define(eventHubName1) .withExistingNamespace(namespace1) // Optional - configure data capture @@ -101,7 +101,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating another event hub in the namespace"); - EventHub eventHub2 = azure.eventHubNamespaces() + EventHub eventHub2 = azureResourceManager.eventHubNamespaces() .eventHubs() .define(eventHubName2) .withExistingNamespace(namespace1) @@ -116,7 +116,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating a consumer group in the second event hub"); - EventHubConsumerGroup consumerGroup2 = azure.eventHubNamespaces() + EventHubConsumerGroup consumerGroup2 = azureResourceManager.eventHubNamespaces() .eventHubs() .consumerGroups() .define("cg2") @@ -146,7 +146,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating an event hub namespace along with event hub"); - EventHubNamespace namespace2 = azure.eventHubNamespaces() + EventHubNamespace namespace2 = azureResourceManager.eventHubNamespaces() .define(namespaceName2) .withRegion(Region.US_EAST2) .withExistingResourceGroup(rgName) @@ -162,7 +162,7 @@ public static boolean runSample(Azure azure) { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().deleteByName(rgName); + azureResourceManager.resourceGroups().deleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -186,16 +186,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/eventhubs/samples/ManageEventHubEvents.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/eventhubs/samples/ManageEventHubEvents.java index 31a061dc9a44d..6cfba9d1d4140 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/eventhubs/samples/ManageEventHubEvents.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/eventhubs/samples/ManageEventHubEvents.java @@ -6,7 +6,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.cosmos.models.CosmosDBAccount; import com.azure.resourcemanager.cosmos.models.DatabaseAccountKind; import com.azure.resourcemanager.eventhubs.models.EventHubNamespace; @@ -29,13 +29,13 @@ public class ManageEventHubEvents { /** * Main function which runs the actual sample. * - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { + public static boolean runSample(AzureResourceManager azureResourceManager) { final Region region = Region.US_EAST; - final String rgName = azure.sdkContext().randomResourceName("rgEvHb", 24); - final String namespaceName = azure.sdkContext().randomResourceName("ns", 24); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgEvHb", 24); + final String namespaceName = azureResourceManager.sdkContext().randomResourceName("ns", 24); final String eventHubName = "FirstEventHub"; String diagnosticSettingId = null; @@ -43,7 +43,7 @@ public static boolean runSample(Azure azure) { //============================================================= // Creates a Cosmos DB. // - CosmosDBAccount docDb = azure.cosmosDBAccounts() + CosmosDBAccount docDb = azureResourceManager.cosmosDBAccounts() .define(namespaceName) .withRegion(region) .withNewResourceGroup(rgName) @@ -61,7 +61,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating event hub namespace and event hub"); - EventHubNamespace namespace = azure.eventHubNamespaces() + EventHubNamespace namespace = azureResourceManager.eventHubNamespaces() .define(namespaceName) .withRegion(region) .withExistingResourceGroup(rgName) @@ -78,7 +78,7 @@ public static boolean runSample(Azure azure) { System.out.println("Retrieving the namespace authorization rule"); - EventHubNamespaceAuthorizationRule eventHubAuthRule = azure.eventHubNamespaces().authorizationRules() + EventHubNamespaceAuthorizationRule eventHubAuthRule = azureResourceManager.eventHubNamespaces().authorizationRules() .getByName(namespace.resourceGroupName(), namespace.name(), "RootManageSharedAccessKey"); System.out.println("Namespace authorization rule Retrieved"); @@ -90,7 +90,7 @@ public static boolean runSample(Azure azure) { System.out.println("Enabling diagnostics events of a cosmosdb to stream to event hub"); // Store Id of created Diagnostic settings only for clean-up - DiagnosticSetting ds = azure.diagnosticSettings() + DiagnosticSetting ds = azureResourceManager.diagnosticSettings() .define("DiaEventHub") .withResource(docDb.id()) .withEventHub(eventHubAuthRule.id(), eventHubName) @@ -112,10 +112,10 @@ public static boolean runSample(Azure azure) { try { if (diagnosticSettingId != null) { System.out.println("Deleting Diagnostic Setting: " + diagnosticSettingId); - azure.diagnosticSettings().deleteById(diagnosticSettingId); + azureResourceManager.diagnosticSettings().deleteById(diagnosticSettingId); } System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -139,16 +139,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/eventhubs/samples/ManageEventHubGeoDisasterRecovery.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/eventhubs/samples/ManageEventHubGeoDisasterRecovery.java index b28e10290aaed..13733f68db423 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/eventhubs/samples/ManageEventHubGeoDisasterRecovery.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/eventhubs/samples/ManageEventHubGeoDisasterRecovery.java @@ -7,7 +7,7 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.eventhubs.models.DisasterRecoveryPairingAuthorizationKey; import com.azure.resourcemanager.eventhubs.models.DisasterRecoveryPairingAuthorizationRule; import com.azure.resourcemanager.eventhubs.models.EventHub; @@ -31,15 +31,15 @@ public class ManageEventHubGeoDisasterRecovery { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String rgName = azure.sdkContext().randomResourceName("rgNEMV_", 24); - final String primaryNamespaceName = azure.sdkContext().randomResourceName("ns", 14); - final String secondaryNamespaceName = azure.sdkContext().randomResourceName("ns", 14); - final String geoDRName = azure.sdkContext().randomResourceName("geodr", 14); - final String eventHubName = azure.sdkContext().randomResourceName("eh", 14); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgNEMV_", 24); + final String primaryNamespaceName = azureResourceManager.sdkContext().randomResourceName("ns", 14); + final String secondaryNamespaceName = azureResourceManager.sdkContext().randomResourceName("ns", 14); + final String geoDRName = azureResourceManager.sdkContext().randomResourceName("geodr", 14); + final String eventHubName = azureResourceManager.sdkContext().randomResourceName("eh", 14); boolean isFailOverSucceeded = false; EventHubDisasterRecoveryPairing pairing = null; @@ -48,13 +48,13 @@ public static boolean runSample(Azure azure) { //============================================================ // Create resource group for the namespaces and recovery pairings // - ResourceGroup resourceGroup = azure.resourceGroups().define(rgName) + ResourceGroup resourceGroup = azureResourceManager.resourceGroups().define(rgName) .withRegion(Region.US_SOUTH_CENTRAL) .create(); System.out.println("Creating primary event hub namespace " + primaryNamespaceName); - EventHubNamespace primaryNamespace = azure.eventHubNamespaces() + EventHubNamespace primaryNamespace = azureResourceManager.eventHubNamespaces() .define(primaryNamespaceName) .withRegion(Region.US_SOUTH_CENTRAL) .withExistingResourceGroup(resourceGroup) @@ -65,7 +65,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating secondary event hub namespace " + primaryNamespaceName); - EventHubNamespace secondaryNamespace = azure.eventHubNamespaces() + EventHubNamespace secondaryNamespace = azureResourceManager.eventHubNamespaces() .define(secondaryNamespaceName) .withRegion(Region.US_NORTH_CENTRAL) .withExistingResourceGroup(resourceGroup) @@ -79,7 +79,7 @@ public static boolean runSample(Azure azure) { // System.out.println("Creating geo-disaster recovery pairing " + geoDRName); - pairing = azure.eventHubDisasterRecoveryPairings() + pairing = azureResourceManager.eventHubDisasterRecoveryPairings() .define(geoDRName) .withExistingPrimaryNamespace(primaryNamespace) .withExistingSecondaryNamespace(secondaryNamespace) @@ -102,7 +102,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating an event hub and consumer group in primary namespace"); - EventHub eventHubInPrimaryNamespace = azure.eventHubs() + EventHub eventHubInPrimaryNamespace = azureResourceManager.eventHubs() .define(eventHubName) .withExistingNamespace(primaryNamespace) .withNewConsumerGroup("consumerGrp1") @@ -116,7 +116,7 @@ public static boolean runSample(Azure azure) { System.out.println("Retrieving the event hubs in secondary namespace"); - EventHub eventHubInSecondaryNamespace = azure.eventHubs().getByName(rgName, secondaryNamespaceName, eventHubName); + EventHub eventHubInSecondaryNamespace = azureResourceManager.eventHubs().getByName(rgName, secondaryNamespaceName, eventHubName); System.out.println("Retrieved the event hubs in secondary namespace"); Utils.print(eventHubInSecondaryNamespace); @@ -150,7 +150,7 @@ public static boolean runSample(Azure azure) { } System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -174,16 +174,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/keyvault/samples/ManageKeyVault.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/keyvault/samples/ManageKeyVault.java index 5ab4d7d725e0d..351149717c247 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/keyvault/samples/ManageKeyVault.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/keyvault/samples/ManageKeyVault.java @@ -8,7 +8,7 @@ import com.azure.core.management.AzureEnvironment; import com.azure.core.util.Configuration; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.keyvault.models.KeyPermissions; import com.azure.resourcemanager.keyvault.models.SecretPermissions; import com.azure.resourcemanager.keyvault.models.Vault; @@ -31,14 +31,14 @@ public final class ManageKeyVault { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @param clientId client id * @return true if sample runs successfully */ - public static boolean runSample(Azure azure, String clientId) { - final String vaultName1 = azure.sdkContext().randomResourceName("vault1", 20); - final String vaultName2 = azure.sdkContext().randomResourceName("vault2", 20); - final String rgName = azure.sdkContext().randomResourceName("rgNEMV", 24); + public static boolean runSample(AzureResourceManager azureResourceManager, String clientId) { + final String vaultName1 = azureResourceManager.sdkContext().randomResourceName("vault1", 20); + final String vaultName2 = azureResourceManager.sdkContext().randomResourceName("vault2", 20); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgNEMV", 24); try { //============================================================ @@ -46,7 +46,7 @@ public static boolean runSample(Azure azure, String clientId) { System.out.println("Creating a key vault..."); - Vault vault1 = azure.vaults().define(vaultName1) + Vault vault1 = azureResourceManager.vaults().define(vaultName1) .withRegion(Region.US_WEST) .withNewResourceGroup(rgName) .withEmptyAccessPolicy() @@ -94,7 +94,7 @@ public static boolean runSample(Azure azure, String clientId) { //============================================================ // Create another key vault - Vault vault2 = azure.vaults().define(vaultName2) + Vault vault2 = azureResourceManager.vaults().define(vaultName2) .withRegion(Region.US_EAST) .withExistingResourceGroup(rgName) .defineAccessPolicy() @@ -116,22 +116,22 @@ public static boolean runSample(Azure azure, String clientId) { System.out.println("Listing key vaults..."); - for (Vault vault : azure.vaults().listByResourceGroup(rgName)) { + for (Vault vault : azureResourceManager.vaults().listByResourceGroup(rgName)) { Utils.print(vault); } //============================================================ // Delete key vaults System.out.println("Deleting the key vaults"); - azure.vaults().deleteById(vault1.id()); - azure.vaults().deleteById(vault2.id()); + azureResourceManager.vaults().deleteById(vault1.id()); + azureResourceManager.vaults().deleteById(vault2.id()); System.out.println("Deleted the key vaults"); return true; } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -156,16 +156,16 @@ public static void main(String[] args) { .build(); final Configuration configuration = Configuration.getGlobalConfiguration(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure, configuration.get(Configuration.PROPERTY_AZURE_CLIENT_ID)); + runSample(azureResourceManager, configuration.get(Configuration.PROPERTY_AZURE_CLIENT_ID)); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/kubernetescluster/samples/DeployImageFromContainerRegistryToKubernetes.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/kubernetescluster/samples/DeployImageFromContainerRegistryToKubernetes.java index 3112b41ae7831..dfce56ecdbb22 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/kubernetescluster/samples/DeployImageFromContainerRegistryToKubernetes.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/kubernetescluster/samples/DeployImageFromContainerRegistryToKubernetes.java @@ -6,7 +6,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.containerregistry.models.AccessKeyType; import com.azure.resourcemanager.containerregistry.models.Registry; import com.azure.resourcemanager.containerregistry.models.RegistryCredentials; @@ -73,15 +73,15 @@ public class DeployImageFromContainerRegistryToKubernetes { /** * Main function which runs the actual sample. * - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @param clientId secondary service principal client ID * @param secret secondary service principal secret * @return true if sample runs successfully */ - public static boolean runSample(Azure azure, String clientId, String secret) throws IOException, JSchException, InterruptedException { - final String rgName = azure.sdkContext().randomResourceName("rgaks", 15); - final String acrName = azure.sdkContext().randomResourceName("acrsample", 20); - final String aksName = azure.sdkContext().randomResourceName("akssample", 30); + public static boolean runSample(AzureResourceManager azureResourceManager, String clientId, String secret) throws IOException, JSchException, InterruptedException { + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgaks", 15); + final String acrName = azureResourceManager.sdkContext().randomResourceName("acrsample", 20); + final String aksName = azureResourceManager.sdkContext().randomResourceName("akssample", 30); final String rootUserName = "aksuser"; final Region region = Region.US_EAST; final String dockerImageName = "nginx"; @@ -134,7 +134,7 @@ public static boolean runSample(Azure azure, String clientId, String secret) thr Date t1 = new Date(); - KubernetesCluster kubernetesCluster = azure.kubernetesClusters().define(aksName) + KubernetesCluster kubernetesCluster = azureResourceManager.kubernetesClusters().define(aksName) .withRegion(region) .withNewResourceGroup(rgName) .withDefaultVersion() @@ -161,7 +161,7 @@ public static boolean runSample(Azure azure, String clientId, String secret) thr t1 = new Date(); - Registry azureRegistry = azure.containerRegistries().define(acrName) + Registry azureRegistry = azureResourceManager.containerRegistries().define(acrName) .withRegion(region) .withNewResourceGroup(rgName) .withBasicSku() @@ -177,7 +177,7 @@ public static boolean runSample(Azure azure, String clientId, String secret) thr // Create a Docker client that will be used to push/pull images to/from the Azure Container Registry RegistryCredentials acrCredentials = azureRegistry.getCredentials(); - DockerClient dockerClient = DockerUtils.createDockerClient(azure, rgName, region, + DockerClient dockerClient = DockerUtils.createDockerClient(azureResourceManager, rgName, region, azureRegistry.loginServerUrl(), acrCredentials.username(), acrCredentials.accessKeys().get(AccessKeyType.PRIMARY)); @@ -268,7 +268,7 @@ public static boolean runSample(Azure azure, String clientId, String secret) thr // The Kubernetes client API requires setting an environment variable pointing at a real file; // we will create a temporary file that will be deleted automatically when the sample exits - kubernetesCluster = azure.kubernetesClusters().getByResourceGroup(rgName, aksName); + kubernetesCluster = azureResourceManager.kubernetesClusters().getByResourceGroup(rgName, aksName); System.out.println("Found Kubernetes master at: " + kubernetesCluster.fqdn()); byte[] kubeConfigContent = kubernetesCluster.adminKubeConfigContent(); @@ -434,7 +434,7 @@ public static boolean runSample(Azure azure, String clientId, String secret) thr } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -459,16 +459,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure, "", ""); + runSample(azureResourceManager, "", ""); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/kubernetescluster/samples/ManageKubernetesCluster.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/kubernetescluster/samples/ManageKubernetesCluster.java index 9060a602304f6..bfbce9ac0f9a4 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/kubernetescluster/samples/ManageKubernetesCluster.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/kubernetescluster/samples/ManageKubernetesCluster.java @@ -6,7 +6,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.containerservice.models.ContainerServiceVMSizeTypes; import com.azure.resourcemanager.containerservice.models.KubernetesCluster; import com.azure.resourcemanager.resources.fluentcore.arm.Region; @@ -31,14 +31,14 @@ public class ManageKubernetesCluster { /** * Main function which runs the actual sample. * - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @param clientId secondary service principal client ID * @param secret secondary service principal secret * @return true if sample runs successfully */ - public static boolean runSample(Azure azure, String clientId, String secret) throws IOException, JSchException { - final String rgName = azure.sdkContext().randomResourceName("rgaks", 15); - final String aksName = azure.sdkContext().randomResourceName("akssample", 30); + public static boolean runSample(AzureResourceManager azureResourceManager, String clientId, String secret) throws IOException, JSchException { + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgaks", 15); + final String aksName = azureResourceManager.sdkContext().randomResourceName("akssample", 30); final Region region = Region.US_EAST; String servicePrincipalClientId = clientId; // replace with a real service principal client id String servicePrincipalSecret = secret; // and corresponding secret @@ -85,7 +85,7 @@ public static boolean runSample(Azure azure, String clientId, String secret) thr Date t1 = new Date(); - KubernetesCluster kubernetesCluster = azure.kubernetesClusters().define(aksName) + KubernetesCluster kubernetesCluster = azureResourceManager.kubernetesClusters().define(aksName) .withRegion(region) .withNewResourceGroup(rgName) .withDefaultVersion() @@ -125,7 +125,7 @@ public static boolean runSample(Azure azure, String clientId, String secret) thr } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -150,16 +150,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure, "", ""); + runSample(azureResourceManager, "", ""); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/kubernetescluster/samples/ManagedKubernetesClusterWithAdvancedNetworking.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/kubernetescluster/samples/ManagedKubernetesClusterWithAdvancedNetworking.java index 2a9c551d47381..d222114127b2f 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/kubernetescluster/samples/ManagedKubernetesClusterWithAdvancedNetworking.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/kubernetescluster/samples/ManagedKubernetesClusterWithAdvancedNetworking.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.containerservice.models.ContainerServiceVMSizeTypes; import com.azure.resourcemanager.containerservice.models.KubernetesCluster; import com.azure.resourcemanager.containerservice.models.NetworkPlugin; @@ -35,15 +35,15 @@ public class ManagedKubernetesClusterWithAdvancedNetworking { /** * Main function which runs the actual sample. * - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @param clientId secondary service principal client ID * @param secret secondary service principal secret * @return true if sample runs successfully */ - public static boolean runSample(Azure azure, String clientId, String secret) throws IOException, JSchException { - final String rgName = azure.sdkContext().randomResourceName("rgaks", 15); - final String vnetName = azure.sdkContext().randomResourceName("vnetaks", 20); - final String aksName = azure.sdkContext().randomResourceName("akssample", 30); + public static boolean runSample(AzureResourceManager azureResourceManager, String clientId, String secret) throws IOException, JSchException { + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgaks", 15); + final String vnetName = azureResourceManager.sdkContext().randomResourceName("vnetaks", 20); + final String aksName = azureResourceManager.sdkContext().randomResourceName("akssample", 30); final Region region = Region.US_CENTRAL; String servicePrincipalClientId = clientId; // replace it with a real service principal client id String servicePrincipalSecret = secret; // and the corresponding secret @@ -55,7 +55,7 @@ public static boolean runSample(Azure azure, String clientId, String secret) thr // Create a virtual network with two subnets. System.out.println("Create a virtual network with two subnets: subnet1 and subnet2"); - Network virtualNetwork = azure.networks().define(vnetName) + Network virtualNetwork = azureResourceManager.networks().define(vnetName) .withRegion(region) .withNewResourceGroup(rgName) .withAddressSpace("192.168.0.0/16") @@ -110,7 +110,7 @@ public static boolean runSample(Azure azure, String clientId, String secret) thr Date t1 = new Date(); - KubernetesCluster kubernetesCluster = azure.kubernetesClusters().define(aksName) + KubernetesCluster kubernetesCluster = azureResourceManager.kubernetesClusters().define(aksName) .withRegion(region) .withExistingResourceGroup(rgName) .withDefaultVersion() @@ -157,7 +157,7 @@ public static boolean runSample(Azure azure, String clientId, String secret) thr } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -182,16 +182,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure, "", ""); + runSample(azureResourceManager, "", ""); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/monitor/samples/AutoscaleSettingsBasedOnPerformanceOrSchedule.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/monitor/samples/AutoscaleSettingsBasedOnPerformanceOrSchedule.java index 2013f65de733d..4cb31cf84c635 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/monitor/samples/AutoscaleSettingsBasedOnPerformanceOrSchedule.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/monitor/samples/AutoscaleSettingsBasedOnPerformanceOrSchedule.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.appservice.models.PricingTier; import com.azure.resourcemanager.appservice.models.WebApp; import com.azure.resourcemanager.monitor.models.AutoscaleSetting; @@ -36,20 +36,20 @@ public final class AutoscaleSettingsBasedOnPerformanceOrSchedule { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String webappName = azure.sdkContext().randomResourceName("MyTestScaleWebApp", 20); - final String autoscaleSettingsName = azure.sdkContext().randomResourceName("autoscalename1", 20); - final String rgName = azure.sdkContext().randomResourceName("myResourceGroup", 20); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String webappName = azureResourceManager.sdkContext().randomResourceName("MyTestScaleWebApp", 20); + final String autoscaleSettingsName = azureResourceManager.sdkContext().randomResourceName("autoscalename1", 20); + final String rgName = azureResourceManager.sdkContext().randomResourceName("myResourceGroup", 20); try { // ============================================================ // Create a Web App and App Service Plan System.out.println("Creating a web app and service plan"); - WebApp webapp = azure.webApps().define(webappName) + WebApp webapp = azureResourceManager.webApps().define(webappName) .withRegion(Region.US_SOUTH_CENTRAL) .withNewResourceGroup(rgName) .withNewWindowsPlan(PricingTier.PREMIUM_P1) @@ -60,7 +60,7 @@ public static boolean runSample(Azure azure) { // ============================================================ // Configure autoscale rules for scale-in and scale out based on the number of requests a Web App receives - AutoscaleSetting scaleSettings = azure.autoscaleSettings().define(autoscaleSettingsName) + AutoscaleSetting scaleSettings = azureResourceManager.autoscaleSettings().define(autoscaleSettingsName) .withRegion(Region.US_SOUTH_CENTRAL) .withExistingResourceGroup(rgName) .withTargetResource(webapp.appServicePlanId()) @@ -118,9 +118,9 @@ public static boolean runSample(Azure azure) { return true; } finally { - if (azure.resourceGroups().getByName(rgName) != null) { + if (azureResourceManager.resourceGroups().getByName(rgName) != null) { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } else { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -140,16 +140,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/monitor/samples/QueryMetricsAndActivityLogs.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/monitor/samples/QueryMetricsAndActivityLogs.java index 67d982c5b9eff..97428a1502c4a 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/monitor/samples/QueryMetricsAndActivityLogs.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/monitor/samples/QueryMetricsAndActivityLogs.java @@ -9,7 +9,7 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.monitor.models.EventData; import com.azure.resourcemanager.monitor.models.Metric; import com.azure.resourcemanager.monitor.models.MetricCollection; @@ -56,12 +56,12 @@ public final class QueryMetricsAndActivityLogs { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) throws IOException { - final String storageAccountName = azure.sdkContext().randomResourceName("saMonitor", 20); - final String rgName = azure.sdkContext().randomResourceName("rgMonitor", 20); + public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException { + final String storageAccountName = azureResourceManager.sdkContext().randomResourceName("saMonitor", 20); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgMonitor", 20); try { // ============================================================ @@ -69,7 +69,7 @@ public static boolean runSample(Azure azure) throws IOException { System.out.println("Creating a Storage Account"); - StorageAccount storageAccount = azure.storageAccounts().define(storageAccountName) + StorageAccount storageAccount = azureResourceManager.storageAccounts().define(storageAccountName) .withRegion(Region.US_EAST) .withNewResourceGroup(rgName) .withBlobStorageAccountKind() @@ -89,7 +89,7 @@ public static boolean runSample(Azure azure) throws IOException { OffsetDateTime recordDateTime = OffsetDateTime.now(); // get metric definitions for storage account. - for (MetricDefinition metricDefinition : azure.metricDefinitions().listByResource(storageAccount.id())) { + for (MetricDefinition metricDefinition : azureResourceManager.metricDefinitions().listByResource(storageAccount.id())) { // find metric definition for Transactions if (metricDefinition.name().localizedValue().equalsIgnoreCase("transactions")) { // get metric records @@ -133,7 +133,7 @@ public static boolean runSample(Azure azure) throws IOException { } // get activity logs for the same period. - PagedIterable logs = azure.activityLogs().defineQuery() + PagedIterable logs = azureResourceManager.activityLogs().defineQuery() .startingFrom(recordDateTime.minusDays(7)) .endsBefore(recordDateTime) .withAllPropertiesInResponse() @@ -156,9 +156,9 @@ public static boolean runSample(Azure azure) throws IOException { return true; } finally { - if (azure.resourceGroups().getByName(rgName) != null) { + if (azureResourceManager.resourceGroups().getByName(rgName) != null) { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } else { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -178,16 +178,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/monitor/samples/SecurityBreachOrRiskActivityLogAlerts.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/monitor/samples/SecurityBreachOrRiskActivityLogAlerts.java index 493f6ba5a2de8..254b11f722a61 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/monitor/samples/SecurityBreachOrRiskActivityLogAlerts.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/monitor/samples/SecurityBreachOrRiskActivityLogAlerts.java @@ -8,7 +8,7 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.monitor.models.ActionGroup; import com.azure.resourcemanager.monitor.models.ActivityLogAlert; import com.azure.resourcemanager.monitor.models.EventData; @@ -33,19 +33,19 @@ public final class SecurityBreachOrRiskActivityLogAlerts { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String storageAccountName = azure.sdkContext().randomResourceName("saMonitor", 20); - final String rgName = azure.sdkContext().randomResourceName("rgMonitor", 20); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String storageAccountName = azureResourceManager.sdkContext().randomResourceName("saMonitor", 20); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgMonitor", 20); try { // ============================================================ // Create a storage account System.out.println("Creating a Storage Account"); - StorageAccount storageAccount = azure.storageAccounts().define(storageAccountName) + StorageAccount storageAccount = azureResourceManager.storageAccounts().define(storageAccountName) .withRegion(Region.US_EAST) .withNewResourceGroup(rgName) .withBlobStorageAccountKind() @@ -57,7 +57,7 @@ public static boolean runSample(Azure azure) { // ============================================================ // Create an action group to send notifications in case activity log alert condition will be triggered - ActionGroup ag = azure.actionGroups().define("securityBreachActionGroup") + ActionGroup ag = azureResourceManager.actionGroups().define("securityBreachActionGroup") .withExistingResourceGroup(rgName) .defineReceiver("tierOne") .withPushNotification("security_on_duty@securecorporation.com") @@ -74,10 +74,10 @@ public static boolean runSample(Azure azure) { // ============================================================ // Set a trigger to fire each time - ActivityLogAlert ala = azure.alertRules().activityLogAlerts() + ActivityLogAlert ala = azureResourceManager.alertRules().activityLogAlerts() .define("Potential security breach alert") .withExistingResourceGroup(rgName) - .withTargetSubscription(azure.subscriptionId()) + .withTargetSubscription(azureResourceManager.subscriptionId()) .withDescription("Security StorageAccounts ListAccountKeys trigger") .withRuleEnabled() .withActionGroups(ag.id()) @@ -98,7 +98,7 @@ public static boolean runSample(Azure azure) { OffsetDateTime recordDateTime = OffsetDateTime.parse("2020-08-03T16:34:27.009944500+08:00"); // get activity logs for the same period. - PagedIterable logs = azure.activityLogs().defineQuery() + PagedIterable logs = azureResourceManager.activityLogs().defineQuery() .startingFrom(recordDateTime.minusDays(7)) .endsBefore(recordDateTime) .withAllPropertiesInResponse() @@ -124,9 +124,9 @@ public static boolean runSample(Azure azure) { return true; } finally { - if (azure.resourceGroups().getByName(rgName) != null) { + if (azureResourceManager.resourceGroups().getByName(rgName) != null) { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } else { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -146,16 +146,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/monitor/samples/WebAppPerformanceMonitoringAlerts.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/monitor/samples/WebAppPerformanceMonitoringAlerts.java index 0cee43e64cd73..e08eb5a812083 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/monitor/samples/WebAppPerformanceMonitoringAlerts.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/monitor/samples/WebAppPerformanceMonitoringAlerts.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.appservice.models.AppServicePlan; import com.azure.resourcemanager.appservice.models.OperatingSystem; import com.azure.resourcemanager.appservice.models.PricingTier; @@ -32,18 +32,18 @@ public final class WebAppPerformanceMonitoringAlerts { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String rgName = azure.sdkContext().randomResourceName("rgMonitor", 20); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgMonitor", 20); try { // ============================================================ // Create an App Service plan System.out.println("Creating App Service plan"); - AppServicePlan servicePlan = azure.appServicePlans().define("HighlyAvailableWebApps") + AppServicePlan servicePlan = azureResourceManager.appServicePlans().define("HighlyAvailableWebApps") .withRegion(Region.US_SOUTH_CENTRAL) .withNewResourceGroup(rgName) .withPricingTier(PricingTier.PREMIUM_P1) @@ -55,7 +55,7 @@ public static boolean runSample(Azure azure) { // ============================================================ // Create an action group to send notifications in case metric alert condition will be triggered - ActionGroup ag = azure.actionGroups().define("criticalPerformanceActionGroup") + ActionGroup ag = azureResourceManager.actionGroups().define("criticalPerformanceActionGroup") .withExistingResourceGroup(rgName) .defineReceiver("tierOne") .withPushNotification("ops_on_duty@performancemonitoring.com") @@ -72,7 +72,7 @@ public static boolean runSample(Azure azure) { // ============================================================ // Set a trigger to fire each time - MetricAlert ma = azure.alertRules().metricAlerts().define("Critical performance alert") + MetricAlert ma = azureResourceManager.alertRules().metricAlerts().define("Critical performance alert") .withExistingResourceGroup(rgName) .withTargetResource(servicePlan.id()) .withPeriod(Duration.ofMinutes(5)) @@ -89,9 +89,9 @@ public static boolean runSample(Azure azure) { return true; } finally { - if (azure.resourceGroups().getByName(rgName) != null) { + if (azureResourceManager.resourceGroups().getByName(rgName) != null) { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } else { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -111,16 +111,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/CreateSimpleInternetFacingLoadBalancer.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/CreateSimpleInternetFacingLoadBalancer.java index da679755669a3..91e817641d3fe 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/CreateSimpleInternetFacingLoadBalancer.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/CreateSimpleInternetFacingLoadBalancer.java @@ -8,7 +8,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.AvailabilitySet; import com.azure.resourcemanager.compute.models.AvailabilitySetSkuTypes; import com.azure.resourcemanager.compute.models.KnownLinuxVirtualMachineImage; @@ -56,18 +56,18 @@ public final class CreateSimpleInternetFacingLoadBalancer { /** * Main function which runs the actual sample. * - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { + public static boolean runSample(AzureResourceManager azureResourceManager) { final Region region = Region.US_EAST; - final String resourceGroupName = azure.sdkContext().randomResourceName("rg", 15); - final String vnetName = azure.sdkContext().randomResourceName("vnet", 24); - final String loadBalancerName = azure.sdkContext().randomResourceName("lb" + "-", 18); - final String publicIpName = azure.sdkContext().randomResourceName("pip", 18); + final String resourceGroupName = azureResourceManager.sdkContext().randomResourceName("rg", 15); + final String vnetName = azureResourceManager.sdkContext().randomResourceName("vnet", 24); + final String loadBalancerName = azureResourceManager.sdkContext().randomResourceName("lb" + "-", 18); + final String publicIpName = azureResourceManager.sdkContext().randomResourceName("pip", 18); final String httpLoadBalancingRule = "httpRule"; - final String availabilitySetName = azure.sdkContext().randomResourceName("av", 24); + final String availabilitySetName = azureResourceManager.sdkContext().randomResourceName("av", 24); final String userName = "tirekicker"; final String sshKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfSPC2K7LZcFKEO+/t3dzmQYtrJFZNxOsbVgOVKietqHyvmYGHEC0J2wPdAqQ/63g/hhAEFRoyehM+rbeDri4txB3YFfnOK58jqdkyXzupWqXzOrlKY4Wz9SKjjN765+dqUITjKRIaAip1Ri137szRg71WnrmdP3SphTRlCx1Bk2nXqWPsclbRDCiZeF8QOTi4JqbmJyK5+0UqhqYRduun8ylAwKKQJ1NJt85sYIHn9f1Rfr6Tq2zS0wZ7DHbZL+zB5rSlAr8QyUdg/GQD+cmSs6LvPJKL78d6hMGk84ARtFo4A79ovwX/Fj01znDQkU6nJildfkaolH2rWFG/qttD azjava@javalib.com"; try { @@ -75,7 +75,7 @@ public static boolean runSample(Azure azure) { //============================================================= // Define a common availability set for the backend virtual machines - Creatable availabilitySetDefinition = azure.availabilitySets().define(availabilitySetName) + Creatable availabilitySetDefinition = azureResourceManager.availabilitySets().define(availabilitySetName) .withRegion(region) .withNewResourceGroup(resourceGroupName) .withSku(AvailabilitySetSkuTypes.ALIGNED); @@ -83,7 +83,7 @@ public static boolean runSample(Azure azure) { //============================================================= // Define a common virtual network for the virtual machines - Creatable networkDefinition = azure.networks().define(vnetName) + Creatable networkDefinition = azureResourceManager.networks().define(vnetName) .withRegion(region) .withNewResourceGroup(resourceGroupName) .withAddressSpace("10.0.0.0/28"); @@ -98,7 +98,7 @@ public static boolean runSample(Azure azure) { for (int i = 0; i < 2; i++) { virtualMachineDefinitions.add( - azure.virtualMachines().define(azure.sdkContext().randomResourceName("vm", 24)) + azureResourceManager.virtualMachines().define(azureResourceManager.sdkContext().randomResourceName("vm", 24)) .withRegion(region) .withExistingResourceGroup(resourceGroupName) .withNewPrimaryNetwork(networkDefinition) @@ -115,7 +115,7 @@ public static boolean runSample(Azure azure) { stopwatch.start(); // Create and retrieve the VMs by the interface accepted by the load balancing rule - Collection virtualMachines = azure.virtualMachines().create(virtualMachineDefinitions).values(); + Collection virtualMachines = azureResourceManager.virtualMachines().create(virtualMachineDefinitions).values(); stopwatch.stop(); System.out.println("Created 2 Linux VMs: (took " + (stopwatch.getTime() / 1000) + " seconds)\n"); @@ -139,7 +139,7 @@ public static boolean runSample(Azure azure) { + "- One load balancing rule for HTTP, mapping public ports on the load\n" + " balancer to ports in the backend address pool"); - LoadBalancer loadBalancer = azure.loadBalancers().define(loadBalancerName) + LoadBalancer loadBalancer = azureResourceManager.loadBalancers().define(loadBalancerName) .withRegion(region) .withExistingResourceGroup(resourceGroupName) @@ -183,14 +183,14 @@ public static boolean runSample(Azure azure) { System.out.println("Deleting load balancer " + loadBalancerName + "(" + loadBalancer.id() + ")"); - azure.loadBalancers().deleteById(loadBalancer.id()); + azureResourceManager.loadBalancers().deleteById(loadBalancer.id()); System.out.println("Deleted load balancer" + loadBalancerName); return true; } finally { try { System.out.println("Deleting Resource Group: " + resourceGroupName); - azure.resourceGroups().beginDeleteByName(resourceGroupName); + azureResourceManager.resourceGroups().beginDeleteByName(resourceGroupName); System.out.println("Deleted Resource Group: " + resourceGroupName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -217,16 +217,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageApplicationGateway.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageApplicationGateway.java index aff97be515778..ee16f71af3413 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageApplicationGateway.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageApplicationGateway.java @@ -8,7 +8,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.KnownLinuxVirtualMachineImage; import com.azure.resourcemanager.compute.models.VirtualMachine; import com.azure.resourcemanager.compute.models.VirtualMachineSizeTypes; @@ -79,12 +79,12 @@ public final class ManageApplicationGateway { /** * Main function which runs the actual sample. * - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) throws IOException { - final String rgName = azure.sdkContext().randomResourceName("rgNEAG", 15); - final String pipName = azure.sdkContext().randomResourceName("pip" + "-", 18); + public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException { + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgNEAG", 15); + final String pipName = azureResourceManager.sdkContext().randomResourceName("pip" + "-", 18); final String userName = "tirekicker"; final String sshKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfSPC2K7LZcFKEO+/t3dzmQYtrJFZNxOsbVgOVKietqHyvmYGHEC0J2wPdAqQ/63g/hhAEFRoyehM+rbeDri4txB3YFfnOK58jqdkyXzupWqXzOrlKY4Wz9SKjjN765+dqUITjKRIaAip1Ri137szRg71WnrmdP3SphTRlCx1Bk2nXqWPsclbRDCiZeF8QOTi4JqbmJyK5+0UqhqYRduun8ylAwKKQJ1NJt85sYIHn9f1Rfr6Tq2zS0wZ7DHbZL+zB5rSlAr8QyUdg/GQD+cmSs6LvPJKL78d6hMGk84ARtFo4A79ovwX/Fj01znDQkU6nJildfkaolH2rWFG/qttD azjava@javalib.com"; @@ -102,7 +102,7 @@ public static boolean runSample(Azure azure) throws IOException { //============================================================= // Create a resource group (Where all resources gets created) // - ResourceGroup resourceGroup = azure.resourceGroups().define(rgName) + ResourceGroup resourceGroup = azureResourceManager.resourceGroups().define(rgName) .withRegion(Region.US_EAST) .create(); @@ -113,7 +113,7 @@ public static boolean runSample(Azure azure) throws IOException { // Create a public IP address for the Application Gateway System.out.println("Creating a public IP address for the application gateway ..."); - PublicIpAddress publicIPAddress = azure.publicIpAddresses().define(pipName) + PublicIpAddress publicIPAddress = azureResourceManager.publicIpAddresses().define(pipName) .withRegion(Region.US_EAST) .withExistingResourceGroup(rgName) .create(); @@ -134,9 +134,9 @@ public static boolean runSample(Azure azure) throws IOException { //============================================================= // Create 1 network creatable per region // Prepare Creatable Network definition (Where all the virtual machines get added to) - String networkName = azure.sdkContext().randomResourceName("vnetNEAG-", 20); + String networkName = azureResourceManager.sdkContext().randomResourceName("vnetNEAG-", 20); - Creatable networkCreatable = azure.networks().define(networkName) + Creatable networkCreatable = azureResourceManager.networks().define(networkName) .withRegion(regions[i]) .withExistingResourceGroup(resourceGroup) .withAddressSpace(addressSpaces[i]); @@ -144,19 +144,19 @@ public static boolean runSample(Azure azure) throws IOException { //============================================================= // Create 1 storage creatable per region (For storing VMs disk) - String storageAccountName = azure.sdkContext().randomResourceName("stgneag", 20); - Creatable storageAccountCreatable = azure.storageAccounts().define(storageAccountName) + String storageAccountName = azureResourceManager.sdkContext().randomResourceName("stgneag", 20); + Creatable storageAccountCreatable = azureResourceManager.storageAccounts().define(storageAccountName) .withRegion(regions[i]) .withExistingResourceGroup(resourceGroup); - String linuxVMNamePrefix = azure.sdkContext().randomResourceName("vm-", 15); + String linuxVMNamePrefix = azureResourceManager.sdkContext().randomResourceName("vm-", 15); for (int j = 0; j < vmCountInAPool; j++) { //============================================================= // Create 1 public IP address creatable - Creatable publicIPAddressCreatable = azure.publicIpAddresses() + Creatable publicIPAddressCreatable = azureResourceManager.publicIpAddresses() .define(String.format("%s-%d", linuxVMNamePrefix, j)) .withRegion(regions[i]) .withExistingResourceGroup(resourceGroup) @@ -167,7 +167,7 @@ public static boolean runSample(Azure azure) throws IOException { //============================================================= // Create 1 virtual machine creatable - Creatable virtualMachineCreatable = azure.virtualMachines() + Creatable virtualMachineCreatable = azureResourceManager.virtualMachines() .define(String.format("%s-%d", linuxVMNamePrefix, j)) .withRegion(regions[i]) .withExistingResourceGroup(resourceGroup) @@ -191,7 +191,7 @@ public static boolean runSample(Azure azure) throws IOException { System.out.println("Creating virtual machines (two backend pools)"); stopwatch.start(); - CreatedResources virtualMachines = azure.virtualMachines().create(creatableVirtualMachines); + CreatedResources virtualMachines = azureResourceManager.virtualMachines().create(creatableVirtualMachines); stopwatch.stop(); System.out.println("Created virtual machines (two backend pools)"); @@ -232,7 +232,7 @@ public static boolean runSample(Azure azure) throws IOException { final String sslCertificatePfxPath = ManageApplicationGateway.class.getClassLoader().getResource("myTest._pfx").getPath(); final String sslCertificatePfxPath2 = ManageApplicationGateway.class.getClassLoader().getResource("myTest2._pfx").getPath(); - ApplicationGateway applicationGateway = azure.applicationGateways().define("myFirstAppGateway") + ApplicationGateway applicationGateway = azureResourceManager.applicationGateways().define("myFirstAppGateway") .withRegion(Region.US_EAST) .withExistingResourceGroup(resourceGroup) @@ -301,7 +301,7 @@ public static boolean runSample(Azure azure) throws IOException { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -328,16 +328,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageExpressRoute.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageExpressRoute.java index f04ef743e513f..8a4045aa2ee6f 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageExpressRoute.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageExpressRoute.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.network.models.ExpressRouteCircuit; import com.azure.resourcemanager.network.models.ExpressRouteCircuitSkuType; import com.azure.resourcemanager.network.models.Network; @@ -30,22 +30,22 @@ public final class ManageExpressRoute { /** * Main function which runs the actual sample. * - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { + public static boolean runSample(AzureResourceManager azureResourceManager) { final Region region = Region.US_NORTH_CENTRAL; - final String rgName = azure.sdkContext().randomResourceName("rg", 20); - final String ercName = azure.sdkContext().randomResourceName("erc", 20); - final String gatewayName = azure.sdkContext().randomResourceName("gtw", 20); - final String connectionName = azure.sdkContext().randomResourceName("con", 20); - final String vnetName = azure.sdkContext().randomResourceName("vnet", 20); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rg", 20); + final String ercName = azureResourceManager.sdkContext().randomResourceName("erc", 20); + final String gatewayName = azureResourceManager.sdkContext().randomResourceName("gtw", 20); + final String connectionName = azureResourceManager.sdkContext().randomResourceName("con", 20); + final String vnetName = azureResourceManager.sdkContext().randomResourceName("vnet", 20); try { //============================================================ // create Express Route Circuit System.out.println("Creating express route circuit..."); - ExpressRouteCircuit erc = azure.expressRouteCircuits().define(ercName) + ExpressRouteCircuit erc = azureResourceManager.expressRouteCircuits().define(ercName) .withRegion(region) .withNewResourceGroup(rgName) .withServiceProvider("Equinix") @@ -75,7 +75,7 @@ public static boolean runSample(Azure azure) { //============================================================ // Create virtual network to be associated with virtual network gateway System.out.println("Creating virtual network..."); - Network network = azure.networks().define(vnetName) + Network network = azureResourceManager.networks().define(vnetName) .withRegion(region) .withExistingResourceGroup(rgName) .withAddressSpace("192.168.0.0/16") @@ -86,7 +86,7 @@ public static boolean runSample(Azure azure) { //============================================================ // Create virtual network gateway System.out.println("Creating virtual network gateway..."); - VirtualNetworkGateway vngw1 = azure.virtualNetworkGateways().define(gatewayName) + VirtualNetworkGateway vngw1 = azureResourceManager.virtualNetworkGateways().define(gatewayName) .withRegion(region) .withNewResourceGroup(rgName) .withExistingNetwork(network) @@ -109,7 +109,7 @@ public static boolean runSample(Azure azure) { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); } catch (Exception g) { @@ -132,16 +132,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageExpressRouteCrossConnection.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageExpressRouteCrossConnection.java index da10c95ced2b0..ab9cc661e4b7f 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageExpressRouteCrossConnection.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageExpressRouteCrossConnection.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.network.models.ExpressRouteCrossConnection; import com.azure.core.management.profile.AzureProfile; @@ -25,22 +25,22 @@ public final class ManageExpressRouteCrossConnection { /** * Main function which runs the actual sample. * - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { + public static boolean runSample(AzureResourceManager azureResourceManager) { final String connectionId = ""; //============================================================ // list Express Route Cross Connections System.out.println("List express route cross connection..."); - azure.expressRouteCrossConnections().list().forEach(expressRouteCrossConnection -> + azureResourceManager.expressRouteCrossConnections().list().forEach(expressRouteCrossConnection -> System.out.println(expressRouteCrossConnection.name())); System.out.println(); //============================================================ // get Express Route Cross Connection by id - ExpressRouteCrossConnection crossConnection = azure.expressRouteCrossConnections().getById(connectionId); + ExpressRouteCrossConnection crossConnection = azureResourceManager.expressRouteCrossConnections().getById(connectionId); //============================================================ // create Express Route Cross Connection private peering @@ -112,16 +112,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageIPAddress.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageIPAddress.java index e34a8e83b6f2b..0b59f8c9b5e52 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageIPAddress.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageIPAddress.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.KnownWindowsVirtualMachineImage; import com.azure.resourcemanager.compute.models.VirtualMachine; import com.azure.resourcemanager.compute.models.VirtualMachineSizeTypes; @@ -32,16 +32,16 @@ public final class ManageIPAddress { /** * Main function which runs the actual sample. * - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String publicIPAddressName1 = azure.sdkContext().randomResourceName("pip1", 20); - final String publicIPAddressName2 = azure.sdkContext().randomResourceName("pip2", 20); - final String publicIPAddressLeafDNS1 = azure.sdkContext().randomResourceName("pip1", 20); - final String publicIPAddressLeafDNS2 = azure.sdkContext().randomResourceName("pip2", 20); - final String vmName = azure.sdkContext().randomResourceName("vm", 8); - final String rgName = azure.sdkContext().randomResourceName("rgNEMP", 24); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String publicIPAddressName1 = azureResourceManager.sdkContext().randomResourceName("pip1", 20); + final String publicIPAddressName2 = azureResourceManager.sdkContext().randomResourceName("pip2", 20); + final String publicIPAddressLeafDNS1 = azureResourceManager.sdkContext().randomResourceName("pip1", 20); + final String publicIPAddressLeafDNS2 = azureResourceManager.sdkContext().randomResourceName("pip2", 20); + final String vmName = azureResourceManager.sdkContext().randomResourceName("vm", 8); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgNEMP", 24); final String userName = "tirekicker"; final String password = Utils.password(); @@ -54,7 +54,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating a public IP address..."); - PublicIpAddress publicIPAddress = azure.publicIpAddresses().define(publicIPAddressName1) + PublicIpAddress publicIPAddress = azureResourceManager.publicIpAddresses().define(publicIPAddressName1) .withRegion(Region.US_EAST) .withNewResourceGroup(rgName) .withLeafDomainLabel(publicIPAddressLeafDNS1) @@ -71,7 +71,7 @@ public static boolean runSample(Azure azure) { Date t1 = new Date(); - VirtualMachine vm = azure.virtualMachines().define(vmName) + VirtualMachine vm = azureResourceManager.virtualMachines().define(vmName) .withRegion(Region.US_EAST) .withExistingResourceGroup(rgName) .withNewPrimaryNetwork("10.0.0.0/28") @@ -103,7 +103,7 @@ public static boolean runSample(Azure azure) { // Define a new public IP address - PublicIpAddress publicIpAddress2 = azure.publicIpAddresses().define(publicIPAddressName2) + PublicIpAddress publicIpAddress2 = azureResourceManager.publicIpAddresses().define(publicIPAddressName2) .withRegion(Region.US_EAST) .withNewResourceGroup(rgName) .withLeafDomainLabel(publicIPAddressLeafDNS2) @@ -145,13 +145,13 @@ public static boolean runSample(Azure azure) { //============================================================ // Delete the public ip System.out.println("Deleting the public IP address"); - azure.publicIpAddresses().deleteById(publicIPAddress.id()); + azureResourceManager.publicIpAddresses().deleteById(publicIPAddress.id()); System.out.println("Deleted the public IP address"); return true; } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -179,16 +179,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageInternalLoadBalancer.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageInternalLoadBalancer.java index e5556c6d5e035..823eb5ab6ea2f 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageInternalLoadBalancer.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageInternalLoadBalancer.java @@ -8,7 +8,7 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.AvailabilitySet; import com.azure.resourcemanager.compute.models.AvailabilitySetSkuTypes; import com.azure.resourcemanager.compute.models.KnownLinuxVirtualMachineImage; @@ -71,16 +71,16 @@ public final class ManageInternalLoadBalancer { /** * Main function which runs the actual sample. * - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String rgName = azure.sdkContext().randomResourceName("rgNEML", 15); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgNEML", 15); - final String vnetName = azure.sdkContext().randomResourceName("vnet", 24); + final String vnetName = azureResourceManager.sdkContext().randomResourceName("vnet", 24); - final String loadBalancerName3 = azure.sdkContext().randomResourceName("intlb3" + "-", 18); - final String loadBalancerName4 = azure.sdkContext().randomResourceName("intlb4" + "-", 18); + final String loadBalancerName3 = azureResourceManager.sdkContext().randomResourceName("intlb3" + "-", 18); + final String loadBalancerName4 = azureResourceManager.sdkContext().randomResourceName("intlb4" + "-", 18); final String privateFrontEndName = loadBalancerName3 + "-BE"; final String backendPoolName3 = loadBalancerName3 + "-BAP3"; @@ -93,12 +93,12 @@ public static boolean runSample(Azure azure) { final String natRule6002to22forVM4 = "nat6002to22forVM4"; final String natRule6003to23forVM4 = "nat6003to23forVM4"; - final String networkInterfaceName3 = azure.sdkContext().randomResourceName("nic3", 24); - final String networkInterfaceName4 = azure.sdkContext().randomResourceName("nic4", 24); + final String networkInterfaceName3 = azureResourceManager.sdkContext().randomResourceName("nic3", 24); + final String networkInterfaceName4 = azureResourceManager.sdkContext().randomResourceName("nic4", 24); - final String availSetName = azure.sdkContext().randomResourceName("av2", 24); - final String vmName3 = azure.sdkContext().randomResourceName("lVM3", 24); - final String vmName4 = azure.sdkContext().randomResourceName("lVM4", 24); + final String availSetName = azureResourceManager.sdkContext().randomResourceName("av2", 24); + final String vmName3 = azureResourceManager.sdkContext().randomResourceName("lVM3", 24); + final String vmName4 = azureResourceManager.sdkContext().randomResourceName("lVM4", 24); final String userName = "tirekicker"; final String sshKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfSPC2K7LZcFKEO+/t3dzmQYtrJFZNxOsbVgOVKietqHyvmYGHEC0J2wPdAqQ/63g/hhAEFRoyehM+rbeDri4txB3YFfnOK58jqdkyXzupWqXzOrlKY4Wz9SKjjN765+dqUITjKRIaAip1Ri137szRg71WnrmdP3SphTRlCx1Bk2nXqWPsclbRDCiZeF8QOTi4JqbmJyK5+0UqhqYRduun8ylAwKKQJ1NJt85sYIHn9f1Rfr6Tq2zS0wZ7DHbZL+zB5rSlAr8QyUdg/GQD+cmSs6LvPJKL78d6hMGk84ARtFo4A79ovwX/Fj01znDQkU6nJildfkaolH2rWFG/qttD azjava@javalib.com"; try { @@ -107,7 +107,7 @@ public static boolean runSample(Azure azure) { // Create a virtual network with a frontend and a backend subnets System.out.println("Creating virtual network with a frontend and a backend subnets..."); - Network network = azure.networks().define(vnetName) + Network network = azureResourceManager.networks().define(vnetName) .withRegion(Region.US_EAST) .withNewResourceGroup(rgName) .withAddressSpace("172.16.0.0/16") @@ -148,7 +148,7 @@ public static boolean runSample(Azure azure) { + " balancer to a port for a specific virtual machine in the backend address pool\n" + " - this provides direct VM connectivity for SSH to port 22 and TELNET to port 23"); - LoadBalancer loadBalancer3 = azure.loadBalancers().define(loadBalancerName3) + LoadBalancer loadBalancer3 = azureResourceManager.loadBalancers().define(loadBalancerName3) .withRegion(Region.US_EAST) .withExistingResourceGroup(rgName) @@ -212,7 +212,7 @@ public static boolean runSample(Azure azure) { // Define two network interfaces in the backend subnet // associate network interfaces to NAT rules, backend pools - Creatable networkInterface3Creatable = azure.networkInterfaces().define(networkInterfaceName3) + Creatable networkInterface3Creatable = azureResourceManager.networkInterfaces().define(networkInterfaceName3) .withRegion(Region.US_EAST) .withNewResourceGroup(rgName) .withExistingPrimaryNetwork(network) @@ -222,7 +222,7 @@ public static boolean runSample(Azure azure) { .withExistingLoadBalancerInboundNatRule(loadBalancer3, natRule6000to22forVM3) .withExistingLoadBalancerInboundNatRule(loadBalancer3, natRule6001to23forVM3); - Creatable networkInterface4Creatable = azure.networkInterfaces().define(networkInterfaceName4) + Creatable networkInterface4Creatable = azureResourceManager.networkInterfaces().define(networkInterfaceName4) .withRegion(Region.US_EAST) .withNewResourceGroup(rgName) .withExistingPrimaryNetwork(network) @@ -235,7 +235,7 @@ public static boolean runSample(Azure azure) { //============================================================= // Define an availability set - Creatable availSet2Definition = azure.availabilitySets().define(availSetName) + Creatable availSet2Definition = azureResourceManager.availabilitySets().define(availSetName) .withRegion(Region.US_EAST) .withNewResourceGroup(rgName) .withFaultDomainCount(2) @@ -250,7 +250,7 @@ public static boolean runSample(Azure azure) { List> virtualMachineCreateables2 = new ArrayList>(); - Creatable virtualMachine3Creatable = azure.virtualMachines().define(vmName3) + Creatable virtualMachine3Creatable = azureResourceManager.virtualMachines().define(vmName3) .withRegion(Region.US_EAST) .withExistingResourceGroup(rgName) .withNewPrimaryNetworkInterface(networkInterface3Creatable) @@ -262,7 +262,7 @@ public static boolean runSample(Azure azure) { virtualMachineCreateables2.add(virtualMachine3Creatable); - Creatable virtualMachine4Creatable = azure.virtualMachines().define(vmName4) + Creatable virtualMachine4Creatable = azureResourceManager.virtualMachines().define(vmName4) .withRegion(Region.US_EAST) .withExistingResourceGroup(rgName) .withNewPrimaryNetworkInterface(networkInterface4Creatable) @@ -277,7 +277,7 @@ public static boolean runSample(Azure azure) { StopWatch stopwatch = new StopWatch(); stopwatch.start(); - Collection virtualMachines = azure.virtualMachines().create(virtualMachineCreateables2).values(); + Collection virtualMachines = azureResourceManager.virtualMachines().create(virtualMachineCreateables2).values(); stopwatch.stop(); System.out.println("Created 2 Linux VMs: (took " + (stopwatch.getTime() / 1000) + " seconds) "); @@ -329,7 +329,7 @@ public static boolean runSample(Azure azure) { + " balancer to a port for a specific virtual machine in the backend address pool\n" + " - this provides direct VM connectivity for SSH to port 22 and TELNET to port 23"); - LoadBalancer loadBalancer4 = azure.loadBalancers().define(loadBalancerName4) + LoadBalancer loadBalancer4 = azureResourceManager.loadBalancers().define(loadBalancerName4) .withRegion(Region.US_EAST) .withExistingResourceGroup(rgName) @@ -392,7 +392,7 @@ public static boolean runSample(Azure azure) { //============================================================= // List load balancers - PagedIterable loadBalancers = azure.loadBalancers().list(); + PagedIterable loadBalancers = azureResourceManager.loadBalancers().list(); System.out.println("Walking through the list of load balancers"); @@ -407,14 +407,14 @@ public static boolean runSample(Azure azure) { System.out.println("Deleting load balancer " + loadBalancerName4 + "(" + loadBalancer4.id() + ")"); - azure.loadBalancers().deleteById(loadBalancer4.id()); + azureResourceManager.loadBalancers().deleteById(loadBalancer4.id()); System.out.println("Deleted load balancer" + loadBalancerName4); return true; } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); } catch (Exception g) { @@ -440,16 +440,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageInternetFacingLoadBalancer.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageInternetFacingLoadBalancer.java index 782394859d8c9..731b7fbd4b9ab 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageInternetFacingLoadBalancer.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageInternetFacingLoadBalancer.java @@ -8,7 +8,7 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.AvailabilitySet; import com.azure.resourcemanager.compute.models.AvailabilitySetSkuTypes; import com.azure.resourcemanager.compute.models.KnownLinuxVirtualMachineImage; @@ -71,16 +71,16 @@ public final class ManageInternetFacingLoadBalancer { /** * Main function which runs the actual sample. * - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String rgName = azure.sdkContext().randomResourceName("rgNEML", 15); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgNEML", 15); - final String vnetName = azure.sdkContext().randomResourceName("vnet", 24); + final String vnetName = azureResourceManager.sdkContext().randomResourceName("vnet", 24); - final String loadBalancerName1 = azure.sdkContext().randomResourceName("intlb1" + "-", 18); - final String loadBalancerName2 = azure.sdkContext().randomResourceName("intlb2" + "-", 18); + final String loadBalancerName1 = azureResourceManager.sdkContext().randomResourceName("intlb1" + "-", 18); + final String loadBalancerName2 = azureResourceManager.sdkContext().randomResourceName("intlb2" + "-", 18); final String publicIpName1 = "pip1-" + loadBalancerName1; final String publicIpName2 = "pip2-" + loadBalancerName1; final String frontendName = loadBalancerName1 + "-FE1"; @@ -96,10 +96,10 @@ public static boolean runSample(Azure azure) { final String natRule5002to22forVM2 = "nat5002to22forVM2"; final String natRule5003to23forVM2 = "nat5003to23forVM2"; - final String networkInterfaceName1 = azure.sdkContext().randomResourceName("nic1", 24); - final String networkInterfaceName2 = azure.sdkContext().randomResourceName("nic2", 24); + final String networkInterfaceName1 = azureResourceManager.sdkContext().randomResourceName("nic1", 24); + final String networkInterfaceName2 = azureResourceManager.sdkContext().randomResourceName("nic2", 24); - final String availSetName = azure.sdkContext().randomResourceName("av", 24); + final String availSetName = azureResourceManager.sdkContext().randomResourceName("av", 24); final String userName = "tirekicker"; final String sshKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfSPC2K7LZcFKEO+/t3dzmQYtrJFZNxOsbVgOVKietqHyvmYGHEC0J2wPdAqQ/63g/hhAEFRoyehM+rbeDri4txB3YFfnOK58jqdkyXzupWqXzOrlKY4Wz9SKjjN765+dqUITjKRIaAip1Ri137szRg71WnrmdP3SphTRlCx1Bk2nXqWPsclbRDCiZeF8QOTi4JqbmJyK5+0UqhqYRduun8ylAwKKQJ1NJt85sYIHn9f1Rfr6Tq2zS0wZ7DHbZL+zB5rSlAr8QyUdg/GQD+cmSs6LvPJKL78d6hMGk84ARtFo4A79ovwX/Fj01znDQkU6nJildfkaolH2rWFG/qttD azjava@javalib.com"; try { @@ -108,7 +108,7 @@ public static boolean runSample(Azure azure) { // Create a virtual network with a frontend and a backend subnets System.out.println("Creating virtual network with a frontend and a backend subnets..."); - Network network = azure.networks().define(vnetName) + Network network = azureResourceManager.networks().define(vnetName) .withRegion(Region.US_EAST) .withNewResourceGroup(rgName) .withAddressSpace("172.16.0.0/16") @@ -129,7 +129,7 @@ public static boolean runSample(Azure azure) { // Create a public IP address System.out.println("Creating a public IP address..."); - PublicIpAddress publicIPAddress = azure.publicIpAddresses().define(publicIpName1) + PublicIpAddress publicIPAddress = azureResourceManager.publicIpAddresses().define(publicIpName1) .withRegion(Region.US_EAST) .withExistingResourceGroup(rgName) .withLeafDomainLabel(publicIpName1) @@ -165,7 +165,7 @@ public static boolean runSample(Azure azure) { + " balancer to a port for a specific virtual machine in the backend address pool\n" + " - this provides direct VM connectivity for SSH to port 22 and TELNET to port 23"); - LoadBalancer loadBalancer1 = azure.loadBalancers().define(loadBalancerName1) + LoadBalancer loadBalancer1 = azureResourceManager.loadBalancers().define(loadBalancerName1) .withRegion(Region.US_EAST) .withExistingResourceGroup(rgName) @@ -247,7 +247,7 @@ public static boolean runSample(Azure azure) { List> networkInterfaceCreatables = new ArrayList>(); - Creatable networkInterface1Creatable = azure.networkInterfaces().define(networkInterfaceName1) + Creatable networkInterface1Creatable = azureResourceManager.networkInterfaces().define(networkInterfaceName1) .withRegion(Region.US_EAST) .withNewResourceGroup(rgName) .withExistingPrimaryNetwork(network) @@ -260,7 +260,7 @@ public static boolean runSample(Azure azure) { networkInterfaceCreatables.add(networkInterface1Creatable); - Creatable networkInterface2Creatable = azure.networkInterfaces().define(networkInterfaceName2) + Creatable networkInterface2Creatable = azureResourceManager.networkInterfaces().define(networkInterfaceName2) .withRegion(Region.US_EAST) .withNewResourceGroup(rgName) .withExistingPrimaryNetwork(network) @@ -277,7 +277,7 @@ public static boolean runSample(Azure azure) { //============================================================= // Define an availability set - Creatable availSet1Definition = azure.availabilitySets().define(availSetName) + Creatable availSet1Definition = azureResourceManager.availabilitySets().define(availSetName) .withRegion(Region.US_EAST) .withNewResourceGroup(rgName) .withFaultDomainCount(2) @@ -294,7 +294,7 @@ public static boolean runSample(Azure azure) { List> virtualMachineCreateables1 = new ArrayList>(); for (Creatable nicDefinition : networkInterfaceCreatables) { - virtualMachineCreateables1.add(azure.virtualMachines().define(azure.sdkContext().randomResourceName("lVM1", 24)) + virtualMachineCreateables1.add(azureResourceManager.virtualMachines().define(azureResourceManager.sdkContext().randomResourceName("lVM1", 24)) .withRegion(Region.US_EAST) .withExistingResourceGroup(rgName) .withNewPrimaryNetworkInterface(nicDefinition) @@ -308,7 +308,7 @@ public static boolean runSample(Azure azure) { StopWatch stopwatch = new StopWatch(); stopwatch.start(); - Collection virtualMachines = azure.virtualMachines().create(virtualMachineCreateables1).values(); + Collection virtualMachines = azureResourceManager.virtualMachines().create(virtualMachineCreateables1).values(); stopwatch.stop(); System.out.println("Created 2 Linux VMs: (took " + (stopwatch.getTime() / 1000) + " seconds) "); @@ -342,7 +342,7 @@ public static boolean runSample(Azure azure) { // Create another public IP address System.out.println("Creating another public IP address..."); - PublicIpAddress publicIpAddress2 = azure.publicIpAddresses().define(publicIpName2) + PublicIpAddress publicIpAddress2 = azureResourceManager.publicIpAddresses().define(publicIpName2) .withRegion(Region.US_EAST) .withExistingResourceGroup(rgName) .withLeafDomainLabel(publicIpName2) @@ -378,7 +378,7 @@ public static boolean runSample(Azure azure) { + " balancer to a port for a specific virtual machine in the backend address pool\n" + " - this provides direct VM connectivity for SSH to port 22 and TELNET to port 23"); - LoadBalancer loadBalancer2 = azure.loadBalancers().define(loadBalancerName2) + LoadBalancer loadBalancer2 = azureResourceManager.loadBalancers().define(loadBalancerName2) .withRegion(Region.US_EAST) .withExistingResourceGroup(rgName) @@ -454,7 +454,7 @@ public static boolean runSample(Azure azure) { //============================================================= // List load balancers - PagedIterable loadBalancers = azure.loadBalancers().list(); + PagedIterable loadBalancers = azureResourceManager.loadBalancers().list(); System.out.println("Walking through the list of load balancers"); @@ -468,14 +468,14 @@ public static boolean runSample(Azure azure) { System.out.println("Deleting load balancer " + loadBalancerName2 + "(" + loadBalancer2.id() + ")"); - azure.loadBalancers().deleteById(loadBalancer2.id()); + azureResourceManager.loadBalancers().deleteById(loadBalancer2.id()); System.out.println("Deleted load balancer" + loadBalancerName2); return true; } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); } catch (Exception g) { @@ -501,16 +501,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageNetworkInterface.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageNetworkInterface.java index 2eaa54c6a8884..9e419e5cbd062 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageNetworkInterface.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageNetworkInterface.java @@ -8,7 +8,7 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.KnownWindowsVirtualMachineImage; import com.azure.resourcemanager.compute.models.VirtualMachine; import com.azure.resourcemanager.compute.models.VirtualMachineSizeTypes; @@ -33,21 +33,21 @@ public final class ManageNetworkInterface { /** * Main function which runs the actual sample. * - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { + public static boolean runSample(AzureResourceManager azureResourceManager) { final Region region = Region.US_NORTH_CENTRAL; - final String vnetName = azure.sdkContext().randomResourceName("vnet", 24); - final String networkInterfaceName1 = azure.sdkContext().randomResourceName("nic1", 24); - final String networkInterfaceName2 = azure.sdkContext().randomResourceName("nic2", 24); - final String networkInterfaceName3 = azure.sdkContext().randomResourceName("nic3", 24); - final String publicIPAddressLeafDNS1 = azure.sdkContext().randomResourceName("pip1", 24); - final String publicIPAddressLeafDNS2 = azure.sdkContext().randomResourceName("pip2", 24); + final String vnetName = azureResourceManager.sdkContext().randomResourceName("vnet", 24); + final String networkInterfaceName1 = azureResourceManager.sdkContext().randomResourceName("nic1", 24); + final String networkInterfaceName2 = azureResourceManager.sdkContext().randomResourceName("nic2", 24); + final String networkInterfaceName3 = azureResourceManager.sdkContext().randomResourceName("nic3", 24); + final String publicIPAddressLeafDNS1 = azureResourceManager.sdkContext().randomResourceName("pip1", 24); + final String publicIPAddressLeafDNS2 = azureResourceManager.sdkContext().randomResourceName("pip2", 24); // TODO: adjust the length of vm name from 8 to 24 - final String vmName = azure.sdkContext().randomResourceName("vm", 8); - final String rgName = azure.sdkContext().randomResourceName("rgNEMI", 24); + final String vmName = azureResourceManager.sdkContext().randomResourceName("vm", 8); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgNEMI", 24); final String userName = "tirekicker"; final String password = Utils.password(); try { @@ -59,7 +59,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating a virtual network ..."); - Network network = azure.networks().define(vnetName) + Network network = azureResourceManager.networks().define(vnetName) .withRegion(region) .withNewResourceGroup(rgName) .withAddressSpace("172.16.0.0/16") @@ -80,7 +80,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating multiple network interfaces"); System.out.println("Creating network interface 1"); - NetworkInterface networkInterface1 = azure.networkInterfaces().define(networkInterfaceName1) + NetworkInterface networkInterface1 = azureResourceManager.networkInterfaces().define(networkInterfaceName1) .withRegion(region) .withExistingResourceGroup(rgName) .withExistingPrimaryNetwork(network) @@ -94,7 +94,7 @@ public static boolean runSample(Azure azure) { Utils.print(networkInterface1); System.out.println("Creating network interface 2"); - NetworkInterface networkInterface2 = azure.networkInterfaces().define(networkInterfaceName2) + NetworkInterface networkInterface2 = azureResourceManager.networkInterfaces().define(networkInterfaceName2) .withRegion(region) .withExistingResourceGroup(rgName) .withExistingPrimaryNetwork(network) @@ -107,7 +107,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating network interface 3"); - NetworkInterface networkInterface3 = azure.networkInterfaces().define(networkInterfaceName3) + NetworkInterface networkInterface3 = azureResourceManager.networkInterfaces().define(networkInterfaceName3) .withRegion(region) .withExistingResourceGroup(rgName) .withExistingPrimaryNetwork(network) @@ -126,7 +126,7 @@ public static boolean runSample(Azure azure) { Date t1 = new Date(); - VirtualMachine vm = azure.virtualMachines().define(vmName) + VirtualMachine vm = azureResourceManager.virtualMachines().define(vmName) .withRegion(region) .withExistingResourceGroup(rgName) .withExistingPrimaryNetworkInterface(networkInterface1) @@ -161,7 +161,7 @@ public static boolean runSample(Azure azure) { // List network interfaces System.out.println("Walking through network inter4faces in resource group: " + rgName); - PagedIterable networkInterfaces = azure.networkInterfaces().listByResourceGroup(rgName); + PagedIterable networkInterfaces = azureResourceManager.networkInterfaces().listByResourceGroup(rgName); for (NetworkInterface networkinterface : networkInterfaces) { Utils.print(networkinterface); } @@ -172,14 +172,14 @@ public static boolean runSample(Azure azure) { System.out.println("Deleting a network interface: " + networkInterface2.id()); System.out.println("First, deleting the vm"); - azure.virtualMachines().deleteById(vm.id()); + azureResourceManager.virtualMachines().deleteById(vm.id()); System.out.println("Second, deleting the network interface"); - azure.networkInterfaces().deleteById(networkInterface2.id()); + azureResourceManager.networkInterfaces().deleteById(networkInterface2.id()); System.out.println("Deleted network interface"); System.out.println("============================================================"); System.out.println("Remaining network interfaces are ..."); - networkInterfaces = azure.networkInterfaces().listByResourceGroup(rgName); + networkInterfaces = azureResourceManager.networkInterfaces().listByResourceGroup(rgName); for (NetworkInterface networkinterface : networkInterfaces) { Utils.print(networkinterface); } @@ -188,7 +188,7 @@ public static boolean runSample(Azure azure) { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -215,16 +215,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageNetworkPeeringInSameSubscription.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageNetworkPeeringInSameSubscription.java index 6274dd7730b34..e928ba38ecf68 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageNetworkPeeringInSameSubscription.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageNetworkPeeringInSameSubscription.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.network.models.Network; import com.azure.resourcemanager.network.models.NetworkPeering; import com.azure.resourcemanager.resources.fluentcore.arm.Region; @@ -62,15 +62,15 @@ public final class ManageNetworkPeeringInSameSubscription { /** * Main function which runs the actual sample. * - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { + public static boolean runSample(AzureResourceManager azureResourceManager) { final Region region = Region.US_EAST; - final String resourceGroupName = azure.sdkContext().randomResourceName("rg", 15); - final String vnetAName = azure.sdkContext().randomResourceName("net", 15); - final String vnetBName = azure.sdkContext().randomResourceName("net", 15); - final String peeringABName = azure.sdkContext().randomResourceName("peer", 15); + final String resourceGroupName = azureResourceManager.sdkContext().randomResourceName("rg", 15); + final String vnetAName = azureResourceManager.sdkContext().randomResourceName("net", 15); + final String vnetBName = azureResourceManager.sdkContext().randomResourceName("net", 15); + final String peeringABName = azureResourceManager.sdkContext().randomResourceName("peer", 15); try { //============================================================= @@ -78,21 +78,21 @@ public static boolean runSample(Azure azure) { System.out.println("Creating two virtual networks in the same region and subscription..."); - Creatable networkADefinition = azure.networks().define(vnetAName) + Creatable networkADefinition = azureResourceManager.networks().define(vnetAName) .withRegion(region) .withNewResourceGroup(resourceGroupName) .withAddressSpace("10.0.0.0/27") .withSubnet("subnet1", "10.0.0.0/28") .withSubnet("subnet2", "10.0.0.16/28"); - Creatable networkBDefinition = azure.networks().define(vnetBName) + Creatable networkBDefinition = azureResourceManager.networks().define(vnetBName) .withRegion(region) .withNewResourceGroup(resourceGroupName) .withAddressSpace("10.1.0.0/27") .withSubnet("subnet3", "10.1.0.0/27"); // Create the networks in parallel for better performance - CreatedResources created = azure.networks().create(Arrays.asList(networkADefinition, networkBDefinition)); + CreatedResources created = azureResourceManager.networks().create(Arrays.asList(networkADefinition, networkBDefinition)); // Print virtual network details for (Network network : created.values()) { @@ -153,7 +153,7 @@ public static boolean runSample(Azure azure) { } finally { try { System.out.println("Deleting Resource Group: " + resourceGroupName); - azure.resourceGroups().beginDeleteByName(resourceGroupName); + azureResourceManager.resourceGroups().beginDeleteByName(resourceGroupName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); } catch (Exception g) { @@ -179,16 +179,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageNetworkSecurityGroup.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageNetworkSecurityGroup.java index 190877770b66e..9d1218b78cb87 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageNetworkSecurityGroup.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageNetworkSecurityGroup.java @@ -8,7 +8,7 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.KnownLinuxVirtualMachineImage; import com.azure.resourcemanager.compute.models.VirtualMachine; import com.azure.resourcemanager.compute.models.VirtualMachineSizeTypes; @@ -40,20 +40,20 @@ public final class ManageNetworkSecurityGroup { /** * Main function which runs the actual sample. * - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) throws UnsupportedEncodingException, JSchException { + public static boolean runSample(AzureResourceManager azureResourceManager) throws UnsupportedEncodingException, JSchException { final Region region = Region.US_NORTH_CENTRAL; - final String frontEndNSGName = azure.sdkContext().randomResourceName("fensg", 24); - final String backEndNSGName = azure.sdkContext().randomResourceName("bensg", 24); - final String rgName = azure.sdkContext().randomResourceName("rgNEMS", 24); - final String vnetName = azure.sdkContext().randomResourceName("vnet", 24); - final String networkInterfaceName1 = azure.sdkContext().randomResourceName("nic1", 24); - final String networkInterfaceName2 = azure.sdkContext().randomResourceName("nic2", 24); - final String publicIPAddressLeafDNS1 = azure.sdkContext().randomResourceName("pip1", 24); - final String frontEndVMName = azure.sdkContext().randomResourceName("fevm", 24); - final String backEndVMName = azure.sdkContext().randomResourceName("bevm", 24); + final String frontEndNSGName = azureResourceManager.sdkContext().randomResourceName("fensg", 24); + final String backEndNSGName = azureResourceManager.sdkContext().randomResourceName("bensg", 24); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgNEMS", 24); + final String vnetName = azureResourceManager.sdkContext().randomResourceName("vnet", 24); + final String networkInterfaceName1 = azureResourceManager.sdkContext().randomResourceName("nic1", 24); + final String networkInterfaceName2 = azureResourceManager.sdkContext().randomResourceName("nic2", 24); + final String publicIPAddressLeafDNS1 = azureResourceManager.sdkContext().randomResourceName("pip1", 24); + final String frontEndVMName = azureResourceManager.sdkContext().randomResourceName("fevm", 24); + final String backEndVMName = azureResourceManager.sdkContext().randomResourceName("bevm", 24); final String userName = "tirekicker"; try { final String sshKey = SSHShell.generateSSHKeys(null, null).getSshPublicKey(); @@ -62,7 +62,7 @@ public static boolean runSample(Azure azure) throws UnsupportedEncodingException System.out.println("Creating a virtual network ..."); - Network network = azure.networks().define(vnetName) + Network network = azureResourceManager.networks().define(vnetName) .withRegion(region) .withNewResourceGroup(rgName) .withAddressSpace("172.16.0.0/16") @@ -84,7 +84,7 @@ public static boolean runSample(Azure azure) throws UnsupportedEncodingException // - ALLOW-WEB- allows HTTP traffic into the front end subnet System.out.println("Creating a security group for the front end - allows SSH and HTTP"); - NetworkSecurityGroup frontEndNSG = azure.networkSecurityGroups().define(frontEndNSGName) + NetworkSecurityGroup frontEndNSG = azureResourceManager.networkSecurityGroups().define(frontEndNSGName) .withRegion(region) .withNewResourceGroup(rgName) .defineRule("ALLOW-SSH") @@ -122,7 +122,7 @@ public static boolean runSample(Azure azure) throws UnsupportedEncodingException System.out.println("Creating a security group for the front end - allows SSH and " + "denies all outbound internet traffic "); - NetworkSecurityGroup backEndNSG = azure.networkSecurityGroups().define(backEndNSGName) + NetworkSecurityGroup backEndNSG = azureResourceManager.networkSecurityGroups().define(backEndNSGName) .withRegion(region) .withExistingResourceGroup(rgName) .defineRule("ALLOW-SQL") @@ -160,7 +160,7 @@ public static boolean runSample(Azure azure) throws UnsupportedEncodingException System.out.println("Creating a network interface for the front end"); - NetworkInterface networkInterface1 = azure.networkInterfaces().define(networkInterfaceName1) + NetworkInterface networkInterface1 = azureResourceManager.networkInterfaces().define(networkInterfaceName1) .withRegion(region) .withExistingResourceGroup(rgName) .withExistingPrimaryNetwork(network) @@ -182,7 +182,7 @@ public static boolean runSample(Azure azure) throws UnsupportedEncodingException System.out.println("Creating a network interface for the back end"); - NetworkInterface networkInterface2 = azure.networkInterfaces().define(networkInterfaceName2) + NetworkInterface networkInterface2 = azureResourceManager.networkInterfaces().define(networkInterfaceName2) .withRegion(region) .withExistingResourceGroup(rgName) .withExistingPrimaryNetwork(network) @@ -203,7 +203,7 @@ public static boolean runSample(Azure azure) throws UnsupportedEncodingException Date t1 = new Date(); - VirtualMachine frontEndVM = azure.virtualMachines().define(frontEndVMName) + VirtualMachine frontEndVM = azureResourceManager.virtualMachines().define(frontEndVMName) .withRegion(region) .withExistingResourceGroup(rgName) .withExistingPrimaryNetworkInterface(networkInterface1) @@ -229,7 +229,7 @@ public static boolean runSample(Azure azure) throws UnsupportedEncodingException t1 = new Date(); - VirtualMachine backEndVM = azure.virtualMachines().define(backEndVMName) + VirtualMachine backEndVM = azureResourceManager.virtualMachines().define(backEndVMName) .withRegion(region) .withExistingResourceGroup(rgName) .withExistingPrimaryNetworkInterface(networkInterface2) @@ -249,7 +249,7 @@ public static boolean runSample(Azure azure) throws UnsupportedEncodingException // List network security groups System.out.println("Walking through network security groups"); - PagedIterable networkSecurityGroups = azure.networkSecurityGroups().listByResourceGroup(rgName); + PagedIterable networkSecurityGroups = azureResourceManager.networkSecurityGroups().listByResourceGroup(rgName); for (NetworkSecurityGroup networkSecurityGroup : networkSecurityGroups) { Utils.print(networkSecurityGroup); @@ -281,7 +281,7 @@ public static boolean runSample(Azure azure) throws UnsupportedEncodingException try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -309,16 +309,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageNetworkWatcher.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageNetworkWatcher.java index 3f6204f722080..414b69e9b08f4 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageNetworkWatcher.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageNetworkWatcher.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.KnownLinuxVirtualMachineImage; import com.azure.resourcemanager.compute.models.VirtualMachine; import com.azure.resourcemanager.compute.models.VirtualMachineSizeTypes; @@ -65,22 +65,22 @@ public final class ManageNetworkWatcher { /** * Main function which runs the actual sample. * - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { + public static boolean runSample(AzureResourceManager azureResourceManager) { final Region region = Region.US_NORTH_CENTRAL; - final String nwName = azure.sdkContext().randomResourceName("nw", 8); + final String nwName = azureResourceManager.sdkContext().randomResourceName("nw", 8); final String userName = "tirekicker"; - final String vnetName = azure.sdkContext().randomResourceName("vnet", 20); - final String dnsLabel = azure.sdkContext().randomResourceName("pipdns", 20); + final String vnetName = azureResourceManager.sdkContext().randomResourceName("vnet", 20); + final String dnsLabel = azureResourceManager.sdkContext().randomResourceName("pipdns", 20); final String subnetName = "subnet1"; - final String nsgName = azure.sdkContext().randomResourceName("nsg", 20); - final String rgName = azure.sdkContext().randomResourceName("rg", 24); - final String saName = azure.sdkContext().randomResourceName("sa", 24); - final String vmName = azure.sdkContext().randomResourceName("vm", 24); - final String packetCaptureName = azure.sdkContext().randomResourceName("pc", 8); + final String nsgName = azureResourceManager.sdkContext().randomResourceName("nsg", 20); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rg", 24); + final String saName = azureResourceManager.sdkContext().randomResourceName("sa", 24); + final String vmName = azureResourceManager.sdkContext().randomResourceName("vm", 24); + final String packetCaptureName = azureResourceManager.sdkContext().randomResourceName("pc", 8); final String packetCaptureStorageContainer = "packetcapture"; // file name to save packet capture log locally final String packetCaptureFile = "packetcapture.cap"; @@ -92,7 +92,7 @@ public static boolean runSample(Azure azure) { //============================================================ // Create network watcher System.out.println("Creating network watcher..."); - nw = azure.networkWatchers().define(nwName) + nw = azureResourceManager.networkWatchers().define(nwName) .withRegion(region) .withNewResourceGroup() .create(); @@ -105,7 +105,7 @@ public static boolean runSample(Azure azure) { // Create network security group, virtual network and VM; add packetCapture extension to enable System.out.println("Creating network security group..."); - NetworkSecurityGroup nsg = azure.networkSecurityGroups().define(nsgName) + NetworkSecurityGroup nsg = azureResourceManager.networkSecurityGroups().define(nsgName) .withRegion(region) .withNewResourceGroup(rgName) .defineRule("DenyInternetInComing") @@ -119,7 +119,7 @@ public static boolean runSample(Azure azure) { .create(); System.out.println("Defining a virtual network..."); - Creatable virtualNetworkDefinition = azure.networks().define(vnetName) + Creatable virtualNetworkDefinition = azureResourceManager.networks().define(vnetName) .withRegion(region) .withExistingResourceGroup(rgName) .withAddressSpace("192.168.0.0/16") @@ -129,7 +129,7 @@ public static boolean runSample(Azure azure) { .attach(); System.out.println("Creating a virtual machine..."); - VirtualMachine vm = azure.virtualMachines().define(vmName) + VirtualMachine vm = azureResourceManager.virtualMachines().define(vmName) .withRegion(region) .withExistingResourceGroup(rgName) .withNewPrimaryNetwork(virtualNetworkDefinition) @@ -150,7 +150,7 @@ public static boolean runSample(Azure azure) { // Create storage account System.out.println("Creating storage account..."); - StorageAccount storageAccount = azure.storageAccounts().define(saName) + StorageAccount storageAccount = azureResourceManager.storageAccounts().define(saName) .withRegion(region) .withExistingResourceGroup(rgName) .withGeneralPurposeAccountKindV2() @@ -291,17 +291,17 @@ public static boolean runSample(Azure azure) { //============================================================ // Delete network watcher System.out.println("Deleting network watcher..."); - azure.networkWatchers().deleteById(nw.id()); + azureResourceManager.networkWatchers().deleteById(nw.id()); System.out.println("Deleted network watcher"); return true; } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); if (nw != null) { System.out.println("Deleting network watcher resource group: " + nw.name()); - azure.resourceGroups().beginDeleteByName(nw.resourceGroupName()); + azureResourceManager.resourceGroups().beginDeleteByName(nw.resourceGroupName()); } } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -326,16 +326,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageSimpleApplicationGateway.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageSimpleApplicationGateway.java index a2330ea82119d..7552b9137e42c 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageSimpleApplicationGateway.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageSimpleApplicationGateway.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.network.models.ApplicationGateway; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.core.management.profile.AzureProfile; @@ -57,11 +57,11 @@ public final class ManageSimpleApplicationGateway { /** * Main function which runs the actual sample. * - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) throws IOException { - final String rgName = azure.sdkContext().randomResourceName("rgNEAGS", 15); + public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException { + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgNEAGS", 15); try { //======================================================================= // Create an application gateway @@ -70,7 +70,7 @@ public static boolean runSample(Azure azure) throws IOException { System.out.println("Creating an application gateway... (this can take about 20 min)"); long t1 = System.currentTimeMillis(); - ApplicationGateway applicationGateway = azure.applicationGateways().define("myFirstAppGateway") + ApplicationGateway applicationGateway = azureResourceManager.applicationGateways().define("myFirstAppGateway") .withRegion(Region.US_EAST) .withNewResourceGroup(rgName) @@ -127,7 +127,7 @@ public static boolean runSample(Azure azure) throws IOException { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -154,16 +154,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVirtualMachinesInParallelWithNetwork.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVirtualMachinesInParallelWithNetwork.java index 77f0e02b6347e..6f30a02666d3e 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVirtualMachinesInParallelWithNetwork.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVirtualMachinesInParallelWithNetwork.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.KnownLinuxVirtualMachineImage; import com.azure.resourcemanager.compute.models.VirtualMachine; import com.azure.resourcemanager.compute.models.VirtualMachineSizeTypes; @@ -38,23 +38,23 @@ public final class ManageVirtualMachinesInParallelWithNetwork { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { + public static boolean runSample(AzureResourceManager azureResourceManager) { final int frontendVMCount = 4; final int backendVMCount = 4; - final String rgName = azure.sdkContext().randomResourceName("rgNEPP", 24); - final String frontEndNsgName = azure.sdkContext().randomResourceName("fensg", 24); - final String backEndNsgName = azure.sdkContext().randomResourceName("bensg", 24); - final String networkName = azure.sdkContext().randomResourceName("vnetCOMV", 24); - final String storageAccountName = azure.sdkContext().randomResourceName("stgCOMV", 20); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgNEPP", 24); + final String frontEndNsgName = azureResourceManager.sdkContext().randomResourceName("fensg", 24); + final String backEndNsgName = azureResourceManager.sdkContext().randomResourceName("bensg", 24); + final String networkName = azureResourceManager.sdkContext().randomResourceName("vnetCOMV", 24); + final String storageAccountName = azureResourceManager.sdkContext().randomResourceName("stgCOMV", 20); final String userName = "tirekicker"; final String password = Utils.password(); final Region region = Region.US_SOUTH_CENTRAL; try { // Create a resource group [Where all resources gets created] - ResourceGroup resourceGroup = azure.resourceGroups().define(rgName) + ResourceGroup resourceGroup = azureResourceManager.resourceGroups().define(rgName) .withRegion(region) .create(); @@ -64,7 +64,7 @@ public static boolean runSample(Azure azure) { // - ALLOW-SSH - allows SSH traffic into the front end subnet // - ALLOW-WEB- allows HTTP traffic into the front end subnet - Creatable frontEndNSGCreatable = azure.networkSecurityGroups().define(frontEndNsgName) + Creatable frontEndNSGCreatable = azureResourceManager.networkSecurityGroups().define(frontEndNsgName) .withRegion(region) .withExistingResourceGroup(resourceGroup) .defineRule("ALLOW-SSH") @@ -94,7 +94,7 @@ public static boolean runSample(Azure azure) { // - ALLOW-SQL - allows SQL traffic only from the front end subnet // - DENY-WEB - denies all outbound internet traffic from the back end subnet - Creatable backEndNSGCreatable = azure.networkSecurityGroups().define(backEndNsgName) + Creatable backEndNSGCreatable = azureResourceManager.networkSecurityGroups().define(backEndNsgName) .withRegion(region) .withExistingResourceGroup(resourceGroup) .defineRule("ALLOW-SQL") @@ -122,7 +122,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating security group for the back ends - allows SSH and denies all outbound internet traffic"); @SuppressWarnings("unchecked") - Collection networkSecurityGroups = azure.networkSecurityGroups() + Collection networkSecurityGroups = azureResourceManager.networkSecurityGroups() .create(frontEndNSGCreatable, backEndNSGCreatable).values(); NetworkSecurityGroup frontendNSG = null; @@ -144,7 +144,7 @@ public static boolean runSample(Azure azure) { Utils.print(backendNSG); // Create Network [Where all the virtual machines get added to] - Network network = azure.networks().define(networkName) + Network network = azureResourceManager.networks().define(networkName) .withRegion(region) .withExistingResourceGroup(resourceGroup) .withAddressSpace("172.16.0.0/16") @@ -159,14 +159,14 @@ public static boolean runSample(Azure azure) { .create(); // Prepare Creatable Storage account definition [For storing VMs disk] - Creatable creatableStorageAccount = azure.storageAccounts().define(storageAccountName) + Creatable creatableStorageAccount = azureResourceManager.storageAccounts().define(storageAccountName) .withRegion(region) .withExistingResourceGroup(resourceGroup); // Prepare a batch of Creatable Virtual Machines definitions List> frontendCreatableVirtualMachines = new ArrayList<>(); for (int i = 0; i < frontendVMCount; i++) { - Creatable creatableVirtualMachine = azure.virtualMachines().define("VM-FE-" + i) + Creatable creatableVirtualMachine = azureResourceManager.virtualMachines().define("VM-FE-" + i) .withRegion(region) .withExistingResourceGroup(resourceGroup) .withExistingPrimaryNetwork(network) @@ -184,7 +184,7 @@ public static boolean runSample(Azure azure) { List> backendCreatableVirtualMachines = new ArrayList<>(); for (int i = 0; i < backendVMCount; i++) { - Creatable creatableVirtualMachine = azure.virtualMachines().define("VM-BE-" + i) + Creatable creatableVirtualMachine = azureResourceManager.virtualMachines().define("VM-BE-" + i) .withRegion(region) .withExistingResourceGroup(resourceGroup) .withExistingPrimaryNetwork(network) @@ -207,7 +207,7 @@ public static boolean runSample(Azure azure) { StopWatch stopwatch = new StopWatch(); stopwatch.start(); - Collection virtualMachines = azure.virtualMachines().create(allCreatableVirtualMachines).values(); + Collection virtualMachines = azureResourceManager.virtualMachines().create(allCreatableVirtualMachines).values(); stopwatch.stop(); System.out.println("Created virtual machines"); @@ -222,7 +222,7 @@ public static boolean runSample(Azure azure) { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -248,16 +248,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVirtualNetwork.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVirtualNetwork.java index 6bc79f0ed2f79..ab9e9b41c441d 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVirtualNetwork.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVirtualNetwork.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.KnownLinuxVirtualMachineImage; import com.azure.resourcemanager.compute.models.VirtualMachine; import com.azure.resourcemanager.compute.models.VirtualMachineSizeTypes; @@ -34,22 +34,22 @@ public final class ManageVirtualNetwork { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String vnetName1 = azure.sdkContext().randomResourceName("vnet1", 20); - final String vnetName2 = azure.sdkContext().randomResourceName("vnet2", 20); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String vnetName1 = azureResourceManager.sdkContext().randomResourceName("vnet1", 20); + final String vnetName2 = azureResourceManager.sdkContext().randomResourceName("vnet2", 20); final String vnet1FrontEndSubnetName = "frontend"; final String vnet1BackEndSubnetName = "backend"; final String vnet1FrontEndSubnetNsgName = "frontendnsg"; final String vnet1BackEndSubnetNsgName = "backendnsg"; - final String frontEndVMName = azure.sdkContext().randomResourceName("fevm", 24); - final String backEndVMName = azure.sdkContext().randomResourceName("bevm", 24); - final String publicIPAddressLeafDnsForFrontEndVM = azure.sdkContext().randomResourceName("pip1", 24); + final String frontEndVMName = azureResourceManager.sdkContext().randomResourceName("fevm", 24); + final String backEndVMName = azureResourceManager.sdkContext().randomResourceName("bevm", 24); + final String publicIPAddressLeafDnsForFrontEndVM = azureResourceManager.sdkContext().randomResourceName("pip1", 24); final String userName = "tirekicker"; final String sshKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfSPC2K7LZcFKEO+/t3dzmQYtrJFZNxOsbVgOVKietqHyvmYGHEC0J2wPdAqQ/63g/hhAEFRoyehM+rbeDri4txB3YFfnOK58jqdkyXzupWqXzOrlKY4Wz9SKjjN765+dqUITjKRIaAip1Ri137szRg71WnrmdP3SphTRlCx1Bk2nXqWPsclbRDCiZeF8QOTi4JqbmJyK5+0UqhqYRduun8ylAwKKQJ1NJt85sYIHn9f1Rfr6Tq2zS0wZ7DHbZL+zB5rSlAr8QyUdg/GQD+cmSs6LvPJKL78d6hMGk84ARtFo4A79ovwX/Fj01znDQkU6nJildfkaolH2rWFG/qttD azjava@javalib.com"; - final String rgName = azure.sdkContext().randomResourceName("rgNEMV", 24); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgNEMV", 24); try { //============================================================ @@ -59,7 +59,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating a network security group for virtual network backend subnet..."); - NetworkSecurityGroup backEndSubnetNsg = azure.networkSecurityGroups().define(vnet1BackEndSubnetNsgName) + NetworkSecurityGroup backEndSubnetNsg = azureResourceManager.networkSecurityGroups().define(vnet1BackEndSubnetNsgName) .withRegion(Region.US_EAST) .withNewResourceGroup(rgName) .defineRule("DenyInternetInComing") @@ -89,7 +89,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating virtual network #1..."); - Network virtualNetwork1 = azure.networks().define(vnetName1) + Network virtualNetwork1 = azureResourceManager.networks().define(vnetName1) .withRegion(Region.US_EAST) .withExistingResourceGroup(rgName) .withAddressSpace("192.168.0.0/16") @@ -112,7 +112,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating a network security group for virtual network backend subnet..."); - NetworkSecurityGroup frontEndSubnetNsg = azure.networkSecurityGroups().define(vnet1FrontEndSubnetNsgName) + NetworkSecurityGroup frontEndSubnetNsg = azureResourceManager.networkSecurityGroups().define(vnet1FrontEndSubnetNsgName) .withRegion(Region.US_EAST) .withExistingResourceGroup(rgName) .defineRule("AllowHttpInComing") @@ -161,7 +161,7 @@ public static boolean runSample(Azure azure) { Date t1 = new Date(); - VirtualMachine frontEndVM = azure.virtualMachines().define(frontEndVMName) + VirtualMachine frontEndVM = azureResourceManager.virtualMachines().define(frontEndVMName) .withRegion(Region.US_EAST) .withExistingResourceGroup(rgName) .withExistingPrimaryNetwork(virtualNetwork1) @@ -187,7 +187,7 @@ public static boolean runSample(Azure azure) { Date t3 = new Date(); - VirtualMachine backEndVM = azure.virtualMachines().define(backEndVMName) + VirtualMachine backEndVM = azureResourceManager.virtualMachines().define(backEndVMName) .withRegion(Region.US_EAST) .withExistingResourceGroup(rgName) .withExistingPrimaryNetwork(virtualNetwork1) @@ -212,7 +212,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating virtual network #2..."); - Network virtualNetwork2 = azure.networks().define(vnetName2) + Network virtualNetwork2 = azureResourceManager.networks().define(vnetName2) .withRegion(Region.US_EAST) .withNewResourceGroup(rgName) .create(); @@ -225,7 +225,7 @@ public static boolean runSample(Azure azure) { //============================================================ // List virtual networks - for (Network virtualNetwork : azure.networks().listByResourceGroup(rgName)) { + for (Network virtualNetwork : azureResourceManager.networks().listByResourceGroup(rgName)) { Utils.print(virtualNetwork); } @@ -233,14 +233,14 @@ public static boolean runSample(Azure azure) { //============================================================ // Delete a virtual network System.out.println("Deleting the virtual network"); - azure.networks().deleteById(virtualNetwork2.id()); + azureResourceManager.networks().deleteById(virtualNetwork2.id()); System.out.println("Deleted the virtual network"); return true; } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); } catch (Exception g) { @@ -263,16 +263,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVirtualNetworkAsync.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVirtualNetworkAsync.java index 737c4323d186c..146a7cffc0a63 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVirtualNetworkAsync.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVirtualNetworkAsync.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.KnownLinuxVirtualMachineImage; import com.azure.resourcemanager.compute.models.VirtualMachine; import com.azure.resourcemanager.compute.models.VirtualMachineSizeTypes; @@ -50,22 +50,22 @@ private static class Indexable2Duration { /** * Main function which runs the actual sample. * - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(final Azure azure) { - final String vnetName1 = azure.sdkContext().randomResourceName("vnet1", 20); - final String vnetName2 = azure.sdkContext().randomResourceName("vnet2", 20); + public static boolean runSample(final AzureResourceManager azureResourceManager) { + final String vnetName1 = azureResourceManager.sdkContext().randomResourceName("vnet1", 20); + final String vnetName2 = azureResourceManager.sdkContext().randomResourceName("vnet2", 20); final String vnet1FrontEndSubnetName = "frontend"; final String vnet1BackEndSubnetName = "backend"; final String vnet1FrontEndSubnetNsgName = "frontendnsg"; final String vnet1BackEndSubnetNsgName = "backendnsg"; - final String frontEndVMName = azure.sdkContext().randomResourceName("fevm", 24); - final String backEndVMName = azure.sdkContext().randomResourceName("bevm", 24); - final String publicIPAddressLeafDnsForFrontEndVM = azure.sdkContext().randomResourceName("pip1", 24); + final String frontEndVMName = azureResourceManager.sdkContext().randomResourceName("fevm", 24); + final String backEndVMName = azureResourceManager.sdkContext().randomResourceName("bevm", 24); + final String publicIPAddressLeafDnsForFrontEndVM = azureResourceManager.sdkContext().randomResourceName("pip1", 24); final String userName = "tirekicker"; final String sshKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfSPC2K7LZcFKEO+/t3dzmQYtrJFZNxOsbVgOVKietqHyvmYGHEC0J2wPdAqQ/63g/hhAEFRoyehM+rbeDri4txB3YFfnOK58jqdkyXzupWqXzOrlKY4Wz9SKjjN765+dqUITjKRIaAip1Ri137szRg71WnrmdP3SphTRlCx1Bk2nXqWPsclbRDCiZeF8QOTi4JqbmJyK5+0UqhqYRduun8ylAwKKQJ1NJt85sYIHn9f1Rfr6Tq2zS0wZ7DHbZL+zB5rSlAr8QyUdg/GQD+cmSs6LvPJKL78d6hMGk84ARtFo4A79ovwX/Fj01znDQkU6nJildfkaolH2rWFG/qttD azjava@javalib.com"; - final String rgName = azure.sdkContext().randomResourceName("rgNEMV", 24); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgNEMV", 24); try { //============================================================ @@ -80,7 +80,7 @@ public static boolean runSample(final Azure azure) { final Map createdResources = new TreeMap<>(); Flux.merge( - azure.networkSecurityGroups().define(vnet1BackEndSubnetNsgName) + azureResourceManager.networkSecurityGroups().define(vnet1BackEndSubnetNsgName) .withRegion(Region.US_EAST) .withNewResourceGroup(rgName) .defineRule("DenyInternetInComing") @@ -104,7 +104,7 @@ public static boolean runSample(final Azure azure) { System.out.println("Creating virtual network #1..."); return Flux.merge( Flux.just(backEndNsg), - azure.networks().define(vnetName1) + azureResourceManager.networks().define(vnetName1) .withRegion(Region.US_EAST) .withExistingResourceGroup(rgName) .withAddressSpace("192.168.0.0/16") @@ -115,7 +115,7 @@ public static boolean runSample(final Azure azure) { .attach() .createAsync()); }), - azure.networkSecurityGroups().define(vnet1FrontEndSubnetNsgName) + azureResourceManager.networkSecurityGroups().define(vnet1FrontEndSubnetNsgName) .withRegion(Region.US_EAST) .withNewResourceGroup(rgName) .defineRule("AllowHttpInComing") @@ -189,7 +189,7 @@ public static boolean runSample(final Azure azure) { final Date t1 = new Date(); Flux.merge( - azure.virtualMachines().define(frontEndVMName) + azureResourceManager.virtualMachines().define(frontEndVMName) .withRegion(Region.US_EAST) .withExistingResourceGroup(rgName) .withExistingPrimaryNetwork(virtualNetwork1) @@ -201,7 +201,7 @@ public static boolean runSample(final Azure azure) { .withSsh(sshKey) .withSize(VirtualMachineSizeTypes.STANDARD_D3_V2) .createAsync(), - azure.virtualMachines().define(backEndVMName) + azureResourceManager.virtualMachines().define(backEndVMName) .withRegion(Region.US_EAST) .withExistingResourceGroup(rgName) .withExistingPrimaryNetwork(virtualNetwork1) @@ -213,7 +213,7 @@ public static boolean runSample(final Azure azure) { .withSsh(sshKey) .withSize(VirtualMachineSizeTypes.STANDARD_D3_V2) .createAsync(), - azure.networks().define(vnetName2) + azureResourceManager.networks().define(vnetName2) .withRegion(Region.US_EAST) .withNewResourceGroup(rgName) .createAsync()) @@ -242,7 +242,7 @@ public static boolean runSample(final Azure azure) { //============================================================ // List virtual networks and print details - for (Network network : azure.networks().listByResourceGroup(rgName)) { + for (Network network : azureResourceManager.networks().listByResourceGroup(rgName)) { Utils.print(network); } @@ -250,7 +250,7 @@ public static boolean runSample(final Azure azure) { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().deleteByNameAsync(rgName).block(); + azureResourceManager.resourceGroups().deleteByNameAsync(rgName).block(); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -275,16 +275,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVpnGatewayPoint2SiteConnection.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVpnGatewayPoint2SiteConnection.java index 4a6f8def3e9ab..a2adaca02f3a8 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVpnGatewayPoint2SiteConnection.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVpnGatewayPoint2SiteConnection.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.network.models.Network; import com.azure.resourcemanager.network.models.VirtualNetworkGateway; import com.azure.resourcemanager.network.models.VirtualNetworkGatewaySkuName; @@ -40,22 +40,22 @@ public final class ManageVpnGatewayPoint2SiteConnection { /** * Main function which runs the actual sample. * - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) throws IOException { + public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException { final String certPath = System.getenv("CERT_PATH"); final String clientCertThumbprint = System.getenv("CLIENT_CERT_THUMBPRINT"); final Region region = Region.US_WEST2; - final String rgName = azure.sdkContext().randomResourceName("rg", 20); - final String vnetName = azure.sdkContext().randomResourceName("vnet", 20); - final String vpnGatewayName = azure.sdkContext().randomResourceName("vngw", 20); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rg", 20); + final String vnetName = azureResourceManager.sdkContext().randomResourceName("vnet", 20); + final String vpnGatewayName = azureResourceManager.sdkContext().randomResourceName("vngw", 20); try { //============================================================ // Create virtual network with address spaces 192.168.0.0/16 and 10.254.0.0/16 and 3 subnets System.out.println("Creating virtual network..."); - Network network = azure.networks().define(vnetName) + Network network = azureResourceManager.networks().define(vnetName) .withRegion(region) .withNewResourceGroup(rgName) .withAddressSpace("192.168.0.0/16") @@ -71,7 +71,7 @@ public static boolean runSample(Azure azure) throws IOException { //============================================================ // Create virtual network gateway System.out.println("Creating virtual network gateway..."); - VirtualNetworkGateway vngw1 = azure.virtualNetworkGateways().define(vpnGatewayName) + VirtualNetworkGateway vngw1 = azureResourceManager.virtualNetworkGateways().define(vpnGatewayName) .withRegion(region) .withExistingResourceGroup(rgName) .withExistingNetwork(network) @@ -113,7 +113,7 @@ public static boolean runSample(Azure azure) throws IOException { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); } catch (Exception g) { @@ -137,16 +137,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVpnGatewaySite2SiteConnection.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVpnGatewaySite2SiteConnection.java index edf991a7658cc..63cf4653282f5 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVpnGatewaySite2SiteConnection.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVpnGatewaySite2SiteConnection.java @@ -6,7 +6,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.network.models.LocalNetworkGateway; import com.azure.resourcemanager.network.models.Network; import com.azure.resourcemanager.network.models.VirtualNetworkGateway; @@ -29,23 +29,23 @@ public final class ManageVpnGatewaySite2SiteConnection { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { + public static boolean runSample(AzureResourceManager azureResourceManager) { final Region region = Region.US_WEST2; - final String rgName = azure.sdkContext().randomResourceName("rg", 20); - final String vnetName = azure.sdkContext().randomResourceName("vnet", 20); - final String vpnGatewayName = azure.sdkContext().randomResourceName("vngw", 20); - final String localGatewayName = azure.sdkContext().randomResourceName("lngw", 20); - final String connectionName = azure.sdkContext().randomResourceName("con", 20); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rg", 20); + final String vnetName = azureResourceManager.sdkContext().randomResourceName("vnet", 20); + final String vpnGatewayName = azureResourceManager.sdkContext().randomResourceName("vngw", 20); + final String localGatewayName = azureResourceManager.sdkContext().randomResourceName("lngw", 20); + final String connectionName = azureResourceManager.sdkContext().randomResourceName("con", 20); try { //============================================================ // Create virtual network System.out.println("Creating virtual network..."); - Network network = azure.networks().define(vnetName) + Network network = azureResourceManager.networks().define(vnetName) .withRegion(region) .withNewResourceGroup(rgName) .withAddressSpace("10.11.0.0/16") @@ -58,7 +58,7 @@ public static boolean runSample(Azure azure) { //============================================================ // Create VPN gateway System.out.println("Creating virtual network gateway..."); - VirtualNetworkGateway vngw = azure.virtualNetworkGateways().define(vpnGatewayName) + VirtualNetworkGateway vngw = azureResourceManager.virtualNetworkGateways().define(vpnGatewayName) .withRegion(region) .withExistingResourceGroup(rgName) .withExistingNetwork(network) @@ -70,7 +70,7 @@ public static boolean runSample(Azure azure) { //============================================================ // Create local network gateway System.out.println("Creating virtual network gateway..."); - LocalNetworkGateway lngw = azure.localNetworkGateways().define(localGatewayName) + LocalNetworkGateway lngw = azureResourceManager.localNetworkGateways().define(localGatewayName) .withRegion(region) .withExistingResourceGroup(rgName) .withIPAddress("40.71.184.214") @@ -103,7 +103,7 @@ public static boolean runSample(Azure azure) { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); } catch (Exception g) { @@ -126,16 +126,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVpnGatewayVNet2VNetConnection.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVpnGatewayVNet2VNetConnection.java index 85674e5a5a77d..058a8f6a65eab 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVpnGatewayVNet2VNetConnection.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/ManageVpnGatewayVNet2VNetConnection.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.KnownLinuxVirtualMachineImage; import com.azure.resourcemanager.compute.models.VirtualMachine; import com.azure.resourcemanager.network.models.ConnectivityCheck; @@ -49,30 +49,30 @@ public final class ManageVpnGatewayVNet2VNetConnection { /** * Main function which runs the actual sample. * - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { + public static boolean runSample(AzureResourceManager azureResourceManager) { final Region region = Region.US_WEST2; - final String rgName = azure.sdkContext().randomResourceName("rg", 20); - final String vnetName = azure.sdkContext().randomResourceName("vnet", 20); - final String vnet2Name = azure.sdkContext().randomResourceName("vnet", 20); - final String vpnGatewayName = azure.sdkContext().randomResourceName("vngw", 20); - final String vpnGateway2Name = azure.sdkContext().randomResourceName("vngw2", 20); - final String connectionName = azure.sdkContext().randomResourceName("con", 20); - final String connection2Name = azure.sdkContext().randomResourceName("con2", 20); - final String nwName = azure.sdkContext().randomResourceName("nw", 20); - final String vm1Name = azure.sdkContext().randomResourceName("vm1", 20); - final String vm2Name = azure.sdkContext().randomResourceName("vm2", 20); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rg", 20); + final String vnetName = azureResourceManager.sdkContext().randomResourceName("vnet", 20); + final String vnet2Name = azureResourceManager.sdkContext().randomResourceName("vnet", 20); + final String vpnGatewayName = azureResourceManager.sdkContext().randomResourceName("vngw", 20); + final String vpnGateway2Name = azureResourceManager.sdkContext().randomResourceName("vngw2", 20); + final String connectionName = azureResourceManager.sdkContext().randomResourceName("con", 20); + final String connection2Name = azureResourceManager.sdkContext().randomResourceName("con2", 20); + final String nwName = azureResourceManager.sdkContext().randomResourceName("nw", 20); + final String vm1Name = azureResourceManager.sdkContext().randomResourceName("vm1", 20); + final String vm2Name = azureResourceManager.sdkContext().randomResourceName("vm2", 20); final String rootname = "tirekicker"; - final String password = azure.sdkContext().randomResourceName("pWd!", 15); + final String password = azureResourceManager.sdkContext().randomResourceName("pWd!", 15); final String storageContainerName = "results"; try { //============================================================ // Create 2 virtual networks with subnets and 2 virtual network gateways corresponding to each network System.out.println("Creating virtual network..."); - Network network1 = azure.networks().define(vnetName) + Network network1 = azureResourceManager.networks().define(vnetName) .withRegion(region) .withNewResourceGroup(rgName) .withAddressSpace("10.11.0.0/16") @@ -84,7 +84,7 @@ public static boolean runSample(Azure azure) { Utils.print(network1); System.out.println("Creating virtual network gateway..."); - VirtualNetworkGateway vngw1 = azure.virtualNetworkGateways().define(vpnGatewayName) + VirtualNetworkGateway vngw1 = azureResourceManager.virtualNetworkGateways().define(vpnGatewayName) .withRegion(region) .withExistingResourceGroup(rgName) .withExistingNetwork(network1) @@ -94,7 +94,7 @@ public static boolean runSample(Azure azure) { System.out.println("Created virtual network gateway"); System.out.println("Creating virtual network..."); - Network network2 = azure.networks().define(vnet2Name) + Network network2 = azureResourceManager.networks().define(vnet2Name) .withRegion(region) .withNewResourceGroup(rgName) .withAddressSpace("10.41.0.0/16") @@ -104,7 +104,7 @@ public static boolean runSample(Azure azure) { System.out.println("Created virtual network"); System.out.println("Creating virtual network gateway..."); - VirtualNetworkGateway vngw2 = azure.virtualNetworkGateways().define(vpnGateway2Name) + VirtualNetworkGateway vngw2 = azureResourceManager.virtualNetworkGateways().define(vpnGateway2Name) .withRegion(region) .withExistingResourceGroup(rgName) .withExistingNetwork(network2) @@ -126,12 +126,12 @@ public static boolean runSample(Azure azure) { // Troubleshoot the connection // create Network Watcher - NetworkWatcher nw = azure.networkWatchers().define(nwName) + NetworkWatcher nw = azureResourceManager.networkWatchers().define(nwName) .withRegion(region) .withExistingResourceGroup(rgName) .create(); // Create storage account to store troubleshooting information - StorageAccount storageAccount = azure.storageAccounts().define("sa" + azure.sdkContext().randomResourceName("", 8)) + StorageAccount storageAccount = azureResourceManager.storageAccounts().define("sa" + azureResourceManager.sdkContext().randomResourceName("", 8)) .withRegion(region) .withExistingResourceGroup(rgName) .create(); @@ -180,7 +180,7 @@ public static boolean runSample(Azure azure) { // Create 2 virtual machines, each one in its network and verify connectivity between them List> vmDefinitions = new ArrayList<>(); - vmDefinitions.add(azure.virtualMachines().define(vm1Name) + vmDefinitions.add(azureResourceManager.virtualMachines().define(vm1Name) .withRegion(region) .withExistingResourceGroup(rgName) .withExistingPrimaryNetwork(network1) @@ -196,7 +196,7 @@ public static boolean runSample(Azure azure) { .withType("NetworkWatcherAgentLinux") .withVersion("1.4") .attach()); - vmDefinitions.add(azure.virtualMachines().define(vm2Name) + vmDefinitions.add(azureResourceManager.virtualMachines().define(vm2Name) .withRegion(region) .withExistingResourceGroup(rgName) .withExistingPrimaryNetwork(network2) @@ -212,7 +212,7 @@ public static boolean runSample(Azure azure) { .withType("NetworkWatcherAgentLinux") .withVersion("1.4") .attach()); - CreatedResources createdVMs = azure.virtualMachines().create(vmDefinitions); + CreatedResources createdVMs = azureResourceManager.virtualMachines().create(vmDefinitions); VirtualMachine vm1 = createdVMs.get(vmDefinitions.get(0).key()); VirtualMachine vm2 = createdVMs.get(vmDefinitions.get(1).key()); @@ -226,7 +226,7 @@ public static boolean runSample(Azure azure) { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); } catch (Exception g) { @@ -250,16 +250,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/VerifyNetworkPeeringWithNetworkWatcher.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/VerifyNetworkPeeringWithNetworkWatcher.java index ed0d7d1638eac..2ceb6d8a0599e 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/VerifyNetworkPeeringWithNetworkWatcher.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/network/samples/VerifyNetworkPeeringWithNetworkWatcher.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.KnownLinuxVirtualMachineImage; import com.azure.resourcemanager.compute.models.VirtualMachine; import com.azure.resourcemanager.network.models.ConnectivityCheck; @@ -55,25 +55,25 @@ public final class VerifyNetworkPeeringWithNetworkWatcher { /** * Main function which runs the actual sample. * - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { + public static boolean runSample(AzureResourceManager azureResourceManager) { final Region region = Region.US_SOUTH_CENTRAL; - final String resourceGroupName = azure.sdkContext().randomResourceName("rg", 15); - final String vnetAName = azure.sdkContext().randomResourceName("net", 15); - final String vnetBName = azure.sdkContext().randomResourceName("net", 15); + final String resourceGroupName = azureResourceManager.sdkContext().randomResourceName("rg", 15); + final String vnetAName = azureResourceManager.sdkContext().randomResourceName("net", 15); + final String vnetBName = azureResourceManager.sdkContext().randomResourceName("net", 15); - final String[] vmNames = azure.sdkContext().randomResourceNames("vm", 15, 2); + final String[] vmNames = azureResourceManager.sdkContext().randomResourceNames("vm", 15, 2); final String[] vmIPAddresses = new String[]{ /* within subnetA */ "10.0.0.8", /* within subnetB */ "10.1.0.8" }; - final String peeringABName = azure.sdkContext().randomResourceName("peer", 15); + final String peeringABName = azureResourceManager.sdkContext().randomResourceName("peer", 15); final String rootname = "tirekicker"; - final String password = azure.sdkContext().randomResourceName("pWd!", 15); - final String networkWatcherName = azure.sdkContext().randomResourceName("netwch", 20); + final String password = azureResourceManager.sdkContext().randomResourceName("pWd!", 15); + final String networkWatcherName = azureResourceManager.sdkContext().randomResourceName("netwch", 20); try { @@ -81,13 +81,13 @@ public static boolean runSample(Azure azure) { // Define two virtual networks to peer and put the virtual machines in, at specific IP addresses List> networkDefinitions = new ArrayList<>(); - networkDefinitions.add(azure.networks().define(vnetAName) + networkDefinitions.add(azureResourceManager.networks().define(vnetAName) .withRegion(region) .withNewResourceGroup(resourceGroupName) .withAddressSpace("10.0.0.0/27") .withSubnet("subnetA", "10.0.0.0/27")); - networkDefinitions.add(azure.networks().define(vnetBName) + networkDefinitions.add(azureResourceManager.networks().define(vnetBName) .withRegion(region) .withNewResourceGroup(resourceGroupName) .withAddressSpace("10.1.0.0/27") @@ -99,7 +99,7 @@ public static boolean runSample(Azure azure) { List> vmDefinitions = new ArrayList<>(); for (int i = 0; i < networkDefinitions.size(); i++) { - vmDefinitions.add(azure.virtualMachines().define(vmNames[i]) + vmDefinitions.add(azureResourceManager.virtualMachines().define(vmNames[i]) .withRegion(region) .withExistingResourceGroup(resourceGroupName) .withNewPrimaryNetwork(networkDefinitions.get(i)) @@ -119,7 +119,7 @@ public static boolean runSample(Azure azure) { // Create the VMs in parallel for better performance System.out.println("Creating virtual machines and virtual networks..."); - CreatedResources createdVMs = azure.virtualMachines().create(vmDefinitions); + CreatedResources createdVMs = azureResourceManager.virtualMachines().create(vmDefinitions); VirtualMachine vmA = createdVMs.get(vmDefinitions.get(0).key()); VirtualMachine vmB = createdVMs.get(vmDefinitions.get(1).key()); System.out.println("Created the virtual machines and networks."); @@ -148,7 +148,7 @@ public static boolean runSample(Azure azure) { //============================================================= // Check connectivity between the two VMs/networks using Network Watcher - NetworkWatcher networkWatcher = azure.networkWatchers().define(networkWatcherName) + NetworkWatcher networkWatcher = azureResourceManager.networkWatchers().define(networkWatcherName) .withRegion(region) .withExistingResourceGroup(resourceGroupName) .create(); @@ -184,7 +184,7 @@ public static boolean runSample(Azure azure) { } finally { try { System.out.println("Deleting Resource Group: " + resourceGroupName); - azure.resourceGroups().beginDeleteByName(resourceGroupName); + azureResourceManager.resourceGroups().beginDeleteByName(resourceGroupName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); } catch (Exception g) { @@ -210,16 +210,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/privatedns/samples/ManagePrivateDns.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/privatedns/samples/ManagePrivateDns.java index bb961dc29b48d..2dce400ec49fe 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/privatedns/samples/ManagePrivateDns.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/privatedns/samples/ManagePrivateDns.java @@ -6,7 +6,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.InstanceViewStatus; import com.azure.resourcemanager.compute.models.KnownWindowsVirtualMachineImage; import com.azure.resourcemanager.compute.models.RunCommandResult; @@ -35,22 +35,22 @@ public class ManagePrivateDns { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String rgName = azure.sdkContext().randomResourceName("rgNEMV", 24); - final String vnetName = azure.sdkContext().randomResourceName("vnetwork-1", 24); - final String subnetName = azure.sdkContext().randomResourceName("subnet-1", 24); - final String linkName = azure.sdkContext().randomResourceName("vnlink-1", 24); - final String vm1Name = azure.sdkContext().randomResourceName("vm1-", 24); - final String vm2Name = azure.sdkContext().randomResourceName("vm2-", 24); - final String rsName = azure.sdkContext().randomResourceName("recordset1-", 24); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgNEMV", 24); + final String vnetName = azureResourceManager.sdkContext().randomResourceName("vnetwork-1", 24); + final String subnetName = azureResourceManager.sdkContext().randomResourceName("subnet-1", 24); + final String linkName = azureResourceManager.sdkContext().randomResourceName("vnlink-1", 24); + final String vm1Name = azureResourceManager.sdkContext().randomResourceName("vm1-", 24); + final String vm2Name = azureResourceManager.sdkContext().randomResourceName("vm2-", 24); + final String rsName = azureResourceManager.sdkContext().randomResourceName("recordset1-", 24); final String userName = "tirekicker"; final String password = Utils.password(); try { - ResourceGroup resourceGroup = azure.resourceGroups().define(rgName) + ResourceGroup resourceGroup = azureResourceManager.resourceGroups().define(rgName) .withRegion(Region.US_WEST) .create(); @@ -58,7 +58,7 @@ public static boolean runSample(Azure azure) { // Creates a private DNS Zone System.out.println("Creating private DNS zone " + CUSTOM_DOMAIN_NAME + "..."); - PrivateDnsZone privateDnsZone = azure.privateDnsZones().define(CUSTOM_DOMAIN_NAME) + PrivateDnsZone privateDnsZone = azureResourceManager.privateDnsZones().define(CUSTOM_DOMAIN_NAME) .withExistingResourceGroup(resourceGroup) .create(); @@ -69,7 +69,7 @@ public static boolean runSample(Azure azure) { // Creates a virtual network System.out.println("Creating virtual network " + vnetName + "..."); - Network network = azure.networks().define(vnetName) + Network network = azureResourceManager.networks().define(vnetName) .withRegion(Region.US_WEST) .withExistingResourceGroup(rgName) .withAddressSpace("10.2.0.0/16") @@ -96,7 +96,7 @@ public static boolean runSample(Azure azure) { // Creates test virtual machines System.out.println("Creating first virtual machine " + vm1Name + "..."); - VirtualMachine virtualMachine1 = azure.virtualMachines().define(vm1Name) + VirtualMachine virtualMachine1 = azureResourceManager.virtualMachines().define(vm1Name) .withRegion(Region.US_WEST) .withExistingResourceGroup(rgName) .withExistingPrimaryNetwork(network) @@ -115,7 +115,7 @@ public static boolean runSample(Azure azure) { System.out.println("Started first virtual machine " + virtualMachine1.name()); System.out.println("Creating second virtual machine " + vm2Name + "..."); - VirtualMachine virtualMachine2 = azure.virtualMachines().define(vm2Name) + VirtualMachine virtualMachine2 = azureResourceManager.virtualMachines().define(vm2Name) .withRegion(Region.US_WEST) .withExistingResourceGroup(rgName) .withExistingPrimaryNetwork(network) @@ -165,7 +165,7 @@ public static boolean runSample(Azure azure) { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -189,16 +189,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/rediscache/samples/ManageRedisCache.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/rediscache/samples/ManageRedisCache.java index 5f95fb1aebf07..993aa4a9b7668 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/rediscache/samples/ManageRedisCache.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/rediscache/samples/ManageRedisCache.java @@ -8,7 +8,7 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.redis.models.DayOfWeek; import com.azure.resourcemanager.redis.models.RebootType; import com.azure.resourcemanager.redis.models.RedisAccessKeys; @@ -41,21 +41,21 @@ public final class ManageRedisCache { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String redisCacheName1 = azure.sdkContext().randomResourceName("rc1", 20); - final String redisCacheName2 = azure.sdkContext().randomResourceName("rc2", 20); - final String redisCacheName3 = azure.sdkContext().randomResourceName("rc3", 20); - final String rgName = azure.sdkContext().randomResourceName("rgRCMC", 20); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String redisCacheName1 = azureResourceManager.sdkContext().randomResourceName("rc1", 20); + final String redisCacheName2 = azureResourceManager.sdkContext().randomResourceName("rc2", 20); + final String redisCacheName3 = azureResourceManager.sdkContext().randomResourceName("rc3", 20); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgRCMC", 20); try { // ============================================================ // Define a redis cache System.out.println("Creating a Redis Cache"); - Creatable redisCache1Definition = azure.redisCaches().define(redisCacheName1) + Creatable redisCache1Definition = azureResourceManager.redisCaches().define(redisCacheName1) .withRegion(Region.US_CENTRAL) .withNewResourceGroup(rgName) .withBasicSku(); @@ -63,13 +63,13 @@ public static boolean runSample(Azure azure) { // ============================================================ // Define two more Redis caches - Creatable redisCache2Definition = azure.redisCaches().define(redisCacheName2) + Creatable redisCache2Definition = azureResourceManager.redisCaches().define(redisCacheName2) .withRegion(Region.US_CENTRAL) .withNewResourceGroup(rgName) .withPremiumSku() .withShardCount(3); - Creatable redisCache3Definition = azure.redisCaches().define(redisCacheName3) + Creatable redisCache3Definition = azureResourceManager.redisCaches().define(redisCacheName3) .withRegion(Region.US_CENTRAL) .withNewResourceGroup(rgName) .withPremiumSku(2) @@ -81,7 +81,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating three Redis Caches in parallel... (this will take several minutes)"); @SuppressWarnings("unchecked") - CreatedResources createdCaches = azure.redisCaches().create( + CreatedResources createdCaches = azureResourceManager.redisCaches().create( redisCache1Definition, redisCache2Definition, redisCache3Definition); @@ -110,7 +110,7 @@ public static boolean runSample(Azure azure) { System.out.println("Listing Redis Caches"); - PagedIterable caches = azure.redisCaches().listByResourceGroup(rgName); + PagedIterable caches = azureResourceManager.redisCaches().listByResourceGroup(rgName); // Walk through all the caches for (RedisCache redis : caches) { @@ -144,14 +144,14 @@ public static boolean runSample(Azure azure) { System.out.println("Deleting a Redis Cache - " + redisCache1.name()); - azure.redisCaches().deleteById(redisCache1.id()); + azureResourceManager.redisCaches().deleteById(redisCache1.id()); System.out.println("Deleted Redis Cache"); return true; } finally { - if (azure.resourceGroups().getByName(rgName) != null) { + if (azureResourceManager.resourceGroups().getByName(rgName) != null) { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().deleteByName(rgName); + azureResourceManager.resourceGroups().deleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } else { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -173,16 +173,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployUsingARMTemplate.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployUsingARMTemplate.java index 2efe27db3a491..d67f18086b7d4 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployUsingARMTemplate.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployUsingARMTemplate.java @@ -8,7 +8,7 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.resources.models.Deployment; import com.azure.resourcemanager.resources.models.DeploymentMode; import com.azure.resourcemanager.resources.models.DeploymentOperation; @@ -31,14 +31,14 @@ public final class DeployUsingARMTemplate { /** * Main function which runs the actual sample. * - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) throws IOException, IllegalAccessException { - final String rgName = azure.sdkContext().randomResourceName("rgRSAT", 24); - final String deploymentName = azure.sdkContext().randomResourceName("dpRSAT", 24); + public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException, IllegalAccessException { + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgRSAT", 24); + final String deploymentName = azureResourceManager.sdkContext().randomResourceName("dpRSAT", 24); try { - String templateJson = DeployUsingARMTemplate.getTemplate(azure); + String templateJson = DeployUsingARMTemplate.getTemplate(azureResourceManager); //============================================================= @@ -46,7 +46,7 @@ public static boolean runSample(Azure azure) throws IOException, IllegalAccessEx System.out.println("Creating a resource group with name: " + rgName); - azure.resourceGroups().define(rgName) + azureResourceManager.resourceGroups().define(rgName) .withRegion(Region.US_EAST2) .create(); @@ -61,7 +61,7 @@ public static boolean runSample(Azure azure) throws IOException, IllegalAccessEx // System.out.println("Starting a deployment for an Azure App Service: " + deploymentName); - azure.deployments().define(deploymentName) + azureResourceManager.deployments().define(deploymentName) .withExistingResourceGroup(rgName) .withTemplate(templateJson) .withParameters("{}") @@ -72,7 +72,7 @@ public static boolean runSample(Azure azure) throws IOException, IllegalAccessEx return true; } finally { try { - Deployment deployment = azure.deployments() + Deployment deployment = azureResourceManager.deployments() .getByResourceGroup(rgName, deploymentName); PagedIterable operations = deployment.deploymentOperations() .list(); @@ -96,7 +96,7 @@ public static boolean runSample(Azure azure) throws IOException, IllegalAccessEx try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -123,22 +123,22 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); } } - private static String getTemplate(Azure azure) throws IllegalAccessException, JsonProcessingException, IOException { - final String hostingPlanName = azure.sdkContext().randomResourceName("hpRSAT", 24); - final String webappName = azure.sdkContext().randomResourceName("wnRSAT", 24); + private static String getTemplate(AzureResourceManager azureResourceManager) throws IllegalAccessException, JsonProcessingException, IOException { + final String hostingPlanName = azureResourceManager.sdkContext().randomResourceName("hpRSAT", 24); + final String webappName = azureResourceManager.sdkContext().randomResourceName("wnRSAT", 24); try (InputStream embeddedTemplate = DeployUsingARMTemplate.class.getResourceAsStream("/templateValue.json")) { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployUsingARMTemplateAsync.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployUsingARMTemplateAsync.java index ca2324003130f..ac57c9428d5d5 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployUsingARMTemplateAsync.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployUsingARMTemplateAsync.java @@ -9,7 +9,7 @@ import com.azure.core.management.AzureEnvironment; import com.azure.core.management.profile.AzureProfile; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.resourcemanager.resources.models.DeploymentMode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -34,12 +34,12 @@ public final class DeployUsingARMTemplateAsync { /** * Main function which runs the actual sample. * - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(final Azure azure) throws InterruptedException { - final String rgPrefix = azure.sdkContext().randomResourceName("rgJavaTest", 16); - final String deploymentPrefix = azure.sdkContext().randomResourceName("javaTest", 16); + public static boolean runSample(final AzureResourceManager azureResourceManager) throws InterruptedException { + final String rgPrefix = azureResourceManager.sdkContext().randomResourceName("rgJavaTest", 16); + final String deploymentPrefix = azureResourceManager.sdkContext().randomResourceName("javaTest", 16); final String sshKey = getSSHPublicKey(); final int numDeployments = 3; @@ -78,7 +78,7 @@ public static boolean runSample(final Azure azure) throws InterruptedException { } String deploymentName = deploymentPrefix + "-" + integer; deploymentList.add(deploymentName); - return azure.deployments() + return azureResourceManager.deployments() .define(deploymentName) .withNewResourceGroup(rgPrefix + "-" + integer, Region.US_SOUTH_CENTRAL) .withTemplateLink(templateUri, templateContentVersion) @@ -119,7 +119,7 @@ public static boolean runSample(final Azure azure) throws InterruptedException { for (int i = 1; i != numDeployments; i++) { String rgName = rgPrefix + "-" + i; System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } } catch (NullPointerException npe) { @@ -146,13 +146,13 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployUsingARMTemplateWithDeploymentOperations.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployUsingARMTemplateWithDeploymentOperations.java index 59f35bc9abc3e..85836d5cf5606 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployUsingARMTemplateWithDeploymentOperations.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployUsingARMTemplateWithDeploymentOperations.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.resources.models.Deployment; import com.azure.resourcemanager.resources.models.DeploymentMode; import com.azure.resourcemanager.resources.models.DeploymentOperation; @@ -36,13 +36,13 @@ public final class DeployUsingARMTemplateWithDeploymentOperations { /** * Main function which runs the actual sample. * - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @param defaultPollingInterval polling interval in seconds * @return true if sample runs successfully */ - public static boolean runSample(final Azure azure, int defaultPollingInterval) throws InterruptedException { - final String rgPrefix = azure.sdkContext().randomResourceName("rgJavaTest", 16); - final String deploymentPrefix = azure.sdkContext().randomResourceName("javaTest", 16); + public static boolean runSample(final AzureResourceManager azureResourceManager, int defaultPollingInterval) throws InterruptedException { + final String rgPrefix = azureResourceManager.sdkContext().randomResourceName("rgJavaTest", 16); + final String deploymentPrefix = azureResourceManager.sdkContext().randomResourceName("javaTest", 16); final String sshKey = getSSHPublicKey(); final int numDeployments = 3; final int pollingInterval = defaultPollingInterval < 0 ? 15 : defaultPollingInterval; // in seconds @@ -77,7 +77,7 @@ public static boolean runSample(final Azure azure, int defaultPollingInterval) t } else { params = parameters; } - return azure.deployments() + return azureResourceManager.deployments() .define(deploymentPrefix + "-" + integer) .withNewResourceGroup(rgPrefix + "-" + integer, Region.US_SOUTH_CENTRAL) .withTemplateLink(templateUri, templateContentVersion) @@ -155,7 +155,7 @@ public static boolean runSample(final Azure azure, int defaultPollingInterval) t for (int i = 1; i != numDeployments; i++) { String rgName = rgPrefix + "-" + i; System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } } catch (NullPointerException npe) { @@ -182,13 +182,13 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); - runSample(azure, -1); + runSample(azureResourceManager, -1); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployUsingARMTemplateWithProgress.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployUsingARMTemplateWithProgress.java index 6fa6dc2f62d37..9b51ca4f66e71 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployUsingARMTemplateWithProgress.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployUsingARMTemplateWithProgress.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.resources.models.Deployment; import com.azure.resourcemanager.resources.models.DeploymentMode; import com.azure.resourcemanager.resources.fluentcore.arm.Region; @@ -31,21 +31,21 @@ public final class DeployUsingARMTemplateWithProgress { /** * Main function which runs the actual sample. * - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) throws IOException, IllegalAccessException { - final String rgName = azure.sdkContext().randomResourceName("rgRSAP", 24); - final String deploymentName = azure.sdkContext().randomResourceName("dpRSAP", 24); + public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException, IllegalAccessException { + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgRSAP", 24); + final String deploymentName = azureResourceManager.sdkContext().randomResourceName("dpRSAP", 24); try { - String templateJson = DeployUsingARMTemplateWithProgress.getTemplate(azure); + String templateJson = DeployUsingARMTemplateWithProgress.getTemplate(azureResourceManager); //============================================================= // Create resource group. System.out.println("Creating a resource group with name: " + rgName); - azure.resourceGroups().define(rgName) + azureResourceManager.resourceGroups().define(rgName) .withRegion(Region.US_WEST) .create(); @@ -58,7 +58,7 @@ public static boolean runSample(Azure azure) throws IOException, IllegalAccessEx System.out.println("Starting a deployment for an Azure App Service: " + deploymentName); - azure.deployments().define(deploymentName) + azureResourceManager.deployments().define(deploymentName) .withExistingResourceGroup(rgName) .withTemplate(templateJson) .withParameters("{}") @@ -67,21 +67,21 @@ public static boolean runSample(Azure azure) throws IOException, IllegalAccessEx System.out.println("Started a deployment for an Azure App Service: " + deploymentName); - Deployment deployment = azure.deployments().getByResourceGroup(rgName, deploymentName); + Deployment deployment = azureResourceManager.deployments().getByResourceGroup(rgName, deploymentName); System.out.println("Current deployment status : " + deployment.provisioningState()); while (!(deployment.provisioningState().equalsIgnoreCase("Succeeded") || deployment.provisioningState().equalsIgnoreCase("Failed") || deployment.provisioningState().equalsIgnoreCase("Cancelled"))) { SdkContext.sleep(10000); - deployment = azure.deployments().getByResourceGroup(rgName, deploymentName); + deployment = azureResourceManager.deployments().getByResourceGroup(rgName, deploymentName); System.out.println("Current deployment status : " + deployment.provisioningState()); } return true; } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -107,13 +107,13 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); @@ -121,9 +121,9 @@ public static void main(String[] args) { } - private static String getTemplate(Azure azure) throws IllegalAccessException, JsonProcessingException, IOException { - final String hostingPlanName = azure.sdkContext().randomResourceName("hpRSAT", 24); - final String webappName = azure.sdkContext().randomResourceName("wnRSAT", 24); + private static String getTemplate(AzureResourceManager azureResourceManager) throws IllegalAccessException, JsonProcessingException, IOException { + final String hostingPlanName = azureResourceManager.sdkContext().randomResourceName("hpRSAT", 24); + final String webappName = azureResourceManager.sdkContext().randomResourceName("wnRSAT", 24); try (InputStream embeddedTemplate = DeployUsingARMTemplateWithProgress.class.getResourceAsStream("/templateValue.json")) { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployUsingARMTemplateWithTags.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployUsingARMTemplateWithTags.java index d9f3049b05b08..af356f7d4d6a8 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployUsingARMTemplateWithTags.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployUsingARMTemplateWithTags.java @@ -8,7 +8,7 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.resources.models.Deployment; import com.azure.resourcemanager.resources.models.DeploymentMode; import com.azure.resourcemanager.resources.models.DeploymentOperation; @@ -35,21 +35,21 @@ public final class DeployUsingARMTemplateWithTags { /** * Main function which runs the actual sample. * - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) throws IOException, IllegalAccessException { - final String rgName = azure.sdkContext().randomResourceName("rgRSAT", 24); - final String deploymentName = azure.sdkContext().randomResourceName("dpRSAT", 24); + public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException, IllegalAccessException { + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgRSAT", 24); + final String deploymentName = azureResourceManager.sdkContext().randomResourceName("dpRSAT", 24); try { - String templateJson = getTemplate(azure); + String templateJson = getTemplate(azureResourceManager); //============================================================= // Create resource group. System.out.println("Creating a resource group with name: " + rgName); - azure.resourceGroups().define(rgName) + azureResourceManager.resourceGroups().define(rgName) .withRegion(Region.US_WEST) .create(); @@ -62,7 +62,7 @@ public static boolean runSample(Azure azure) throws IOException, IllegalAccessEx System.out.println("Starting a deployment for an Azure App Service: " + deploymentName); - Deployment deployment = azure.deployments().define(deploymentName) + Deployment deployment = azureResourceManager.deployments().define(deploymentName) .withExistingResourceGroup(rgName) .withTemplate(templateJson) .withParameters("{}") @@ -77,7 +77,7 @@ public static boolean runSample(Azure azure) throws IOException, IllegalAccessEx // Getting created resources for (DeploymentOperation operation : operations) { if (operation.targetResource() != null) { - genericResources.add(azure.genericResources().getById(operation.targetResource().id())); + genericResources.add(azureResourceManager.genericResources().getById(operation.targetResource().id())); } } @@ -90,7 +90,7 @@ public static boolean runSample(Azure azure) throws IOException, IllegalAccessEx .apply(); } - PagedIterable listResources = azure.genericResources().listByTag(rgName, "label", "deploy1"); + PagedIterable listResources = azureResourceManager.genericResources().listByTag(rgName, "label", "deploy1"); System.out.println("Tagged resources for deployment: " + deploymentName); for (GenericResource genericResource : listResources) { System.out.println(genericResource.resourceProviderNamespace() + "/" + genericResource.resourceType() + ": " + genericResource.name()); @@ -100,7 +100,7 @@ public static boolean runSample(Azure azure) throws IOException, IllegalAccessEx try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -126,22 +126,22 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); } } - private static String getTemplate(Azure azure) throws IllegalAccessException, JsonProcessingException, IOException { - final String hostingPlanName = azure.sdkContext().randomResourceName("hpRSAT", 24); - final String webappName = azure.sdkContext().randomResourceName("wnRSAT", 24); + private static String getTemplate(AzureResourceManager azureResourceManager) throws IllegalAccessException, JsonProcessingException, IOException { + final String hostingPlanName = azureResourceManager.sdkContext().randomResourceName("hpRSAT", 24); + final String webappName = azureResourceManager.sdkContext().randomResourceName("wnRSAT", 24); try (InputStream embeddedTemplate = DeployUsingARMTemplateWithProgress.class.getResourceAsStream("/templateValue.json")) { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployVirtualMachineUsingARMTemplate.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployVirtualMachineUsingARMTemplate.java index b777b6524e414..99a3197d13cc5 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployVirtualMachineUsingARMTemplate.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/DeployVirtualMachineUsingARMTemplate.java @@ -6,7 +6,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.core.management.profile.AzureProfile; import com.azure.resourcemanager.resources.fluentcore.utils.SdkContext; @@ -29,14 +29,14 @@ public class DeployVirtualMachineUsingARMTemplate { /** * Main function which runs the actual sample. * - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) throws IOException, IllegalAccessException { - final String rgName = azure.sdkContext().randomResourceName("rgRSAT", 24); - final String deploymentName = azure.sdkContext().randomResourceName("dpRSAT", 24); + public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException, IllegalAccessException { + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgRSAT", 24); + final String deploymentName = azureResourceManager.sdkContext().randomResourceName("dpRSAT", 24); try { - String templateJson = DeployVirtualMachineUsingARMTemplate.getTemplate(azure); + String templateJson = DeployVirtualMachineUsingARMTemplate.getTemplate(azureResourceManager); System.out.println(templateJson); @@ -45,7 +45,7 @@ public static boolean runSample(Azure azure) throws IOException, IllegalAccessEx System.out.println("Creating a resource group with name: " + rgName); - azure.resourceGroups().define(rgName) + azureResourceManager.resourceGroups().define(rgName) .withRegion(Region.US_WEST) .create(); @@ -58,7 +58,7 @@ public static boolean runSample(Azure azure) throws IOException, IllegalAccessEx System.out.println("Starting a deployment for an Azure Virtual Machine with managed disks: " + deploymentName); - azure.deployments().define(deploymentName) + azureResourceManager.deployments().define(deploymentName) .withExistingResourceGroup(rgName) .withTemplate(templateJson) .withParameters("{}") @@ -66,14 +66,14 @@ public static boolean runSample(Azure azure) throws IOException, IllegalAccessEx .create(); System.out.println("Started a deployment for an Azure Virtual Machine with managed disks: " + deploymentName); - Deployment deployment = azure.deployments().getByResourceGroup(rgName, deploymentName); + Deployment deployment = azureResourceManager.deployments().getByResourceGroup(rgName, deploymentName); System.out.println("Current deployment status : " + deployment.provisioningState()); while (!(deployment.provisioningState().equalsIgnoreCase("Succeeded") || deployment.provisioningState().equalsIgnoreCase("Failed") || deployment.provisioningState().equalsIgnoreCase("Cancelled"))) { SdkContext.sleep(10000); - deployment = azure.deployments().getByResourceGroup(rgName, deploymentName); + deployment = azureResourceManager.deployments().getByResourceGroup(rgName, deploymentName); System.out.println("Current deployment status : " + deployment.provisioningState()); } return true; @@ -81,7 +81,7 @@ public static boolean runSample(Azure azure) throws IOException, IllegalAccessEx try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -107,23 +107,23 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); } } - private static String getTemplate(Azure azure) throws IllegalAccessException, JsonProcessingException, IOException { + private static String getTemplate(AzureResourceManager azureResourceManager) throws IllegalAccessException, JsonProcessingException, IOException { final String adminUsername = "tirekicker"; final String adminPassword = Utils.password(); - final String osDiskName = azure.sdkContext().randomResourceName("osdisk-", 24); + final String osDiskName = azureResourceManager.sdkContext().randomResourceName("osdisk-", 24); try (InputStream embeddedTemplate = DeployUsingARMTemplateWithProgress.class.getResourceAsStream("/virtualMachineWithManagedDisksTemplate.json")) { diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/ManageResource.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/ManageResource.java index 2be8c6836d377..82372afae009e 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/ManageResource.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/ManageResource.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.core.management.profile.AzureProfile; import com.azure.resourcemanager.storage.models.StorageAccount; @@ -27,13 +27,13 @@ public final class ManageResource { /** * Main function which runs the actual sample. * - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String rgName = azure.sdkContext().randomResourceName("rgRSMR", 24); - final String resourceName1 = azure.sdkContext().randomResourceName("rn1", 24); - final String resourceName2 = azure.sdkContext().randomResourceName("rn2", 24); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgRSMR", 24); + final String resourceName1 = azureResourceManager.sdkContext().randomResourceName("rn1", 24); + final String resourceName2 = azureResourceManager.sdkContext().randomResourceName("rn2", 24); try { @@ -42,7 +42,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating a resource group with name: " + rgName); - azure.resourceGroups().define(rgName) + azureResourceManager.resourceGroups().define(rgName) .withRegion(Region.US_WEST) .create(); @@ -52,7 +52,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating a storage account with name: " + resourceName1); - StorageAccount storageAccount = azure.storageAccounts().define(resourceName1) + StorageAccount storageAccount = azureResourceManager.storageAccounts().define(resourceName1) .withRegion(Region.US_WEST) .withExistingResourceGroup(rgName) .create(); @@ -77,7 +77,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating another storage account with name: " + resourceName2); - StorageAccount storageAccount2 = azure.storageAccounts().define(resourceName2) + StorageAccount storageAccount2 = azureResourceManager.storageAccounts().define(resourceName2) .withRegion(Region.US_WEST) .withExistingResourceGroup(rgName) .create(); @@ -90,7 +90,7 @@ public static boolean runSample(Azure azure) { System.out.println("Listing all storage accounts for resource group: " + rgName); - for (StorageAccount sAccount : azure.storageAccounts().list()) { + for (StorageAccount sAccount : azureResourceManager.storageAccounts().list()) { System.out.println("Storage account: " + sAccount.name()); } @@ -100,7 +100,7 @@ public static boolean runSample(Azure azure) { System.out.println("Deleting storage account: " + resourceName2); - azure.storageAccounts().deleteById(storageAccount2.id()); + azureResourceManager.storageAccounts().deleteById(storageAccount2.id()); System.out.println("Deleted storage account: " + resourceName2); return true; @@ -108,7 +108,7 @@ public static boolean runSample(Azure azure) { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -133,13 +133,13 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/ManageResourceGroup.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/ManageResourceGroup.java index c7e643082969c..0218b61523260 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/ManageResourceGroup.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/resources/samples/ManageResourceGroup.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.resources.models.ResourceGroup; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.core.management.profile.AzureProfile; @@ -25,14 +25,14 @@ public final class ManageResourceGroup { /** * Main function which runs the actual sample. * - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String rgName = azure.sdkContext().randomResourceName("rgRSMA", 24); - final String rgName2 = azure.sdkContext().randomResourceName("rgRSMA", 24); - final String resourceTagName = azure.sdkContext().randomResourceName("rgRSTN", 24); - final String resourceTagValue = azure.sdkContext().randomResourceName("rgRSTV", 24); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgRSMA", 24); + final String rgName2 = azureResourceManager.sdkContext().randomResourceName("rgRSMA", 24); + final String resourceTagName = azureResourceManager.sdkContext().randomResourceName("rgRSTN", 24); + final String resourceTagValue = azureResourceManager.sdkContext().randomResourceName("rgRSTV", 24); try { @@ -41,7 +41,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating a resource group with name: " + rgName); - ResourceGroup resourceGroup = azure.resourceGroups().define(rgName) + ResourceGroup resourceGroup = azureResourceManager.resourceGroups().define(rgName) .withRegion(Region.US_WEST) .create(); @@ -65,7 +65,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating another resource group with name: " + rgName2); - azure.resourceGroups().define(rgName2) + azureResourceManager.resourceGroups().define(rgName2) .withRegion(Region.US_WEST) .create(); @@ -77,7 +77,7 @@ public static boolean runSample(Azure azure) { System.out.println("Listing all resource groups"); - for (ResourceGroup rGroup : azure.resourceGroups().list()) { + for (ResourceGroup rGroup : azureResourceManager.resourceGroups().list()) { System.out.println("Resource group: " + rGroup.name()); } @@ -87,13 +87,13 @@ public static boolean runSample(Azure azure) { System.out.println("Deleting resource group: " + rgName2); - azure.resourceGroups().beginDeleteByName(rgName2); + azureResourceManager.resourceGroups().beginDeleteByName(rgName2); return true; } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); } catch (Exception g) { @@ -117,13 +117,13 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/samples/DockerUtils.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/samples/DockerUtils.java index 9bd00d78255d6..34a4e6d7ff887 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/samples/DockerUtils.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/samples/DockerUtils.java @@ -3,7 +3,7 @@ package com.azure.resourcemanager.samples; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.KnownLinuxVirtualMachineImage; import com.azure.resourcemanager.compute.models.VirtualMachine; import com.azure.resourcemanager.compute.models.VirtualMachineSizeTypes; @@ -82,7 +82,7 @@ public SSLContext getSSLContext() { /** * Instantiate a Docker client that will be used for Docker client related operations. * - * @param azure - instance of Azure + * @param azureResourceManager - instance of Azure * @param rgName - name of the Azure resource group to be used when creating a virtual machine * @param region - region to be used when creating a virtual machine * @param registryServerUrl - address of the private container registry @@ -91,7 +91,7 @@ public SSLContext getSSLContext() { * @return an instance of DockerClient * @throws Exception exception thrown */ - public static DockerClient createDockerClient(Azure azure, String rgName, Region region, + public static DockerClient createDockerClient(AzureResourceManager azureResourceManager, String rgName, Region region, String registryServerUrl, String username, String password) throws IOException { final String envDockerHost = System.getenv("DOCKER_HOST"); final String envDockerCertPath = System.getenv("DOCKER_CERT_PATH"); @@ -101,7 +101,7 @@ public static DockerClient createDockerClient(Azure azure, String rgName, Region if (envDockerHost == null || envDockerHost.isEmpty()) { // Could not find a Docker environment; presume that there is no local Docker engine running and // attempt to configure a Docker engine running inside a new Azure virtual machine - dockerClient = fromNewDockerVM(azure, rgName, region, registryServerUrl, username, password); + dockerClient = fromNewDockerVM(azureResourceManager, rgName, region, registryServerUrl, username, password); } else { dockerHostUrl = envDockerHost; System.out.println("Using local settings to connect to a Docker service: " + dockerHostUrl); @@ -178,7 +178,7 @@ public static DockerClientConfig createDockerClientConfig(String host, String re /** * It creates a new Azure virtual machine and it instantiate a Java Docker client. * - * @param azure - instance of Azure + * @param azureResourceManager - instance of Azure * @param rgName - name of the Azure resource group to be used when creating a virtual machine * @param region - region to be used when creating a virtual machine * @param registryServerUrl - address of the private container registry @@ -187,10 +187,10 @@ public static DockerClientConfig createDockerClientConfig(String host, String re * @return an instance of DockerClient * @throws Exception exception thrown */ - public static DockerClient fromNewDockerVM(Azure azure, String rgName, Region region, + public static DockerClient fromNewDockerVM(AzureResourceManager azureResourceManager, String rgName, Region region, String registryServerUrl, String username, String password) { - final String dockerVMName = azure.sdkContext().randomResourceName("dockervm", 15); - final String publicIPDnsLabel = azure.sdkContext().randomResourceName("pip", 10); + final String dockerVMName = azureResourceManager.sdkContext().randomResourceName("dockervm", 15); + final String publicIPDnsLabel = azureResourceManager.sdkContext().randomResourceName("pip", 10); final String vmUserName = "dockerUser"; final String vmPassword = Utils.password(); @@ -200,7 +200,7 @@ public static DockerClient fromNewDockerVM(Azure azure, String rgName, Region re Date t1 = new Date(); - VirtualMachine dockerVM = azure.virtualMachines().define(dockerVMName) + VirtualMachine dockerVM = azureResourceManager.virtualMachines().define(dockerVMName) .withRegion(region) .withExistingResourceGroup(rgName) .withNewPrimaryNetwork("10.0.0.0/28") diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/servicebus/samples/ServiceBusPublishSubscribeAdvanceFeatures.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/servicebus/samples/ServiceBusPublishSubscribeAdvanceFeatures.java index 19b4198bb6e5e..89491a69351f3 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/servicebus/samples/ServiceBusPublishSubscribeAdvanceFeatures.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/servicebus/samples/ServiceBusPublishSubscribeAdvanceFeatures.java @@ -12,7 +12,7 @@ import com.azure.messaging.servicebus.ServiceBusClientBuilder; import com.azure.messaging.servicebus.ServiceBusMessage; import com.azure.messaging.servicebus.ServiceBusSenderClient; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.resourcemanager.samples.Utils; import com.azure.resourcemanager.servicebus.models.AuthorizationKeys; @@ -41,18 +41,18 @@ public final class ServiceBusPublishSubscribeAdvanceFeatures { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { + public static boolean runSample(AzureResourceManager azureResourceManager) { // New resources - final String rgName = azure.sdkContext().randomResourceName("rgSB04_", 24); - final String namespaceName = azure.sdkContext().randomResourceName("namespace", 20); - final String topic1Name = azure.sdkContext().randomResourceName("topic1_", 24); - final String topic2Name = azure.sdkContext().randomResourceName("topic2_", 24); - final String subscription1Name = azure.sdkContext().randomResourceName("subs_", 24); - final String subscription2Name = azure.sdkContext().randomResourceName("subs_", 24); - final String subscription3Name = azure.sdkContext().randomResourceName("subs_", 24); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgSB04_", 24); + final String namespaceName = azureResourceManager.sdkContext().randomResourceName("namespace", 20); + final String topic1Name = azureResourceManager.sdkContext().randomResourceName("topic1_", 24); + final String topic2Name = azureResourceManager.sdkContext().randomResourceName("topic2_", 24); + final String subscription1Name = azureResourceManager.sdkContext().randomResourceName("subs_", 24); + final String subscription2Name = azureResourceManager.sdkContext().randomResourceName("subs_", 24); + final String subscription3Name = azureResourceManager.sdkContext().randomResourceName("subs_", 24); final String sendRuleName = "SendRule"; final String manageRuleName = "ManageRule"; @@ -62,7 +62,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating name space " + namespaceName + " in resource group " + rgName + "..."); - ServiceBusNamespace serviceBusNamespace = azure.serviceBusNamespaces() + ServiceBusNamespace serviceBusNamespace = azureResourceManager.serviceBusNamespaces() .define(namespaceName) .withRegion(Region.US_WEST) .withNewResourceGroup(rgName) @@ -181,14 +181,14 @@ public static boolean runSample(Azure azure) { System.out.println("Deleting namespace " + namespaceName + "..."); // This will delete the namespace and topic within it. - azure.serviceBusNamespaces().deleteById(serviceBusNamespace.id()); + azureResourceManager.serviceBusNamespaces().deleteById(serviceBusNamespace.id()); System.out.println("Deleted namespace " + namespaceName + "..."); return true; } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -210,16 +210,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/servicebus/samples/ServiceBusPublishSubscribeBasic.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/servicebus/samples/ServiceBusPublishSubscribeBasic.java index 296c89040a258..2cd3435203456 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/servicebus/samples/ServiceBusPublishSubscribeBasic.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/servicebus/samples/ServiceBusPublishSubscribeBasic.java @@ -12,7 +12,7 @@ import com.azure.messaging.servicebus.ServiceBusClientBuilder; import com.azure.messaging.servicebus.ServiceBusMessage; import com.azure.messaging.servicebus.ServiceBusSenderClient; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.resourcemanager.samples.Utils; import com.azure.resourcemanager.servicebus.models.AuthorizationKeys; @@ -43,16 +43,16 @@ public final class ServiceBusPublishSubscribeBasic { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { + public static boolean runSample(AzureResourceManager azureResourceManager) { // New resources - final String rgName = azure.sdkContext().randomResourceName("rgSB02_", 24); - final String namespaceName = azure.sdkContext().randomResourceName("namespace", 20); - final String topicName = azure.sdkContext().randomResourceName("topic_", 24); - final String subscription1Name = azure.sdkContext().randomResourceName("sub1_", 24); - final String subscription2Name = azure.sdkContext().randomResourceName("sub2_", 24); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgSB02_", 24); + final String namespaceName = azureResourceManager.sdkContext().randomResourceName("namespace", 20); + final String topicName = azureResourceManager.sdkContext().randomResourceName("topic_", 24); + final String subscription1Name = azureResourceManager.sdkContext().randomResourceName("sub1_", 24); + final String subscription2Name = azureResourceManager.sdkContext().randomResourceName("sub2_", 24); try { //============================================================ @@ -60,7 +60,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating name space " + namespaceName + " in resource group " + rgName + "..."); - ServiceBusNamespace serviceBusNamespace = azure.serviceBusNamespaces() + ServiceBusNamespace serviceBusNamespace = azureResourceManager.serviceBusNamespaces() .define(namespaceName) .withRegion(Region.US_WEST) .withNewResourceGroup(rgName) @@ -165,14 +165,14 @@ public static boolean runSample(Azure azure) { System.out.println("Deleting namespace " + namespaceName + "..."); // This will delete the namespace and queue within it. - azure.serviceBusNamespaces().deleteById(serviceBusNamespace.id()); + azureResourceManager.serviceBusNamespaces().deleteById(serviceBusNamespace.id()); System.out.println("Deleted namespace " + namespaceName + "..."); return true; } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -194,16 +194,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/servicebus/samples/ServiceBusQueueAdvanceFeatures.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/servicebus/samples/ServiceBusQueueAdvanceFeatures.java index cf07084e74070..69cf94581bdb9 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/servicebus/samples/ServiceBusQueueAdvanceFeatures.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/servicebus/samples/ServiceBusQueueAdvanceFeatures.java @@ -12,7 +12,7 @@ import com.azure.messaging.servicebus.ServiceBusClientBuilder; import com.azure.messaging.servicebus.ServiceBusMessage; import com.azure.messaging.servicebus.ServiceBusSenderClient; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.resourcemanager.samples.Utils; import com.azure.resourcemanager.servicebus.models.AuthorizationKeys; @@ -43,15 +43,15 @@ public final class ServiceBusQueueAdvanceFeatures { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { + public static boolean runSample(AzureResourceManager azureResourceManager) { // New resources - final String rgName = azure.sdkContext().randomResourceName("rgSB04_", 24); - final String namespaceName = azure.sdkContext().randomResourceName("namespace", 20); - final String queue1Name = azure.sdkContext().randomResourceName("queue1_", 24); - final String queue2Name = azure.sdkContext().randomResourceName("queue2_", 24); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgSB04_", 24); + final String namespaceName = azureResourceManager.sdkContext().randomResourceName("namespace", 20); + final String queue1Name = azureResourceManager.sdkContext().randomResourceName("queue1_", 24); + final String queue2Name = azureResourceManager.sdkContext().randomResourceName("queue2_", 24); final String sendRuleName = "SendRule"; try { @@ -60,7 +60,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating name space " + namespaceName + " in resource group " + rgName + "..."); - ServiceBusNamespace serviceBusNamespace = azure.serviceBusNamespaces() + ServiceBusNamespace serviceBusNamespace = azureResourceManager.serviceBusNamespaces() .define(namespaceName) .withRegion(Region.US_WEST) .withNewResourceGroup(rgName) @@ -157,14 +157,14 @@ public static boolean runSample(Azure azure) { System.out.println("Deleting namespace " + namespaceName + "..."); // This will delete the namespace and queue within it. - azure.serviceBusNamespaces().deleteById(serviceBusNamespace.id()); + azureResourceManager.serviceBusNamespaces().deleteById(serviceBusNamespace.id()); System.out.println("Deleted namespace " + namespaceName + "..."); return true; } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -186,16 +186,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/servicebus/samples/ServiceBusQueueBasic.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/servicebus/samples/ServiceBusQueueBasic.java index 0adb992774dac..365a5a93c7bc6 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/servicebus/samples/ServiceBusQueueBasic.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/servicebus/samples/ServiceBusQueueBasic.java @@ -12,7 +12,7 @@ import com.azure.messaging.servicebus.ServiceBusClientBuilder; import com.azure.messaging.servicebus.ServiceBusMessage; import com.azure.messaging.servicebus.ServiceBusSenderClient; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.resourcemanager.samples.Utils; import com.azure.resourcemanager.servicebus.models.AuthorizationKeys; @@ -41,15 +41,15 @@ public final class ServiceBusQueueBasic { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { + public static boolean runSample(AzureResourceManager azureResourceManager) { // New resources - final String rgName = azure.sdkContext().randomResourceName("rgSB01_", 24); - final String namespaceName = azure.sdkContext().randomResourceName("namespace", 20); - final String queue1Name = azure.sdkContext().randomResourceName("queue1_", 24); - final String queue2Name = azure.sdkContext().randomResourceName("queue2_", 24); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgSB01_", 24); + final String namespaceName = azureResourceManager.sdkContext().randomResourceName("namespace", 20); + final String queue1Name = azureResourceManager.sdkContext().randomResourceName("queue1_", 24); + final String queue2Name = azureResourceManager.sdkContext().randomResourceName("queue2_", 24); try { //============================================================ @@ -57,7 +57,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating name space " + namespaceName + " in resource group " + rgName + "..."); - ServiceBusNamespace serviceBusNamespace = azure.serviceBusNamespaces() + ServiceBusNamespace serviceBusNamespace = azureResourceManager.serviceBusNamespaces() .define(namespaceName) .withRegion(Region.US_WEST) .withNewResourceGroup(rgName) @@ -111,7 +111,7 @@ public static boolean runSample(Azure azure) { System.out.println("List of namespaces in resource group " + rgName + "..."); - for (ServiceBusNamespace serviceBusNamespace1 : azure.serviceBusNamespaces().listByResourceGroup(rgName)) { + for (ServiceBusNamespace serviceBusNamespace1 : azureResourceManager.serviceBusNamespaces().listByResourceGroup(rgName)) { Utils.print(serviceBusNamespace1); } @@ -161,14 +161,14 @@ public static boolean runSample(Azure azure) { System.out.println("Deleting namespace " + namespaceName + "..."); // This will delete the namespace and queue within it. - azure.serviceBusNamespaces().deleteById(serviceBusNamespace.id()); + azureResourceManager.serviceBusNamespaces().deleteById(serviceBusNamespace.id()); System.out.println("Deleted namespace " + namespaceName + "..."); return true; } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -190,16 +190,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/servicebus/samples/ServiceBusWithClaimBasedAuthorization.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/servicebus/samples/ServiceBusWithClaimBasedAuthorization.java index de5bbf11356e4..c41b2ff0d75ce 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/servicebus/samples/ServiceBusWithClaimBasedAuthorization.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/servicebus/samples/ServiceBusWithClaimBasedAuthorization.java @@ -11,7 +11,7 @@ import com.azure.messaging.servicebus.ServiceBusClientBuilder; import com.azure.messaging.servicebus.ServiceBusMessage; import com.azure.messaging.servicebus.ServiceBusSenderClient; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.resourcemanager.samples.Utils; import com.azure.resourcemanager.servicebus.models.AuthorizationKeys; @@ -37,17 +37,17 @@ public final class ServiceBusWithClaimBasedAuthorization { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { + public static boolean runSample(AzureResourceManager azureResourceManager) { // New resources - final String rgName = azure.sdkContext().randomResourceName("rgSB03_", 24); - final String namespaceName = azure.sdkContext().randomResourceName("namespace", 20); - final String queueName = azure.sdkContext().randomResourceName("queue1_", 24); - final String topicName = azure.sdkContext().randomResourceName("topic_", 24); - final String subscription1Name = azure.sdkContext().randomResourceName("sub1_", 24); - final String subscription2Name = azure.sdkContext().randomResourceName("sub2_", 24); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgSB03_", 24); + final String namespaceName = azureResourceManager.sdkContext().randomResourceName("namespace", 20); + final String queueName = azureResourceManager.sdkContext().randomResourceName("queue1_", 24); + final String topicName = azureResourceManager.sdkContext().randomResourceName("topic_", 24); + final String subscription1Name = azureResourceManager.sdkContext().randomResourceName("sub1_", 24); + final String subscription2Name = azureResourceManager.sdkContext().randomResourceName("sub2_", 24); try { //============================================================ @@ -55,7 +55,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating name space " + namespaceName + " along with a queue " + queueName + " and a topic " + topicName + " in resource group " + rgName + "..."); - ServiceBusNamespace serviceBusNamespace = azure.serviceBusNamespaces() + ServiceBusNamespace serviceBusNamespace = azureResourceManager.serviceBusNamespaces() .define(namespaceName) .withRegion(Region.US_WEST) .withNewResourceGroup(rgName) @@ -121,14 +121,14 @@ public static boolean runSample(Azure azure) { // Delete a namespace System.out.println("Deleting namespace " + namespaceName + " [topic, queues and subscription will delete along with that]..."); // This will delete the namespace and queue within it. - azure.serviceBusNamespaces().deleteById(serviceBusNamespace.id()); + azureResourceManager.serviceBusNamespaces().deleteById(serviceBusNamespace.id()); System.out.println("Deleted namespace " + namespaceName + "..."); return true; } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -150,16 +150,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/GettingSqlServerMetrics.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/GettingSqlServerMetrics.java index eab8aba60bae3..13d8878e63b85 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/GettingSqlServerMetrics.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/GettingSqlServerMetrics.java @@ -8,7 +8,7 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.monitor.fluent.inner.MetadataValueInner; import com.azure.resourcemanager.monitor.models.Metric; import com.azure.resourcemanager.monitor.models.MetricCollection; @@ -48,14 +48,14 @@ public class GettingSqlServerMetrics { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) throws ClassNotFoundException, SQLException { - final String sqlServerName = azure.sdkContext().randomResourceName("sqltest", 20); + public static boolean runSample(AzureResourceManager azureResourceManager) throws ClassNotFoundException, SQLException { + final String sqlServerName = azureResourceManager.sdkContext().randomResourceName("sqltest", 20); final String dbName = "dbSample"; final String epName = "epSample"; - final String rgName = azure.sdkContext().randomResourceName("rgsql", 20); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgsql", 20); final String administratorLogin = "sqladmin3423"; final String administratorPassword = Utils.password(); OffsetDateTime startTime = OffsetDateTime.now().minusDays(1); @@ -68,7 +68,7 @@ public static boolean runSample(Azure azure) throws ClassNotFoundException, SQLE // Create a SQL Server. System.out.println("Creating a SQL server to be used for getting various metrics"); - SqlServer sqlServer = azure.sqlServers().define(sqlServerName) + SqlServer sqlServer = azureResourceManager.sqlServers().define(sqlServerName) .withRegion(Region.US_EAST) .withNewResourceGroup(rgName) .withAdministratorLogin(administratorLogin) @@ -172,7 +172,7 @@ public static boolean runSample(Azure azure) throws ClassNotFoundException, SQLE System.out.println("Listing the SQL subscription usage metrics for the current selected region"); - List subscriptionUsageMetrics = azure.sqlServers().listUsageByRegion(Region.US_EAST); + List subscriptionUsageMetrics = azureResourceManager.sqlServers().listUsageByRegion(Region.US_EAST); for (SqlSubscriptionUsageMetric usageMetric : subscriptionUsageMetrics) { Utils.print(usageMetric); } @@ -216,7 +216,7 @@ public static boolean runSample(Azure azure) throws ClassNotFoundException, SQLE // Use Monitor Service to list the SQL server metrics. System.out.println("Using Monitor Service to list the SQL server metrics"); - PagedIterable metricDefinitions = azure.metricDefinitions().listByResource(sqlServer.id()); + PagedIterable metricDefinitions = azureResourceManager.metricDefinitions().listByResource(sqlServer.id()); for (MetricDefinition metricDefinition : metricDefinitions) { // find metric definition for "DTU used" and "Storage used" @@ -265,7 +265,7 @@ public static boolean runSample(Azure azure) throws ClassNotFoundException, SQLE // ============================================================ // Use Monitor Service to list the SQL Database metrics. System.out.println("Using Monitor Service to list the SQL Database metrics"); - metricDefinitions = azure.metricDefinitions().listByResource(db.id()); + metricDefinitions = azureResourceManager.metricDefinitions().listByResource(db.id()); for (MetricDefinition metricDefinition : metricDefinitions) { // find metric definition for Transactions @@ -311,12 +311,12 @@ public static boolean runSample(Azure azure) throws ClassNotFoundException, SQLE // Delete the SQL Servers. System.out.println("Deleting the Sql Server"); - azure.sqlServers().deleteById(sqlServer.id()); + azureResourceManager.sqlServers().deleteById(sqlServer.id()); return true; } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (Exception e) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -335,16 +335,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlDatabase.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlDatabase.java index fc25c61ecaa51..018481452919a 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlDatabase.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlDatabase.java @@ -8,7 +8,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.core.management.profile.AzureProfile; import com.azure.resourcemanager.samples.Utils; @@ -34,12 +34,12 @@ public final class ManageSqlDatabase { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String sqlServerName = azure.sdkContext().randomResourceName("sqlserver", 20); - final String rgName = azure.sdkContext().randomResourceName("rgRSDSI", 20); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String sqlServerName = azureResourceManager.sdkContext().randomResourceName("sqlserver", 20); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgRSDSI", 20); final String administratorLogin = "sqladmin3423"; final String administratorPassword = Utils.password(); final String firewallRuleIPAddress = "10.0.0.1"; @@ -50,7 +50,7 @@ public static boolean runSample(Azure azure) { // ============================================================ // Create a SQL Server, with 2 firewall rules. - SqlServer sqlServer = azure.sqlServers().define(sqlServerName) + SqlServer sqlServer = azureResourceManager.sqlServers().define(sqlServerName) .withRegion(Region.US_EAST) .withNewResourceGroup(rgName) .withAdministratorLogin(administratorLogin) @@ -111,12 +111,12 @@ public static boolean runSample(Azure azure) { // Delete the SQL Server. System.out.println("Deleting a Sql Server"); - azure.sqlServers().deleteById(sqlServer.id()); + azureResourceManager.sqlServers().deleteById(sqlServer.id()); return true; } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (Exception e) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -135,16 +135,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlDatabaseInElasticPool.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlDatabaseInElasticPool.java index bc971d7b1a30d..312f35eba8558 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlDatabaseInElasticPool.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlDatabaseInElasticPool.java @@ -8,7 +8,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.core.management.profile.AzureProfile; import com.azure.resourcemanager.samples.Utils; @@ -37,12 +37,12 @@ public final class ManageSqlDatabaseInElasticPool { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String sqlServerName = azure.sdkContext().randomResourceName("sqlserver", 20); - final String rgName = azure.sdkContext().randomResourceName("rgRSSDEP", 20); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String sqlServerName = azureResourceManager.sdkContext().randomResourceName("sqlserver", 20); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgRSSDEP", 20); final String elasticPoolName = "myElasticPool"; final String elasticPool2Name = "secondElasticPool"; final String administratorLogin = "sqladmin3423"; @@ -56,7 +56,7 @@ public static boolean runSample(Azure azure) { // ============================================================ // Create a SQL Server, with 2 firewall rules. - SqlServer sqlServer = azure.sqlServers().define(sqlServerName) + SqlServer sqlServer = azureResourceManager.sqlServers().define(sqlServerName) .withRegion(Region.US_EAST) .withNewResourceGroup(rgName) .withAdministratorLogin(administratorLogin) @@ -198,12 +198,12 @@ public static boolean runSample(Azure azure) { // ============================================================ // Delete the SQL Server. System.out.println("Deleting a Sql Server"); - azure.sqlServers().deleteById(sqlServer.id()); + azureResourceManager.sqlServers().deleteById(sqlServer.id()); return true; } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (Exception e) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -222,16 +222,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlDatabasesAcrossDifferentDataCenters.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlDatabasesAcrossDifferentDataCenters.java index d9d6b6956959f..1f25194297948 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlDatabasesAcrossDifferentDataCenters.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlDatabasesAcrossDifferentDataCenters.java @@ -8,7 +8,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.KnownWindowsVirtualMachineImage; import com.azure.resourcemanager.compute.models.VirtualMachine; import com.azure.resourcemanager.compute.models.VirtualMachineSizeTypes; @@ -45,16 +45,16 @@ public final class ManageSqlDatabasesAcrossDifferentDataCenters { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String sqlServerName = azure.sdkContext().randomResourceName("sqlserver", 20); - final String rgName = azure.sdkContext().randomResourceName("rgRSSDRE", 20); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String sqlServerName = azureResourceManager.sdkContext().randomResourceName("sqlserver", 20); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgRSSDRE", 20); final String administratorLogin = "sqladmin3423"; final String administratorPassword = Utils.password(); - final String slaveSqlServer1Name = azure.sdkContext().randomResourceName("slave1sql", 20); - final String slaveSqlServer2Name = azure.sdkContext().randomResourceName("slave2sql", 20); + final String slaveSqlServer1Name = azureResourceManager.sdkContext().randomResourceName("slave1sql", 20); + final String slaveSqlServer2Name = azureResourceManager.sdkContext().randomResourceName("slave2sql", 20); final String databaseName = "mydatabase"; final String networkPrefix = "network"; final String virtualMachinePrefix = "samplevm"; @@ -62,7 +62,7 @@ public static boolean runSample(Azure azure) { // ============================================================ // Create a SQL Server, with 2 firewall rules. - SqlServer masterSqlServer = azure.sqlServers().define(sqlServerName) + SqlServer masterSqlServer = azureResourceManager.sqlServers().define(sqlServerName) .withRegion(Region.US_EAST) .withNewResourceGroup(rgName) .withAdministratorLogin(administratorLogin) @@ -84,7 +84,7 @@ public static boolean runSample(Azure azure) { // Create secondary SQLServer/Database for the master database System.out.println("Creating server in secondary location for master SQL Server"); - SqlServer sqlServerInSecondaryLocation = azure.sqlServers() + SqlServer sqlServerInSecondaryLocation = azureResourceManager.sqlServers() .define(slaveSqlServer1Name) .withRegion(Region.US_EAST2) .withExistingResourceGroup(rgName) @@ -103,7 +103,7 @@ public static boolean runSample(Azure azure) { // ============================================================ // Create another slave SQLServer/Database for the master database System.out.println("Creating server in another location for master SQL Server"); - SqlServer sqlServerInEurope = azure.sqlServers() + SqlServer sqlServerInEurope = azureResourceManager.sqlServers() .define(slaveSqlServer2Name) .withRegion(Region.US_SOUTH_CENTRAL) .withExistingResourceGroup(rgName) @@ -134,11 +134,11 @@ public static boolean runSample(Azure azure) { System.out.println("Creating virtual networks in different regions."); for (Region region: regions) { - creatableNetworks.add(azure.networks().define(azure.sdkContext().randomResourceName(networkPrefix, 20)) + creatableNetworks.add(azureResourceManager.networks().define(azureResourceManager.sdkContext().randomResourceName(networkPrefix, 20)) .withRegion(region) .withExistingResourceGroup(rgName)); } - Collection networks = azure.networks().create(creatableNetworks).values(); + Collection networks = azureResourceManager.networks().create(creatableNetworks).values(); // ============================================================ // Create virtual machines attached to different virtual networks created above. @@ -146,12 +146,12 @@ public static boolean runSample(Azure azure) { System.out.println("Creating virtual machines in different regions."); for (Network network: networks) { - String virtualMachineName = azure.sdkContext().randomResourceName(virtualMachinePrefix, 20); - Creatable publicIPAddressCreatable = azure.publicIpAddresses().define(virtualMachineName) + String virtualMachineName = azureResourceManager.sdkContext().randomResourceName(virtualMachinePrefix, 20); + Creatable publicIPAddressCreatable = azureResourceManager.publicIpAddresses().define(virtualMachineName) .withRegion(network.region()) .withExistingResourceGroup(rgName) .withLeafDomainLabel(virtualMachineName); - creatableVirtualMachines.add(azure.virtualMachines().define(virtualMachineName) + creatableVirtualMachines.add(azureResourceManager.virtualMachines().define(virtualMachineName) .withRegion(network.region()) .withExistingResourceGroup(rgName) .withExistingPrimaryNetwork(network) @@ -165,7 +165,7 @@ public static boolean runSample(Azure azure) { } HashMap ipAddresses = new HashMap<>(); - for (VirtualMachine virtualMachine: azure.virtualMachines().create(creatableVirtualMachines).values()) { + for (VirtualMachine virtualMachine: azureResourceManager.virtualMachines().create(creatableVirtualMachines).values()) { ipAddresses.put(virtualMachine.name(), virtualMachine.getPrimaryPublicIPAddress().ipAddress()); } @@ -194,13 +194,13 @@ public static boolean runSample(Azure azure) { // Delete the SQL Server. System.out.println("Deleting all Sql Servers"); for (SqlServer sqlServer: sqlServers) { - azure.sqlServers().deleteById(sqlServer.id()); + azureResourceManager.sqlServers().deleteById(sqlServer.id()); } return true; } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (Exception e) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -220,16 +220,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlFailoverGroups.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlFailoverGroups.java index 50650a1124625..8f0f4740aa941 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlFailoverGroups.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlFailoverGroups.java @@ -6,7 +6,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.core.management.profile.AzureProfile; import com.azure.resourcemanager.resources.fluentcore.utils.SdkContext; @@ -29,14 +29,14 @@ public class ManageSqlFailoverGroups { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String sqlPrimaryServerName = azure.sdkContext().randomResourceName("sqlpri", 20); - final String sqlSecondaryServerName = azure.sdkContext().randomResourceName("sqlsec", 20); - final String rgName = azure.sdkContext().randomResourceName("rgsql", 20); - final String failoverGroupName = azure.sdkContext().randomResourceName("fog", 20); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String sqlPrimaryServerName = azureResourceManager.sdkContext().randomResourceName("sqlpri", 20); + final String sqlSecondaryServerName = azureResourceManager.sdkContext().randomResourceName("sqlsec", 20); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgsql", 20); + final String failoverGroupName = azureResourceManager.sdkContext().randomResourceName("fog", 20); final String dbName = "dbSample"; final String administratorLogin = "sqladmin3423"; final String administratorPassword = Utils.password(); @@ -47,7 +47,7 @@ public static boolean runSample(Azure azure) { // Create a primary SQL Server with a sample database. System.out.println("Creating a primary SQL Server with a sample database"); - SqlServer sqlPrimaryServer = azure.sqlServers().define(sqlPrimaryServerName) + SqlServer sqlPrimaryServer = azureResourceManager.sqlServers().define(sqlPrimaryServerName) .withRegion(Region.US_EAST) .withNewResourceGroup(rgName) .withAdministratorLogin(administratorLogin) @@ -64,7 +64,7 @@ public static boolean runSample(Azure azure) { // Create a secondary SQL Server with a sample database. System.out.println("Creating a secondary SQL Server with a sample database"); - SqlServer sqlSecondaryServer = azure.sqlServers().define(sqlSecondaryServerName) + SqlServer sqlSecondaryServer = azureResourceManager.sqlServers().define(sqlSecondaryServerName) .withRegion(Region.US_EAST2) .withExistingResourceGroup(rgName) .withAdministratorLogin(administratorLogin) @@ -152,13 +152,13 @@ public static boolean runSample(Azure azure) { // Delete the SQL Servers. System.out.println("Deleting the Sql Servers"); - azure.sqlServers().deleteById(sqlPrimaryServer.id()); - azure.sqlServers().deleteById(sqlSecondaryServer.id()); + azureResourceManager.sqlServers().deleteById(sqlPrimaryServer.id()); + azureResourceManager.sqlServers().deleteById(sqlSecondaryServer.id()); return true; } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (Exception e) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -177,16 +177,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlFirewallRules.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlFirewallRules.java index 4dbfbb39641f6..d30ca6fe2b688 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlFirewallRules.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlFirewallRules.java @@ -8,7 +8,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.core.management.profile.AzureProfile; import com.azure.resourcemanager.samples.Utils; @@ -33,12 +33,12 @@ public final class ManageSqlFirewallRules { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String sqlServerName = azure.sdkContext().randomResourceName("sqlserver", 20); - final String rgName = azure.sdkContext().randomResourceName("rgRSSDFW", 20); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String sqlServerName = azureResourceManager.sdkContext().randomResourceName("sqlserver", 20); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgRSSDFW", 20); final String administratorLogin = "sqladmin3423"; final String administratorPassword = Utils.password(); final String firewallRuleIPAddress = "10.0.0.1"; @@ -54,7 +54,7 @@ public static boolean runSample(Azure azure) { // Create a SQL Server, with 2 firewall rules. System.out.println("Create a SQL server with 2 firewall rules adding a single IP Address and a range of IP Addresses"); - SqlServer sqlServer = azure.sqlServers().define(sqlServerName) + SqlServer sqlServer = azureResourceManager.sqlServers().define(sqlServerName) .withRegion(Region.US_EAST) .withNewResourceGroup(rgName) .withAdministratorLogin(administratorLogin) @@ -106,12 +106,12 @@ public static boolean runSample(Azure azure) { // Delete the SQL Server. System.out.println("Deleting a Sql Server"); - azure.sqlServers().deleteById(sqlServer.id()); + azureResourceManager.sqlServers().deleteById(sqlServer.id()); return true; } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (Exception e) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -130,16 +130,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlImportExportDatabase.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlImportExportDatabase.java index e0e3c6fdd4e20..928969b67940e 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlImportExportDatabase.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlImportExportDatabase.java @@ -8,7 +8,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.resourcemanager.resources.fluentcore.model.Creatable; import com.azure.core.management.profile.AzureProfile; @@ -29,13 +29,13 @@ public final class ManageSqlImportExportDatabase { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String sqlServerName = azure.sdkContext().randomResourceName("sqlserver", 20); - final String rgName = azure.sdkContext().randomResourceName("rgsql", 20); - String storageName = azure.sdkContext().randomResourceName(sqlServerName, 23); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String sqlServerName = azureResourceManager.sdkContext().randomResourceName("sqlserver", 20); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgsql", 20); + String storageName = azureResourceManager.sdkContext().randomResourceName(sqlServerName, 23); final String administratorLogin = "sqladmin3423"; final String administratorPassword = Utils.password(); final String dbFromSampleName = "db-from-sample"; @@ -43,7 +43,7 @@ public static boolean runSample(Azure azure) { // ============================================================ // Create a SQL Server with one database from a sample. - SqlServer sqlServer = azure.sqlServers().define(sqlServerName) + SqlServer sqlServer = azureResourceManager.sqlServers().define(sqlServerName) .withRegion(Region.US_EAST) .withNewResourceGroup(rgName) .withAdministratorLogin(administratorLogin) @@ -63,7 +63,7 @@ public static boolean runSample(Azure azure) { // Export a database from a SQL server created above to a new storage account within the same resource group. System.out.println("Exporting a database from a SQL server created above to a new storage account within the same resource group."); - Creatable storageAccountCreatable = azure.storageAccounts() + Creatable storageAccountCreatable = azureResourceManager.storageAccounts() .define(storageName) .withRegion(sqlServer.regionName()) .withExistingResourceGroup(sqlServer.resourceGroupName()); @@ -71,7 +71,7 @@ public static boolean runSample(Azure azure) { dbFromSample.exportTo(storageAccountCreatable, "container-name", "dbfromsample.bacpac") .withSqlAdministratorLoginAndPassword(administratorLogin, administratorPassword) .execute(); - StorageAccount storageAccount = azure.storageAccounts().getByResourceGroup(sqlServer.resourceGroupName(), storageName); + StorageAccount storageAccount = azureResourceManager.storageAccounts().getByResourceGroup(sqlServer.resourceGroupName(), storageName); // ============================================================ // Import a database within a new elastic pool from a storage account container created above. @@ -110,7 +110,7 @@ public static boolean runSample(Azure azure) { // Delete the storage account. System.out.println("Deleting the storage account"); - azure.storageAccounts().deleteById(storageAccount.id()); + azureResourceManager.storageAccounts().deleteById(storageAccount.id()); // Delete the databases. System.out.println("Deleting the databases"); @@ -123,12 +123,12 @@ public static boolean runSample(Azure azure) { // Delete the SQL Server. System.out.println("Deleting a Sql Server"); - azure.sqlServers().deleteById(sqlServer.id()); + azureResourceManager.sqlServers().deleteById(sqlServer.id()); return true; } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (Exception e) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -149,16 +149,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlServerDnsAliases.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlServerDnsAliases.java index 7268fd33303ef..8b099c897b4d5 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlServerDnsAliases.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlServerDnsAliases.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.core.management.profile.AzureProfile; import com.azure.resourcemanager.resources.fluentcore.utils.SdkContext; @@ -35,15 +35,15 @@ public class ManageSqlServerDnsAliases { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) throws ClassNotFoundException, SQLException { - final String sqlServerForTestName = azure.sdkContext().randomResourceName("sqltest", 20); - final String sqlServerForProdName = azure.sdkContext().randomResourceName("sqlprod", 20); - final String sqlServerDnsAlias = azure.sdkContext().randomResourceName("sqlserver", 20); + public static boolean runSample(AzureResourceManager azureResourceManager) throws ClassNotFoundException, SQLException { + final String sqlServerForTestName = azureResourceManager.sdkContext().randomResourceName("sqltest", 20); + final String sqlServerForProdName = azureResourceManager.sdkContext().randomResourceName("sqlprod", 20); + final String sqlServerDnsAlias = azureResourceManager.sdkContext().randomResourceName("sqlserver", 20); final String dbName = "dbSample"; - final String rgName = azure.sdkContext().randomResourceName("rgRSSDFW", 20); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgRSSDFW", 20); final String administratorLogin = "sqladmin3423"; final String administratorPassword = Utils.password(); try { @@ -54,7 +54,7 @@ public static boolean runSample(Azure azure) throws ClassNotFoundException, SQLE // Create a "test" SQL Server. System.out.println("Creating a SQL server for test related activities"); - SqlServer sqlServerForTest = azure.sqlServers().define(sqlServerForTestName) + SqlServer sqlServerForTest = azureResourceManager.sqlServers().define(sqlServerForTestName) .withRegion(Region.US_EAST) .withNewResourceGroup(rgName) .withAdministratorLogin(administratorLogin) @@ -99,7 +99,7 @@ public static boolean runSample(Azure azure) throws ClassNotFoundException, SQLE // Create a "production" SQL Server. System.out.println("Creating a SQL server for production related activities"); - SqlServer sqlServerForProd = azure.sqlServers().define(sqlServerForProdName) + SqlServer sqlServerForProd = azureResourceManager.sqlServers().define(sqlServerForProdName) .withRegion(Region.US_EAST2) .withExistingResourceGroup(rgName) .withAdministratorLogin(administratorLogin) @@ -197,13 +197,13 @@ public static boolean runSample(Azure azure) throws ClassNotFoundException, SQLE // Delete the SQL Servers. System.out.println("Deleting the Sql Servers"); - azure.sqlServers().deleteById(sqlServerForTest.id()); - azure.sqlServers().deleteById(sqlServerForProd.id()); + azureResourceManager.sqlServers().deleteById(sqlServerForTest.id()); + azureResourceManager.sqlServers().deleteById(sqlServerForProd.id()); return true; } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (Exception e) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -222,16 +222,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlServerKeysWithAzureKeyVaultKey.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlServerKeysWithAzureKeyVaultKey.java index e3834a66adf10..1b77e061440d5 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlServerKeysWithAzureKeyVaultKey.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlServerKeysWithAzureKeyVaultKey.java @@ -9,7 +9,7 @@ import com.azure.core.management.AzureEnvironment; import com.azure.core.util.Configuration; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.keyvault.models.Key; import com.azure.resourcemanager.keyvault.models.KeyPermissions; import com.azure.resourcemanager.keyvault.models.SkuName; @@ -37,15 +37,15 @@ public class ManageSqlServerKeysWithAzureKeyVaultKey { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @param objectId the object ID of the service principal/user used to authenticate to Azure * @return true if sample runs successfully */ - public static boolean runSample(Azure azure, String objectId) { - final String sqlServerName = azure.sdkContext().randomResourceName("sqlsrv", 20); - final String rgName = azure.sdkContext().randomResourceName("rgsql", 20); - final String vaultName = azure.sdkContext().randomResourceName("sqlkv", 20); - final String keyName = azure.sdkContext().randomResourceName("sqlkey", 20); + public static boolean runSample(AzureResourceManager azureResourceManager, String objectId) { + final String sqlServerName = azureResourceManager.sdkContext().randomResourceName("sqlsrv", 20); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgsql", 20); + final String vaultName = azureResourceManager.sdkContext().randomResourceName("sqlkv", 20); + final String keyName = azureResourceManager.sdkContext().randomResourceName("sqlkey", 20); final String administratorLogin = "sqladmin3423"; final String administratorPassword = Utils.password(); @@ -55,7 +55,7 @@ public static boolean runSample(Azure azure, String objectId) { // Create a SQL Server with system assigned managed service identity. System.out.println("Creating a SQL Server with system assigned managed service identity"); - SqlServer sqlServer = azure.sqlServers().define(sqlServerName) + SqlServer sqlServer = azureResourceManager.sqlServers().define(sqlServerName) .withRegion(Region.US_EAST) .withNewResourceGroup(rgName) .withAdministratorLogin(administratorLogin) @@ -69,7 +69,7 @@ public static boolean runSample(Azure azure, String objectId) { // Create an Azure Key Vault and set the access policies. System.out.println("Creating an Azure Key Vault and set the access policies"); - Vault vault = azure.vaults().define(vaultName) + Vault vault = azureResourceManager.vaults().define(vaultName) .withRegion(Region.US_EAST) .withExistingResourceGroup(rgName) .defineAccessPolicy() @@ -128,17 +128,17 @@ public static boolean runSample(Azure azure, String objectId) { // Delete key System.out.println("Deleting the key"); - azure.sqlServers().serverKeys().deleteBySqlServer(rgName, sqlServerName, serverKeyName); + azureResourceManager.sqlServers().serverKeys().deleteBySqlServer(rgName, sqlServerName, serverKeyName); // Delete the SQL Server. System.out.println("Deleting a Sql Server"); - azure.sqlServers().deleteById(sqlServer.id()); + azureResourceManager.sqlServers().deleteById(sqlServer.id()); return true; } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (Exception e) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -158,16 +158,16 @@ public static void main(String[] args) { .build(); final Configuration configuration = Configuration.getGlobalConfiguration(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure, configuration.get(Configuration.PROPERTY_AZURE_CLIENT_ID)); + runSample(azureResourceManager, configuration.get(Configuration.PROPERTY_AZURE_CLIENT_ID)); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlServerSecurityAlertPolicy.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlServerSecurityAlertPolicy.java index a83858f68ad73..f51b3d68b801b 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlServerSecurityAlertPolicy.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlServerSecurityAlertPolicy.java @@ -6,7 +6,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.core.management.profile.AzureProfile; import com.azure.resourcemanager.samples.Utils; @@ -29,13 +29,13 @@ public class ManageSqlServerSecurityAlertPolicy { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String sqlServerName = azure.sdkContext().randomResourceName("sql", 20); - final String storageAccountName = azure.sdkContext().randomResourceName("sqlsa", 20); - final String rgName = azure.sdkContext().randomResourceName("rgsql", 20); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String sqlServerName = azureResourceManager.sdkContext().randomResourceName("sql", 20); + final String storageAccountName = azureResourceManager.sdkContext().randomResourceName("sqlsa", 20); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgsql", 20); final Region region = Region.US_EAST; final String dbName = "dbSample"; final String administratorLogin = "sqladmin3423"; @@ -47,7 +47,7 @@ public static boolean runSample(Azure azure) { // Create a primary SQL Server with a sample database. System.out.println("Creating a primary SQL Server with a sample database"); - SqlServer sqlServer = azure.sqlServers().define(sqlServerName) + SqlServer sqlServer = azureResourceManager.sqlServers().define(sqlServerName) .withRegion(region) .withNewResourceGroup(rgName) .withAdministratorLogin(administratorLogin) @@ -63,7 +63,7 @@ public static boolean runSample(Azure azure) { // ============================================================ // Create an Azure Storage Account and get the storage account blob entry point. System.out.println("Creating an Azure Storage Account and a storage account blob"); - StorageAccount storageAccount = azure.storageAccounts().define(storageAccountName) + StorageAccount storageAccount = azureResourceManager.storageAccounts().define(storageAccountName) .withRegion(region) .withExistingResourceGroup(rgName) .create(); @@ -100,12 +100,12 @@ public static boolean runSample(Azure azure) { // Delete the SQL Servers. System.out.println("Deleting the Sql Servers"); - azure.sqlServers().deleteById(sqlServer.id()); + azureResourceManager.sqlServers().deleteById(sqlServer.id()); return true; } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (Exception e) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -124,16 +124,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlVirtualNetworkRules.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlVirtualNetworkRules.java index 4f84020d3feda..a0e1bbfdb1c8d 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlVirtualNetworkRules.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlVirtualNetworkRules.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.network.models.Network; import com.azure.resourcemanager.network.models.ServiceEndpointType; import com.azure.resourcemanager.resources.fluentcore.arm.Region; @@ -33,15 +33,15 @@ public class ManageSqlVirtualNetworkRules { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String sqlServerName = azure.sdkContext().randomResourceName("sqlserver", 20); - final String rgName = azure.sdkContext().randomResourceName("rgRSSDFW", 20); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String sqlServerName = azureResourceManager.sdkContext().randomResourceName("sqlserver", 20); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgRSSDFW", 20); final String administratorLogin = "sqladmin3423"; final String administratorPassword = Utils.password(); - final String vnetName = azure.sdkContext().randomResourceName("vnetsql", 20); + final String vnetName = azureResourceManager.sdkContext().randomResourceName("vnetsql", 20); try { @@ -49,7 +49,7 @@ public static boolean runSample(Azure azure) { // Create a virtual network with two subnets. System.out.println("Create a virtual network with two subnets: subnet1 and subnet2"); - Network virtualNetwork = azure.networks().define(vnetName) + Network virtualNetwork = azureResourceManager.networks().define(vnetName) .withRegion(Region.US_EAST) .withNewResourceGroup(rgName) .withAddressSpace("192.168.0.0/16") @@ -68,7 +68,7 @@ public static boolean runSample(Azure azure) { // Create a SQL Server, with one virtual network rule. System.out.println("Create a SQL server with one virtual network rule"); - SqlServer sqlServer = azure.sqlServers().define(sqlServerName) + SqlServer sqlServer = azureResourceManager.sqlServers().define(sqlServerName) .withRegion(Region.US_EAST) .withExistingResourceGroup(rgName) .withAdministratorLogin(administratorLogin) @@ -84,7 +84,7 @@ public static boolean runSample(Azure azure) { // ============================================================ // Get the virtual network rule created above. - SqlVirtualNetworkRule virtualNetworkRule = azure.sqlServers().virtualNetworkRules() + SqlVirtualNetworkRule virtualNetworkRule = azureResourceManager.sqlServers().virtualNetworkRules() .getBySqlServer(rgName, sqlServerName, "virtualNetworkRule1"); Utils.print(virtualNetworkRule); @@ -126,12 +126,12 @@ public static boolean runSample(Azure azure) { // Delete the SQL Server. System.out.println("Deleting a Sql Server"); - azure.sqlServers().deleteById(sqlServer.id()); + azureResourceManager.sqlServers().deleteById(sqlServer.id()); return true; } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (Exception e) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -150,16 +150,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlWithRecoveredOrRestoredDatabase.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlWithRecoveredOrRestoredDatabase.java index b3a20408377b8..1d7c6cd220c48 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlWithRecoveredOrRestoredDatabase.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/sql/samples/ManageSqlWithRecoveredOrRestoredDatabase.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.core.management.profile.AzureProfile; import com.azure.resourcemanager.resources.fluentcore.utils.SdkContext; @@ -32,12 +32,12 @@ public final class ManageSqlWithRecoveredOrRestoredDatabase { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String sqlServerName = azure.sdkContext().randomResourceName("sqlserver", 20); - final String rgName = azure.sdkContext().randomResourceName("rgsql", 20); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String sqlServerName = azureResourceManager.sdkContext().randomResourceName("sqlserver", 20); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgsql", 20); final String administratorLogin = "sqladmin3423"; final String administratorPassword = Utils.password(); final String dbToDeleteName = "db-to-delete"; @@ -47,7 +47,7 @@ public static boolean runSample(Azure azure) { // ============================================================ // Create a SQL Server with two databases from a sample. System.out.println("Creating a SQL Server with two databases from a sample."); - SqlServer sqlServer = azure.sqlServers().define(sqlServerName) + SqlServer sqlServer = azureResourceManager.sqlServers().define(sqlServerName) .withRegion(Region.US_EAST) .withNewResourceGroup(rgName) .withAdministratorLogin(administratorLogin) @@ -137,12 +137,12 @@ public static boolean runSample(Azure azure) { // Delete the SQL Server. System.out.println("Deleting a Sql Server"); - azure.sqlServers().deleteById(sqlServer.id()); + azureResourceManager.sqlServers().deleteById(sqlServer.id()); return true; } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (Exception e) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -162,16 +162,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/storage/samples/ManageStorageAccount.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/storage/samples/ManageStorageAccount.java index a6e4873cbcc83..8ac5022021787 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/storage/samples/ManageStorageAccount.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/storage/samples/ManageStorageAccount.java @@ -9,7 +9,7 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.core.management.profile.AzureProfile; import com.azure.resourcemanager.samples.Utils; @@ -36,14 +36,14 @@ public final class ManageStorageAccount { /** * Main function which runs the actual sample. * - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String storageAccountName = azure.sdkContext().randomResourceName("sa", 8); - final String storageAccountName2 = azure.sdkContext().randomResourceName("sa2", 8); - final String storageAccountName3 = azure.sdkContext().randomResourceName("sa3", 8); - final String rgName = azure.sdkContext().randomResourceName("rgSTMS", 8); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String storageAccountName = azureResourceManager.sdkContext().randomResourceName("sa", 8); + final String storageAccountName2 = azureResourceManager.sdkContext().randomResourceName("sa2", 8); + final String storageAccountName3 = azureResourceManager.sdkContext().randomResourceName("sa3", 8); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgSTMS", 8); try { // ============================================================ @@ -51,7 +51,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating a Storage Account"); - StorageAccount storageAccount = azure.storageAccounts().define(storageAccountName) + StorageAccount storageAccount = azureResourceManager.storageAccounts().define(storageAccountName) .withRegion(Region.US_EAST) .withNewResourceGroup(rgName) .create(); @@ -81,7 +81,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating a 2nd Storage Account"); - StorageAccount storageAccount2 = azure.storageAccounts().define(storageAccountName2) + StorageAccount storageAccount2 = azureResourceManager.storageAccounts().define(storageAccountName2) .withRegion(Region.US_EAST) .withNewResourceGroup(rgName) .create(); @@ -108,7 +108,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating a V2 Storage Account"); - azure.storageAccounts().define(storageAccountName3) + azureResourceManager.storageAccounts().define(storageAccountName3) .withRegion(Region.US_EAST) .withNewResourceGroup(rgName) .withGeneralPurposeAccountKindV2() @@ -121,7 +121,7 @@ public static boolean runSample(Azure azure) { System.out.println("Listing storage accounts"); - StorageAccounts storageAccounts = azure.storageAccounts(); + StorageAccounts storageAccounts = azureResourceManager.storageAccounts(); PagedIterable accounts = storageAccounts.listByResourceGroup(rgName); for (StorageAccount sa : accounts) { @@ -135,14 +135,14 @@ public static boolean runSample(Azure azure) { System.out.println("Deleting a storage account - " + storageAccount.name() + " created @ " + storageAccount.creationTime()); - azure.storageAccounts().deleteById(storageAccount.id()); + azureResourceManager.storageAccounts().deleteById(storageAccount.id()); System.out.println("Deleted storage account"); return true; } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (Exception e) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -162,16 +162,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/storage/samples/ManageStorageAccountAsync.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/storage/samples/ManageStorageAccountAsync.java index cda82776be0f1..86f1c467ce7ba 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/storage/samples/ManageStorageAccountAsync.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/storage/samples/ManageStorageAccountAsync.java @@ -9,7 +9,7 @@ import com.azure.core.management.AzureEnvironment; import com.azure.core.management.profile.AzureProfile; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.resourcemanager.samples.Utils; import com.azure.resourcemanager.storage.models.StorageAccounts; @@ -26,13 +26,13 @@ public final class ManageStorageAccountAsync { /** * Main function which runs the actual sample. * - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(final Azure azure) { - final String storageAccountName = azure.sdkContext().randomResourceName("sa", 8); - final String storageAccountName2 = azure.sdkContext().randomResourceName("sa2", 8); - final String rgName = azure.sdkContext().randomResourceName("rgSTMS", 8); + public static boolean runSample(final AzureResourceManager azureResourceManager) { + final String storageAccountName = azureResourceManager.sdkContext().randomResourceName("sa", 8); + final String storageAccountName2 = azureResourceManager.sdkContext().randomResourceName("sa2", 8); + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgSTMS", 8); try { // ============================================================ @@ -41,11 +41,11 @@ public static boolean runSample(final Azure azure) { System.out.println("Creating a Storage Accounts"); Flux.merge( - azure.storageAccounts().define(storageAccountName) + azureResourceManager.storageAccounts().define(storageAccountName) .withRegion(Region.US_EAST) .withNewResourceGroup(rgName) .createAsync(), - azure.storageAccounts().define(storageAccountName2) + azureResourceManager.storageAccounts().define(storageAccountName2) .withRegion(Region.US_EAST) .withNewResourceGroup(rgName) .createAsync()) @@ -60,7 +60,7 @@ public static boolean runSample(final Azure azure) { System.out.println("Listing storage accounts"); - StorageAccounts storageAccounts = azure.storageAccounts(); + StorageAccounts storageAccounts = azureResourceManager.storageAccounts(); storageAccounts.listByResourceGroupAsync(rgName) .flatMap(storageAccount -> { @@ -85,14 +85,14 @@ public static boolean runSample(final Azure azure) { .flatMap(storageAccount -> { System.out.println("Deleting a storage account - " + storageAccount.name() + " created @ " + storageAccount.creationTime()); - return azure.storageAccounts().deleteByIdAsync(storageAccount.id()); + return azureResourceManager.storageAccounts().deleteByIdAsync(storageAccount.id()); }).blockLast(); return true; } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().deleteByNameAsync(rgName).block(); + azureResourceManager.resourceGroups().deleteByNameAsync(rgName).block(); System.out.println("Deleted Resource Group: " + rgName); } catch (Exception e) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -112,16 +112,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/storage/samples/ManageStorageAccountNetworkRules.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/storage/samples/ManageStorageAccountNetworkRules.java index f8de7def8cbe2..5af776180edac 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/storage/samples/ManageStorageAccountNetworkRules.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/storage/samples/ManageStorageAccountNetworkRules.java @@ -7,7 +7,7 @@ import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.management.AzureEnvironment; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.KnownLinuxVirtualMachineImage; import com.azure.resourcemanager.compute.models.VirtualMachine; import com.azure.resourcemanager.compute.models.VirtualMachineSizeTypes; @@ -32,16 +32,16 @@ public final class ManageStorageAccountNetworkRules { /** * Main function which runs the actual sample. * - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String rgName = azure.sdkContext().randomResourceName("rgSTMS", 8); - final String networkName = azure.sdkContext().randomResourceName("nw", 8); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgSTMS", 8); + final String networkName = azureResourceManager.sdkContext().randomResourceName("nw", 8); final String subnetName = "subnetA"; - final String storageAccountName = azure.sdkContext().randomResourceName("sa", 8); - final String publicIpName = azure.sdkContext().randomResourceName("pip", 8); - final String vmName = azure.sdkContext().randomResourceName("vm", 8); + final String storageAccountName = azureResourceManager.sdkContext().randomResourceName("sa", 8); + final String publicIpName = azureResourceManager.sdkContext().randomResourceName("pip", 8); + final String vmName = azureResourceManager.sdkContext().randomResourceName("vm", 8); try { // ============================================================ @@ -49,7 +49,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating a Virtual network and subnet with storage service subnet access enabled:"); - final Network network = azure.networks().define(networkName) + final Network network = azureResourceManager.networks().define(networkName) .withRegion(Region.US_EAST) .withNewResourceGroup(rgName) .withAddressSpace("10.0.0.0/28") @@ -69,7 +69,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating a storage account with access allowed only from the subnet :" + subnetId); - StorageAccount storageAccount = azure.storageAccounts().define(storageAccountName) + StorageAccount storageAccount = azureResourceManager.storageAccounts().define(storageAccountName) .withRegion(Region.US_EAST) .withExistingResourceGroup(rgName) .withAccessFromSelectedNetworks() @@ -84,7 +84,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating a Public IP address"); - final PublicIpAddress publicIPAddress = azure.publicIpAddresses() + final PublicIpAddress publicIPAddress = azureResourceManager.publicIpAddresses() .define(publicIpName) .withRegion(Region.US_EAST) .withExistingResourceGroup(rgName) @@ -99,7 +99,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating a VM with the Public IP address"); - VirtualMachine linuxVM = azure.virtualMachines() + VirtualMachine linuxVM = azureResourceManager.virtualMachines() .define(vmName) .withRegion(Region.US_EAST) .withExistingResourceGroup(rgName) @@ -145,7 +145,7 @@ public static boolean runSample(Azure azure) { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (Exception e) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -165,16 +165,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/trafficmanager/samples/ManageSimpleTrafficManager.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/trafficmanager/samples/ManageSimpleTrafficManager.java index 9f8f49fe6b258..93fda407a3c2e 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/trafficmanager/samples/ManageSimpleTrafficManager.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/trafficmanager/samples/ManageSimpleTrafficManager.java @@ -8,7 +8,7 @@ import com.azure.core.management.AzureEnvironment; import com.azure.core.management.profile.AzureProfile; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.compute.models.KnownLinuxVirtualMachineImage; import com.azure.resourcemanager.compute.models.VirtualMachine; import com.azure.resourcemanager.compute.models.VirtualMachineSizeTypes; @@ -35,11 +35,11 @@ public final class ManageSimpleTrafficManager { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) { - final String rgName = azure.sdkContext().randomResourceName("rgCOPD", 24); + public static boolean runSample(AzureResourceManager azureResourceManager) { + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgCOPD", 24); final String userName = "tirekicker"; final String sshKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfSPC2K7LZcFKEO+/t3dzmQYtrJFZNxOsbVgOVKietqHyvmYGHEC0J2wPdAqQ/63g/hhAEFRoyehM+rbeDri4txB3YFfnOK58jqdkyXzupWqXzOrlKY4Wz9SKjjN765+dqUITjKRIaAip1Ri137szRg71WnrmdP3SphTRlCx1Bk2nXqWPsclbRDCiZeF8QOTi4JqbmJyK5+0UqhqYRduun8ylAwKKQJ1NJt85sYIHn9f1Rfr6Tq2zS0wZ7DHbZL+zB5rSlAr8QyUdg/GQD+cmSs6LvPJKL78d6hMGk84ARtFo4A79ovwX/Fj01znDQkU6nJildfkaolH2rWFG/qttD azjava@javalib.com"; final int vmCountPerRegion = 2; @@ -52,7 +52,7 @@ public static boolean runSample(Azure azure) { //============================================================= // Create a shared resource group for all the resources so they can all be deleted together // - ResourceGroup resourceGroup = azure.resourceGroups() + ResourceGroup resourceGroup = azureResourceManager.resourceGroups() .define(rgName) .withRegion(Region.US_EAST2) .create(); @@ -64,12 +64,12 @@ public static boolean runSample(Azure azure) { List> creatableVirtualMachines = new ArrayList<>(); for (Region region : regions) { - String linuxVMNamePrefix = azure.sdkContext().randomResourceName("vm", 15); + String linuxVMNamePrefix = azureResourceManager.sdkContext().randomResourceName("vm", 15); for (int i = 0; i < vmCountPerRegion; i++) { //============================================================= // Create a virtual machine in its own virtual network String vmName = String.format("%s-%d", linuxVMNamePrefix, i); - Creatable vmDefinition = azure.virtualMachines().define(vmName) + Creatable vmDefinition = azureResourceManager.virtualMachines().define(vmName) .withRegion(region) .withExistingResourceGroup(resourceGroup) .withNewPrimaryNetwork("10.0.0.0/29") @@ -91,7 +91,7 @@ public static boolean runSample(Azure azure) { System.out.println("Creating the virtual machines..."); stopwatch.start(); - Collection virtualMachines = azure.virtualMachines().create(creatableVirtualMachines).values(); + Collection virtualMachines = azureResourceManager.virtualMachines().create(creatableVirtualMachines).values(); stopwatch.stop(); System.out.println(String.format("Created virtual machines in %d seconds.", stopwatch.getTime() / 1000)); @@ -99,8 +99,8 @@ public static boolean runSample(Azure azure) { //============================================================= // Create 1 traffic manager profile // - String trafficManagerName = azure.sdkContext().randomResourceName("tra", 15); - TrafficManagerProfile.DefinitionStages.WithEndpoint profileWithEndpoint = azure.trafficManagerProfiles() + String trafficManagerName = azureResourceManager.sdkContext().randomResourceName("tra", 15); + TrafficManagerProfile.DefinitionStages.WithEndpoint profileWithEndpoint = azureResourceManager.trafficManagerProfiles() .define(trafficManagerName) .withExistingResourceGroup(resourceGroup) .withLeafDomainLabel(trafficManagerName) @@ -109,7 +109,7 @@ public static boolean runSample(Azure azure) { TrafficManagerProfile.DefinitionStages.WithCreate profileWithCreate = null; int routingPriority = 1; for (VirtualMachine vm : virtualMachines) { - String endpointName = azure.sdkContext().randomResourceName("ep", 15); + String endpointName = azureResourceManager.sdkContext().randomResourceName("ep", 15); profileWithCreate = profileWithEndpoint.defineAzureTargetEndpoint(endpointName) .toResourceId(vm.getPrimaryPublicIPAddressId()) .withRoutingPriority(routingPriority++) @@ -138,7 +138,7 @@ public static boolean runSample(Azure azure) { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().deleteByName(rgName); + azureResourceManager.resourceGroups().deleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -161,16 +161,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/trafficmanager/samples/ManageTrafficManager.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/trafficmanager/samples/ManageTrafficManager.java index 939c32d4be782..7027ab13edd42 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/trafficmanager/samples/ManageTrafficManager.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/main/java/com/azure/resourcemanager/trafficmanager/samples/ManageTrafficManager.java @@ -8,7 +8,7 @@ import com.azure.core.management.AzureEnvironment; import com.azure.core.management.profile.AzureProfile; import com.azure.identity.DefaultAzureCredentialBuilder; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.appservice.models.AppServiceDomain; import com.azure.resourcemanager.appservice.models.AppServicePlan; import com.azure.resourcemanager.appservice.models.OperatingSystem; @@ -46,17 +46,17 @@ public final class ManageTrafficManager { /** * Main function which runs the actual sample. - * @param azure instance of the azure client + * @param azureResourceManager instance of the azure client * @return true if sample runs successfully */ - public static boolean runSample(Azure azure) throws IOException { - final String rgName = azure.sdkContext().randomResourceName("rgNEMV_", 24); - final String domainName = azure.sdkContext().randomResourceName("jsdkdemo-", 20) + ".com"; + public static boolean runSample(AzureResourceManager azureResourceManager) throws IOException { + final String rgName = azureResourceManager.sdkContext().randomResourceName("rgNEMV_", 24); + final String domainName = azureResourceManager.sdkContext().randomResourceName("jsdkdemo-", 20) + ".com"; // [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Serves as an example, not for deployment. Please change when using this in your code.")] final String certPassword = "StrongPass!12"; - final String appServicePlanNamePrefix = azure.sdkContext().randomResourceName("jplan1_", 15); - final String webAppNamePrefix = azure.sdkContext().randomResourceName("webapp1-", 20); - final String tmName = azure.sdkContext().randomResourceName("jsdktm-", 20); + final String appServicePlanNamePrefix = azureResourceManager.sdkContext().randomResourceName("jplan1_", 15); + final String webAppNamePrefix = azureResourceManager.sdkContext().randomResourceName("webapp1-", 20); + final String tmName = azureResourceManager.sdkContext().randomResourceName("jsdktm-", 20); final List regions = new ArrayList<>(); // The regions in which web app needs to be created // @@ -66,7 +66,7 @@ public static boolean runSample(Azure azure) throws IOException { regions.add(Region.US_CENTRAL); try { - azure.resourceGroups().define(rgName) + azureResourceManager.resourceGroups().define(rgName) .withRegion(Region.US_WEST) .create(); @@ -74,7 +74,7 @@ public static boolean runSample(Azure azure) throws IOException { // Purchase a domain (will be canceled for a full refund) System.out.println("Purchasing a domain " + domainName + "..."); - AppServiceDomain domain = azure.appServiceDomains().define(domainName) + AppServiceDomain domain = azureResourceManager.appServiceDomains().define(domainName) .withExistingResourceGroup(rgName) .defineRegistrantContact() .withFirstName("Jon") @@ -112,7 +112,7 @@ public static boolean runSample(Azure azure) throws IOException { for (Region region : regions) { String planName = appServicePlanNamePrefix + id; System.out.println("Creating an app service plan " + planName + " in region " + region + "..."); - AppServicePlan appServicePlan = azure.appServicePlans().define(planName) + AppServicePlan appServicePlan = azureResourceManager.appServicePlans().define(planName) .withRegion(region) .withExistingResourceGroup(rgName) .withPricingTier(PricingTier.BASIC_B1) @@ -131,7 +131,7 @@ public static boolean runSample(Azure azure) throws IOException { for (AppServicePlan appServicePlan : appServicePlans) { String webAppName = webAppNamePrefix + id; System.out.println("Creating a web app " + webAppName + " using the plan " + appServicePlan.name() + "..."); - WebApp webApp = azure.webApps().define(webAppName) + WebApp webApp = azureResourceManager.webApps().define(webAppName) .withExistingWindowsPlan(appServicePlan) .withExistingResourceGroup(rgName) .withManagedHostnameBindings(domain, webAppName) @@ -155,7 +155,7 @@ public static boolean runSample(Azure azure) throws IOException { // Creates a traffic manager profile System.out.println("Creating a traffic manager profile " + tmName + " for the web apps..."); - TrafficManagerProfile.DefinitionStages.WithEndpoint tmDefinition = azure.trafficManagerProfiles() + TrafficManagerProfile.DefinitionStages.WithEndpoint tmDefinition = azureResourceManager.trafficManagerProfiles() .define(tmName) .withExistingResourceGroup(rgName) .withLeafDomainLabel(tmName) @@ -228,13 +228,13 @@ public static boolean runSample(Azure azure) throws IOException { // Deletes the traffic manager profile System.out.println("Deleting the traffic manger profile..."); - azure.trafficManagerProfiles().deleteById(trafficManagerProfile.id()); + azureResourceManager.trafficManagerProfiles().deleteById(trafficManagerProfile.id()); System.out.println("Traffic manager profile deleted"); return true; } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); @@ -257,16 +257,16 @@ public static void main(String[] args) { .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint()) .build(); - Azure azure = Azure + AzureResourceManager azureResourceManager = AzureResourceManager .configure() .withLogLevel(HttpLogDetailLevel.BASIC) .authenticate(credential, profile) .withDefaultSubscription(); // Print selected subscription - System.out.println("Selected subscription: " + azure.subscriptionId()); + System.out.println("Selected subscription: " + azureResourceManager.subscriptionId()); - runSample(azure); + runSample(azureResourceManager); } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/AppPlatformLiveOnlyTests.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/AppPlatformLiveOnlyTests.java index bd0f2a1674d4c..6ffb40772f976 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/AppPlatformLiveOnlyTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/AppPlatformLiveOnlyTests.java @@ -22,6 +22,6 @@ public void testSpringCloud() throws CertificateException, NoSuchAlgorithmExcept return; } - Assertions.assertTrue(ManageSpringCloud.runSample(azure, clientIdFromFile())); + Assertions.assertTrue(ManageSpringCloud.runSample(azureResourceManager, clientIdFromFile())); } } diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/AppServiceSampleLiveOnlyTests.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/AppServiceSampleLiveOnlyTests.java index 7737b44f7bb17..9b663dbebf9f8 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/AppServiceSampleLiveOnlyTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/AppServiceSampleLiveOnlyTests.java @@ -37,7 +37,7 @@ public void testManageWebAppSourceControl() throws GitAPIException { return; } - Assertions.assertTrue(ManageWebAppSourceControl.runSample(azure)); + Assertions.assertTrue(ManageWebAppSourceControl.runSample(azureResourceManager)); } @Test @@ -47,7 +47,7 @@ public void testManageWebAppStorageAccountConnection() { return; } - Assertions.assertTrue(ManageWebAppStorageAccountConnection.runSample(azure)); + Assertions.assertTrue(ManageWebAppStorageAccountConnection.runSample(azureResourceManager)); } @Test @@ -57,7 +57,7 @@ public void testManageLinuxWebAppSourceControl() throws GitAPIException { return; } - Assertions.assertTrue(ManageLinuxWebAppSourceControl.runSample(azure)); + Assertions.assertTrue(ManageLinuxWebAppSourceControl.runSample(azureResourceManager)); } @Test @@ -67,7 +67,7 @@ public void testManageLinuxWebAppStorageAccountConnection() { return; } - Assertions.assertTrue(ManageLinuxWebAppStorageAccountConnection.runSample(azure)); + Assertions.assertTrue(ManageLinuxWebAppStorageAccountConnection.runSample(azureResourceManager)); } @Test @@ -77,7 +77,7 @@ public void testManageLinuxWebAppWithContainerRegistry() throws IOException, Int return; } - Assertions.assertTrue(ManageLinuxWebAppWithContainerRegistry.runSample(azure)); + Assertions.assertTrue(ManageLinuxWebAppWithContainerRegistry.runSample(azureResourceManager)); } @Test @@ -87,7 +87,7 @@ public void testManageFunctionAppWithAuthentication() throws GitAPIException { return; } - Assertions.assertTrue(ManageFunctionAppWithAuthentication.runSample(azure)); + Assertions.assertTrue(ManageFunctionAppWithAuthentication.runSample(azureResourceManager)); } @Test @@ -97,7 +97,7 @@ public void testManageFunctionAppSourceControl() throws GitAPIException { return; } - Assertions.assertTrue(ManageFunctionAppSourceControl.runSample(azure)); + Assertions.assertTrue(ManageFunctionAppSourceControl.runSample(azureResourceManager)); } @Test @@ -107,7 +107,7 @@ public void testManageLinuxWebAppCosmosDbByMsi() { return; } - Assertions.assertTrue(ManageLinuxWebAppCosmosDbByMsi.runSample(azure)); + Assertions.assertTrue(ManageLinuxWebAppCosmosDbByMsi.runSample(azureResourceManager)); } @Test @@ -117,7 +117,7 @@ public void testManageWebAppCosmosDbByMsi() { return; } - Assertions.assertTrue(ManageWebAppCosmosDbByMsi.runSample(azure, credentialFromFile(), clientIdFromFile())); + Assertions.assertTrue(ManageWebAppCosmosDbByMsi.runSample(azureResourceManager, credentialFromFile(), clientIdFromFile())); } @Test @@ -127,7 +127,7 @@ public void testManageWebAppCosmosDbThroughKeyVault() { return; } - Assertions.assertTrue(ManageWebAppCosmosDbThroughKeyVault.runSample(azure, clientIdFromFile())); + Assertions.assertTrue(ManageWebAppCosmosDbThroughKeyVault.runSample(azureResourceManager, clientIdFromFile())); } @Test @@ -137,7 +137,7 @@ public void testManageFunctionAppLogs() throws IOException { return; } - Assertions.assertTrue(ManageFunctionAppLogs.runSample(azure)); + Assertions.assertTrue(ManageFunctionAppLogs.runSample(azureResourceManager)); } @Test @@ -147,7 +147,7 @@ public void testManageWebAppLogs() throws IOException { return; } - Assertions.assertTrue(ManageWebAppLogs.runSample(azure)); + Assertions.assertTrue(ManageWebAppLogs.runSample(azureResourceManager)); } @Test @@ -157,7 +157,7 @@ public void testManageLinuxFunctionAppSourceControl() { return; } - Assertions.assertTrue(ManageLinuxFunctionAppSourceControl.runSample(azure)); + Assertions.assertTrue(ManageLinuxFunctionAppSourceControl.runSample(azureResourceManager)); } @Test @@ -167,7 +167,7 @@ public void testManageWebAppWithDomainSsl() throws IOException { return; } - Assertions.assertTrue(ManageWebAppWithDomainSsl.runSample(azure)); + Assertions.assertTrue(ManageWebAppWithDomainSsl.runSample(azureResourceManager)); } @Test @@ -177,7 +177,7 @@ public void testManageWebAppWithTrafficManager() throws IOException { return; } - Assertions.assertTrue(ManageWebAppWithTrafficManager.runSample(azure)); + Assertions.assertTrue(ManageWebAppWithTrafficManager.runSample(azureResourceManager)); } @Test @@ -187,7 +187,7 @@ public void testManageLinuxWebAppWithDomainSsl() throws IOException { return; } - Assertions.assertTrue(ManageLinuxWebAppWithDomainSsl.runSample(azure)); + Assertions.assertTrue(ManageLinuxWebAppWithDomainSsl.runSample(azureResourceManager)); } @Test @@ -197,7 +197,7 @@ public void testManageLinuxWebAppWithTrafficManager() throws IOException { return; } - Assertions.assertTrue(ManageLinuxWebAppWithTrafficManager.runSample(azure)); + Assertions.assertTrue(ManageLinuxWebAppWithTrafficManager.runSample(azureResourceManager)); } @Test @@ -207,6 +207,6 @@ public void testManageFunctionAppWithDomainSsl() throws IOException { return; } - Assertions.assertTrue(ManageFunctionAppWithDomainSsl.runSample(azure)); + Assertions.assertTrue(ManageFunctionAppWithDomainSsl.runSample(azureResourceManager)); } } diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/AppServiceSampleTests.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/AppServiceSampleTests.java index e37016ee3d879..8af2255cf8ffe 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/AppServiceSampleTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/AppServiceSampleTests.java @@ -20,40 +20,40 @@ public class AppServiceSampleTests extends SamplesTestBase { @Test public void testManageWebAppBasic() { - Assertions.assertTrue(ManageWebAppBasic.runSample(azure)); + Assertions.assertTrue(ManageWebAppBasic.runSample(azureResourceManager)); } @Test @Disabled("Fails randomly when creating one of the three slots") public void testManageWebAppSlots() { - Assertions.assertTrue(ManageWebAppSlots.runSample(azure)); + Assertions.assertTrue(ManageWebAppSlots.runSample(azureResourceManager)); } @Test @Disabled("Failing in playback - dependent on git") public void testManageWebAppSourceControlAsync() { - Assertions.assertTrue(ManageWebAppSourceControlAsync.runSample(azure)); + Assertions.assertTrue(ManageWebAppSourceControlAsync.runSample(azureResourceManager)); } @Test @Disabled("Stops in between for user input") public void testManageWebAppSqlConnection() throws IOException { - Assertions.assertTrue(ManageWebAppSqlConnection.runSample(azure)); + Assertions.assertTrue(ManageWebAppSqlConnection.runSample(azureResourceManager)); } @Test public void testManageLinuxWebAppBasic() { - Assertions.assertTrue(ManageLinuxWebAppBasic.runSample(azure)); + Assertions.assertTrue(ManageLinuxWebAppBasic.runSample(azureResourceManager)); } @Test @Disabled("Stops in between for user input") public void testManageLinuxWebAppSqlConnection() throws IOException { - Assertions.assertTrue(ManageLinuxWebAppSqlConnection.runSample(azure)); + Assertions.assertTrue(ManageLinuxWebAppSqlConnection.runSample(azureResourceManager)); } @Test public void testManageFunctionAppBasic() { - Assertions.assertTrue(ManageFunctionAppBasic.runSample(azure)); + Assertions.assertTrue(ManageFunctionAppBasic.runSample(azureResourceManager)); } } diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/CdnSampleLiveOnlyTests.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/CdnSampleLiveOnlyTests.java index cae5b0801e7c2..6ed3af64a60e7 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/CdnSampleLiveOnlyTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/CdnSampleLiveOnlyTests.java @@ -17,6 +17,6 @@ public void testManageCdnProfileWithWebApp() { return; } - Assertions.assertTrue(ManageCdnProfileWithWebApp.runSample(azure)); + Assertions.assertTrue(ManageCdnProfileWithWebApp.runSample(azureResourceManager)); } } diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/CdnSampleTests.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/CdnSampleTests.java index 900e8a7b7292b..159c3a3cd96a2 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/CdnSampleTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/CdnSampleTests.java @@ -11,6 +11,6 @@ public class CdnSampleTests extends SamplesTestBase { @Test public void testManageCdnProfileWithCustomDomain() { - Assertions.assertTrue(ManageCdnProfileWithCustomDomain.runSample(azure)); + Assertions.assertTrue(ManageCdnProfileWithCustomDomain.runSample(azureResourceManager)); } } diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/ComputeSampleTests.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/ComputeSampleTests.java index ca4fd6ed3b504..64828cf0efb5f 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/ComputeSampleTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/ComputeSampleTests.java @@ -38,140 +38,140 @@ public class ComputeSampleTests extends SamplesTestBase { @Test public void testCreateVirtualMachinesInParallel() { - Assertions.assertTrue(CreateVirtualMachinesInParallel.runSample(azure)); + Assertions.assertTrue(CreateVirtualMachinesInParallel.runSample(azureResourceManager)); } @Test @Disabled("Sample leverages true parallelization, which cannot be recorded, until GenericResources support deleteByIds()") public void testCreateVirtualMachinesAsyncTrackingRelatedResources() { - Assertions.assertTrue(CreateVirtualMachinesAsyncTrackingRelatedResources.runSample(azure)); + Assertions.assertTrue(CreateVirtualMachinesAsyncTrackingRelatedResources.runSample(azureResourceManager)); } @Test public void testCreateVirtualMachinesUsingCustomImageOrSpecializedVHD() { - Assertions.assertTrue(CreateVirtualMachinesUsingCustomImageOrSpecializedVHD.runSample(azure)); + Assertions.assertTrue(CreateVirtualMachinesUsingCustomImageOrSpecializedVHD.runSample(azureResourceManager)); } @Test public void testCreateVirtualMachineUsingCustomImageFromVHD() { - Assertions.assertTrue(CreateVirtualMachineUsingCustomImageFromVHD.runSample(azure)); + Assertions.assertTrue(CreateVirtualMachineUsingCustomImageFromVHD.runSample(azureResourceManager)); } @Test @Disabled("Need to investigate - 'Disks or snapshot cannot be resized down.'") public void testCreateVirtualMachineUsingCustomImageFromVM() { - Assertions.assertTrue(CreateVirtualMachineUsingCustomImageFromVM.runSample(azure)); + Assertions.assertTrue(CreateVirtualMachineUsingCustomImageFromVM.runSample(azureResourceManager)); } @Test public void testCreateVirtualMachineUsingSpecializedDiskFromSnapshot() { - Assertions.assertTrue(CreateVirtualMachineUsingSpecializedDiskFromSnapshot.runSample(azure)); + Assertions.assertTrue(CreateVirtualMachineUsingSpecializedDiskFromSnapshot.runSample(azureResourceManager)); } @Test public void testCreateVirtualMachineUsingSpecializedDiskFromVhd() { - Assertions.assertTrue(CreateVirtualMachineUsingSpecializedDiskFromVhd.runSample(azure)); + Assertions.assertTrue(CreateVirtualMachineUsingSpecializedDiskFromVhd.runSample(azureResourceManager)); } @Test public void testListVirtualMachineExtensionImages() { - Assertions.assertTrue(ListVirtualMachineExtensionImages.runSample(azure)); + Assertions.assertTrue(ListVirtualMachineExtensionImages.runSample(azureResourceManager)); } @Test public void testListVirtualMachineImages() { - Assertions.assertTrue(ListVirtualMachineImages.runSample(azure)); + Assertions.assertTrue(ListVirtualMachineImages.runSample(azureResourceManager)); } @Test public void testListListComputeSkus() { - Assertions.assertTrue(ListComputeSkus.runSample(azure)); + Assertions.assertTrue(ListComputeSkus.runSample(azureResourceManager)); } @Test public void testManageAvailabilitySet() { - Assertions.assertTrue(ManageAvailabilitySet.runSample(azure)); + Assertions.assertTrue(ManageAvailabilitySet.runSample(azureResourceManager)); } @Test public void testManageVirtualMachineWithUnmanagedDisks() { - Assertions.assertTrue(ManageVirtualMachineWithUnmanagedDisks.runSample(azure)); + Assertions.assertTrue(ManageVirtualMachineWithUnmanagedDisks.runSample(azureResourceManager)); } @Test public void testManageVirtualMachine() { - Assertions.assertTrue(ManageVirtualMachine.runSample(azure)); + Assertions.assertTrue(ManageVirtualMachine.runSample(azureResourceManager)); } @Test public void testManageVirtualMachineAsync() { - Assertions.assertTrue(ManageVirtualMachineAsync.runSample(azure)); + Assertions.assertTrue(ManageVirtualMachineAsync.runSample(azureResourceManager)); } @Test public void testManageVirtualMachineExtension() { - Assertions.assertTrue(ManageVirtualMachineExtension.runSample(azure)); + Assertions.assertTrue(ManageVirtualMachineExtension.runSample(azureResourceManager)); } @Test public void testManageVirtualMachineScaleSet() { - Assertions.assertTrue(ManageVirtualMachineScaleSet.runSample(azure)); + Assertions.assertTrue(ManageVirtualMachineScaleSet.runSample(azureResourceManager)); } @Test public void testManageVirtualMachineScaleSetAsync() { - Assertions.assertTrue(ManageVirtualMachineScaleSetAsync.runSample(azure)); + Assertions.assertTrue(ManageVirtualMachineScaleSetAsync.runSample(azureResourceManager)); } @Test public void testManageVirtualMachineScaleSetWithUnmanagedDisks() { - Assertions.assertTrue(ManageVirtualMachineScaleSetWithUnmanagedDisks.runSample(azure)); + Assertions.assertTrue(ManageVirtualMachineScaleSetWithUnmanagedDisks.runSample(azureResourceManager)); } @Test public void testManageVirtualMachinesInParallel() { - Assertions.assertTrue(ManageVirtualMachinesInParallel.runSample(azure)); + Assertions.assertTrue(ManageVirtualMachinesInParallel.runSample(azureResourceManager)); } @Test public void testManageVirtualMachineWithDisk() { - Assertions.assertTrue(ManageVirtualMachineWithDisk.runSample(azure)); + Assertions.assertTrue(ManageVirtualMachineWithDisk.runSample(azureResourceManager)); } @Test public void testConvertVirtualMachineToManagedDisks() { - Assertions.assertTrue(ConvertVirtualMachineToManagedDisks.runSample(azure)); + Assertions.assertTrue(ConvertVirtualMachineToManagedDisks.runSample(azureResourceManager)); } @Test public void testManageManagedDisks() { - Assertions.assertTrue(ManageManagedDisks.runSample(azure)); + Assertions.assertTrue(ManageManagedDisks.runSample(azureResourceManager)); } @Test @Disabled("Skipping for now - looks like a service side issue") public void testManageStorageFromMSIEnabledVirtualMachine() { - Assertions.assertTrue(ManageStorageFromMSIEnabledVirtualMachine.runSample(azure)); + Assertions.assertTrue(ManageStorageFromMSIEnabledVirtualMachine.runSample(azureResourceManager)); } @Test @Disabled("Skipping for now - looks like a service side issue") public void testManageResourceFromMSIEnabledVirtualMachineBelongsToAADGroup() { - Assertions.assertTrue(ManageResourceFromMSIEnabledVirtualMachineBelongsToAADGroup.runSample(azure)); + Assertions.assertTrue(ManageResourceFromMSIEnabledVirtualMachineBelongsToAADGroup.runSample(azureResourceManager)); } @Test public void testManageUserAssignedMSIEnabledVirtualMachine() { - Assertions.assertTrue(ManageUserAssignedMSIEnabledVirtualMachine.runSample(azure)); + Assertions.assertTrue(ManageUserAssignedMSIEnabledVirtualMachine.runSample(azureResourceManager)); } @Test public void testManageZonalVirtualMachine() { - Assertions.assertTrue(ManageZonalVirtualMachine.runSample(azure)); + Assertions.assertTrue(ManageZonalVirtualMachine.runSample(azureResourceManager)); } @Test public void testManageZonalVirtualMachineScaleSet() { - Assertions.assertTrue(ManageZonalVirtualMachineScaleSet.runSample(azure)); + Assertions.assertTrue(ManageZonalVirtualMachineScaleSet.runSample(azureResourceManager)); } } diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/ContainerInstanceTests.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/ContainerInstanceTests.java index 622b2cb5780cc..dc68ba20b2028 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/ContainerInstanceTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/ContainerInstanceTests.java @@ -19,7 +19,7 @@ public class ContainerInstanceTests extends SamplesTestBase { public void testManageContainerInstanceWithAzureFileShareMount() { // Skip test in "playback" mode due to HTTP calls made outside of the management plane which can not be recorded at this time if (!isPlaybackMode()) { - Assertions.assertTrue(ManageContainerInstanceWithAzureFileShareMount.runSample(azure)); + Assertions.assertTrue(ManageContainerInstanceWithAzureFileShareMount.runSample(azureResourceManager)); } } @@ -27,7 +27,7 @@ public void testManageContainerInstanceWithAzureFileShareMount() { public void testManageContainerInstanceWithManualAzureFileShareMountCreation() { // Skip test in "playback" mode due to HTTP calls made outside of the management plane which can not be recorded at this time if (!isPlaybackMode()) { - Assertions.assertTrue(ManageContainerInstanceWithManualAzureFileShareMountCreation.runSample(azure)); + Assertions.assertTrue(ManageContainerInstanceWithManualAzureFileShareMountCreation.runSample(azureResourceManager)); } } @@ -35,7 +35,7 @@ public void testManageContainerInstanceWithManualAzureFileShareMountCreation() { public void testManageContainerInstanceWithMultipleContainerImages() { // Skip test in "playback" mode due to HTTP calls made outside of the management plane which can not be recorded at this time if (!isPlaybackMode()) { - Assertions.assertTrue(ManageContainerInstanceWithMultipleContainerImages.runSample(azure)); + Assertions.assertTrue(ManageContainerInstanceWithMultipleContainerImages.runSample(azureResourceManager)); } } @@ -43,7 +43,7 @@ public void testManageContainerInstanceWithMultipleContainerImages() { public void testManageContainerInstanceZeroToOneAndOneToManyUsingContainerServiceOrchestrator() throws InterruptedException, JSchException, IOException { // Skip test in "playback" mode due to HTTP calls made outside of the management plane which can not be recorded at this time if (!isPlaybackMode()) { - Assertions.assertTrue(ManageContainerInstanceZeroToOneAndOneToManyUsingContainerServiceOrchestrator.runSample(azure, "", "")); + Assertions.assertTrue(ManageContainerInstanceZeroToOneAndOneToManyUsingContainerServiceOrchestrator.runSample(azureResourceManager, "", "")); } } diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/ContainerRegistryTests.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/ContainerRegistryTests.java index 6ae3994b98593..41e704a21646d 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/ContainerRegistryTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/ContainerRegistryTests.java @@ -20,7 +20,7 @@ public void testManageContainerRegistry() throws IOException { return; } - Assertions.assertTrue(ManageContainerRegistry.runSample(azure)); + Assertions.assertTrue(ManageContainerRegistry.runSample(azureResourceManager)); } @Test @@ -30,6 +30,6 @@ public void testManageContainerRegistryWithWebhooks() throws IOException, Interr return; } - Assertions.assertTrue(ManageContainerRegistryWithWebhooks.runSample(azure)); + Assertions.assertTrue(ManageContainerRegistryWithWebhooks.runSample(azureResourceManager)); } } diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/CosmosDBTests.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/CosmosDBTests.java index 2b36b97d27ec9..ad5acd83c9384 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/CosmosDBTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/CosmosDBTests.java @@ -17,25 +17,25 @@ public class CosmosDBTests extends SamplesTestBase { public void testCreateCosmosDBWithEventualConsistency() { // Skip test in "playback" mode due to HTTP calls made outside of the management plane which can not be recorded at this time if (!isPlaybackMode()) { - Assertions.assertTrue(CreateCosmosDBWithEventualConsistency.runSample(azure)); + Assertions.assertTrue(CreateCosmosDBWithEventualConsistency.runSample(azureResourceManager)); } } @Test public void testCreateCosmosDBWithIPRange() { - Assertions.assertTrue(CreateCosmosDBWithIPRange.runSample(azure)); + Assertions.assertTrue(CreateCosmosDBWithIPRange.runSample(azureResourceManager)); } @Test public void testCreateCosmosDBTableWithVirtualNetworkRule() { - Assertions.assertTrue(CreateCosmosDBTableWithVirtualNetworkRule.runSample(azure)); + Assertions.assertTrue(CreateCosmosDBTableWithVirtualNetworkRule.runSample(azureResourceManager)); } @Test public void testCreateCosmosDBWithKindMongoDB() { // Skip test in "playback" mode due to HTTP calls made outside of the management plane which can not be recorded at this time if (!isPlaybackMode()) { - Assertions.assertTrue(CreateCosmosDBWithKindMongoDB.runSample(azure)); + Assertions.assertTrue(CreateCosmosDBWithKindMongoDB.runSample(azureResourceManager)); } } @@ -43,7 +43,7 @@ public void testCreateCosmosDBWithKindMongoDB() { public void testManageHACosmosDB() { // Skip test in "playback" mode due to HTTP calls made outside of the management plane which can not be recorded at this time if (!isPlaybackMode()) { - Assertions.assertTrue(ManageHACosmosDB.runSample(azure)); + Assertions.assertTrue(ManageHACosmosDB.runSample(azureResourceManager)); } } } diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/DnsSampleTests.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/DnsSampleTests.java index 0fb463e7a1c1b..19c524dce5705 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/DnsSampleTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/DnsSampleTests.java @@ -15,7 +15,7 @@ public class DnsSampleTests extends SamplesTestBase { @Test @Disabled("The domain name 'the custom domain that you own (e.g. contoso.com)' is invalid.") public void testManageDns() throws IOException { - Assertions.assertTrue(ManageDns.runSample(azure)); + Assertions.assertTrue(ManageDns.runSample(azureResourceManager)); } } diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/EventHubsSampleTests.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/EventHubsSampleTests.java index 333ac59ec7bad..16a0ae07982f8 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/EventHubsSampleTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/EventHubsSampleTests.java @@ -11,16 +11,16 @@ public class EventHubsSampleTests extends SamplesTestBase { @Test public void testManageEventHub() { - Assertions.assertTrue(ManageEventHub.runSample(azure)); + Assertions.assertTrue(ManageEventHub.runSample(azureResourceManager)); } @Test public void testManageEventHubEvents() { - Assertions.assertTrue(ManageEventHubEvents.runSample(azure)); + Assertions.assertTrue(ManageEventHubEvents.runSample(azureResourceManager)); } @Test public void testManageEventHubGeoDisasterRecovery() { - Assertions.assertTrue(ManageEventHubGeoDisasterRecovery.runSample(azure)); + Assertions.assertTrue(ManageEventHubGeoDisasterRecovery.runSample(azureResourceManager)); } } diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/GraphRbacTests.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/GraphRbacTests.java index 267f96c980669..e4568c0f2002f 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/GraphRbacTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/GraphRbacTests.java @@ -10,7 +10,7 @@ import com.azure.core.http.policy.HttpPipelinePolicy; import com.azure.core.http.policy.RetryPolicy; import com.azure.core.test.annotation.DoNotRecord; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.resourcemanager.authorization.samples.ManageServicePrincipalCredentials; import com.azure.resourcemanager.authorization.samples.ManageUsersGroupsAndRoles; import com.azure.core.management.profile.AzureProfile; @@ -24,7 +24,7 @@ import java.util.List; public class GraphRbacTests extends ResourceManagerTestBase { - private Azure.Authenticated authenticated; + private AzureResourceManager.Authenticated authenticated; private AzureProfile profile; @Test @@ -72,7 +72,7 @@ protected HttpPipeline buildHttpPipeline( @Override protected void initializeClients(HttpPipeline httpPipeline, AzureProfile profile) { - authenticated = Azure.authenticate(httpPipeline, profile); + authenticated = AzureResourceManager.authenticate(httpPipeline, profile); this.profile = profile; } diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/KeyVaultSampleTests.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/KeyVaultSampleTests.java index 37a9401593799..b002c9c75a92b 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/KeyVaultSampleTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/KeyVaultSampleTests.java @@ -18,6 +18,6 @@ public void testManageKeyVault() { final Configuration configuration = Configuration.getGlobalConfiguration(); clientId = configuration.get(Configuration.PROPERTY_AZURE_CLIENT_ID); } - Assertions.assertTrue(ManageKeyVault.runSample(azure, clientId)); + Assertions.assertTrue(ManageKeyVault.runSample(azureResourceManager, clientId)); } } diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/KubernetesClusterTests.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/KubernetesClusterTests.java index 12f5de3903bf8..940cc55005e7e 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/KubernetesClusterTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/KubernetesClusterTests.java @@ -22,7 +22,7 @@ public void testManageKubernetesCluster() throws IOException, JSchException { // Assertions.assertTrue(ManageKubernetesCluster.runSample(azure, "client id", "secret")); return; } else { - Assertions.assertTrue(ManageKubernetesCluster.runSample(azure, "", "")); + Assertions.assertTrue(ManageKubernetesCluster.runSample(azureResourceManager, "", "")); } } @@ -34,14 +34,14 @@ public void testManageKubernetesClusterWithAdvancedNetworking() throws IOExcepti // Assertions.assertTrue(ManageKubernetesCluster.runSample(azure, "client id", "secret")); return; } else { - Assertions.assertTrue(ManagedKubernetesClusterWithAdvancedNetworking.runSample(azure, "", "")); + Assertions.assertTrue(ManagedKubernetesClusterWithAdvancedNetworking.runSample(azureResourceManager, "", "")); } } @Test public void testDeployImageFromContainerRegistryToKubernetes() throws InterruptedException, JSchException, IOException { if (!isPlaybackMode()) { - Assertions.assertTrue(DeployImageFromContainerRegistryToKubernetes.runSample(azure, "", "")); + Assertions.assertTrue(DeployImageFromContainerRegistryToKubernetes.runSample(azureResourceManager, "", "")); } } } diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/MonitorTests.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/MonitorTests.java index ce1a62c86246b..89f4b58001fbd 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/MonitorTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/MonitorTests.java @@ -19,25 +19,25 @@ public class MonitorTests extends SamplesTestBase { public void testQueryMetricsAndActivityLogs() throws IOException { // Skip test in "playback" mode due to HTTP calls made outside of the management plane which can not be recorded at this time if (!isPlaybackMode()) { - Assertions.assertTrue(QueryMetricsAndActivityLogs.runSample(azure)); + Assertions.assertTrue(QueryMetricsAndActivityLogs.runSample(azureResourceManager)); } } @Test public void testSecurityBreachOrRiskActivityLogAlerts() { - Assertions.assertTrue(SecurityBreachOrRiskActivityLogAlerts.runSample(azure)); + Assertions.assertTrue(SecurityBreachOrRiskActivityLogAlerts.runSample(azureResourceManager)); } @Test public void testWebAppPerformanceMonitoringAlerts() { - Assertions.assertTrue(WebAppPerformanceMonitoringAlerts.runSample(azure)); + Assertions.assertTrue(WebAppPerformanceMonitoringAlerts.runSample(azureResourceManager)); } @Test public void testAutoscaleSettingsBasedOnPerformanceOrSchedule() { // Skip test in "playback" mode due to HTTP calls made outside of the management plane which can not be recorded at this time if (!isPlaybackMode()) { - Assertions.assertTrue(AutoscaleSettingsBasedOnPerformanceOrSchedule.runSample(azure)); + Assertions.assertTrue(AutoscaleSettingsBasedOnPerformanceOrSchedule.runSample(azureResourceManager)); } } } diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/NetworkSampleTests.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/NetworkSampleTests.java index 8f8adc07a5270..ce290ef9701a1 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/NetworkSampleTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/NetworkSampleTests.java @@ -30,78 +30,78 @@ public class NetworkSampleTests extends SamplesTestBase { @Test public void testManageNetworkPeeringInSameSubscription() { - Assertions.assertTrue(ManageNetworkPeeringInSameSubscription.runSample(azure)); + Assertions.assertTrue(ManageNetworkPeeringInSameSubscription.runSample(azureResourceManager)); } @Test @Disabled("Get error `Cannot create more than 1 network watchers for this subscription in this region.` with test subscription") public void testVerifyNetworkPeeringWithNetworkWatcher() { - Assertions.assertTrue(VerifyNetworkPeeringWithNetworkWatcher.runSample(azure)); + Assertions.assertTrue(VerifyNetworkPeeringWithNetworkWatcher.runSample(azureResourceManager)); } @Test public void testManageApplicationGateway() throws IOException { - Assertions.assertTrue(ManageApplicationGateway.runSample(azure)); + Assertions.assertTrue(ManageApplicationGateway.runSample(azureResourceManager)); } @Test public void testManageInternalLoadBalancer() { - Assertions.assertTrue(ManageInternalLoadBalancer.runSample(azure)); + Assertions.assertTrue(ManageInternalLoadBalancer.runSample(azureResourceManager)); } @Test public void testCreateSimpleInternetFacingLoadBalancer() { - Assertions.assertTrue(CreateSimpleInternetFacingLoadBalancer.runSample(azure)); + Assertions.assertTrue(CreateSimpleInternetFacingLoadBalancer.runSample(azureResourceManager)); } @Test public void testManageInternetFacingLoadBalancer() { - Assertions.assertTrue(ManageInternetFacingLoadBalancer.runSample(azure)); + Assertions.assertTrue(ManageInternetFacingLoadBalancer.runSample(azureResourceManager)); } @Test public void testManageIPAddress() { - Assertions.assertTrue(ManageIPAddress.runSample(azure)); + Assertions.assertTrue(ManageIPAddress.runSample(azureResourceManager)); } @Test public void testManageNetworkInterface() { - Assertions.assertTrue(ManageNetworkInterface.runSample(azure)); + Assertions.assertTrue(ManageNetworkInterface.runSample(azureResourceManager)); } @Test public void testManageNetworkSecurityGroup() throws UnsupportedEncodingException, JSchException { - Assertions.assertTrue(ManageNetworkSecurityGroup.runSample(azure)); + Assertions.assertTrue(ManageNetworkSecurityGroup.runSample(azureResourceManager)); } @Test public void testManageSimpleApplicationGateway() throws IOException { - Assertions.assertTrue(ManageSimpleApplicationGateway.runSample(azure)); + Assertions.assertTrue(ManageSimpleApplicationGateway.runSample(azureResourceManager)); } @Test public void testManageVirtualMachinesInParallelWithNetwork() { - Assertions.assertTrue(ManageVirtualMachinesInParallelWithNetwork.runSample(azure)); + Assertions.assertTrue(ManageVirtualMachinesInParallelWithNetwork.runSample(azureResourceManager)); } @Test public void testManageVirtualNetwork() { - Assertions.assertTrue(ManageVirtualNetwork.runSample(azure)); + Assertions.assertTrue(ManageVirtualNetwork.runSample(azureResourceManager)); } @Test public void testManageVirtualNetworkAsync() { - Assertions.assertTrue(ManageVirtualNetworkAsync.runSample(azure)); + Assertions.assertTrue(ManageVirtualNetworkAsync.runSample(azureResourceManager)); } @Test public void testManageVpnGatewaySite2SiteConnection() { - Assertions.assertTrue(ManageVpnGatewaySite2SiteConnection.runSample(azure)); + Assertions.assertTrue(ManageVpnGatewaySite2SiteConnection.runSample(azureResourceManager)); } @Test @Disabled("Need root certificate file and client certificate thumbprint to run the sample") public void testManageVpnGatewayPoint2SiteConnection() throws IOException { - Assertions.assertTrue(ManageVpnGatewayPoint2SiteConnection.runSample(azure)); + Assertions.assertTrue(ManageVpnGatewayPoint2SiteConnection.runSample(azureResourceManager)); } } diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/NetworkWatcherSampleLiveOnlyTests.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/NetworkWatcherSampleLiveOnlyTests.java index 7540e3f135368..0f291b3e76e6a 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/NetworkWatcherSampleLiveOnlyTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/NetworkWatcherSampleLiveOnlyTests.java @@ -16,6 +16,6 @@ public void testManageNetworkWatcher() { return; } - Assertions.assertTrue(ManageNetworkWatcher.runSample(azure)); + Assertions.assertTrue(ManageNetworkWatcher.runSample(azureResourceManager)); } } diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/PrivateDnsSampleTests.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/PrivateDnsSampleTests.java index c4278ae3fe1aa..56ac9790a2642 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/PrivateDnsSampleTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/PrivateDnsSampleTests.java @@ -9,6 +9,6 @@ public class PrivateDnsSampleTests extends SamplesTestBase { @Test public void testManagePrivateDns() { - Assertions.assertTrue(ManagePrivateDns.runSample(azure)); + Assertions.assertTrue(ManagePrivateDns.runSample(azureResourceManager)); } } diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/RedisCacheSampleTests.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/RedisCacheSampleTests.java index f2b908594801f..8bbe21fd08059 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/RedisCacheSampleTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/RedisCacheSampleTests.java @@ -10,6 +10,6 @@ public class RedisCacheSampleTests extends SamplesTestBase { @Test public void testManageRedisCache() { - Assertions.assertTrue(ManageRedisCache.runSample(azure)); + Assertions.assertTrue(ManageRedisCache.runSample(azureResourceManager)); } } diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/ResourceSampleTests.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/ResourceSampleTests.java index dc863d959fbbc..02116e92f6b9b 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/ResourceSampleTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/ResourceSampleTests.java @@ -23,45 +23,45 @@ public void testDeployUsingARMTemplate() throws IOException, IllegalAccessExcept if (isPlaybackMode()) { return; } - Assertions.assertTrue(DeployUsingARMTemplate.runSample(azure)); + Assertions.assertTrue(DeployUsingARMTemplate.runSample(azureResourceManager)); } @Test public void testDeployUsingARMTemplateWithProgress() throws IOException, IllegalAccessException { - Assertions.assertTrue(DeployUsingARMTemplateWithProgress.runSample(azure)); + Assertions.assertTrue(DeployUsingARMTemplateWithProgress.runSample(azureResourceManager)); } @Test public void testDeployUsingARMTemplateAsync() throws InterruptedException { - Assertions.assertTrue(DeployUsingARMTemplateAsync.runSample(azure)); + Assertions.assertTrue(DeployUsingARMTemplateAsync.runSample(azureResourceManager)); } @Test() public void testDeployUsingARMTemplateWithDeploymentOperations() throws InterruptedException { if (isPlaybackMode()) { - Assertions.assertTrue(DeployUsingARMTemplateWithDeploymentOperations.runSample(azure, 0)); + Assertions.assertTrue(DeployUsingARMTemplateWithDeploymentOperations.runSample(azureResourceManager, 0)); } else { - Assertions.assertTrue(DeployUsingARMTemplateWithDeploymentOperations.runSample(azure, -1)); + Assertions.assertTrue(DeployUsingARMTemplateWithDeploymentOperations.runSample(azureResourceManager, -1)); } } @Test public void testDeployUsingARMTemplateWithTags() throws IOException, IllegalAccessException { - Assertions.assertTrue(DeployUsingARMTemplateWithTags.runSample(azure)); + Assertions.assertTrue(DeployUsingARMTemplateWithTags.runSample(azureResourceManager)); } @Test public void testManageResource() { - Assertions.assertTrue(ManageResource.runSample(azure)); + Assertions.assertTrue(ManageResource.runSample(azureResourceManager)); } @Test public void testManageResourceGroup() { - Assertions.assertTrue(ManageResourceGroup.runSample(azure)); + Assertions.assertTrue(ManageResourceGroup.runSample(azureResourceManager)); } @Test public void testDeployVirtualMachineUsingARMTemplate() throws IOException, IllegalAccessException { - Assertions.assertTrue(DeployVirtualMachineUsingARMTemplate.runSample(azure)); + Assertions.assertTrue(DeployVirtualMachineUsingARMTemplate.runSample(azureResourceManager)); } } diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/SamplesTestBase.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/SamplesTestBase.java index 950e155859b67..47923655e9cf3 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/SamplesTestBase.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/SamplesTestBase.java @@ -9,7 +9,7 @@ import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.http.policy.HttpPipelinePolicy; import com.azure.core.http.policy.RetryPolicy; -import com.azure.resourcemanager.Azure; +import com.azure.resourcemanager.AzureResourceManager; import com.azure.core.management.profile.AzureProfile; import com.azure.resourcemanager.resources.fluentcore.utils.HttpPipelineProvider; import com.azure.resourcemanager.resources.fluentcore.utils.SdkContext; @@ -21,7 +21,7 @@ import java.util.List; public class SamplesTestBase extends ResourceManagerTestBase { - protected Azure azure; + protected AzureResourceManager azureResourceManager; @Override protected HttpPipeline buildHttpPipeline( @@ -46,7 +46,7 @@ protected void initializeClients(HttpPipeline httpPipeline, AzureProfile profile SdkContext.setDelayProvider(new TestDelayProvider(!isPlaybackMode())); SdkContext sdkContext = new SdkContext(); sdkContext.setIdentifierFunction(name -> new TestIdentifierProvider(testResourceNamer)); - azure = Azure + azureResourceManager = AzureResourceManager .authenticate(httpPipeline, profile) .withSdkContext(sdkContext) .withDefaultSubscription(); diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/ServiceBusSampleLiveOnlyTests.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/ServiceBusSampleLiveOnlyTests.java index 25c028812bf2b..acd2b60611e66 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/ServiceBusSampleLiveOnlyTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/ServiceBusSampleLiveOnlyTests.java @@ -19,7 +19,7 @@ public void testServiceBusQueueBasic() { if (skipInPlayback()) { return; } - Assertions.assertTrue(ServiceBusQueueBasic.runSample(azure)); + Assertions.assertTrue(ServiceBusQueueBasic.runSample(azureResourceManager)); } @Test @@ -28,7 +28,7 @@ public void testServiceBusPublishSubscribeBasic() { if (skipInPlayback()) { return; } - Assertions.assertTrue(ServiceBusPublishSubscribeBasic.runSample(azure)); + Assertions.assertTrue(ServiceBusPublishSubscribeBasic.runSample(azureResourceManager)); } @Test @@ -37,7 +37,7 @@ public void testServiceBusWithClaimBasedAuthorization() { if (skipInPlayback()) { return; } - Assertions.assertTrue(ServiceBusWithClaimBasedAuthorization.runSample(azure)); + Assertions.assertTrue(ServiceBusWithClaimBasedAuthorization.runSample(azureResourceManager)); } @Test @@ -46,7 +46,7 @@ public void testServiceBusQueueAdvanceFeatures() { if (skipInPlayback()) { return; } - Assertions.assertTrue(ServiceBusQueueAdvanceFeatures.runSample(azure)); + Assertions.assertTrue(ServiceBusQueueAdvanceFeatures.runSample(azureResourceManager)); } @Test @@ -55,6 +55,6 @@ public void testServiceBusPublishSubscribeAdvanceFeatures() { if (skipInPlayback()) { return; } - Assertions.assertTrue(ServiceBusPublishSubscribeAdvanceFeatures.runSample(azure)); + Assertions.assertTrue(ServiceBusPublishSubscribeAdvanceFeatures.runSample(azureResourceManager)); } } diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/SqlSampleTests.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/SqlSampleTests.java index 95397aec3908d..7e740d4a0609f 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/SqlSampleTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/SqlSampleTests.java @@ -26,58 +26,58 @@ public class SqlSampleTests extends SamplesTestBase { @Test public void testManageSqlDatabase() { - Assertions.assertTrue(ManageSqlDatabase.runSample(azure)); + Assertions.assertTrue(ManageSqlDatabase.runSample(azureResourceManager)); } @Test public void testManageSqlDatabaseInElasticPool() { - Assertions.assertTrue(ManageSqlDatabaseInElasticPool.runSample(azure)); + Assertions.assertTrue(ManageSqlDatabaseInElasticPool.runSample(azureResourceManager)); } @Test public void testManageSqlDatabasesAcrossDifferentDataCenters() { - Assertions.assertTrue(ManageSqlDatabasesAcrossDifferentDataCenters.runSample(azure)); + Assertions.assertTrue(ManageSqlDatabasesAcrossDifferentDataCenters.runSample(azureResourceManager)); } @Test public void testManageSqlFirewallRules() { - Assertions.assertTrue(ManageSqlFirewallRules.runSample(azure)); + Assertions.assertTrue(ManageSqlFirewallRules.runSample(azureResourceManager)); } @Test public void testManageSqlServerSecurityAlertPolicy() { - Assertions.assertTrue(ManageSqlServerSecurityAlertPolicy.runSample(azure)); + Assertions.assertTrue(ManageSqlServerSecurityAlertPolicy.runSample(azureResourceManager)); } @Test public void testManageSqlVirtualNetworkRules() { - Assertions.assertTrue(ManageSqlVirtualNetworkRules.runSample(azure)); + Assertions.assertTrue(ManageSqlVirtualNetworkRules.runSample(azureResourceManager)); } @Test public void testManageSqlImportExportDatabase() { // Skip test in "playback" mode due to HTTP calls made outside of the management plane which can not be recorded at this time if (!isPlaybackMode()) { - Assertions.assertTrue(ManageSqlImportExportDatabase.runSample(azure)); + Assertions.assertTrue(ManageSqlImportExportDatabase.runSample(azureResourceManager)); } } @Test public void testManageSqlWithRecoveredOrRestoredDatabase() { // This test can take significant time to run since it depends on the availability of certain resources on the service side. - Assertions.assertTrue(ManageSqlWithRecoveredOrRestoredDatabase.runSample(azure)); + Assertions.assertTrue(ManageSqlWithRecoveredOrRestoredDatabase.runSample(azureResourceManager)); } @Test public void testManageSqlFailoverGroups() { - Assertions.assertTrue(ManageSqlFailoverGroups.runSample(azure)); + Assertions.assertTrue(ManageSqlFailoverGroups.runSample(azureResourceManager)); } @Test public void testGettingSqlServerMetrics() throws SQLException, ClassNotFoundException { // Skip test in "playback" mode due to HTTP calls made outside of the management plane which can not be recorded at this time if (!isPlaybackMode()) { - Assertions.assertTrue(GettingSqlServerMetrics.runSample(azure)); + Assertions.assertTrue(GettingSqlServerMetrics.runSample(azureResourceManager)); } } @@ -85,7 +85,7 @@ public void testGettingSqlServerMetrics() throws SQLException, ClassNotFoundExce public void testManageSqlServerDnsAliases() throws SQLException, ClassNotFoundException { // Skip test in "playback" mode due to HTTP calls made outside of the management plane which can not be recorded at this time if (!isPlaybackMode()) { - Assertions.assertTrue(ManageSqlServerDnsAliases.runSample(azure)); + Assertions.assertTrue(ManageSqlServerDnsAliases.runSample(azureResourceManager)); } } @@ -113,7 +113,7 @@ public void testManageSqlServerKeysWithAzureKeyVaultKey() { } } - Assertions.assertTrue(ManageSqlServerKeysWithAzureKeyVaultKey.runSample(azure, servicePrincipalClientId)); + Assertions.assertTrue(ManageSqlServerKeysWithAzureKeyVaultKey.runSample(azureResourceManager, servicePrincipalClientId)); } } } diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/StorageSampleTests.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/StorageSampleTests.java index 7426b7069d437..3faf5ea3af9ef 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/StorageSampleTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/StorageSampleTests.java @@ -13,16 +13,16 @@ public class StorageSampleTests extends SamplesTestBase { @Test public void testManageStorageAccount() { - Assertions.assertTrue(ManageStorageAccount.runSample(azure)); + Assertions.assertTrue(ManageStorageAccount.runSample(azureResourceManager)); } @Test public void testManageStorageAccountAsync() { - Assertions.assertTrue(ManageStorageAccountAsync.runSample(azure)); + Assertions.assertTrue(ManageStorageAccountAsync.runSample(azureResourceManager)); } @Test public void testManageStorageAccountNetworkRules() { - Assertions.assertTrue(ManageStorageAccountNetworkRules.runSample(azure)); + Assertions.assertTrue(ManageStorageAccountNetworkRules.runSample(azureResourceManager)); } } diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/TrafficManagerSampleTests.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/TrafficManagerSampleTests.java index 4a725be26c41c..ef52aa6ab02f1 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/TrafficManagerSampleTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/TrafficManagerSampleTests.java @@ -14,7 +14,7 @@ public class TrafficManagerSampleTests extends SamplesTestBase { @Test public void testManageSimpleTrafficManager() { - Assertions.assertTrue(ManageSimpleTrafficManager.runSample(azure)); + Assertions.assertTrue(ManageSimpleTrafficManager.runSample(azureResourceManager)); } @Test @@ -24,6 +24,6 @@ public void testManageTrafficManager() throws IOException { // sample creates certificate return; } - Assertions.assertTrue(ManageTrafficManager.runSample(azure)); + Assertions.assertTrue(ManageTrafficManager.runSample(azureResourceManager)); } } diff --git a/sdk/resourcemanager/azure-resourcemanager/src/main/java/com/azure/resourcemanager/Azure.java b/sdk/resourcemanager/azure-resourcemanager/src/main/java/com/azure/resourcemanager/AzureResourceManager.java similarity index 97% rename from sdk/resourcemanager/azure-resourcemanager/src/main/java/com/azure/resourcemanager/Azure.java rename to sdk/resourcemanager/azure-resourcemanager/src/main/java/com/azure/resourcemanager/AzureResourceManager.java index ddb75631cffdf..b34f241da6df5 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/main/java/com/azure/resourcemanager/Azure.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/main/java/com/azure/resourcemanager/AzureResourceManager.java @@ -120,7 +120,7 @@ import java.util.Objects; /** The entry point for accessing resource management APIs in Azure. */ -public final class Azure { +public final class AzureResourceManager { private final ResourceManager resourceManager; private final StorageManager storageManager; private final ComputeManager computeManager; @@ -193,7 +193,7 @@ public interface Configurable extends AzureConfigurable { private static final class ConfigurableImpl extends AzureConfigurableImpl implements Configurable { @Override public Authenticated authenticate(TokenCredential credential, AzureProfile profile) { - return Azure.authenticate(buildHttpPipeline(credential, profile), profile); + return AzureResourceManager.authenticate(buildHttpPipeline(credential, profile), profile); } } @@ -251,7 +251,7 @@ public interface Authenticated extends AccessManagement { * @param subscriptionId the ID of the subscription * @return an authenticated Azure client configured to work with the specified subscription */ - Azure withSubscription(String subscriptionId); + AzureResourceManager withSubscription(String subscriptionId); /** * Selects the default subscription as the subscription for the APIs to work with. @@ -263,7 +263,7 @@ public interface Authenticated extends AccessManagement { * @throws IllegalStateException when no subscription or more than one subscription found in the tenant. * @return an authenticated Azure client configured to work with the default subscription */ - Azure withDefaultSubscription(); + AzureResourceManager withDefaultSubscription(); } /** The implementation for the Authenticated interface. */ @@ -354,20 +354,22 @@ public Authenticated withTenantId(String tenantId) { } @Override - public Azure withSubscription(String subscriptionId) { - return new Azure(httpPipeline, new AzureProfile(tenantId, subscriptionId, environment), this); + public AzureResourceManager withSubscription(String subscriptionId) { + return new AzureResourceManager( + httpPipeline, new AzureProfile(tenantId, subscriptionId, environment), this); } @Override - public Azure withDefaultSubscription() { + public AzureResourceManager withDefaultSubscription() { if (subscriptionId == null) { subscriptionId = Utils.defaultSubscription(this.subscriptions().list()); } - return new Azure(httpPipeline, new AzureProfile(tenantId, subscriptionId, environment), this); + return new AzureResourceManager( + httpPipeline, new AzureProfile(tenantId, subscriptionId, environment), this); } } - private Azure(HttpPipeline httpPipeline, AzureProfile profile, Authenticated authenticated) { + private AzureResourceManager(HttpPipeline httpPipeline, AzureProfile profile, Authenticated authenticated) { this.sdkContext = authenticated.sdkContext(); this.resourceManager = ResourceManager.authenticate(httpPipeline, profile).withSdkContext(sdkContext).withDefaultSubscription(); diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/ApplicationGatewayTests.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/ApplicationGatewayTests.java index ea97b474b2bc8..481ae1e64480f 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/ApplicationGatewayTests.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/ApplicationGatewayTests.java @@ -41,7 +41,7 @@ import org.junit.jupiter.api.Test; public class ApplicationGatewayTests extends ResourceManagerTestBase { - private Azure azure; + private AzureResourceManager azureResourceManager; @Override protected HttpPipeline buildHttpPipeline( @@ -66,9 +66,9 @@ protected void initializeClients(HttpPipeline httpPipeline, AzureProfile profile SdkContext.setDelayProvider(new TestDelayProvider(!isPlaybackMode())); SdkContext sdkContext = new SdkContext(); sdkContext.setIdentifierFunction(name -> new TestIdentifierProvider(testResourceNamer)); - Azure.Authenticated azureAuthed = - Azure.authenticate(httpPipeline, profile).withSdkContext(sdkContext); - azure = azureAuthed.withDefaultSubscription(); + AzureResourceManager.Authenticated azureAuthed = + AzureResourceManager.authenticate(httpPipeline, profile).withSdkContext(sdkContext); + azureResourceManager = azureAuthed.withDefaultSubscription(); } @Override @@ -82,8 +82,8 @@ protected void cleanUpResources() { */ @Test public void testAppGatewaysInternalComplex() throws Exception { - new TestApplicationGateway().new PrivateComplex(azure.sdkContext()) - .runTest(azure.applicationGateways(), azure.resourceGroups()); + new TestApplicationGateway().new PrivateComplex(azureResourceManager.sdkContext()) + .runTest(azureResourceManager.applicationGateways(), azureResourceManager.resourceGroups()); } /** @@ -93,23 +93,23 @@ public void testAppGatewaysInternalComplex() throws Exception { */ @Test public void testAppGatewaysPublicUrlPathBased() throws Exception { - new TestApplicationGateway().new UrlPathBased(azure.sdkContext()) - .runTest(azure.applicationGateways(), azure.resourceGroups()); + new TestApplicationGateway().new UrlPathBased(azureResourceManager.sdkContext()) + .runTest(azureResourceManager.applicationGateways(), azureResourceManager.resourceGroups()); } @Test public void testAppGatewayBackendHealthCheck() throws Exception { - String testId = azure.applicationGateways().manager().sdkContext().randomResourceName("", 15); + String testId = azureResourceManager.applicationGateways().manager().sdkContext().randomResourceName("", 15); String name = "ag" + testId; Region region = Region.US_EAST; - String password = azure.applicationGateways().manager().sdkContext().randomResourceName("Abc.123", 12); + String password = azureResourceManager.applicationGateways().manager().sdkContext().randomResourceName("Abc.123", 12); String vnetName = "net" + testId; String rgName = "rg" + testId; try { // Create a vnet Network network = - azure + azureResourceManager .networks() .define(vnetName) .withRegion(region) @@ -124,7 +124,7 @@ public void testAppGatewayBackendHealthCheck() throws Exception { for (int i = 0; i < 2; i++) { vmsDefinitions .add( - azure + azureResourceManager .virtualMachines() .define("vm" + i + testId) .withRegion(region) @@ -138,7 +138,7 @@ public void testAppGatewayBackendHealthCheck() throws Exception { .withRootPassword(password)); } - CreatedResources createdVms = azure.virtualMachines().create(vmsDefinitions); + CreatedResources createdVms = azureResourceManager.virtualMachines().create(vmsDefinitions); VirtualMachine[] vms = new VirtualMachine[createdVms.size()]; for (int i = 0; i < vmsDefinitions.size(); i++) { vms[i] = createdVms.get(vmsDefinitions.get(i).key()); @@ -151,7 +151,7 @@ public void testAppGatewayBackendHealthCheck() throws Exception { // Create the app gateway in the other subnet of the same vnet and point the backend at the VMs ApplicationGateway appGateway = - azure + azureResourceManager .applicationGateways() .define(name) .withRegion(region) @@ -260,8 +260,8 @@ public void testAppGatewayBackendHealthCheck() throws Exception { } catch (Exception e) { throw e; } finally { - if (azure.resourceGroups().contain(rgName)) { - azure.resourceGroups().beginDeleteByName(rgName); + if (azureResourceManager.resourceGroups().contain(rgName)) { + azureResourceManager.resourceGroups().beginDeleteByName(rgName); } } } @@ -273,17 +273,17 @@ public void testAppGatewayBackendHealthCheck() throws Exception { */ @Test public void testAppGatewaysInternalMinimal() throws Exception { - new TestApplicationGateway().new PrivateMinimal(azure.sdkContext()) - .runTest(azure.applicationGateways(), azure.resourceGroups()); + new TestApplicationGateway().new PrivateMinimal(azureResourceManager.sdkContext()) + .runTest(azureResourceManager.applicationGateways(), azureResourceManager.resourceGroups()); } @Test public void testAppGatewaysStartStop() throws Exception { - String rgName = azure.sdkContext().randomResourceName("rg", 13); + String rgName = azureResourceManager.sdkContext().randomResourceName("rg", 13); Region region = Region.US_EAST; - String name = azure.sdkContext().randomResourceName("ag", 15); + String name = azureResourceManager.sdkContext().randomResourceName("ag", 15); ApplicationGateway appGateway = - azure + azureResourceManager .applicationGateways() .define(name) .withRegion(region) @@ -305,21 +305,21 @@ public void testAppGatewaysStartStop() throws Exception { appGateway.start(); Assertions.assertEquals(ApplicationGatewayOperationalState.RUNNING, appGateway.operationalState()); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); } @Test public void testApplicationGatewaysInParallel() throws Exception { - String rgName = azure.applicationGateways().manager().sdkContext().randomResourceName("rg", 13); + String rgName = azureResourceManager.applicationGateways().manager().sdkContext().randomResourceName("rg", 13); Region region = Region.US_EAST; - Creatable resourceGroup = azure.resourceGroups().define(rgName).withRegion(region); + Creatable resourceGroup = azureResourceManager.resourceGroups().define(rgName).withRegion(region); List> agCreatables = new ArrayList<>(); agCreatables .add( - azure + azureResourceManager .applicationGateways() - .define(azure.applicationGateways().manager().sdkContext().randomResourceName("ag", 13)) + .define(azureResourceManager.applicationGateways().manager().sdkContext().randomResourceName("ag", 13)) .withRegion(Region.US_EAST) .withNewResourceGroup(resourceGroup) .defineRequestRoutingRule("rule1") @@ -332,9 +332,9 @@ public void testApplicationGatewaysInParallel() throws Exception { agCreatables .add( - azure + azureResourceManager .applicationGateways() - .define(azure.applicationGateways().manager().sdkContext().randomResourceName("ag", 13)) + .define(azureResourceManager.applicationGateways().manager().sdkContext().randomResourceName("ag", 13)) .withRegion(Region.US_EAST) .withNewResourceGroup(resourceGroup) .defineRequestRoutingRule("rule1") @@ -345,7 +345,7 @@ public void testApplicationGatewaysInParallel() throws Exception { .toBackendIPAddress("10.0.0.4") .attach()); - CreatedResources created = azure.applicationGateways().create(agCreatables); + CreatedResources created = azureResourceManager.applicationGateways().create(agCreatables); List ags = new ArrayList<>(); List agIds = new ArrayList<>(); for (Creatable creatable : agCreatables) { @@ -355,29 +355,29 @@ public void testApplicationGatewaysInParallel() throws Exception { agIds.add(ag.id()); } - azure.applicationGateways().stop(agIds); + azureResourceManager.applicationGateways().stop(agIds); for (ApplicationGateway ag : ags) { Assertions.assertEquals(ApplicationGatewayOperationalState.STOPPED, ag.refresh().operationalState()); } - azure.applicationGateways().start(agIds); + azureResourceManager.applicationGateways().start(agIds); for (ApplicationGateway ag : ags) { Assertions.assertEquals(ApplicationGatewayOperationalState.RUNNING, ag.refresh().operationalState()); } - azure.applicationGateways().deleteByIds(agIds); + azureResourceManager.applicationGateways().deleteByIds(agIds); for (String id : agIds) { try { - ApplicationGateway ag = azure.applicationGateways().getById(id); + ApplicationGateway ag = azureResourceManager.applicationGateways().getById(id); Assertions.assertNull(ag); } catch (ManagementException e) { Assertions.assertEquals(404, e.getResponse().getStatusCode()); } } - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); } /** @@ -387,8 +387,8 @@ public void testApplicationGatewaysInParallel() throws Exception { */ @Test public void testAppGatewaysInternetFacingMinimal() throws Exception { - new TestApplicationGateway().new PublicMinimal(azure.sdkContext()) - .runTest(azure.applicationGateways(), azure.resourceGroups()); + new TestApplicationGateway().new PublicMinimal(azureResourceManager.sdkContext()) + .runTest(azureResourceManager.applicationGateways(), azureResourceManager.resourceGroups()); } /** @@ -398,7 +398,7 @@ public void testAppGatewaysInternetFacingMinimal() throws Exception { */ @Test public void testAppGatewaysInternetFacingComplex() throws Exception { - new TestApplicationGateway().new PublicComplex(azure.sdkContext()) - .runTest(azure.applicationGateways(), azure.resourceGroups()); + new TestApplicationGateway().new PublicComplex(azureResourceManager.sdkContext()) + .runTest(azureResourceManager.applicationGateways(), azureResourceManager.resourceGroups()); } } diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/AzureTests.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/AzureResourceManagerTests.java similarity index 85% rename from sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/AzureTests.java rename to sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/AzureResourceManagerTests.java index d15cd608bfb51..b49051e44e600 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/AzureTests.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/AzureResourceManagerTests.java @@ -80,8 +80,8 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -public class AzureTests extends ResourceManagerTestBase { - private Azure azure; +public class AzureResourceManagerTests extends ResourceManagerTestBase { + private AzureResourceManager azureResourceManager; private MSIManager msiManager; @Override @@ -107,8 +107,8 @@ protected void initializeClients(HttpPipeline httpPipeline, AzureProfile profile SdkContext.setDelayProvider(new TestDelayProvider(!isPlaybackMode())); SdkContext sdkContext = new SdkContext(); sdkContext.setIdentifierFunction(name -> new TestIdentifierProvider(testResourceNamer)); - Azure.Authenticated azureAuthed = Azure.authenticate(httpPipeline, profile).withSdkContext(sdkContext); - azure = azureAuthed.withDefaultSubscription(); + AzureResourceManager.Authenticated azureAuthed = AzureResourceManager.authenticate(httpPipeline, profile).withSdkContext(sdkContext); + azureResourceManager = azureAuthed.withDefaultSubscription(); this.msiManager = MSIManager.authenticate(httpPipeline, profile, sdkContext); } @@ -227,11 +227,11 @@ public void run() { */ @Test public void testDeployments() throws Exception { - String testId = azure.deployments().manager().sdkContext().randomResourceName("", 8); - PagedIterable deployments = azure.deployments().list(); + String testId = azureResourceManager.deployments().manager().sdkContext().randomResourceName("", 8); + PagedIterable deployments = azureResourceManager.deployments().list(); System.out.println("Deployments: " + TestUtilities.getSize(deployments)); Deployment deployment = - azure + azureResourceManager .deployments() .define("depl" + testId) .withNewResourceGroup("rg" + testId, Region.US_WEST) @@ -245,7 +245,7 @@ public void testDeployments() throws Exception { .create(); System.out.println("Created deployment: " + deployment.correlationId()); - azure.resourceGroups().beginDeleteByName("rg" + testId); + azureResourceManager.resourceGroups().beginDeleteByName("rg" + testId); } /** @@ -257,27 +257,27 @@ public void testDeployments() throws Exception { public void testGenericResources() throws Exception { // Create some resources NetworkSecurityGroup nsg = - azure + azureResourceManager .networkSecurityGroups() - .define(azure.networkSecurityGroups().manager().sdkContext().randomResourceName("nsg", 13)) + .define(azureResourceManager.networkSecurityGroups().manager().sdkContext().randomResourceName("nsg", 13)) .withRegion(Region.US_EAST) .withNewResourceGroup() .create(); - azure + azureResourceManager .publicIpAddresses() - .define(azure.networkSecurityGroups().manager().sdkContext().randomResourceName("pip", 13)) + .define(azureResourceManager.networkSecurityGroups().manager().sdkContext().randomResourceName("pip", 13)) .withRegion(Region.US_EAST) .withExistingResourceGroup(nsg.resourceGroupName()) .create(); PagedIterable resources = - azure.genericResources().listByResourceGroup(nsg.resourceGroupName()); + azureResourceManager.genericResources().listByResourceGroup(nsg.resourceGroupName()); Assertions.assertEquals(2, TestUtilities.getSize(resources)); GenericResource firstResource = resources.iterator().next(); - GenericResource resourceById = azure.genericResources().getById(firstResource.id()); + GenericResource resourceById = azureResourceManager.genericResources().getById(firstResource.id()); GenericResource resourceByDetails = - azure + azureResourceManager .genericResources() .get( firstResource.resourceGroupName(), @@ -285,7 +285,7 @@ public void testGenericResources() throws Exception { firstResource.resourceType(), firstResource.name()); Assertions.assertTrue(resourceById.id().equalsIgnoreCase(resourceByDetails.id())); - azure.resourceGroups().beginDeleteByName(nsg.resourceGroupName()); + azureResourceManager.resourceGroups().beginDeleteByName(nsg.resourceGroupName()); } // /** @@ -505,7 +505,7 @@ public void testGenericResources() throws Exception { @Test public void testVMImages() throws ManagementException, IOException { PagedIterable publishers = - azure.virtualMachineImages().publishers().listByRegion(Region.US_WEST); + azureResourceManager.virtualMachineImages().publishers().listByRegion(Region.US_WEST); Assertions.assertTrue(TestUtilities.getSize(publishers) > 0); for (VirtualMachinePublisher p : publishers.stream().limit(5).toArray(VirtualMachinePublisher[]::new)) { System.out.println(String.format("Publisher name: %s, region: %s", p.name(), p.region())); @@ -517,7 +517,7 @@ public void testVMImages() throws ManagementException, IOException { } } // TODO: limit vm images by filter - PagedIterable images = azure.virtualMachineImages().listByRegion(Region.US_WEST); + PagedIterable images = azureResourceManager.virtualMachineImages().listByRegion(Region.US_WEST); Assertions.assertTrue(TestUtilities.getSize(images) > 0); // Seems to help avoid connection refused error on subsequent mock test SdkContext.sleep(2000); @@ -530,7 +530,7 @@ public void testVMImages() throws ManagementException, IOException { */ @Test public void testNetworkSecurityGroups() throws Exception { - new TestNSG().runTest(azure.networkSecurityGroups(), azure.resourceGroups()); + new TestNSG().runTest(azureResourceManager.networkSecurityGroups(), azureResourceManager.resourceGroups()); } /** @@ -540,8 +540,8 @@ public void testNetworkSecurityGroups() throws Exception { */ @Test public void testLoadBalancersNatRules() throws Exception { - new TestLoadBalancer().new InternetWithNatRule(azure.virtualMachines().manager()) - .runTest(azure.loadBalancers(), azure.resourceGroups()); + new TestLoadBalancer().new InternetWithNatRule(azureResourceManager.virtualMachines().manager()) + .runTest(azureResourceManager.loadBalancers(), azureResourceManager.resourceGroups()); } /** @@ -551,8 +551,8 @@ public void testLoadBalancersNatRules() throws Exception { */ @Test public void testLoadBalancersNatPools() throws Exception { - new TestLoadBalancer().new InternetWithNatPool(azure.virtualMachines().manager()) - .runTest(azure.loadBalancers(), azure.resourceGroups()); + new TestLoadBalancer().new InternetWithNatPool(azureResourceManager.virtualMachines().manager()) + .runTest(azureResourceManager.loadBalancers(), azureResourceManager.resourceGroups()); } /** @@ -562,8 +562,8 @@ public void testLoadBalancersNatPools() throws Exception { */ @Test public void testLoadBalancersInternetMinimum() throws Exception { - new TestLoadBalancer().new InternetMinimal(azure.virtualMachines().manager()) - .runTest(azure.loadBalancers(), azure.resourceGroups()); + new TestLoadBalancer().new InternetMinimal(azureResourceManager.virtualMachines().manager()) + .runTest(azureResourceManager.loadBalancers(), azureResourceManager.resourceGroups()); } /** @@ -573,8 +573,8 @@ public void testLoadBalancersInternetMinimum() throws Exception { */ @Test public void testLoadBalancersNatOnly() throws Exception { - new TestLoadBalancer().new InternetNatOnly(azure.virtualMachines().manager()) - .runTest(azure.loadBalancers(), azure.resourceGroups()); + new TestLoadBalancer().new InternetNatOnly(azureResourceManager.virtualMachines().manager()) + .runTest(azureResourceManager.loadBalancers(), azureResourceManager.resourceGroups()); } /** @@ -584,8 +584,8 @@ public void testLoadBalancersNatOnly() throws Exception { */ @Test public void testLoadBalancersInternalMinimum() throws Exception { - new TestLoadBalancer().new InternalMinimal(azure.virtualMachines().manager()) - .runTest(azure.loadBalancers(), azure.resourceGroups()); + new TestLoadBalancer().new InternalMinimal(azureResourceManager.virtualMachines().manager()) + .runTest(azureResourceManager.loadBalancers(), azureResourceManager.resourceGroups()); } /** @@ -596,18 +596,18 @@ public void testLoadBalancersInternalMinimum() throws Exception { @Test @Disabled("Though valid scenario, NRP is failing") public void testLoadBalancersInternalWithAvailabilityZone() throws Exception { - new TestLoadBalancer().new InternalWithZone(azure.virtualMachines().manager()) - .runTest(azure.loadBalancers(), azure.resourceGroups()); + new TestLoadBalancer().new InternalWithZone(azureResourceManager.virtualMachines().manager()) + .runTest(azureResourceManager.loadBalancers(), azureResourceManager.resourceGroups()); } @Test public void testManagedDiskVMUpdate() throws Exception { - SdkContext context = azure.disks().manager().sdkContext(); + SdkContext context = azureResourceManager.disks().manager().sdkContext(); final String rgName = context.randomResourceName("rg", 13); final String linuxVM2Name = context.randomResourceName("vm" + "-", 10); final String linuxVM2Pip = context.randomResourceName("pip" + "-", 18); VirtualMachine linuxVM2 = - azure + azureResourceManager .virtualMachines() .define(linuxVM2Name) .withRegion(Region.US_EAST) @@ -627,7 +627,7 @@ public void testManagedDiskVMUpdate() throws Exception { linuxVM2.deallocate(); linuxVM2.update().withoutDataDisk(2).withNewDataDisk(200).apply(); - azure.resourceGroups().beginDeleteByName(rgName); + azureResourceManager.resourceGroups().beginDeleteByName(rgName); } /** @@ -637,7 +637,7 @@ public void testManagedDiskVMUpdate() throws Exception { */ @Test public void testPublicIPAddresses() throws Exception { - new TestPublicIPAddress().runTest(azure.publicIpAddresses(), azure.resourceGroups()); + new TestPublicIPAddress().runTest(azureResourceManager.publicIpAddresses(), azureResourceManager.resourceGroups()); } /** @@ -647,7 +647,7 @@ public void testPublicIPAddresses() throws Exception { */ @Test public void testPublicIPPrefixes() throws Exception { - new TestPublicIPPrefix().runTest(azure.publicIpPrefixes(), azure.resourceGroups()); + new TestPublicIPPrefix().runTest(azureResourceManager.publicIpPrefixes(), azureResourceManager.resourceGroups()); } /** @@ -657,7 +657,7 @@ public void testPublicIPPrefixes() throws Exception { */ @Test public void testAvailabilitySets() throws Exception { - new TestAvailabilitySet().runTest(azure.availabilitySets(), azure.resourceGroups()); + new TestAvailabilitySet().runTest(azureResourceManager.availabilitySets(), azureResourceManager.resourceGroups()); } /** @@ -667,7 +667,7 @@ public void testAvailabilitySets() throws Exception { */ @Test public void testNetworks() throws Exception { - new TestNetwork().new WithSubnets().runTest(azure.networks(), azure.resourceGroups()); + new TestNetwork().new WithSubnets().runTest(azureResourceManager.networks(), azureResourceManager.resourceGroups()); } /** @@ -677,7 +677,7 @@ public void testNetworks() throws Exception { */ @Test public void testNetworkWithAccessFromServiceToSubnet() throws Exception { - new TestNetwork().new WithAccessFromServiceToSubnet().runTest(azure.networks(), azure.resourceGroups()); + new TestNetwork().new WithAccessFromServiceToSubnet().runTest(azureResourceManager.networks(), azureResourceManager.resourceGroups()); } /** @@ -687,7 +687,7 @@ public void testNetworkWithAccessFromServiceToSubnet() throws Exception { */ @Test public void testNetworkPeerings() throws Exception { - new TestNetwork().new WithPeering().runTest(azure.networks(), azure.resourceGroups()); + new TestNetwork().new WithPeering().runTest(azureResourceManager.networks(), azureResourceManager.resourceGroups()); } /** @@ -697,7 +697,7 @@ public void testNetworkPeerings() throws Exception { */ @Test public void testDdosAndVmProtection() throws Exception { - new TestNetwork().new WithDDosProtectionPlanAndVmProtection().runTest(azure.networks(), azure.resourceGroups()); + new TestNetwork().new WithDDosProtectionPlanAndVmProtection().runTest(azureResourceManager.networks(), azureResourceManager.resourceGroups()); } /** @@ -707,7 +707,7 @@ public void testDdosAndVmProtection() throws Exception { */ @Test public void testNetworkUpdateTags() throws Exception { - new TestNetwork().new WithUpdateTags().runTest(azure.networks(), azure.resourceGroups()); + new TestNetwork().new WithUpdateTags().runTest(azureResourceManager.networks(), azureResourceManager.resourceGroups()); } /** @@ -717,7 +717,7 @@ public void testNetworkUpdateTags() throws Exception { */ @Test public void testRouteTables() throws Exception { - new TestRouteTables().new Minimal().runTest(azure.routeTables(), azure.resourceGroups()); + new TestRouteTables().new Minimal().runTest(azureResourceManager.routeTables(), azureResourceManager.resourceGroups()); } /** Tests the regions enum. */ @@ -751,7 +751,7 @@ public void testRegions() { */ @Test public void testNetworkInterfaces() throws Exception { - new TestNetworkInterface().runTest(azure.networkInterfaces(), azure.resourceGroups()); + new TestNetworkInterface().runTest(azureResourceManager.networkInterfaces(), azureResourceManager.resourceGroups()); } /** @@ -761,7 +761,7 @@ public void testNetworkInterfaces() throws Exception { */ @Test public void testNetworkWatchers() throws Exception { - new TestNetworkWatcher().runTest(azure.networkWatchers(), azure.resourceGroups()); + new TestNetworkWatcher().runTest(azureResourceManager.networkWatchers(), azureResourceManager.resourceGroups()); } @Test @@ -772,7 +772,7 @@ public void testNetworkWatcherFunctions() throws Exception { try { TestNetworkWatcher tnw = new TestNetworkWatcher(); - NetworkWatcher nw = tnw.createResource(azure.networkWatchers()); + NetworkWatcher nw = tnw.createResource(azureResourceManager.networkWatchers()); tnwrg = tnw.groupName(); nwrg = nw.resourceGroupName(); @@ -781,9 +781,9 @@ public void testNetworkWatcherFunctions() throws Exception { VirtualMachine[] virtualMachines = tnw .ensureNetwork( - azure.networkWatchers().manager().networks(), - azure.virtualMachines(), - azure.networkInterfaces()); + azureResourceManager.networkWatchers().manager().networks(), + azureResourceManager.virtualMachines(), + azureResourceManager.networkInterfaces()); ConnectionMonitor connectionMonitor = nw @@ -823,7 +823,7 @@ public void testNetworkWatcherFunctions() throws Exception { FlowLogSettings flowLogSettings = nw.getFlowLogSettings(virtualMachines[0].getPrimaryNetworkInterface().networkSecurityGroupId()); - StorageAccount storageAccount = tnw.ensureStorageAccount(azure.storageAccounts()); + StorageAccount storageAccount = tnw.ensureStorageAccount(azureResourceManager.storageAccounts()); flowLogSettings .update() .withLogging() @@ -901,15 +901,15 @@ public void testNetworkWatcherFunctions() throws Exception { ConnectionMonitorQueryResult queryResult = connectionMonitor.query(); - azure.virtualMachines().deleteById(virtualMachines[1].id()); + azureResourceManager.virtualMachines().deleteById(virtualMachines[1].id()); topology.execute(); // Assertions.assertEquals(10, topology.resources().size()); // not sure why it is 18 now } finally { if (nwrg != null) { - azure.resourceGroups().beginDeleteByName(nwrg); + azureResourceManager.resourceGroups().beginDeleteByName(nwrg); } if (tnwrg != null) { - azure.resourceGroups().beginDeleteByName(tnwrg); + azureResourceManager.resourceGroups().beginDeleteByName(tnwrg); } } } @@ -921,7 +921,7 @@ public void testNetworkWatcherFunctions() throws Exception { */ @Test public void testLocalNetworkGateways() throws Exception { - new TestLocalNetworkGateway().runTest(azure.localNetworkGateways(), azure.resourceGroups()); + new TestLocalNetworkGateway().runTest(azureResourceManager.localNetworkGateways(), azureResourceManager.resourceGroups()); } /** @@ -931,7 +931,7 @@ public void testLocalNetworkGateways() throws Exception { */ @Test public void testExpressRouteCircuits() throws Exception { - new TestExpressRouteCircuit().new Basic().runTest(azure.expressRouteCircuits(), azure.resourceGroups()); + new TestExpressRouteCircuit().new Basic().runTest(azureResourceManager.expressRouteCircuits(), azureResourceManager.resourceGroups()); } /** @@ -942,7 +942,7 @@ public void testExpressRouteCircuits() throws Exception { @Test public void testExpressRouteCircuitPeering() throws Exception { new TestExpressRouteCircuit().new ExpressRouteCircuitPeering() - .runTest(azure.expressRouteCircuits(), azure.resourceGroups()); + .runTest(azureResourceManager.expressRouteCircuits(), azureResourceManager.resourceGroups()); } /** @@ -955,7 +955,7 @@ public void testExpressRouteCircuitPeering() throws Exception { public void testVirtualMachines() throws Exception { // Future: This method needs to have a better specific name since we are going to include unit test for // different vm scenarios. - new TestVirtualMachine().runTest(azure.virtualMachines(), azure.resourceGroups()); + new TestVirtualMachine().runTest(azureResourceManager.virtualMachines(), azureResourceManager.resourceGroups()); } /** @@ -965,7 +965,7 @@ public void testVirtualMachines() throws Exception { */ @Test public void testVirtualMachineDataDisk() throws Exception { - new TestVirtualMachineDataDisk().runTest(azure.virtualMachines(), azure.resourceGroups()); + new TestVirtualMachineDataDisk().runTest(azureResourceManager.virtualMachines(), azureResourceManager.resourceGroups()); } /** @@ -975,7 +975,7 @@ public void testVirtualMachineDataDisk() throws Exception { */ @Test public void testVirtualMachineNics() throws Exception { - new TestVirtualMachineNics(azure.networks().manager()).runTest(azure.virtualMachines(), azure.resourceGroups()); + new TestVirtualMachineNics(azureResourceManager.networks().manager()).runTest(azureResourceManager.virtualMachines(), azureResourceManager.resourceGroups()); } /** @@ -985,7 +985,7 @@ public void testVirtualMachineNics() throws Exception { */ @Test public void testVirtualMachineSSh() throws Exception { - new TestVirtualMachineSsh(azure.publicIpAddresses()).runTest(azure.virtualMachines(), azure.resourceGroups()); + new TestVirtualMachineSsh(azureResourceManager.publicIpAddresses()).runTest(azureResourceManager.virtualMachines(), azureResourceManager.resourceGroups()); } /** @@ -995,24 +995,24 @@ public void testVirtualMachineSSh() throws Exception { */ @Test public void testVirtualMachineSizes() throws Exception { - new TestVirtualMachineSizes().runTest(azure.virtualMachines(), azure.resourceGroups()); + new TestVirtualMachineSizes().runTest(azureResourceManager.virtualMachines(), azureResourceManager.resourceGroups()); } @Test public void testVirtualMachineCustomData() throws Exception { - new TestVirtualMachineCustomData(azure.publicIpAddresses()) - .runTest(azure.virtualMachines(), azure.resourceGroups()); + new TestVirtualMachineCustomData(azureResourceManager.publicIpAddresses()) + .runTest(azureResourceManager.virtualMachines(), azureResourceManager.resourceGroups()); } @Test public void testVirtualMachineInAvailabilitySet() throws Exception { - new TestVirtualMachineInAvailabilitySet().runTest(azure.virtualMachines(), azure.resourceGroups()); + new TestVirtualMachineInAvailabilitySet().runTest(azureResourceManager.virtualMachines(), azureResourceManager.resourceGroups()); } @Test public void testVirtualMachineSyncPoller() throws Exception { - new TestVirtualMachineSyncPoller(azure.networks().manager()) - .runTest(azure.virtualMachines(), azure.resourceGroups()); + new TestVirtualMachineSyncPoller(azureResourceManager.networks().manager()) + .runTest(azureResourceManager.virtualMachines(), azureResourceManager.resourceGroups()); } /** @@ -1022,10 +1022,10 @@ public void testVirtualMachineSyncPoller() throws Exception { */ @Test public void listSubscriptions() throws Exception { - Assertions.assertTrue(0 < TestUtilities.getSize(azure.subscriptions().list())); - Subscription subscription = azure.getCurrentSubscription(); + Assertions.assertTrue(0 < TestUtilities.getSize(azureResourceManager.subscriptions().list())); + Subscription subscription = azureResourceManager.getCurrentSubscription(); Assertions.assertNotNull(subscription); - Assertions.assertTrue(azure.subscriptionId().equalsIgnoreCase(subscription.subscriptionId())); + Assertions.assertTrue(azureResourceManager.subscriptionId().equalsIgnoreCase(subscription.subscriptionId())); } /** @@ -1035,7 +1035,7 @@ public void listSubscriptions() throws Exception { */ @Test public void listLocations() throws Exception { - Subscription subscription = azure.getCurrentSubscription(); + Subscription subscription = azureResourceManager.getCurrentSubscription(); Assertions.assertNotNull(subscription); for (Location location : subscription.listLocations()) { Region region = Region.fromName(location.name()); @@ -1056,7 +1056,7 @@ public void listLocations() throws Exception { */ @Test public void listResourceGroups() throws Exception { - int groupCount = TestUtilities.getSize(azure.resourceGroups().list()); + int groupCount = TestUtilities.getSize(azureResourceManager.resourceGroups().list()); System.out.println(String.format("Group count: %s", groupCount)); Assertions.assertTrue(0 < groupCount); } @@ -1068,14 +1068,14 @@ public void listResourceGroups() throws Exception { */ @Test public void listStorageAccounts() throws Exception { - Assertions.assertTrue(0 < TestUtilities.getSize(azure.storageAccounts().list())); + Assertions.assertTrue(0 < TestUtilities.getSize(azureResourceManager.storageAccounts().list())); } @Test public void createStorageAccount() throws Exception { String storageAccountName = generateRandomResourceName("testsa", 12); StorageAccount storageAccount = - azure + azureResourceManager .storageAccounts() .define(storageAccountName) .withRegion(Region.ASIA_EAST) @@ -1085,7 +1085,7 @@ public void createStorageAccount() throws Exception { Assertions.assertEquals(storageAccount.name(), storageAccountName); - azure.resourceGroups().beginDeleteByName(storageAccount.resourceGroupName()); + azureResourceManager.resourceGroups().beginDeleteByName(storageAccount.resourceGroupName()); } // @Test @@ -1095,13 +1095,13 @@ public void createStorageAccount() throws Exception { @Test public void testTrafficManager() throws Exception { - new TestTrafficManager(azure.publicIpAddresses()) - .runTest(azure.trafficManagerProfiles(), azure.resourceGroups()); + new TestTrafficManager(azureResourceManager.publicIpAddresses()) + .runTest(azureResourceManager.trafficManagerProfiles(), azureResourceManager.resourceGroups()); } @Test public void testRedis() throws Exception { - new TestRedis().runTest(azure.redisCaches(), azure.resourceGroups()); + new TestRedis().runTest(azureResourceManager.redisCaches(), azureResourceManager.resourceGroups()); } // @Test @@ -1112,33 +1112,33 @@ public void testRedis() throws Exception { @Test public void testDnsZones() throws Exception { - new TestDns().runTest(azure.dnsZones(), azure.resourceGroups()); + new TestDns().runTest(azureResourceManager.dnsZones(), azureResourceManager.resourceGroups()); } @Test public void testPrivateDnsZones() throws Exception { - new TestPrivateDns().runTest(azure.privateDnsZones(), azure.resourceGroups()); + new TestPrivateDns().runTest(azureResourceManager.privateDnsZones(), azureResourceManager.resourceGroups()); } @Test public void testSqlServer() throws Exception { - new TestSql().runTest(azure.sqlServers(), azure.resourceGroups()); + new TestSql().runTest(azureResourceManager.sqlServers(), azureResourceManager.resourceGroups()); } @Test public void testResourceStreaming() throws Exception { - new TestResourceStreaming(azure.storageAccounts()).runTest(azure.virtualMachines(), azure.resourceGroups()); + new TestResourceStreaming(azureResourceManager.storageAccounts()).runTest(azureResourceManager.virtualMachines(), azureResourceManager.resourceGroups()); } @Test public void testKubernetesCluster() throws Exception { - new TestKubernetesCluster().runTest(azure.kubernetesClusters(), azure.resourceGroups()); + new TestKubernetesCluster().runTest(azureResourceManager.kubernetesClusters(), azureResourceManager.resourceGroups()); } @Test public void testContainerInstanceWithPublicIpAddressWithSystemAssignedMsi() throws Exception { new TestContainerInstanceWithPublicIpAddressWithSystemAssignedMSI() - .runTest(azure.containerGroups(), azure.resourceGroups(), azure.subscriptionId()); + .runTest(azureResourceManager.containerGroups(), azureResourceManager.resourceGroups(), azureResourceManager.subscriptionId()); } @Test @@ -1168,7 +1168,7 @@ public void testContainerInstanceWithPublicIpAddressWithUserAssignedMsi() throws List dnsServers = new ArrayList(); dnsServers.add("dnsServer1"); ContainerGroup containerGroup = - azure + azureResourceManager .containerGroups() .define(cgName) .withRegion(Region.US_EAST2) @@ -1246,16 +1246,16 @@ public void testContainerInstanceWithPublicIpAddressWithUserAssignedMsi() throws // TODO: add network and dns testing when questions have been answered - ContainerGroup containerGroup2 = azure.containerGroups().getByResourceGroup(rgName, cgName); + ContainerGroup containerGroup2 = azureResourceManager.containerGroups().getByResourceGroup(rgName, cgName); List containerGroupList = - azure.containerGroups().listByResourceGroup(rgName).stream().collect(Collectors.toList()); + azureResourceManager.containerGroups().listByResourceGroup(rgName).stream().collect(Collectors.toList()); Assertions.assertTrue(containerGroupList.size() > 0); containerGroup.refresh(); Set containerGroupOperations = - azure.containerGroups().listOperations().stream().collect(Collectors.toSet()); + azureResourceManager.containerGroups().listOperations().stream().collect(Collectors.toSet()); // Number of supported operation can change hence don't assert with a predefined number. Assertions.assertTrue(containerGroupOperations.size() > 0); } @@ -1266,18 +1266,18 @@ public void testContainerInstanceWithPrivateIpAddress() throws Exception { // LIVE ONLY TEST BECAUSE IT REQUIRES SUBSCRIPTION ID if (!isPlaybackMode()) { new TestContainerInstanceWithPrivateIpAddress() - .runTest(azure.containerGroups(), azure.resourceGroups(), azure.subscriptionId()); + .runTest(azureResourceManager.containerGroups(), azureResourceManager.resourceGroups(), azureResourceManager.subscriptionId()); } } @Test public void testContainerRegistry() throws Exception { - new TestContainerRegistry().runTest(azure.containerRegistries(), azure.resourceGroups()); + new TestContainerRegistry().runTest(azureResourceManager.containerRegistries(), azureResourceManager.resourceGroups()); } @Test public void testCosmosDB() throws Exception { - new TestCosmosDB().runTest(azure.cosmosDBAccounts(), azure.resourceGroups()); + new TestCosmosDB().runTest(azureResourceManager.cosmosDBAccounts(), azureResourceManager.resourceGroups()); } // @Test @@ -1312,7 +1312,7 @@ public void generateMissingRegion() { StringBuilder sb = new StringBuilder(); PagedIterable locations = - azure + azureResourceManager .getCurrentSubscription() .listLocations(); // note the region is not complete since it depends on current subscription diff --git a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/VirtualNetworkGatewayTests.java b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/VirtualNetworkGatewayTests.java index 5778eb0880204..2fb0816ca98cd 100644 --- a/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/VirtualNetworkGatewayTests.java +++ b/sdk/resourcemanager/azure-resourcemanager/src/test/java/com/azure/resourcemanager/VirtualNetworkGatewayTests.java @@ -30,7 +30,7 @@ import java.util.List; public class VirtualNetworkGatewayTests extends ResourceManagerTestBase { - private Azure azure; + private AzureResourceManager azureResourceManager; @Override protected HttpPipeline buildHttpPipeline( @@ -55,9 +55,9 @@ protected void initializeClients(HttpPipeline httpPipeline, AzureProfile profile SdkContext.setDelayProvider(new TestDelayProvider(!isPlaybackMode())); SdkContext sdkContext = new SdkContext(); sdkContext.setIdentifierFunction(name -> new TestIdentifierProvider(testResourceNamer)); - Azure.Authenticated azureAuthed = - Azure.authenticate(httpPipeline, profile).withSdkContext(sdkContext); - azure = azureAuthed.withDefaultSubscription(); + AzureResourceManager.Authenticated azureAuthed = + AzureResourceManager.authenticate(httpPipeline, profile).withSdkContext(sdkContext); + azureResourceManager = azureAuthed.withDefaultSubscription(); } @Override @@ -71,12 +71,12 @@ public void testNetworkWatcherTroubleshooting() throws Exception { String connectionName = generateRandomResourceName("vngwc", 8); TestNetworkWatcher tnw = new TestNetworkWatcher(); - NetworkWatcher nw = tnw.createResource(azure.networkWatchers()); + NetworkWatcher nw = tnw.createResource(azureResourceManager.networkWatchers()); Region region = nw.region(); String resourceGroup = nw.resourceGroupName(); VirtualNetworkGateway vngw1 = - azure + azureResourceManager .virtualNetworkGateways() .define(gatewayName) .withRegion(region) @@ -87,7 +87,7 @@ public void testNetworkWatcherTroubleshooting() throws Exception { .create(); VirtualNetworkGateway vngw2 = - azure + azureResourceManager .virtualNetworkGateways() .define(gatewayName + "2") .withRegion(region) @@ -107,7 +107,7 @@ public void testNetworkWatcherTroubleshooting() throws Exception { // Create storage account to store troubleshooting information StorageAccount storageAccount = - azure + azureResourceManager .storageAccounts() .define("sa" + generateRandomResourceName("", 8)) .withRegion(region) @@ -142,7 +142,7 @@ public void testNetworkWatcherTroubleshooting() throws Exception { .execute(); Assertions.assertEquals("Healthy", troubleshooting.code()); - azure.resourceGroups().deleteByName(resourceGroup); + azureResourceManager.resourceGroups().deleteByName(resourceGroup); } /** @@ -152,8 +152,8 @@ public void testNetworkWatcherTroubleshooting() throws Exception { */ @Test public void testVirtualNetworkGateways() throws Exception { - new TestVirtualNetworkGateway().new Basic(azure.virtualNetworkGateways().manager()) - .runTest(azure.virtualNetworkGateways(), azure.resourceGroups()); + new TestVirtualNetworkGateway().new Basic(azureResourceManager.virtualNetworkGateways().manager()) + .runTest(azureResourceManager.virtualNetworkGateways(), azureResourceManager.resourceGroups()); } /** @@ -164,8 +164,8 @@ public void testVirtualNetworkGateways() throws Exception { */ @Test public void testVirtualNetworkGatewaySiteToSite() throws Exception { - new TestVirtualNetworkGateway().new SiteToSite(azure.virtualNetworkGateways().manager()) - .runTest(azure.virtualNetworkGateways(), azure.resourceGroups()); + new TestVirtualNetworkGateway().new SiteToSite(azureResourceManager.virtualNetworkGateways().manager()) + .runTest(azureResourceManager.virtualNetworkGateways(), azureResourceManager.resourceGroups()); } /** @@ -176,8 +176,8 @@ public void testVirtualNetworkGatewaySiteToSite() throws Exception { */ @Test public void testVirtualNetworkGatewayVNetToVNet() throws Exception { - new TestVirtualNetworkGateway().new VNetToVNet(azure.virtualNetworkGateways().manager()) - .runTest(azure.virtualNetworkGateways(), azure.resourceGroups()); + new TestVirtualNetworkGateway().new VNetToVNet(azureResourceManager.virtualNetworkGateways().manager()) + .runTest(azureResourceManager.virtualNetworkGateways(), azureResourceManager.resourceGroups()); } /** @@ -187,7 +187,7 @@ public void testVirtualNetworkGatewayVNetToVNet() throws Exception { */ @Test public void testVirtualNetworkGatewayPointToSite() throws Exception { - new TestVirtualNetworkGateway().new PointToSite(azure.virtualNetworkGateways().manager()) - .runTest(azure.virtualNetworkGateways(), azure.resourceGroups()); + new TestVirtualNetworkGateway().new PointToSite(azureResourceManager.virtualNetworkGateways().manager()) + .runTest(azureResourceManager.virtualNetworkGateways(), azureResourceManager.resourceGroups()); } } diff --git a/sdk/resourcemanager/docs/AUTH.md b/sdk/resourcemanager/docs/AUTH.md index bc3d1754b032c..a7409fd4cb1e7 100644 --- a/sdk/resourcemanager/docs/AUTH.md +++ b/sdk/resourcemanager/docs/AUTH.md @@ -78,7 +78,7 @@ Once the `TokenCredential` and `AzureProfile` are ready, you can move forward wi Azure azure = Azure.authenticate(credential, profile).withDefaultSubscription(); ``` -The `Authenticated` class provides access to a subset of Azure APIs that do not require a specific subscription. If the profile does not contain a subscription, you can select a subscription via [`Authenticated::subscriptions`](https://github.com/Azure/azure-sdk-for-java/blob/master/sdk/resourcemanager/azure-resourcemanager/src/main/java/com/azure/resourcemanager/Azure.java#L200). Similarly, you can select a tenant via [`Authenticated::tenants`](https://github.com/Azure/azure-sdk-for-java/blob/master/sdk/resourcemanager/azure-resourcemanager/src/main/java/com/azure/resourcemanager/Azure.java#L207). +The `Authenticated` class provides access to a subset of Azure APIs that do not require a specific subscription. If the profile does not contain a subscription, you can select a subscription via [`Authenticated::subscriptions`](https://github.com/Azure/azure-sdk-for-java/blob/master/sdk/resourcemanager/azure-resourcemanager/src/main/java/com/azure/resourcemanager/AzureResourceManager.java#L200). Similarly, you can select a tenant via [`Authenticated::tenants`](https://github.com/Azure/azure-sdk-for-java/blob/master/sdk/resourcemanager/azure-resourcemanager/src/main/java/com/azure/resourcemanager/AzureResourceManager.java#L207). ```java Azure.Authenticated authenticated = Azure.authenticate(credential, profile);