Generated from c921cf7ddc81cdc67b358506836f9e328623d568

Merge remote-tracking branch 'upstream/master'

sdk/compute/mgmt-v2017_09_01/pom.xml

@@ -11,15 +11,15 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.2.0</version>
-        <relativePath>../../parents/azure-arm-parent</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-compute</artifactId>
     <version>1.0.0-beta</version>
     <packaging>jar</packaging>
     <name>Microsoft Azure SDK for Compute Management</name>
     <description>This package contains Microsoft Compute Management SDK.</description>
-    <url>https://github.com/Azure/azure-libraries-for-java</url>
+    <url>https://github.com/Azure/azure-sdk-for-java</url>
     <licenses>
         <license>
             <name>The MIT License (MIT)</name>
@@ -28,8 +28,8 @@
         </license>
     </licenses>
     <scm>
-        <url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
-        <connection>scm:git:[email protected]:Azure/azure-libraries-for-java.git</connection>
+        <url>scm:git:https://github.com/Azure/azure-sdk-for-java</url>
+        <connection>scm:git:[email protected]:Azure/azure-sdk-for-java.git</connection>
         <tag>HEAD</tag>
     </scm>
     <properties>
@@ -71,6 +71,8 @@
             <artifactId>azure-arm-client-runtime</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
+            <!--Below version for test jar needs to be removed, this will be done as part of v1-runtime 1.6.7-->
+            <version>1.6.5</version>
         </dependency>
     </dependencies>
     <build>

sdk/compute/mgmt-v2017_09_01/src/main/java/com/microsoft/azure/management/compute/v2017_09_01/ResourceSkuCapabilities.java

