From 8ef75a1901ecd2377f8abc9f92ba75b977cfc375 Mon Sep 17 00:00:00 2001 From: Zim Kalinowski Date: Tue, 5 Mar 2019 15:44:32 +0800 Subject: [PATCH] cleaning up azure_rm_sql* class names (#53261) --- .../modules/cloud/azure/azure_rm_sqldatabase.py | 10 +++++----- .../modules/cloud/azure/azure_rm_sqlfirewallrule.py | 10 +++++----- .../cloud/azure/azure_rm_sqlfirewallrule_facts.py | 6 +++--- lib/ansible/modules/cloud/azure/azure_rm_sqlserver.py | 10 +++++----- .../modules/cloud/azure/azure_rm_sqlserver_facts.py | 6 +++--- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/lib/ansible/modules/cloud/azure/azure_rm_sqldatabase.py b/lib/ansible/modules/cloud/azure/azure_rm_sqldatabase.py index d568d682779..5e05ecb7eca 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_sqldatabase.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_sqldatabase.py @@ -211,7 +211,7 @@ class Actions: NoAction, Create, Update, Delete = range(4) -class AzureRMDatabases(AzureRMModuleBase): +class AzureRMSqlDatabase(AzureRMModuleBase): """Configuration class for an Azure RM SQL Database resource""" def __init__(self): @@ -308,9 +308,9 @@ class AzureRMDatabases(AzureRMModuleBase): self.state = None self.to_do = Actions.NoAction - super(AzureRMDatabases, self).__init__(derived_arg_spec=self.module_arg_spec, - supports_check_mode=True, - supports_tags=True) + super(AzureRMSqlDatabase, self).__init__(derived_arg_spec=self.module_arg_spec, + supports_check_mode=True, + supports_tags=True) def exec_module(self, **kwargs): """Main module execution method""" @@ -495,7 +495,7 @@ def _snake_to_camel(snake, capitalize_first=False): def main(): """Main execution""" - AzureRMDatabases() + AzureRMSqlDatabase() if __name__ == '__main__': diff --git a/lib/ansible/modules/cloud/azure/azure_rm_sqlfirewallrule.py b/lib/ansible/modules/cloud/azure/azure_rm_sqlfirewallrule.py index 008a84981a0..e2cd32131d9 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_sqlfirewallrule.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_sqlfirewallrule.py @@ -94,7 +94,7 @@ class Actions: NoAction, Create, Update, Delete = range(4) -class AzureRMFirewallRules(AzureRMModuleBase): +class AzureRMSqlFirewallRule(AzureRMModuleBase): """Configuration class for an Azure RM Firewall Rule resource""" def __init__(self): @@ -134,9 +134,9 @@ class AzureRMFirewallRules(AzureRMModuleBase): self.state = None self.to_do = Actions.NoAction - super(AzureRMFirewallRules, self).__init__(derived_arg_spec=self.module_arg_spec, - supports_check_mode=True, - supports_tags=False) + super(AzureRMSqlFirewallRule, self).__init__(derived_arg_spec=self.module_arg_spec, + supports_check_mode=True, + supports_tags=False) def exec_module(self, **kwargs): """Main module execution method""" @@ -265,7 +265,7 @@ class AzureRMFirewallRules(AzureRMModuleBase): def main(): """Main execution""" - AzureRMFirewallRules() + AzureRMSqlFirewallRule() if __name__ == '__main__': diff --git a/lib/ansible/modules/cloud/azure/azure_rm_sqlfirewallrule_facts.py b/lib/ansible/modules/cloud/azure/azure_rm_sqlfirewallrule_facts.py index 3db08398178..be79e642eab 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_sqlfirewallrule_facts.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_sqlfirewallrule_facts.py @@ -112,7 +112,7 @@ except ImportError: pass -class AzureRMFirewallRulesFacts(AzureRMModuleBase): +class AzureRMSqlFirewallRuleFacts(AzureRMModuleBase): def __init__(self): # define user inputs into argument self.module_arg_spec = dict( @@ -135,7 +135,7 @@ class AzureRMFirewallRulesFacts(AzureRMModuleBase): self.resource_group = None self.server_name = None self.name = None - super(AzureRMFirewallRulesFacts, self).__init__(self.module_arg_spec, supports_tags=False) + super(AzureRMSqlFirewallRuleFacts, self).__init__(self.module_arg_spec, supports_tags=False) def exec_module(self, **kwargs): for key in self.module_arg_spec: @@ -203,7 +203,7 @@ class AzureRMFirewallRulesFacts(AzureRMModuleBase): def main(): - AzureRMFirewallRulesFacts() + AzureRMSqlFirewallRuleFacts() if __name__ == '__main__': diff --git a/lib/ansible/modules/cloud/azure/azure_rm_sqlserver.py b/lib/ansible/modules/cloud/azure/azure_rm_sqlserver.py index 5e127ebad30..0ce8b32c885 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_sqlserver.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_sqlserver.py @@ -118,7 +118,7 @@ class Actions: NoAction, Create, Update, Delete = range(4) -class AzureRMServers(AzureRMModuleBase): +class AzureRMSqlServer(AzureRMModuleBase): """Configuration class for an Azure RM SQL Server resource""" def __init__(self): @@ -163,9 +163,9 @@ class AzureRMServers(AzureRMModuleBase): self.state = None self.to_do = Actions.NoAction - super(AzureRMServers, self).__init__(derived_arg_spec=self.module_arg_spec, - supports_check_mode=True, - supports_tags=True) + super(AzureRMSqlServer, self).__init__(derived_arg_spec=self.module_arg_spec, + supports_check_mode=True, + supports_tags=True) def exec_module(self, **kwargs): """Main module execution method""" @@ -314,7 +314,7 @@ class AzureRMServers(AzureRMModuleBase): def main(): """Main execution""" - AzureRMServers() + AzureRMSqlServer() if __name__ == '__main__': diff --git a/lib/ansible/modules/cloud/azure/azure_rm_sqlserver_facts.py b/lib/ansible/modules/cloud/azure/azure_rm_sqlserver_facts.py index e9f9bfb3974..40167ec2d86 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_sqlserver_facts.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_sqlserver_facts.py @@ -121,7 +121,7 @@ except ImportError: pass -class AzureRMServersFacts(AzureRMModuleBase): +class AzureRMSqlServerFacts(AzureRMModuleBase): def __init__(self): # define user inputs into argument self.module_arg_spec = dict( @@ -140,7 +140,7 @@ class AzureRMServersFacts(AzureRMModuleBase): ) self.resource_group = None self.server_name = None - super(AzureRMServersFacts, self).__init__(self.module_arg_spec) + super(AzureRMSqlServerFacts, self).__init__(self.module_arg_spec) def exec_module(self, **kwargs): for key in self.module_arg_spec: @@ -195,7 +195,7 @@ class AzureRMServersFacts(AzureRMModuleBase): def main(): - AzureRMServersFacts() + AzureRMSqlServerFacts() if __name__ == '__main__':