Browse Source

Fix issues with newest ansible-test 2.11

Change-Id: Ifdf253ca01b0e19b55867d8ead03eaceb5b2d73a
changes/96/785096/4
Sagi Shnaidman 2 weeks ago
parent
commit
c329f65b41
9 changed files with 13 additions and 21 deletions
  1. +1
    -1
      plugins/module_utils/openstack.py
  2. +2
    -1
      plugins/modules/baremetal_node.py
  3. +2
    -1
      plugins/modules/compute_flavor_info.py
  4. +2
    -1
      plugins/modules/identity_domain_info.py
  5. +2
    -1
      plugins/modules/identity_user_info.py
  6. +2
    -1
      plugins/modules/port_info.py
  7. +2
    -1
      plugins/modules/project_info.py
  8. +0
    -7
      tests/sanity/ignore-2.10.txt
  9. +0
    -7
      tests/sanity/ignore-2.11.txt

+ 1
- 1
plugins/module_utils/openstack.py View File

@ -290,7 +290,7 @@ class OpenStackModule:
"The '%s' module has been renamed to '%s' in openstack "
"collection: openstack.cloud.%s" % (
self.module_name, new_module_name, new_module_name),
version='2.10')
version='2.0.0', collection_name='openstack.cloud')
def openstack_cloud_from_module(self):
"""Sets up connection to cloud using provided options. Checks if all


+ 2
- 1
plugins/modules/baremetal_node.py View File

@ -242,7 +242,8 @@ def _parse_driver_info(sdk, module):
info.update(info.pop(deprecated))
module.deprecate("Suboption %s of the driver_info parameter of "
"'openstack.cloud.baremetal_node' is deprecated"
% deprecated, version='2.0.0')
% deprecated, version='2.0.0',
collection_name='openstack.cloud')
return info


+ 2
- 1
plugins/modules/compute_flavor_info.py View File

@ -184,7 +184,8 @@ def main():
is_old_facts = module._name == 'openstack.cloud.compute_flavor_facts'
if is_old_facts:
module.deprecate("The 'openstack.cloud.compute_flavor_facts' module has been renamed to 'openstack.cloud.compute_flavor_info', "
"and the renamed one no longer returns ansible_facts", version='2.13')
"and the renamed one no longer returns ansible_facts", version='2.0.0',
collection_name='openstack.cloud')
name = module.params['name']
vcpus = module.params['vcpus']


+ 2
- 1
plugins/modules/identity_domain_info.py View File

@ -102,7 +102,8 @@ def main():
is_old_facts = module._name == 'openstack.cloud.identity_domain_facts'
if is_old_facts:
module.deprecate("The 'openstack.cloud.identity_domain_facts' module has been renamed to 'openstack.cloud.identity_domain_info', "
"and the renamed one no longer returns ansible_facts", version='2.13')
"and the renamed one no longer returns ansible_facts", version='2.0.0',
collection_name='openstack.cloud')
sdk, opcloud = openstack_cloud_from_module(module)
try:


+ 2
- 1
plugins/modules/identity_user_info.py View File

@ -126,7 +126,8 @@ def main():
is_old_facts = module._name == 'openstack.cloud.identity_user_facts'
if is_old_facts:
module.deprecate("The 'openstack.cloud.identity_user_facts' module has been renamed to 'openstack.cloud.identity_user_info', "
"and the renamed one no longer returns ansible_facts", version='2.13')
"and the renamed one no longer returns ansible_facts", version='2.0.0',
collection_name='openstack.cloud')
sdk, opcloud = openstack_cloud_from_module(module)
try:


+ 2
- 1
plugins/modules/port_info.py View File

@ -195,7 +195,8 @@ def main():
is_old_facts = module._name == 'openstack.cloud.port_facts'
if is_old_facts:
module.deprecate("The 'openstack.cloud.port_facts' module has been renamed to 'openstack.cloud.port_info', "
"and the renamed one no longer returns ansible_facts", version='2.13')
"and the renamed one no longer returns ansible_facts", version='2.0.0',
collection_name='openstack.cloud')
port = module.params.get('port')
filters = module.params.get('filters')


+ 2
- 1
plugins/modules/project_info.py View File

@ -115,7 +115,8 @@ def main():
is_old_facts = module._name == 'openstack.cloud.project_facts'
if is_old_facts:
module.deprecate("The 'openstack.cloud.project_facts' module has been renamed to 'openstack.cloud.project_info', "
"and the renamed one no longer returns ansible_facts", version='2.13')
"and the renamed one no longer returns ansible_facts", version='2.0.0',
collection_name='openstack.cloud')
sdk, opcloud = openstack_cloud_from_module(module)
try:


+ 0
- 7
tests/sanity/ignore-2.10.txt View File

@ -1,7 +0,0 @@
plugins/modules/baremetal_node.py pylint:ansible-deprecated-no-collection-name
plugins/modules/compute_flavor_info.py pylint:ansible-deprecated-no-collection-name
plugins/modules/identity_domain_info.py pylint:ansible-deprecated-no-collection-name
plugins/modules/identity_user_info.py pylint:ansible-deprecated-no-collection-name
plugins/modules/port_info.py pylint:ansible-deprecated-no-collection-name
plugins/modules/project_info.py pylint:ansible-deprecated-no-collection-name
plugins/module_utils/openstack.py pylint:ansible-deprecated-no-collection-name

+ 0
- 7
tests/sanity/ignore-2.11.txt View File

@ -1,7 +0,0 @@
plugins/modules/baremetal_node.py pylint:ansible-deprecated-no-collection-name
plugins/modules/compute_flavor_info.py pylint:ansible-deprecated-no-collection-name
plugins/modules/identity_domain_info.py pylint:ansible-deprecated-no-collection-name
plugins/modules/identity_user_info.py pylint:ansible-deprecated-no-collection-name
plugins/modules/port_info.py pylint:ansible-deprecated-no-collection-name
plugins/modules/project_info.py pylint:ansible-deprecated-no-collection-name
plugins/module_utils/openstack.py pylint:ansible-deprecated-no-collection-name

Loading…
Cancel
Save