Skip to content

Commit

Permalink
Merge pull request #1920 from ogail/dev
Browse files Browse the repository at this point in the history 
Remove SubscriptionData class
  • Loading branch information
Abdelrahman Elogeel authored and Abdelrahman Elogeel committed Oct 1, 2013
2 parents 05a88b4 + 1eeb82d commit 21c325e
Show file tree
Hide file tree
Showing 47 changed files with 200 additions and 400 deletions.
4 changes: 2 additions & 2 deletions WindowsAzurePowershell/src/Commands.ScenarioTest/Resources/ServiceManagement/Common.ps1
View file
Expand Up @@ -16,7 +16,7 @@
.SYNOPSIS
Sets
#>
function Set-CurrentStorageAccount
function Set-CurrentStorageAccountName
{
Get-AzureSubscription -Default | Set-AzureSubscription -CurrentStorageAccount ""
Get-AzureSubscription -Default | Set-AzureSubscription -CurrentStorageAccountName ""
}
2 changes: 1 addition & 1 deletion ...rePowershell/src/Commands.ServiceManagement.Test/FunctionalTests/AddAzureVhdSASUriTest.cs
View file
Expand Up @@ -41,7 +41,7 @@ public void Initialize()

pass = false;
testStartTime = DateTime.Now;
storageAccountKey = vmPowershellCmdlets.GetAzureStorageAccountKey(defaultAzureSubscription.CurrentStorageAccount);
storageAccountKey = vmPowershellCmdlets.GetAzureStorageAccountKey(defaultAzureSubscription.CurrentStorageAccountName);

try
{
Expand Down
4 changes: 2 additions & 2 deletions ...owsAzurePowershell/src/Commands.ServiceManagement.Test/FunctionalTests/AddAzureVhdTest.cs
View file
Expand Up @@ -41,7 +41,7 @@ public void Initialize()

pass = true;
testStartTime = DateTime.Now;
storageAccountKey = vmPowershellCmdlets.GetAzureStorageAccountKey(defaultAzureSubscription.CurrentStorageAccount);
storageAccountKey = vmPowershellCmdlets.GetAzureStorageAccountKey(defaultAzureSubscription.CurrentStorageAccountName);
}

/// <summary>
Expand Down Expand Up @@ -400,7 +400,7 @@ public void WrongProtocolShouldFail()

// Set the destination
string vhdBlobName = string.Format("{0}/{1}.vhd", vhdContainerName, Utilities.GetUniqueShortName(Path.GetFileNameWithoutExtension(vhdName)));
string badUrlRoot = string.Format(@"badprotocolhttp://{0}.blob.core.windows.net/", defaultAzureSubscription.CurrentStorageAccount);
string badUrlRoot = string.Format(@"badprotocolhttp://{0}.blob.core.windows.net/", defaultAzureSubscription.CurrentStorageAccountName);
string vhdDestUri = badUrlRoot + vhdBlobName;

DateTime startTime = DateTime.Now;
Expand Down
6 changes: 3 additions & 3 deletions WindowsAzurePowershell/src/Commands.ServiceManagement.Test/FunctionalTests/FunctionalTest.cs
View file
Expand Up @@ -478,7 +478,7 @@ public void AzureServiceDiagnosticsExtensionConfigTest()
// Create a certificate
X509Certificate2 cert = Utilities.CreateCertificate(password);

string storage = defaultAzureSubscription.CurrentStorageAccount;
string storage = defaultAzureSubscription.CurrentStorageAccountName;
XmlDocument daConfig = new XmlDocument();
daConfig.Load(@".\da.xml");

Expand Down Expand Up @@ -797,11 +797,11 @@ public void AzureStorageKeyTest()

