diff --git a/azure-mgmt-batch/src/main/java/com/microsoft/azure/management/batch/ApplicationPackage.java b/azure-mgmt-batch/src/main/java/com/microsoft/azure/management/batch/ApplicationPackage.java index 890af38802cae..30b31608790cf 100644 --- a/azure-mgmt-batch/src/main/java/com/microsoft/azure/management/batch/ApplicationPackage.java +++ b/azure-mgmt-batch/src/main/java/com/microsoft/azure/management/batch/ApplicationPackage.java @@ -7,7 +7,6 @@ package com.microsoft.azure.management.batch; import com.microsoft.azure.management.apigeneration.LangDefinition; -import com.microsoft.azure.management.apigeneration.Method; import com.microsoft.azure.management.batch.implementation.ApplicationPackageInner; import com.microsoft.azure.management.resources.fluentcore.arm.models.ExternalChildResource; import com.microsoft.azure.management.resources.fluentcore.model.Wrapper; @@ -56,13 +55,11 @@ public interface ApplicationPackage extends * * @param format format of the uploaded package supported values zip, tar */ - @Method void activate(String format); /** * Deletes the application package. */ - @Method void delete(); } diff --git a/azure-mgmt-batch/src/main/java/com/microsoft/azure/management/batch/BatchAccount.java b/azure-mgmt-batch/src/main/java/com/microsoft/azure/management/batch/BatchAccount.java index c32b9077acedf..52172451ee13e 100644 --- a/azure-mgmt-batch/src/main/java/com/microsoft/azure/management/batch/BatchAccount.java +++ b/azure-mgmt-batch/src/main/java/com/microsoft/azure/management/batch/BatchAccount.java @@ -7,6 +7,7 @@ package com.microsoft.azure.management.batch; import com.microsoft.azure.management.apigeneration.LangDefinition; +import com.microsoft.azure.management.apigeneration.Method; import com.microsoft.azure.management.batch.implementation.BatchAccountInner; import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource; import com.microsoft.azure.management.resources.fluentcore.arm.models.Resource; @@ -69,6 +70,7 @@ public interface BatchAccount extends /** * @return the access keys for this batch account */ + @Method BatchAccountKeys refreshKeys(); /** diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/AvailabilitySet.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/AvailabilitySet.java index d05f27608b26f..eace8c3b84df6 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/AvailabilitySet.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/AvailabilitySet.java @@ -27,47 +27,31 @@ public interface AvailabilitySet extends Wrapper, Updatable { + /** - * Returns the update domain count of an availability set. - *

- * An update domain represents the group of virtual - * machines and underlying physical hardware that can be rebooted at the same time. - * - * @return the update domain count + * @return the update domain count of this availability set */ int updateDomainCount(); /** - * Returns the fault domain count of availability set. - *

- * A fault domain represents the group of virtual - * machines that shares common power source and network switch. - * - * @return the fault domain count + * @return the fault domain count of this availability set */ int faultDomainCount(); /** - * Lists the resource IDs of the virtual machines in the availability set. - * - * @return list of resource ID strings + * @return the resource IDs of the virtual machines in the availability set */ List virtualMachineIds(); /** - * Lists the statuses of the existing virtual machines in the availability set. - * - * @return list of virtual machine statuses + * @return the statuses of the existing virtual machines in the availability set */ List statuses(); - - /************************************************************** - * Fluent interfaces to create an AvailabilitySet - **************************************************************/ + // Fluent interfaces /** - * Container interface for all the definitions. + * Container interface for all the definitions related to an availability set. */ interface Definition extends DefinitionStages.Blank, @@ -98,7 +82,7 @@ interface WithUpdateDomainCount { /** * Specifies the update domain count for the availability set. * @param updateDomainCount update domain count - * @return the next stage of the resource definition + * @return the next stage of the definition */ WithCreate withUpdateDomainCount(int updateDomainCount); } @@ -109,8 +93,8 @@ interface WithUpdateDomainCount { interface WithFaultDomainCount { /** * Specifies the fault domain count for the availability set. - * @param faultDomainCount fault domain count - * @return the next stage of the resource definition + * @param faultDomainCount the fault domain count + * @return the next stage of the definition */ WithCreate withFaultDomainCount(int faultDomainCount); } diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachine.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachine.java index 1c0b104c536f1..8c6c3f1fc5436 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachine.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachine.java @@ -2,8 +2,7 @@ import com.microsoft.azure.PagedList; import com.microsoft.azure.management.apigeneration.Fluent; -import com.microsoft.azure.management.apigeneration.LangMethodDefinition; -import com.microsoft.azure.management.apigeneration.LangMethodDefinition.LangMethodType; +import com.microsoft.azure.management.apigeneration.Method; import com.microsoft.azure.management.compute.implementation.VirtualMachineInner; import com.microsoft.azure.management.network.Network; import com.microsoft.azure.management.network.NetworkInterface; @@ -92,6 +91,7 @@ public interface VirtualMachine extends * * @return the refreshed instance view */ + @Method VirtualMachineInstanceView refreshInstanceView(); // Getters @@ -139,7 +139,6 @@ public interface VirtualMachine extends * * @return the public IP of the primary network interface */ - @LangMethodDefinition(AsType = LangMethodType.Method) PublicIpAddress getPrimaryPublicIpAddress(); /** diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineDataDisk.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineDataDisk.java index 1959e8612d9f8..6fafcda1646ca 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineDataDisk.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineDataDisk.java @@ -50,18 +50,9 @@ public interface VirtualMachineDataDisk extends String sourceImageUri(); /** - * Gets the create option used while creating this disk. - *

- * Possible values include: 'fromImage', 'empty', 'attach' - * 'fromImage' - if data disk was created from a user image - * 'attach' - if an existing vhd was usd to back the data disk - * 'empty' - if the disk was created as an empty disk - * when disk is created using 'fromImage' option, a copy of user image vhd will be created first - * and it will be used as the vhd to back the data disk. - * - * @return disk create option + * @return the creation method used while creating this disk */ - DiskCreateOptionTypes createOption(); + DiskCreateOptionTypes creationMethod(); // fluent (setters) @@ -268,7 +259,7 @@ interface WithAttach extends Attachable.InDefinition { /** The entirety of a data disk definition as part of a virtual machine update. * @param the return type of the final {@link UpdateDefinitionStages.WithAttach#attach()} */ - interface UpdateDefinition extends + interface UpdateDefinition extends UpdateDefinitionStages.Blank, UpdateDefinitionStages.WithAttach, UpdateDefinitionStages.WithStoreAt { diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineExtensionImage.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineExtensionImage.java index caf64f2dd4e2c..ee15afccc743e 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineExtensionImage.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineExtensionImage.java @@ -49,21 +49,16 @@ public interface VirtualMachineExtensionImage extends /** * @return the schema defined by publisher, where extension consumers should provide settings in a matching schema - *

