Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Subscription RP commands #5453

Closed
wants to merge 16 commits into from
Closed

Add Subscription RP commands #5453

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
bfeb127
Add Subscription RP.
wilcobmsft Jan 31, 2018
72eff01
Add Subscription RP to setup.
wilcobmsft Feb 1, 2018
76dba43
Add missing completer.
wilcobmsft Feb 1, 2018
9ff171d
1. Fix custom create command.
wilcobmsft Feb 1, 2018
b8b37c4
Fix solution paths.
wilcobmsft Feb 2, 2018
8072792
Undo unnecessary change.
wilcobmsft Feb 2, 2018
4e61167
Style fix
wilcobmsft Feb 2, 2018
e05d0dc
Address PR feedback.
wilcobmsft Feb 2, 2018
0647fb6
Move subscriptiondefinition under account group.
wilcobmsft Feb 2, 2018
ae8572e
Update help.
wilcobmsft Feb 2, 2018
3b9e493
Fix how we handle subscription_definition_name param.
wilcobmsft Feb 2, 2018
2ab09b1
Style fix
wilcobmsft Feb 2, 2018
f84f839
Style fix
wilcobmsft Feb 2, 2018
f025c4a
Style fix
wilcobmsft Feb 2, 2018
356c646
Fix help
wilcobmsft Feb 3, 2018
d718b4b
Revert change
wilcobmsft Feb 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions azure-cli2017.pyproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<LaunchProvider>Standard Python launcher</LaunchProvider>
<InterpreterId>MSBuild|{54f4b6dc-0859-46dc-99bb-b275c9d0aca3}|$(MSBuildProjectFullPath)</InterpreterId>
<EnableNativeCodeDebugging>False</EnableNativeCodeDebugging>
<CommandLineArguments></CommandLineArguments>
<CommandLineArguments>interactive</CommandLineArguments>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be reverted.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

<InterpreterArguments>
</InterpreterArguments>
</PropertyGroup>
Expand Down Expand Up @@ -605,7 +605,6 @@
<Compile Include="command_modules\azure-cli-subscription\azure\cli\command_modules\subscription\tests\__init__.py" />
<Compile Include="command_modules\azure-cli-subscription\azure\cli\command_modules\subscription\_client_factory.py" />
<Compile Include="command_modules\azure-cli-subscription\azure\cli\command_modules\subscription\_exception_handler.py" />
<Compile Include="command_modules\azure-cli-subscription\azure\cli\command_modules\subscription\_completers.py" />
<Compile Include="command_modules\azure-cli-subscription\azure\cli\command_modules\subscription\_help.py" />
<Compile Include="command_modules\azure-cli-subscription\azure\cli\command_modules\subscription\_params.py" />
<Compile Include="command_modules\azure-cli-subscription\azure\cli\command_modules\subscription\__init__.py" />
Expand Down
11 changes: 0 additions & 11 deletions ...mand_modules/azure-cli-subscription/azure/cli/command_modules/subscription/_completers.py
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions src/command_modules/azure-cli-subscription/azure/cli/command_modules/subscription/_help.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,8 @@
type: group
short-summary: Manage Azure Subscription Definitions.
"""

helps['subscriptiondefinition create'] = """
type: group
short-summary: Create a subscription definition.
"""
10 changes: 5 additions & 5 deletions src/command_modules/azure-cli-subscription/azure/cli/command_modules/subscription/_params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
# Licensed under the MIT License. See License.txt in the project root for license information.
# --------------------------------------------------------------------------------------------

from azure.cli.command_modules.subscription._completers import get_offer_type_completion_list
from azure.cli.core.commands.parameters import get_enum_type


# pylint: disable=line-too-long
def load_arguments(self, _):
with self.argument_context('subscriptiondefinition show') as c:
c.argument('subscription_definition_name', options_list=['--name', '-n'], required=False, help='Name of the subscription definition to show.')
c.argument('subscription_definition_name', options_list=['--name', '-n'], help='Name of the subscription definition.')

with self.argument_context('subscriptiondefinition create') as c:
c.argument('name', options_list=['--name', '-n'], required=True, help='Name of the subscription definition.')
c.argument('offer_type', options_list=['--offer_type', '-ot'], required=True, help='The subscription\'s offer type.', completer=get_offer_type_completion_list)
c.argument('subscription_display_name', options_list=['--subscription_display_name', '-sdn'], required=False, help='The subscription display name of the subscription definition.')
c.argument('name', options_list=['--name', '-n'], help='Name of the subscription definition.')
c.argument('offer_type', required=True, help='The subscription\'s offer type.', arg_type=get_enum_type(['MS-AZR-0017P', 'MS-AZR-0148P']))
c.argument('subscription_display_name', options_list=['--subscription-display-name', '-sdn'], help='The subscription display name of the subscription definition.')
1 change: 0 additions & 1 deletion src/command_modules/azure-cli-subscription/azure/cli/command_modules/subscription/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@


def cli_subscription_create_subscription_definition(client, name, offer_type, subscription_display_name=None):
"""Create a subscription definition."""
new_def = SubscriptionDefinition(
subscription_display_name=subscription_display_name if subscription_display_name else name,
offer_type=offer_type)
Expand Down