Update from master

sdk/storage/mgmt-v2019_04_01/pom.xml

@@ -11,11 +11,11 @@
     <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-storage</artifactId>
-    <version>1.0.0-beta-2</version>
+    <version>1.0.0-beta</version>
     <packaging>jar</packaging>
     <name>Microsoft Azure SDK for Storage Management</name>
     <description>This package contains Microsoft Storage Management SDK.</description>

sdk/storage/mgmt-v2019_04_01/src/main/java/com/microsoft/azure/management/storage/v2019_04_01/ActiveDirectoryProperties.java

@@ -0,0 +1,174 @@
+/**
+ * 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.storage.v2019_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Settings properties for Active Directory (AD).
+ */
+public class ActiveDirectoryProperties {
+    /**
+     * Specifies the primary domain that the AD DNS server is authoritative
+     * for.
+     */
+    @JsonProperty(value = "domainName", required = true)
+    private String domainName;
+
+    /**
+     * Specifies the NetBIOS domain name.
+     */
+    @JsonProperty(value = "netBiosDomainName", required = true)
+    private String netBiosDomainName;
+
+    /**
+     * Specifies the Active Directory forest to get.
+     */
+    @JsonProperty(value = "forestName", required = true)
+    private String forestName;
+
+    /**
+     * Specifies the domain GUID.
+     */
+    @JsonProperty(value = "domainGuid", required = true)
+    private String domainGuid;
+
+    /**
+     * Specifies the security identifier (SID).
+     */
+    @JsonProperty(value = "domainSid", required = true)
+    private String domainSid;
+
+    /**
+     * Specifies the security identifier (SID) for Azure Storage.
+     */
+    @JsonProperty(value = "azureStorageSid", required = true)
+    private String azureStorageSid;
+
+    /**
+     * Get specifies the primary domain that the AD DNS server is authoritative for.
+     *
+     * @return the domainName value
+     */
+    public String domainName() {
+        return this.domainName;
+    }
+
+    /**
+     * Set specifies the primary domain that the AD DNS server is authoritative for.
+     *
+     * @param domainName the domainName value to set
+     * @return the ActiveDirectoryProperties object itself.
+     */
+    public ActiveDirectoryProperties withDomainName(String domainName) {
+        this.domainName = domainName;
+        return this;
+    }
+
+    /**
+     * Get specifies the NetBIOS domain name.
+     *
+     * @return the netBiosDomainName value
+     */
+    public String netBiosDomainName() {
+        return this.netBiosDomainName;
+    }
+
+    /**
+     * Set specifies the NetBIOS domain name.
+     *
+     * @param netBiosDomainName the netBiosDomainName value to set
+     * @return the ActiveDirectoryProperties object itself.
+     */
+    public ActiveDirectoryProperties withNetBiosDomainName(String netBiosDomainName) {
+        this.netBiosDomainName = netBiosDomainName;
+        return this;
+    }
+
+    /**
+     * Get specifies the Active Directory forest to get.
+     *
+     * @return the forestName value
+     */
+    public String forestName() {
+        return this.forestName;
+    }
+
+    /**
+     * Set specifies the Active Directory forest to get.
+     *
+     * @param forestName the forestName value to set
+     * @return the ActiveDirectoryProperties object itself.
+     */
+    public ActiveDirectoryProperties withForestName(String forestName) {
+        this.forestName = forestName;
+        return this;
+    }
+
+    /**
+     * Get specifies the domain GUID.
+     *
+     * @return the domainGuid value
+     */
+    public String domainGuid() {
+        return this.domainGuid;
+    }
+
+    /**
+     * Set specifies the domain GUID.
+     *
+     * @param domainGuid the domainGuid value to set
+     * @return the ActiveDirectoryProperties object itself.
+     */
+    public ActiveDirectoryProperties withDomainGuid(String domainGuid) {
+        this.domainGuid = domainGuid;
+        return this;
+    }
+
+    /**
+     * Get specifies the security identifier (SID).
+     *
+     * @return the domainSid value
+     */
+    public String domainSid() {
+        return this.domainSid;
+    }
+
+    /**
+     * Set specifies the security identifier (SID).
+     *
+     * @param domainSid the domainSid value to set
+     * @return the ActiveDirectoryProperties object itself.
+     */
+    public ActiveDirectoryProperties withDomainSid(String domainSid) {
+        this.domainSid = domainSid;
+        return this;
+    }
+
+    /**
+     * Get specifies the security identifier (SID) for Azure Storage.
+     *
+     * @return the azureStorageSid value
+     */
+    public String azureStorageSid() {
+        return this.azureStorageSid;
+    }
+
+    /**
+     * Set specifies the security identifier (SID) for Azure Storage.
+     *
+     * @param azureStorageSid the azureStorageSid value to set
+     * @return the ActiveDirectoryProperties object itself.
+     */
+    public ActiveDirectoryProperties withAzureStorageSid(String azureStorageSid) {
+        this.azureStorageSid = azureStorageSid;
+        return this;
+    }
+
+}

