Rename Name to SubscriptionName

andrerod · Oct 1, 2013 · 5678f59 · 5678f59
1 parent bfdbb30
commit 5678f59
Show file tree

Hide file tree

Showing 51 changed files with 257 additions and 254 deletions.
diff --git a/WindowsAzurePowershell/src/Commands.ScenarioTest/CloudServiceTests/EmulatorTests.cs b/WindowsAzurePowershell/src/Commands.ScenarioTest/CloudServiceTests/EmulatorTests.cs
@@ -39,7 +39,7 @@ public void CommonPowerShellSucceedingTest()
                 "Write-Verbose \"Verbose\"",
                 "Write-Warning \"Warning\"",
                 "foreach ($k in (Get-Item env:) ){$name=$k.name; $Value = $k.Value; Write-Debug \"$name=$Value\"}",
-                "foreach ($sub in Get-AzureSubscription) {$name = $sub.Name; Write-Debug $name}",
+                "foreach ($sub in Get-AzureSubscription) {$name = $sub.SubscriptionName; Write-Debug $name}",
                 "Assert-True {$true -eq $true}"
                 );
         }

diff --git a/WindowsAzurePowershell/src/Commands.ScenarioTest/Resources/Common.ps1 b/WindowsAzurePowershell/src/Commands.ScenarioTest/Resources/Common.ps1
@@ -124,12 +124,12 @@ function Write-Log
 
 function Check-SubscriptionMatch
 {
-    param([string] $baseSubscriptionName, [Microsoft.WindowsAzure.Commands.Utilities.Common.WindowsAzureSubscription] $checkedSubscription)
-    Write-Log ("[CheckSubscriptionMatch]: base subscription: '$baseSubscriptionName', validating '" + ($checkedSubscription.Name)+ "'")
+    param([string] $baseSubscriptionName, [Microsoft.WindowsAzure.Commands.Utilities.Common.SubscriptionData] $checkedSubscription)
+    Write-Log ("[CheckSubscriptionMatch]: base subscription: '$baseSubscriptionName', validating '" + ($checkedSubscription.SubscriptionName)+ "'")
     Format-Subscription $checkedSubscription | Write-Log
-    if ($baseSubscriptionName -ne $checkedSubscription.Name) 
+    if ($baseSubscriptionName -ne $checkedSubscription.SubscriptionName) 
     {
-        throw ("[Check-SubscriptionMatch]: Subscription Match Failed '" + ($baseSubscriptionName) + "' != '" + ($checkedSubscription.Name) + "'")
+        throw ("[Check-SubscriptionMatch]: Subscription Match Failed '" + ($baseSubscriptionName) + "' != '" + ($checkedSubscription.SubscriptionName) + "'")
     }
 
     Write-Log ("CheckSubscriptionMatch]: subscription check succeeded.")

diff --git a/WindowsAzurePowershell/src/Commands.ScenarioTest/Resources/CredUtils.ps1 b/WindowsAzurePowershell/src/Commands.ScenarioTest/Resources/CredUtils.ps1
@@ -17,30 +17,30 @@
 #
 # Import the given subscription if it has not already been imported
 #
-#    param [string] $Name: the subscription to import
+#    param [string] $subscriptionName: the subscription to import
 #    param [string] $publishFile     : the path to the publishsettings file with crednentials for the 
 #     given subscription
 #######################################
 function Import-SubscriptionIfNecessary 
 {
-    param( [String] $Name, [String] $publishFile)
-    Write-Log "[import-subscriptionifnecessary]: Setting subscription with $Name, using publish settings file $publishFile\r\n"
-    $subscription = Get-AzureSubscription $Name
+    param( [String] $subscriptionName, [String] $publishFile)
+    Write-Log "[import-subscriptionifnecessary]: Setting subscription with $subscriptionName, using publish settings file $publishFile\r\n"
+    $subscription = Get-AzureSubscription $subscriptionName
     if ($subscription -eq $NULL) 
 	{
-       Write-Log "[import-subsctiptionifnecessary]: subscription $Name not found, importing publish settings file $publishFile\r\n"
+       Write-Log "[import-subsctiptionifnecessary]: subscription $subscriptionName not found, importing publish settings file $publishFile\r\n"
        Import-AzurePublishSettingsFile $publishFile
     }
 
-    Select-AzureSubscription $Name
+    Select-AzureSubscription $subscriptionName
     $currentSub = Get-AzureSubscription -Current
 	Write-Log $currentSub
-    if ($Name -ne $currentSub.Name) 
+    if ($subscriptionName -ne $currentSub.SubscriptionName) 
 	{
-        throw "[import-subscriptionIfNecessary]: Unable to set current subscription to $Name"
+        throw "[import-subscriptionIfNecessary]: Unable to set current subscription to $subscriptionName"
     }
 
-    return $currentSub | Select-Object Name,SubscriptionId
+    return $currentSub | Select-Object SubscriptionName,SubscriptionId
 }
 
 ################################
@@ -52,7 +52,7 @@ function Remove-AllSubscriptions
     try {
     foreach ($subscription in  Get-AzureSubscription) 
 	{
-	  $toss = Remove-AzureSubscription $subscription.Name
+	  $toss = Remove-AzureSubscription $subscription.SubscriptionName
 	}
 
 	Assert-True { (Get-AzureSubscription) -eq $nul} "[Remove-AllSubscriptions]: all subscriptions not removed"
@@ -66,27 +66,27 @@ function Remove-AllSubscriptions
 #
 # Select only the relevant columns from a subscription
 #
-#    parm [WindowsAzureSubscription] $subscription: the subscription object to write out
+#    parm [SubscriptionData] $subscription: the subscription object to write out
 ############################################
 function Format-Subscription 
 {
     [CmdletBinding()]
-    param([Parameter(Mandatory=$true, Position=0, ValueFromPipeline=$true, ValueFromPipelineByPropertyName=$false)] [Microsoft.WindowsAzure.Commands.Utilities.Common.WindowsAzureSubscription] $subscription)
+    param([Parameter(Mandatory=$true, Position=0, ValueFromPipeline=$true, ValueFromPipelineByPropertyName=$false)] [Microsoft.WindowsAzure.Commands.Utilities.Common.SubscriptionData] $subscription)
 	PROCESS
 	{
-	    Select-Object -InputObject $subscription -Property Name,SubscriptionId,ServiceEndpoint,IsDefault | Format-List | Out-String
+	    Select-Object -InputObject $subscription -Property SubscriptionName,SubscriptionId,ServiceEndpoint,IsDefault | Format-List | Out-String
 	}
 }
 
 
 function Check-SubscriptionMatch
 {
-    param([string] $baseSubscriptionName, [Microsoft.WindowsAzure.Commands.Utilities.Common.WindowsAzureSubscription] $checkedSubscription)
-	Write-Log ("[CheckSubscriptionMatch]: base subscription: '$baseSubscriptionName', validating '" + ($checkedSubscription.Name)+ "'")
+    param([string] $baseSubscriptionName, [Microsoft.WindowsAzure.Commands.Utilities.Common.SubscriptionData] $checkedSubscription)
+	Write-Log ("[CheckSubscriptionMatch]: base subscription: '$baseSubscriptionName', validating '" + ($checkedSubscription.SubscriptionName)+ "'")
 	Format-Subscription $checkedSubscription | Write-Log
-	if ($baseSubscriptionName -ne $checkedSubscription.Name) 
+	if ($baseSubscriptionName -ne $checkedSubscription.SubscriptionName) 
 	{
-	    throw ("[Check-SubscriptionMatch]: Subscription Match Failed '" + ($baseSubscriptionName) + "' != '" + ($checkedSubscription.Name) + "'")
+	    throw ("[Check-SubscriptionMatch]: Subscription Match Failed '" + ($baseSubscriptionName) + "' != '" + ($checkedSubscription.SubscriptionName) + "'")
 	}
 
     Write-Log ("CheckSubscriptionMatch]: subscription check succeeded.")
@@ -95,12 +95,12 @@ function Check-SubscriptionMatch
 ##########################
 #
 #  Find a subscription in a list of expected subscriptions
-#    param $input: A list of WindowsAzureSubscription
+#    param $input: A list of subscriptiondata
 ##########################
 function Find-Subscription
 {
-    param( [Microsoft.WindowsAzure.Commands.Utilities.Common.WindowsAzureSubscription] $subscription, [array] $subscriptions)
-    $subscriptions | Where-Object {$_.Name -eq $subscription.Name}
+    param( [Microsoft.WindowsAzure.Commands.Utilities.Common.SubscriptionData] $subscription, [array] $subscriptions)
+    $subscriptions | Where-Object {$_.Name -eq $subscription.SubscriptionName}
 }
 ############################################
 #
@@ -126,8 +126,8 @@ function ImportAndVerify-PublishSettingsFile
 	$allSubscriptions | Format-Subscription | Write-Log
 	foreach ($subscription in $allSubscriptions)
 	{
-	    Write-Log ("[importandverify-publishsettingsfile]: Checking subscription '" + $subscription.Name + "'")
-		Assert-True {(Find-Subscription $subscription $subscriptions) -ne $nul} ("[importandverify-publishsettings]: Could not find subscription '" + $subscription.Name + "'")
+	    Write-Log ("[importandverify-publishsettingsfile]: Checking subscription '" + $subscription.SubscriptionName + "'")
+		Assert-True {(Find-Subscription $subscription $subscriptions) -ne $nul} ("[importandverify-publishsettings]: Could not find subscription '" + $subscription.SubscriptionName + "'")
 	}
 
 	Write-Log "[importandverify-publishsettingsfile]: Checking each subscription individually."

diff --git a/WindowsAzurePowershell/src/Commands.ScenarioTest/Resources/Credentials.ps1 b/WindowsAzurePowershell/src/Commands.ScenarioTest/Resources/Credentials.ps1
@@ -34,11 +34,11 @@ function Test-SelectSubscription
 	PROCESS
 	{
 	    Assert-True {($Name -and $Id)} "[select-subscription]: You must specify a Name and Id"
-		Select-AzureSubscription -Name $Name
+		Select-AzureSubscription -SubscriptionName $Name
 		Write-Log "Selected subscription '$Name'"
 		$subscription = Get-AzureSubscription -Current
 		$subscription | Format-Subscription | Write-Log
-		Assert-True { (($subscription.Name -eq $Name) -and ($subscription.SubscriptionId -eq $Id))} "[Select-Subscription]: current subscription does not match '$Name'"
+		Assert-True { (($subscription.SubscriptionName -eq $Name) -and ($subscription.SubscriptionId -eq $Id))} "[Select-Subscription]: current subscription does not match '$Name'"
 	}
 }
 
@@ -136,7 +136,7 @@ function Test-RemoveInvalidSubscription
 #######################################
 function Test-RemoveEmptySubscription
 {
-    $message = "Cannot validate argument on parameter 'Name'. The argument is null or empty. Supply an argument that is not null or empty and then try the command again."
+    $message = "Cannot validate argument on parameter 'SubscriptionName'. The argument is null or empty. Supply an argument that is not null or empty and then try the command again."
 	Assert-Throws {Remove-AzureSubscription ""} $message
 }
 
@@ -156,7 +156,7 @@ function Test-GetInvalidSubscription
 #######################################
 function Test-GetEmptySubscription
 {
-    $message = "Cannot validate argument on parameter 'Name'. The argument is null or empty. Supply an argument that is not null or empty and then try the command again."
+    $message = "Cannot validate argument on parameter 'SubscriptionName'. The argument is null or empty. Supply an argument that is not null or empty and then try the command again."
 	Assert-Throws {Get-AzureSubscription ""} $message
 }
 
@@ -177,7 +177,7 @@ function Test-GetEmptyCurrentSubscription
 #########################################
 function Test-GetEmptyDefaultSubscription
 {
-    $message = "No default subscription has been designated. Use Set-AzureSubscription -DefaultSubscription <Name> to set the default subscription."
+    $message = "No default subscription has been designated. Use Set-AzureSubscription -DefaultSubscription <subscriptionName> to set the default subscription."
 	Remove-AllSubscriptions
 	Assert-Throws {Get-AzureSubscription -Default} $message
 }
@@ -198,6 +198,6 @@ function Test-SelectInvalidSubscription
 #######################################
 function Test-SelectEmptySubscription
 {
-    $message = "Cannot validate argument on parameter 'Name'. The argument is null or empty. Supply an argument that is not null or empty and then try the command again."
+    $message = "Cannot validate argument on parameter 'SubscriptionName'. The argument is null or empty. Supply an argument that is not null or empty and then try the command again."
 	Assert-Throws {Select-AzureSubscription ""} $message
 }
diff --git a/WindowsAzurePowershell/src/Commands.ScenarioTest/Resources/Management/ManagementTests.ps1 b/WindowsAzurePowershell/src/Commands.ScenarioTest/Resources/Management/ManagementTests.ps1
@@ -21,9 +21,9 @@ Tests Remove-AzureSubscription with valid subscription
 function Test-RemoveAzureSubscriptionWithDefaultSubscription
 {
 	# Setup
-	$name = (Get-AzureSubscription -Default).Name
-	$expectedDefaultWarning = "The default subscription is being removed. Use Select-Subscription <Name> to select a new default subscription."
-	$expectedCurrentWarning = "The current subscription is being removed. Use Select-Subscription <Name> to select a new current subscription."
+	$name = (Get-AzureSubscription -Default).SubscriptionName
+	$expectedDefaultWarning = "The default subscription is being removed. Use Select-Subscription <subscriptionName> to select a new default subscription."
+	$expectedCurrentWarning = "The current subscription is being removed. Use Select-Subscription <subscriptionName> to select a new current subscription."
 
 	# Test
 	Remove-AzureSubscription $name -Force -WarningVariable warning
@@ -54,7 +54,7 @@ Tests Remove-AzureSubscription with empty subscription
 function Test-RemoveAzureSubscriptionWithEmptySubscription
 {
 	# Setup
-	$errorMessage = "Cannot validate argument on parameter 'Name'. The argument is null or empty. Supply an argument that is not null or empty and then try the command again."
+	$errorMessage = "Cannot validate argument on parameter 'SubscriptionName'. The argument is null or empty. Supply an argument that is not null or empty and then try the command again."
 
 	# Test
 	Assert-Throws { Remove-AzureSubscription "" } $errorMessage
@@ -67,7 +67,7 @@ Tests Remove-AzureSubscription with WhatIf
 function Test-RemoveAzureSubscriptionWithWhatIf
 {
 	# Setup
-	$name = (Get-AzureSubscription -Default).Name
+	$name = (Get-AzureSubscription -Default).SubscriptionName
 
 	# Test
 	Remove-AzureSubscription $name -Force -WhatIf

diff --git a/...erviceManagement.Test/FunctionalTests/IaasCmdletInfo/RemoveAzureSubscriptionCmdletInfo.cs b/...erviceManagement.Test/FunctionalTests/IaasCmdletInfo/RemoveAzureSubscriptionCmdletInfo.cs
@@ -18,10 +18,10 @@ namespace Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests
 
     public class RemoveAzureSubscriptionCmdletInfo : CmdletsInfo
     {
-        public RemoveAzureSubscriptionCmdletInfo(string Name, string dataFile, bool force = false)
+        public RemoveAzureSubscriptionCmdletInfo(string subscriptionName, string dataFile, bool force = false)
         {
             cmdletName = Utilities.RemoveAzureSubscriptionCmdletName;
-            cmdletParams.Add(new CmdletParam("Name", Name));
+            cmdletParams.Add(new CmdletParam("SubscriptionName", subscriptionName));
             if (dataFile != null)
             {
                 cmdletParams.Add(new CmdletParam("SubscriptionDataFile", dataFile));

diff --git a/...erviceManagement.Test/FunctionalTests/IaasCmdletInfo/SelectAzureSubscriptionCmdletInfo.cs b/...erviceManagement.Test/FunctionalTests/IaasCmdletInfo/SelectAzureSubscriptionCmdletInfo.cs
@@ -18,17 +18,17 @@ namespace Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests
 
     public class SelectAzureSubscriptionCmdletInfo : CmdletsInfo
     {
-        public SelectAzureSubscriptionCmdletInfo(string Name)
+        public SelectAzureSubscriptionCmdletInfo(string subscriptionName)
         {
             cmdletName = "Select-AzureSubscription";
-            cmdletParams.Add(new CmdletParam("Name", Name));
+            cmdletParams.Add(new CmdletParam("SubscriptionName", subscriptionName));
             cmdletParams.Add(new CmdletParam("Default"));
         }
 
-        public SelectAzureSubscriptionCmdletInfo(string Name, bool clear, string subscriptionDataFile)
+        public SelectAzureSubscriptionCmdletInfo(string subscriptionName, bool clear, string subscriptionDataFile)
         {
             cmdletName = "Select-AzureSubscription";
-            cmdletParams.Add(new CmdletParam("Name", Name));
+            cmdletParams.Add(new CmdletParam("SubscriptionName", subscriptionName));
             if (clear)
             {
                 cmdletParams.Add(new CmdletParam("Clear"));

diff --git a/...s.ServiceManagement.Test/FunctionalTests/IaasCmdletInfo/SetAzureSubscriptionCmdletInfo.cs b/...s.ServiceManagement.Test/FunctionalTests/IaasCmdletInfo/SetAzureSubscriptionCmdletInfo.cs
@@ -24,11 +24,11 @@ public SetAzureSubscriptionCmdletInfo(string defaultSubscriptionName)
             cmdletParams.Add(new CmdletParam("DefaultSubscription", defaultSubscriptionName));
         }
 
-        public SetAzureSubscriptionCmdletInfo(string Name, string CurrentStorageAccountName)
+        public SetAzureSubscriptionCmdletInfo(string subscriptionName, string currentStorageAccount)
         {
             cmdletName = Utilities.SetAzureSubscriptionCmdletName;
-            cmdletParams.Add(new CmdletParam("Name", Name));
-            cmdletParams.Add(new CmdletParam("CurrentStorageAccountName", CurrentStorageAccountName));
+            cmdletParams.Add(new CmdletParam("SubscriptionName", subscriptionName));
+            cmdletParams.Add(new CmdletParam("CurrentStorageAccount", currentStorageAccount));
         }
     }
 }
diff --git a/...ell/src/Commands.ServiceManagement.Test/FunctionalTests/PowershellCore/AddAzureVhdTest.cs b/...ell/src/Commands.ServiceManagement.Test/FunctionalTests/PowershellCore/AddAzureVhdTest.cs
@@ -64,7 +64,7 @@ public void Initialize()
             vmPowershellCmdlets = new ServiceManagementCmdletTestHelper();
             vmPowershellCmdlets.ImportAzurePublishSettingsFile();
             defaultAzureSubscription = vmPowershellCmdlets.SetDefaultAzureSubscription(Resource.DefaultSubscriptionName);
-            Assert.AreEqual(Resource.DefaultSubscriptionName, defaultAzureSubscription.Name);
+            Assert.AreEqual(Resource.DefaultSubscriptionName, defaultAzureSubscription.SubscriptionName);
             storageAccountKey = vmPowershellCmdlets.GetAzureStorageAccountKey(defaultAzureSubscription.CurrentStorageAccountName);
             Assert.AreEqual(defaultAzureSubscription.CurrentStorageAccountName, storageAccountKey.StorageAccountName);
 

diff --git a/.../src/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementCmdletTestHelper.cs b/.../src/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementCmdletTestHelper.cs
@@ -671,43 +671,43 @@ public WindowsAzureSubscription GetCurrentAzureSubscription()
             return null;
         }
 
-        public WindowsAzureSubscription SetAzureSubscription(string Name, string CurrentStorageAccountName)
+        public WindowsAzureSubscription SetAzureSubscription(string subscriptionName, string CurrentStorageAccountName)
         {
-            SetAzureSubscriptionCmdletInfo setAzureSubscriptionCmdlet = new SetAzureSubscriptionCmdletInfo(Name, CurrentStorageAccountName);
+            SetAzureSubscriptionCmdletInfo setAzureSubscriptionCmdlet = new SetAzureSubscriptionCmdletInfo(subscriptionName, CurrentStorageAccountName);
             WindowsAzurePowershellCmdlet azurePowershellCmdlet = new WindowsAzurePowershellCmdlet(setAzureSubscriptionCmdlet);
             azurePowershellCmdlet.Run();
 
             Collection<WindowsAzureSubscription> subscriptions = GetAzureSubscription();
             foreach (WindowsAzureSubscription subscription in subscriptions)
             {
-                if (subscription.Name == Name)
+                if (subscription.SubscriptionName == subscriptionName)
                 {
                     return subscription;
                 }
             }
             return null;
         }
 
-        public WindowsAzureSubscription SetDefaultAzureSubscription(string Name)
+        public WindowsAzureSubscription SetDefaultAzureSubscription(string subscriptionName)
         {
-            SelectAzureSubscriptionCmdletInfo selectAzureSubscriptionCmdlet = new SelectAzureSubscriptionCmdletInfo(Name);
+            SelectAzureSubscriptionCmdletInfo selectAzureSubscriptionCmdlet = new SelectAzureSubscriptionCmdletInfo(subscriptionName);
             WindowsAzurePowershellCmdlet azurePowershellCmdlet = new WindowsAzurePowershellCmdlet(selectAzureSubscriptionCmdlet);
             azurePowershellCmdlet.Run();
 
             Collection<WindowsAzureSubscription> subscriptions = GetAzureSubscription();
             foreach (WindowsAzureSubscription subscription in subscriptions)
             {
-                if (subscription.Name == Name)
+                if (subscription.SubscriptionName == subscriptionName)
                 {
                     return subscription;
                 }
             }
             return null;
         }
 
-        public bool SelectAzureSubscription(string Name, bool clear = false, string subscriptionDataFile = null)
+        public bool SelectAzureSubscription(string subscriptionName, bool clear = false, string subscriptionDataFile = null)
         {
-            return RunPSCmdletAndReturnFirst<bool>(new SelectAzureSubscriptionCmdletInfo(Name, clear, subscriptionDataFile));
+            return RunPSCmdletAndReturnFirst<bool>(new SelectAzureSubscriptionCmdletInfo(subscriptionName, clear, subscriptionDataFile));
         }
 
         #endregion