Decouple Sql project with Storage in ASM;

AzurePowershell.Test.targets

@@ -29,7 +29,7 @@
     <ServiceManagementTestDebug>.\src\ServiceManagement\Compute\Commands.ServiceManagement.Test\bin\Debug\Microsoft.WindowsAzure.Commands.ServiceManagement.Test.dll</ServiceManagementTestDebug>
     <SqlDatabaseTestDebug>.\src\ServiceManagement\Sql\Commands.SqlDatabase.Test\bin\Debug\Microsoft.WindowsAzure.Commands.SqlDatabase.Test.dll</SqlDatabaseTestDebug>
     <HDInsightTestDebug>.\src\ServiceManagement\HDInsight\Commands.HDInsight.Test\bin\Debug\Microsoft.WindowsAzure.Commands.HDInsight.Test.dll</HDInsightTestDebug>
-    <StorageTestDebug>.\src\Common\Storage\Commands.Storage.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Storage.Test.dll</StorageTestDebug>
+    <StorageTestDebug>.\src\Storage\Commands.Storage.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Storage.Test.dll</StorageTestDebug>
     <KeyVaultTestDebug>.\src\ResourceManager\KeyVault\Commands.KeyVault.Test\bin\Debug\Microsoft.Azure.Commands.KeyVault.Test.dll</KeyVaultTestDebug>
     <DataLakeAnalyticsTestDebug>.\src\ResourceManager\DataLakeAnalytics\Commands.DataLakeAnalytics.Test\bin\Debug\Microsoft.Azure.Commands.DataLakeAnalytics.Test.dll</DataLakeAnalyticsTestDebug>
     <DataLakeStoreTestDebug>.\src\ResourceManager\DataLakeStore\Commands.DataLakeStore.Test\bin\Debug\Microsoft.Azure.Commands.DataLakeStore.Test.dll</DataLakeStoreTestDebug>

setup/azurecmdfiles.wxi

@@ -4403,12 +4403,6 @@
                         <Component Id="cmp221C334CE6510BD95538F285D482251F" Guid="*">
                             <File Id="fil0CA12B2E4C52E4FBA985D8D4F838390D" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Azure.psd1" />
                         </Component>
-                        <Component Id="cmp74B0B7D2461EE67BC1B2C706CD41372F" Guid="*">
-                            <File Id="filD84EC14AB325E2924B8FFE3A4D3D018A" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Azure.Storage.psd1" />
-                        </Component>
-                        <Component Id="cmp572CBAA060A870457B636480C182F6E3" Guid="*">
-                            <File Id="filA870DB1BA05E5465BDE158B5DC54FD4F" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\AzureStorageStartup.ps1" />
-                        </Component>
                         <Component Id="cmpD8BD7D4C976FE7FE527348B4E7F85B8D" Guid="*">
                             <File Id="filA1C13EA190ADD849F77BDADF0A1A0638" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Hyak.Common.dll" />
                         </Component>
@@ -4496,18 +4490,6 @@
                         <Component Id="cmpD017719071884CE7DFF67453A22683A2" Guid="*">
                             <File Id="filF177A73C4C606380D6125980B86E51AC" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Microsoft.WindowsAzure.Commands.SqlDatabase.Types.ps1xml" />
                         </Component>
-                        <Component Id="cmpFAD94D1001808F6A0312DF8DF0D72A5C" Guid="*">
-                            <File Id="fil681F19CA5C5A56909A6D04F030A002D9" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Microsoft.WindowsAzure.Commands.Storage.dll" />
-                        </Component>
-                        <Component Id="cmp2103BDFB92495235F57C1975F3E23093" Guid="*">
-                            <File Id="filEC116C854DE0FC2BE1ABF57F5F86692C" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Microsoft.WindowsAzure.Commands.Storage.dll-Help.xml" />
-                        </Component>
-                        <Component Id="cmp5D2A04E733C2324A249F18F641F2F593" Guid="*">
-                            <File Id="fil4F5290658A463ED8944C26B35C4E470A" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Microsoft.WindowsAzure.Commands.Storage.format.ps1xml" />
-                        </Component>
-                        <Component Id="cmp51E42C3F30F8F7927DEB13C8A2A6436E" Guid="*">
-                            <File Id="fil57181F99D0B643E1F08D55628508A561" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Microsoft.WindowsAzure.Commands.Storage.types.ps1xml" />
-                        </Component>
                         <Component Id="cmp2E468077C73CFDDC9DAE16AA2E46CCA4" Guid="*">
                             <File Id="fil89020D4DEB7938824ABCBF4D5AAA02C7" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Microsoft.WindowsAzure.Commands.Store.format.ps1xml" />
                         </Component>