@@ -11,7 +11,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
- * Describes The SKU capabilites object.
+ * Describes The SKU capabilities object.
  */
 public class ResourceSkuCapabilities {
     /**
@@ -27,7 +27,7 @@ public class ResourceSkuCapabilities {
     private String value;
 
     /**
-     * Get the name value.
+     * Get an invariant to describe the feature.
      *
      * @return the name value
      */
@@ -36,7 +36,7 @@ public String name() {
     }
 
     /**
-     * Get the value value.
+     * Get an invariant if the feature is measured by quantity.
      *
      * @return the value value
      */

sdk/compute/mgmt-v2017_09_01/src/main/java/com/microsoft/azure/management/compute/v2017_09_01/ResourceSkuCapacity.java

@@ -40,7 +40,7 @@ public class ResourceSkuCapacity {
     private ResourceSkuCapacityScaleType scaleType;
 
     /**
-     * Get the minimum value.
+     * Get the minimum capacity.
      *
      * @return the minimum value
      */
@@ -49,7 +49,7 @@ public Long minimum() {
     }
 
     /**
-     * Get the maximum value.
+     * Get the maximum capacity that can be set.
      *
      * @return the maximum value
      */
@@ -58,7 +58,7 @@ public Long maximum() {
     }
 
     /**
-     * Get the defaultProperty value.
+     * Get the default capacity.
      *
      * @return the defaultProperty value
      */
@@ -67,7 +67,7 @@ public Long defaultProperty() {
     }
 
     /**
-     * Get the scaleType value.
+     * Get the scale type applicable to the sku. Possible values include: 'Automatic', 'Manual', 'None'.
      *
      * @return the scaleType value
      */

sdk/compute/mgmt-v2017_09_01/src/main/java/com/microsoft/azure/management/compute/v2017_09_01/ResourceSkuCosts.java

@@ -33,7 +33,7 @@ public class ResourceSkuCosts {
     private String extendedUnit;
 
     /**
-     * Get the meterID value.
+     * Get used for querying price from commerce.
      *
      * @return the meterID value
      */
@@ -42,7 +42,7 @@ public String meterID() {
     }
 
     /**
-     * Get the quantity value.
+     * Get the multiplier is needed to extend the base metered cost.
      *
      * @return the quantity value
      */
@@ -51,7 +51,7 @@ public Long quantity() {
     }
 
     /**
-     * Get the extendedUnit value.
+     * Get an invariant to show the extended unit.
      *
      * @return the extendedUnit value
      */

sdk/compute/mgmt-v2017_09_01/src/main/java/com/microsoft/azure/management/compute/v2017_09_01/ResourceSkuLocationInfo.java

@@ -28,7 +28,7 @@ public class ResourceSkuLocationInfo {
     private List<String> zones;
 
     /**
-     * Get the location value.
+     * Get location of the SKU.
      *
      * @return the location value
      */
@@ -37,7 +37,7 @@ public String location() {
     }
 
     /**
-     * Get the zones value.
+     * Get list of availability zones where the SKU is supported.
      *
      * @return the zones value
      */

sdk/compute/mgmt-v2017_09_01/src/main/java/com/microsoft/azure/management/compute/v2017_09_01/ResourceSkuRestrictionInfo.java

@@ -28,7 +28,7 @@ public class ResourceSkuRestrictionInfo {
     private List<String> zones;
 
     /**
-     * Get the locations value.
+     * Get locations where the SKU is restricted.
      *
      * @return the locations value
      */
@@ -37,7 +37,7 @@ public List<String> locations() {
     }
 
     /**
-     * Get the zones value.
+     * Get list of availability zones where the SKU is restricted.
      *
      * @return the zones value
      */

sdk/compute/mgmt-v2017_09_01/src/main/java/com/microsoft/azure/management/compute/v2017_09_01/ResourceSkuRestrictions.java

@@ -42,7 +42,7 @@ public class ResourceSkuRestrictions {
     private ResourceSkuRestrictionsReasonCode reasonCode;
 
     /**
-     * Get the type value.
+     * Get the type of restrictions. Possible values include: 'Location', 'Zone'.
      *
      * @return the type value
      */
@@ -51,7 +51,7 @@ public ResourceSkuRestrictionsType type() {
     }
 
     /**
-     * Get the values value.
+     * Get the value of restrictions. If the restriction type is set to location. This would be different locations where the SKU is restricted.
      *
      * @return the values value
      */
@@ -60,7 +60,7 @@ public List<String> values() {
     }
 
     /**
-     * Get the restrictionInfo value.
+     * Get the information about the restriction where the SKU cannot be used.
      *
      * @return the restrictionInfo value
      */
@@ -69,7 +69,7 @@ public ResourceSkuRestrictionInfo restrictionInfo() {
     }
 
     /**
-     * Get the reasonCode value.
+     * Get the reason for restriction. Possible values include: 'QuotaId', 'NotAvailableForSubscription'.
      *
      * @return the reasonCode value
      */

sdk/compute/mgmt-v2017_09_01/src/main/java/com/microsoft/azure/management/compute/v2017_09_01/implementation/ComputeManagementClientImpl.java

@@ -63,11 +63,11 @@ public String apiVersion() {
         return this.apiVersion;
     }
 
-    /** Gets or sets the preferred language for the response. */
+    /** The preferred language for the response. */
     private String acceptLanguage;
 
     /**
-     * Gets Gets or sets the preferred language for the response.
+     * Gets The preferred language for the response.
      *
      * @return the acceptLanguage value.
      */
@@ -76,7 +76,7 @@ public String acceptLanguage() {
     }
 
     /**
-     * Sets Gets or sets the preferred language for the response.
+     * Sets The preferred language for the response.
      *
      * @param acceptLanguage the acceptLanguage value.
      * @return the service client itself
@@ -86,11 +86,11 @@ public ComputeManagementClientImpl withAcceptLanguage(String acceptLanguage) {
         return this;
     }
 
-    /** Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30. */
+    /** The retry timeout in seconds for Long Running Operations. Default value is 30. */
     private int longRunningOperationRetryTimeout;
 
     /**
-     * Gets Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30.
+     * Gets The retry timeout in seconds for Long Running Operations. Default value is 30.
      *
      * @return the longRunningOperationRetryTimeout value.
      */
@@ -99,7 +99,7 @@ public int longRunningOperationRetryTimeout() {
     }
 
     /**
-     * Sets Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30.
+     * Sets The retry timeout in seconds for Long Running Operations. Default value is 30.
      *
      * @param longRunningOperationRetryTimeout the longRunningOperationRetryTimeout value.
      * @return the service client itself
@@ -109,11 +109,11 @@ public ComputeManagementClientImpl withLongRunningOperationRetryTimeout(int long
         return this;
     }
 
-    /** When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true. */
+    /** Whether a unique x-ms-client-request-id should be generated. When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true. */
     private boolean generateClientRequestId;
 
     /**
-     * Gets When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
+     * Gets Whether a unique x-ms-client-request-id should be generated. When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
      *
      * @return the generateClientRequestId value.
      */
@@ -122,7 +122,7 @@ public boolean generateClientRequestId() {
     }
 
     /**
-     * Sets When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
+     * Sets Whether a unique x-ms-client-request-id should be generated. When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
      *
      * @param generateClientRequestId the generateClientRequestId value.
      * @return the service client itself
@@ -191,6 +191,6 @@ protected void initialize() {
      */
     @Override
     public String userAgent() {
-        return String.format("%s (%s, %s)", super.userAgent(), "ComputeManagementClient", "2017-09-01");
+        return String.format("%s (%s, %s, auto-generated)", super.userAgent(), "ComputeManagementClient", "2017-09-01");
     }
 }

sdk/compute/mgmt-v2017_09_01/src/main/java/com/microsoft/azure/management/compute/v2017_09_01/implementation/ResourceSkuInner.java

@@ -103,7 +103,7 @@ public class ResourceSkuInner {
     private List<ResourceSkuRestrictions> restrictions;
 
     /**
-     * Get the resourceType value.
+     * Get the type of resource the SKU applies to.
      *
      * @return the resourceType value
      */
@@ -112,7 +112,7 @@ public String resourceType() {
     }
 
     /**
-     * Get the name value.
+     * Get the name of SKU.
      *
      * @return the name value
      */
@@ -121,7 +121,7 @@ public String name() {
     }
 
     /**
-     * Get the tier value.
+     * Get specifies the tier of virtual machines in a scale set.&lt;br /&gt;&lt;br /&gt; Possible Values:&lt;br /&gt;&lt;br /&gt; **Standard**&lt;br /&gt;&lt;br /&gt; **Basic**.
      *
      * @return the tier value
      */
@@ -130,7 +130,7 @@ public String tier() {
     }
 
     /**
-     * Get the size value.
+     * Get the Size of the SKU.
      *
      * @return the size value
      */
@@ -139,7 +139,7 @@ public String size() {
     }
 
     /**
-     * Get the family value.
+     * Get the Family of this particular SKU.
      *
      * @return the family value
      */
@@ -148,7 +148,7 @@ public String family() {
     }
 
     /**
-     * Get the kind value.
+     * Get the Kind of resources that are supported in this SKU.
      *
      * @return the kind value
      */
@@ -157,7 +157,7 @@ public String kind() {
     }
 
     /**
-     * Get the capacity value.
+     * Get specifies the number of virtual machines in the scale set.
      *
      * @return the capacity value
      */
@@ -166,7 +166,7 @@ public ResourceSkuCapacity capacity() {
     }
 
     /**
-     * Get the locations value.
+     * Get the set of locations that the SKU is available.
      *
      * @return the locations value
      */
@@ -175,7 +175,7 @@ public List<String> locations() {
     }
 
     /**
-     * Get the locationInfo value.
+     * Get a list of locations and availability zones in those locations where the SKU is available.
      *
      * @return the locationInfo value
      */
@@ -184,7 +184,7 @@ public List<ResourceSkuLocationInfo> locationInfo() {
     }
 
     /**
-     * Get the apiVersions value.
+     * Get the api versions that support this SKU.
      *
      * @return the apiVersions value
      */
@@ -193,7 +193,7 @@ public List<String> apiVersions() {
     }
 
     /**
-     * Get the costs value.
+     * Get metadata for retrieving price info.
      *
      * @return the costs value
      */
@@ -202,7 +202,7 @@ public List<ResourceSkuCosts> costs() {
     }
 
     /**
-     * Get the capabilities value.
+     * Get a name value pair to describe the capability.
      *
      * @return the capabilities value
      */
@@ -211,7 +211,7 @@ public List<ResourceSkuCapabilities> capabilities() {
     }
 
     /**
-     * Get the restrictions value.
+     * Get the restrictions because of which SKU cannot be used. This is empty if there are no restrictions.
      *
      * @return the restrictions value
      */