updates based on PR feedback

Author: viananth

src/StackAdmin/AzureStackAdmin/Commands.AzureStackAdmin/Commands.AzureStackAdmin.csproj

@@ -265,13 +265,13 @@
     <Compile Include="Microsoft.Subscriptions\ProviderRegistrations\GetResourceProviderRegistration.cs" />
     <Compile Include="Microsoft.Subscriptions\ProviderRegistrations\RemoveResourceProviderRegistration.cs" />
     <Compile Include="Microsoft.Subscriptions\ProviderRegistrations\SetResourceProviderRegistration.cs" />
-    <Compile Include="Microsoft.Subscriptions\Subscriptions\GetTenantSubscription.cs" />
+    <Compile Include="Microsoft.Subscriptions\Subscriptions\GetUserSubscription.cs" />
     <Compile Include="Microsoft.Subscriptions\Subscriptions\GetSubscription.cs" />
-    <Compile Include="Microsoft.Subscriptions\Subscriptions\NewTenantSubscription.cs" />
+    <Compile Include="Microsoft.Subscriptions\Subscriptions\NewUserSubscription.cs" />
     <Compile Include="Microsoft.Subscriptions\Subscriptions\NewSubscription.cs" />
-    <Compile Include="Microsoft.Subscriptions\Subscriptions\RemoveTenantSubscription.cs" />
+    <Compile Include="Microsoft.Subscriptions\Subscriptions\RemoveUserSubscription.cs" />
     <Compile Include="Microsoft.Subscriptions\Subscriptions\RemoveSubscription.cs" />
-    <Compile Include="Microsoft.Subscriptions\Subscriptions\SetTenantSubscription.cs" />
+    <Compile Include="Microsoft.Subscriptions\Subscriptions\SetUserSubscription.cs" />
     <Compile Include="Microsoft.Subscriptions\Subscriptions\SetSubscription.cs" />
     <Compile Include="Nouns.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

src/StackAdmin/AzureStackAdmin/Commands.AzureStackAdmin/Microsoft.Subscriptions/Subscriptions/GetTenantSubscription.cs renamed to src/StackAdmin/AzureStackAdmin/Commands.AzureStackAdmin/Microsoft.Subscriptions/Subscriptions/GetUserSubscription.cs

@@ -23,10 +23,10 @@ namespace Microsoft.AzureStack.Commands
     /// <summary>
     /// Get Subscription Cmdlet
     /// </summary>
-    [Cmdlet(VerbsCommon.Get, Nouns.TenantSubscription)]
+    [Cmdlet(VerbsCommon.Get, Nouns.UserSubscription)]
     [OutputType(typeof(SubscriptionDefinition))]
     [Alias("Get-AzureRmManagedSubscription", "Get-AzsTenantSubscription")]
