Merge pull request Azure#1549 from martinsawicki/martin-networking

Fixing miscellaneous acronym capitalization issues
enc · Mar 23, 2017 · 7d3c934 · 7d3c934
2 parents 2c401f3 + 39f7301
commit 7d3c934
Show file tree

Hide file tree

Showing 18 changed files with 117 additions and 117 deletions.
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
@@ -1008,7 +1008,7 @@ interface WithWindowsCreateManaged extends WithFromImageCreateOptionsManaged {
              * @return the stage representing creatable Windows VM definition
              */
             @Method
-            WithWindowsCreateManaged withoutVmAgent();
+            WithWindowsCreateManaged withoutVMAgent();
 
             /**
              * Specifies that automatic updates should be disabled.
@@ -1031,10 +1031,10 @@ interface WithWindowsCreateManaged extends WithFromImageCreateOptionsManaged {
              * <p>
              * Each call to this method adds the given listener to the list of VM's WinRM listeners.
              *
-             * @param listener the WinRmListener
+             * @param listener the WinRMListener
              * @return the stage representing creatable Windows VM definition
              */
-            WithWindowsCreateManaged withWinRm(WinRMListener listener);
+            WithWindowsCreateManaged withWinRM(WinRMListener listener);
         }
 
         /**
@@ -1049,7 +1049,7 @@ interface WithWindowsCreateUnmanaged extends WithFromImageCreateOptionsUnmanaged
              * @return the stage representing creatable Windows VM definition
              */
             @Method
-            WithWindowsCreateUnmanaged withoutVmAgent();
+            WithWindowsCreateUnmanaged withoutVMAgent();
 
             /**
              * Specifies that automatic updates should be disabled.
@@ -1072,10 +1072,10 @@ interface WithWindowsCreateUnmanaged extends WithFromImageCreateOptionsUnmanaged
              * <p>
              * Each call to this method adds the given listener to the list of VM's WinRM listeners.
              *
-             * @param listener the WinRmListener
+             * @param listener the WinRMListener
              * @return the stage representing creatable Windows VM definition
              */
-            WithWindowsCreateUnmanaged withWinRm(WinRMListener listener);
+            WithWindowsCreateUnmanaged withWinRM(WinRMListener listener);
         }
 
         /**

diff --git a/...-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSet.java b/...-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSet.java
@@ -958,14 +958,14 @@ interface WithWindowsCreateManaged extends WithManagedCreate {
              *
              * @return the next stage of the definition
              */
-            WithWindowsCreateManaged withVmAgent();
+            WithWindowsCreateManaged withVMAgent();
 
             /**
              * Disables the VM agent.
              *
              * @return the next stage of the definition
              */
-            WithWindowsCreateManaged withoutVmAgent();
+            WithWindowsCreateManaged withoutVMAgent();
 
             /**
              * Enables automatic updates.
@@ -994,10 +994,10 @@ interface WithWindowsCreateManaged extends WithManagedCreate {
              * <p>
              * Each call to this method adds the given listener to the list of VM's WinRM listeners.
              *
-             * @param listener a WinRm listener
+             * @param listener a WinRM listener
              * @return the next stage of the definition
              */
-            WithWindowsCreateManaged withWinRm(WinRMListener listener);
+            WithWindowsCreateManaged withWinRM(WinRMListener listener);
         }
 
         /**
@@ -1012,14 +1012,14 @@ interface WithWindowsCreateUnmanaged extends WithUnmanagedCreate {
              *
              * @return the next stage of the definition
              */
-            WithWindowsCreateUnmanaged withVmAgent();
+            WithWindowsCreateUnmanaged withVMAgent();
 
             /**
              * Disables the VM agent.
              *
              * @return the next stage of the definition
              */
-            WithWindowsCreateUnmanaged withoutVmAgent();
+            WithWindowsCreateUnmanaged withoutVMAgent();
 
             /**
              * Enables automatic updates.
@@ -1048,10 +1048,10 @@ interface WithWindowsCreateUnmanaged extends WithUnmanagedCreate {
              * <p>
              * Each call to this method adds the given listener to the list of VM's WinRM listeners.
              *
-             * @param listener a WinRm listener
+             * @param listener a WinRM listener
              * @return the next stage of the definition
              */