try
{
StorageServiceKeyOperationContext key1 = vmPowershellCmdlets.GetAzureStorageAccountKey(defaultAzureSubscription.CurrentStorageAccount); // Get-AzureStorageAccountKey
StorageServiceKeyOperationContext key1 = vmPowershellCmdlets.GetAzureStorageAccountKey(defaultAzureSubscription.CurrentStorageAccountName); // Get-AzureStorageAccountKey
Console.WriteLine("Primary - {0}", key1.Primary);
Console.WriteLine("Secondary - {0}", key1.Secondary);

StorageServiceKeyOperationContext key2 = vmPowershellCmdlets.NewAzureStorageAccountKey(defaultAzureSubscription.CurrentStorageAccount, KeyType.Secondary);
StorageServiceKeyOperationContext key2 = vmPowershellCmdlets.NewAzureStorageAccountKey(defaultAzureSubscription.CurrentStorageAccountName, KeyType.Secondary);
Console.WriteLine("Primary - {0}", key2.Primary);
Console.WriteLine("Secondary - {0}", key2.Secondary);

Expand Down
18 changes: 9 additions & 9 deletions ...ell/src/Commands.ServiceManagement.Test/FunctionalTests/PowershellCore/AddAzureVhdTest.cs
View file
Expand Up @@ -30,7 +30,7 @@ namespace Microsoft.WindowsAzure.Management.ServiceManagement.Test.FunctionalTes
public class AddAzureVhdTest
{
private ServiceManagementCmdletTestHelper vmPowershellCmdlets;
private SubscriptionData defaultAzureSubscription;
private WindowsAzureSubscription defaultAzureSubscription;
private StorageServiceKeyOperationContext storageAccountKey;
//private string destination;
//private string patchDestination;
Expand Down Expand Up @@ -65,14 +65,14 @@ public void Initialize()
vmPowershellCmdlets.ImportAzurePublishSettingsFile();
defaultAzureSubscription = vmPowershellCmdlets.SetDefaultAzureSubscription(Resource.DefaultSubscriptionName);
Assert.AreEqual(Resource.DefaultSubscriptionName, defaultAzureSubscription.SubscriptionName);
storageAccountKey = vmPowershellCmdlets.GetAzureStorageAccountKey(defaultAzureSubscription.CurrentStorageAccount);
Assert.AreEqual(defaultAzureSubscription.CurrentStorageAccount, storageAccountKey.StorageAccountName);
storageAccountKey = vmPowershellCmdlets.GetAzureStorageAccountKey(defaultAzureSubscription.CurrentStorageAccountName);
Assert.AreEqual(defaultAzureSubscription.CurrentStorageAccountName, storageAccountKey.StorageAccountName);

//destination = string.Format(@"http://{0}.blob.core.windows.net/vhdstore/{1}", defaultAzureSubscription.CurrentStorageAccount, Utilities.GetUniqueShortName("PSTestAzureVhd"));
//patchDestination = string.Format(@"http://{0}.blob.core.windows.net/vhdstore/{1}", defaultAzureSubscription.CurrentStorageAccount, Utilities.GetUniqueShortName("PSTestAzureVhd"));
//destination = string.Format(@"http://{0}.blob.core.windows.net/vhdstore/{1}", defaultAzureSubscription.CurrentStorageAccountName, Utilities.GetUniqueShortName("PSTestAzureVhd"));
//patchDestination = string.Format(@"http://{0}.blob.core.windows.net/vhdstore/{1}", defaultAzureSubscription.CurrentStorageAccountName, Utilities.GetUniqueShortName("PSTestAzureVhd"));

//destinationSasUri = string.Format(@"http://{0}.blob.core.windows.net/vhdstore/{1}", defaultAzureSubscription.CurrentStorageAccount, Utilities.GetUniqueShortName("PSTestAzureVhd"));
//patchDestinationSasUri = string.Format(@"http://{0}.blob.core.windows.net/vhdstore/{1}", defaultAzureSubscription.CurrentStorageAccount, Utilities.GetUniqueShortName("PSTestAzureVhd"));
//destinationSasUri = string.Format(@"http://{0}.blob.core.windows.net/vhdstore/{1}", defaultAzureSubscription.CurrentStorageAccountName, Utilities.GetUniqueShortName("PSTestAzureVhd"));
//patchDestinationSasUri = string.Format(@"http://{0}.blob.core.windows.net/vhdstore/{1}", defaultAzureSubscription.CurrentStorageAccountName, Utilities.GetUniqueShortName("PSTestAzureVhd"));
//var destinationBlob = new CloudPageBlob(new Uri(destinationSasUri), new StorageCredentials(storageAccountKey.StorageAccountName, storageAccountKey.Primary));
//var patchDestinationBlob = new CloudPageBlob(new Uri(patchDestinationSasUri), new StorageCredentials(storageAccountKey.StorageAccountName, storageAccountKey.Primary));
//var policy = new SharedAccessBlobPolicy()
Expand All @@ -90,7 +90,7 @@ public void Initialize()
//patchDestinationSasUri += patchDestinationBlobToken;


blobUrlRoot = string.Format(@"http://{0}.blob.core.windows.net/", defaultAzureSubscription.CurrentStorageAccount);
blobUrlRoot = string.Format(@"http://{0}.blob.core.windows.net/", defaultAzureSubscription.CurrentStorageAccountName);

perfFile = "perf.csv";
}
Expand Down Expand Up @@ -1027,7 +1027,7 @@ public void WrongProtocolShouldFail()

// Set the destination
string vhdBlobName = string.Format("vhdstore/{0}.vhd", Utilities.GetUniqueShortName(Path.GetFileNameWithoutExtension(vhdName)));
string badUrlRoot = string.Format(@"badprotocolhttp://{0}.blob.core.windows.net/", defaultAzureSubscription.CurrentStorageAccount);
string badUrlRoot = string.Format(@"badprotocolhttp://{0}.blob.core.windows.net/", defaultAzureSubscription.CurrentStorageAccountName);
string vhdDestUri = badUrlRoot + vhdBlobName;

DateTime startTime = DateTime.Now;
Expand Down
2 changes: 1 addition & 1 deletion ...wsAzurePowershell/src/Commands.ServiceManagement.Test/FunctionalTests/SaveAzureVhdTest.cs
View file
Expand Up @@ -80,7 +80,7 @@ public void Initialize()
{
pass = true;
testStartTime = DateTime.Now;
storageAccountKey = vmPowershellCmdlets.GetAzureStorageAccountKey(defaultAzureSubscription.CurrentStorageAccount);
storageAccountKey = vmPowershellCmdlets.GetAzureStorageAccountKey(defaultAzureSubscription.CurrentStorageAccountName);

// Set the source blob
blobHandle = Utilities.GetBlobHandle(vhdBlobLocation, storageAccountKey.Primary);
Expand Down
4 changes: 2 additions & 2 deletions WindowsAzurePowershell/src/Commands.ServiceManagement.Test/FunctionalTests/ScenarioTest.cs
View file
Expand Up @@ -756,7 +756,7 @@ public void AzureServiceDiagnosticsExtensionConfigScenarioTest()
string deploymentName = "deployment1";
string deploymentLabel = "label1";
DeploymentInfoContext result;
string storage = defaultAzureSubscription.CurrentStorageAccount;
string storage = defaultAzureSubscription.CurrentStorageAccountName;
XmlDocument daConfig = new XmlDocument();
daConfig.Load(@".\da.xml");

Expand Down Expand Up @@ -814,7 +814,7 @@ public void AzureServiceDiagnosticsExtensionTest()
string deploymentLabel = "label1";
DeploymentInfoContext result;

string storage = defaultAzureSubscription.CurrentStorageAccount;
string storage = defaultAzureSubscription.CurrentStorageAccountName;
XmlDocument daConfig = new XmlDocument();
daConfig.Load(@".\da.xml");

Expand Down
28 changes: 14 additions & 14 deletions .../src/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementCmdletTestHelper.cs
View file
Expand Up @@ -653,15 +653,15 @@ internal void ImportAzurePublishSettingsFile(string publishSettingsFile)

#region AzureSubscription

public Collection<SubscriptionData> GetAzureSubscription()
public Collection<WindowsAzureSubscription> GetAzureSubscription()
{
return RunPSCmdletAndReturnAll<SubscriptionData>(new GetAzureSubscriptionCmdletInfo());
return RunPSCmdletAndReturnAll<WindowsAzureSubscription>(new GetAzureSubscriptionCmdletInfo());
}

public SubscriptionData GetCurrentAzureSubscription()
public WindowsAzureSubscription GetCurrentAzureSubscription()
{
Collection<SubscriptionData> subscriptions = GetAzureSubscription();
foreach (SubscriptionData subscription in subscriptions)
Collection<WindowsAzureSubscription> subscriptions = GetAzureSubscription();
foreach (WindowsAzureSubscription subscription in subscriptions)
{
if (subscription.IsDefault)
{
Expand All @@ -671,14 +671,14 @@ public SubscriptionData GetCurrentAzureSubscription()
return null;
}

public SubscriptionData SetAzureSubscription(string subscriptionName, string currentStorageAccount)
public WindowsAzureSubscription SetAzureSubscription(string subscriptionName, string CurrentStorageAccountName)
{
SetAzureSubscriptionCmdletInfo setAzureSubscriptionCmdlet = new SetAzureSubscriptionCmdletInfo(subscriptionName, currentStorageAccount);
SetAzureSubscriptionCmdletInfo setAzureSubscriptionCmdlet = new SetAzureSubscriptionCmdletInfo(subscriptionName, CurrentStorageAccountName);
WindowsAzurePowershellCmdlet azurePowershellCmdlet = new WindowsAzurePowershellCmdlet(setAzureSubscriptionCmdlet);
azurePowershellCmdlet.Run();

Collection<SubscriptionData> subscriptions = GetAzureSubscription();
foreach (SubscriptionData subscription in subscriptions)
Collection<WindowsAzureSubscription> subscriptions = GetAzureSubscription();
foreach (WindowsAzureSubscription subscription in subscriptions)
{
if (subscription.SubscriptionName == subscriptionName)
{
Expand All @@ -688,14 +688,14 @@ public SubscriptionData SetAzureSubscription(string subscriptionName, string cur
return null;
}

public SubscriptionData SetDefaultAzureSubscription(string subscriptionName)
public WindowsAzureSubscription SetDefaultAzureSubscription(string subscriptionName)
{
SelectAzureSubscriptionCmdletInfo selectAzureSubscriptionCmdlet = new SelectAzureSubscriptionCmdletInfo(subscriptionName);
WindowsAzurePowershellCmdlet azurePowershellCmdlet = new WindowsAzurePowershellCmdlet(selectAzureSubscriptionCmdlet);
azurePowershellCmdlet.Run();

Collection<SubscriptionData> subscriptions = GetAzureSubscription();
foreach (SubscriptionData subscription in subscriptions)
Collection<WindowsAzureSubscription> subscriptions = GetAzureSubscription();
foreach (WindowsAzureSubscription subscription in subscriptions)
{
if (subscription.SubscriptionName == subscriptionName)
{
Expand Down Expand Up @@ -1283,9 +1283,9 @@ public void RemoveAzureSubscriptions()
}
}

public void RemoveAzureSubscription(string subscriptionName, bool force)
public void RemoveAzureSubscription(string Name, bool force)
{
RemoveAzureSubscriptionCmdletInfo removeAzureSubscriptionCmdletInfo = new RemoveAzureSubscriptionCmdletInfo(subscriptionName, null, force);
RemoveAzureSubscriptionCmdletInfo removeAzureSubscriptionCmdletInfo = new RemoveAzureSubscriptionCmdletInfo(Name, null, force);
WindowsAzurePowershellCmdlet removeAzureSubscriptionCmdlet = new WindowsAzurePowershellCmdlet(removeAzureSubscriptionCmdletInfo);

var result = removeAzureSubscriptionCmdlet.Run();
Expand Down
14 changes: 7 additions & 7 deletions ...rePowershell/src/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementTest.cs
View file
Expand Up @@ -45,7 +45,7 @@ public class ServiceManagementTest
protected const string vhdContainerName = "vhdstore";

protected static ServiceManagementCmdletTestHelper vmPowershellCmdlets;
protected static SubscriptionData defaultAzureSubscription;
protected static WindowsAzureSubscription defaultAzureSubscription;
protected static StorageServiceKeyOperationContext storageAccountKey;
protected static string blobUrlRoot;

Expand Down Expand Up @@ -85,9 +85,9 @@ public static void SetDefaultStorage()
{
defaultAzureSubscription = vmPowershellCmdlets.SetAzureSubscription(defaultAzureSubscription.SubscriptionName, CredentialHelper.DefaultStorageName);

storageAccountKey = vmPowershellCmdlets.GetAzureStorageAccountKey(defaultAzureSubscription.CurrentStorageAccount);
Assert.AreEqual(defaultAzureSubscription.CurrentStorageAccount, storageAccountKey.StorageAccountName);
blobUrlRoot = (vmPowershellCmdlets.GetAzureStorageAccount(defaultAzureSubscription.CurrentStorageAccount)[0].Endpoints.ToArray())[0];
storageAccountKey = vmPowershellCmdlets.GetAzureStorageAccountKey(defaultAzureSubscription.CurrentStorageAccountName);
Assert.AreEqual(defaultAzureSubscription.CurrentStorageAccountName, storageAccountKey.StorageAccountName);
blobUrlRoot = (vmPowershellCmdlets.GetAzureStorageAccount(defaultAzureSubscription.CurrentStorageAccountName)[0].Endpoints.ToArray())[0];
}
else
{
Expand Down Expand Up @@ -143,7 +143,7 @@ public static void SetTestSettings()
}
Console.WriteLine("Location Name: {0}", locationName);

if (defaultAzureSubscription.CurrentStorageAccount == null && !string.IsNullOrEmpty(CredentialHelper.DefaultStorageName))
if (defaultAzureSubscription.CurrentStorageAccountName == null && !string.IsNullOrEmpty(CredentialHelper.DefaultStorageName))
{
SetDefaultStorage();
}
Expand Down Expand Up @@ -172,7 +172,7 @@ public static void CleanUpAssembly()
Retry(String.Format("Get-AzureDisk | Where {{$_.DiskName.Contains(\"{0}\")}} | Remove-AzureDisk -DeleteVhd", serviceNamePrefix), "in use");
if (deleteDefaultStorageAccount)
{
//vmPowershellCmdlets.RemoveAzureStorageAccount(defaultAzureSubscription.CurrentStorageAccount);
//vmPowershellCmdlets.RemoveAzureStorageAccount(defaultAzureSubscription.CurrentStorageAccountName);
}
}
}
Expand Down Expand Up @@ -213,7 +213,7 @@ protected static void ReImportSubscription()
// Re-import the subscription.
vmPowershellCmdlets.ImportAzurePublishSettingsFile();
vmPowershellCmdlets.SetDefaultAzureSubscription(CredentialHelper.DefaultSubscriptionName);
vmPowershellCmdlets.SetAzureSubscription(defaultAzureSubscription.SubscriptionName, defaultAzureSubscription.CurrentStorageAccount);
vmPowershellCmdlets.SetAzureSubscription(defaultAzureSubscription.SubscriptionName, defaultAzureSubscription.CurrentStorageAccountName);
}
}
}
4 changes: 2 additions & 2 deletions WindowsAzurePowershell/src/Commands.ServiceManagement/Properties/Resources.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions WindowsAzurePowershell/src/Commands.ServiceManagement/Properties/Resources.resx
View file
Expand Up @@ -187,7 +187,7 @@
<value>Cannot Create New Deployment with Virtual Machines Present in {0} Slot</value>
</data>
<data name="CurrentStorageAccountIsNotSet" xml:space="preserve">
<value>CurrentStorageAccount is not set. Use Set-AzureSubscription subname -CurrentStorageAccount storageaccount to set it.</value>
<value>CurrentStorageAccountName is not set. Use Set-AzureSubscription subname -CurrentStorageAccountName storageaccount to set it.</value>
</data>
<data name="DeployedArtifactsWillBeRemoved" xml:space="preserve">
<value>This cmdlet will remove deployed applications including VMs from the specified deployment slot. Do you want to continue?</value>
Expand Down Expand Up @@ -310,7 +310,7 @@
<value>No endpoint found for the VM: {0}</value>
</data>
<data name="CurrentStorageAccountIsNotAccessible" xml:space="preserve">
<value>CurrentStorageAccount is not accessible. Ensure the current storage account is accessible and in the same location or affinity group as your cloud service.</value>
<value>CurrentStorageAccountName is not accessible. Ensure the current storage account is accessible and in the same location or affinity group as your cloud service.</value>
</data>
<data name="ServiceExistsLocationCanNotBeSpecified" xml:space="preserve">
<value>Service already exists, Location cannot be specified.</value>
Expand Down

0 comments on commit 21c325e

Please sign in to comment.