sanity: add two missing {compile,import}-2.6!skip (#1194)

sanity: add two missing {compile,import}-2.6!skip Reviewed-by: Mario Lenz <[email protected]>
ansible-collections · Jan 18, 2022 · 67b9506 · 67b9506
1 parent e79d395
commit 67b9506
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 4 deletions.
diff --git a/plugins/modules/vmware_guest_network.py b/plugins/modules/vmware_guest_network.py
@@ -866,7 +866,7 @@ def main():
         network_data = {}
         module.deprecate(
             msg='The old way of configuring interfaces by supplying an arbitrary list will be removed, loops should be used to handle multiple interfaces',
-            version='2.0.0',
+            version='3.0.0',
             collection_name='community.vmware'
         )
         diff, changed, network_info = pyv._deprectated_list_config()

diff --git a/plugins/modules/vmware_host_firewall_manager.py b/plugins/modules/vmware_host_firewall_manager.py
@@ -405,7 +405,7 @@ def main():
             module.deprecate(
                 msg=('Please adjust your playbook to ensure the `allowed_hosts` '
                      'entries come with an `all_ip` key (boolean).'),
-                version='2.0.0',
+                version='3.0.0',
                 collection_name='community.vmware'
             )
 

diff --git a/plugins/modules/vsphere_copy.py b/plugins/modules/vsphere_copy.py
@@ -141,9 +141,9 @@ def main():
     )
 
     if module.params.get('host'):
-        module.deprecate("The 'host' option is being replaced by 'hostname'", version='2.0.0', collection_name='community.vmware')
+        module.deprecate("The 'host' option is being replaced by 'hostname'", version='3.0.0', collection_name='community.vmware')
     if module.params.get('login'):
-        module.deprecate("The 'login' option is being replaced by 'username'", version='2.0.0', collection_name='community.vmware')
+        module.deprecate("The 'login' option is being replaced by 'username'", version='3.0.0', collection_name='community.vmware')
 
     hostname = module.params['hostname']
     username = module.params['username']

diff --git a/tests/integration/targets/vmware_host_firewall_manager/tasks/main.yml b/tests/integration/targets/vmware_host_firewall_manager/tasks/main.yml
@@ -18,6 +18,8 @@
         rules:
           - name: vvold
             enabled: true
+            allowed_hosts:
+              all_ip: true
       register: all_hosts_result
     - debug: msg="{{ all_hosts_result }}"
     - name: ensure everything is changed for all hosts of {{ ccr1 }}
@@ -73,6 +75,8 @@
         rules:
           - name: vvold
             enabled: true
+            allowed_hosts:
+              all_ip: true
       register: all_hosts_result_check_mode
       check_mode: true
     - debug: var=all_hosts_result_check_mode

diff --git a/tests/sanity/ignore-2.11.txt b/tests/sanity/ignore-2.11.txt
@@ -196,6 +196,8 @@ plugins/modules/vmware_guest_tools_upgrade.py compile-2.6!skip
 plugins/modules/vmware_guest_tools_upgrade.py import-2.6!skip
 plugins/modules/vmware_guest_tools_wait.py compile-2.6!skip
 plugins/modules/vmware_guest_tools_wait.py import-2.6!skip
+plugins/modules/vmware_guest_tpm.py compile-2.6!skip
+plugins/modules/vmware_guest_tpm.py import-2.6!skip
 plugins/modules/vmware_guest_video.py compile-2.6!skip
 plugins/modules/vmware_guest_video.py import-2.6!skip
 plugins/modules/vmware_guest_vnc.py compile-2.6!skip
@@ -327,6 +329,8 @@ plugins/modules/vmware_vcenter_settings_info.py compile-2.6!skip
 plugins/modules/vmware_vcenter_settings_info.py import-2.6!skip
 plugins/modules/vmware_vcenter_statistics.py compile-2.6!skip
 plugins/modules/vmware_vcenter_statistics.py import-2.6!skip
+plugins/modules/vmware_vm_config_option.py compile-2.6!skip
+plugins/modules/vmware_vm_config_option.py import-2.6!skip
 plugins/modules/vmware_vm_host_drs_rule.py compile-2.6!skip
 plugins/modules/vmware_vm_host_drs_rule.py import-2.6!skip
 plugins/modules/vmware_vm_info.py compile-2.6!skip

diff --git a/tests/sanity/ignore-2.12.txt b/tests/sanity/ignore-2.12.txt
@@ -167,6 +167,8 @@ plugins/modules/vmware_guest_tools_upgrade.py compile-2.6!skip
 plugins/modules/vmware_guest_tools_upgrade.py import-2.6!skip
 plugins/modules/vmware_guest_tools_wait.py compile-2.6!skip
 plugins/modules/vmware_guest_tools_wait.py import-2.6!skip
+plugins/modules/vmware_guest_tpm.py compile-2.6!skip
+plugins/modules/vmware_guest_tpm.py import-2.6!skip
 plugins/modules/vmware_guest_video.py compile-2.6!skip
 plugins/modules/vmware_guest_video.py import-2.6!skip
 plugins/modules/vmware_guest_vnc.py compile-2.6!skip
@@ -298,6 +300,8 @@ plugins/modules/vmware_vcenter_settings_info.py compile-2.6!skip
 plugins/modules/vmware_vcenter_settings_info.py import-2.6!skip
 plugins/modules/vmware_vcenter_statistics.py compile-2.6!skip
 plugins/modules/vmware_vcenter_statistics.py import-2.6!skip
+plugins/modules/vmware_vm_config_option.py compile-2.6!skip
+plugins/modules/vmware_vm_config_option.py import-2.6!skip
 plugins/modules/vmware_vm_host_drs_rule.py compile-2.6!skip
 plugins/modules/vmware_vm_host_drs_rule.py import-2.6!skip
 plugins/modules/vmware_vm_info.py compile-2.6!skip