sdk/storage/mgmt-v2019_04_01/src/main/java/com/microsoft/azure/management/storage/v2019_04_01/AzureFilesIdentityBasedAuthentication.java

@@ -16,13 +16,19 @@
 public class AzureFilesIdentityBasedAuthentication {
     /**
      * Indicates the directory service used. Possible values include: 'None',
-     * 'AADDS'.
+     * 'AADDS', 'AD'.
      */
     @JsonProperty(value = "directoryServiceOptions", required = true)
     private DirectoryServiceOptions directoryServiceOptions;
 
     /**
-     * Get indicates the directory service used. Possible values include: 'None', 'AADDS'.
+     * Required if choose AD.
+     */
+    @JsonProperty(value = "activeDirectoryProperties")
+    private ActiveDirectoryProperties activeDirectoryProperties;
+
+    /**
+     * Get indicates the directory service used. Possible values include: 'None', 'AADDS', 'AD'.
      *
      * @return the directoryServiceOptions value
      */
@@ -31,7 +37,7 @@ public DirectoryServiceOptions directoryServiceOptions() {
     }
 
     /**
-     * Set indicates the directory service used. Possible values include: 'None', 'AADDS'.
+     * Set indicates the directory service used. Possible values include: 'None', 'AADDS', 'AD'.
      *
      * @param directoryServiceOptions the directoryServiceOptions value to set
      * @return the AzureFilesIdentityBasedAuthentication object itself.
@@ -41,4 +47,24 @@ public AzureFilesIdentityBasedAuthentication withDirectoryServiceOptions(Directo
         return this;
     }
 
+    /**
+     * Get required if choose AD.
+     *
+     * @return the activeDirectoryProperties value
+     */
+    public ActiveDirectoryProperties activeDirectoryProperties() {
+        return this.activeDirectoryProperties;
+    }
+
+    /**
+     * Set required if choose AD.
+     *
+     * @param activeDirectoryProperties the activeDirectoryProperties value to set
+     * @return the AzureFilesIdentityBasedAuthentication object itself.
+     */
+    public AzureFilesIdentityBasedAuthentication withActiveDirectoryProperties(ActiveDirectoryProperties activeDirectoryProperties) {
+        this.activeDirectoryProperties = activeDirectoryProperties;
+        return this;
+    }
+
 }

sdk/storage/mgmt-v2019_04_01/src/main/java/com/microsoft/azure/management/storage/v2019_04_01/DirectoryServiceOptions.java

@@ -22,6 +22,9 @@ public final class DirectoryServiceOptions extends ExpandableStringEnum<Director
     /** Static value AADDS for DirectoryServiceOptions. */
     public static final DirectoryServiceOptions AADDS = fromString("AADDS");
 
