For Test( 2.9 to 2.10) (#140)

* adding more testing dimensions

plugins/module_utils/azure_rm_common.py

@@ -3,6 +3,10 @@
 #
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+
+
 import os
 import re
 import types
@@ -358,7 +362,6 @@ def __init__(self, derived_arg_spec, bypass_checks=False, no_log=False,
         self.module = AnsibleModule(argument_spec=merged_arg_spec,
                                     bypass_checks=bypass_checks,
                                     no_log=no_log,
-                                    check_invalid_arguments=check_invalid_arguments,
                                     mutually_exclusive=mutually_exclusive,
                                     required_together=required_together,
                                     required_one_of=required_one_of,

plugins/module_utils/azure_rm_common_ext.py

@@ -2,6 +2,10 @@
 #
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+
+
 from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase
 import re
 from ansible.module_utils.common.dict_transformations import _camel_to_snake, _snake_to_camel

plugins/module_utils/azure_rm_common_rest.py

@@ -2,6 +2,10 @@
 #
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+
+
 try:
     from ansible.module_utils.ansible_release import __version__ as ANSIBLE_VERSION
 except Exception:

plugins/modules/azure_rm_aks.py

@@ -110,7 +110,6 @@
             client_secret:
                 description:
                     - The secret password associated with the service principal.
-                required: true
     enable_rbac:
         description:
             - Enable RBAC.
@@ -205,6 +204,7 @@
                     log_analytics_workspace_resource_id:
                         description:
                             - Where to store the container metrics.
+                        required: true
             virtual_node:
                 description:
                     - With virtual nodes, you have quick provisioning of pods, and only pay per second for their execution time.
@@ -218,6 +218,7 @@
                     subnet_resource_id:
                         description:
                             - Subnet associated to the cluster.
+                        required: true
         version_added: "2.8"
     node_resource_group:
         description:

plugins/modules/azure_rm_aks_info.py

@@ -116,7 +116,7 @@ def exec_module(self, **kwargs):
 
         is_old_facts = self.module._name == 'azure_rm_aks_facts'
         if is_old_facts:
-            self.module.deprecate("The 'azure_rm_aks_facts' module has been renamed to 'azure_rm_aks_info'", version='2.13')
+            self.module.deprecate("The 'azure_rm_aks_facts' module has been renamed to 'azure_rm_aks_info'", version=(2, 9))
 
         for key in self.module_args:
             setattr(self, key, kwargs[key])

plugins/modules/azure_rm_aksversion_info.py

@@ -93,7 +93,7 @@ def exec_module(self, **kwargs):
 
         is_old_facts = self.module._name == 'azure_rm_aksversion_facts'
         if is_old_facts:
-            self.module.deprecate("The 'azure_rm_aksversion_facts' module has been renamed to 'azure_rm_aksversion_info'", version='2.13')
+            self.module.deprecate("The 'azure_rm_aksversion_facts' module has been renamed to 'azure_rm_aksversion_info'", version=(2, 9))
 
         for key in self.module_args:
             setattr(self, key, kwargs[key])

plugins/modules/azure_rm_appgateway.py

@@ -439,10 +439,9 @@
 import time
 from ansible_collections.azure.azcollection.plugins.module_utils.azure_rm_common import AzureRMModuleBase
 from copy import deepcopy
-from ansible.module_utils.network.common.utils import dict_merge
 from ansible.module_utils.common.dict_transformations import (
     camel_dict_to_snake_dict, snake_dict_to_camel_dict,
-    _camel_to_snake, _snake_to_camel,
+    _camel_to_snake, _snake_to_camel, dict_merge,
 )
 
 try:

plugins/modules/azure_rm_applicationsecuritygroup_info.py

@@ -139,7 +139,7 @@ def exec_module(self, **kwargs):
         is_old_facts = self.module._name == 'azure_rm_applicationsecuritygroup_facts'
         if is_old_facts:
             self.module.deprecate("The 'azure_rm_applicationsecuritygroup_facts' module has been renamed to 'azure_rm_applicationsecuritygroup_info'",
-                                  version='2.13')
+                                  version=(2, 9))
 
         for key in list(self.module_arg_spec.keys()) + ['tags']:
             if hasattr(self, key):

plugins/modules/azure_rm_appserviceplan_info.py

@@ -156,7 +156,7 @@ def exec_module(self, **kwargs):
 
         is_old_facts = self.module._name == 'azure_rm_appserviceplan_facts'
         if is_old_facts:
-            self.module.deprecate("The 'azure_rm_appserviceplan_facts' module has been renamed to 'azure_rm_appserviceplan_info'", version='2.13')
+            self.module.deprecate("The 'azure_rm_appserviceplan_facts' module has been renamed to 'azure_rm_appserviceplan_info'", version=(2, 9))
 
         for key in self.module_arg_spec:
             setattr(self, key, kwargs[key])

plugins/modules/azure_rm_automationaccount_info.py

@@ -285,7 +285,7 @@ def exec_module(self, **kwargs):
 
         is_old_facts = self.module._name == 'azure_rm_automationaccount_facts'
         if is_old_facts:
-            self.module.deprecate("The 'azure_rm_automationaccount_facts' module has been renamed to 'azure_rm_automationaccount_info'", version='2.13')
+            self.module.deprecate("The 'azure_rm_automationaccount_facts' module has been renamed to 'azure_rm_automationaccount_info'", version=(2, 9))
 
         for key in list(self.module_arg_spec):
             setattr(self, key, kwargs[key])

plugins/modules/azure_rm_autoscale_info.py

@@ -233,7 +233,7 @@ def exec_module(self, **kwargs):
 
         is_old_facts = self.module._name == 'azure_rm_autoscale_facts'
         if is_old_facts:
-            self.module.deprecate("The 'azure_rm_autoscale_facts' module has been renamed to 'azure_rm_autoscale_info'", version='2.13')
+            self.module.deprecate("The 'azure_rm_autoscale_facts' module has been renamed to 'azure_rm_autoscale_info'", version=(2, 9))
 
         for key in list(self.module_arg_spec):
             setattr(self, key, kwargs[key])

plugins/modules/azure_rm_availabilityset_info.py

@@ -148,7 +148,7 @@ def exec_module(self, **kwargs):
 
         is_old_facts = self.module._name == 'azure_rm_availabilityset_facts'
         if is_old_facts:
-            self.module.deprecate("The 'azure_rm_availabilityset_facts' module has been renamed to 'azure_rm_availabilityset_info'", version='2.13')
+            self.module.deprecate("The 'azure_rm_availabilityset_facts' module has been renamed to 'azure_rm_availabilityset_info'", version=(2, 9))
 
         for key in self.module_args:
             setattr(self, key, kwargs[key])

plugins/modules/azure_rm_cdnendpoint_info.py

@@ -218,7 +218,7 @@ def exec_module(self, **kwargs):
 
         is_old_facts = self.module._name == 'azure_rm_cdnendpoint_facts'
         if is_old_facts:
-            self.module.deprecate("The 'azure_rm_cdnendpoint_facts' module has been renamed to 'azure_rm_cdnendpoint_info'", version='2.13')
+            self.module.deprecate("The 'azure_rm_cdnendpoint_facts' module has been renamed to 'azure_rm_cdnendpoint_info'", version=(2, 9))
 
         for key in self.module_args:
             setattr(self, key, kwargs[key])

plugins/modules/azure_rm_cdnprofile_info.py

@@ -160,7 +160,7 @@ def exec_module(self, **kwargs):
 
         is_old_facts = self.module._name == 'azure_rm_cdnprofile_facts'
         if is_old_facts:
-            self.module.deprecate("The 'azure_rm_cdnprofile_facts' module has been renamed to 'azure_rm_cdnprofile_info'", version='2.13')
+            self.module.deprecate("The 'azure_rm_cdnprofile_facts' module has been renamed to 'azure_rm_cdnprofile_info'", version=(2, 9))
 
         for key in self.module_args:
             setattr(self, key, kwargs[key])

plugins/modules/azure_rm_containerinstance_info.py

@@ -212,7 +212,7 @@ def exec_module(self, **kwargs):
 
         is_old_facts = self.module._name == 'azure_rm_containerinstance_facts'
         if is_old_facts:
-            self.module.deprecate("The 'azure_rm_containerinstance_facts' module has been renamed to 'azure_rm_containerinstance_info'", version='2.13')
+            self.module.deprecate("The 'azure_rm_containerinstance_facts' module has been renamed to 'azure_rm_containerinstance_info'", version=(2, 9))
 
         for key in self.module_arg_spec:
             setattr(self, key, kwargs[key])

plugins/modules/azure_rm_containerregistry_info.py

@@ -183,7 +183,7 @@ def exec_module(self, **kwargs):
 
         is_old_facts = self.module._name == 'azure_rm_containerregistry_info'
         if is_old_facts:
-            self.module.deprecate("The 'azure_rm_containerregistry_facts' module has been renamed to 'azure_rm_containerregistry_info'", version='2.13')
+            self.module.deprecate("The 'azure_rm_containerregistry_facts' module has been renamed to 'azure_rm_containerregistry_info'", version=(2, 9))
 
         for key in list(self.module_arg_spec) + ['tags']:
             setattr(self, key, kwargs[key])

plugins/modules/azure_rm_containerregistryreplication.py

@@ -71,9 +71,8 @@
     description:
         - The status of the replication at the time the operation was called.
     returned: always
-    type: complex
-    sample: status
-    contains:
+    type: str
+    sample: Ready
 '''
 
 import time
@@ -144,7 +143,6 @@ def __init__(self):
         self.location = None
 
         self.results = dict(changed=False)
-        self.mgmt_client = None
         self.state = None
         self.to_do = Actions.NoAction
 

plugins/modules/azure_rm_cosmosdbaccount_info.py

@@ -394,7 +394,7 @@ def exec_module(self, **kwargs):
 
         is_old_facts = self.module._name == 'azure_rm_cosmosdbaccount_facts'
         if is_old_facts:
-            self.module.deprecate("The 'azure_rm_cosmosdbaccount_facts' module has been renamed to 'azure_rm_cosmosdbaccount_info'", version='2.13')
+            self.module.deprecate("The 'azure_rm_cosmosdbaccount_facts' module has been renamed to 'azure_rm_cosmosdbaccount_info'", version=(2, 9))
 
         for key in self.module_arg_spec:
             setattr(self, key, kwargs[key])

plugins/modules/azure_rm_deployment.py

@@ -16,10 +16,10 @@
 ---
 module: azure_rm_deployment
 
-short_description: Create or destroy Azure Resource Manager template deployments
-
 version_added: "2.1"
 
+short_description: Create or destroy Azure Resource Manager template deployments
+
 description:
     - Create or destroy Azure Resource Manager template deployments via the Azure SDK for Python.
     - You can find some quick start templates in GitHub here U(https://github.com/azure/azure-quickstart-templates).
@@ -118,7 +118,7 @@
 # Create or update a template deployment based on a uri to the template and parameters specified inline.
 # This deploys a VM with SSH support for a given public key, then stores the result in 'azure_vms'. The result is then
 # used to create a new host group. This host group is then used to wait for each instance to respond to the public IP SSH.
----
+
 - name: Create Azure Deploy
   azure_rm_deployment:
     resource_group: myResourceGroup

plugins/modules/azure_rm_deployment_info.py

@@ -157,7 +157,7 @@ def exec_module(self, **kwargs):
 
         is_old_facts = self.module._name == 'azure_rm_deployment_facts'
         if is_old_facts:
-            self.module.deprecate("The 'azure_rm_deployment_facts' module has been renamed to 'azure_rm_deployment_info'", version='2.13')
+            self.module.deprecate("The 'azure_rm_deployment_facts' module has been renamed to 'azure_rm_deployment_info'", version=(2, 9))
 
         for key in self.module_arg_spec:
             setattr(self, key, kwargs[key])

plugins/modules/azure_rm_devtestlab_info.py

@@ -181,7 +181,7 @@ def __init__(self):
     def exec_module(self, **kwargs):
         is_old_facts = self.module._name == 'azure_rm_devtestlab_facts'
         if is_old_facts:
-            self.module.deprecate("The 'azure_rm_devtestlab_facts' module has been renamed to 'azure_rm_devtestlab_info'", version='2.13')
+            self.module.deprecate("The 'azure_rm_devtestlab_facts' module has been renamed to 'azure_rm_devtestlab_info'", version=(2, 9))
 
         for key in self.module_arg_spec:
             setattr(self, key, kwargs[key])

plugins/modules/azure_rm_devtestlabarmtemplate_info.py

@@ -155,7 +155,7 @@ def __init__(self):
     def exec_module(self, **kwargs):
         is_old_facts = self.module._name == 'azure_rm_devtestlabarmtemplate_facts'
         if is_old_facts:
-            self.module.deprecate("The 'azure_rm_devtestlabarmtemplate_facts' module has been renamed to 'azure_rm_devtestlabarmtemplate_info'", version='2.13')
+            self.module.deprecate("The 'azure_rm_devtestlabarmtemplate_facts' module has been renamed to 'azure_rm_devtestlabarmtemplate_info'", version=(2, 9))
 
         for key in self.module_arg_spec:
             setattr(self, key, kwargs[key])

plugins/modules/azure_rm_devtestlabartifactsource_info.py

@@ -184,7 +184,7 @@ def exec_module(self, **kwargs):
         is_old_facts = self.module._name == 'azure_rm_devtestlabartifactsource_facts'
         if is_old_facts:
             self.module.deprecate("The 'azure_rm_devtestlabartifactsource_facts' module has been renamed to 'azure_rm_devtestlabartifactsource_info'",
-                                  version='2.13')
+                                  version=(2, 9))
 
         for key in self.module_arg_spec:
             setattr(self, key, kwargs[key])

plugins/modules/azure_rm_devtestlabcustomimage_info.py

@@ -161,7 +161,7 @@ def __init__(self):
     def exec_module(self, **kwargs):
         is_old_facts = self.module._name == 'azure_rm_devtestlabcustomimage_facts'
         if is_old_facts:
-            self.module.deprecate("The 'azure_rm_devtestlabcustomimage_facts' module has been renamed to 'azure_rm_devtestlabcustomimage_info'", version='2.13')
+            self.module.deprecate("The 'azure_rm_devtestlabcustomimage_facts' module has been renamed to 'azure_rm_devtestlabcustomimage_info'", version=(2, 9))
 
         for key in self.module_arg_spec:
             setattr(self, key, kwargs[key])

plugins/modules/azure_rm_devtestlabenvironment_info.py

@@ -171,7 +171,7 @@ def __init__(self):
     def exec_module(self, **kwargs):
         is_old_facts = self.module._name == 'azure_rm_devtestlabenvironment_facts'
         if is_old_facts:
-            self.module.deprecate("The 'azure_rm_devtestlabenvironment_facts' module has been renamed to 'azure_rm_devtestlabenvironment_info'", version='2.13')
+            self.module.deprecate("The 'azure_rm_devtestlabenvironment_facts' module has been renamed to 'azure_rm_devtestlabenvironment_info'", version=(2, 9))
 
         for key in self.module_arg_spec:
             setattr(self, key, kwargs[key])

plugins/modules/azure_rm_devtestlabpolicy_info.py

@@ -170,7 +170,7 @@ def __init__(self):
     def exec_module(self, **kwargs):
         is_old_facts = self.module._name == 'azure_rm_devtestlabpolicy_facts'
         if is_old_facts:
-            self.module.deprecate("The 'azure_rm_devtestlabpolicy_facts' module has been renamed to 'azure_rm_devtestlabpolicy_info'", version='2.13')
+            self.module.deprecate("The 'azure_rm_devtestlabpolicy_facts' module has been renamed to 'azure_rm_devtestlabpolicy_info'", version=(2, 9))
 
         for key in self.module_arg_spec:
             setattr(self, key, kwargs[key])

plugins/modules/azure_rm_devtestlabschedule_info.py

@@ -154,7 +154,7 @@ def __init__(self):
     def exec_module(self, **kwargs):
         is_old_facts = self.module._name == 'azure_rm_devtestlabschedule_facts'
         if is_old_facts:
-            self.module.deprecate("The 'azure_rm_devtestlabschedule_facts' module has been renamed to 'azure_rm_devtestlabschedule_info'", version='2.13')
+            self.module.deprecate("The 'azure_rm_devtestlabschedule_facts' module has been renamed to 'azure_rm_devtestlabschedule_info'", version=(2, 9))
 
         for key in self.module_arg_spec:
             setattr(self, key, kwargs[key])

plugins/modules/azure_rm_devtestlabvirtualmachine_info.py

@@ -250,7 +250,7 @@ def exec_module(self, **kwargs):
         is_old_facts = self.module._name == 'azure_rm_devtestlabvirtualmachine_facts'
         if is_old_facts:
             self.module.deprecate("The 'azure_rm_devtestlabvirtualmachine_facts' module has been renamed to 'azure_rm_devtestlabvirtualmachine_info'",
-                                  version='2.13')
+                                  version=(2, 9))
 
         for key in self.module_arg_spec:
             setattr(self, key, kwargs[key])

plugins/modules/azure_rm_devtestlabvirtualnetwork_info.py

@@ -153,7 +153,7 @@ def exec_module(self, **kwargs):
         is_old_facts = self.module._name == 'azure_rm_devtestlabvirtualnetwork_facts'
         if is_old_facts:
             self.module.deprecate("The 'azure_rm_devtestlabvirtualnetwork_facts' module has been renamed to 'azure_rm_devtestlabvirtualnetwork_info'",
-                                  version='2.13')
+                                  version=(2, 9))
 
         for key in self.module_arg_spec:
             setattr(self, key, kwargs[key])

plugins/modules/azure_rm_dnsrecordset_info.py

@@ -193,7 +193,7 @@ def exec_module(self, **kwargs):
 
         is_old_facts = self.module._name == 'azure_rm_dnsrecordset_facts'
         if is_old_facts:
-            self.module.deprecate("The 'azure_rm_dnsrecordset_facts' module has been renamed to 'azure_rm_dnsrecordset_info'", version='2.13')
+            self.module.deprecate("The 'azure_rm_dnsrecordset_facts' module has been renamed to 'azure_rm_dnsrecordset_info'", version=(2, 9))
 
         for key in self.module_arg_spec:
             setattr(self, key, kwargs[key])

plugins/modules/azure_rm_dnszone_info.py

@@ -164,7 +164,7 @@ def exec_module(self, **kwargs):
 
         is_old_facts = self.module._name == 'azure_rm_dnszone_facts'
         if is_old_facts:
-            self.module.deprecate("The 'azure_rm_dnszone_facts' module has been renamed to 'azure_rm_dnszone_info'", version='2.13')
+            self.module.deprecate("The 'azure_rm_dnszone_facts' module has been renamed to 'azure_rm_dnszone_info'", version=(2, 9))
 
         for key in self.module_arg_spec:
             setattr(self, key, kwargs[key])

plugins/modules/azure_rm_functionapp_info.py

@@ -136,7 +136,7 @@ def exec_module(self, **kwargs):
 
         is_old_facts = self.module._name == 'azure_rm_functionapp_facts'
         if is_old_facts:
-            self.module.deprecate("The 'azure_rm_functionapp_facts' module has been renamed to 'azure_rm_functionapp_info'", version='2.13')
+            self.module.deprecate("The 'azure_rm_functionapp_facts' module has been renamed to 'azure_rm_functionapp_info'", version=(2, 9))
 
         for key in self.module_arg_spec:
             setattr(self, key, kwargs[key])

plugins/modules/azure_rm_hdinsightcluster_info.py

@@ -222,7 +222,7 @@ def exec_module(self, **kwargs):
         is_old_facts = self.module._name == 'azure_rm_hdinsightcluster_facts'
         if is_old_facts:
             self.module.deprecate("The 'azure_rm_hdinsightcluster_facts' module has been renamed to 'azure_rm_hdinsightcluster_info'",
-                                  version='2.13')
+                                  version=(2, 9))
 
         for key in self.module_arg_spec:
             setattr(self, key, kwargs[key])

plugins/modules/azure_rm_image_info.py

@@ -208,7 +208,7 @@ def exec_module(self, **kwargs):
 
         is_old_facts = self.module._name == 'azure_rm_image_facts'
         if is_old_facts:
-            self.module.deprecate("The 'azure_rm_image_facts' module has been renamed to 'azure_rm_image_info'", version='2.13')
+            self.module.deprecate("The 'azure_rm_image_facts' module has been renamed to 'azure_rm_image_info'", version=(2, 9))
 
         for key in self.module_arg_spec:
             setattr(self, key, kwargs[key])

plugins/modules/azure_rm_loadbalancer.py

@@ -741,7 +741,7 @@ def exec_module(self, **kwargs):
             is_compatible_param = is_compatible_param or self.public_ip_address_name or self.probe_protocol or self.natpool_protocol or self.protocol
             if is_compatible_param:
                 self.deprecate('Discrete load balancer config settings are deprecated and will be removed.'
-                               ' Use frontend_ip_configurations, backend_address_pools, probes, inbound_nat_pools lists instead.', version='2.9')
+                               ' Use frontend_ip_configurations, backend_address_pools, probes, inbound_nat_pools lists instead.', version=(2, 9))
                 frontend_ip_name = 'frontendip0'
                 backend_address_pool_name = 'backendaddrp0'
                 prob_name = 'prob0'

plugins/modules/azure_rm_loadbalancer_info.py

@@ -113,7 +113,7 @@ def exec_module(self, **kwargs):
 
         is_old_facts = self.module._name == 'azure_rm_loadbalancer_facts'
         if is_old_facts:
-            self.module.deprecate("The 'azure_rm_loadbalancer_facts' module has been renamed to 'azure_rm_loadbalancer_info'", version='2.13')
+            self.module.deprecate("The 'azure_rm_loadbalancer_facts' module has been renamed to 'azure_rm_loadbalancer_info'", version=(2, 9))
 
         for key in self.module_args:
             setattr(self, key, kwargs[key])