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.

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

{RDBMS} Updating tests, help, params file #12776

Merged
merged 4 commits into from
Apr 1, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 24 additions & 6 deletions src/azure-cli/azure/cli/command_modules/rdbms/_help.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,15 @@
short-summary: Create a server.
examples:
- name: Create a MariaDB server in North Europe with sku GP_Gen5_2 (General Purpose, Gen 5 hardware, 2 vCores).
text: az mariadb server create -l northeurope -g testgroup -n testsvr -u username -p password \\ --sku-name GP_Gen5_2
text: |
az mariadb server create -l northeurope -g testgroup -n testsvr -u username -p password \\
--sku-name GP_Gen5_2
- name: Create a MariaDB server with all paramaters set.
text: az mariadb server create -l northeurope -g testgroup -n testsvr -u username -p password \\ --sku-name B_Gen5_1 --ssl-enforcement Disabled \\ --backup-retention 10 --geo-redundant-backup Enabled --storage-size 51200 --tags "key=value" --version {server-version}
text: |
az mariadb server create -l northeurope -g testgroup -n testsvr -u username -p password \\
--sku-name B_Gen5_1 --ssl-enforcement Disabled --public-network-access Disabled \\
--backup-retention 10 --geo-redundant-backup Enabled --storage-size 51200 \\
--tags "key=value" --version 10.2
"""

helps['mariadb server delete'] = """
Expand Down Expand Up @@ -431,9 +437,15 @@
short-summary: Create a server.
examples:
- name: Create a MySQL server in North Europe with sku GP_Gen5_2 (General Purpose, Gen 5 hardware, 2 vCores).
text: az mysql server create -l northeurope -g testgroup -n testsvr -u username -p password \\ --sku-name GP_Gen5_2
text: |
az mysql server create -l northeurope -g testgroup -n testsvr -u username -p password \\
--sku-name GP_Gen5_2
- name: Create a MySQL server with all paramaters set.
text: az mysql server create -l northeurope -g testgroup -n testsvr -u username -p password \\ --sku-name B_Gen5_1 --ssl-enforcement Disabled --public-network-access Disabled \\ --backup-retention 10 --geo-redundant-backup Enabled --storage-size 51200 --tags "key=value" --version {server-version}
text: |
az mysql server create -l northeurope -g testgroup -n testsvr -u username -p password \\
--sku-name B_Gen5_1 --ssl-enforcement Disabled --public-network-access Disabled \\
--backup-retention 10 --geo-redundant-backup Enabled --storage-size 51200 \\
--tags "key=value" --version 5.7
"""

helps['mysql server delete'] = """
Expand Down Expand Up @@ -796,9 +808,15 @@
short-summary: Create a server.
examples:
- name: Create a PostgreSQL server in North Europe with sku GP_Gen5_2 (General Purpose, Gen 5 hardware, 2 vCores).
text: az postgres server create -l northeurope -g testgroup -n testsvr -u username -p password \\ --sku-name GP_Gen5_2
text: |
az postgres server create -l northeurope -g testgroup -n testsvr -u username -p password \\
--sku-name GP_Gen5_2
- name: Create a PostgreSQL server with all paramaters set.
text: az postgres server create -l northeurope -g testgroup -n testsvr -u username -p password \\ --sku-name B_Gen5_1 --ssl-enforcement Enabled --public-network-access Disabled \\ --backup-retention 10 --geo-redundant-backup Enabled --storage-size 51200 --tags "key=value" --version {server-version}
text: |
az postgres server create -l northeurope -g testgroup -n testsvr -u username -p password \\
--sku-name B_Gen5_1 --ssl-enforcement Enabled --public-network-access Disabled \\
--backup-retention 10 --geo-redundant-backup Enabled --storage-size 51200 \\
--tags "key=value" --version 11.0
"""

helps['postgres server delete'] = """
Expand Down
2 changes: 1 addition & 1 deletion src/azure-cli/azure/cli/command_modules/rdbms/_params.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def _complex_params(command_group):
c.argument('administrator_login', options_list=['--admin-user', '-u'], help='Administrator username for the server. Once set, it cannot be changed.')
c.argument('administrator_login_password', options_list=['--admin-password', '-p'], help='The password of the administrator. Minimum 8 characters and maximum 128 characters. Password must contain characters from three of the following categories: English uppercase letters, English lowercase letters, numbers, and non-alphanumeric characters.')
c.argument('ssl_enforcement', arg_type=get_enum_type(['Enabled', 'Disabled']), options_list=['--ssl-enforcement'], help='Enable or disable ssl enforcement for connections to server. Default is Enabled.')
c.argument('public_network_access', arg_type=get_enum_type(['Enabled', 'Disabled']), options_list=['--public-network-access'], help='Set whether public network access to server is allowed or not. When false, only connections made through Private Links can reach this server.')
c.argument('public_network_access', arg_type=get_enum_type(['Enabled', 'Disabled']), options_list=['--public-network-access'], help='Enable or disable public network access to server. When disabled, only connections made through Private Links can reach this server. Default is Enabled.')
c.argument('tier', arg_type=get_enum_type(['Basic', 'GeneralPurpose', 'MemoryOptimized']), options_list=['--performance-tier'], help='The performance tier of the server.')
c.argument('capacity', options_list=['--vcore'], type=int, help='Number of vcore.')
c.argument('family', options_list=['--family'], arg_type=get_enum_type(['Gen4', 'Gen5']), help='Hardware generation.')
Expand Down
Loading