Skip to content

Commit f487947

Browse files
authored
Merge pull request #8035 from maddieclayton/azuretest
Remove Azure.Storage dependency from Azure
2 parents fa0e1f5 + 565d0e4 commit f487947

34 files changed

+59
-126
lines changed

build.proj

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -278,18 +278,10 @@
278278

279279
<CallTarget Targets="CodeSignBinaries" Condition="'$(CodeSign)' == 'true'" />
280280

281-
<Exec ContinueOnError="false"
282-
Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot; . $(LibraryToolsFolder)\NewOutputTypeIndex.ps1 -OutputFile $(PackageDirectory)\outputtypes.json -BuildConfig $(Configuration) &quot;"
283-
Condition="('$(Scope)' == 'All' or '$(Scope)' == 'Latest') and $(CodeSign) == 'true'" />
284-
285281
<!--<Message Importance="high" Text="Running Static Analyser" />
286282
<CallTarget targets="DependencyAnalysis" ContinueOnError="ErrorAndContinue" />
287283
<Exec Command="$(PowerShellCommandPrefix) &quot;. $(LibraryToolsFolder)\CheckAssemblies.ps1 -BuildConfig $(Configuration) &quot;" />-->
288284
<Exec Command="$(PowerShellCommandPrefix) &quot;. $(LibraryToolsFolder)\CleanupBuild.ps1 -BuildConfig $(Configuration) &quot;" />
289-
290-
<Exec ContinueOnError="false"
291-
Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot; . $(LibraryToolsFolder)\NewHelpIndex.ps1 -OutputFile $(PackageDirectory)\index.json -BuildConfig $(Configuration) &quot;"
292-
Condition="('$(Scope)' == 'All' or '$(Scope)' == 'Latest') and $(CodeSign) == 'true'" />
293285
</Target>
294286

295287
<!--

src/ServiceManagement/Automation/Commands.Automation/Cmdlet/AzureAutomationBaseCmdlet.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
using System.Xml.Linq;
2424
using Microsoft.Azure.Commands.Automation.Common;
2525
using Microsoft.Azure.Commands.Automation.DataContract;
26-
using Microsoft.Azure.Commands.Automation.Properties;
26+
using Microsoft.WindowsAzure.Commands.Automation.Properties;
2727
using Microsoft.WindowsAzure;
2828
using Microsoft.WindowsAzure.Commands.Utilities.Common;
2929
using Hyak.Common;

src/ServiceManagement/Automation/Commands.Automation/Cmdlet/RemoveAzureAutomationAccount.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
using System.Security.Permissions;
1919
using Microsoft.Azure.Commands.Automation.Common;
2020
using Microsoft.Azure.Commands.Automation.Model;
21-
using Microsoft.Azure.Commands.Automation.Properties;
21+
using Microsoft.WindowsAzure.Commands.Automation.Properties;
2222
using Microsoft.WindowsAzure.Commands.Utilities.Common;
2323

2424
namespace Microsoft.Azure.Commands.Automation.Cmdlet

src/ServiceManagement/Automation/Commands.Automation/Cmdlet/RemoveAzureAutomationCertificate.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
using System.Security.Permissions;
1919
using Microsoft.Azure.Commands.Automation.Model;
2020
using Microsoft.Azure.Commands.Automation.Common;
21-
using Microsoft.Azure.Commands.Automation.Properties;
21+
using Microsoft.WindowsAzure.Commands.Automation.Properties;
2222