@@ -4550,9 +4532,6 @@
                         <Component Id="cmp040AE53B216B629F70731A3F324DE5A5" Guid="*">
                             <File Id="filB99C1F2E3BE7968A23849AECB2BB2A82" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Microsoft.WindowsAzure.Management.WebSites.dll" />
                         </Component>
-                        <Component Id="cmpB559FF7BECE247BF0FB2DEE533E5A820" Guid="*">
-                            <File Id="fil4F8DE0942438BAD0C298FD8A89445201" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Microsoft.WindowsAzure.Storage.DataMovement.dll" />
-                        </Component>
                         <Component Id="cmp2DA9A48FC4B479D897435D7DCFA6DDE3" Guid="*">
                             <File Id="filC19927285F3206791C423E6553D4C137" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Microsoft.WindowsAzure.Storage.dll" />
                         </Component>
@@ -6274,8 +6253,6 @@
             <ComponentRef Id="cmpAC5F70011A33DAC18EE39F5D5BB9840B" />
             <ComponentRef Id="cmp5C3F4FE4E92F090F22B371444CEFA7FB" />
             <ComponentRef Id="cmp221C334CE6510BD95538F285D482251F" />
-            <ComponentRef Id="cmp74B0B7D2461EE67BC1B2C706CD41372F" />
-            <ComponentRef Id="cmp572CBAA060A870457B636480C182F6E3" />
             <ComponentRef Id="cmpD8BD7D4C976FE7FE527348B4E7F85B8D" />
             <ComponentRef Id="cmpD5A2C7B5CF9A37015F3B71F2DC61EC0B" />
             <ComponentRef Id="cmp33B1D8F375238B9F828BCE9F9EF759BD" />
@@ -6305,10 +6282,6 @@
             <ComponentRef Id="cmp6015156A00F944A12A8D05D0ED9FFBAA" />
             <ComponentRef Id="cmpD18A799B47DEC4A144D024E0784C15DC" />
             <ComponentRef Id="cmpD017719071884CE7DFF67453A22683A2" />
-            <ComponentRef Id="cmpFAD94D1001808F6A0312DF8DF0D72A5C" />
-            <ComponentRef Id="cmp2103BDFB92495235F57C1975F3E23093" />
-            <ComponentRef Id="cmp5D2A04E733C2324A249F18F641F2F593" />
-            <ComponentRef Id="cmp51E42C3F30F8F7927DEB13C8A2A6436E" />
             <ComponentRef Id="cmp2E468077C73CFDDC9DAE16AA2E46CCA4" />
             <ComponentRef Id="cmpF0F44F9927627E08832F9007D488B28A" />
             <ComponentRef Id="cmpE67D327E10F48E745B67280068880B6C" />
@@ -6323,7 +6296,6 @@
             <ComponentRef Id="cmp0D7DB3D62819B7BB0DA2287E2D20B6D6" />
             <ComponentRef Id="cmpA2D5C92B41BADB59D66D65AC24DB3F9E" />
             <ComponentRef Id="cmp040AE53B216B629F70731A3F324DE5A5" />
-            <ComponentRef Id="cmpB559FF7BECE247BF0FB2DEE533E5A820" />
             <ComponentRef Id="cmp2DA9A48FC4B479D897435D7DCFA6DDE3" />
             <ComponentRef Id="cmpA10291DA4F33CEBFB790A935E68C763C" />
             <ComponentRef Id="cmp0B5A5E6BA5861771073ED88DCAB35DCC" />

src/Common/Commands.Common.Storage/Commands.Common.Storage.csproj

@@ -165,6 +165,11 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
+    <Compile Include="ResourceModel\AzureStorageBase.cs" />
+    <Compile Include="ResourceModel\AzureStorageBlob.cs" />
+    <Compile Include="ResourceModel\AzureStorageContainer.cs" />
+    <Compile Include="ResourceModel\AzureStorageQueue.cs" />
+    <Compile Include="ResourceModel\AzureStorageTable.cs" />
     <Compile Include="StorageClientWrapper.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="StorageIdentity.cs" />

src/Storage/Commands.Storage/Model/ResourceModel/AzureStorageBase.cs → src/Common/Commands.Common.Storage/ResourceModel/AzureStorageBase.cs

