Skip to content

Sql Import/Export CLI commands and test #2538

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

Merged
troydai merged 7 commits into from
Mar 19, 2017
Merged

Sql Import/Export CLI commands and test #2538

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b112d11
Add Import-New database command
nathannfan Mar 11, 2017
5c7bcf9
Consolidate import-new arguments
nathannfan Mar 11, 2017
14ad71c
Merge branch 'master' of https://github.com/azure/azure-cli into mast…
nathannfan Mar 16, 2017
349bb46
Remove import-new, add export, add import/export test
nathannfan Mar 17, 2017
1ab108b
Fix linter errors
nathannfan Mar 17, 2017
1777163
Merge branch 'master' of https://github.com/azure/azure-cli into mast…
nathannfan Mar 17, 2017
d65edeb
Undo accidental file move
nathannfan Mar 17, 2017
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
25 changes: 15 additions & 10 deletions azure-cli.pyproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,12 +166,12 @@
<Compile Include="command_modules\azure-cli-component\azure\cli\command_modules\component\_help.py">
<SubType>Code</SubType>
</Compile>
<Compile Include="command_modules\azure-cli-configure\azure\cli\command_modules\configure\commands.py" />
<Compile Include="command_modules\azure-cli-configure\azure\cli\command_modules\configure\custom.py" />
<Compile Include="command_modules\azure-cli-configure\azure\cli\command_modules\configure\_consts.py" />
<Compile Include="command_modules\azure-cli-configure\azure\cli\command_modules\configure\_help.py" />
<Compile Include="command_modules\azure-cli-configure\azure\cli\command_modules\configure\_utils.py" />
<Compile Include="command_modules\azure-cli-configure\azure\cli\command_modules\configure\__init__.py" />
<Compile Include="command_modules\azure-cli-component\azure-cli-configure\azure\cli\command_modules\configure\commands.py" />
<Compile Include="command_modules\azure-cli-component\azure-cli-configure\azure\cli\command_modules\configure\custom.py" />
<Compile Include="command_modules\azure-cli-component\azure-cli-configure\azure\cli\command_modules\configure\_consts.py" />
<Compile Include="command_modules\azure-cli-component\azure-cli-configure\azure\cli\command_modules\configure\_help.py" />
<Compile Include="command_modules\azure-cli-component\azure-cli-configure\azure\cli\command_modules\configure\_utils.py" />
<Compile Include="command_modules\azure-cli-component\azure-cli-configure\azure\cli\command_modules\configure\__init__.py" />
<Compile Include="command_modules\azure-cli-configure\setup.py" />
<Compile Include="command_modules\azure-cli-container\azure\cli\command_modules\container\commands.py" />
<Compile Include="command_modules\azure-cli-container\azure\cli\command_modules\container\custom.py" />
Expand Down Expand Up @@ -526,11 +526,12 @@
<Folder Include="command_modules\azure-cli-component\azure\cli\" />
<Folder Include="command_modules\azure-cli-component\azure\cli\command_modules\" />
<Folder Include="command_modules\azure-cli-component\azure\cli\command_modules\component\" />
<Folder Include="command_modules\azure-cli-component\azure-cli-configure\" />
<Folder Include="command_modules\azure-cli-component\azure-cli-configure\azure\" />
<Folder Include="command_modules\azure-cli-component\azure-cli-configure\azure\cli\" />
<Folder Include="command_modules\azure-cli-component\azure-cli-configure\azure\cli\command_modules\" />
<Folder Include="command_modules\azure-cli-component\azure-cli-configure\azure\cli\command_modules\configure\" />
Copy link
Contributor

@jaredmoo jaredmoo Mar 17, 2017

Choose a reason for hiding this comment

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

Why did these changes happen? Maybe these should be reverted?

Copy link
Contributor Author

@nathannfan nathannfan Mar 17, 2017

Choose a reason for hiding this comment

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

Yep, must have happened during a merge.

