Generated from b7fa71077406ef102eee82870ab0165773076a8f

Merge pull request #35 from leonardbf/ANF-440-2019-10-01 ANF-440 correct 2019-10-01 API
AzureSDKAutomation · Dec 5, 2019 · b28c6d8 · b28c6d8
1 parent 02692b6
commit b28c6d8
Show file tree

Hide file tree

Showing 15 changed files with 279 additions and 132 deletions.
diff --git a/sdk/netapp/mgmt-v2019_05_01/pom.xml b/sdk/netapp/mgmt-v2019_05_01/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.2.0</version>
+        <version>1.1.0</version>
         <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-netapp</artifactId>
@@ -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>

diff --git a/...9_05_01/src/main/java/com/microsoft/azure/management/netapp/v2019_05_01/CapacityPool.java b/...9_05_01/src/main/java/com/microsoft/azure/management/netapp/v2019_05_01/CapacityPool.java
@@ -56,7 +56,7 @@ public interface CapacityPool extends HasInner<CapacityPoolInner>, Indexable, Re
     /**
      * @return the size value.
      */
-    Long size();
+    long size();
 
     /**
      * @return the tags value.
@@ -71,7 +71,7 @@ public interface CapacityPool extends HasInner<CapacityPoolInner>, Indexable, Re
     /**
      * The entirety of the CapacityPool definition.
      */
-    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithNetAppAccount, DefinitionStages.WithLocation, DefinitionStages.WithCreate {
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithNetAppAccount, DefinitionStages.WithLocation, DefinitionStages.WithServiceLevel, DefinitionStages.WithSize, DefinitionStages.WithCreate {
     }
 
     /**
@@ -106,31 +106,31 @@ interface WithLocation {
             * @param location the location parameter value
             * @return the next definition stage
             */
-            WithCreate withLocation(String location);
+            WithServiceLevel withLocation(String location);
         }
 
         /**
          * The stage of the capacitypool definition allowing to specify ServiceLevel.
          */
         interface WithServiceLevel {
-            /**
-             * Specifies serviceLevel.
-             * @param serviceLevel The service level of the file system. Possible values include: 'Standard', 'Premium', 'Ultra'
-             * @return the next definition stage
-             */
-            WithCreate withServiceLevel(ServiceLevel serviceLevel);
+           /**
+            * Specifies serviceLevel.
+            * @param serviceLevel The service level of the file system. Possible values include: 'Standard', 'Premium', 'Ultra'
+            * @return the next definition stage
+            */
+            WithSize withServiceLevel(ServiceLevel serviceLevel);
         }
 
         /**
          * The stage of the capacitypool definition allowing to specify Size.
          */
         interface WithSize {
-            /**
-             * Specifies size.
-             * @param size Provisioned size of the pool (in bytes). Allowed values are in 4TiB chunks (value must be multiply of 4398046511104)
-             * @return the next definition stage
-             */
-            WithCreate withSize(Long size);
+           /**
+            * Specifies size.
+            * @param size Provisioned size of the pool (in bytes). Allowed values are in 4TiB chunks (value must be multiply of 4398046511104)
+            * @return the next definition stage
+            */
+            WithCreate withSize(long size);
         }
 
         /**
@@ -150,7 +150,7 @@ interface WithTags {
          * the resource to be created (via {@link WithCreate#create()}), but also allows
          * for any other optional settings to be specified.
          */
