cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

upgrading sql package to newest (#47544)

Browse source 
* upgrading sql package to newest

* LROPOller
This commit is contained in:
Zim Kalinowski 2018-10-25 10:08:56 +08:00 committed by GitHub
parent 4cda7a7883
commit 1cb78209ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/modules/cloud/azure/azure_rm_sqldatabase.py
View file

@ -198,7 +198,7 @@ from ansible.module_utils.azure_rm_common import AzureRMModuleBase
try: try:
from msrestazure.azure_exceptions import CloudError from msrestazure.azure_exceptions import CloudError
from msrestazure.azure_operation import AzureOperationPoller from msrest.polling import LROPoller
from azure.mgmt.sql import SqlManagementClient from azure.mgmt.sql import SqlManagementClient
from msrest.serialization import Model from msrest.serialization import Model
except ImportError: except ImportError:
@ -432,7 +432,7 @@ class AzureRMDatabases(AzureRMModuleBase):
server_name=self.server_name, server_name=self.server_name,
database_name=self.name, database_name=self.name,
parameters=self.parameters) parameters=self.parameters)
if isinstance(response, AzureOperationPoller): if isinstance(response, LROPoller):
response = self.get_poller_result(response) response = self.get_poller_result(response)
except CloudError as exc: except CloudError as exc:

4
lib/ansible/modules/cloud/azure/azure_rm_sqlfirewallrule.py
View file

@ -82,7 +82,7 @@ from ansible.module_utils.azure_rm_common import AzureRMModuleBase
try: try:
from msrestazure.azure_exceptions import CloudError from msrestazure.azure_exceptions import CloudError
from msrestazure.azure_operation import AzureOperationPoller from msrest.polling import LROPoller
from azure.mgmt.sql import SqlManagementClient from azure.mgmt.sql import SqlManagementClient
from msrest.serialization import Model from msrest.serialization import Model
except ImportError: except ImportError:
@ -215,7 +215,7 @@ class AzureRMFirewallRules(AzureRMModuleBase):
firewall_rule_name=self.name, firewall_rule_name=self.name,
start_ip_address=self.start_ip_address, start_ip_address=self.start_ip_address,
end_ip_address=self.end_ip_address) end_ip_address=self.end_ip_address)
if isinstance(response, AzureOperationPoller): if isinstance(response, LROPoller):
response = self.get_poller_result(response) response = self.get_poller_result(response)
except CloudError as exc: except CloudError as exc:

2
lib/ansible/modules/cloud/azure/azure_rm_sqlfirewallrule_facts.py
View file

@ -104,7 +104,7 @@ from ansible.module_utils.azure_rm_common import AzureRMModuleBase
try: try:
from msrestazure.azure_exceptions import CloudError from msrestazure.azure_exceptions import CloudError
from msrestazure.azure_operation import AzureOperationPoller from msrest.polling import LROPoller
from azure.mgmt.sql import SqlManagementClient from azure.mgmt.sql import SqlManagementClient
from msrest.serialization import Model from msrest.serialization import Model
except ImportError: except ImportError:

4
lib/ansible/modules/cloud/azure/azure_rm_sqlserver.py
View file

@ -106,7 +106,7 @@ from ansible.module_utils.azure_rm_common import AzureRMModuleBase
try: try:
from msrestazure.azure_exceptions import CloudError from msrestazure.azure_exceptions import CloudError
from msrestazure.azure_operation import AzureOperationPoller from msrest.polling import LROPoller
from azure.mgmt.sql import SqlManagementClient from azure.mgmt.sql import SqlManagementClient
from msrest.serialization import Model from msrest.serialization import Model
except ImportError: except ImportError:
@ -272,7 +272,7 @@ class AzureRMServers(AzureRMModuleBase):
response = self.sql_client.servers.create_or_update(self.resource_group, response = self.sql_client.servers.create_or_update(self.resource_group,
self.name, self.name,
self.parameters) self.parameters)
if isinstance(response, AzureOperationPoller): if isinstance(response, LROPoller):
response = self.get_poller_result(response) response = self.get_poller_result(response)
except CloudError as exc: except CloudError as exc:

1
lib/ansible/modules/cloud/azure/azure_rm_sqlserver_facts.py
View file

@ -114,7 +114,6 @@ from ansible.module_utils.azure_rm_common import AzureRMModuleBase
try: try:
from msrestazure.azure_exceptions import CloudError from msrestazure.azure_exceptions import CloudError
from msrestazure.azure_operation import AzureOperationPoller
from azure.mgmt.sql import SqlManagementClient from azure.mgmt.sql import SqlManagementClient
from msrest.serialization import Model from msrest.serialization import Model
except ImportError: except ImportError:

2
packaging/requirements/requirements-azure.txt
View file

@ -17,7 +17,7 @@ azure-mgmt-network==1.7.1
azure-mgmt-nspkg==2.0.0 azure-mgmt-nspkg==2.0.0
azure-mgmt-rdbms==1.4.1 azure-mgmt-rdbms==1.4.1
azure-mgmt-resource==1.2.2 azure-mgmt-resource==1.2.2
azure-mgmt-sql==0.7.1 azure-mgmt-sql==0.10.0
azure-mgmt-storage==1.5.0 azure-mgmt-storage==1.5.0
azure-mgmt-trafficmanager==0.50.0 azure-mgmt-trafficmanager==0.50.0
azure-mgmt-web==0.32.0 azure-mgmt-web==0.32.0

2
test/runner/requirements/integration.cloud.azure.txt
View file

@ -17,7 +17,7 @@ azure-mgmt-network==1.7.1
azure-mgmt-nspkg==2.0.0 azure-mgmt-nspkg==2.0.0
azure-mgmt-rdbms==1.4.1 azure-mgmt-rdbms==1.4.1
azure-mgmt-resource==1.2.2 azure-mgmt-resource==1.2.2
azure-mgmt-sql==0.7.1 azure-mgmt-sql==0.10.0
azure-mgmt-storage==1.5.0 azure-mgmt-storage==1.5.0
azure-mgmt-trafficmanager==0.50.0 azure-mgmt-trafficmanager==0.50.0
azure-mgmt-web==0.32.0 azure-mgmt-web==0.32.0