+    /** Static value AD for DirectoryServiceOptions. */
+    public static final DirectoryServiceOptions AD = fromString("AD");
+
     /**
      * Creates or finds a DirectoryServiceOptions from its string representation.
      * @param name a name to look for

sdk/storage/mgmt-v2019_04_01/src/main/java/com/microsoft/azure/management/storage/v2019_04_01/ListKeyExpand.java

@@ -0,0 +1,50 @@
+/**
+ * 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.storage.v2019_04_01;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Defines values for ListKeyExpand.
+ */
+public enum ListKeyExpand {
+    /** Enum value kerb. */
+    KERB("kerb");
+
+    /** The actual serialized value for a ListKeyExpand instance. */
+    private String value;
+
+    ListKeyExpand(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Parses a serialized value to a ListKeyExpand instance.
+     *
+     * @param value the serialized value to parse.
+     * @return the parsed ListKeyExpand object, or null if unable to parse.
+     */
+    @JsonCreator
+    public static ListKeyExpand fromString(String value) {
+        ListKeyExpand[] items = ListKeyExpand.values();
+        for (ListKeyExpand item : items) {
+            if (item.toString().equalsIgnoreCase(value)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    @JsonValue
+    @Override
+    public String toString() {
+        return this.value;
+    }
+}

sdk/storage/mgmt-v2019_04_01/src/main/java/com/microsoft/azure/management/storage/v2019_04_01/StorageAccountRegenerateKeyParameters.java

@@ -16,13 +16,13 @@
 public class StorageAccountRegenerateKeyParameters {
     /**
      * The name of storage keys that want to be regenerated, possible values
-     * are key1, key2.
+     * are key1, key2, kerb1, kerb2.
      */
     @JsonProperty(value = "keyName", required = true)
     private String keyName;
 
     /**
-     * Get the name of storage keys that want to be regenerated, possible values are key1, key2.
+     * Get the name of storage keys that want to be regenerated, possible values are key1, key2, kerb1, kerb2.
      *
      * @return the keyName value
      */
@@ -31,7 +31,7 @@ public String keyName() {
     }
 
     /**
-     * Set the name of storage keys that want to be regenerated, possible values are key1, key2.
+     * Set the name of storage keys that want to be regenerated, possible values are key1, key2, kerb1, kerb2.
      *
      * @param keyName the keyName value to set
      * @return the StorageAccountRegenerateKeyParameters object itself.

sdk/storage/mgmt-v2019_04_01/src/main/java/com/microsoft/azure/management/storage/v2019_04_01/StorageAccounts.java

@@ -24,7 +24,7 @@
  */
 public interface StorageAccounts extends SupportsCreating<StorageAccount.DefinitionStages.Blank>, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup<StorageAccount>, SupportsListingByResourceGroup<StorageAccount>, SupportsListing<StorageAccount>, HasInner<StorageAccountsInner> {
     /**
-     * Lists the access keys for the specified storage account.
+     * Lists the access keys or Kerberos keys (if active directory enabled) for the specified storage account.
      *
      * @param resourceGroupName The name of the resource group within the user's subscription. The name is case insensitive.
      * @param accountName The name of the storage account within the specified resource group. Storage account names must be between 3 and 24 characters in length and use numbers and lower-case letters only.
@@ -34,11 +34,11 @@ public interface StorageAccounts extends SupportsCreating<StorageAccount.Definit
     Observable<StorageAccountListKeysResult> listKeysAsync(String resourceGroupName, String accountName);
 
     /**
-     * Regenerates one of the access keys for the specified storage account.
+     * Regenerates one of the access keys or Kerberos keys for the specified storage account.
      *
      * @param resourceGroupName The name of the resource group within the user's subscription. The name is case insensitive.
      * @param accountName The name of the storage account within the specified resource group. Storage account names must be between 3 and 24 characters in length and use numbers and lower-case letters only.
-     * @param keyName The name of storage keys that want to be regenerated, possible values are key1, key2.
+     * @param keyName The name of storage keys that want to be regenerated, possible values are key1, key2, kerb1, kerb2.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */