Skip to content

Commit c65fc0f

Browse files
authored
Merge pull request Azure#4711 from viananth/rename-tensub
Rename *-AzsTenantSubscription to *-AzsUserSubscription
2 parents 6189773 + 62c7e5e commit c65fc0f

File tree

8 files changed

+71
-49
lines changed

8 files changed

+71
-49
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -265,13 +265,13 @@
265265
<Compile Include="Microsoft.Subscriptions\ProviderRegistrations\GetResourceProviderRegistration.cs" />
266266
<Compile Include="Microsoft.Subscriptions\ProviderRegistrations\RemoveResourceProviderRegistration.cs" />
267267
<Compile Include="Microsoft.Subscriptions\ProviderRegistrations\SetResourceProviderRegistration.cs" />
268-
<Compile Include="Microsoft.Subscriptions\Subscriptions\GetTenantSubscription.cs" />
268+
<Compile Include="Microsoft.Subscriptions\Subscriptions\GetUserSubscription.cs" />
269269
<Compile Include="Microsoft.Subscriptions\Subscriptions\GetSubscription.cs" />
270-
<Compile Include="Microsoft.Subscriptions\Subscriptions\NewTenantSubscription.cs" />
270+
<Compile Include="Microsoft.Subscriptions\Subscriptions\NewUserSubscription.cs" />
271271
<Compile Include="Microsoft.Subscriptions\Subscriptions\NewSubscription.cs" />
272-
<Compile Include="Microsoft.Subscriptions\Subscriptions\RemoveTenantSubscription.cs" />
272+
<Compile Include="Microsoft.Subscriptions\Subscriptions\RemoveUserSubscription.cs" />
273273
<Compile Include="Microsoft.Subscriptions\Subscriptions\RemoveSubscription.cs" />
274-
<Compile Include="Microsoft.Subscriptions\Subscriptions\SetTenantSubscription.cs" />
274+
<Compile Include="Microsoft.Subscriptions\Subscriptions\SetUserSubscription.cs" />
275275
<Compile Include="Microsoft.Subscriptions\Subscriptions\SetSubscription.cs" />
276276
<Compile Include="Nouns.cs" />
277277
<Compile Include="Properties\AssemblyInfo.cs" />

src/StackAdmin/AzureStackAdmin/Commands.AzureStackAdmin/Microsoft.AzureStack.Commands.dll-help.xml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2115,7 +2115,7 @@
21152115
<command:command xmlns:maml="http://schemas.microsoft.com/maml/2004/10" xmlns:command="http://schemas.microsoft.com/maml/dev/command/2004/10" xmlns:dev="http://schemas.microsoft.com/maml/dev/2004/10">
21162116
<command:details>
21172117
<command:name>
2118-
Get-AzsTenantSubscription
2118+
Get-AzsUserSubscription
21192119
</command:name>
21202120
<maml:description>
21212121
<maml:para>
@@ -2126,7 +2126,7 @@
21262126
<maml:para></maml:para>
21272127
</maml:copyright>
21282128
<command:verb>Get</command:verb>
2129-
<command:noun>AzsTenantSubscription</command:noun>
2129+
<command:noun>AzsUserSubscription</command:noun>
21302130
<dev:version></dev:version>
21312131
</command:details>
21322132
<maml:description>
@@ -2135,7 +2135,7 @@
21352135
<!-- Cmdlet syntax section-->
21362136
<command:syntax>
21372137
<command:syntaxItem>
2138-
<maml:name>Get-AzsTenantSubscription</maml:name>
2138+
<maml:name>Get-AzsUserSubscription</maml:name>
21392139
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named">
21402140
<maml:name>InformationAction</maml:name>
21412141
<maml:description>
@@ -2304,7 +2304,7 @@
23042304
<maml:para>C:\PS&gt;</maml:para>
23052305
</maml:introduction>
23062306
<dev:code>
2307-
Get-AzsTenantSubscription -SubscriptionId &quot;2fff214f-8589-4d25-b468-dc99320724bc&quot;
2307+
Get-AzsUserSubscription -SubscriptionId &quot;2fff214f-8589-4d25-b468-dc99320724bc&quot;
23082308
</dev:code>
23092309
<dev:remarks>
23102310
<maml:para>Description</maml:para>
@@ -3747,16 +3747,16 @@
37473747
<command:command xmlns:maml="http://schemas.microsoft.com/maml/2004/10" xmlns:command="http://schemas.microsoft.com/maml/dev/command/2004/10" xmlns:dev="http://schemas.microsoft.com/maml/dev/2004/10">
37483748
<command:details>
37493749
<command:name>
3750-
New-AzsTenantSubscription
3750+
New-AzsUserSubscription
37513751
</command:name>
37523752
<maml:description>
3753-
<maml:para>The New-AzsTenantSubscription cmdlet creates a subscription as an admin for the specified tenant user</maml:para>
3753+
<maml:para>The New-AzsUserSubscription cmdlet creates a subscription as an admin for the specified tenant user</maml:para>
37543754
</maml:description>
37553755
<maml:copyright>
37563756
<maml:para></maml:para>
37573757
</maml:copyright>
37583758
<command:verb>New</command:verb>
3759-
<command:noun>AzsTenantSubscription</command:noun>
3759+
<command:noun>AzsUserSubscription</command:noun>
37603760
<dev:version></dev:version>
37613761
</command:details>
37623762
<maml:description>
@@ -3765,7 +3765,7 @@
37653765
<!-- Cmdlet syntax section-->
37663766
<command:syntax>
37673767
<command:syntaxItem>
3768-
<maml:name>New-AzsTenantSubscription</maml:name>
3768+
<maml:name>New-AzsUserSubscription</maml:name>
37693769
<command:parameter required="true" variableLength="false" globbing="false" pipelineInput="false" position="named">
37703770
<maml:name>OfferId</maml:name>
37713771
<maml:description>
@@ -3961,7 +3961,7 @@
39613961
<maml:para>C:\PS&gt;</maml:para>
39623962
</maml:introduction>
39633963
<dev:code>
3964-
New-AzsTenantSubscription -Owner &quot;[email protected]&quot; -OfferId $OfferId -DisplayName &quot;Displayname&quot;
3964+
New-AzsUserSubscription -Owner &quot;[email protected]&quot; -OfferId $OfferId -DisplayName &quot;Displayname&quot;
39653965
</dev:code>
39663966
<dev:remarks>
39673967
<maml:para>Description</maml:para>
@@ -5900,16 +5900,16 @@
59005900
<command:command xmlns:maml="http://schemas.microsoft.com/maml/2004/10" xmlns:command="http://schemas.microsoft.com/maml/dev/command/2004/10" xmlns:dev="http://schemas.microsoft.com/maml/dev/2004/10">
59015901
<command:details>
59025902
<command:name>
5903-
Remove-AzsTenantSubscription
5903+
Remove-AzsUserSubscription
59045904
</command:name>
59055905
<maml:description>
5906-
<maml:para>The cmdlet Remove-AzsTenantSubscription removes the specified subscription as an administrator</maml:para>
5906+
<maml:para>The cmdlet Remove-AzsUserSubscription removes the specified subscription as an administrator</maml:para>
59075907
</maml:description>
59085908
<maml:copyright>
59095909
<maml:para></maml:para>
59105910
</maml:copyright>
59115911
<command:verb>Remove</command:verb>
5912-
<command:noun>AzsTenantSubscription</command:noun>
5912+
<command:noun>AzsUserSubscription</command:noun>
59135913
<dev:version></dev:version>
59145914
</command:details>
59155915
<maml:description>
@@ -5918,7 +5918,7 @@
59185918
<!-- Cmdlet syntax section-->
59195919
<command:syntax>
59205920
<command:syntaxItem>
5921-
<maml:name>Remove-AzsTenantSubscription</maml:name>
5921+
<maml:name>Remove-AzsUserSubscription</maml:name>
59225922
<command:parameter required="true" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="named" aliases="TargetSubscriptionId">
59235923
<maml:name>SubscriptionID</maml:name>
59245924
<maml:description>
@@ -6094,7 +6094,7 @@
60946094
<maml:para>C:\PS&gt;</maml:para>
60956095
</maml:introduction>
60966096
<dev:code>
6097-
Remove-AzsTenantSubscription -SubscriptionId &quot;83a3cff6-b856-4db1-8d1b-86386ff9d515&quot;
6097+
Remove-AzsUserSubscription -SubscriptionId &quot;83a3cff6-b856-4db1-8d1b-86386ff9d515&quot;
60986098
</dev:code>
60996099
<dev:remarks>
61006100
<maml:para>Description</maml:para>
@@ -6142,7 +6142,7 @@
61426142
<!-- Cmdlet syntax section-->
61436143
<command:syntax>
61446144
<command:syntaxItem>
6145-
<maml:name>Remove-AzsTenantSubscription</maml:name>
6145+
<maml:name>Remove-AzsUserSubscription</maml:name>
61466146
<command:parameter required="true" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="named" aliases="TargetSubscriptionId">
61476147
<maml:name>SubscriptionID</maml:name>
61486148
<maml:description>
@@ -7060,25 +7060,25 @@
70607060
<command:command xmlns:maml="http://schemas.microsoft.com/maml/2004/10" xmlns:command="http://schemas.microsoft.com/maml/dev/command/2004/10" xmlns:dev="http://schemas.microsoft.com/maml/dev/2004/10">
70617061
<command:details>
70627062
<command:name>
7063-
Set-AzsTenantSubscription
7063+
Set-AzsUserSubscription
70647064
</command:name>
70657065
<maml:description>
7066-
<maml:para>The Set-AzsTenantSubscription updates any tenant user subscription as a service administrator</maml:para>
7066+
<maml:para>The Set-AzsUserSubscription updates any tenant user subscription as a service administrator</maml:para>
70677067
</maml:description>
70687068
<maml:copyright>
70697069
<maml:para></maml:para>
70707070
</maml:copyright>
70717071
<command:verb>Set</command:verb>
7072-
<command:noun>AzsTenantSubscription</command:noun>
7072+
<command:noun>AzsUserSubscription</command:noun>
70737073
<dev:version></dev:version>
70747074
</command:details>
70757075
<maml:description>
7076-
<maml:para>The Set-AzsTenantSubscription updates any tenant user subscription as a service administrator</maml:para>
7076+
<maml:para>The Set-AzsUserSubscription updates any tenant user subscription as a service administrator</maml:para>
70777077
</maml:description>
70787078
<!-- Cmdlet syntax section-->
70797079
<command:syntax>
70807080
<command:syntaxItem>
7081-
<maml:name>Set-AzsTenantSubscription</maml:name>
7081+
<maml:name>Set-AzsUserSubscription</maml:name>
70827082
<command:parameter required="true" variableLength="false" globbing="false" pipelineInput="false" position="named">
70837083
<maml:name>Subscription</maml:name>
70847084
<maml:description>
@@ -8010,16 +8010,16 @@
80108010
<command:command xmlns:maml="http://schemas.microsoft.com/maml/2004/10" xmlns:command="http://schemas.microsoft.com/maml/dev/command/2004/10" xmlns:dev="http://schemas.microsoft.com/maml/dev/2004/10">
80118011
<command:details>
80128012
<command:name>
8013-
Set-AzsTenantSubscription
8013+
Set-AzsUserSubscription
80148014
</command:name>
80158015
<maml:description>
8016-
<maml:para>The Set-AzsTenantSubscription cmdlet updates the current logged user's subscription details. This cmdlet will be deprecated in a future release</maml:para>
8016+
<maml:para>The Set-AzsUserSubscription cmdlet updates the current logged user's subscription details. This cmdlet will be deprecated in a future release</maml:para>
80178017
</maml:description>
80188018
<maml:copyright>
80198019
<maml:para></maml:para>
80208020
</maml:copyright>
80218021
<command:verb>Set</command:verb>
8022-
<command:noun>AzsTenantSubscription</command:noun>
8022+
<command:noun>AzsUserSubscription</command:noun>
80238023
<dev:version></dev:version>
80248024
</command:details>
80258025
<maml:description>
@@ -8028,7 +8028,7 @@
80288028
<!-- Cmdlet syntax section-->
80298029
<command:syntax>
80308030
<command:syntaxItem>
8031-
<maml:name>Set-AzsTenantSubscription</maml:name>
8031+
<maml:name>Set-AzsUserSubscription</maml:name>
80328032
<command:parameter required="true" variableLength="false" globbing="false" pipelineInput="false" position="named">
80338033
<maml:name>Subscription</maml:name>
80348034
<maml:description>
Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ namespace Microsoft.AzureStack.Commands
2323
/// <summary>
2424
/// Get Subscription Cmdlet
2525
/// </summary>
26-
[Cmdlet(VerbsCommon.Get, Nouns.TenantSubscription)]
26+
[Cmdlet(VerbsCommon.Get, Nouns.UserSubscription)]
2727
[OutputType(typeof(SubscriptionDefinition))]
28-
[Alias("Get-AzureRmManagedSubscription")]
29-
public class GetTenantSubscription : AdminApiCmdlet
28+
[Alias("Get-AzureRmManagedSubscription", "Get-AzsTenantSubscription")]
29+
public class GetUserSubscription : AdminApiCmdlet
3030
{
3131
/// <summary>
3232
/// Gets or sets the subscription id.
@@ -42,7 +42,12 @@ protected override void ExecuteCore()
4242
{
4343
if (this.MyInvocation.InvocationName.Equals("Get-AzureRmManagedSubscription", StringComparison.OrdinalIgnoreCase))
4444
{
45-
this.WriteWarning("Alias Get-AzureRmManagedSubscription will be deprecated in a future release. Please use the cmdlet name Get-AzsTenantSubscription instead");
45+
this.WriteWarning("Alias Get-AzureRmManagedSubscription will be deprecated in a future release. Please use the cmdlet name Get-AzsUserSubscription instead");
46+
}
47+
48+
if (this.MyInvocation.InvocationName.Equals("Get-AzsTenantSubscription", StringComparison.OrdinalIgnoreCase))
49+
{
50+
this.WriteWarning("Alias Get-AzsTenantSubscription will be deprecated in a future release. Please use the cmdlet name Get-AzsUserSubscription instead");
4651
}
4752

4853
using (var client = this.GetAzureStackClient())

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ static NewSubscription()
6767
/// </summary>
6868
protected SubscriptionDefinition GetSubscriptionDefinition()
6969
{
70-
if (NewTenantSubscription.SubscriptionIds.Count != 0)
70+
if (NewUserSubscription.SubscriptionIds.Count != 0)
7171
{
7272
this.SubscriptionId = NewSubscription.SubscriptionIds.Dequeue().ToString();
7373
}
Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ namespace Microsoft.AzureStack.Commands
2424
/// <summary>
2525
/// New Managed Subscription Cmdlet
2626
/// </summary>
27-
[Cmdlet(VerbsCommon.New, Nouns.TenantSubscription, SupportsShouldProcess = true)]
27+
[Cmdlet(VerbsCommon.New, Nouns.UserSubscription, SupportsShouldProcess = true)]
2828
[OutputType(typeof(SubscriptionDefinition))]
29-
[Alias("New-AzureRmManagedSubscription")]
30-
public class NewTenantSubscription : AdminApiCmdlet
29+
[Alias("New-AzureRmManagedSubscription", "New-AzsTenantSubscription")]
30+
public class NewUserSubscription : AdminApiCmdlet
3131
{
3232
/// <summary>
3333
/// Gets or sets the subscription owner.
@@ -73,7 +73,7 @@ public class NewTenantSubscription : AdminApiCmdlet
7373
/// </summary>
7474
public static Queue<Guid> SubscriptionIds { get; set; }
7575

76-
static NewTenantSubscription()
76+
static NewUserSubscription()
7777
{
7878
SubscriptionIds = new Queue<Guid>();
7979
}
@@ -83,9 +83,9 @@ static NewTenantSubscription()
8383
/// </summary>
8484
protected AdminSubscriptionDefinition GetSubscriptionDefinition()
8585
{
86-
if (NewTenantSubscription.SubscriptionIds.Count != 0)
86+
if (NewUserSubscription.SubscriptionIds.Count != 0)
8787
{
88-
this.SubscriptionId = NewTenantSubscription.SubscriptionIds.Dequeue().ToString();
88+
this.SubscriptionId = NewUserSubscription.SubscriptionIds.Dequeue().ToString();
8989
}
9090
else if (string.IsNullOrEmpty(this.SubscriptionId))
9191
{
@@ -110,7 +110,12 @@ protected override void ExecuteCore()
110110
{
111111
if (this.MyInvocation.InvocationName.Equals("New-AzureRmManagedSubscription", StringComparison.OrdinalIgnoreCase))
112112
{
113-
this.WriteWarning("Alias New-AzureRmManagedSubscription will be deprecated in a future release. Please use the cmdlet name New-AzsTenantSubscription instead");
113+
this.WriteWarning("Alias New-AzureRmManagedSubscription will be deprecated in a future release. Please use the cmdlet name New-AzsUserSubscription instead");
114+
}
115+
116+
if (this.MyInvocation.InvocationName.Equals("New-AzsTenantSubscription", StringComparison.OrdinalIgnoreCase))
117+
{
118+
this.WriteWarning("Alias New-AzsTenantSubscription will be deprecated in a future release. Please use the cmdlet name New-AzsUserSubscription instead");
114119
}
115120

116121
if (ShouldProcess(this.SubscriptionId, VerbsCommon.New))
Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ namespace Microsoft.AzureStack.Commands
1616
{
1717
using System;
1818
using System.Management.Automation;
19+
using System.Runtime.InteropServices.ComTypes;
1920
using Microsoft.Azure;
2021
using Microsoft.WindowsAzure.Commands.Common;
2122
using Microsoft.AzureStack.Management;
@@ -24,10 +25,10 @@ namespace Microsoft.AzureStack.Commands
2425
/// <summary>
2526
/// Subscription Cmdlet
2627
/// </summary>
27-
[Cmdlet(VerbsCommon.Remove, Nouns.TenantSubscription, SupportsShouldProcess = true)]
28+
[Cmdlet(VerbsCommon.Remove, Nouns.UserSubscription, SupportsShouldProcess = true)]
2829
[OutputType(typeof(AzureOperationResponse))]
29-
[Alias("Remove-AzureRmManagedSubscription")]
30-
public class RemoveTenantSubscription : AdminApiCmdlet
30+
[Alias("Remove-AzureRmManagedSubscription", "Remove-AzsTenantSubscription")]
31+
public class RemoveUserSubscription : AdminApiCmdlet
3132
{
3233
/// <summary>
3334
/// Gets or sets the subscription ID to be deleted.
@@ -44,7 +45,12 @@ protected override void ExecuteCore()
4445
{
4546
if (this.MyInvocation.InvocationName.Equals("Remove-AzureRmManagedSubscription", StringComparison.OrdinalIgnoreCase))
4647
{
47-
this.WriteWarning("Alias Remove-AzureRmManagedSubscription will be deprecated in a future release. Please use the cmdlet name Remove-AzsTenantSubscription instead");
48+
this.WriteWarning("Alias Remove-AzureRmManagedSubscription will be deprecated in a future release. Please use the cmdlet name Remove-AzsUserSubscription instead");
49+
}
50+
51+
if (this.MyInvocation.InvocationName.Equals("Remove-AzsTenantSubscription", StringComparison.OrdinalIgnoreCase))
52+
{
53+
this.WriteWarning("Alias Remove-AzsTenantSubscription will be deprecated in a future release. Please use the cmdlet name Remove-AzsUserSubscription instead");
4854
}
4955

5056
if (ShouldProcess(this.SubscriptionId.ToString(), VerbsCommon.Remove))
Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,18 @@ namespace Microsoft.AzureStack.Commands
1616
{
1717
using System;
1818
using System.Management.Automation;
19+
using System.Runtime.InteropServices.ComTypes;
1920
using Microsoft.WindowsAzure.Commands.Common;
2021
using Microsoft.AzureStack.Management;
2122
using Microsoft.AzureStack.Management.Models;
2223

2324
/// <summary>
2425
/// Set Managed Subscription Cmdlet
2526
/// </summary>
26-
[Cmdlet(VerbsCommon.Set, Nouns.TenantSubscription, SupportsShouldProcess = true)]
27+
[Cmdlet(VerbsCommon.Set, Nouns.UserSubscription, SupportsShouldProcess = true)]
2728
[OutputType(typeof(SubscriptionDefinition))]
28-
[Alias("Set-AzureRmManagedSubscription")]
29-
public class SetTenantSubscription : AdminApiCmdlet
29+
[Alias("Set-AzureRmManagedSubscription", "Set-AzsTenantSubscription")]
30+
public class SetUserSubscription : AdminApiCmdlet
3031
{
3132
/// <summary>
3233
/// Gets or sets the subscription to be updated.
@@ -42,7 +43,12 @@ protected override void ExecuteCore()
4243
{
4344
if (this.MyInvocation.InvocationName.Equals("Set-AzureRmManagedSubscription", StringComparison.OrdinalIgnoreCase))
4445
{
45-
this.WriteWarning("Alias Set-AzureRmManagedSubscription will be deprecated in a future release. Please use the cmdlet name Set-AzsTenantSubscription instead");
46+
this.WriteWarning("Alias Set-AzureRmManagedSubscription will be deprecated in a future release. Please use the cmdlet name Set-AzsUserSubscription instead");
47+
}
48+
49+
if (this.MyInvocation.InvocationName.Equals("Set-AzsTenantSubscription", StringComparison.OrdinalIgnoreCase))
50+
{
51+
this.WriteWarning("Alias Set-AzsTenantSubscription will be deprecated in a future release. Please use the cmdlet name Set-AzsUserSubscription instead");
4652
}
4753

4854
if (ShouldProcess(this.Subscription.SubscriptionId, VerbsCommon.Set))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ internal static class Nouns
4242
/// <summary>
4343
/// The noun for operations on Subscriptions as an administrator.
4444
/// </summary>
45-
public const string TenantSubscription = Prefix + "TenantSubscription";
45+
public const string UserSubscription = Prefix + "UserSubscription";
4646

4747
/// <summary>
4848
/// The noun for operations on Offers.

0 commit comments

Comments
 (0)