-    public class GetTenantSubscription : AdminApiCmdlet 
+    public class GetUserSubscription : AdminApiCmdlet 
     {
         /// <summary>
         /// Gets or sets the subscription id.

src/StackAdmin/AzureStackAdmin/Commands.AzureStackAdmin/Microsoft.Subscriptions/Subscriptions/NewSubscription.cs

@@ -67,7 +67,7 @@ static NewSubscription()
         /// </summary>
         protected SubscriptionDefinition GetSubscriptionDefinition()
         {
-            if (NewTenantSubscription.SubscriptionIds.Count != 0)
+            if (NewUserSubscription.SubscriptionIds.Count != 0)
             {
                 this.SubscriptionId = NewSubscription.SubscriptionIds.Dequeue().ToString();
             }

src/StackAdmin/AzureStackAdmin/Commands.AzureStackAdmin/Microsoft.Subscriptions/Subscriptions/NewTenantSubscription.cs renamed to src/StackAdmin/AzureStackAdmin/Commands.AzureStackAdmin/Microsoft.Subscriptions/Subscriptions/NewUserSubscription.cs

@@ -24,10 +24,10 @@ namespace Microsoft.AzureStack.Commands
     /// <summary>
     /// New Managed Subscription Cmdlet
     /// </summary>
-    [Cmdlet(VerbsCommon.New, Nouns.TenantSubscription, SupportsShouldProcess = true)]
+    [Cmdlet(VerbsCommon.New, Nouns.UserSubscription, SupportsShouldProcess = true)]
     [OutputType(typeof(SubscriptionDefinition))]
     [Alias("New-AzureRmManagedSubscription", "New-AzsTenantSubscription")]
-    public class NewTenantSubscription : AdminApiCmdlet
+    public class NewUserSubscription : AdminApiCmdlet
     {
         /// <summary>
         /// Gets or sets the subscription owner.
@@ -73,7 +73,7 @@ public class NewTenantSubscription : AdminApiCmdlet
         /// </summary>
         public static Queue<Guid> SubscriptionIds { get; set; }
 
-        static NewTenantSubscription()
+        static NewUserSubscription()
         {
             SubscriptionIds = new Queue<Guid>();
         }
@@ -83,9 +83,9 @@ static NewTenantSubscription()
         /// </summary>
         protected AdminSubscriptionDefinition GetSubscriptionDefinition()
         {
-            if (NewTenantSubscription.SubscriptionIds.Count != 0)
+            if (NewUserSubscription.SubscriptionIds.Count != 0)
             {
-                this.SubscriptionId = NewTenantSubscription.SubscriptionIds.Dequeue().ToString();
+                this.SubscriptionId = NewUserSubscription.SubscriptionIds.Dequeue().ToString();
             }
             else if (string.IsNullOrEmpty(this.SubscriptionId))
             {

src/StackAdmin/AzureStackAdmin/Commands.AzureStackAdmin/Microsoft.Subscriptions/Subscriptions/RemoveTenantSubscription.cs renamed to src/StackAdmin/AzureStackAdmin/Commands.AzureStackAdmin/Microsoft.Subscriptions/Subscriptions/RemoveUserSubscription.cs

@@ -25,10 +25,10 @@ namespace Microsoft.AzureStack.Commands
     /// <summary>
     /// Subscription Cmdlet
     /// </summary>
-    [Cmdlet(VerbsCommon.Remove, Nouns.TenantSubscription, SupportsShouldProcess = true)]
+    [Cmdlet(VerbsCommon.Remove, Nouns.UserSubscription, SupportsShouldProcess = true)]
     [OutputType(typeof(AzureOperationResponse))]
     [Alias("Remove-AzureRmManagedSubscription", "Remove-AzsTenantSubscription")]
-    public class RemoveTenantSubscription : AdminApiCmdlet
+    public class RemoveUserSubscription : AdminApiCmdlet
     {
         /// <summary>
         /// Gets or sets the subscription ID to be deleted.

src/StackAdmin/AzureStackAdmin/Commands.AzureStackAdmin/Microsoft.Subscriptions/Subscriptions/SetTenantSubscription.cs renamed to src/StackAdmin/AzureStackAdmin/Commands.AzureStackAdmin/Microsoft.Subscriptions/Subscriptions/SetUserSubscription.cs

@@ -24,10 +24,10 @@ namespace Microsoft.AzureStack.Commands
     /// <summary>
     /// Set Managed Subscription Cmdlet
     /// </summary>
-    [Cmdlet(VerbsCommon.Set, Nouns.TenantSubscription, SupportsShouldProcess = true)]
+    [Cmdlet(VerbsCommon.Set, Nouns.UserSubscription, SupportsShouldProcess = true)]
     [OutputType(typeof(SubscriptionDefinition))]
     [Alias("Set-AzureRmManagedSubscription", "Set-AzsTenantSubscription")]
-    public class SetTenantSubscription : AdminApiCmdlet
+    public class SetUserSubscription : AdminApiCmdlet
     {
         /// <summary>
         /// Gets or sets the subscription to be updated.

src/StackAdmin/AzureStackAdmin/Commands.AzureStackAdmin/Nouns.cs

@@ -42,7 +42,7 @@ internal static class Nouns
         /// <summary>
         /// The noun for operations on Subscriptions as an administrator.
         /// </summary>
-        public const string TenantSubscription = Prefix + "UserSubscription";
+        public const string UserSubscription = Prefix + "UserSubscription";
 
         /// <summary>
         /// The noun for operations on Offers.