-        interface WithCreate extends Creatable<CapacityPool>, DefinitionStages.WithServiceLevel, DefinitionStages.WithSize, DefinitionStages.WithTags {
+        interface WithCreate extends Creatable<CapacityPool>, DefinitionStages.WithTags {
         }
     }
     /**

diff --git a/...c/main/java/com/microsoft/azure/management/netapp/v2019_05_01/CheckNameResourceTypes.java b/...c/main/java/com/microsoft/azure/management/netapp/v2019_05_01/CheckNameResourceTypes.java
@@ -16,17 +16,17 @@
  * Defines values for CheckNameResourceTypes.
  */
 public final class CheckNameResourceTypes extends ExpandableStringEnum<CheckNameResourceTypes> {
-    /** Static value Microsoft.NetApp/netAppAccount for CheckNameResourceTypes. */
-    public static final CheckNameResourceTypes MICROSOFT_NET_APPNET_APP_ACCOUNT = fromString("Microsoft.NetApp/netAppAccount");
+    /** Static value Microsoft.NetApp/netAppAccounts for CheckNameResourceTypes. */
+    public static final CheckNameResourceTypes MICROSOFT_NET_APPNET_APP_ACCOUNTS = fromString("Microsoft.NetApp/netAppAccounts");
 
-    /** Static value Microsoft.NetApp/netAppAccount/capacityPools for CheckNameResourceTypes. */
-    public static final CheckNameResourceTypes MICROSOFT_NET_APPNET_APP_ACCOUNTCAPACITY_POOLS = fromString("Microsoft.NetApp/netAppAccount/capacityPools");
+    /** Static value Microsoft.NetApp/netAppAccounts/capacityPools for CheckNameResourceTypes. */
+    public static final CheckNameResourceTypes MICROSOFT_NET_APPNET_APP_ACCOUNTSCAPACITY_POOLS = fromString("Microsoft.NetApp/netAppAccounts/capacityPools");
 
-    /** Static value Microsoft.NetApp/netAppAccount/capacityPools/volumes for CheckNameResourceTypes. */
-    public static final CheckNameResourceTypes MICROSOFT_NET_APPNET_APP_ACCOUNTCAPACITY_POOLSVOLUMES = fromString("Microsoft.NetApp/netAppAccount/capacityPools/volumes");
+    /** Static value Microsoft.NetApp/netAppAccounts/capacityPools/volumes for CheckNameResourceTypes. */
+    public static final CheckNameResourceTypes MICROSOFT_NET_APPNET_APP_ACCOUNTSCAPACITY_POOLSVOLUMES = fromString("Microsoft.NetApp/netAppAccounts/capacityPools/volumes");
 
-    /** Static value Microsoft.NetApp/netAppAccount/capacityPools/volumes/snapshots for CheckNameResourceTypes. */
-    public static final CheckNameResourceTypes MICROSOFT_NET_APPNET_APP_ACCOUNTCAPACITY_POOLSVOLUMESSNAPSHOTS = fromString("Microsoft.NetApp/netAppAccount/capacityPools/volumes/snapshots");
+    /** Static value Microsoft.NetApp/netAppAccounts/capacityPools/volumes/snapshots for CheckNameResourceTypes. */
+    public static final CheckNameResourceTypes MICROSOFT_NET_APPNET_APP_ACCOUNTSCAPACITY_POOLSVOLUMESSNAPSHOTS = fromString("Microsoft.NetApp/netAppAccounts/capacityPools/volumes/snapshots");
 
     /**
      * Creates or finds a CheckNameResourceTypes from its string representation.

diff --git a/..._01/src/main/java/com/microsoft/azure/management/netapp/v2019_05_01/ExportPolicyRule.java b/..._01/src/main/java/com/microsoft/azure/management/netapp/v2019_05_01/ExportPolicyRule.java
@@ -45,7 +45,8 @@ public class ExportPolicyRule {
     private Boolean nfsv3;
 
     /**
-     * Allows NFSv4 protocol.
+     * Deprecated: Will use the NFSv4.1 protocol, please use swagger version
+     * 2019-07-01 or later.
      */
     @JsonProperty(value = "nfsv4")
     private Boolean nfsv4;
@@ -158,7 +159,7 @@ public ExportPolicyRule withNfsv3(Boolean nfsv3) {
     }
 
     /**
-     * Get allows NFSv4 protocol.
+     * Get deprecated: Will use the NFSv4.1 protocol, please use swagger version 2019-07-01 or later.
      *
      * @return the nfsv4 value
      */
@@ -167,7 +168,7 @@ public Boolean nfsv4() {
     }
 
     /**
-     * Set allows NFSv4 protocol.
+     * Set deprecated: Will use the NFSv4.1 protocol, please use swagger version 2019-07-01 or later.
      *
      * @param nfsv4 the nfsv4 value to set
      * @return the ExportPolicyRule object itself.

diff --git a/...va/com/microsoft/azure/management/netapp/v2019_05_01/ResourceNameAvailabilityRequest.java b/...va/com/microsoft/azure/management/netapp/v2019_05_01/ResourceNameAvailabilityRequest.java
@@ -22,10 +22,10 @@ public class ResourceNameAvailabilityRequest {
 
     /**
      * Resource type used for verification. Possible values include:
-     * 'Microsoft.NetApp/netAppAccount',
-     * 'Microsoft.NetApp/netAppAccount/capacityPools',
-     * 'Microsoft.NetApp/netAppAccount/capacityPools/volumes',
-     * 'Microsoft.NetApp/netAppAccount/capacityPools/volumes/snapshots'.
+     * 'Microsoft.NetApp/netAppAccounts',
+     * 'Microsoft.NetApp/netAppAccounts/capacityPools',
+     * 'Microsoft.NetApp/netAppAccounts/capacityPools/volumes',
+     * 'Microsoft.NetApp/netAppAccounts/capacityPools/volumes/snapshots'.
      */
     @JsonProperty(value = "type", required = true)
     private CheckNameResourceTypes type;
@@ -57,7 +57,7 @@ public ResourceNameAvailabilityRequest withName(String name) {
     }
 
     /**
-     * Get resource type used for verification. Possible values include: 'Microsoft.NetApp/netAppAccount', 'Microsoft.NetApp/netAppAccount/capacityPools', 'Microsoft.NetApp/netAppAccount/capacityPools/volumes', 'Microsoft.NetApp/netAppAccount/capacityPools/volumes/snapshots'.
+     * Get resource type used for verification. Possible values include: 'Microsoft.NetApp/netAppAccounts', 'Microsoft.NetApp/netAppAccounts/capacityPools', 'Microsoft.NetApp/netAppAccounts/capacityPools/volumes', 'Microsoft.NetApp/netAppAccounts/capacityPools/volumes/snapshots'.
      *
      * @return the type value
      */
@@ -66,7 +66,7 @@ public CheckNameResourceTypes type() {
     }
 
     /**
-     * Set resource type used for verification. Possible values include: 'Microsoft.NetApp/netAppAccount', 'Microsoft.NetApp/netAppAccount/capacityPools', 'Microsoft.NetApp/netAppAccount/capacityPools/volumes', 'Microsoft.NetApp/netAppAccount/capacityPools/volumes/snapshots'.
+     * Set resource type used for verification. Possible values include: 'Microsoft.NetApp/netAppAccounts', 'Microsoft.NetApp/netAppAccounts/capacityPools', 'Microsoft.NetApp/netAppAccounts/capacityPools/volumes', 'Microsoft.NetApp/netAppAccounts/capacityPools/volumes/snapshots'.
      *
      * @param type the type value to set
      * @return the ResourceNameAvailabilityRequest object itself.

diff --git a/...t-v2019_05_01/src/main/java/com/microsoft/azure/management/netapp/v2019_05_01/Volume.java b/...t-v2019_05_01/src/main/java/com/microsoft/azure/management/netapp/v2019_05_01/Volume.java
@@ -17,6 +17,7 @@
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
 import com.microsoft.azure.management.netapp.v2019_05_01.implementation.NetAppManager;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -53,11 +54,21 @@ public interface Volume extends HasInner<VolumeInner>, Indexable, Refreshable<Vo
      */
     String location();
 
+    /**
+     * @return the mountTargets value.
+     */
+    Object mountTargets();
+
     /**
      * @return the name value.
      */
     String name();
 
+    /**
+     * @return the protocolTypes value.
+     */
+    List<String> protocolTypes();
+
     /**
      * @return the provisioningState value.
      */
@@ -91,12 +102,12 @@ public interface Volume extends HasInner<VolumeInner>, Indexable, Refreshable<Vo
     /**
      * @return the usageThreshold value.
      */
-    Long usageThreshold();
+    long usageThreshold();
 
     /**
      * The entirety of the Volume definition.
      */
-    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithCapacityPool, DefinitionStages.WithCreationToken, DefinitionStages.WithLocation, DefinitionStages.WithServiceLevel, DefinitionStages.WithCreate {
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithCapacityPool, DefinitionStages.WithCreationToken, DefinitionStages.WithLocation, DefinitionStages.WithSubnetId, DefinitionStages.WithUsageThreshold, DefinitionStages.WithCreate {
     }
 
     /**
@@ -144,19 +155,31 @@ interface WithLocation {
             * @param location the location parameter value
             * @return the next definition stage
             */
-            WithServiceLevel withLocation(String location);
+            WithSubnetId withLocation(String location);
         }
 
         /**
-         * The stage of the volume definition allowing to specify ServiceLevel.
+         * The stage of the volume definition allowing to specify SubnetId.
          */
-        interface WithServiceLevel {
+        interface WithSubnetId {
            /**
-            * Specifies serviceLevel.
-            * @param serviceLevel The service level of the file system. Possible values include: 'Standard', 'Premium', 'Ultra'
+            * Specifies subnetId.
+            * @param subnetId The Azure Resource URI for a delegated subnet. Must have the delegation Microsoft.NetApp/volumes
             * @return the next definition stage
             */
-            WithCreate withServiceLevel(ServiceLevel serviceLevel);
+            WithUsageThreshold withSubnetId(String subnetId);
+        }
+
+        /**
+         * The stage of the volume definition allowing to specify UsageThreshold.
+         */
+        interface WithUsageThreshold {
+           /**
+            * Specifies usageThreshold.
+            * @param usageThreshold Maximum storage quota allowed for a file system in bytes. This is a soft quota used for alerting only. Minimum size is 100 GiB. Upper limit is 100TiB. Specified in bytes
+            * @return the next definition stage
+            */
+            WithCreate withUsageThreshold(long usageThreshold);
         }
 
         /**
@@ -172,59 +195,71 @@ interface WithExportPolicy {
         }
 
         /**
-         * The stage of the volume definition allowing to specify SnapshotId.
+         * The stage of the volume definition allowing to specify MountTargets.
          */
-        interface WithSnapshotId {
+        interface WithMountTargets {
             /**
-             * Specifies snapshotId.
-             * @param snapshotId UUID v4 used to identify the Snapshot
+             * Specifies mountTargets.
+             * @param mountTargets List of mount targets
              * @return the next definition stage
              */
-            WithCreate withSnapshotId(String snapshotId);
+            WithCreate withMountTargets(Object mountTargets);
         }
 
         /**
-         * The stage of the volume definition allowing to specify SubnetId.
+         * The stage of the volume definition allowing to specify ProtocolTypes.
          */
-        interface WithSubnetId {
+        interface WithProtocolTypes {
             /**
-             * Specifies subnetId.
-             * @param subnetId The Azure Resource URI for a delegated subnet. Must have the delegation Microsoft.NetApp/volumes
+             * Specifies protocolTypes.
+             * @param protocolTypes Set of protocol types
              * @return the next definition stage
              */
-            WithCreate withSubnetId(String subnetId);
+            WithCreate withProtocolTypes(List<String> protocolTypes);
         }
 
         /**
-         * The stage of the volume definition allowing to specify Tags.
+         * The stage of the volume definition allowing to specify ServiceLevel.
          */
-        interface WithTags {
+        interface WithServiceLevel {
             /**
-             * Specifies tags.
-             * @param tags the tags parameter value
+             * Specifies serviceLevel.
+             * @param serviceLevel The service level of the file system. Possible values include: 'Standard', 'Premium', 'Ultra'
              * @return the next definition stage
              */
-            WithCreate withTags(Map<String, String> tags);
+            WithCreate withServiceLevel(ServiceLevel serviceLevel);
         }
 
         /**
-         * The stage of the volume definition allowing to specify UsageThreshold.
+         * The stage of the volume definition allowing to specify SnapshotId.
          */
-        interface WithUsageThreshold {
+        interface WithSnapshotId {
             /**
-             * Specifies usageThreshold.
-             * @param usageThreshold Maximum storage quota allowed for a file system in bytes. This is a soft quota used for alerting only. Minimum size is 100 GiB. Upper limit is 100TiB
+             * Specifies snapshotId.
+             * @param snapshotId UUID v4 used to identify the Snapshot
+             * @return the next definition stage
+             */
+            WithCreate withSnapshotId(String snapshotId);
+        }
+
+        /**
+         * The stage of the volume definition allowing to specify Tags.
+         */
+        interface WithTags {
+            /**
+             * Specifies tags.
+             * @param tags the tags parameter value
              * @return the next definition stage
              */
-            WithCreate withUsageThreshold(Long usageThreshold);
+            WithCreate withTags(Map<String, String> tags);
         }
 
         /**
          * The stage of the 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 WithCreate extends Creatable<Volume>, DefinitionStages.WithExportPolicy, DefinitionStages.WithSnapshotId, DefinitionStages.WithSubnetId, DefinitionStages.WithTags, DefinitionStages.WithUsageThreshold {
+        interface WithCreate extends Creatable<Volume>, DefinitionStages.WithExportPolicy, DefinitionStages.WithMountTargets, DefinitionStages.WithProtocolTypes, DefinitionStages.WithServiceLevel, DefinitionStages.WithSnapshotId, DefinitionStages.WithTags {
         }
     }
     /**
@@ -279,7 +314,7 @@ interface WithTags {
         interface WithUsageThreshold {
             /**
              * Specifies usageThreshold.
-             * @param usageThreshold Maximum storage quota allowed for a file system in bytes. This is a soft quota used for alerting only. Minimum size is 100 GiB. Upper limit is 100TiB
+             * @param usageThreshold Maximum storage quota allowed for a file system in bytes. This is a soft quota used for alerting only. Minimum size is 100 GiB. Upper limit is 100TiB. Specified in bytes
              * @return the next update stage
              */
             Update withUsageThreshold(Long usageThreshold);

diff --git a/...19_05_01/src/main/java/com/microsoft/azure/management/netapp/v2019_05_01/VolumePatch.java b/...19_05_01/src/main/java/com/microsoft/azure/management/netapp/v2019_05_01/VolumePatch.java
@@ -29,7 +29,7 @@ public class VolumePatch extends Resource {
      * usageThreshold.
      * Maximum storage quota allowed for a file system in bytes. This is a soft
      * quota used for alerting only. Minimum size is 100 GiB. Upper limit is
-     * 100TiB.
+     * 100TiB. Specified in bytes.
      */
     @JsonProperty(value = "properties.usageThreshold")
     private Long usageThreshold;
@@ -62,7 +62,7 @@ public VolumePatch withServiceLevel(ServiceLevel serviceLevel) {
     }
 
     /**
-     * Get maximum storage quota allowed for a file system in bytes. This is a soft quota used for alerting only. Minimum size is 100 GiB. Upper limit is 100TiB.
+     * Get maximum storage quota allowed for a file system in bytes. This is a soft quota used for alerting only. Minimum size is 100 GiB. Upper limit is 100TiB. Specified in bytes.
      *
      * @return the usageThreshold value
      */
@@ -71,7 +71,7 @@ public Long usageThreshold() {
     }
 
     /**
-     * Set maximum storage quota allowed for a file system in bytes. This is a soft quota used for alerting only. Minimum size is 100 GiB. Upper limit is 100TiB.
+     * Set maximum storage quota allowed for a file system in bytes. This is a soft quota used for alerting only. Minimum size is 100 GiB. Upper limit is 100TiB. Specified in bytes.
      *
      * @param usageThreshold the usageThreshold value to set
      * @return the VolumePatch object itself.