@@ -1,4 +1,4 @@
-// ----------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------------
 //
 // Copyright Microsoft Corporation
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,7 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-namespace Microsoft.WindowsAzure.Commands.Storage.Model.ResourceModel
+namespace Microsoft.WindowsAzure.Commands.Common.Storage.ResourceModel
 {
     using System;
     using Microsoft.WindowsAzure.Commands.Common.Storage;

src/Storage/Commands.Storage/Model/ResourceModel/AzureStorageBlob.cs → src/Common/Commands.Common.Storage/ResourceModel/AzureStorageBlob.cs

@@ -12,7 +12,7 @@
 // limitations under the License.
 // ---------------------------------------------------------------------------------
 
-namespace Microsoft.WindowsAzure.Commands.Storage.Model.ResourceModel
+namespace Microsoft.WindowsAzure.Commands.Common.Storage.ResourceModel
 {
     using System;
     using Microsoft.WindowsAzure.Storage.Blob;

src/Storage/Commands.Storage/Model/ResourceModel/AzureStorageContainer.cs → src/Common/Commands.Common.Storage/ResourceModel/AzureStorageContainer.cs

@@ -12,7 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-namespace Microsoft.WindowsAzure.Commands.Storage.Model.ResourceModel
+namespace Microsoft.WindowsAzure.Commands.Common.Storage.ResourceModel
 {
     using System;
     using Microsoft.WindowsAzure.Storage.Blob;

src/Storage/Commands.Storage/Model/ResourceModel/AzureStorageQueue.cs → src/Common/Commands.Common.Storage/ResourceModel/AzureStorageQueue.cs

@@ -12,7 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-namespace Microsoft.WindowsAzure.Commands.Storage.Model.ResourceModel
+namespace Microsoft.WindowsAzure.Commands.Common.Storage.ResourceModel
 {
     using System;
     using Microsoft.WindowsAzure.Storage.Queue;

src/Storage/Commands.Storage/Model/ResourceModel/AzureStorageTable.cs → src/Common/Commands.Common.Storage/ResourceModel/AzureStorageTable.cs

@@ -12,7 +12,7 @@
 // limitations under the License.
 // ---------------------------------------------------------------------------------
 
-namespace Microsoft.WindowsAzure.Commands.Storage.Model.ResourceModel
+namespace Microsoft.WindowsAzure.Commands.Common.Storage.ResourceModel
 {
     using System;
     using Microsoft.WindowsAzure.Storage.Table;

src/ResourceManager/Storage/Commands.Management.Storage/StorageAccount/GetAzureStorageAccount.cs

@@ -22,19 +22,30 @@ namespace Microsoft.Azure.Commands.Management.Storage
     [Cmdlet(VerbsCommon.Get, StorageAccountNounStr), OutputType(typeof(PSStorageAccount))]
     public class GetAzureStorageAccountCommand : StorageAccountBaseCmdlet
     {
+        protected const string ResourceGroupParameterSet = "ResourceGroupParameterSet";
+        protected const string AccountNameParameterSet = "AccountNameParameterSet";
+
         [Parameter(
             Position = 0,
             Mandatory = false,
+            ParameterSetName = ResourceGroupParameterSet,
             ValueFromPipelineByPropertyName = true,
-            HelpMessage = "Resource Group StorageAccountName.")]
+            HelpMessage = "Resource Group Name.")]
+        [Parameter(
+            Position = 0,
+            Mandatory = true,
+            ParameterSetName = AccountNameParameterSet,
+            ValueFromPipelineByPropertyName = true,
+            HelpMessage = "Resource Group Name.")]
         [ValidateNotNullOrEmpty]
         public string ResourceGroupName { get; set; }
 
         [Parameter(
             Position = 1,
-            Mandatory = false,
+            Mandatory = true,
             ValueFromPipelineByPropertyName = true,
-            HelpMessage = "Storage Account StorageAccountName.")]
+            ParameterSetName = AccountNameParameterSet,
+            HelpMessage = "Storage Account Name.")]
         [Alias(StorageAccountNameAlias, AccountNameAlias)]
         [ValidateNotNullOrEmpty]
         public string Name { get; set; }

src/ResourceManager/Storage/Commands.Management.Storage/StorageAccount/SetAzureRmCurrentStorageAccount.cs

@@ -38,10 +38,11 @@ public class SetAzureRmCurrentStorageAccount : StorageAccountBaseCmdlet
         [ValidateNotNullOrEmpty]
         public string ResourceGroupName { get; set; }
 
-        [Parameter(Mandatory=true, ParameterSetName=ResourceNameParameterSet, 
+        [Parameter(Mandatory=true, ParameterSetName=ResourceNameParameterSet,
         ValueFromPipelineByPropertyName = true)]
+        [Alias(StorageAccountNameAlias, AccountNameAlias)]
         [ValidateNotNullOrEmpty]
-        public string StorageAccountName { get; set; }
+        public string Name { get; set; }
 
         public override void ExecuteCmdlet()
         {
@@ -52,7 +53,7 @@ public override void ExecuteCmdlet()
             }
             else
             {
-                account = StorageUtilities.GenerateCloudStorageAccount(new ARMStorageProvider(StorageClient), ResourceGroupName, StorageAccountName);
+                account = StorageUtilities.GenerateCloudStorageAccount(new ARMStorageProvider(StorageClient), ResourceGroupName, Name);
             }
 
             // Clear the current storage account for both SM and RM

src/ResourceManager/Storage/Commands.Management.Storage/StorageAccount/StorageAccountBaseCmdlet.cs

@@ -78,23 +78,23 @@ public string SubscriptionId
 
         protected static AccountType ParseAccountType(string accountType)
         {
-            if ("Standard_LRS".Equals(accountType, StringComparison.OrdinalIgnoreCase))
+            if (AccountTypeString.StandardLRS.Equals(accountType, StringComparison.OrdinalIgnoreCase))
             {
                 return AccountType.StandardLRS;
             }
-            if ("Standard_ZRS".Equals(accountType, StringComparison.OrdinalIgnoreCase))
+            if (AccountTypeString.StandardZRS.Equals(accountType, StringComparison.OrdinalIgnoreCase))
             {
                 return AccountType.StandardZRS;
             }
-            if ("Standard_GRS".Equals(accountType, StringComparison.OrdinalIgnoreCase))
+            if (AccountTypeString.StandardGRS.Equals(accountType, StringComparison.OrdinalIgnoreCase))
             {
                 return AccountType.StandardGRS;
             }
-            if ("Standard_RAGRS".Equals(accountType, StringComparison.OrdinalIgnoreCase))
+            if (AccountTypeString.StandardRAGRS.Equals(accountType, StringComparison.OrdinalIgnoreCase))
             {
                 return AccountType.StandardRAGRS;
             }
-            if ("Premium_LRS".Equals(accountType, StringComparison.OrdinalIgnoreCase))
+            if (AccountTypeString.PremiumLRS.Equals(accountType, StringComparison.OrdinalIgnoreCase))
             {
                 return AccountType.PremiumLRS;
             }

src/ServiceManagement/HDInsight/Commands.HDInsight/packages.config

@@ -21,6 +21,5 @@
   <package id="Microsoft.WindowsAzure.Management.HDInsight" version="1.5.11" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
   <package id="System.Spatial" version="5.6.4" targetFramework="net45" />
-  <package id="WindowsAzure.Storage" version="3.0.3.0" targetFramework="net45" />
   <package id="WindowsAzure.Storage" version="6.0.0" targetFramework="net45" />
 </packages>

src/ServiceManagement/Sql/Commands.SqlDatabase/Commands.SqlDatabase.csproj

@@ -255,10 +255,6 @@
       <Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
       <Name>Commands.Common</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Storage\Commands.Storage\Commands.Storage.csproj">
-      <Project>{08cf7da7-0392-4a19-b79b-e1ff67cdb81a}</Project>
-      <Name>Commands.Storage</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Content Include="Microsoft.WindowsAzure.Commands.SqlDatabase.dll-Help.xml">
@@ -275,4 +271,4 @@
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
-</Project>
+</Project>

src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/StartAzureSqlDatabaseExport.cs

@@ -13,16 +13,14 @@
 
 using System;
 using System.Management.Automation;
-using Microsoft.WindowsAzure.Commands.Common;
 using Microsoft.Azure.Commands.Common.Authentication.Models;
 using Microsoft.WindowsAzure.Commands.Common.Storage;
+using Microsoft.WindowsAzure.Commands.Common.Storage.ResourceModel;
 using Microsoft.WindowsAzure.Commands.SqlDatabase.Services.Common;
 using Microsoft.WindowsAzure.Commands.SqlDatabase.Services.ImportExport;
 using Microsoft.WindowsAzure.Commands.SqlDatabase.Services.Server;
-using Microsoft.WindowsAzure.Commands.Storage.Model.ResourceModel;
 using Microsoft.WindowsAzure.Management.Sql;
 using Microsoft.WindowsAzure.Management.Sql.Models;
-using Microsoft.Azure.Commands.Common.Authentication;
 
 namespace Microsoft.WindowsAzure.Commands.SqlDatabase.Database.Cmdlet
 {

src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/StartAzureSqlDatabaseImport.cs

@@ -13,16 +13,14 @@
 
 using System;
 using System.Management.Automation;
-using Microsoft.WindowsAzure.Commands.Common;
 using Microsoft.Azure.Commands.Common.Authentication.Models;
 using Microsoft.WindowsAzure.Commands.Common.Storage;
+using Microsoft.WindowsAzure.Commands.Common.Storage.ResourceModel;
 using Microsoft.WindowsAzure.Commands.SqlDatabase.Services.Common;
 using Microsoft.WindowsAzure.Commands.SqlDatabase.Services.ImportExport;
 using Microsoft.WindowsAzure.Commands.SqlDatabase.Services.Server;
-using Microsoft.WindowsAzure.Commands.Storage.Model.ResourceModel;
 using Microsoft.WindowsAzure.Management.Sql;
 using Microsoft.WindowsAzure.Management.Sql.Models;
-using Microsoft.Azure.Commands.Common.Authentication;
 
 namespace Microsoft.WindowsAzure.Commands.SqlDatabase.Database.Cmdlet
 {

src/Storage/Commands.Storage.Test/Blob/Cmdlet/NewAzureStorageContainerTest.cs

@@ -1,4 +1,4 @@
-// ----------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------------
 //
 // Copyright Microsoft Corporation
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,6 +15,7 @@
 using System;
 using System.Linq;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.WindowsAzure.Commands.Common.Storage.ResourceModel;
 using Microsoft.WindowsAzure.Commands.Storage.Blob.Cmdlet;
 using Microsoft.WindowsAzure.Commands.Storage.Common;
 using Microsoft.WindowsAzure.Commands.Storage.Model.ResourceModel;

src/Storage/Commands.Storage.Test/Blob/Cmdlet/SetAzureStorageContainerAclTest.cs

@@ -1,4 +1,4 @@
-// ----------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------------
 //
 // Copyright Microsoft Corporation
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,9 +15,9 @@
 using System;
 using System.Linq;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.WindowsAzure.Commands.Common.Storage.ResourceModel;
 using Microsoft.WindowsAzure.Commands.Storage.Cmdlet;
 using Microsoft.WindowsAzure.Commands.Storage.Common;
-using Microsoft.WindowsAzure.Commands.Storage.Model.ResourceModel;
 using Microsoft.WindowsAzure.Storage.Blob;
 
 namespace Microsoft.WindowsAzure.Commands.Storage.Test.Blob

src/Storage/Commands.Storage.Test/Commands.Storage.Test.csproj

@@ -122,9 +122,9 @@
     <Reference Include="Microsoft.WindowsAzure.Storage">
       <HintPath>..\..\packages\WindowsAzure.Storage.6.1.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.WindowsAzure.Storage.DataMovement, Version=5.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\Microsoft.WindowsAzure.Storage.DataMovement.dll</HintPath>
+    <Reference Include="Microsoft.WindowsAzure.Storage.DataMovement">
+      <HintPath>..\..\packages\Microsoft.Azure.Storage.DataMovement.0.2.0\lib\net45\Microsoft.WindowsAzure.Storage.DataMovement.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>

src/Storage/Commands.Storage.Test/Common/StorageCloudCmdletBaseTest.cs

@@ -1,4 +1,4 @@
-// ----------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------------
 //
 // Copyright Microsoft Corporation
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,9 +16,9 @@
 using System.Linq;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Microsoft.WindowsAzure.Commands.Common.Storage;
+using Microsoft.WindowsAzure.Commands.Common.Storage.ResourceModel;
 using Microsoft.WindowsAzure.Commands.Common.Test.Mocks;
 using Microsoft.WindowsAzure.Commands.Storage.Common;
-using Microsoft.WindowsAzure.Commands.Storage.Model.ResourceModel;
 using Microsoft.WindowsAzure.Storage;
 
 namespace Microsoft.WindowsAzure.Commands.Storage.Test.Common