Misc networking fit and finish + annotations

azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/AvailabilitySet.java

@@ -5,7 +5,7 @@
  */
 package com.microsoft.azure.management.compute;
 
-import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.Fluent;
 import com.microsoft.azure.management.compute.implementation.AvailabilitySetInner;
 import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource;
 import com.microsoft.azure.management.resources.fluentcore.arm.models.Resource;
@@ -20,7 +20,7 @@
 /**
  * An immutable client-side representation of an Azure availability set.
  */
-@LangDefinition(ContainerName = "~/")
+@Fluent()
 public interface AvailabilitySet extends
         GroupableResource,
         Refreshable<AvailabilitySet>,
@@ -69,7 +69,6 @@ public interface AvailabilitySet extends
     /**
      * Container interface for all the definitions.
      */
-    @LangDefinition(ContainerName = "~/AvailabilitySet.Definition")
     interface Definition extends
         DefinitionStages.Blank,
         DefinitionStages.WithGroup,
@@ -79,7 +78,6 @@ interface Definition extends
     /**
      * Grouping of availability set definition stages.
      */
-    @LangDefinition(ContainerName = "~/AvailabilitySet.Definition", ContainerFileName = "IDefinition", IsContainerOnly = true)
     interface DefinitionStages {
         /**
          * The first stage of an availability set definition.
@@ -136,7 +134,6 @@ interface WithCreate extends
      * <p>
      * Call {@link Update#apply()} to apply the changes to the resource in Azure.
      */
-    @LangDefinition(ContainerName = "~/AvailabilitySet.Update")
     interface Update extends
         Appliable<AvailabilitySet>,
         Resource.UpdateWithTags<Update> {

azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/AvailabilitySets.java

@@ -1,6 +1,6 @@
 package com.microsoft.azure.management.compute;
 
-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;
@@ -13,7 +13,7 @@
 /**
  * Entry point to availability set management API.
  */
-@LangDefinition(ContainerName = "~/")
+@Fluent
 public interface AvailabilitySets extends
         SupportsListingByGroup<AvailabilitySet>,
         SupportsGettingByGroup<AvailabilitySet>,

azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachine.java

@@ -1,7 +1,9 @@
 package com.microsoft.azure.management.compute;
 
 import com.microsoft.azure.PagedList;
-import com.microsoft.azure.management.apigeneration.LangDefinition;
+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.compute.implementation.VirtualMachineInner;
 import com.microsoft.azure.management.network.Network;
 import com.microsoft.azure.management.network.NetworkInterface;
@@ -22,7 +24,7 @@
 /**
  * An immutable client-side representation of an Azure virtual machine.
  */
-@LangDefinition(ContainerName = "~/")
+@Fluent
 public interface VirtualMachine extends
         GroupableResource,
         Refreshable<VirtualMachine>,
@@ -137,7 +139,13 @@ public interface VirtualMachine extends
      *
      * @return the public IP of the primary network interface
      */
-    PublicIpAddress primaryPublicIpAddress();
+    @LangMethodDefinition(AsType = LangMethodType.Method)
+    PublicIpAddress getPrimaryPublicIpAddress();
+
+    /**
+     * @return the resource ID of the public IP address associated with this virtual machine's primary network interface
+     */
+    String primaryPublicIpAddressId();
 
     /**
      * Returns id to the availability set this virtual machine associated with.
@@ -222,7 +230,6 @@ public interface VirtualMachine extends
     /**
      * The entirety of the virtual machine definition.
      */
-    @LangDefinition(ContainerName = "~/VirtualMachine.Definition")
     interface Definition extends
             DefinitionStages.Blank,
             DefinitionStages.WithGroup,
@@ -242,7 +249,6 @@ interface Definition extends
     /**
      * Grouping of virtual machine definition stages.
      */
-    @LangDefinition(ContainerName = "~/VirtualMachine.Definition", ContainerFileName = "IDefinition", IsContainerOnly = true)
     interface DefinitionStages {
         /**
          * The first stage of a virtual machine definition.
@@ -815,7 +821,6 @@ interface WithCreate extends
     /**
      * Grouping of virtual machine update stages.
      */
-    @LangDefinition(ContainerName = "~/VirtualMachine.Update", ContainerFileName = "IUpdate", IsContainerOnly = true)
     interface UpdateStages {
         /**
          * The stage of the virtual machine definition allowing to specify data disk configuration.
@@ -958,7 +963,6 @@ interface WithExtension {
      * <p>
      * Call {@link Update#apply()} to apply the changes to the resource in Azure.
      */
-    @LangDefinition(ContainerName = "~/VirtualMachine.Update")
     interface Update extends
             Appliable<VirtualMachine>,
             Resource.UpdateWithTags<Update>,

azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineDataDisk.java

@@ -1,6 +1,6 @@
 package com.microsoft.azure.management.compute;
 
-import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.Fluent;
 import com.microsoft.azure.management.resources.fluentcore.arm.models.ChildResource;
 import com.microsoft.azure.management.resources.fluentcore.model.Attachable;
 import com.microsoft.azure.management.resources.fluentcore.model.Settable;
@@ -9,7 +9,7 @@
 /**
  * A data disk of a virtual machine.
  */
-@LangDefinition(ContainerName = "~/")
+@Fluent
 public interface VirtualMachineDataDisk extends
         Wrapper<DataDisk>,
         ChildResource<VirtualMachine> {
@@ -68,7 +68,6 @@ public interface VirtualMachineDataDisk extends
     /**
      * Grouping of data disk definition stages applicable as part of a virtual machine creation.
      */
-    @LangDefinition(ContainerName = "~/VirtualMachineDataDisk.Definition", ContainerFileName = "IDefinition", IsContainerOnly = true)
     interface DefinitionStages {
         /**
          * The first stage of a  data disk definition.
@@ -165,7 +164,6 @@ interface WithAttach<ParentT> extends Attachable.InUpdate<ParentT> {
      * The entirety of a data disk definition.
      * @param <ParentT> the return type of the final {@link Attachable#attach()}
      */
-    @LangDefinition(ContainerName = "~/VirtualMachineDataDisk.Definition")
     interface Definition<ParentT> extends
             DefinitionStages.Blank<ParentT>,
             DefinitionStages.WithAttach<ParentT>,
@@ -175,7 +173,6 @@ interface Definition<ParentT> extends
     /**
      * Grouping of data disk definition stages applicable as part of a virtual machine update.
      */
-    @LangDefinition(ContainerName = "~/VirtualMachineDataDisk.Update", ContainerFileName = "IUpdateDefinition", IsContainerOnly = true)
     interface UpdateDefinitionStages {
         /**
          * The first stage of a  data disk definition.
@@ -271,7 +268,6 @@ interface WithAttach<ParentT> extends Attachable.InDefinition<ParentT> {
     /** The entirety of a data disk definition as part of a virtual machine update.
      * @param <ParentT> the return type of the final {@link UpdateDefinitionStages.WithAttach#attach()}
      */
-    @LangDefinition(ContainerName = "~/VirtualMachineDataDisk.Update", ContainerFileName = "IUpdateDefinition")
        interface UpdateDefinition<ParentT>  extends
             UpdateDefinitionStages.Blank<ParentT>,
             UpdateDefinitionStages.WithAttach<ParentT>,
@@ -281,7 +277,6 @@ interface UpdateDefinition<ParentT>  extends
     /**
      * Grouping of data disk update stages.
      */
-    @LangDefinition(ContainerName = "~/VirtualMachineDataDisk.Update", ContainerFileName = "IUpdate")
     interface UpdateStages {
         /**
          * Specifies the new size in GB for data disk.
@@ -311,7 +306,6 @@ interface UpdateStages {
     /**
      * The entirety of a data disk update as part of a virtual machine update.
      */
-    @LangDefinition(ContainerName = "~/VirtualMachineDataDisk.Update")
     interface Update extends
             UpdateStages,
             Settable<VirtualMachine.Update> {

azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineExtension.java

@@ -1,6 +1,5 @@
 package com.microsoft.azure.management.compute;
-
-import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.Fluent;
 import com.microsoft.azure.management.compute.implementation.VirtualMachineExtensionInner;
 import com.microsoft.azure.management.resources.fluentcore.arm.models.ExternalChildResource;
 import com.microsoft.azure.management.resources.fluentcore.model.Attachable;
@@ -14,7 +13,7 @@
  * An immutable client-side representation of an Azure virtual machine extension.
  * An extension associated with a virtual machine will be created from a {@link VirtualMachineExtensionImage }.
  */
-@LangDefinition
+@Fluent
 public interface VirtualMachineExtension extends
         ExternalChildResource<VirtualMachineExtension, VirtualMachine>,
         Wrapper<VirtualMachineExtensionInner> {

azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineExtensionImage.java

@@ -1,5 +1,6 @@
 package com.microsoft.azure.management.compute;
 
+import com.microsoft.azure.management.apigeneration.Fluent;
 import com.microsoft.azure.management.compute.implementation.VirtualMachineExtensionImageInner;
 import com.microsoft.azure.management.resources.fluentcore.model.Wrapper;
 
@@ -8,6 +9,7 @@
  * <p>
  * Note: Azure virtual machine extension image is also referred as virtual machine extension handler.
  */
+@Fluent
 public interface VirtualMachineExtensionImage extends
         Wrapper<VirtualMachineExtensionImageInner> {
     /**

azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineExtensionImageType.java

@@ -1,11 +1,13 @@
 package com.microsoft.azure.management.compute;
 
+import com.microsoft.azure.management.apigeneration.Fluent;
 import com.microsoft.azure.management.compute.implementation.VirtualMachineExtensionImageInner;
 import com.microsoft.azure.management.resources.fluentcore.model.Wrapper;
 
 /**
  * An immutable client-side representation of an Azure virtual machine extension image type.
  */
+@Fluent
 public interface VirtualMachineExtensionImageType extends
         Wrapper<VirtualMachineExtensionImageInner> {
     /**

azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineExtensionImageTypes.java

@@ -1,9 +1,11 @@
 package com.microsoft.azure.management.compute;
 
+import com.microsoft.azure.management.apigeneration.Fluent;
 import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing;
 
 /**
  * Entry point to virtual machine image extension types.
  */
+@Fluent
 public interface VirtualMachineExtensionImageTypes extends SupportsListing<VirtualMachineExtensionImageType> {
 }

azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineExtensionImageVersion.java

@@ -1,11 +1,13 @@
 package com.microsoft.azure.management.compute;
 
+import com.microsoft.azure.management.apigeneration.Fluent;
 import com.microsoft.azure.management.compute.implementation.VirtualMachineExtensionImageInner;
 import com.microsoft.azure.management.resources.fluentcore.model.Wrapper;
 
 /**
  * An immutable client-side representation of an Azure virtual machine extension image version.
  */
+@Fluent
 public interface VirtualMachineExtensionImageVersion extends
         Wrapper<VirtualMachineExtensionImageInner> {
     /**

azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineExtensionImageVersions.java

@@ -1,9 +1,11 @@
 package com.microsoft.azure.management.compute;
 
+import com.microsoft.azure.management.apigeneration.Fluent;
 import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing;
 
 /**
  * Entry point to virtual machine image extension versions.
  */
+@Fluent
 public interface VirtualMachineExtensionImageVersions extends SupportsListing<VirtualMachineExtensionImageVersion> {
 }

azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineExtensionImages.java

@@ -1,10 +1,12 @@
 package com.microsoft.azure.management.compute;
 
+import com.microsoft.azure.management.apigeneration.Fluent;
 import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListingByRegion;
 
 /**
  *  Entry point to virtual machine extension image management API.
  */
+@Fluent
 public interface VirtualMachineExtensionImages extends SupportsListingByRegion<VirtualMachineExtensionImage> {
     /**
      * @return entry point to virtual machine extension image publishers

azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineImage.java

@@ -5,7 +5,7 @@
  */
 package com.microsoft.azure.management.compute;
 
-import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.Fluent;
 import com.microsoft.azure.management.compute.implementation.VirtualMachineImageInner;
 import com.microsoft.azure.management.resources.fluentcore.arm.Region;
 import com.microsoft.azure.management.resources.fluentcore.model.Wrapper;
@@ -15,7 +15,7 @@
 /**
  * An immutable client-side representation of an Azure virtual machine image.
  */
-@LangDefinition(ContainerName = "~/")
+@Fluent
 public interface VirtualMachineImage extends
         Wrapper<VirtualMachineImageInner> {
     /**

azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineImages.java

@@ -5,13 +5,13 @@
  */
 package com.microsoft.azure.management.compute;
 
-import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.Fluent;
 import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListingByRegion;
 
 /**
  *  Entry point to virtual machine image management API.
  */
-@LangDefinition(ContainerName = "~/")
+@Fluent
 public interface VirtualMachineImages extends
         SupportsListingByRegion<VirtualMachineImage> {
     /**

azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineImagesInSku.java

@@ -1,10 +1,10 @@
 package com.microsoft.azure.management.compute;
-import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.Fluent;
 import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing;
 
 /**
  * Entry point to virtual machine sku images.
  */
-@LangDefinition(ContainerName = "~/")
+@Fluent
 public interface VirtualMachineImagesInSku extends SupportsListing<VirtualMachineImage> {
 }

azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineOffer.java

@@ -5,13 +5,13 @@
  */
 package com.microsoft.azure.management.compute;
 
-import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.Fluent;
 import com.microsoft.azure.management.resources.fluentcore.arm.Region;
 
 /**
  * Represents a virtual machine image offer.
  */
-@LangDefinition(ContainerName = "~/")
+@Fluent
 public interface VirtualMachineOffer {
     /**
      * @return the region where this virtual machine image offer is available

azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineOffers.java

@@ -5,13 +5,13 @@
  */
 package com.microsoft.azure.management.compute;
 
-import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.Fluent;
 import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing;
 
 /**
  * Entry point to virtual machine image offers.
  */
-@LangDefinition(ContainerName = "~/")
+@Fluent
 public interface VirtualMachineOffers extends SupportsListing<VirtualMachineOffer> {
 }
 

azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachinePublisher.java

@@ -5,13 +5,13 @@
  */
 package com.microsoft.azure.management.compute;
 
-import com.microsoft.azure.management.apigeneration.LangDefinition;
+import com.microsoft.azure.management.apigeneration.Fluent;
 import com.microsoft.azure.management.resources.fluentcore.arm.Region;
 
 /**
  * Represents a virtual machine image publisher.
  */
-@LangDefinition(ContainerName = "~/")
+@Fluent
 public interface VirtualMachinePublisher {
     /**
      * @return the region where virtual machine images from this publisher is available