Merge pull request #1155 from hovsepm/TenantId

[#106171538] Changed Tenant to TenantId in cmdletst

Author: Hovsep

src/ResourceManager/Profile/Commands.Profile.Test/LoginCmdletTests.cs

@@ -50,7 +50,7 @@ public void LoginWithSubscriptionAndTenant()
             // Setup
             cmdlt.CommandRuntime = commandRuntimeMock;
             cmdlt.SubscriptionId = "2c224e7e-3ef5-431d-a57b-e71f4662e3a6";
-            cmdlt.Tenant = "72f988bf-86f1-41af-91ab-2d7cd011db47";
+            cmdlt.TenantId = "72f988bf-86f1-41af-91ab-2d7cd011db47";
 
             // Act
             cmdlt.InvokeBeginProcessing();
@@ -69,7 +69,7 @@ public void LoginWithInvalidSubscriptionAndTenantThrowsCloudException()
             // Setup
             cmdlt.CommandRuntime = commandRuntimeMock;
             cmdlt.SubscriptionId = "2c224e7e-3ef5-431d-a57b-e71f4662e3a5";
-            cmdlt.Tenant = "72f988bf-86f1-41af-91ab-2d7cd011db47";
+            cmdlt.TenantId = "72f988bf-86f1-41af-91ab-2d7cd011db47";
 
             // Act
             cmdlt.InvokeBeginProcessing();
@@ -119,7 +119,7 @@ public void LoginWithNoSubscriptionAndTenant()
             var cmdlt = new AddAzureRMAccountCommand();
             // Setup
             cmdlt.CommandRuntime = commandRuntimeMock;
-            cmdlt.Tenant = "72f988bf-86f1-41af-91ab-2d7cd011db47";
+            cmdlt.TenantId = "72f988bf-86f1-41af-91ab-2d7cd011db47";
 
             // Act
             cmdlt.InvokeBeginProcessing();
@@ -137,7 +137,7 @@ public void LoginWithSubscriptionname()
             var cmdlt = new AddAzureRMAccountCommand();
             // Setup
             cmdlt.CommandRuntime = commandRuntimeMock;
-            cmdlt.Tenant = "72f988bf-86f1-41af-91ab-2d7cd011db47";
+            cmdlt.TenantId = "72f988bf-86f1-41af-91ab-2d7cd011db47";
             cmdlt.SubscriptionName = "Node CLI Test";
 
             // Act
@@ -156,7 +156,7 @@ public void LoginWithBothSubscriptionIdAndNameThrowsCloudException()
             var cmdlt = new AddAzureRMAccountCommand();
             // Setup
             cmdlt.CommandRuntime = commandRuntimeMock;
-            cmdlt.Tenant = "72f988bf-86f1-41af-91ab-2d7cd011db47";
+            cmdlt.TenantId = "72f988bf-86f1-41af-91ab-2d7cd011db47";
             cmdlt.SubscriptionName = "Node CLI Test";
             cmdlt.SubscriptionId = "2c224e7e-3ef5-431d-a57b-e71f4662e3a6";
 

src/ResourceManager/Profile/Commands.Profile.Test/TenantCmdletTests.cs

@@ -49,7 +49,7 @@ public void GetTenantWithTenantParameter()
             var cmdlt = new GetAzureRMTenantCommand();
             // Setup
             cmdlt.CommandRuntime = commandRuntimeMock;
-            cmdlt.Tenant = "72f988bf-86f1-41af-91ab-2d7cd011db47";
+            cmdlt.TenantId = "72f988bf-86f1-41af-91ab-2d7cd011db47";
 
             // Act
             Login("2c224e7e-3ef5-431d-a57b-e71f4662e3a6", null);
@@ -69,7 +69,7 @@ public void GetTenantWithDomainParameter()
             var cmdlt = new GetAzureRMTenantCommand();
             // Setup
             cmdlt.CommandRuntime = commandRuntimeMock;
-            cmdlt.Tenant = "microsoft.com";
+            cmdlt.TenantId = "microsoft.com";
 
             // Act
             Login("2c224e7e-3ef5-431d-a57b-e71f4662e3a6", null);
@@ -107,7 +107,7 @@ private void Login(string subscriptionId, string tenantId)
             // Setup
             cmdlt.CommandRuntime = commandRuntimeMock;
             cmdlt.SubscriptionId = subscriptionId;
-            cmdlt.Tenant = tenantId;
+            cmdlt.TenantId = tenantId;
 
             // Act
             cmdlt.InvokeBeginProcessing();

src/ResourceManager/Profile/Commands.Profile/Account/AddAzureRmAccount.cs

@@ -48,8 +48,9 @@ public class AddAzureRMAccountCommand : AzureRMCmdlet , IModuleAssemblyInitializ
         [Parameter(ParameterSetName = "User", Mandatory = false, HelpMessage = "Optional tenant name or ID")]
         [Parameter(ParameterSetName = "ServicePrincipal", Mandatory = true, HelpMessage = "TenantId name or ID")]
         [Parameter(ParameterSetName = "AccessToken", Mandatory = false, HelpMessage = "TenantId name or ID")]
+        [Alias("Tenant")]
         [ValidateNotNullOrEmpty]
-        public string Tenant { get; set; }
+        public string TenantId { get; set; }
 
         [Parameter(ParameterSetName = "AccessToken", Mandatory = true, HelpMessage = "AccessToken")]
         [ValidateNotNullOrEmpty]
@@ -126,9 +127,9 @@ protected override void ProcessRecord()
                 password = Credential.Password;
             }
 
-            if (!string.IsNullOrEmpty(Tenant))
+            if (!string.IsNullOrEmpty(TenantId))
             {
-                azureAccount.SetProperty(AzureAccount.Property.Tenants, new[] { Tenant });
+                azureAccount.SetProperty(AzureAccount.Property.Tenants, new[] { TenantId });
             }
 
             if( AzureRmProfileProvider.Instance.Profile == null)
@@ -138,7 +139,7 @@ protected override void ProcessRecord()
 
             var profileClient = new RMProfileClient(AzureRmProfileProvider.Instance.Profile);
 
-            WriteObject((PSAzureProfile)profileClient.Login(azureAccount, Environment, Tenant, SubscriptionId, 
+            WriteObject((PSAzureProfile)profileClient.Login(azureAccount, Environment, TenantId, SubscriptionId, 
                 SubscriptionName, password));
         }