Dummy

src/ServiceManagement/Storage/Storage.Management.Tests/Storage.Tests.csproj

@@ -18,9 +18,15 @@
     <Compile Include="TestUtilities\UndoContextDiscoveryExtensions.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="SessionRecords\Microsoft.WindowsAzure.Management.Storage.Testing.StorageManagementOperationTests\CanAbortStorageAccountMigrationToSrp.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.WindowsAzure.Management.Storage.Testing.StorageManagementOperationTests\CanCreateUpdateGetAndDeleteStorageAccounts.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.WindowsAzure.Management.Storage.Testing.StorageManagementOperationTests\CanMigrateStorageAccountToSrp.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />

src/ServiceManagement/Storage/Storage.Management.Tests/StorageManagementOperationTests.cs

@@ -16,6 +16,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.Azure;
 using Microsoft.Azure.Test.HttpRecorder;
 using Microsoft.WindowsAzure.Management.Storage;
 using Microsoft.WindowsAzure.Management.Storage.Models;
@@ -139,6 +140,160 @@ public void CanCreateUpdateGetAndDeleteStorageAccounts()
             }
         }
 
+        [Fact]
+        public void CanMigrateStorageAccountToSrp()
+        {
+            TestLogTracingInterceptor.Current.Start();
+
+            using (var undoContext = UndoContext.Current)
+            {
+                undoContext.Start();
+                var mgmt = TestBase.GetServiceClient<ManagementClient>();
+                var storage = TestBase.GetServiceClient<StorageManagementClient>();
+
+                try
+                {
+                    var location = mgmt.GetDefaultLocation("Storage");
+                    const string westUS = "West US";
+                    if (mgmt.Locations.List().Any(
+                        c => string.Equals(c.Name, westUS, StringComparison.OrdinalIgnoreCase)))
+                    {
+                        location = westUS;
+                    }
+
+                    var storageAccountName = HttpMockServer.GetAssetName(
+                        "teststorage1234",
+                        "teststorage").ToLower();
+
+                    Assert.True(storage.StorageAccounts
+                               .CheckNameAvailability(storageAccountName).IsAvailable);
+
+                    // Create
+                    var storageCreateParams = new StorageAccountCreateParameters
+                    {
+                        Location = location,
+                        AffinityGroup = null,
+                        Label = "Test测试1",
+                        Description = "Test测试2",
+                        Name = storageAccountName,
+                        AccountType = StorageAccountTypes.StandardGRS,
+                        ExtendedProperties = new Dictionary<string, string>
+                        {
+                            { "foo1", "bar" },
+                            { "foo2", "baz" }
+                        }
+                    };
+                    var st1 = storage.StorageAccounts.Create(storageCreateParams);
+
+                    // Get
+                    var storageCreated = storage.StorageAccounts
+                                        .Get(storageAccountName).StorageAccount;
+                    VerifyStorageAccount(
+                        storageCreated,
+                        storageCreateParams.Name,
+                        storageCreateParams.Label,
+                        storageCreateParams.Description,
+                        storageCreateParams.Location,
+                        storageCreateParams.AccountType);
+                    Assert.True(storageCreated.ExtendedProperties["foo1"] == "bar");
+                    Assert.True(storageCreated.ExtendedProperties["foo2"] == "baz");
+
+                    var response = storage.StorageAccounts.PrepareMigration(storageAccountName);
+                    Assert.Equal(OperationStatus.Succeeded, response.Status);
+
+                    storageCreated = storage.StorageAccounts.Get(storageAccountName).StorageAccount;
+                    Assert.Equal(IaaSClassicToArmMigrationState.Prepared, storageCreated.MigrationState);
+
+                    response = storage.StorageAccounts.CommitMigration(storageAccountName);
+                    Assert.Equal(OperationStatus.Succeeded, response.Status);
+                }
+                finally
+                {
+                    undoContext.Dispose();
+                    mgmt.Dispose();
+                    storage.Dispose();
+                    TestLogTracingInterceptor.Current.Stop();
+                }
+            }
+        }
+
+        [Fact]
+        public void CanAbortStorageAccountMigrationToSrp()
+        {
+            TestLogTracingInterceptor.Current.Start();
+
+            using (var undoContext = UndoContext.Current)
+            {
+                undoContext.Start();
+                var mgmt = TestBase.GetServiceClient<ManagementClient>();
+                var storage = TestBase.GetServiceClient<StorageManagementClient>();
+
+                try
+                {
+                    var location = mgmt.GetDefaultLocation("Storage");
+                    const string westUS = "West US";
+                    if (mgmt.Locations.List().Any(
+                        c => string.Equals(c.Name, westUS, StringComparison.OrdinalIgnoreCase)))
+                    {
+                        location = westUS;
+                    }
+
+                    var storageAccountName = HttpMockServer.GetAssetName(
+                        "teststorage1234",
+                        "teststorage").ToLower();
+
+                    Assert.True(storage.StorageAccounts
+                               .CheckNameAvailability(storageAccountName).IsAvailable);
+
+                    // Create
+                    var storageCreateParams = new StorageAccountCreateParameters
+                    {
+                        Location = location,
+                        AffinityGroup = null,
+                        Label = "Test测试1",
+                        Description = "Test测试2",
+                        Name = storageAccountName,
+                        AccountType = StorageAccountTypes.StandardGRS,
+                        ExtendedProperties = new Dictionary<string, string>
+                        {
+                            { "foo1", "bar" },
+                            { "foo2", "baz" }
+                        }
+                    };
+                    var st1 = storage.StorageAccounts.Create(storageCreateParams);
+
+                    // Get
+                    var storageCreated = storage.StorageAccounts
+                                        .Get(storageAccountName).StorageAccount;
+                    VerifyStorageAccount(
+                        storageCreated,
+                        storageCreateParams.Name,
+                        storageCreateParams.Label,
+                        storageCreateParams.Description,
+                        storageCreateParams.Location,
+                        storageCreateParams.AccountType);
+                    Assert.True(storageCreated.ExtendedProperties["foo1"] == "bar");
+                    Assert.True(storageCreated.ExtendedProperties["foo2"] == "baz");
+
+                    var response = storage.StorageAccounts.PrepareMigration(storageAccountName);
+                    Assert.Equal(OperationStatus.Succeeded, response.Status);
+
+                    storageCreated = storage.StorageAccounts.Get(storageAccountName).StorageAccount;
+                    Assert.Equal(IaaSClassicToArmMigrationState.Prepared, storageCreated.MigrationState);
+
+                    response = storage.StorageAccounts.AbortMigration(storageAccountName);
+                    Assert.Equal(OperationStatus.Succeeded, response.Status);
+                }
+                finally
+                {
+                    undoContext.Dispose();
+                    mgmt.Dispose();
+                    storage.Dispose();
+                    TestLogTracingInterceptor.Current.Stop();
+                }
+            }
+        }
+
         private static bool VerifyStorageAccount(
             StorageAccount storageCreated,
             string storageAccountName,

src/ServiceManagement/Storage/StorageManagement/Generated/IStorageAccountOperations.cs

@@ -36,6 +36,61 @@ namespace Microsoft.WindowsAzure.Management.Storage
     /// </summary>
     public partial interface IStorageAccountOperations
     {
+        /// <summary>
+        /// Abort storage account migration api validates and aborts the given
+        /// storage account for IaaS Classic to ARM migration.
+        /// </summary>
+        /// <param name='storageAccountName'>
+        /// Name of storage account to be migrated.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// Cancellation token.
+        /// </param>
+        /// <returns>
+        /// The response body contains the status of the specified asynchronous
+        /// operation, indicating whether it has succeeded, is inprogress, or
+        /// has failed. Note that this status is distinct from the HTTP status
+        /// code returned for the Get Operation Status operation itself. If
+        /// the asynchronous operation succeeded, the response body includes
+        /// the HTTP status code for the successful request. If the
+        /// asynchronous operation failed, the response body includes the HTTP
+        /// status code for the failed request and error information regarding
+        /// the failure.
+        /// </returns>
+        Task<OperationStatusResponse> AbortMigrationAsync(string storageAccountName, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Abort storage account migration api validates and aborts the given
+        /// storage account for IaaS Classic to ARM migration.
+        /// </summary>
+        /// <param name='storageAccountName'>
+        /// Name of storage account to be migrated.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// Cancellation token.
+        /// </param>
+        /// <returns>
+        /// A standard service response including an HTTP status code and
+        /// request ID.
+        /// </returns>
+        Task<AzureOperationResponse> BeginAbortMigrationAsync(string storageAccountName, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Commit storage account migration api validates and commits the
+        /// given storage account for IaaS Classic to ARM migration.
+        /// </summary>
+        /// <param name='storageAccountName'>
+        /// Name of storage account to be migrated.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// Cancellation token.
+        /// </param>
+        /// <returns>
+        /// A standard service response including an HTTP status code and
+        /// request ID.
+        /// </returns>
+        Task<AzureOperationResponse> BeginCommitMigrationAsync(string storageAccountName, CancellationToken cancellationToken);
+
         /// <summary>
         /// The Begin Creating Storage Account operation creates a new storage
         /// account in Azure.  (see
@@ -54,6 +109,22 @@ public partial interface IStorageAccountOperations
         /// </returns>
         Task<AzureOperationResponse> BeginCreatingAsync(StorageAccountCreateParameters parameters, CancellationToken cancellationToken);
 
+        /// <summary>
+        /// Prepare storage account migration api validates and prepares the
+        /// given storage account for IaaS Classic to ARM migration.
+        /// </summary>
+        /// <param name='storageAccountName'>
+        /// Name of storage account to be migrated.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// Cancellation token.
+        /// </param>
+        /// <returns>
+        /// A standard service response including an HTTP status code and
+        /// request ID.
+        /// </returns>
+        Task<AzureOperationResponse> BeginPrepareMigrationAsync(string storageAccountName, CancellationToken cancellationToken);
+
         /// <summary>
         /// The Check Name Availability operation checks if a storage account
         /// name is available for use in Azure.  (see
@@ -71,6 +142,29 @@ public partial interface IStorageAccountOperations
         /// </returns>
         Task<CheckNameAvailabilityResponse> CheckNameAvailabilityAsync(string accountName, CancellationToken cancellationToken);
 
+        /// <summary>
+        /// Commit storage account migration api validates and commits the
+        /// given storage account for IaaS Classic to ARM migration.
+        /// </summary>
+        /// <param name='storageAccountName'>
+        /// Name of storage account to be migrated.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// Cancellation token.
+        /// </param>
+        /// <returns>
+        /// The response body contains the status of the specified asynchronous
+        /// operation, indicating whether it has succeeded, is inprogress, or
+        /// has failed. Note that this status is distinct from the HTTP status
+        /// code returned for the Get Operation Status operation itself. If
+        /// the asynchronous operation succeeded, the response body includes
+        /// the HTTP status code for the successful request. If the
+        /// asynchronous operation failed, the response body includes the HTTP
+        /// status code for the failed request and error information regarding
+        /// the failure.
+        /// </returns>
+        Task<OperationStatusResponse> CommitMigrationAsync(string storageAccountName, CancellationToken cancellationToken);
+
         /// <summary>
         /// The Create Storage Account operation creates a new storage account
         /// in Azure.  (see
@@ -162,6 +256,29 @@ public partial interface IStorageAccountOperations
         /// </returns>
         Task<StorageAccountListResponse> ListAsync(CancellationToken cancellationToken);
 
+        /// <summary>
+        /// Prepare storage account migration api validates and prepares the
+        /// given storage account for IaaS Classic to ARM migration.
+        /// </summary>
+        /// <param name='storageAccountName'>
+        /// Name of storage account to be migrated.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// Cancellation token.
+        /// </param>
+        /// <returns>
+        /// The response body contains the status of the specified asynchronous
+        /// operation, indicating whether it has succeeded, is inprogress, or
+        /// has failed. Note that this status is distinct from the HTTP status
+        /// code returned for the Get Operation Status operation itself. If
+        /// the asynchronous operation succeeded, the response body includes
+        /// the HTTP status code for the successful request. If the
+        /// asynchronous operation failed, the response body includes the HTTP
+        /// status code for the failed request and error information regarding
+        /// the failure.
+        /// </returns>
+        Task<OperationStatusResponse> PrepareMigrationAsync(string storageAccountName, CancellationToken cancellationToken);
+
         /// <summary>
         /// The Regenerate Keys operation regenerates the primary or secondary
         /// access key for the specified storage account.  (see

src/ServiceManagement/Storage/StorageManagement/Generated/Models/GeoRegionStatus.cs

@@ -24,6 +24,9 @@
 
 namespace Microsoft.WindowsAzure.Management.Storage.Models
 {
+    /// <summary>
+    /// Indicates whether the storage region is available.
+    /// </summary>
     public enum GeoRegionStatus
     {
         Available = 0,

src/ServiceManagement/Storage/StorageManagement/Generated/Models/IaaSClassicToArmMigrationState.cs

@@ -0,0 +1,50 @@
+// 
+// Copyright (c) Microsoft and contributors.  All rights reserved.
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//   http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// 
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// 
+
+// Warning: This code was generated by a tool.
+// 
+// Changes to this file may cause incorrect behavior and will be lost if the
+// code is regenerated.
+
+using System;
+using System.Linq;
+
+namespace Microsoft.WindowsAzure.Management.Storage.Models
+{
+    /// <summary>
+    /// Known values of IaaS Classic to ARM migration state.
+    /// </summary>
+    public static partial class IaaSClassicToArmMigrationState
+    {
+        public const string None = "None";
+
+        public const string Preparing = "Preparing";
+
+        public const string Prepared = "Prepared";
+
+        public const string PrepareFailed = "PrepareFailed";
+
+        public const string Committing = "Committing";
+
+        public const string Committed = "Committed";
+
+        public const string CommitFailed = "CommitFailed";
+
+        public const string Aborting = "Aborting";
+
+        public const string AbortFailed = "AbortFailed";
+    }
+}