-            WithWindowsCreateUnmanaged withWinRm(WinRMListener listener);
+            WithWindowsCreateUnmanaged withWinRM(WinRMListener listener);
         }
 
         /**

diff --git a/...ompute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetVM.java b/...ompute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetVM.java
@@ -145,7 +145,7 @@ public interface VirtualMachineScaleSetVM extends
     boolean isLinuxPasswordAuthenticationEnabled();
 
     /**
-     * @return true if this is a Windows virtual machine and Vm agent is provisioned, false otherwise
+     * @return true if this is a Windows virtual machine and VM agent is provisioned, false otherwise
      */
     boolean isWindowsVMAgentProvisioned();
 

diff --git a/...c/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImpl.java b/...c/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImpl.java
@@ -602,7 +602,7 @@ public VirtualMachineImpl withSsh(String publicKeyData) {
     }
 
     @Override
-    public VirtualMachineImpl withoutVmAgent() {
+    public VirtualMachineImpl withoutVMAgent() {
         this.inner().osProfile().windowsConfiguration().withProvisionVMAgent(false);
         return this;
     }
@@ -620,7 +620,7 @@ public VirtualMachineImpl withTimeZone(String timeZone) {
     }
 
     @Override
-    public VirtualMachineImpl withWinRm(WinRMListener listener) {
+    public VirtualMachineImpl withWinRM(WinRMListener listener) {
         if (this.inner().osProfile().windowsConfiguration().winRM() == null) {
             WinRMConfiguration winRMConfiguration = new WinRMConfiguration();
             this.inner().osProfile().windowsConfiguration().withWinRM(winRMConfiguration);

diff --git a/...ava/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetImpl.java b/...ava/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetImpl.java
@@ -788,15 +788,15 @@ public VirtualMachineScaleSetImpl withSsh(String publicKeyData) {
     }
 
     @Override
-    public VirtualMachineScaleSetImpl withVmAgent() {
+    public VirtualMachineScaleSetImpl withVMAgent() {
         this.inner()
                 .virtualMachineProfile()
                 .osProfile().windowsConfiguration().withProvisionVMAgent(true);
         return this;
     }
 
     @Override
-    public VirtualMachineScaleSetImpl withoutVmAgent() {
+    public VirtualMachineScaleSetImpl withoutVMAgent() {
         this.inner()
                 .virtualMachineProfile()
                 .osProfile().windowsConfiguration().withProvisionVMAgent(false);
@@ -828,7 +828,7 @@ public VirtualMachineScaleSetImpl withTimeZone(String timeZone) {
     }
 
     @Override
-    public VirtualMachineScaleSetImpl withWinRm(WinRMListener listener) {
+    public VirtualMachineScaleSetImpl withWinRM(WinRMListener listener) {
         if (this.inner().virtualMachineProfile().osProfile().windowsConfiguration().winRM() == null) {
             WinRMConfiguration winRMConfiguration = new WinRMConfiguration();
             this.inner()

diff --git a/...a/com/microsoft/azure/management/compute/samples/ConvertVirtualMachineToManagedDisks.java b/...a/com/microsoft/azure/management/compute/samples/ConvertVirtualMachineToManagedDisks.java
@@ -30,7 +30,7 @@ public final class ConvertVirtualMachineToManagedDisks {
      * @return true if sample runs successfully
      */
     public static boolean runSample(Azure azure) {
-        final String linuxVmName = Utils.createRandomName("VM1");
+        final String linuxVMName = Utils.createRandomName("VM1");
         final String rgName = Utils.createRandomName("rgCOMV");
         final String userName = "tirekicker";
         final String password = "12NewPA$$w0rd!";
@@ -42,7 +42,7 @@ public static boolean runSample(Azure azure) {
 
             System.out.println("Creating an un-managed Linux VM");
 
-            VirtualMachine linuxVM = azure.virtualMachines().define(linuxVmName)
+            VirtualMachine linuxVM = azure.virtualMachines().define(linuxVMName)
                     .withRegion(region)
                     .withNewResourceGroup(rgName)
                     .withNewPrimaryNetwork("10.0.0.0/28")

diff --git a/...crosoft/azure/management/compute/samples/CreateVirtualMachineUsingCustomImageFromVHD.java b/...crosoft/azure/management/compute/samples/CreateVirtualMachineUsingCustomImageFromVHD.java
@@ -46,12 +46,12 @@ public final class CreateVirtualMachineUsingCustomImageFromVHD {
      * @return true if sample runs successfully
      */
     public static boolean runSample(Azure azure) {
-        final String linuxVmName1 = SdkContext.randomResourceName("VM1", 10);
-        final String linuxVmName2 = SdkContext.randomResourceName("VM2", 10);
-        final String linuxVmName3 = SdkContext.randomResourceName("VM3", 10);
+        final String linuxVMName1 = SdkContext.randomResourceName("VM1", 10);
+        final String linuxVMName2 = SdkContext.randomResourceName("VM2", 10);
+        final String linuxVMName3 = SdkContext.randomResourceName("VM3", 10);
         final String customImageName = SdkContext.randomResourceName("img", 10);
         final String rgName = SdkContext.randomResourceName("rgCOMV", 15);
-        final String publicIpDnsLabel = SdkContext.randomResourceName("pip", 10);
+        final String publicIPDnsLabel = SdkContext.randomResourceName("pip", 10);
         final String userName = "tirekicker";
         final String password = "12NewPA$$w0rd!";
         final Region region = Region.US_WEST_CENTRAL;
@@ -68,12 +68,12 @@ public static boolean runSample(Azure azure) {
 
             System.out.println("Creating a un-managed Linux VM");
 
-            VirtualMachine linuxVM = azure.virtualMachines().define(linuxVmName1)
+            VirtualMachine linuxVM = azure.virtualMachines().define(linuxVMName1)
                     .withRegion(region)
                     .withNewResourceGroup(rgName)
                     .withNewPrimaryNetwork("10.0.0.0/28")
                     .withPrimaryPrivateIPAddressDynamic()
-                    .withNewPrimaryPublicIPAddress(publicIpDnsLabel)
+                    .withNewPrimaryPublicIPAddress(publicIPDnsLabel)
                     .withPopularLinuxImage(KnownLinuxVirtualMachineImage.UBUNTU_SERVER_16_04_LTS)
                     .withRootUsername(userName)
                     .withRootPassword(password)
@@ -157,7 +157,7 @@ public static boolean runSample(Azure azure) {
 
             System.out.println("Creating a Linux VM using custom image: " + virtualMachineCustomImage.id());
 
-            VirtualMachine linuxVM2 = azure.virtualMachines().define(linuxVmName2)
+            VirtualMachine linuxVM2 = azure.virtualMachines().define(linuxVMName2)
                     .withRegion(region)
                     .withExistingResourceGroup(rgName)
                     .withNewPrimaryNetwork("10.0.0.0/28")
@@ -176,7 +176,7 @@ public static boolean runSample(Azure azure) {
             // Create another Linux VM using custom image and configure the data disks from image and
             // add another data disk
 
-            VirtualMachine linuxVM3 = azure.virtualMachines().define(linuxVmName3)
+            VirtualMachine linuxVM3 = azure.virtualMachines().define(linuxVMName3)
                     .withRegion(region)
                     .withExistingResourceGroup(rgName)
                     .withNewPrimaryNetwork("10.0.0.0/28")

diff --git a/...icrosoft/azure/management/compute/samples/CreateVirtualMachineUsingCustomImageFromVM.java b/...icrosoft/azure/management/compute/samples/CreateVirtualMachineUsingCustomImageFromVM.java
@@ -43,9 +43,9 @@ public final class CreateVirtualMachineUsingCustomImageFromVM {
      * @return true if sample runs successfully
      */
     public static boolean runSample(Azure azure) {
-        final String linuxVmName1 = Utils.createRandomName("VM1");
-        final String linuxVmName2 = Utils.createRandomName("VM2");
-        final String linuxVmName3 = Utils.createRandomName("VM3");
+        final String linuxVMName1 = Utils.createRandomName("VM1");
+        final String linuxVMName2 = Utils.createRandomName("VM2");
+        final String linuxVMName3 = Utils.createRandomName("VM3");
         final String customImageName = Utils.createRandomName("img");
         final String rgName = Utils.createRandomName("rgCOMV");
         final String publicIpDnsLabel = Utils.createRandomName("pip");
@@ -65,7 +65,7 @@ public static boolean runSample(Azure azure) {
 
             System.out.println("Creating a un-managed Linux VM");
 
-            VirtualMachine linuxVM = azure.virtualMachines().define(linuxVmName1)
+            VirtualMachine linuxVM = azure.virtualMachines().define(linuxVMName1)
                     .withRegion(region)
                     .withNewResourceGroup(rgName)
                     .withNewPrimaryNetwork("10.0.0.0/28")
@@ -137,7 +137,7 @@ public static boolean runSample(Azure azure) {
 
             System.out.println("Creating a Linux VM using custom image - " + virtualMachineCustomImage.id());
 
-            VirtualMachine linuxVM2 = azure.virtualMachines().define(linuxVmName2)
+            VirtualMachine linuxVM2 = azure.virtualMachines().define(linuxVMName2)
                     .withRegion(region)
                     .withExistingResourceGroup(rgName)
                     .withNewPrimaryNetwork("10.0.0.0/28")
@@ -157,7 +157,7 @@ public static boolean runSample(Azure azure) {
 
             System.out.println("Creating another Linux VM with additional data disks using custom image - " + virtualMachineCustomImage.id());
 
-            VirtualMachine linuxVM3 = azure.virtualMachines().define(linuxVmName3)
+            VirtualMachine linuxVM3 = azure.virtualMachines().define(linuxVMName3)
                     .withRegion(region)
                     .withExistingResourceGroup(rgName)
                     .withNewPrimaryNetwork("10.0.0.0/28")

diff --git a/...zure/management/compute/samples/CreateVirtualMachineUsingSpecializedDiskFromSnapshot.java b/...zure/management/compute/samples/CreateVirtualMachineUsingSpecializedDiskFromSnapshot.java
@@ -39,8 +39,8 @@ public final class CreateVirtualMachineUsingSpecializedDiskFromSnapshot {
      * @return true if sample runs successfully
      */
     public static boolean runSample(Azure azure) {
-        final String linuxVmName1 = Utils.createRandomName("VM1");
-        final String linuxVmName2 = Utils.createRandomName("VM2");
+        final String linuxVMName1 = Utils.createRandomName("VM1");
+        final String linuxVMName2 = Utils.createRandomName("VM2");
         final String managedOSSnapshotName = Utils.createRandomName("ss-os-");
         final String managedDataDiskSnapshotPrefix = Utils.createRandomName("ss-data-");
         final String managedNewOSDiskName = Utils.createRandomName("ds-os-nw-");
@@ -64,7 +64,7 @@ public static boolean runSample(Azure azure) {
 
             System.out.println("Creating a un-managed Linux VM");
 
-            VirtualMachine linuxVM = azure.virtualMachines().define(linuxVmName1)
+            VirtualMachine linuxVM = azure.virtualMachines().define(linuxVMName1)
                     .withRegion(region)
                     .withNewResourceGroup(rgName)
                     .withNewPrimaryNetwork("10.0.0.0/28")
@@ -183,7 +183,7 @@ public static boolean runSample(Azure azure) {
 
             System.out.println("Creating a Linux VM using specialized OS and data disks");
 
-            VirtualMachine linuxVM2 = azure.virtualMachines().define(linuxVmName2)
+            VirtualMachine linuxVM2 = azure.virtualMachines().define(linuxVMName2)
                     .withRegion(region)
                     .withExistingResourceGroup(rgName)
                     .withNewPrimaryNetwork("10.0.0.0/28")

diff --git a/...oft/azure/management/compute/samples/CreateVirtualMachineUsingSpecializedDiskFromVhd.java b/...oft/azure/management/compute/samples/CreateVirtualMachineUsingSpecializedDiskFromVhd.java
@@ -38,8 +38,8 @@ public class CreateVirtualMachineUsingSpecializedDiskFromVhd {
      * @return true if sample runs successfully
      */
     public static boolean runSample(Azure azure) {
-        final String linuxVmName1 = Utils.createRandomName("VM1");
-        final String linuxVmName2 = Utils.createRandomName("VM2");
+        final String linuxVMName1 = Utils.createRandomName("VM1");
+        final String linuxVMName2 = Utils.createRandomName("VM2");
         final String managedOSDiskName = Utils.createRandomName("ds-os-");
         final String managedDataDiskNamePrefix = Utils.createRandomName("ds-data-");
         final String rgName = Utils.createRandomName("rgCOMV");
@@ -58,7 +58,7 @@ public static boolean runSample(Azure azure) {
 
             System.out.println("Creating a un-managed Linux VM");
 
-            VirtualMachine linuxVM = azure.virtualMachines().define(linuxVmName1)
+            VirtualMachine linuxVM = azure.virtualMachines().define(linuxVMName1)
                     .withRegion(region)
                     .withNewResourceGroup(rgName)
                     .withNewPrimaryNetwork("10.0.0.0/28")
@@ -149,7 +149,7 @@ public static boolean runSample(Azure azure) {
 
             System.out.println("Creating a Linux VM using specialized OS and data disks");
 
-            VirtualMachine linuxVM2 = azure.virtualMachines().define(linuxVmName2)
+            VirtualMachine linuxVM2 = azure.virtualMachines().define(linuxVMName2)
                     .withRegion(region)
                     .withExistingResourceGroup(rgName)
                     .withNewPrimaryNetwork("10.0.0.0/28")

diff --git a/...ure/management/compute/samples/CreateVirtualMachinesUsingCustomImageOrSpecializedVHD.java b/...ure/management/compute/samples/CreateVirtualMachinesUsingCustomImageOrSpecializedVHD.java
@@ -43,11 +43,11 @@ public final class CreateVirtualMachinesUsingCustomImageOrSpecializedVHD {
      * @return true if sample runs successfully
      */
     public static boolean runSample(Azure azure) {
-        final String linuxVmName1 = Utils.createRandomName("VM1");
-        final String linuxVmName2 = Utils.createRandomName("VM2");
-        final String linuxVmName3 = Utils.createRandomName("VM3");
+        final String linuxVMName1 = Utils.createRandomName("VM1");
+        final String linuxVMName2 = Utils.createRandomName("VM2");
+        final String linuxVMName3 = Utils.createRandomName("VM3");
         final String rgName = Utils.createRandomName("rgCOMV");
-        final String publicIpDnsLabel = Utils.createRandomName("pip");
+        final String publicIPDnsLabel = Utils.createRandomName("pip");
         final String userName = "tirekicker";
         final String password = "12NewPA$$w0rd!";
 
@@ -62,12 +62,12 @@ public static boolean runSample(Azure azure) {
 
             System.out.println("Creating a Linux VM");
 
-            VirtualMachine linuxVM = azure.virtualMachines().define(linuxVmName1)
+            VirtualMachine linuxVM = azure.virtualMachines().define(linuxVMName1)
                     .withRegion(Region.US_EAST)
                     .withNewResourceGroup(rgName)
                     .withNewPrimaryNetwork("10.0.0.0/28")
                     .withPrimaryPrivateIPAddressDynamic()
-                    .withNewPrimaryPublicIPAddress(publicIpDnsLabel)
+                    .withNewPrimaryPublicIPAddress(publicIPDnsLabel)
                     .withPopularLinuxImage(KnownLinuxVirtualMachineImage.UBUNTU_SERVER_16_04_LTS)
                     .withRootUsername(userName)
                     .withRootPassword(password)
@@ -119,7 +119,7 @@ public static boolean runSample(Azure azure) {
 
             System.out.println("Creating a Linux VM using captured image - " + capturedImageUri);
 
-            VirtualMachine linuxVM2 = azure.virtualMachines().define(linuxVmName2)
+            VirtualMachine linuxVM2 = azure.virtualMachines().define(linuxVMName2)
                     .withRegion(Region.US_EAST)
                     .withExistingResourceGroup(rgName)
                     .withNewPrimaryNetwork("10.0.0.0/28")
@@ -150,7 +150,7 @@ public static boolean runSample(Azure azure) {
                     + specializedVhd
                     + " of deleted VM");
 
-            VirtualMachine linuxVM3 = azure.virtualMachines().define(linuxVmName3)
+            VirtualMachine linuxVM3 = azure.virtualMachines().define(linuxVMName3)
                     .withRegion(Region.US_EAST)
                     .withExistingResourceGroup(rgName)
                     .withNewPrimaryNetwork("10.0.0.0/28")