Skip to content

Commit

Permalink
Rename Azure modules: facts -> info (ansible#61505)
Browse files Browse the repository at this point in the history
* rename

* add symlink

* rename

* rename

* rename

* rename

* rename

* rename

* rename

* rename

* rename

* rename

* rename

* rename
  • Loading branch information
smile37773 authored and Zim Kalinowski committed Aug 29, 2019
1 parent 8768043 commit 7bb0556
Show file tree
Hide file tree
Showing 39 changed files with 228 additions and 169 deletions.
1 change: 1 addition & 0 deletions lib/ansible/modules/cloud/azure/_azure_rm_dnszone_facts.py
1 change: 1 addition & 0 deletions lib/ansible/modules/cloud/azure/_azure_rm_image_facts.py
1 change: 1 addition & 0 deletions lib/ansible/modules/cloud/azure/_azure_rm_lock_facts.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ def __init__(self):

self.results = dict(
changed=False,
ansible_facts=dict(
ansible_info=dict(
azure_availabilitysets=[]
)
)
Expand All @@ -156,9 +156,9 @@ def exec_module(self, **kwargs):
if self.name and not self.resource_group:
self.fail("Parameter error: resource group required when filtering by name.")
if self.name:
self.results['ansible_facts']['azure_availabilitysets'] = self.get_item()
self.results['ansible_info']['azure_availabilitysets'] = self.get_item()
else:
self.results['ansible_facts']['azure_availabilitysets'] = self.list_items()
self.results['ansible_info']['azure_availabilitysets'] = self.list_items()

return self.results

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@

DOCUMENTATION = '''
---
module: azure_rm_dnsrecordset_facts
module: azure_rm_dnsrecordset_info
version_added: "2.4"
version_added: "2.9"
short_description: Get DNS Record Set facts
Expand Down Expand Up @@ -51,18 +51,18 @@

EXAMPLES = '''
- name: Get facts for one Record Set
azure_rm_dnsrecordset_facts:
azure_rm_dnsrecordset_info:
resource_group: myResourceGroup
zone_name: example.com
relative_name: server10
record_type: A
- name: Get facts for all Type A Record Sets in a Zone
azure_rm_dnsrecordset_facts:
azure_rm_dnsrecordset_info:
resource_group: myResourceGroup
zone_name: example.com
record_type: A
- name: Get all record sets in one zone
azure_rm_dnsrecordset_facts:
azure_rm_dnsrecordset_info:
resource_group: myResourceGroup
zone_name: example.com
'''
Expand Down Expand Up @@ -163,7 +163,7 @@
)


class AzureRMRecordSetFacts(AzureRMModuleBase):
class AzureRMRecordSetInfo(AzureRMModuleBase):

def __init__(self):

Expand All @@ -179,7 +179,7 @@ def __init__(self):
# store the results of the module operation
self.results = dict(
changed=False,
ansible_facts=dict(azure_dnsrecordset=[])
ansible_info=dict(azure_dnsrecordset=[])
)

self.relative_name = None
Expand All @@ -188,10 +188,14 @@ def __init__(self):
self.record_type = None
self.top = None

super(AzureRMRecordSetFacts, self).__init__(self.module_arg_spec)
super(AzureRMRecordSetInfo, self).__init__(self.module_arg_spec)

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')

for key in self.module_arg_spec:
setattr(self, key, kwargs[key])

Expand All @@ -216,7 +220,8 @@ def exec_module(self, **kwargs):
# if there is a zone name listed, then they want all the record sets in a zone
results = self.list_zone()

self.results['ansible_facts']['azure_dnsrecordset'] = self.serialize_list(results)
if is_old_facts:
self.results['ansible_facts']['azure_dnsrecordset'] = self.serialize_list(results)
self.results['dnsrecordsets'] = self.curated_list(results)
return self.results

Expand Down Expand Up @@ -281,7 +286,7 @@ def record_to_dict(self, record):


def main():
AzureRMRecordSetFacts()
AzureRMRecordSetInfo()


if __name__ == '__main__':
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@

DOCUMENTATION = '''
---
module: azure_rm_dnszone_facts
module: azure_rm_dnszone_info
version_added: "2.4"
version_added: "2.9"
short_description: Get DNS zone facts
Expand Down Expand Up @@ -45,16 +45,16 @@

EXAMPLES = '''
- name: Get facts for one zone
azure_rm_dnszone_facts:
azure_rm_dnszone_info:
resource_group: myResourceGroup
name: foobar22
- name: Get facts for all zones in a resource group
azure_rm_dnszone_facts:
azure_rm_dnszone_info:
resource_group: myResourceGroup
- name: Get facts by tags
azure_rm_dnszone_facts:
azure_rm_dnszone_info:
tags:
- testing
'''
Expand Down Expand Up @@ -137,7 +137,7 @@
AZURE_OBJECT_CLASS = 'DnsZone'


class AzureRMDNSZoneFacts(AzureRMModuleBase):
class AzureRMDNSZoneInfo(AzureRMModuleBase):

def __init__(self):

Expand All @@ -151,17 +151,21 @@ def __init__(self):
# store the results of the module operation
self.results = dict(
changed=False,
ansible_facts=dict(azure_dnszones=[])
ansible_info=dict(azure_dnszones=[])
)

self.name = None
self.resource_group = None
self.tags = None

super(AzureRMDNSZoneFacts, self).__init__(self.module_arg_spec)
super(AzureRMDNSZoneInfo, self).__init__(self.module_arg_spec)

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')

for key in self.module_arg_spec:
setattr(self, key, kwargs[key])

Expand All @@ -180,7 +184,7 @@ def exec_module(self, **kwargs):
# all the zones in a subscription
results = self.list_items()

self.results['ansible_facts']['azure_dnszones'] = self.serialize_items(results)
self.results['ansible_info']['azure_dnszones'] = self.serialize_items(results)
self.results['dnszones'] = self.curated_items(results)

return self.results
Expand Down Expand Up @@ -247,7 +251,7 @@ def zone_to_dict(self, zone):


def main():
AzureRMDNSZoneFacts()
AzureRMDNSZoneInfo()


if __name__ == '__main__':
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

DOCUMENTATION = '''
---
module: azure_rm_functionapp_facts
version_added: "2.4"
module: azure_rm_functionapp_info
version_added: "2.9"
short_description: Get Azure Function App facts
description:
- Get facts for one Azure Function App or all Function Apps within a resource group.
Expand All @@ -42,16 +42,16 @@

EXAMPLES = '''
- name: Get facts for one Function App
azure_rm_functionapp_facts:
azure_rm_functionapp_info:
resource_group: myResourceGroup
name: myfunctionapp
- name: Get facts for all Function Apps in a resource group
azure_rm_functionapp_facts:
azure_rm_functionapp_info:
resource_group: myResourceGroup
- name: Get facts for all Function Apps by tags
azure_rm_functionapp_facts:
azure_rm_functionapp_info:
tags:
- testing
'''
Expand Down Expand Up @@ -108,7 +108,7 @@
from ansible.module_utils.azure_rm_common import AzureRMModuleBase


class AzureRMFunctionAppFacts(AzureRMModuleBase):
class AzureRMFunctionAppInfo(AzureRMModuleBase):
def __init__(self):

self.module_arg_spec = dict(
Expand All @@ -119,33 +119,37 @@ def __init__(self):

self.results = dict(
changed=False,
ansible_facts=dict(azure_functionapps=[])
ansible_info=dict(azure_functionapps=[])
)

self.name = None
self.resource_group = None
self.tags = None

super(AzureRMFunctionAppFacts, self).__init__(
super(AzureRMFunctionAppInfo, self).__init__(
self.module_arg_spec,
supports_tags=False,
facts_module=True
)

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')

for key in self.module_arg_spec:
setattr(self, key, kwargs[key])

if self.name and not self.resource_group:
self.fail("Parameter error: resource group required when filtering by name.")

if self.name:
self.results['ansible_facts']['azure_functionapps'] = self.get_functionapp()
self.results['ansible_info']['azure_functionapps'] = self.get_functionapp()
elif self.resource_group:
self.results['ansible_facts']['azure_functionapps'] = self.list_resource_group()
self.results['ansible_info']['azure_functionapps'] = self.list_resource_group()
else:
self.results['ansible_facts']['azure_functionapps'] = self.list_all()
self.results['ansible_info']['azure_functionapps'] = self.list_all()

return self.results

Expand Down Expand Up @@ -195,7 +199,7 @@ def list_all(self):


def main():
AzureRMFunctionAppFacts()
AzureRMFunctionAppInfo()


if __name__ == '__main__':
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

DOCUMENTATION = '''
---
module: azure_rm_hdinsightcluster_facts
version_added: "2.8"
module: azure_rm_hdinsightcluster_info
version_added: "2.9"
short_description: Get Azure HDInsight Cluster facts
description:
- Get facts of Azure HDInsight Cluster.
Expand All @@ -42,12 +42,12 @@

EXAMPLES = '''
- name: Get instance of HDInsight Cluster
azure_rm_hdinsightcluster_facts:
azure_rm_hdinsightcluster_info:
resource_group: myResourceGroup
name: myCluster
- name: List instances of HDInsight Cluster
azure_rm_hdinsightcluster_facts:
azure_rm_hdinsightcluster_info:
resource_group: myResourceGroup
'''

Expand Down Expand Up @@ -192,7 +192,7 @@
pass


class AzureRMHDInsightclusterFacts(AzureRMModuleBase):
class AzureRMHDInsightclusterInfo(AzureRMModuleBase):
def __init__(self):
# define user inputs into argument
self.module_arg_spec = dict(
Expand All @@ -215,9 +215,15 @@ def __init__(self):
self.name = None
self.tags = None

super(AzureRMHDInsightclusterFacts, self).__init__(self.module_arg_spec, supports_tags=False)
super(AzureRMHDInsightclusterInfo, self).__init__(self.module_arg_spec, supports_tags=False)

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')

for key in self.module_arg_spec:
setattr(self, key, kwargs[key])
self.mgmt_client = self.get_mgmt_svc_client(HDInsightManagementClient,
Expand Down Expand Up @@ -308,7 +314,7 @@ def format_response(self, item):


def main():
AzureRMHDInsightclusterFacts()
AzureRMHDInsightclusterInfo()


if __name__ == '__main__':
Expand Down
Loading

0 comments on commit 7bb0556

Please sign in to comment.