2323
namespace Microsoft.Azure.Commands.Automation.Cmdlet
2424
{

src/ServiceManagement/Automation/Commands.Automation/Cmdlet/RemoveAzureAutomationConnection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
using System.Security.Permissions;
1919
using Microsoft.Azure.Commands.Automation.Model;
2020
using Microsoft.Azure.Commands.Automation.Common;
21-
using Microsoft.Azure.Commands.Automation.Properties;
21+
using Microsoft.WindowsAzure.Commands.Automation.Properties;
2222

2323
namespace Microsoft.Azure.Commands.Automation.Cmdlet
2424
{

src/ServiceManagement/Automation/Commands.Automation/Cmdlet/RemoveAzureAutomationConnectionType.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
using System.Management.Automation;
1818
using System.Security.Permissions;
1919
using Microsoft.Azure.Commands.Automation.Common;
20-
using Microsoft.Azure.Commands.Automation.Properties;
20+
using Microsoft.WindowsAzure.Commands.Automation.Properties;
2121

2222
namespace Microsoft.Azure.Commands.Automation.Cmdlet
2323
{

src/ServiceManagement/Automation/Commands.Automation/Cmdlet/RemoveAzureAutomationCredential.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
using System.Security.Permissions;
1919
using Microsoft.Azure.Commands.Automation.Model;
2020
using Microsoft.Azure.Commands.Automation.Common;
21-
using Microsoft.Azure.Commands.Automation.Properties;
21+
using Microsoft.WindowsAzure.Commands.Automation.Properties;
2222

2323
namespace Microsoft.Azure.Commands.Automation.Cmdlet
2424
{

src/ServiceManagement/Automation/Commands.Automation/Cmdlet/RemoveAzureAutomationModule.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
using System.Security.Permissions;
1919
using Microsoft.Azure.Commands.Automation.Model;
2020
using Microsoft.Azure.Commands.Automation.Common;
21-
using Microsoft.Azure.Commands.Automation.Properties;
21+
using Microsoft.WindowsAzure.Commands.Automation.Properties;
2222

2323
namespace Microsoft.Azure.Commands.Automation.Cmdlet
2424
{

src/ServiceManagement/Automation/Commands.Automation/Cmdlet/RemoveAzureAutomationRunbook.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
using System.Management.Automation;
1818
using System.Security.Permissions;
1919
using Microsoft.Azure.Commands.Automation.Common;
20-
using Microsoft.Azure.Commands.Automation.Properties;
20+
using Microsoft.WindowsAzure.Commands.Automation.Properties;
2121

2222
namespace Microsoft.Azure.Commands.Automation.Cmdlet
2323
{

src/ServiceManagement/Automation/Commands.Automation/Cmdlet/RemoveAzureAutomationSchedule.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
using System.Management.Automation;
1818
using System.Security.Permissions;
1919
using Microsoft.Azure.Commands.Automation.Common;
20-
using Microsoft.Azure.Commands.Automation.Properties;
20+
using Microsoft.WindowsAzure.Commands.Automation.Properties;
2121

2222
namespace Microsoft.Azure.Commands.Automation.Cmdlet
2323
{

src/ServiceManagement/Automation/Commands.Automation/Cmdlet/RemoveAzureAutomationVariable.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
using System.Security.Permissions;
1919
using Microsoft.Azure.Commands.Automation.Common;
2020
using Microsoft.Azure.Commands.Automation.Model;
21-
using Microsoft.Azure.Commands.Automation.Properties;
21+
using Microsoft.WindowsAzure.Commands.Automation.Properties;
2222

2323
namespace Microsoft.Azure.Commands.Automation.Cmdlet
2424
{

src/ServiceManagement/Automation/Commands.Automation/Cmdlet/UnregisterAzureAutomationScheduledRunbook.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
using System.Security.Permissions;
1919
using Microsoft.Azure.Commands.Automation.Common;
2020
using Microsoft.Azure.Commands.Automation.Model;
21-
using Microsoft.Azure.Commands.Automation.Properties;
21+
using Microsoft.WindowsAzure.Commands.Automation.Properties;
2222

2323
namespace Microsoft.Azure.Commands.Automation.Cmdlet
2424
{

src/ServiceManagement/Automation/Commands.Automation/Common/AutomationClient.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
using System.Security;
2323
using System.Security.Cryptography.X509Certificates;
2424
using Microsoft.Azure.Commands.Automation.Model;
25-
using Microsoft.Azure.Commands.Automation.Properties;
25+
using Microsoft.WindowsAzure.Commands.Automation.Properties;
2626
using Microsoft.WindowsAzure.Management.Automation;
2727
using Microsoft.WindowsAzure.Management.Automation.Models;
2828
using Microsoft.WindowsAzure.Commands.Common;

src/ServiceManagement/Automation/Commands.Automation/Common/PowershellJsonConverter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15-
using Microsoft.Azure.Commands.Automation.Properties;
15+
using Microsoft.WindowsAzure.Commands.Automation.Properties;
1616
using System;
1717
using System.Collections;
1818
using System.Collections.ObjectModel;

src/ServiceManagement/Automation/Commands.Automation/Common/RequiresExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
using System;
1616
using System.Globalization;
1717
using System.Text.RegularExpressions;
18-
using Microsoft.Azure.Commands.Automation.Properties;
18+
using Microsoft.WindowsAzure.Commands.Automation.Properties;
1919

2020
namespace Microsoft.Azure.Commands.Automation.Common
2121
{

src/ServiceManagement/Automation/Commands.Automation/Model/CertificateInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// ----------------------------------------------------------------------------------
1414

1515
using Microsoft.Azure.Commands.Automation.Common;
16-
using Microsoft.Azure.Commands.Automation.Properties;
16+
using Microsoft.WindowsAzure.Commands.Automation.Properties;
1717
using System;
1818

1919
namespace Microsoft.Azure.Commands.Automation.Model

src/ServiceManagement/Automation/Commands.Automation/Model/Connection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
using System.Collections;
1616
using System.Collections.Generic;
1717
using Microsoft.Azure.Commands.Automation.Common;
18-
using Microsoft.Azure.Commands.Automation.Properties;
18+
using Microsoft.WindowsAzure.Commands.Automation.Properties;
1919
using System;
2020

2121
namespace Microsoft.Azure.Commands.Automation.Model

src/ServiceManagement/Automation/Commands.Automation/Model/CredentialInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// ----------------------------------------------------------------------------------
1414

1515
using Microsoft.Azure.Commands.Automation.Common;
16-
using Microsoft.Azure.Commands.Automation.Properties;
16+
using Microsoft.WindowsAzure.Commands.Automation.Properties;
1717
using System;
1818

1919
namespace Microsoft.Azure.Commands.Automation.Model

src/ServiceManagement/Automation/Commands.Automation/Model/Module.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
using System.Collections;
1616
using Microsoft.Azure.Commands.Automation.Common;
17-
using Microsoft.Azure.Commands.Automation.Properties;
17+
using Microsoft.WindowsAzure.Commands.Automation.Properties;
1818
using System;
1919
using System.Collections.Generic;
2020

src/ServiceManagement/Automation/Commands.Automation/Model/Schedule.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// ----------------------------------------------------------------------------------
1414

1515
using Microsoft.Azure.Commands.Automation.Common;
16-
using Microsoft.Azure.Commands.Automation.Properties;
16+
using Microsoft.WindowsAzure.Commands.Automation.Properties;
1717
using System;
1818

1919
namespace Microsoft.Azure.Commands.Automation.Model

src/ServiceManagement/Automation/Commands.Automation/Properties/Resources.Designer.cs

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/ServiceManagement/Azure.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ CLRVersion = '4.0'
5151
# ProcessorArchitecture = ''
5252

5353
# Modules that must be imported into the global environment prior to importing this module
54-
RequiredModules = @(@{ModuleName = 'Azure.Storage'; ModuleVersion = '4.6.1'; })
54+
RequiredModules = @()
5555

5656
# Assemblies that must be loaded prior to importing this module
5757
# RequiredAssemblies = @()

src/ServiceManagement/Common/Commands.ScenarioTest/Common/PowerShellTest.cs

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -39,22 +39,7 @@ public class PowerShellTest
3939
public PowerShellTest(AzureModule commandMode, params string[] modules)
4040
{
4141
this.modules = new List<string>();
42-
if (commandMode == AzureModule.AzureServiceManagement)
43-
{
44-
this.modules.Add(FileUtilities.GetContentFilePath(@"ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1"));
45-
this.modules.Add(FileUtilities.GetContentFilePath(@"Storage\Azure.Storage\Azure.Storage.psd1"));
46-
this.modules.Add(FileUtilities.GetContentFilePath(@"ServiceManagement\Azure\Azure.psd1"));
47-
}
48-
else if (commandMode == AzureModule.AzureResourceManager)
49-
{
50-
this.modules.Add(FileUtilities.GetContentFilePath(@"ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1"));
51-
this.modules.Add(FileUtilities.GetContentFilePath(@"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Resources.psd1"));
52-
this.modules.Add(FileUtilities.GetContentFilePath(@"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Tags.psd1"));
53-
}
54-
else
55-
{
56-
throw new ArgumentException("Unknown command type for testing");
57-
}
42+
this.modules.Add(FileUtilities.GetContentFilePath(@"ServiceManagement\Azure\Azure.psd1"));
5843
this.modules.Add("Assert.ps1");
5944
this.modules.Add("Common.ps1");
6045
this.modules.AddRange(modules);

src/ServiceManagement/Common/Commands.ScenarioTest/CredentialTests/CredentialTestHelper.cs

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -39,31 +39,7 @@ public CredentialTestHelper()
3939
public void SetupModules(AzureModule mode, params string[] testModules)
4040
{
4141
modules = new List<string>();
42-
switch (mode)
43-
{
44-
case AzureModule.AzureProfile:
45-
modules.Add(@"ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1");
46-
modules.Add(@"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Resources.psd1");
47-
modules.Add(@"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Tags.psd1");
48-
modules.Add(@"Storage\Azure.Storage\Azure.Storage.psd1");
49-
modules.Add(@"ServiceManagement\Azure\Azure.psd1");
50-
break;
51-
52-
case AzureModule.AzureServiceManagement:
53-
modules.Add(@"ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1");
54-
modules.Add(@"Storage\Azure.Storage\Azure.Storage.psd1");
55-
modules.Add(@"ServiceManagement\Azure\Azure.psd1");
56-
break;
57-
58-
case AzureModule.AzureResourceManager:
59-
modules.Add(@"ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1");
60-
modules.Add(@"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Resources.psd1");
61-
modules.Add(@"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Tags.psd1");
62-
break;
63-
64-
default:
65-
throw new ArgumentException("Unknown command type for testing");
66-
}
42+
modules.Add(@"ServiceManagement\Azure\Azure.psd1");
6743
modules.Add("Assert.ps1");
6844
modules.Add("Common.ps1");
6945
modules.AddRange(testModules);

src/ServiceManagement/Common/Commands.ScenarioTest/ResourceManagerTests/ResourceManagerTests.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,6 @@ protected void RunPowerShellTest(params string[] scripts)
5252

5353
List<string> modules = Directory.GetFiles("Resources\\ResourceManager", "*.ps1").ToList();
5454
modules.Add("Common.ps1");
55-
modules.Add(@"..\..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1");
56-
modules.Add(@"..\..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Resources.psd1");
57-
modules.Add(@"..\..\..\..\Package\Debug\ResourceManager\AzureResourceManager\zureRM.Resources\AzureRM.Tags.psd1");
5855

5956
helper.SetupEnvironment(AzureModule.AzureResourceManager);
6057
helper.SetupModules(modules.ToArray());

src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Commands.ServiceManagement.Test.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -472,10 +472,6 @@
472472
</EmbeddedResource>
473473
</ItemGroup>
474474
<ItemGroup>
475-
<ProjectReference Include="..\..\..\Storage\Commands.Storage\Commands.Storage.csproj">
476-
<Project>{08cf7da7-0392-4a19-b79b-e1ff67cdb81a}</Project>
477-
<Name>Commands.Storage</Name>
478-
</ProjectReference>
479475
<ProjectReference Include="..\..\Profile\Commands.Profile\Commands.ServiceManagement.Profile.csproj">
480476
<Project>{c60342b1-47d3-4a0e-8081-9b97ce60b7af}</Project>
481477
<Name>Commands.ServiceManagement.Profile</Name>

src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/CredentialHelper.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
using Microsoft.VisualStudio.TestTools.UnitTesting;
1616
using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.Properties;
17-
using Microsoft.WindowsAzure.Commands.Storage.Common;
1817
using Microsoft.WindowsAzure.Storage.Auth;
1918
using Microsoft.WindowsAzure.Storage.Blob;
2019
using System;
@@ -279,13 +278,13 @@ public static void CopyTestData(string srcContainer, string srcBlob, string dest
279278
try
280279
{
281280
vmPowershellCmdlets.RunPSScript(String.Format("{0}-{1} -Name {2}",
282-
VerbsCommon.Get, StorageNouns.Container, destContainer));
281+
VerbsCommon.Get, "AzureStorageContainer", destContainer));
283282
}
284283
catch
285284
{
286285
// Create a container.
287286
vmPowershellCmdlets.RunPSScript(String.Format("{0}-{1} -Name {2}",
288-
VerbsCommon.New, StorageNouns.Container, destContainer));
287+
VerbsCommon.New, "AzureStorageContainer", destContainer));
289288
}
290289

291290
// Make SAS Uri for the source blob.
@@ -294,13 +293,13 @@ public static void CopyTestData(string srcContainer, string srcBlob, string dest
294293
if (string.IsNullOrEmpty(destBlob))
295294
{
296295
vmPowershellCmdlets.RunPSScript(string.Format("{0}-{1} -SrcContainer {2} -SrcBlob {3} -DestContainer {4} -Force",
297-
VerbsLifecycle.Start, StorageNouns.CopyBlob, srcContainer, srcBlob, destContainer));
296+
VerbsLifecycle.Start, "AzureStorageBlobCopy", srcContainer, srcBlob, destContainer));
298297
destBlob = srcBlob;
299298
}
300299
else
301300
{
302301
vmPowershellCmdlets.RunPSScript(string.Format("{0}-{1} -SrcUri \"{2}\" -DestContainer {3} -DestBlob {4} -Force",
303-
VerbsLifecycle.Start, StorageNouns.CopyBlob, srcSasUri, destContainer, destBlob));
302+
VerbsLifecycle.Start, "AzureStorageBlobCopy", srcSasUri, destContainer, destBlob));
304303
}
305304

306305
for (int i = 0; i < 60; i++)

src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/FunctionalTestCommonVhd.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
using Microsoft.VisualStudio.TestTools.UnitTesting;
1616
using Microsoft.WindowsAzure.Commands.ServiceManagement.Model;
1717
using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.ConfigDataInfo;
18-
using Microsoft.WindowsAzure.Commands.Storage.Common;
1918
using System;
2019
using System.IO;
2120
using System.Linq;
@@ -168,7 +167,7 @@ public void AzureDiskTest()
168167
private void CopyCommonVhd(string vhdContainerName, string vhdName, string myVhdName)
169168
{
170169
vmPowershellCmdlets.RunPSScript(string.Format("{0}-{1} -SrcContainer {2} -SrcBlob {3} -DestContainer {4} -DestBlob {5}",
171-
VerbsLifecycle.Start, StorageNouns.CopyBlob, vhdContainerName, vhdName, vhdContainerName, myVhdName));
170+
VerbsLifecycle.Start, "CopyAzureStorageBlob", vhdContainerName, vhdName, vhdContainerName, myVhdName));
172171
}
173172

174173
[TestMethod(), TestCategory(Category.Functional), TestCategory(Category.BVT), TestProperty("Feature", "IAAS"), Priority(1), Owner("hylee"), Description("Test the cmdlet ((Add,Get,Save,Update,Remove)-AzureVMImage)")]

src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementCmdletTestHelper.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.PIRCmdletInfo;
3333
using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.NetworkCmdletInfo;
3434
using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.SubscriptionCmdletInfo;
35-
using Microsoft.WindowsAzure.Commands.Storage.Common;
3635
using Microsoft.WindowsAzure.Commands.Utilities.Common;
3736
using Microsoft.WindowsAzure.Management.Network.Models;
3837
using Microsoft.WindowsAzure.Storage.Blob;
@@ -178,7 +177,7 @@ public CopyState CheckCopyBlobStatus(string destContainer, string destBlob, bool
178177
{
179178
List<string> st = new List<string>();
180179
st.Add(string.Format("{0}-{1} -Container {2} -Blob {3}",
181-
VerbsCommon.Get, StorageNouns.CopyBlobStatus, destContainer, destBlob));
180+
VerbsCommon.Get, "AzureStorageBlobCopyState", destContainer, destBlob));
182181

183182
WindowsAzurePowershellScript azurePowershellCmdlet = new WindowsAzurePowershellScript(st);
184183
return (CopyState)azurePowershellCmdlet.Run(debug)[0].BaseObject;

0 commit comments

Comments
 (0)