diff --git a/sdk/netapp/mgmt-v2020_02_01/pom.xml b/sdk/netapp/mgmt-v2020_02_01/pom.xml index 18b64ab338fb..c669883b5fe5 100644 --- a/sdk/netapp/mgmt-v2020_02_01/pom.xml +++ b/sdk/netapp/mgmt-v2020_02_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.3.2 - ../../parents/azure-arm-parent/pom.xml + 1.1.0 + ../../../pom.management.xml azure-mgmt-netapp 1.0.0-beta diff --git a/sdk/netapp/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/netapp/v2020_02_01/CapacityPool.java b/sdk/netapp/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/netapp/v2020_02_01/CapacityPool.java index 7e8e4c508d16..d4f8be9978b5 100644 --- a/sdk/netapp/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/netapp/v2020_02_01/CapacityPool.java +++ b/sdk/netapp/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/netapp/v2020_02_01/CapacityPool.java @@ -51,7 +51,7 @@ public interface CapacityPool extends HasInner, Indexable, Re /** * @return the serviceLevel value. */ - ServiceLevel serviceLevel(); + PoolServiceLevel serviceLevel(); /** * @return the size value. @@ -118,7 +118,7 @@ interface WithServiceLevel { * @param serviceLevel The service level of the file system. Possible values include: 'Standard', 'Premium', 'Ultra' * @return the next definition stage */ - WithSize withServiceLevel(ServiceLevel serviceLevel); + WithSize withServiceLevel(PoolServiceLevel serviceLevel); } /** @@ -172,7 +172,7 @@ interface WithServiceLevel { * @param serviceLevel The service level of the file system. Possible values include: 'Standard', 'Premium', 'Ultra' * @return the next update stage */ - Update withServiceLevel(ServiceLevel serviceLevel); + Update withServiceLevel(PatchServiceLevel serviceLevel); } /** diff --git a/sdk/netapp/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/netapp/v2020_02_01/CapacityPoolPatch.java b/sdk/netapp/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/netapp/v2020_02_01/CapacityPoolPatch.java index 92038683fb87..3a37186f19d3 100644 --- a/sdk/netapp/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/netapp/v2020_02_01/CapacityPoolPatch.java +++ b/sdk/netapp/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/netapp/v2020_02_01/CapacityPoolPatch.java @@ -31,7 +31,7 @@ public class CapacityPoolPatch extends Resource { * 'Standard', 'Premium', 'Ultra'. */ @JsonProperty(value = "properties.serviceLevel") - private ServiceLevel serviceLevel; + private PatchServiceLevel serviceLevel; /** * Get provisioned size of the pool (in bytes). Allowed values are in 4TiB chunks (value must be multiply of 4398046511104). @@ -58,7 +58,7 @@ public CapacityPoolPatch withSize(Long size) { * * @return the serviceLevel value */ - public ServiceLevel serviceLevel() { + public PatchServiceLevel serviceLevel() { return this.serviceLevel; } @@ -68,7 +68,7 @@ public ServiceLevel serviceLevel() { * @param serviceLevel the serviceLevel value to set * @return the CapacityPoolPatch object itself. */ - public CapacityPoolPatch withServiceLevel(ServiceLevel serviceLevel) { + public CapacityPoolPatch withServiceLevel(PatchServiceLevel serviceLevel) { this.serviceLevel = serviceLevel; return this; } diff --git a/sdk/netapp/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/netapp/v2020_02_01/PatchServiceLevel.java b/sdk/netapp/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/netapp/v2020_02_01/PatchServiceLevel.java new file mode 100644 index 000000000000..0cb0d1984437 --- /dev/null +++ b/sdk/netapp/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/netapp/v2020_02_01/PatchServiceLevel.java @@ -0,0 +1,44 @@ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + */ + +package com.microsoft.azure.management.netapp.v2020_02_01; + +import java.util.Collection; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.microsoft.rest.ExpandableStringEnum; + +/** + * Defines values for PatchServiceLevel. + */ +public final class PatchServiceLevel extends ExpandableStringEnum { + /** Static value Standard for PatchServiceLevel. */ + public static final PatchServiceLevel STANDARD = fromString("Standard"); + + /** Static value Premium for PatchServiceLevel. */ + public static final PatchServiceLevel PREMIUM = fromString("Premium"); + + /** Static value Ultra for PatchServiceLevel. */ + public static final PatchServiceLevel ULTRA = fromString("Ultra"); + + /** + * Creates or finds a PatchServiceLevel from its string representation. + * @param name a name to look for + * @return the corresponding PatchServiceLevel + */ + @JsonCreator + public static PatchServiceLevel fromString(String name) { + return fromString(name, PatchServiceLevel.class); + } + + /** + * @return known PatchServiceLevel values + */ + public static Collection values() { + return values(PatchServiceLevel.class); + } +} diff --git a/sdk/netapp/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/netapp/v2020_02_01/PoolServiceLevel.java b/sdk/netapp/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/netapp/v2020_02_01/PoolServiceLevel.java new file mode 100644 index 000000000000..dcf7d194a3b2 --- /dev/null +++ b/sdk/netapp/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/netapp/v2020_02_01/PoolServiceLevel.java @@ -0,0 +1,44 @@ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + */ + +package com.microsoft.azure.management.netapp.v2020_02_01; + +import java.util.Collection; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.microsoft.rest.ExpandableStringEnum; + +/** + * Defines values for PoolServiceLevel. + */ +public final class PoolServiceLevel extends ExpandableStringEnum { + /** Static value Standard for PoolServiceLevel. */ + public static final PoolServiceLevel STANDARD = fromString("Standard"); + + /** Static value Premium for PoolServiceLevel. */ + public static final PoolServiceLevel PREMIUM = fromString("Premium"); + + /** Static value Ultra for PoolServiceLevel. */ + public static final PoolServiceLevel ULTRA = fromString("Ultra"); + + /** + * Creates or finds a PoolServiceLevel from its string representation. + * @param name a name to look for + * @return the corresponding PoolServiceLevel + */ + @JsonCreator + public static PoolServiceLevel fromString(String name) { + return fromString(name, PoolServiceLevel.class); + } + + /** + * @return known PoolServiceLevel values + */ + public static Collection values() { + return values(PoolServiceLevel.class); + } +} diff --git a/sdk/netapp/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/netapp/v2020_02_01/ReplicationObject.java b/sdk/netapp/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/netapp/v2020_02_01/ReplicationObject.java index d9ecb747fa85..ff5393fadcdf 100644 --- a/sdk/netapp/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/netapp/v2020_02_01/ReplicationObject.java +++ b/sdk/netapp/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/netapp/v2020_02_01/ReplicationObject.java @@ -28,8 +28,7 @@ public class ReplicationObject { private EndpointType endpointType; /** - * Schedule. Possible values include: '_10minutely', 'hourly', 'daily', - * 'weekly', 'monthly'. + * Schedule. Possible values include: '_10minutely', 'hourly', 'daily'. */ @JsonProperty(value = "replicationSchedule", required = true) private ReplicationSchedule replicationSchedule; @@ -87,7 +86,7 @@ public ReplicationObject withEndpointType(EndpointType endpointType) { } /** - * Get schedule. Possible values include: '_10minutely', 'hourly', 'daily', 'weekly', 'monthly'. + * Get schedule. Possible values include: '_10minutely', 'hourly', 'daily'. * * @return the replicationSchedule value */ @@ -96,7 +95,7 @@ public ReplicationSchedule replicationSchedule() { } /** - * Set schedule. Possible values include: '_10minutely', 'hourly', 'daily', 'weekly', 'monthly'. + * Set schedule. Possible values include: '_10minutely', 'hourly', 'daily'. * * @param replicationSchedule the replicationSchedule value to set * @return the ReplicationObject object itself. diff --git a/sdk/netapp/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/netapp/v2020_02_01/ReplicationSchedule.java b/sdk/netapp/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/netapp/v2020_02_01/ReplicationSchedule.java index df1829064e03..4dfdc52c1761 100644 --- a/sdk/netapp/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/netapp/v2020_02_01/ReplicationSchedule.java +++ b/sdk/netapp/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/netapp/v2020_02_01/ReplicationSchedule.java @@ -25,12 +25,6 @@ public final class ReplicationSchedule extends ExpandableStringEnum, Indexable, Refreshable { + /** Static value Standard for VolumeServiceLevel. */ + public static final VolumeServiceLevel STANDARD = fromString("Standard"); + + /** Static value Premium for VolumeServiceLevel. */ + public static final VolumeServiceLevel PREMIUM = fromString("Premium"); + + /** Static value Ultra for VolumeServiceLevel. */ + public static final VolumeServiceLevel ULTRA = fromString("Ultra"); + + /** + * Creates or finds a VolumeServiceLevel from its string representation. + * @param name a name to look for + * @return the corresponding VolumeServiceLevel + */ + @JsonCreator + public static VolumeServiceLevel fromString(String name) { + return fromString(name, VolumeServiceLevel.class); + } + + /** + * @return known VolumeServiceLevel values + */ + public static Collection values() { + return values(VolumeServiceLevel.class); + } +} diff --git a/sdk/netapp/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/netapp/v2020_02_01/implementation/CapacityPoolImpl.java b/sdk/netapp/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/netapp/v2020_02_01/implementation/CapacityPoolImpl.java index 587120c59a95..3327546b1b60 100644 --- a/sdk/netapp/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/netapp/v2020_02_01/implementation/CapacityPoolImpl.java +++ b/sdk/netapp/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/netapp/v2020_02_01/implementation/CapacityPoolImpl.java @@ -12,8 +12,9 @@ import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl; import rx.Observable; import com.microsoft.azure.management.netapp.v2020_02_01.CapacityPoolPatch; -import com.microsoft.azure.management.netapp.v2020_02_01.ServiceLevel; +import com.microsoft.azure.management.netapp.v2020_02_01.PoolServiceLevel; import java.util.Map; +import com.microsoft.azure.management.netapp.v2020_02_01.PatchServiceLevel; import rx.functions.Func1; class CapacityPoolImpl extends CreatableUpdatableImpl implements CapacityPool, CapacityPool.Definition, CapacityPool.Update { @@ -119,7 +120,7 @@ public String provisioningState() { } @Override - public ServiceLevel serviceLevel() { + public PoolServiceLevel serviceLevel() { return this.inner().serviceLevel(); } @@ -151,6 +152,12 @@ public CapacityPoolImpl withLocation(String location) { return this; } + @Override + public CapacityPoolImpl withServiceLevel(PoolServiceLevel serviceLevel) { + this.inner().withServiceLevel(serviceLevel); + return this; + } + @Override public CapacityPoolImpl withSize(long size) { this.inner().withSize(size); @@ -158,18 +165,14 @@ public CapacityPoolImpl withSize(long size) { } @Override - public CapacityPoolImpl withSize(Long size) { - this.updateParameter.withSize(size); + public CapacityPoolImpl withServiceLevel(PatchServiceLevel serviceLevel) { + this.updateParameter.withServiceLevel(serviceLevel); return this; } @Override - public CapacityPoolImpl withServiceLevel(ServiceLevel serviceLevel) { - if (isInCreateMode()) { - this.inner().withServiceLevel(serviceLevel); - } else { - this.updateParameter.withServiceLevel(serviceLevel); - } + public CapacityPoolImpl withSize(Long size) { + this.updateParameter.withSize(size); return this; } diff --git a/sdk/netapp/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/netapp/v2020_02_01/implementation/CapacityPoolInner.java b/sdk/netapp/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/netapp/v2020_02_01/implementation/CapacityPoolInner.java index bf0743a3a7b2..8b3cc8cc6fdc 100644 --- a/sdk/netapp/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/netapp/v2020_02_01/implementation/CapacityPoolInner.java +++ b/sdk/netapp/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/netapp/v2020_02_01/implementation/CapacityPoolInner.java @@ -8,7 +8,7 @@ package com.microsoft.azure.management.netapp.v2020_02_01.implementation; -import com.microsoft.azure.management.netapp.v2020_02_01.ServiceLevel; +import com.microsoft.azure.management.netapp.v2020_02_01.PoolServiceLevel; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; @@ -39,7 +39,7 @@ public class CapacityPoolInner extends Resource { * 'Standard', 'Premium', 'Ultra'. */ @JsonProperty(value = "properties.serviceLevel", required = true) - private ServiceLevel serviceLevel; + private PoolServiceLevel serviceLevel; /** * Azure lifecycle management. @@ -81,7 +81,7 @@ public CapacityPoolInner withSize(long size) { * * @return the serviceLevel value */ - public ServiceLevel serviceLevel() { + public PoolServiceLevel serviceLevel() { return this.serviceLevel; } @@ -91,7 +91,7 @@ public ServiceLevel serviceLevel() { * @param serviceLevel the serviceLevel value to set * @return the CapacityPoolInner object itself. */ - public CapacityPoolInner withServiceLevel(ServiceLevel serviceLevel) { + public CapacityPoolInner withServiceLevel(PoolServiceLevel serviceLevel) { this.serviceLevel = serviceLevel; return this; } diff --git a/sdk/netapp/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/netapp/v2020_02_01/implementation/VolumeImpl.java b/sdk/netapp/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/netapp/v2020_02_01/implementation/VolumeImpl.java index 029cd1e383d3..b4ceedec1f12 100644 --- a/sdk/netapp/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/netapp/v2020_02_01/implementation/VolumeImpl.java +++ b/sdk/netapp/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/netapp/v2020_02_01/implementation/VolumeImpl.java @@ -12,13 +12,14 @@ import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl; import rx.Observable; import com.microsoft.azure.management.netapp.v2020_02_01.VolumePatch; -import com.microsoft.azure.management.netapp.v2020_02_01.ServiceLevel; +import com.microsoft.azure.management.netapp.v2020_02_01.VolumeServiceLevel; import com.microsoft.azure.management.netapp.v2020_02_01.VolumePropertiesExportPolicy; import java.util.List; import com.microsoft.azure.management.netapp.v2020_02_01.MountTargetProperties; import com.microsoft.azure.management.netapp.v2020_02_01.VolumePropertiesDataProtection; import java.util.Map; import com.microsoft.azure.management.netapp.v2020_02_01.VolumePatchPropertiesExportPolicy; +import com.microsoft.azure.management.netapp.v2020_02_01.ServiceLevel; import rx.functions.Func1; class VolumeImpl extends CreatableUpdatableImpl implements Volume, Volume.Definition, Volume.Update { @@ -161,7 +162,7 @@ public String provisioningState() { } @Override - public ServiceLevel serviceLevel() { + public VolumeServiceLevel serviceLevel() { return this.inner().serviceLevel(); } @@ -262,6 +263,12 @@ public VolumeImpl withProtocolTypes(List protocolTypes) { return this; } + @Override + public VolumeImpl withServiceLevel(VolumeServiceLevel serviceLevel) { + this.inner().withServiceLevel(serviceLevel); + return this; + } + @Override public VolumeImpl withSnapshotDirectoryVisible(Boolean snapshotDirectoryVisible) { this.inner().withSnapshotDirectoryVisible(snapshotDirectoryVisible); @@ -287,18 +294,14 @@ public VolumeImpl withExportPolicy(VolumePatchPropertiesExportPolicy exportPolic } @Override - public VolumeImpl withUsageThreshold(Long usageThreshold) { - this.updateParameter.withUsageThreshold(usageThreshold); + public VolumeImpl withServiceLevel(ServiceLevel serviceLevel) { + this.updateParameter.withServiceLevel(serviceLevel); return this; } @Override - public VolumeImpl withServiceLevel(ServiceLevel serviceLevel) { - if (isInCreateMode()) { - this.inner().withServiceLevel(serviceLevel); - } else { - this.updateParameter.withServiceLevel(serviceLevel); - } + public VolumeImpl withUsageThreshold(Long usageThreshold) { + this.updateParameter.withUsageThreshold(usageThreshold); return this; } diff --git a/sdk/netapp/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/netapp/v2020_02_01/implementation/VolumeInner.java b/sdk/netapp/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/netapp/v2020_02_01/implementation/VolumeInner.java index 2c78ae91da3a..478eb990530c 100644 --- a/sdk/netapp/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/netapp/v2020_02_01/implementation/VolumeInner.java +++ b/sdk/netapp/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/netapp/v2020_02_01/implementation/VolumeInner.java @@ -8,7 +8,7 @@ package com.microsoft.azure.management.netapp.v2020_02_01.implementation; -import com.microsoft.azure.management.netapp.v2020_02_01.ServiceLevel; +import com.microsoft.azure.management.netapp.v2020_02_01.VolumeServiceLevel; import com.microsoft.azure.management.netapp.v2020_02_01.VolumePropertiesExportPolicy; import java.util.List; import com.microsoft.azure.management.netapp.v2020_02_01.MountTargetProperties; @@ -42,7 +42,7 @@ public class VolumeInner extends Resource { * 'Standard', 'Premium', 'Ultra'. */ @JsonProperty(value = "properties.serviceLevel") - private ServiceLevel serviceLevel; + private VolumeServiceLevel serviceLevel; /** * usageThreshold. @@ -163,7 +163,7 @@ public VolumeInner withCreationToken(String creationToken) { * * @return the serviceLevel value */ - public ServiceLevel serviceLevel() { + public VolumeServiceLevel serviceLevel() { return this.serviceLevel; } @@ -173,7 +173,7 @@ public ServiceLevel serviceLevel() { * @param serviceLevel the serviceLevel value to set * @return the VolumeInner object itself. */ - public VolumeInner withServiceLevel(ServiceLevel serviceLevel) { + public VolumeInner withServiceLevel(VolumeServiceLevel serviceLevel) { this.serviceLevel = serviceLevel; return this; }