- * Note this field will be null since server provide null for them */ String handlerSchema(); /** - * @return true if the extension can be used on xRP Virtual Machine ScaleSets. - *

- * Note by default existing extensions are usable on scale sets, but there might be cases where a publisher wants to - * explicitly indicate the extension is only enabled for Compute Resource Provider VMs but not Virtual Machine ScaleSets. + * @return true if the extension can be used with virtual machine scale sets, false otherwise */ - boolean vmScaleSetEnabled(); + boolean supportsVirtualMachineScaleSets(); /** - * @return true if the handler can support multiple extensions. + * @return true if the handler can support multiple extensions */ boolean supportsMultipleExtensions(); diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineImage.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineImage.java index ef45e4aef0b49..a805b81ff2759 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineImage.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineImage.java @@ -44,22 +44,22 @@ public interface VirtualMachineImage extends String version(); /** - * @return the image reference representing publisher, offer, sku and version of the virtual machine image + * @return the image reference representing the publisher, offer, SKU and version of the virtual machine image */ ImageReference imageReference(); /** - * @return the purchase plan for the virtual machine image. + * @return the purchase plan for the virtual machine image */ PurchasePlan plan(); /** - * @return description of the OS Disk image in the virtual machine image. + * @return OS disk image in the virtual machine image */ OSDiskImage osDiskImage(); /** - * @return description of the Data disk images in the virtual machine. + * @return data disk images in the virtual machine image */ List dataDiskImages(); } diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineOffer.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineOffer.java index ceda0158f1644..6abaed345c74a 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineOffer.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineOffer.java @@ -29,7 +29,7 @@ public interface VirtualMachineOffer { String name(); /** - * @return Virtual machine image SKUs available in this offer. + * @return virtual machine image SKUs available in this offer */ VirtualMachineSkus skus(); } diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachinePublisher.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachinePublisher.java index d0f2c93227a9f..81a151983be1f 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachinePublisher.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachinePublisher.java @@ -14,7 +14,7 @@ @Fluent public interface VirtualMachinePublisher { /** - * @return the region where virtual machine images from this publisher is available + * @return the region where virtual machine images from this publisher are available */ Region region(); @@ -29,7 +29,7 @@ public interface VirtualMachinePublisher { VirtualMachineOffers offers(); /** - * @return the virtual machine image extensions from this publisher. + * @return the virtual machine image extensions from this publisher */ VirtualMachineExtensionImageTypes extensionTypes(); } \ No newline at end of file diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSet.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSet.java index 1cc7058ae8455..50d2c2fa05501 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSet.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSet.java @@ -3,7 +3,6 @@ import com.microsoft.azure.CloudException; import com.microsoft.azure.PagedList; import com.microsoft.azure.management.apigeneration.Fluent; -import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.compute.implementation.VirtualMachineScaleSetInner; import com.microsoft.azure.management.network.Backend; import com.microsoft.azure.management.network.InboundNatPool; @@ -34,17 +33,15 @@ public interface VirtualMachineScaleSet extends // Actions // /** - * @return available skus for the virtual machine scale set including the minimum and maximum vm instances - * allowed for a particular sku + * @return available SKUs for the virtual machine scale set, including the minimum and maximum virtual machine instances + * allowed for a particular SKU * @throws CloudException thrown for an invalid response from the service * @throws IOException exception thrown from serialization/deserialization */ - PagedList availableSkus() throws CloudException, IOException; + PagedList listAvailableSkus() throws CloudException, IOException; /** - * Shuts down the Virtual Machine in the scale set and releases the compute resources. - *

- * You are not billed for the compute resources that the Virtual Machines uses. + * Shuts down the virtual machines in the scale set and releases its compute resources. * * @throws CloudException thrown for an invalid response from the service * @throws IOException exception thrown from serialization/deserialization @@ -53,9 +50,7 @@ public interface VirtualMachineScaleSet extends void deallocate() throws CloudException, IOException, InterruptedException; /** - * Power off (stop) the virtual machines in the scale set. - *

- * You will be billed for the compute resources that the Virtual Machines uses + * Powers off (stops) the virtual machines in the scale set. * * @throws CloudException thrown for an invalid response from the service * @throws IOException exception thrown from serialization/deserialization @@ -64,7 +59,7 @@ public interface VirtualMachineScaleSet extends void powerOff() throws CloudException, IOException, InterruptedException; /** - * Restart the virtual machines in the scale set. + * Restarts the virtual machines in the scale set. * * @throws CloudException thrown for an invalid response from the service * @throws IOException exception thrown from serialization/deserialization @@ -73,7 +68,7 @@ public interface VirtualMachineScaleSet extends void restart() throws CloudException, IOException, InterruptedException; /** - * Start the virtual machines in the scale set. + * Starts the virtual machines in the scale set. * * @throws CloudException thrown for an invalid response from the service * @throws IOException exception thrown from serialization/deserialization @@ -82,7 +77,7 @@ public interface VirtualMachineScaleSet extends void start() throws CloudException, IOException, InterruptedException; /** - * Re-image (update the version of the installed operating system) the virtual machines in the scale set. + * Re-images (updates the version of the installed operating system) the virtual machines in the scale set. * * @throws CloudException thrown for an invalid response from the service * @throws IOException exception thrown from serialization/deserialization @@ -104,7 +99,7 @@ public interface VirtualMachineScaleSet extends OperatingSystemTypes osType(); /** - * @return the operating system disk caching type, valid values are 'None', 'ReadOnly', 'ReadWrite' + * @return the operating system disk caching type */ CachingTypes osDiskCachingType(); @@ -142,7 +137,7 @@ public interface VirtualMachineScaleSet extends *

* @throws IOException the IO exception */ - Network primaryNetwork() throws IOException; + Network getPrimaryNetwork() throws IOException; /** * @return the internet-facing load balancer associated with the primary network interface of @@ -150,7 +145,7 @@ public interface VirtualMachineScaleSet extends * * @throws IOException the IO exception */ - LoadBalancer primaryInternetFacingLoadBalancer() throws IOException; + LoadBalancer getPrimaryInternetFacingLoadBalancer() throws IOException; /** * @return the internet-facing load balancer's backends associated with the primary network interface @@ -158,7 +153,7 @@ public interface VirtualMachineScaleSet extends * * @throws IOException the IO exception */ - Map primaryInternetFacingLoadBalancerBackends() throws IOException; + Map listPrimaryInternetFacingLoadBalancerBackends() throws IOException; /** * @return the internet-facing load balancer's inbound NAT pool associated with the primary network interface @@ -166,7 +161,7 @@ public interface VirtualMachineScaleSet extends * * @throws IOException the IO exception */ - Map primaryInternetFacingLoadBalancerInboundNatPools() throws IOException; + Map listPrimaryInternetFacingLoadBalancerInboundNatPools() throws IOException; /** * @return the internal load balancer associated with the primary network interface of @@ -174,7 +169,7 @@ public interface VirtualMachineScaleSet extends * * @throws IOException the IO exception */ - LoadBalancer primaryInternalLoadBalancer() throws IOException; + LoadBalancer getPrimaryInternalLoadBalancer() throws IOException; /** * @return the internal load balancer's backends associated with the primary network interface @@ -182,25 +177,25 @@ public interface VirtualMachineScaleSet extends * * @throws IOException the IO exception */ - Map primaryInternalLoadBalancerBackends() throws IOException; + Map listPrimaryInternalLoadBalancerBackends() throws IOException; /** - * @return the internal load balancer's inbound NAT pool associated with the primary network interface - * of the virtual machines in the scale set + * @return the inbound NAT pools of the internal load balancer associated with the primary network interface + * of the virtual machines in the scale set, if any. * * @throws IOException the IO exception */ - Map primaryInternalLoadBalancerInboundNatPools() throws IOException; + Map listPrimaryInternalLoadBalancerInboundNatPools() throws IOException; /** - * @return the list of IDs of public Ip addresses associated with the primary internet-facing load balancer + * @return the list of IDs of the public IP addresses associated with the primary Internet-facing load balancer * of the scale set * @throws IOException the IO exception */ List primaryPublicIpAddressIds() throws IOException; /** - * @return the URL to storage containers that store vhds of virtual machines in the scale set + * @return the URL to storage containers that store the VHDs of the virtual machines in the scale set */ List vhdContainers(); @@ -222,7 +217,6 @@ public interface VirtualMachineScaleSet extends /** * The entirety of the load balancer definition. */ - @LangDefinition(ContainerName = "~/VirtualMachineScaleSet.Definition", ContainerFileName = "IDefinition") interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, @@ -245,7 +239,6 @@ interface Definition extends /** * Grouping of virtual machine scale set definition stages. */ - @LangDefinition(ContainerName = "~/VirtualMachineScaleSet.Definition", ContainerFileName = "IDefinition", IsContainerOnly = true) interface DefinitionStages { /** * The first stage of a virtual machine scale set definition. @@ -255,21 +248,21 @@ interface Blank } /** - * The stage of the virtual machine scale set definition allowing to specify the resource group. + * The stage of a virtual machine scale set definition allowing to specify the resource group. */ interface WithGroup extends GroupableResource.DefinitionStages.WithGroup { } /** - * The stage of the virtual machine scale set definition allowing to specify SKU for the virtual machines. + * The stage of a virtual machine scale set definition allowing to specify SKU for the virtual machines. */ interface WithSku { /** * Specifies the SKU for the virtual machines in the scale set. * * @param skuType the SKU type - * @return the stage representing creatable VM scale set definition + * @return the next stage of the definition */ WithNetworkSubnet withSku(VirtualMachineScaleSetSkuTypes skuType); @@ -277,13 +270,13 @@ interface WithSku { * Specifies the SKU for the virtual machines in the scale set. * * @param sku a SKU from the list of available sizes for the virtual machines in this scale set - * @return the stage representing creatable VM scale set definition + * @return the next stage of the definition */ WithNetworkSubnet withSku(VirtualMachineScaleSetSku sku); } /** - * The stage of the virtual machine scale set definition allowing to specify the virtual network subnet for the + * The stage of a virtual machine scale set definition allowing to specify the virtual network subnet for the * primary network configuration. */ interface WithNetworkSubnet { @@ -293,49 +286,47 @@ interface WithNetworkSubnet { * * @param network an existing virtual network * @param subnetName the subnet name - * @return the next stage of the virtual machine scale set definition + * @return the next stage of the definition */ WithPrimaryInternetFacingLoadBalancer withExistingPrimaryNetworkSubnet(Network network, String subnetName); } /** - * The stage of the virtual machine scale set definition allowing to specify a public load balancer for + * The stage of a virtual machine scale set definition allowing to specify an Internet-facing load balancer for * the primary network interface of the virtual machines in the scale set. */ interface WithPrimaryInternetFacingLoadBalancer { /** - * Specify the Internet-facing load balancer whose backends and/or NAT pools can be assigned to the primary + * Specifies an Internet-facing load balancer whose backends and/or NAT pools can be assigned to the primary * network interfaces of the virtual machines in the scale set. *

- * By default all the backends and inbound NAT pools of the load balancer will be associated with the primary - * network interface of the scale set virtual machines unless subset of them is selected in the next stages - * {@link WithPrimaryInternetFacingLoadBalancerBackendOrNatPool}. + * By default, all the backends and inbound NAT pools of the load balancer will be associated with the primary + * network interface of the scale set virtual machines. *

- * @param loadBalancer an existing public load balancer + * @param loadBalancer an existing Internet-facing load balancer * @return the next stage of the definition */ WithPrimaryInternetFacingLoadBalancerBackendOrNatPool withPrimaryInternetFacingLoadBalancer(LoadBalancer loadBalancer); /** - * Specifies that no public load balancer needs to be associated with the virtual machine scale set. + * Specifies that no public load balancer should be associated with the virtual machine scale set. * - * @return the next stage of the virtual machine scale set definition + * @return the next stage of the definition */ WithPrimaryInternalLoadBalancer withoutPrimaryInternetFacingLoadBalancer(); } /** - * The stage of the virtual machine scale set definition allowing to specify an internal load balancer for + * The stage of a virtual machine scale set definition allowing to specify an internal load balancer for * the primary network interface of the virtual machines in the scale set. */ interface WithPrimaryInternalLoadBalancer { /** - * Specify the internal load balancer where it's backends and/or NAT pools can be assigned to the primary network - * interface of the scale set virtual machines. + * Specifies the internal load balancer whose backends and/or NAT pools can be assigned to the primary network + * interface of the virtual machines in the scale set. *

* By default all the backends and inbound NAT pools of the load balancer will be associated with the primary - * network interface of the scale set virtual machines unless subset of them is selected in the next stages - * {@link WithInternalLoadBalancerBackendOrNatPool}. + * network interface of the virtual machines in the scale set, unless subset of them is selected in the next stages. *

* @param loadBalancer an existing internal load balancer * @return the next stage of the definition @@ -343,64 +334,62 @@ interface WithPrimaryInternalLoadBalancer { WithInternalLoadBalancerBackendOrNatPool withPrimaryInternalLoadBalancer(LoadBalancer loadBalancer); /** - * Specifies that no internal load balancer needs to be associated with primary network interface of the + * Specifies that no internal load balancer should be associated with the primary network interfaces of the * virtual machines in the scale set. * - * @return the next stage of the virtual machine scale set definition + * @return the next stage of the definition */ WithOS withoutPrimaryInternalLoadBalancer(); } /** - * The stage of the virtual machine scale set definition allowing to associate backend pool and/or inbound NAT pool - * of the internet-facing load balancer selected in the previous state {@link WithPrimaryInternetFacingLoadBalancer} - * with the primary network interface of the virtual machines in the scale set. + * The stage of a virtual machine scale set definition allowing to associate a backend pool and/or an inbound NAT pool + * of the selected Internet-facing load balancer with the primary network interface of the virtual machines in the scale set. */ interface WithPrimaryInternetFacingLoadBalancerBackendOrNatPool extends WithPrimaryInternetFacingLoadBalancerNatPool { /** - * Associate internet-facing load balancer backends with the primary network interface of the the virtual machines in the scale set. + * Associates the specified backends of the selected load balancer with the primary network interface of the + * virtual machines in the scale set. * - * @param backendNames the backend names - * @return the next stage of the virtual machine scale set definition + * @param backendNames the names of existing backends in the selected load balancer + * @return the next stage of the definition */ WithPrimaryInternetFacingLoadBalancerNatPool withPrimaryInternetFacingLoadBalancerBackends(String ...backendNames); } /** - * The stage of the virtual machine scale set definition allowing to associate inbound NAT pool of the internet - * facing load balancer selected in the previous state {@link WithPrimaryInternetFacingLoadBalancer} with the - * primary network interface of the scale set virtual machines. + * The stage of a virtual machine scale set definition allowing to associate an inbound NAT pool of the selected + * Internet-facing load balancer with the primary network interface of the virtual machines in the scale set. */ interface WithPrimaryInternetFacingLoadBalancerNatPool extends WithPrimaryInternalLoadBalancer { /** - * Associate internet-facing load balancer inbound NAT pools with the the primary network interface of the - * scale set virtual machines. + * Associates the specified inbound NAT pools of the selected internal load balancer with the primary network + * interface of the virtual machines in the scale set. * - * @param natPoolNames the inbound NAT pool names - * @return the next stage of the virtual machine scale set definition + * @param natPoolNames inbound NAT pools names existing on the selected load balancer + * @return the next stage of the definition */ WithPrimaryInternalLoadBalancer withPrimaryInternetFacingLoadBalancerInboundNatPools(String ...natPoolNames); } /** - * The stage of the virtual machine scale set definition allowing to associate backend pool and/or inbound NAT pool - * of the internal load balancer selected in the previous state {@link WithPrimaryInternalLoadBalancer} with the - * primary network interface of the scale set virtual machines. + * The stage of a virtual machine scale set definition allowing to associate backend pools and/or inbound NAT pools + * of the selected internal load balancer with the primary network interface of the virtual machines in the scale set. */ interface WithInternalLoadBalancerBackendOrNatPool extends WithCreate { /** - * Associate internal load balancer backends with the primary network interface of the virtual machines in the scale set. + * Associates the specified backends of the selected load balancer with the primary network interface of the + * virtual machines in the scale set. * - * @param backendNames the backend names + * @param backendNames names of existing backends in the selected load balancer * @return the next stage of the virtual machine scale set definition */ WithInternalInternalLoadBalancerNatPool withPrimaryInternalLoadBalancerBackends(String ...backendNames); } /** - * The stage of the virtual machine scale set definition allowing to associate inbound NAT pool of the internal - * load balancer selected in the previous state {@link WithPrimaryInternalLoadBalancer} with the primary network - * interface of the scale set virtual machines. + * The stage of the virtual machine scale set definition allowing to associate inbound NAT pools of the selected + * internal load balancer with the primary network interface of the virtual machines in the scale set. */ interface WithInternalInternalLoadBalancerNatPool extends WithOS { /** @@ -415,81 +404,73 @@ interface WithInternalInternalLoadBalancerNatPool extends WithOS { } /** - * The stage of the virtual machine scale set definition allowing to specify the Operation System image. + * The stage of the virtual machine scale set definition allowing to specify the operating system image. */ interface WithOS { /** - * Specifies the known marketplace Windows image used as OS for virtual machines in the scale set. + * Specifies a known marketplace Windows image used as the operating system for the virtual machines in the scale set. * - * @param knownImage enum value indicating known market-place image - * @return the next stage of the virtual machine scale set definition + * @param knownImage a known market-place image + * @return the next stage of the definition */ WithAdminUserName withPopularWindowsImage(KnownWindowsVirtualMachineImage knownImage); /** - * Specifies that the latest version of a marketplace Windows image needs to be used. + * Specifies that the latest version of the specified marketplace Windows image should be used. * * @param publisher specifies the publisher of the image * @param offer specifies the offer of the image * @param sku specifies the SKU of the image - * @return the next stage of the virtual machine scale set definition + * @return the next stage of the definition */ WithAdminUserName withLatestWindowsImage(String publisher, String offer, String sku); /** - * Specifies the version of a marketplace Windows image needs to be used. + * Specifies the specific version of a marketplace Windows image needs to be used. * - * @param imageReference describes publisher, offer, SKU and version of the market-place image - * @return the next stage of the virtual machine scale set definition + * @param imageReference describes publisher, offer, SKU and version of the marketplace image + * @return the next stage of the definition */ WithAdminUserName withSpecificWindowsImageVersion(ImageReference imageReference); /** - * Specifies the user (custom) Windows image used for as the OS for virtual machines in the + * Specifies the user (custom) Windows image to be used as the operating system for the virtual machines in the * scale set. - *

- * Custom images are currently limited to single storage account and the number of virtual machines - * in the scale set that can be created using custom image is limited to 40 when over provision - * is disabled {@link WithOverProvision} and up to 20 when enabled. - *

- * @param imageUrl the url the the VHD + * + * @param imageUrl the URL of the VHD * @return the next stage of the virtual machine scale set definition */ WithAdminUserName withStoredWindowsImage(String imageUrl); /** - * Specifies the known marketplace Linux image used for the virtual machine's OS. + * Specifies a known marketplace Linux image used as the virtual machine's operating system. * - * @param knownImage enum value indicating known market-place image - * @return the next stage of the virtual machine scale set definition + * @param knownImage a known market-place image + * @return the next stage of the definition */ WithRootUserName withPopularLinuxImage(KnownLinuxVirtualMachineImage knownImage); /** - * Specifies that the latest version of a marketplace Linux image needs to be used. + * Specifies that the latest version of a marketplace Linux image should be used. * - * @param publisher specifies the publisher of the image - * @param offer specifies the offer of the image - * @param sku specifies the SKU of the image - * @return the next stage of the virtual machine scale set definition + * @param publisher the publisher of the image + * @param offer the offer of the image + * @param sku the SKU of the image + * @return the next stage of the definition */ WithRootUserName withLatestLinuxImage(String publisher, String offer, String sku); /** - * Specifies the version of a market-place Linux image needs to be used. + * Specifies the specific version of a market-place Linux image that should be used. * - * @param imageReference describes publisher, offer, SKU and version of the market-place image - * @return the next stage of the virtual machine scale set definition + * @param imageReference describes the publisher, offer, SKU and version of the market-place image + * @return the next stage of the definition */ WithRootUserName withSpecificLinuxImageVersion(ImageReference imageReference); /** - * Specifies the user (custom) Linux image used for the virtual machine's OS. - *

- * Custom images are currently limited to single storage account and the number of virtual machines - * in the scale set that can be created using custom image is limited to 40 when over provision - * is disabled {@link WithOverProvision} and up to 20 when enabled. - *

+ * Specifies the user (custom) Linux image used as the virtual machine's operating system. + * * @param imageUrl the url the the VHD * @return the next stage of the virtual machine scale set definition */ @@ -497,33 +478,33 @@ interface WithOS { } /** - * The stage of the Linux virtual machine scale set definition allowing to specify root user name. + * The stage of a Linux virtual machine scale set definition allowing to specify the root user name. */ interface WithRootUserName { /** * Specifies the root user name for the Linux virtual machines in the scale set. * - * @param rootUserName the Linux root user name. This must follow the required naming convention for Linux user name - * @return the next stage of the Linux virtual machine scale set definition + * @param rootUserName a Linux root user name, following the required naming convention for Linux user names + * @return the next stage of the definition */ WithLinuxCreate withRootUserName(String rootUserName); } /** - * The stage of the Windows virtual machine scale set definition allowing to specify administrator user name. + * The stage of a Windows virtual machine scale set definition allowing to specify the administrator user name. */ interface WithAdminUserName { /** * Specifies the administrator user name for the Windows virtual machines in the scale set. * - * @param adminUserName the Windows administrator user name. This must follow the required naming convention for Windows user name - * @return the stage representing creatable Windows VM scale set definition + * @param adminUserName a Windows administrator user name, following the required naming convention for Windows user names + * @return the next stage of the definition */ WithWindowsCreate withAdminUserName(String adminUserName); } /** - * The stage of the Linux virtual machine scale set definition which contains all the minimum required inputs + * The stage of a Linux virtual machine scale set definition which contains all the minimum required inputs * for the resource to be created (via {@link WithCreate#create()}), but also allows for any other optional * settings to be specified. * @@ -534,88 +515,88 @@ interface WithLinuxCreate extends WithCreate { *

* Each call to this method adds the given public key to the list of VM's public keys. * - * @param publicKey the SSH public key in PEM format. - * @return the stage representing creatable Linux VM scale set definition + * @param publicKey an SSH public key in the PEM format. + * @return the next stage of the definition */ WithLinuxCreate withSsh(String publicKey); } /** - * The stage of the Windows virtual machine scale set definition which contains all the minimum required + * The stage of a Windows virtual machine scale set definition which contains all the minimum required * inputs for the resource to be created (via {@link WithCreate#create()}, but also allows for any other * optional settings to be specified. * */ interface WithWindowsCreate extends WithCreate { /** - * Specifies that VM Agent should be provisioned. + * Enables the VM agent. * - * @return the stage representing creatable Windows VM scale set definition + * @return the next stage of the definition */ WithWindowsCreate withVmAgent(); /** - * Specifies that VM Agent should not be provisioned. + * Disables the VM agent. * - * @return the stage representing creatable Windows VM scale set definition + * @return the next stage of the definition */ WithWindowsCreate withoutVmAgent(); /** - * Specifies that automatic updates should be enabled. + * Enables automatic updates. * - * @return the stage representing creatable Windows VM scale set definition + * @return the next stage of the definition */ WithWindowsCreate withAutoUpdate(); /** - * Specifies that automatic updates should be disabled. + * Disables automatic updates. * - * @return the stage representing creatable Windows VM scale set definition + * @return the next stage of the definition */ WithWindowsCreate withoutAutoUpdate(); /** - * Specifies the time-zone. + * Specifies the time zone for the virtual machines to use. * - * @param timeZone the timezone - * @return the stage representing creatable Windows VM scale set definition + * @param timeZone a time zone + * @return the next stage of the definition */ WithWindowsCreate withTimeZone(String timeZone); /** - * Specifies the WINRM listener. + * Specifies the WinRM listener. *

* Each call to this method adds the given listener to the list of VM's WinRM listeners. * - * @param listener the WinRmListener - * @return the stage representing creatable Windows VM scale set definition + * @param listener a WinRm listener + * @return the next stage of the definition */ WithWindowsCreate withWinRm(WinRMListener listener); } /** - * The stage of the virtual machine scale set definition allowing to specify password. + * The stage of a virtual machine scale set definition allowing to specify the password. */ interface WithPassword { /** * Specifies the password for the virtual machines in the scale set. * - * @param password the password, this must follow the criteria for Azure VM password - * @return the stage representing creatable VM scale set definition + * @param password a password following the requirements for Azure virtual machine passwords + * @return the next stage of the definition */ WithCreate withPassword(String password); } /** - * The stage of the virtual machine scale set definition allowing to specify the computer name prefix. + * The stage of a virtual machine scale set definition allowing to specify the computer name prefix. */ interface WithComputerNamePrefix { /** - * Specifies the bane prefix for the virtual machines in the scale set. + * Specifies the name prefix to use for auto-generating the names for the virtual machines in the scale set. * - * @param namePrefix the prefix for the name of virtual machines in the scale set - * @return the stage representing creatable VM scale set definition + * @param namePrefix the prefix for the auto-generated names of the virtual machines in the scale set + * @return the next stage of the definition */ WithCreate withComputerNamePrefix(String namePrefix); } @@ -626,118 +607,118 @@ interface WithComputerNamePrefix { */ interface WithCapacity { /** - * Specifies the number of virtual machines in the scale set. + * Specifies the maximum number of virtual machines in the scale set. * * @param capacity the virtual machine capacity - * @return the stage representing creatable VM scale set definition + * @return the next stage of the definition */ WithCreate withCapacity(int capacity); } /** - * The stage of the virtual machine scale set definition allowing to specify upgrade policy. + * The stage of a virtual machine scale set definition allowing to specify the upgrade policy. */ interface WithUpgradePolicy { /** - * Specifies virtual machine scale set upgrade policy mode. + * Specifies the virtual machine scale set upgrade policy mode. * - * @param upgradeMode upgrade policy mode - * @return the stage representing creatable VM scale set definition + * @param upgradeMode an upgrade policy mode + * @return the next stage of the definition */ WithCreate withUpgradeMode(UpgradeMode upgradeMode); } /** - * The stage of the virtual machine scale set definition allowing to specify whether - * or not over provision virtual machines in the scale set. + * The stage of a virtual machine scale set definition allowing to specify whether + * or not to over-provision virtual machines in the scale set. */ interface WithOverProvision { /** - * Enable or disable over provisioning of virtual machines in the scale set. + * Enables or disables over-provisioning of virtual machines in the scale set. * - * @param enabled true to enable over provisioning of virtual machines in the - * scale set - * @return Enable over provision of virtual machines + * @param enabled true if enabling over-0provisioning of virtual machines in the + * scale set, otherwise false + * @return the next stage of the definition */ WithCreate withOverProvision(boolean enabled); /** - * Enable over provision of virtual machines. + * Enables over-provisioning of virtual machines. * - * @return the stage representing creatable VM scale set definition + * @return the next stage of the definition */ - WithCreate withOverProvisionEnabled(); + WithCreate withOverProvisioning(); /** - * Disable over provision of virtual machines. + * Disables over-provisioning of virtual machines. * - * @return the stage representing creatable VM scale set definition + * @return the next stage of the definition */ - WithCreate withOverProvisionDisabled(); + WithCreate withoutOverProvisioning(); } /** - * The stage of the virtual machine scale set definition allowing to specify OS disk configurations. + * The stage of a virtual machine scale set definition allowing to specify OS disk configurations. */ interface WithOsDiskSettings { /** - * Specifies the caching type for the Operating System disk. + * Specifies the caching type for the operating system disk. * * @param cachingType the caching type - * @return the stage representing creatable VM scale set definition + * @return the next stage of the definition */ WithCreate withOsDiskCaching(CachingTypes cachingType); /** - * Specifies the name for the OS Disk. + * Specifies the name for the OS disk. * - * @param name the OS Disk name - * @return the stage representing creatable VM scale set definition + * @param name the OS disk name + * @return the next stage of the definition */ WithCreate withOsDiskName(String name); } /** - * The stage of the virtual machine scale set definition allowing to specify storage account. + * The stage of a virtual machine scale set definition allowing to specify the storage account. */ interface WithStorageAccount { /** - * Specifies the name of a new storage account to put the OS and data disk VHD of the virtual machines + * Specifies a new storage account for the OS and data disk VHDs of the virtual machines * in the scale set. * * @param name the name of the storage account - * @return the stage representing creatable VM scale set definition + * @return the next stage of the definition */ WithCreate withNewStorageAccount(String name); /** - * Specifies definition of a not-yet-created storage account definition - * to put OS and data disk VHDs of virtual machines in the scale set. + * Specifies a new storage account for the OS and data disk VHDs of the virtual machines + * in the scale set. * - * @param creatable the storage account in creatable stage - * @return the stage representing creatable VM scale set definition + * @param creatable the storage account definition in a creatable stage + * @return the next stage in the definition */ WithCreate withNewStorageAccount(Creatable creatable); /** - * Specifies an existing {@link StorageAccount} storage account to put the OS and data disk VHD of - * virtual machines in the scale set. + * Specifies an existing {@link StorageAccount} for the OS and data disk VHDs of + * the virtual machines in the scale set. * * @param storageAccount an existing storage account - * @return the stage representing creatable VM scale set definition + * @return the next stage in the definition */ WithCreate withExistingStorageAccount(StorageAccount storageAccount); } /** - * The stage of the virtual machine definition allowing to specify extensions. + * The stage of a virtual machine definition allowing to specify extensions. */ interface WithExtension { /** - * Specifies definition of an extension to be attached to the virtual machines in the scale set. + * Begins the definition of an extension reference to be attached to the virtual machines in the scale set. * * @param name the reference name for the extension - * @return the stage representing configuration for the extension + * @return the first stage of the extension reference definition */ VirtualMachineScaleSetExtension.DefinitionStages.Blank defineNewExtension(String name); } @@ -764,125 +745,117 @@ interface WithCreate extends /** * Grouping of virtual machine scale set update stages. */ - @LangDefinition(ContainerName = "~/VirtualMachineScaleSet.Update", ContainerFileName = "IUpdate", IsContainerOnly = true) interface UpdateStages { /** - * The stage of the virtual machine scale set update allowing to specify load balancers for the primary + * The stage of a virtual machine scale set update allowing to specify load balancers for the primary * network interface of the scale set virtual machines. */ interface WithPrimaryLoadBalancer extends WithPrimaryInternalLoadBalancer { /** - * Specifies load balancer to tbe used as the internet-facing load balancer for the virtual machines in the + * Specifies the load balancer to be used as the Internet-facing load balancer for the virtual machines in the * scale set. *

* This will replace the current internet-facing load balancer associated with the virtual machines in the * scale set (if any). * By default all the backend and inbound NAT pool of the load balancer will be associated with the primary - * network interface of the scale set virtual machines unless subset of them is selected in the next stages - * {@link WithPrimaryInternetFacingLoadBalancerBackendOrNatPool}. - *

- * @param loadBalancer the primary internet-facing load balancer - * @return the next stage of the virtual machine scale set update allowing to choose backends or inbound - * nat pool from the load balancer. + * network interface of the virtual machines unless a subset of them is selected in the next stages + * @param loadBalancer the primary Internet-facing load balancer + * @return the next stage of the update */ WithPrimaryInternetFacingLoadBalancerBackendOrNatPool withPrimaryInternetFacingLoadBalancer(LoadBalancer loadBalancer); } /** - * The stage of the virtual machine scale set update allowing to associate backend pool and/or inbound NAT pool - * of the internet-facing load balancer selected in the previous state {@link WithPrimaryLoadBalancer} - * with the primary network interface of the scale set virtual machines. + * The stage of a virtual machine scale set update allowing to associate a backend pool and/or inbound NAT pool + * of the selected Internet-facing load balancer with the primary network interface of the virtual machines in + * the scale set. */ interface WithPrimaryInternetFacingLoadBalancerBackendOrNatPool extends WithPrimaryInternetFacingLoadBalancerNatPool { /** - * Associate internet-facing load balancer backends with the primary network interface of the scale set virtual machines. + * Associates the specified Internet-facing load balancer backends with the primary network interface of the + * virtual machines in the scale set. * * @param backendNames the backend names - * @return the next stage of the virtual machine scale set update allowing to choose inbound nat pool from - * the load balancer + * @return the next stage of the update */ WithPrimaryInternetFacingLoadBalancerNatPool withPrimaryInternetFacingLoadBalancerBackends(String ...backendNames); } /** - * The stage of the virtual machine scale set update allowing to associate inbound NAT pool of the internet - * facing load balancer selected in the previous state {@link WithPrimaryLoadBalancer} with the - * primary network interface of the scale set virtual machines. + * The stage of a virtual machine scale set update allowing to associate an inbound NAT pool of the selected + * Internet-facing load balancer with the primary network interface of the virtual machines in the scale set. */ interface WithPrimaryInternetFacingLoadBalancerNatPool extends WithPrimaryInternalLoadBalancer { /** - * Associate internet-facing load balancer inbound NAT pools with the the primary network interface of the - * scale set virtual machines. + * Associates inbound NAT pools of the selected Internet-facing load balancer with the primary network interface + * of the virtual machines in the scale set. * - * @param natPoolNames the inbound NAT pool names - * @return the next stage of the virtual machine scale set update + * @param natPoolNames the names of existing inbound NAT pools on the selected load balancer + * @return the next stage of the update */ WithPrimaryInternalLoadBalancer withPrimaryInternetFacingLoadBalancerInboundNatPools(String ...natPoolNames); } /** - * The stage of the virtual machine scale set update allowing to specify an internal load balancer for + * The stage of a virtual machine scale set update allowing to specify an internal load balancer for * the primary network interface of the scale set virtual machines. */ interface WithPrimaryInternalLoadBalancer extends WithApply { /** - * Specifies load balancer to tbe used as the internal load balancer for the virtual machines in the + * Specifies the load balancer to be used as the internal load balancer for the virtual machines in the * scale set. *

* This will replace the current internal load balancer associated with the virtual machines in the * scale set (if any). - * By default all the backend and inbound NAT pool of the load balancer will be associated with the primary - * network interface of the scale set virtual machines unless subset of them is selected in the next stages - * {@link WithPrimaryInternalLoadBalancerBackendOrNatPool}. + * By default all the backends and inbound NAT pools of the load balancer will be associated with the primary + * network interface of the virtual machines in the scale set unless subset of them is selected in the next stages. *

- * @param loadBalancer the primary internet-facing load balancer - * @return the next stage of the virtual machine scale set update allowing to choose backends or inbound - * nat pool from the load balancer + * @param loadBalancer the primary Internet-facing load balancer + * @return the next stage of the update */ WithPrimaryInternalLoadBalancerBackendOrNatPool withPrimaryInternalLoadBalancer(LoadBalancer loadBalancer); } /** - * The stage of the virtual machine scale set update allowing to associate backend pool and/or inbound NAT pool - * of the internal load balancer selected in the previous state {@link WithPrimaryInternalLoadBalancer} - * with the primary network interface of the scale set virtual machines. + * The stage of a virtual machine scale set update allowing to associate backend pools and/or inbound NAT pools + * of the selected internal load balancer with the primary network interface of the scale set virtual machines. */ interface WithPrimaryInternalLoadBalancerBackendOrNatPool extends WithPrimaryInternalLoadBalancerNatPool { /** - * Associate internal load balancer backends with the primary network interface of the scale set virtual machines. + * Associates the specified internal load balancer backends with the primary network interface of the + * virtual machines in the scale set. * - * @param backendNames the backend names - * @return the next stage of the virtual machine scale set update allowing to choose inbound nat pool from - * the load balancer + * @param backendNames the names of existing backends on the selected load balancer + * @return the next stage of the update */ WithPrimaryInternalLoadBalancerNatPool withPrimaryInternalLoadBalancerBackends(String ...backendNames); } /** - * The stage of the virtual machine scale set update allowing to associate inbound NAT pool of the internal - * load balancer selected in the previous state {@link WithPrimaryInternalLoadBalancer} with the primary network - * interface of the scale set virtual machines. + * The stage of a virtual machine scale set update allowing to associate inbound NAT pools of the selected internal + * load balancer with the primary network interface of the virtual machines in the scale set. */ interface WithPrimaryInternalLoadBalancerNatPool extends WithApply { /** - * Associate internet-facing load balancer inbound NAT pools with the the primary network interface of the - * scale set virtual machines. + * Associates the specified internal load balancer inbound NAT pools with the the primary network interface of + * the virtual machines in the scale set. * - * @param natPoolNames the inbound NAT pool names - * @return the next stage of the virtual machine scale set update + * @param natPoolNames the names of existing inbound NAT pools in the selected load balancer + * @return the next stage of the update */ WithApply withPrimaryInternalLoadBalancerInboundNatPools(String ...natPoolNames); } /** - * The stage of the virtual machine scale set update allowing to change SKU for the virtual machines in the scale set. + * The stage of a virtual machine scale set update allowing to change the SKU for the virtual machines + * in the scale set. */ interface WithSku { /** * Specifies the SKU for the virtual machines in the scale set. * * @param skuType the SKU type - * @return the next stage of the virtual machine scale set update + * @return the next stage of the update */ WithApply withSku(VirtualMachineScaleSetSkuTypes skuType); @@ -890,21 +863,21 @@ interface WithSku { * Specifies the SKU for the virtual machines in the scale set. * * @param sku a SKU from the list of available sizes for the virtual machines in this scale set - * @return the next stage of the virtual machine scale set update + * @return the next stage of the update */ WithApply withSku(VirtualMachineScaleSetSku sku); } /** - * The stage of the virtual machine scale set definition allowing to specify number of + * The stage of a virtual machine scale set definition allowing to specify the number of * virtual machines in the scale set. */ interface WithCapacity { /** * Specifies the new number of virtual machines in the scale set. * - * @param capacity the virtual machine capacity - * @return the next stage of the virtual machine scale set update + * @param capacity the virtual machine capacity of the scale set + * @return the next stage of the update */ WithApply withCapacity(int capacity); } @@ -914,10 +887,10 @@ interface WithCapacity { */ interface WithExtension { /** - * Specifies definition of an extension to be attached to the virtual machines in the scale set. + * Begins the definition of an extension reference to be attached to the virtual machines in the scale set. * - * @param name the reference name for the extension - * @return the stage representing configuration for the extension + * @param name the reference name for an extension + * @return the first stage of the extension reference definition */ VirtualMachineScaleSetExtension .UpdateDefinitionStages @@ -927,90 +900,89 @@ interface WithExtension { * Begins the description of an update of an existing extension assigned to the virtual machines in the scale set. * * @param name the reference name for the extension - * @return the stage representing updatable extension definition + * @return the first stage of the extension reference update */ VirtualMachineScaleSetExtension.Update updateExtension(String name); /** - * Detaches an extension with the given name from the virtual machines in the scale set. + * Removes the extension with the specified name from the virtual machines in the scale set. * - * @param name the reference name for the extension to be removed/uninstalled - * @return the stage representing updatable VM scale set definition + * @param name the reference name of the extension to be removed/uninstalled + * @return the next stage of the update */ WithApply withoutExtension(String name); } /** - * Stage of the virtual machine scale set update allowing to remove public and internal load balancer + * The stage of a virtual machine scale set update allowing to remove the public and internal load balancer * from the primary network interface configuration. */ interface WithoutPrimaryLoadBalancer { /** - * Remove the internet-facing load balancer associated to the primary network interface configuration. + * Removes the association between the Internet-facing load balancer and the primary network interface configuration. *

- * This removes the association between primary network interface configuration and all backend and + * This removes the association between primary network interface configuration and all the backends and * inbound NAT pools in the load balancer. - *

* - * @return the next stage of the virtual machine scale set update + * @return the next stage of the update */ WithApply withoutPrimaryInternetFacingLoadBalancer(); /** - * Remove the internal load balancer associated to the primary network interface configuration. + * Removes the association between the internal load balancer and the primary network interface configuration. *

- * This removes the association between primary network interface configuration and all backend and + * This removes the association between primary network interface configuration and all the backends and * inbound NAT pools in the load balancer. - *

* - * @return the next stage of the virtual machine scale set update + * @return the next stage of the update */ WithApply withoutPrimaryInternalLoadBalancer(); } /** - * Stage of the virtual machine scale set update allowing to remove association between the primary network interface - * configuration and backend of the load balancer. + * The stage of a virtual machine scale set update allowing to remove the association between the primary network + * interface configuration and a backend of a load balancer. */ interface WithoutPrimaryLoadBalancerBackend { /** - * Removes association between the primary network interface configuration and backend of the internet-facing - * load balancer. + * Removes the associations between the primary network interface configuration and the specfied backends + * of the Internet-facing load balancer. * - * @param backendNames the existing backend names to remove - * @return the next stage of the virtual machine scale set update + * @param backendNames existing backend names + * @return the next stage of the update */ WithApply withoutPrimaryInternetFacingLoadBalancerBackends(String ...backendNames); /** - * Removes association between the primary network interface configuration and backend of the internal load balancer. + * Removes the associations between the primary network interface configuration and the specified backends + * of the internal load balancer. * - * @param backendNames the existing backend names to remove - * @return the next stage of the virtual machine scale set update + * @param backendNames existing backend names + * @return the next stage of the update */ WithApply withoutPrimaryInternalLoadBalancerBackends(String ...backendNames); } /** - * Stage of the virtual machine scale set update allowing to remove association between the primary network interface - * configuration and inbound NAT pool of the load balancer. + * A stage of the virtual machine scale set update allowing to remove the associations between the primary network + * interface configuration and the specified inbound NAT pools of the load balancer. */ interface WithoutPrimaryLoadBalancerNatPool { /** - * Removes association between the primary network interface configuration and inbound NAT pool of the - * internet-facing load balancer. + * Removes the associations between the primary network interface configuration and the specified inbound NAT pools + * of an Internet-facing load balancer. * - * @param natPoolNames the name of an existing inbound NAT pools to remove - * @return the next stage of the virtual machine scale set update + * @param natPoolNames the names of existing inbound NAT pools + * @return the next stage of the update */ WithApply withoutPrimaryInternetFacingLoadBalancerNatPools(String ...natPoolNames); /** - * Removes association between the primary network interface configuration and inbound NAT pool of the - * internal load balancer. + * Removes the associations between the primary network interface configuration and the specified inbound NAT pools + * of the internal load balancer. * - * @param natPoolNames the name of an existing inbound NAT pools to remove - * @return the next stage of the virtual machine scale set update + * @param natPoolNames the names of existing inbound NAT pools + * @return the next stage of the update */ WithApply withoutPrimaryInternalLoadBalancerNatPools(String ...natPoolNames); } @@ -1034,7 +1006,6 @@ interface WithApply extends /** * The entirety of the load balancer update. */ - @LangDefinition(ContainerName = "~/VirtualMachineScaleSet.Update", ContainerFileName = "IUpdate") interface Update extends UpdateStages.WithPrimaryLoadBalancer, UpdateStages.WithPrimaryInternetFacingLoadBalancerBackendOrNatPool, diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetExtension.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetExtension.java index d2308cbd5da12..b188e5c5c6b5f 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetExtension.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetExtension.java @@ -1,7 +1,6 @@ package com.microsoft.azure.management.compute; import com.microsoft.azure.management.apigeneration.Fluent; -import com.microsoft.azure.management.apigeneration.LangDefinition; import com.microsoft.azure.management.compute.implementation.VirtualMachineScaleSetExtensionInner; import com.microsoft.azure.management.resources.fluentcore.arm.models.ChildResource; import com.microsoft.azure.management.resources.fluentcore.model.Attachable; @@ -36,7 +35,7 @@ public interface VirtualMachineScaleSetExtension extends /** * @return true if this extension is configured to upgrade automatically when a new minor version of - * virtual machine scale set extension image that this extension based on is published + * the extension image that this extension based on is published */ boolean autoUpgradeMinorVersionEnabled(); @@ -46,7 +45,7 @@ public interface VirtualMachineScaleSetExtension extends Map publicSettings(); /** - * @return the public settings of the virtual machine extension as a json string + * @return the public settings of the virtual machine extension as a JSON string */ String publicSettingsAsJsonString(); @@ -56,11 +55,10 @@ public interface VirtualMachineScaleSetExtension extends String provisioningState(); /** - * The entirety of a virtual machine scale set extension definition as a part of parent definition. + * The entirety of a virtual machine scale set extension definition as a part of a parent definition. * * @param the return type of the final {@link Attachable#attach()} */ - @LangDefinition(ContainerName = "~/VirtualMachineScaleSetExtension.Definition", ContainerFileName = "IDefinition") interface Definition extends DefinitionStages.Blank, DefinitionStages.WithImageOrPublisher, @@ -73,7 +71,6 @@ interface Definition extends /** * Grouping of virtual machine scale set extension definition stages as a part of parent virtual machine scale set definition. */ - @LangDefinition(ContainerName = "~/VirtualMachineScaleSetExtension.Definition", ContainerFileName = "IDefinition", IsContainerOnly = true) interface DefinitionStages { /** * The first stage of a virtual machine scale set extension definition. @@ -85,8 +82,8 @@ interface Blank } /** - * The stage of the virtual machinescale set extension definition allowing to specify extension image or specify name of - * the virtual machine scale set extension publisher. + * The stage of a virtual machines scale set extension definition allowing to specify an extension image or + * specify name of the virtual machine scale set extension publisher. * * @param the return type of {@link WithAttach#attach()} */ @@ -95,30 +92,30 @@ interface WithImageOrPublisher /** * Specifies the virtual machine scale set extension image to use. * - * @param image the image + * @param image an extension image * @return the next stage of the definition */ WithAttach withImage(VirtualMachineExtensionImage image); } /** - * The stage of the virtual machine scale set extension definition allowing to specify the publisher of the - * virtual machine scale set extension image this extension is based on. + * The stage of a virtual machine scale set extension definition allowing to specify the publisher of the + * extension image this extension is based on. * * @param the return type of {@link WithAttach#attach()} */ interface WithPublisher { /** - * Specifies the name of the virtual machine scale set extension image publisher. + * Specifies the name of the publisher of the virtual machine scale set extension image. * - * @param extensionImagePublisherName the publisher name + * @param extensionImagePublisherName a publisher name * @return the next stage of the definition */ WithType withPublisher(String extensionImagePublisherName); } /** - * The stage of the virtual machine scale set extension definition allowing to specify the type of the virtual machine + * The stage of a virtual machine scale set extension definition allowing to specify the type of the virtual machine * scale set extension image this extension is based on. * * @param the return type of {@link WithAttach#attach()} @@ -134,7 +131,7 @@ interface WithType { } /** - * The stage of the virtual machine scale set extension definition allowing to specify the type of the virtual machine + * The stage of a virtual machine scale set extension definition allowing to specify the type of the virtual machine * scale set extension version this extension is based on. * * @param the return type of {@link WithAttach#attach()} @@ -149,7 +146,7 @@ interface WithVersion { WithAttach withVersion(String extensionImageVersionName); } - /** The final stage of the virtual machine scale set extension definition. + /** The final stage of a virtual machine scale set extension definition. *

* At this stage, any remaining optional settings can be specified, or the virtual machine scale set extension definition * can be attached to the parent virtual machine scale set definition using {@link VirtualMachineExtension.DefinitionStages.WithAttach#attach()}. @@ -162,29 +159,29 @@ interface WithAttach extends } /** - * The stage of the virtual machine scale set extension definition allowing to enable or disable auto upgrade of the + * The stage of a virtual machine scale set extension definition allowing to enable or disable auto upgrade of the * extension when when a new minor version of virtual machine scale set extension image gets published. * * @param the return type of {@link WithAttach#attach()} */ interface WithAutoUpgradeMinorVersion { /** - * enables auto upgrade of the extension. + * Enables auto upgrading of the extension with minor versions. * * @return the next stage of the definition */ - WithAttach withAutoUpgradeMinorVersionEnabled(); + WithAttach withMinorVersionAutoUpgrade(); /** - * disables auto upgrade of the extension. + * Disables auto upgrading the extension with minor versions. * * @return the next stage of the definition */ - WithAttach withAutoUpgradeMinorVersionDisabled(); + WithAttach withoutMinorVersionAutoUpgrade(); } /** - * The stage of the virtual machine scale set extension definition allowing to specify the public and private settings. + * The stage of a virtual machine scale set extension definition allowing to specify the public and private settings. * * @param the return type of {@link WithAttach#attach()} */ @@ -228,7 +225,6 @@ interface WithSettings { /** * Grouping of virtual machine scale set extension definition stages as part of parent virtual machine scale set update. */ - @LangDefinition(ContainerName = "~/VirtualMachineScaleSetExtension.Update", ContainerFileName = "IUpdateDefinition", IsContainerOnly = true) interface UpdateDefinitionStages { /** * The first stage of a virtual machine scale set extension definition. @@ -240,7 +236,7 @@ interface Blank } /** - * The stage of the virtual machine scale set extension allowing to specify extension image or specify name of the + * The stage of a virtual machine scale set extension allowing to specify an extension image or the name of the * virtual machine extension publisher. * * @param the return type of {@link WithAttach#attach()} @@ -250,14 +246,14 @@ interface WithImageOrPublisher /** * Specifies the virtual machine scale set extension image to use. * - * @param image the image + * @param image an extension image * @return the next stage of the definition */ WithAttach withImage(VirtualMachineExtensionImage image); } /** - * The stage of the virtual machine scale set extension definition allowing to specify the publisher of the + * The stage of a virtual machine scale set extension definition allowing to specify the publisher of the * virtual machine scale set extension image this extension is based on. * * @param the return type of {@link WithAttach#attach()} @@ -273,8 +269,8 @@ interface WithPublisher { } /** - * The stage of the virtual machine scale set extension definition allowing to specify the type of the virtual machine - * scale set extension image this extension is based on. + * The stage of a virtual machine scale set extension definition allowing to specify the type of the virtual machine + * scale set extension image this extension is based on. * * @param the return type of {@link WithAttach#attach()} */ @@ -282,15 +278,15 @@ interface WithType { /** * Specifies the type of the virtual machine scale set extension image. * - * @param extensionImageTypeName the image type name + * @param extensionImageTypeName an image type name * @return the next stage of the definition */ WithVersion withType(String extensionImageTypeName); } /** - * The stage of the virtual machine scale set extension definition allowing to specify the type of the virtual machine - * scale set extension version this extension is based on. + * The stage of a virtual machine scale set extension definition allowing to specify the type of the virtual machine + * scale set extension version this extension is based on. * * @param the return type of {@link WithAttach#attach()} */ @@ -298,7 +294,7 @@ interface WithVersion { /** * Specifies the version of the virtual machine scale set image extension. * - * @param extensionImageVersionName the version name + * @param extensionImageVersionName a version name * @return the next stage of the definition */ WithAttach withVersion(String extensionImageVersionName); @@ -317,29 +313,29 @@ interface WithAttach extends } /** - * The stage of the virtual machine scale set extension definition allowing to enable or disable auto upgrade of the + * The stage of a virtual machine scale set extension definition allowing to enable or disable auto upgrade of the * extension when when a new minor version of virtual machine scale set extension image gets published. * * @param the return type of {@link WithAttach#attach()} */ interface WithAutoUpgradeMinorVersion { /** - * Enables auto upgrade of the extension. + * Enables auto upgrading of the extension with minor versions. * * @return the next stage of the definition */ - WithAttach withAutoUpgradeMinorVersionEnabled(); + WithAttach withMinorVersionAutoUpgrade(); /** - * Disables auto upgrade of the extension. + * Disables auto upgrade of the extension with minor versions. * * @return the next stage of the definition */ - WithAttach withAutoUpgradeMinorVersionDisabled(); + WithAttach withoutMinorVersionAutoUpgrade(); } /** - * The stage of the virtual machine scale set extension definition allowing to specify the public and private settings. + * The stage of a virtual machine scale set extension definition allowing to specify the public and private settings. * * @param the return type of {@link WithAttach#attach()} */ @@ -384,7 +380,6 @@ interface WithSettings { * The entirety of a virtual machine scale set extension definition as a part of parent update. * @param the return type of the final {@link Attachable#attach()} */ - @LangDefinition(ContainerName = "~/VirtualMachineScaleSetExtension.Update", ContainerFileName = "IUpdateDefinition") interface UpdateDefinition extends UpdateDefinitionStages.Blank, UpdateDefinitionStages.WithImageOrPublisher, @@ -397,30 +392,29 @@ interface UpdateDefinition extends /** * Grouping of virtual machine extension update stages. */ - @LangDefinition(ContainerName = "~/VirtualMachineScaleSetExtension.Update", ContainerFileName = "IUpdate", IsContainerOnly = true) interface UpdateStages { /** - * The stage of the virtual machine scale set extension update allowing to enable or disable auto upgrade of the + * The stage of a virtual machine scale set extension update allowing to enable or disable auto upgrade of the * extension when when a new minor version of virtual machine scale set extension image gets published. */ interface WithAutoUpgradeMinorVersion { /** - * enables auto upgrade of the extension. + * Enables auto-upgrading of the extension with minor versions. * * @return the next stage of the update */ - Update withAutoUpgradeMinorVersionEnabled(); + Update withMinorVersionAutoUpgrade(); /** - * enables auto upgrade of the extension. + * Disables auto upgrading of the extension with minor versions. * * @return the next stage of the update */ - Update withAutoUpgradeMinorVersionDisabled(); + Update withoutMinorVersionAutoUpgrade(); } /** - * The stage of the virtual machine scale set extension update allowing to add or update public and private settings. + * The stage of a virtual machine scale set extension update allowing to add or update public and private settings. */ interface WithSettings { /** @@ -462,11 +456,9 @@ interface WithSettings { /** * The entirety of virtual machine scale set extension update as a part of parent virtual machine scale set update. */ - @LangDefinition(ContainerName = "~/VirtualMachineScaleSetExtension.Update", ContainerFileName = "IUpdate") interface Update extends Settable, UpdateStages.WithAutoUpgradeMinorVersion, UpdateStages.WithSettings { - } } diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetSku.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetSku.java index 6d469713a2863..fcce02937b4c4 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetSku.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetSku.java @@ -3,22 +3,22 @@ import com.microsoft.azure.management.apigeneration.Fluent; /** - * A type representing sku available for virtual machines in a scale set. + * A type representing a SKU available for virtual machines in a scale set. */ @Fluent public interface VirtualMachineScaleSetSku { /** - * @return the type of resource the sku applies to. + * @return the type of resource the SKU applies to */ String resourceType(); /** - * @return the Sku type. + * @return the SKU type */ VirtualMachineScaleSetSkuTypes skuType(); /** - * @return available scaling information. + * @return available scaling information */ VirtualMachineScaleSetSkuCapacity capacity(); } diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSets.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSets.java index 7cb290d53b5ff..b275e1bd0e91d 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSets.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSets.java @@ -27,9 +27,7 @@ public interface VirtualMachineScaleSets extends SupportsDeletingByGroup, SupportsBatchCreation { /** - * Shuts down the Virtual Machine in the scale set and releases the compute resources. - *

- * You are not billed for the compute resources that the Virtual Machines uses + * Shuts down the virtual machine in the scale set and releases the compute resources. * * @param groupName the name of the resource group the virtual machine scale set is in * @param name the name of the virtual machine scale set @@ -40,9 +38,7 @@ public interface VirtualMachineScaleSets extends void deallocate(String groupName, String name) throws CloudException, IOException, InterruptedException; /** - * Power off (stop) the virtual machines in the scale set. - *

- * You will be billed for the compute resources that the Virtual Machines uses. + * Powers off (stops) the virtual machines in the scale set. * * @param groupName the name of the resource group the virtual machine scale set is in * @param name the name of the virtual machine scale set @@ -53,7 +49,7 @@ public interface VirtualMachineScaleSets extends void powerOff(String groupName, String name) throws CloudException, IOException, InterruptedException; /** - * Restart the virtual machines in the scale set. + * Restarts the virtual machines in the scale set. * * @param groupName the name of the resource group the virtual machine scale set is in * @param name the name of the virtual machine scale set @@ -64,7 +60,7 @@ public interface VirtualMachineScaleSets extends void restart(String groupName, String name) throws CloudException, IOException, InterruptedException; /** - * Start the virtual machines in the scale set. + * Starts the virtual machines in the scale set. * * @param groupName the name of the resource group the virtual machine scale set is in * @param name the name of the virtual machine scale set @@ -75,7 +71,7 @@ public interface VirtualMachineScaleSets extends void start(String groupName, String name) throws CloudException, IOException, InterruptedException; /** - * Re-image (update the version of the installed operating system) the virtual machines in the scale set. + * Re-images (updates the version of the installed operating system) the virtual machines in the scale set. * * @param groupName the name of the resource group the virtual machine scale set is in * @param name the name of the virtual machine scale set diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineSize.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineSize.java index 3034eebe472db..0f709eba3f74d 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineSize.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineSize.java @@ -13,27 +13,27 @@ @Fluent public interface VirtualMachineSize { /** - * @return the VM size name + * @return the virtual machine size name */ String name(); /** - * @return the Number of cores supported by a VM size + * @return the number of cores supported by the VM size */ int numberOfCores(); /** - * @return the OS disk size allowed by a VM size + * @return the OS disk size allowed by the VM size */ int osDiskSizeInMB(); /** - * @return resource disk size allowed by a VM size + * @return the resource disk size allowed by the VM size */ int resourceDiskSizeInMB(); /** - * @return the memory size supported by a VM size + * @return the memory size supported by the VM size */ int memoryInMB(); diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineSku.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineSku.java index 22851bfba2d66..d123e06c44677 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineSku.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineSku.java @@ -34,7 +34,7 @@ public interface VirtualMachineSku { String name(); /** - * @return virtual machine images in the sku + * @return virtual machine images in the SKU */ VirtualMachineImagesInSku images(); } \ No newline at end of file diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachines.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachines.java index af6eceac6f1bf..6c065f24a66e1 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachines.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachines.java @@ -25,34 +25,30 @@ public interface VirtualMachines extends SupportsBatchCreation { /** - * @return entry point to virtual machine sizes + * @return available virtual machine sizes */ VirtualMachineSizes sizes(); /** - * Shuts down the Virtual Machine and releases the compute resources. - *

- * You are not billed for the compute resources that this Virtual Machine uses + * Shuts down the virtual machine and releases the compute resources. * - * @param groupName the resource group name + * @param groupName the name of the resource group the virtual machine is in * @param name the virtual machine name */ void deallocate(String groupName, String name); /** - * Generalize the Virtual Machine. + * Generalize the virtual machine. * - * @param groupName the resource group name + * @param groupName the name of the resource group the virtual machine is in * @param name the virtual machine name */ void generalize(String groupName, String name); /** * Power off (stop) a virtual machine. - *

- * You will be billed for the compute resources that this Virtual Machine uses * - * @param groupName the resource group name + * @param groupName the name of the resource group the virtual machine is in * @param name the virtual machine name */ void powerOff(String groupName, String name); @@ -60,7 +56,7 @@ public interface VirtualMachines extends /** * Restart a virtual machine. * - * @param groupName the resource group name + * @param groupName the name of the resource group the virtual machine is in * @param name the virtual machine name */ void restart(String groupName, String name); @@ -68,7 +64,7 @@ public interface VirtualMachines extends /** * Start a virtual machine. * - * @param groupName the resource group name + * @param groupName the name of the resource group the virtual machine is in * @param name the virtual machine name */ void start(String groupName, String name); @@ -76,7 +72,7 @@ public interface VirtualMachines extends /** * Redeploy a virtual machine. * - * @param groupName the resource group name + * @param groupName the name of the resource group the virtual machine is in * @param name the virtual machine name */ void redeploy(String groupName, String name); @@ -87,9 +83,9 @@ public interface VirtualMachines extends * * @param groupName the resource group name * @param name the virtual machine name - * @param containerName destination container name to store the captured Vhd - * @param overwriteVhd whether to overwrites destination vhd if it exists - * @return the template as json string + * @param containerName destination container name to store the captured VHD + * @param overwriteVhd whether to overwrites destination VHD if it exists + * @return the template as JSON string */ String capture(String groupName, String name, String containerName, boolean overwriteVhd); } diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/DataDiskImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/DataDiskImpl.java index 15e9c9b3ef5ba..31a6d444e8dcd 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/DataDiskImpl.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/DataDiskImpl.java @@ -92,7 +92,7 @@ public String sourceImageUri() { } @Override - public DiskCreateOptionTypes createOption() { + public DiskCreateOptionTypes creationMethod() { return this.inner().createOption(); } @@ -172,7 +172,7 @@ protected static void setDataDisksDefaults(List dataDisk protected static void ensureDisksVhdUri(List dataDisks, StorageAccount storageAccount, String namePrefix) { for (VirtualMachineDataDisk dataDisk : dataDisks) { - if (dataDisk.createOption() == DiskCreateOptionTypes.EMPTY) { + if (dataDisk.creationMethod() == DiskCreateOptionTypes.EMPTY) { //New data disk requires Vhd Uri to be set if (dataDisk.inner().vhd() == null) { dataDisk.inner().withVhd(new VirtualHardDisk()); @@ -187,7 +187,7 @@ protected static void ensureDisksVhdUri(List dataDisks, protected static void ensureDisksVhdUri(List dataDisks, String namePrefix) { String containerUrl = null; for (VirtualMachineDataDisk dataDisk : dataDisks) { - if (dataDisk.createOption() == DiskCreateOptionTypes.EMPTY && dataDisk.inner().vhd() != null) { + if (dataDisk.creationMethod() == DiskCreateOptionTypes.EMPTY && dataDisk.inner().vhd() != null) { int idx = dataDisk.inner().vhd().uri().lastIndexOf('/'); containerUrl = dataDisk.inner().vhd().uri().substring(0, idx); break; @@ -195,7 +195,7 @@ protected static void ensureDisksVhdUri(List dataDisks, } if (containerUrl != null) { for (VirtualMachineDataDisk dataDisk : dataDisks) { - if (dataDisk.createOption() == DiskCreateOptionTypes.EMPTY) { + if (dataDisk.creationMethod() == DiskCreateOptionTypes.EMPTY) { //New data disk requires Vhd Uri to be set if (dataDisk.inner().vhd() == null) { dataDisk.inner().withVhd(new VirtualHardDisk()); diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineExtensionImageImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineExtensionImageImpl.java index c42373a31a63b..095cd12710565 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineExtensionImageImpl.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineExtensionImageImpl.java @@ -60,7 +60,7 @@ public String handlerSchema() { } @Override - public boolean vmScaleSetEnabled() { + public boolean supportsVirtualMachineScaleSets() { return this.inner().vmScaleSetEnabled(); } diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImpl.java index 0d33dda324d82..e5ffab1728e7e 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImpl.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImpl.java @@ -1097,7 +1097,7 @@ private boolean dataDisksRequiresImplicitStorageAccountCreation() { boolean hasEmptyVhd = false; for (VirtualMachineDataDisk dataDisk : this.dataDisks) { - if (dataDisk.createOption() == DiskCreateOptionTypes.EMPTY) { + if (dataDisk.creationMethod() == DiskCreateOptionTypes.EMPTY) { if (dataDisk.inner().vhd() == null) { hasEmptyVhd = true; break; @@ -1113,7 +1113,7 @@ private boolean dataDisksRequiresImplicitStorageAccountCreation() { // In update mode, if any of the data disk has vhd uri set then use same container // to store this disk, no need to create a storage account implicitly. for (VirtualMachineDataDisk dataDisk : this.dataDisks) { - if (dataDisk.createOption() == DiskCreateOptionTypes.ATTACH && dataDisk.inner().vhd() != null) { + if (dataDisk.creationMethod() == DiskCreateOptionTypes.ATTACH && dataDisk.inner().vhd() != null) { return false; } } diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetExtensionImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetExtensionImpl.java index 01e4d63dd2e4a..8e09cfeb2b142 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetExtensionImpl.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetExtensionImpl.java @@ -78,13 +78,13 @@ public String provisioningState() { // @Override - public VirtualMachineScaleSetExtensionImpl withAutoUpgradeMinorVersionEnabled() { + public VirtualMachineScaleSetExtensionImpl withMinorVersionAutoUpgrade() { this.inner().withAutoUpgradeMinorVersion(true); return this; } @Override - public VirtualMachineScaleSetExtensionImpl withAutoUpgradeMinorVersionDisabled() { + public VirtualMachineScaleSetExtensionImpl withoutMinorVersionAutoUpgrade() { this.inner().withAutoUpgradeMinorVersion(false); return this; } diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetImpl.java index 80991cfaa1881..2a0985be2c8b6 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetImpl.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetImpl.java @@ -101,8 +101,6 @@ public class VirtualMachineScaleSetImpl private List primaryInternetFacingLBInboundNatPoolsToAddOnUpdate = new ArrayList<>(); private List primaryInternalLBBackendsToAddOnUpdate = new ArrayList<>(); private List primaryInternalLBInboundNatPoolsToAddOnUpdate = new ArrayList<>(); - // cached primary virtual network - private Network primaryVirtualNetwork; // The paged converter for virtual machine scale set sku private PagedListConverter skuConverter; @@ -138,7 +136,7 @@ protected void initializeChildrenFromInner() { } @Override - public PagedList availableSkus() throws CloudException, IOException { + public PagedList listAvailableSkus() throws CloudException, IOException { return this.skuConverter.convert(this.client.listSkus(this.resourceGroupName(), this.name())); } @@ -209,19 +207,16 @@ public int capacity() { } @Override - public Network primaryNetwork() throws IOException { - if (this.primaryVirtualNetwork == null) { - String subnetId = primaryNicDefaultIPConfiguration().subnet().id(); - String virtualNetworkId = ResourceUtils.parentResourcePathFromResourceId(subnetId); - this.primaryVirtualNetwork = this.networkManager + public Network getPrimaryNetwork() throws IOException { + String subnetId = primaryNicDefaultIPConfiguration().subnet().id(); + String virtualNetworkId = ResourceUtils.parentResourcePathFromResourceId(subnetId); + return this.networkManager .networks() .getById(virtualNetworkId); - } - return this.primaryVirtualNetwork; } @Override - public LoadBalancer primaryInternetFacingLoadBalancer() throws IOException { + public LoadBalancer getPrimaryInternetFacingLoadBalancer() throws IOException { if (this.primaryInternetFacingLoadBalancer == null) { loadCurrentPrimaryLoadBalancersIfAvailable(); } @@ -229,8 +224,8 @@ public LoadBalancer primaryInternetFacingLoadBalancer() throws IOException { } @Override - public Map primaryInternetFacingLoadBalancerBackends() throws IOException { - if (this.primaryInternetFacingLoadBalancer() != null) { + public Map listPrimaryInternetFacingLoadBalancerBackends() throws IOException { + if (this.getPrimaryInternetFacingLoadBalancer() != null) { return getBackendsAssociatedWithIpConfiguration(this.primaryInternetFacingLoadBalancer, primaryNicDefaultIPConfiguration()); } @@ -238,8 +233,8 @@ public Map primaryInternetFacingLoadBalancerBackends() throws I } @Override - public Map primaryInternetFacingLoadBalancerInboundNatPools() throws IOException { - if (this.primaryInternetFacingLoadBalancer() != null) { + public Map listPrimaryInternetFacingLoadBalancerInboundNatPools() throws IOException { + if (this.getPrimaryInternetFacingLoadBalancer() != null) { return getInboundNatPoolsAssociatedWithIpConfiguration(this.primaryInternetFacingLoadBalancer, primaryNicDefaultIPConfiguration()); } @@ -247,7 +242,7 @@ public Map primaryInternetFacingLoadBalancerInboundNatPo } @Override - public LoadBalancer primaryInternalLoadBalancer() throws IOException { + public LoadBalancer getPrimaryInternalLoadBalancer() throws IOException { if (this.primaryInternalLoadBalancer == null) { loadCurrentPrimaryLoadBalancersIfAvailable(); } @@ -255,8 +250,8 @@ public LoadBalancer primaryInternalLoadBalancer() throws IOException { } @Override - public Map primaryInternalLoadBalancerBackends() throws IOException { - if (this.primaryInternalLoadBalancer() != null) { + public Map listPrimaryInternalLoadBalancerBackends() throws IOException { + if (this.getPrimaryInternalLoadBalancer() != null) { return getBackendsAssociatedWithIpConfiguration(this.primaryInternalLoadBalancer, primaryNicDefaultIPConfiguration()); } @@ -264,8 +259,8 @@ public Map primaryInternalLoadBalancerBackends() throws IOExcep } @Override - public Map primaryInternalLoadBalancerInboundNatPools() throws IOException { - if (this.primaryInternalLoadBalancer() != null) { + public Map listPrimaryInternalLoadBalancerInboundNatPools() throws IOException { + if (this.getPrimaryInternalLoadBalancer() != null) { return getInboundNatPoolsAssociatedWithIpConfiguration(this.primaryInternalLoadBalancer, primaryNicDefaultIPConfiguration()); } @@ -274,7 +269,7 @@ public Map primaryInternalLoadBalancerInboundNatPools() @Override public List primaryPublicIpAddressIds() throws IOException { - LoadBalancer loadBalancer = this.primaryInternetFacingLoadBalancer(); + LoadBalancer loadBalancer = this.getPrimaryInternetFacingLoadBalancer(); if (loadBalancer != null) { return loadBalancer.publicIpAddressIds(); } @@ -419,9 +414,9 @@ public VirtualMachineScaleSetImpl withPrimaryInternalLoadBalancer(LoadBalancer l public VirtualMachineScaleSetImpl withPrimaryInternalLoadBalancerBackends(String... backendNames) { if (this.isInCreateMode()) { VirtualMachineScaleSetIPConfigurationInner defaultPrimaryIpConfig = primaryNicDefaultIPConfiguration(); - this.removeAllBackendAssociationFromIpConfiguration(this.primaryInternalLoadBalancer, + removeAllBackendAssociationFromIpConfiguration(this.primaryInternalLoadBalancer, defaultPrimaryIpConfig); - this.associateBackEndsToIpConfiguration(this.primaryInternalLoadBalancer.id(), + associateBackEndsToIpConfiguration(this.primaryInternalLoadBalancer.id(), defaultPrimaryIpConfig, backendNames); } else { @@ -434,9 +429,9 @@ public VirtualMachineScaleSetImpl withPrimaryInternalLoadBalancerBackends(String public VirtualMachineScaleSetImpl withPrimaryInternalLoadBalancerInboundNatPools(String... natPoolNames) { if (this.isInCreateMode()) { VirtualMachineScaleSetIPConfigurationInner defaultPrimaryIpConfig = this.primaryNicDefaultIPConfiguration(); - this.removeAllInboundNatPoolAssociationFromIpConfiguration(this.primaryInternalLoadBalancer, + removeAllInboundNatPoolAssociationFromIpConfiguration(this.primaryInternalLoadBalancer, defaultPrimaryIpConfig); - this.associateInboundNATPoolsToIpConfiguration(this.primaryInternalLoadBalancer.id(), + associateInboundNATPoolsToIpConfiguration(this.primaryInternalLoadBalancer.id(), defaultPrimaryIpConfig, natPoolNames); } else { @@ -737,12 +732,12 @@ public VirtualMachineScaleSetImpl withOverProvision(boolean enabled) { } @Override - public VirtualMachineScaleSetImpl withOverProvisionEnabled() { + public VirtualMachineScaleSetImpl withOverProvisioning() { return this.withOverProvision(true); } @Override - public VirtualMachineScaleSetImpl withOverProvisionDisabled() { + public VirtualMachineScaleSetImpl withoutOverProvisioning() { return this.withOverProvision(false); } @@ -1103,7 +1098,6 @@ private void setPrimaryIpConfigurationBackendsAndInboundNatPools() { private void clearCachedProperties() { this.primaryInternetFacingLoadBalancer = null; this.primaryInternalLoadBalancer = null; - this.primaryVirtualNetwork = null; } private void loadCurrentPrimaryLoadBalancersIfAvailable() throws IOException { diff --git a/azure-mgmt-compute/src/test/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetOperationsTests.java b/azure-mgmt-compute/src/test/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetOperationsTests.java index b7cbff894c4ee..149477c5af758 100644 --- a/azure-mgmt-compute/src/test/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetOperationsTests.java +++ b/azure-mgmt-compute/src/test/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetOperationsTests.java @@ -72,7 +72,7 @@ public void canCreateVirtualMachineScaleSetWithCustomScriptExtension() throws Ex .withPublisher("Microsoft.OSTCExtensions") .withType("CustomScriptForLinux") .withVersion("1.4") - .withAutoUpgradeMinorVersionEnabled() + .withMinorVersionAutoUpgrade() .withPublicSetting("fileUris",fileUris) .withPublicSetting("commandToExecute", installCommand) .attach() @@ -153,15 +153,15 @@ public void canCreateVirtualMachineScaleSet() throws Exception { .withNewStorageAccount(ResourceNamer.randomResourceName("stg", 15)) .create(); - Assert.assertNull(virtualMachineScaleSet.primaryInternalLoadBalancer()); - Assert.assertTrue(virtualMachineScaleSet.primaryInternalLoadBalancerBackends().size() == 0); - Assert.assertTrue(virtualMachineScaleSet.primaryInternalLoadBalancerInboundNatPools().size() == 0); + Assert.assertNull(virtualMachineScaleSet.getPrimaryInternalLoadBalancer()); + Assert.assertTrue(virtualMachineScaleSet.listPrimaryInternalLoadBalancerBackends().size() == 0); + Assert.assertTrue(virtualMachineScaleSet.listPrimaryInternalLoadBalancerInboundNatPools().size() == 0); - Assert.assertNotNull(virtualMachineScaleSet.primaryInternetFacingLoadBalancer()); - Assert.assertTrue(virtualMachineScaleSet.primaryInternetFacingLoadBalancerBackends().size() == 2); - Assert.assertTrue(virtualMachineScaleSet.primaryInternetFacingLoadBalancerInboundNatPools().size() == 2); + Assert.assertNotNull(virtualMachineScaleSet.getPrimaryInternetFacingLoadBalancer()); + Assert.assertTrue(virtualMachineScaleSet.listPrimaryInternetFacingLoadBalancerBackends().size() == 2); + Assert.assertTrue(virtualMachineScaleSet.listPrimaryInternetFacingLoadBalancerInboundNatPools().size() == 2); - Assert.assertNotNull(virtualMachineScaleSet.primaryNetwork()); + Assert.assertNotNull(virtualMachineScaleSet.getPrimaryNetwork()); Assert.assertEquals(virtualMachineScaleSet.vhdContainers().size(), 2); Assert.assertEquals(virtualMachineScaleSet.sku(), VirtualMachineScaleSetSkuTypes.STANDARD_A0); @@ -169,11 +169,11 @@ public void canCreateVirtualMachineScaleSet() throws Exception { Assert.assertTrue(virtualMachineScaleSet.upgradeModel() == UpgradeMode.AUTOMATIC); Assert.assertEquals(virtualMachineScaleSet.capacity(), 2); // Fetch the primary Virtual network - Network primaryNetwork = virtualMachineScaleSet.primaryNetwork(); + Network primaryNetwork = virtualMachineScaleSet.getPrimaryNetwork(); String inboundNatPoolToRemove = null; for (String inboundNatPoolName : - virtualMachineScaleSet.primaryInternetFacingLoadBalancerInboundNatPools().keySet()) { + virtualMachineScaleSet.listPrimaryInternetFacingLoadBalancerInboundNatPools().keySet()) { inboundNatPoolToRemove = inboundNatPoolName; break; } @@ -192,13 +192,13 @@ public void canCreateVirtualMachineScaleSet() throws Exception { .virtualMachineScaleSets() .getByGroup(RG_NAME, vmss_name); - Assert.assertNotNull(virtualMachineScaleSet.primaryInternetFacingLoadBalancer()); - Assert.assertTrue(virtualMachineScaleSet.primaryInternetFacingLoadBalancerBackends().size() == 2); - Assert.assertTrue(virtualMachineScaleSet.primaryInternetFacingLoadBalancerInboundNatPools().size() == 1); + Assert.assertNotNull(virtualMachineScaleSet.getPrimaryInternetFacingLoadBalancer()); + Assert.assertTrue(virtualMachineScaleSet.listPrimaryInternetFacingLoadBalancerBackends().size() == 2); + Assert.assertTrue(virtualMachineScaleSet.listPrimaryInternetFacingLoadBalancerInboundNatPools().size() == 1); - Assert.assertNotNull(virtualMachineScaleSet.primaryInternalLoadBalancer()); - Assert.assertTrue(virtualMachineScaleSet.primaryInternalLoadBalancerBackends().size() == 2); - Assert.assertTrue(virtualMachineScaleSet.primaryInternalLoadBalancerInboundNatPools().size() == 2); + Assert.assertNotNull(virtualMachineScaleSet.getPrimaryInternalLoadBalancer()); + Assert.assertTrue(virtualMachineScaleSet.listPrimaryInternalLoadBalancerBackends().size() == 2); + Assert.assertTrue(virtualMachineScaleSet.listPrimaryInternalLoadBalancerInboundNatPools().size() == 2); } private LoadBalancer createHttpLoadBalancers(ResourceGroup resourceGroup, diff --git a/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/AccessPolicy.java b/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/AccessPolicy.java index a387f01b56745..0d017ae06b200 100644 --- a/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/AccessPolicy.java +++ b/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/AccessPolicy.java @@ -6,7 +6,7 @@ package com.microsoft.azure.management.keyvault; -import com.microsoft.azure.management.apigeneration.LangDefinition; +import com.microsoft.azure.management.apigeneration.Fluent; import com.microsoft.azure.management.graphrbac.ActiveDirectoryGroup; import com.microsoft.azure.management.graphrbac.ServicePrincipal; import com.microsoft.azure.management.graphrbac.User; @@ -21,7 +21,7 @@ /** * An immutable client-side representation of a key vault access policy. */ -@LangDefinition() +@Fluent() public interface AccessPolicy extends ChildResource, Wrapper { @@ -55,7 +55,6 @@ public interface AccessPolicy extends * The entirety of an access policy definition. * @param the return type of the final {@link Attachable#attach()} */ - @LangDefinition(ContainerName = "~/AccessPolicy.Definition", ContainerFileName = "IDefinition") interface Definition extends DefinitionStages.Blank, DefinitionStages.WithAttach { @@ -64,7 +63,6 @@ interface Definition extends /** * Grouping of access policy definition stages applicable as part of a key vault creation. */ - @LangDefinition(ContainerName = "~/AccessPolicy.Definition", ContainerFileName = "IDefinition", IsContainerOnly = true) interface DefinitionStages { /** * The first stage of an access policy definition. @@ -197,7 +195,6 @@ interface WithAttach extends * The entirety of an access policy definition as part of a key vault update. * @param the return type of the final {@link UpdateDefinitionStages.WithAttach#attach()} */ - @LangDefinition(ContainerName = "~/AccessPolicy.UpdateDefinition", ContainerFileName = "IUpdateDefinition") interface UpdateDefinition extends UpdateDefinitionStages.Blank, UpdateDefinitionStages.WithAttach { @@ -206,7 +203,6 @@ interface UpdateDefinition extends /** * Grouping of access policy definition stages applicable as part of a key vault update. */ - @LangDefinition(ContainerName = "~/AccessPolicy.UpdateDefinition", ContainerFileName = "IUpdateDefinition", IsContainerOnly = true) interface UpdateDefinitionStages { /** * The first stage of an access policy definition. @@ -338,7 +334,6 @@ interface WithAttach extends /** * Grouping of all the key vault update stages. */ - @LangDefinition(ContainerName = "~/AccessPolicy.Update", ContainerFileName = "IUpdate", IsContainerOnly = true) interface UpdateStages { /** * The access policy update stage allowing permissions to be added or removed. @@ -441,7 +436,6 @@ interface WithPermissions { /** * The entirety of an access policy update as part of a key vault update. */ - @LangDefinition(ContainerName = "~/AccessPolicy.Update", ContainerFileName = "IUpdate") interface Update extends UpdateStages.WithPermissions, Settable { diff --git a/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/Vault.java b/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/Vault.java index 4d0b0c058b6d8..228b7738e3906 100644 --- a/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/Vault.java +++ b/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/Vault.java @@ -6,7 +6,7 @@ package com.microsoft.azure.management.keyvault; -import com.microsoft.azure.management.apigeneration.LangDefinition; +import com.microsoft.azure.management.apigeneration.Fluent; import com.microsoft.azure.management.keyvault.implementation.VaultInner; import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource; import com.microsoft.azure.management.resources.fluentcore.model.Appliable; @@ -20,7 +20,7 @@ /** * An immutable client-side representation of an Azure Key Vault. */ -@LangDefinition +@Fluent public interface Vault extends GroupableResource, Refreshable, @@ -74,7 +74,6 @@ public interface Vault extends /** * Container interface for all the definitions that need to be implemented. */ - @LangDefinition(ContainerName = "~/Vault.Definition", ContainerFileName = "IDefinition") interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, @@ -85,7 +84,6 @@ interface Definition extends /** * Grouping of all the key vault definition stages. */ - @LangDefinition(ContainerName = "~/Vault.Definition", ContainerFileName = "IDefinition", IsContainerOnly = true) interface DefinitionStages { /** * The first stage of the key vault definition. @@ -203,7 +201,6 @@ interface WithCreate extends /** * Grouping of all the key vault update stages. */ - @LangDefinition(ContainerName = "~/Vault.Update", ContainerFileName = "IUpdate", IsContainerOnly = true) interface UpdateStages { /** * A key vault update allowing access policies to be modified, attached, or removed. @@ -292,7 +289,6 @@ interface WithConfigurations { /** * The template for a key vault update operation, containing all the settings that can be modified. */ - @LangDefinition(ContainerName = "~/Vault.Update", ContainerFileName = "IUpdate") interface Update extends Appliable, UpdateStages.WithAccessPolicy, diff --git a/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/Vaults.java b/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/Vaults.java index 02226fde90d15..7298a7b4ad604 100644 --- a/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/Vaults.java +++ b/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/Vaults.java @@ -6,7 +6,7 @@ package com.microsoft.azure.management.keyvault; -import com.microsoft.azure.management.apigeneration.LangDefinition; +import com.microsoft.azure.management.apigeneration.Fluent; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsDeletingByGroup; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingByGroup; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingById; @@ -18,7 +18,7 @@ /** * Entry point for key vaults management API. */ -@LangDefinition(ContainerName = "~/") +@Fluent public interface Vaults extends SupportsListing, SupportsCreating, diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Backend.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Backend.java index 099b0b3bb391f..4e8f2bfd95332 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Backend.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Backend.java @@ -9,7 +9,6 @@ import java.util.Set; import com.microsoft.azure.management.apigeneration.Fluent; -import com.microsoft.azure.management.apigeneration.Method; import com.microsoft.azure.management.network.implementation.BackendAddressPoolInner; import com.microsoft.azure.management.network.model.HasLoadBalancingRules; import com.microsoft.azure.management.resources.fluentcore.arm.models.ChildResource; @@ -35,7 +34,6 @@ public interface Backend extends /** * @return a list of the resource IDs of the virtual machines associated with this backend */ - @Method Set getVirtualMachineIds(); /** diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkInterface.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkInterface.java index 276628e5075da..145ada67208d8 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkInterface.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkInterface.java @@ -7,7 +7,6 @@ package com.microsoft.azure.management.network; import com.microsoft.azure.management.apigeneration.Fluent; -import com.microsoft.azure.management.apigeneration.Method; import com.microsoft.azure.management.network.implementation.NetworkInterfaceInner; import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource; import com.microsoft.azure.management.resources.fluentcore.arm.models.Resource; @@ -108,7 +107,6 @@ public interface NetworkInterface extends * * @return the network security group associated with this network interface. */ - @Method NetworkSecurityGroup getNetworkSecurityGroup(); /** diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NicIpConfiguration.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NicIpConfiguration.java index 1001dda41e35d..40a773e9b397f 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NicIpConfiguration.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NicIpConfiguration.java @@ -3,7 +3,6 @@ import java.util.List; import com.microsoft.azure.management.apigeneration.Fluent; -import com.microsoft.azure.management.apigeneration.Method; import com.microsoft.azure.management.network.implementation.NetworkInterfaceIPConfigurationInner; import com.microsoft.azure.management.network.model.HasPrivateIpAddress; import com.microsoft.azure.management.network.model.HasPublicIpAddress; @@ -29,7 +28,6 @@ public interface NicIpConfiguration extends /** * @return the virtual network associated with this IP configuration */ - @Method Network getNetwork(); /** diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/PublicIpAddress.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/PublicIpAddress.java index 3ec5956213721..3c14a8b1ab297 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/PublicIpAddress.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/PublicIpAddress.java @@ -6,8 +6,6 @@ package com.microsoft.azure.management.network; import com.microsoft.azure.management.apigeneration.Fluent; -import com.microsoft.azure.management.apigeneration.LangMethodDefinition; -import com.microsoft.azure.management.apigeneration.LangMethodDefinition.LangMethodType; import com.microsoft.azure.management.network.implementation.PublicIPAddressInner; import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource; import com.microsoft.azure.management.resources.fluentcore.arm.models.Resource; @@ -67,7 +65,6 @@ public interface PublicIpAddress extends /** * @return the load balancer public frontend that this public IP address is assigned to */ - @LangMethodDefinition(AsType = LangMethodType.Method) PublicFrontend getAssignedLoadBalancerFrontend(); /** @@ -78,7 +75,6 @@ public interface PublicIpAddress extends /** * @return the network interface IP configuration that this public IP address is assigned to */ - @LangMethodDefinition(AsType = LangMethodType.Method) NicIpConfiguration getAssignedNetworkInterfaceIpConfiguration(); /** diff --git a/azure-mgmt-redis/src/main/java/com/microsoft/azure/management/redis/RedisAccessKeys.java b/azure-mgmt-redis/src/main/java/com/microsoft/azure/management/redis/RedisAccessKeys.java index 370b3ff80b97a..2074130323f21 100644 --- a/azure-mgmt-redis/src/main/java/com/microsoft/azure/management/redis/RedisAccessKeys.java +++ b/azure-mgmt-redis/src/main/java/com/microsoft/azure/management/redis/RedisAccessKeys.java @@ -6,12 +6,12 @@ package com.microsoft.azure.management.redis; -import com.microsoft.azure.management.apigeneration.LangDefinition; +import com.microsoft.azure.management.apigeneration.Fluent; /** * The {@link RedisCache#keys} action result. */ -@LangDefinition(ContainerName = "~/") +@Fluent public interface RedisAccessKeys { /** * @return a primary key value. diff --git a/azure-mgmt-redis/src/main/java/com/microsoft/azure/management/redis/RedisCache.java b/azure-mgmt-redis/src/main/java/com/microsoft/azure/management/redis/RedisCache.java index c054422c65e54..df5bb7017657a 100644 --- a/azure-mgmt-redis/src/main/java/com/microsoft/azure/management/redis/RedisCache.java +++ b/azure-mgmt-redis/src/main/java/com/microsoft/azure/management/redis/RedisCache.java @@ -7,7 +7,9 @@ package com.microsoft.azure.management.redis; import org.joda.time.Period; -import com.microsoft.azure.management.apigeneration.LangDefinition; + +import com.microsoft.azure.management.apigeneration.Fluent; +import com.microsoft.azure.management.apigeneration.Method; import com.microsoft.azure.management.redis.implementation.RedisResourceInner; import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource; import com.microsoft.azure.management.resources.fluentcore.arm.models.Resource; @@ -22,7 +24,7 @@ /** * An immutable client-side representation of an Azure Redis Cache. */ -@LangDefinition(ContainerName = "~/") +@Fluent public interface RedisCache extends GroupableResource, Refreshable, @@ -104,6 +106,7 @@ public interface RedisCache extends * * @return the access keys for this Redis Cache */ + @Method RedisAccessKeys refreshKeys(); /** @@ -121,7 +124,6 @@ public interface RedisCache extends /** * Container interface for all the definitions that need to be implemented. */ - @LangDefinition(ContainerName = "~/RedisCache.Definition") interface Definition extends DefinitionStages.Blank, DefinitionStages.WithGroup, @@ -133,7 +135,6 @@ interface Definition extends /** * Grouping of all the Redis Cache definition stages. */ - @LangDefinition(ContainerName = "~/RedisCache.Definition", ContainerFileName = "IDefinition", IsContainerOnly = true) interface DefinitionStages { /** * The first stage of the Redis Cache definition. @@ -308,7 +309,6 @@ interface WithPremiumSkuCreate extends DefinitionStages.WithCreate { /** * Grouping of all the Redis Cache update stages. */ - @LangDefinition(ContainerName = "~/RedisCache.Update", ContainerFileName = "IUpdate", IsContainerOnly = true) interface UpdateStages { /** * A Redis Cache update stage allowing to change the parameters. @@ -422,7 +422,6 @@ interface WithRedisConfiguration { /** * The template for a Redis Cache update operation, containing all the settings that can be modified. */ - @LangDefinition(ContainerName = "~/RedisCache.Update") interface Update extends Appliable, Resource.UpdateWithTags, diff --git a/azure-mgmt-redis/src/main/java/com/microsoft/azure/management/redis/RedisCachePremium.java b/azure-mgmt-redis/src/main/java/com/microsoft/azure/management/redis/RedisCachePremium.java index ea6e2fd81a0a7..6e8f26b55ed7f 100644 --- a/azure-mgmt-redis/src/main/java/com/microsoft/azure/management/redis/RedisCachePremium.java +++ b/azure-mgmt-redis/src/main/java/com/microsoft/azure/management/redis/RedisCachePremium.java @@ -5,14 +5,15 @@ */ package com.microsoft.azure.management.redis; -import com.microsoft.azure.management.apigeneration.LangDefinition; - import java.util.List; +import com.microsoft.azure.management.apigeneration.Fluent; +import com.microsoft.azure.management.apigeneration.Method; + /** * An immutable client-side representation of an Azure Redis cache with Premium SKU. */ -@LangDefinition(ContainerName = "~/") +@Fluent public interface RedisCachePremium extends RedisCache { /** * Reboot specified Redis node(s). This operation requires write permission to the cache resource. There can be potential data loss. @@ -67,7 +68,8 @@ public interface RedisCachePremium extends RedisCache { * Gets the patching schedule for Redis Cache. * @return List of patch schedules for current Redis Cache. */ - List getPatchSchedules(); + @Method + List listPatchSchedules(); /** * Deletes the patching schedule for Redis Cache. diff --git a/azure-mgmt-redis/src/main/java/com/microsoft/azure/management/redis/RedisCaches.java b/azure-mgmt-redis/src/main/java/com/microsoft/azure/management/redis/RedisCaches.java index 00248a315e197..bd0faae274ce0 100644 --- a/azure-mgmt-redis/src/main/java/com/microsoft/azure/management/redis/RedisCaches.java +++ b/azure-mgmt-redis/src/main/java/com/microsoft/azure/management/redis/RedisCaches.java @@ -6,7 +6,7 @@ package com.microsoft.azure.management.redis; -import com.microsoft.azure.management.apigeneration.LangDefinition; +import com.microsoft.azure.management.apigeneration.Fluent; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsDeletingByGroup; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingByGroup; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingById; @@ -19,7 +19,7 @@ /** * Entry point for Redis Caches management API. */ -@LangDefinition(ContainerName = "~/") +@Fluent public interface RedisCaches extends SupportsCreating, SupportsListing, diff --git a/azure-mgmt-redis/src/main/java/com/microsoft/azure/management/redis/implementation/RedisCacheImpl.java b/azure-mgmt-redis/src/main/java/com/microsoft/azure/management/redis/implementation/RedisCacheImpl.java index 218151d942d0d..b5e9acaa17d2f 100644 --- a/azure-mgmt-redis/src/main/java/com/microsoft/azure/management/redis/implementation/RedisCacheImpl.java +++ b/azure-mgmt-redis/src/main/java/com/microsoft/azure/management/redis/implementation/RedisCacheImpl.java @@ -429,7 +429,7 @@ public RedisCacheImpl withPatchSchedule(ScheduleEntry scheduleEntry) { } @Override - public List getPatchSchedules() { + public List listPatchSchedules() { return patchSchedulesInner.get(resourceGroupName(), name()) .scheduleEntries(); } diff --git a/azure-mgmt-redis/src/test/java/com/microsoft/azure/management/redis/RedisCacheOperationsTests.java b/azure-mgmt-redis/src/test/java/com/microsoft/azure/management/redis/RedisCacheOperationsTests.java index 00e85c9eaae89..709da38c0bbc9 100644 --- a/azure-mgmt-redis/src/test/java/com/microsoft/azure/management/redis/RedisCacheOperationsTests.java +++ b/azure-mgmt-redis/src/test/java/com/microsoft/azure/management/redis/RedisCacheOperationsTests.java @@ -176,7 +176,7 @@ public void canCRUDRedisCache() throws Exception { premiumCache.forceReboot(RebootType.ALL_NODES); // Patch Schedule - List patchSchedule = premiumCache.getPatchSchedules(); + List patchSchedule = premiumCache.listPatchSchedules(); Assert.assertEquals(2, patchSchedule.size()); premiumCache.deletePatchSchedule(); @@ -184,7 +184,7 @@ public void canCRUDRedisCache() throws Exception { patchSchedule = redisManager.redisCaches() .getById(premiumCache.id()) .asPremium() - .getPatchSchedules(); + .listPatchSchedules(); Assert.assertNull(patchSchedule); // currently throws because SAS url of the container should be provided as diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/Refreshable.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/Refreshable.java index 6cb08e193560f..f0cb37dee9477 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/Refreshable.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/model/Refreshable.java @@ -7,8 +7,7 @@ package com.microsoft.azure.management.resources.fluentcore.model; import com.microsoft.azure.management.apigeneration.LangDefinition; -import com.microsoft.azure.management.apigeneration.LangMethodDefinition; -import com.microsoft.azure.management.apigeneration.LangMethodDefinition.LangMethodType; +import com.microsoft.azure.management.apigeneration.Method; /** * Base class for resources that can be refreshed to get the latest state. @@ -22,6 +21,6 @@ public interface Refreshable { * * @return the refreshed resource */ - @LangMethodDefinition(AsType = LangMethodType.Method) + @Method T refresh(); } diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageAccount.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageAccount.java index c4ba15c6b830b..9497f1c8d9221 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageAccount.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageAccount.java @@ -7,8 +7,6 @@ package com.microsoft.azure.management.storage; import com.microsoft.azure.management.apigeneration.Fluent; -import com.microsoft.azure.management.apigeneration.LangMethodDefinition; -import com.microsoft.azure.management.apigeneration.LangMethodDefinition.LangMethodType; import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource; import com.microsoft.azure.management.resources.fluentcore.arm.models.Resource; import com.microsoft.azure.management.resources.fluentcore.model.Appliable; @@ -103,7 +101,6 @@ public interface StorageAccount extends * * @return the access keys for this storage account */ - @LangMethodDefinition(AsType = LangMethodType.Method) List getKeys(); /** @@ -112,7 +109,6 @@ public interface StorageAccount extends * @param keyName if the key name * @return the generated access keys for this storage account */ - @LangMethodDefinition(AsType = LangMethodType.Method) List regenerateKey(String keyName); /** diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/samples/Utils.java b/azure-samples/src/main/java/com/microsoft/azure/management/samples/Utils.java index b52e22b5e0a91..57e2187e15b2c 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/samples/Utils.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/samples/Utils.java @@ -344,7 +344,7 @@ public static void print(RedisCache redisCache) { } if (redisCache.isPremium()) { RedisCachePremium premium = redisCache.asPremium(); - List scheduleEntries = premium.getPatchSchedules(); + List scheduleEntries = premium.listPatchSchedules(); if (scheduleEntries != null && !scheduleEntries.isEmpty()) { redisInfo.append("\n\tRedis Patch Schedule:"); for (ScheduleEntry schedule : scheduleEntries) {