<Folder Include="command_modules\azure-cli-configure\" />
<Folder Include="command_modules\azure-cli-configure\azure\" />
<Folder Include="command_modules\azure-cli-configure\azure\cli\" />
<Folder Include="command_modules\azure-cli-configure\azure\cli\command_modules\" />
<Folder Include="command_modules\azure-cli-configure\azure\cli\command_modules\configure\" />
<Folder Include="command_modules\azure-cli-container\" />
<Folder Include="command_modules\azure-cli-container\azure\" />
<Folder Include="command_modules\azure-cli-container\azure\cli\" />
Expand Down Expand Up @@ -586,6 +587,8 @@
<Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\" />
<Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\models\" />
<Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\operations\" />
<Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\tests\" />
<Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\tests\zone_files\" />
<Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\zone_file\" />
<Folder Include="command_modules\azure-cli-network\tests\" />
<Folder Include="command_modules\azure-cli-network\tests\zone_files\" />
Expand All @@ -595,6 +598,7 @@
<Folder Include="command_modules\azure-cli-redis\azure\cli\command_modules\" />
<Folder Include="command_modules\azure-cli-redis\azure\cli\command_modules\redis\" />
<Folder Include="command_modules\azure-cli-redis\tests\" />
<Folder Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\tests\" />
<Folder Include="command_modules\azure-cli-resource\tests\" />
<Folder Include="command_modules\azure-cli-role\tests\" />
<Folder Include="command_modules\azure-cli-redis\azure\cli\command_modules\redis\tests\" />
Expand Down Expand Up @@ -647,6 +651,7 @@
<Folder Include="command_modules\azure-cli-vm\azure\cli\" />
<Folder Include="command_modules\azure-cli-vm\azure\cli\command_modules\" />
<Folder Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\" />
<Folder Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\tests\" />
<Folder Include="command_modules\azure-cli-vm\tests\" />
<Folder Include="command_modules\azure-cli-vm\tests\keyvault\" />
</ItemGroup>
Expand Down
0 ...cli/command_modules/configure/__init__.py → ...cli/command_modules/configure/__init__.py
View file
Open in desktop
File renamed without changes.
0 .../cli/command_modules/configure/_consts.py → .../cli/command_modules/configure/_consts.py
View file
Open in desktop
File renamed without changes.
0 ...re/cli/command_modules/configure/_help.py → ...re/cli/command_modules/configure/_help.py
View file
Open in desktop
File renamed without changes.
0 ...e/cli/command_modules/configure/_utils.py → ...e/cli/command_modules/configure/_utils.py
View file
Open in desktop
File renamed without changes.
0 ...cli/command_modules/configure/commands.py → ...cli/command_modules/configure/commands.py
View file
Open in desktop
File renamed without changes.
0 ...e/cli/command_modules/configure/custom.py → ...e/cli/command_modules/configure/custom.py
View file
Open in desktop
File renamed without changes.
3 changes: 3 additions & 0 deletions src/command_modules/azure-cli-sql/azure/cli/command_modules/sql/commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
# c.command('show-usage', 'list_usages')
c.command('delete', 'delete', confirmation=True)
c.generic_update_command('update', 'get', 'create_or_update', custom_func_name='db_update')
c.command('import', 'import_method')
c.command('export', 'export')

with s.group('sql db replica') as c:
c.custom_command('create', 'db_create_replica')
Expand Down Expand Up @@ -99,6 +101,7 @@
'ServersOperations')

with ServiceGroup(__name__, get_sql_servers_operation, server_operations) as s:

Copy link
Contributor

@troydai troydai Mar 17, 2017

Choose a reason for hiding this comment

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

nitpicking: this is not required.

with s.group('sql server') as c:
c.command('create', 'create_or_update')
c.command('delete', 'delete', confirmation=True)
Expand Down
4 changes: 4 additions & 0 deletions src/command_modules/azure-cli-sql/azure/cli/command_modules/sql/help.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@
type: command
short-summary: Creates a new database by restoring from a database backup.
"""
helps['sql db import'] = """
type: command
short-summary: Imports a bacpac into an existing database.
"""
# helps['sql db restore-point'] = """
# type: group
# short-summary: Manage database restore points.
Expand Down
25 changes: 24 additions & 1 deletion src/command_modules/azure-cli-sql/azure/cli/command_modules/sql/params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,17 @@
from enum import Enum
from ._util import ParametersContext, patch_arg_make_required
from azure.cli.core.commands import CliArgumentType
from azure.cli.core.commands.parameters import enum_choice_list
from azure.cli.core.commands.parameters import ignore_type
from azure.mgmt.sql.models.database import Database
from azure.mgmt.sql.models.elastic_pool import ElasticPool
from azure.mgmt.sql.models.server import Server
from azure.mgmt.sql.models.import_extension_request_parameters \
import ImportExtensionRequestParameters
from azure.mgmt.sql.models.export_request_parameters import ExportRequestParameters
from azure.mgmt.sql.models.sql_management_client_enums import CreateMode
from azure.mgmt.sql.models.sql_management_client_enums import StorageKeyType
from azure.mgmt.sql.models.sql_management_client_enums import AuthenticationType

#####
# Reusable param type definitions
Expand All @@ -21,7 +28,6 @@
options_list=('--server', '-s'),
help='Name of the Azure SQL server.')


#####
# SizeWithUnitConverter - consider moving to common code (azure.cli.commands.parameters)
#####
Expand Down Expand Up @@ -261,6 +267,23 @@ def _configure_db_create_params(
c.argument('elastic_pool_name', help='The name of the elastic pool to move the database into.')
c.argument('max_size_bytes', help='The new maximum size of the database expressed in bytes.')

with ParametersContext(command='sql db export') as c:
c.expand('parameters', ExportRequestParameters)
c.register_alias('administrator_login', ('--admin-user', '-u'))
c.register_alias('administrator_login_password', ('--admin-password', '-p'))
c.argument('authentication_type', options_list=('--auth_type',),
**enum_choice_list(AuthenticationType))
c.argument('storage_key_type', **enum_choice_list(StorageKeyType))

with ParametersContext(command='sql db import') as c:
c.expand('parameters', ImportExtensionRequestParameters)
c.register_alias('administrator_login', ('--admin-user', '-u'))
c.register_alias('administrator_login_password', ('--admin-password', '-p'))
c.argument('authentication_type', options_list=('--auth_type',),
**enum_choice_list(AuthenticationType))
c.argument('storage_key_type', **enum_choice_list(StorageKeyType))
c.argument('name', options_list=('--slkdjflksdjf',), arg_type=ignore_type)


#####
# sql db replica
Expand Down
2 changes: 1 addition & 1 deletion src/command_modules/azure-cli-sql/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

DEPENDENCIES = [
'azure-cli-core',
'azure-mgmt-sql==0.3.1',
'azure-mgmt-sql==0.3.2',
'six'
]

Expand Down
Loading