be compliant to pep8 and pylint. Added integration tests.

lib/ansible/modules/network/aci/aci_access_port_block_to_access_port.py

@@ -250,11 +250,11 @@ from ansible.module_utils.basic import AnsibleModule
 def main():
     argument_spec = aci_argument_spec()
     argument_spec.update(
-        leaf_interface_profile=dict(type='str', aliases=['leaf_interface_profile_name']), # Not required for querying all objects 
+        leaf_interface_profile=dict(type='str', aliases=['leaf_interface_profile_name']),  # Not required for querying all objects
-        access_port_selector=dict(type='str', aliases=['name', 'access_port_selector_name']), # Not required for querying all objects
+        access_port_selector=dict(type='str', aliases=['name', 'access_port_selector_name']),  # Not required for querying all objects
-        leaf_port_blk=dict(type='str', aliases=['leaf_port_blk_name']), # Not required for querying all objects
+        leaf_port_blk=dict(type='str', aliases=['leaf_port_blk_name']),  # Not required for querying all objects
-        from_port=dict(type='str', aliases=['from', 'fromPort', 'from_port_range']), # Not required for querying all objects and deleting port blocks
+        from_port=dict(type='str', aliases=['from', 'fromPort', 'from_port_range']),  # Not required for querying all objects and deleting port blocks
-        to_port=dict(type='str', aliases=['to', 'toPort', 'to_port_range']), # Not required for querying all objects and deleting port blocks
+        to_port=dict(type='str', aliases=['to', 'toPort', 'to_port_range']),  # Not required for querying all objects and deleting port blocks
         from_card=dict(type='str', aliases=['from_card_range']),
         to_card=dict(type='str', aliases=['to_card_range']),
         state=dict(type='str', default='present', choices=['absent', 'present', 'query']),
@@ -264,8 +264,8 @@ def main():
         argument_spec=argument_spec,
         supports_check_mode=True,
         required_if=[
-            ['state', 'absent', ['access_port_selector', 'leaf_port_blk', 'leaf_interface_profile' ]],
+            ['state', 'absent', ['access_port_selector', 'leaf_port_blk', 'leaf_interface_profile']],
-            ['state', 'present', ['access_port_selector', 'leaf_port_blk', 'from_port', 'to_port', 'leaf_interface_profile' ]],
+            ['state', 'present', ['access_port_selector', 'leaf_port_blk', 'from_port', 'to_port', 'leaf_interface_profile']],
         ],
     )
 

test/integration/targets/aci_access_port_block_to_access_port/aliases

@@ -0,0 +1,2 @@
+# No ACI simulator yet, so not enabled
+unsupported

test/integration/targets/aci_access_port_block_to_access_port/tasks/main.yml

@@ -0,0 +1,140 @@
+# Test code for the ACI modules
+# Copyright: (c) 2017, Bruno Calogero <brunocalogero@hotmail.com>
+
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+- name: Test that we have an ACI APIC host, ACI username and ACI password
+  fail:
+    msg: 'Please define the following variables: aci_hostname, aci_username and aci_password.'
+  when: aci_hostname is not defined or aci_username is not defined or aci_password is not defined
+
+- name: Ensuring Interface Policy Leaf profile exists for kick off
+  aci_interface_policy_leaf_profile: &aci_interface_policy_leaf_profile_present
+    host: "{{ aci_hostname }}"
+    username: "{{ aci_username }}"
+    password: "{{ aci_password }}"
+    validate_certs: '{{ aci_validate_certs | default(false) }}'
+    use_ssl: '{{ aci_use_ssl | default(true) }}'
+    use_proxy: '{{ aci_use_proxy | default(true) }}'
+    output_level: debug
+    state: present
+    leaf_interface_profile: leafintprftest
+  register: leaf_profile_present
+
+- name: Ensure Interface Access Port Selector exists for kick of
+  aci_access_port_to_interface_policy_leaf_profile: &aci_access_port_to_interface_policy_leaf_profile_present
+    <<: *aci_interface_policy_leaf_profile_present
+    access_port_selector: anstest_accessportselector
+
+# TODO: Ensure that leaf Policy Group Exists (module missing) (infra:AccPortGrp)
+
+- name: Bind an Access Port Block to an Interface Access Port Selector - check mode works
+  aci_access_port_block_to_access_port: &aci_access_port_block_to_access_port_present
+    <<: *aci_access_port_to_interface_policy_leaf_profile_present
+    leaf_port_blk: anstest_leafportblkname
+    fromPort: 13
+    toPort: 16
+  check_mode: yes
+  register: accessportblock_to_accessport_check_mode_present
+
+- name: Bind an Access Port Block to an Interface Access Port Selector - creation works
+  aci_access_port_block_to_access_port:
+    <<: *aci_access_port_block_to_access_port_present
+  register: accessportblock_to_accessport_present
+
+- name: Bind an Access Port Block to an Interface Access Port Selector - idempotency works
+  aci_access_port_block_to_access_port:
+    <<: *aci_access_port_block_to_access_port_present
+  register: accessportblock_to_accessport_idempotent
+
+- name: Bind an Access Port Block to an Interface Access Port Selector - update works
+  aci_access_port_block_to_access_port:
+    <<: *aci_access_port_block_to_access_port_present
+    leaf_port_blk: anstest_leafportblkname
+    fromPort: 13
+    toPort: 15
+  register: accessportblock_to_accessport_update
+
+# TODO: also test for errors
+- name: present assertions
+  assert:
+    that:
+    - accessportblock_to_accessport_check_mode_present is changed
+    - accessportblock_to_accessport_present is changed
+    - accessportblock_to_accessport_present.previous == []
+    - 'accessportblock_to_accessport_present.sent == {"infraPortBlk": {"attributes": {"name": "anstest_leafportblkname", "fromPort": "16", "toPort": "16"}}}'
+    - accessportblock_to_accessport_idempotent is not changed
+    - accessportblock_to_accessport_idempotent.sent == {}
+    - accessportblock_to_accessport_update is changed
+    - 'accessportblock_to_accessport_update.sent == {"infraPortBlk": {"attributes": {"name": "anstest_leafportblkname", "fromPort": "15", "toPort": "15"}}}'
+
+
+# TODO FROM HERE
+
+- name: Query Specific port block and access_port_selector binding
+  aci_access_port_block_to_access_port:
+    <<: *aci_access_port_block_to_access_port_present
+    state: query
+  register: binding_query
+
+- name: present assertions
+  assert:
+    that:
+      - binding_query is not changed
+      - binding_query.current | length >= 1
+      - '"api/mo/uni/infra/accportprof-leafintprftest/hports-anstest_accessportselector-typ-range/portblk-anstest_leafportblkname.json" in binding_query.url'
+
+- name: Remove binding of Access Port Block and Interface Access Port Selector - check mode
+  aci_access_port_block_to_access_port: &aci_access_port_block_to_access_port_absent
+    <<: *aci_access_port_block_to_access_port_present
+    state: absent
+  check_mode: yes
+  register: accessportblock_to_accessport_check_mode_absent
+
+- name: Remove binding of Access Port Block and Interface Access Port Selector - delete works
+  aci_access_port_block_to_access_port:
+    <<: *aci_access_port_block_to_access_port_absent
+  register: accessportblock_to_accessport_absent
+
+- name: Remove binding of Access Port Block and Interface Access Port Selector - idempotency works
+  aci_access_port_block_to_access_port:
+    <<: *aci_access_port_block_to_access_port_absent
+  register: accessportblock_to_accessport_absent_idempotent
+
+- name: Remove binding of Access Port Block and Interface Access Port Selector - check mode
+  aci_access_port_block_to_access_port:
+    <<: *aci_access_port_to_interface_policy_leaf_profile_present
+    #leaf_port_blk: anstest_leafportblkname
+    #fromPort: 13
+    #toPort: 16
+    state: absent
+  ignore_errors: yes
+  register: accessportblock_to_accessport_absent_missing_param
+
+- name: absent assertions
+  assert:
+    that:
+      - accessportblock_to_accessport_check_mode_absent is changed
+      - accessportblock_to_accessport_check_mode_absent.previous != []
+      - accessportblock_to_accessport_absent is changed
+      - accessportblock_to_accessport_absent.previous == accessportblock_to_accessport_check_mode_absent.previous
+      - accessportblock_to_accessport_absent_idempotent is not changed
+      - accessportblock_to_accessport_absent_idempotent.previous == []
+      - accessportblock_to_accessport_absent_missing_param is failed
+      - 'accessportblock_to_accessport_absent_missing_param.msg == "state is absent but all of the following are missing: leaf_port_blk, fromPort, toPort"'
+
+
+- name: Remove binding of Access Port Block and Interface Access Port Selector - Clean up
+  aci_access_port_block_to_access_port:
+    <<: *aci_access_port_block_to_access_port_present
+    state: absent
+
+- name: Remove Interface Access Port Selector  - Cleanup
+  aci_interface_policy_leaf_profile:
+    <<: *aci_access_port_to_interface_policy_leaf_profile_present
+    state: absent
+
+- name: Remove Interface policy leaf profile - Cleanup
+  aci_interface_policy_leaf_profile:
+    <<: *aci_interface_policy_leaf_profile_present
+    state: absent

test/integration/targets/aci_access_port_to_interface_policy_leaf_profile/tasks/main.yml

@@ -27,9 +27,6 @@
   aci_access_port_to_interface_policy_leaf_profile: &aci_access_port_to_interface_policy_leaf_profile_present
     <<: *aci_interface_policy_leaf_profile_present
     access_port_selector: anstest_accessportselector
-    leaf_port_blk: anstest_leafportblkname
-    fromPort: 13
-    toPort: 16
   check_mode: yes
   register: accessport_to_intf_check_mode_present
 
@@ -56,7 +53,7 @@
     - accessport_to_intf_check_mode_present is changed
     - accessport_to_intf_present is changed
     - accessport_to_intf_present.previous == []
-    - 'accessport_to_intf_present.sent == {"infraHPortS": {"attributes": {"name": "anstest_accessportselector"}, "children": [{"infraPortBlk": {"attributes": {"fromPort": "13", "name": "anstest_leafportblkname", "toPort": "16"}}}, {"infraRsAccBaseGrp": {"attributes": {"tDn": "uni/infra/funcprof/accportgrp-None"}}}]}}'
+    - 'accessport_to_intf_present.sent == {"infraHPortS": {"attributes": {"name": "anstest_accessportselector"}, "children": [{"infraRsAccBaseGrp": {"attributes": {"tDn": "uni/infra/funcprof/accportgrp-None"}}}]}}'
     - accessport_to_intf_idempotent is not changed
     - accessport_to_intf_idempotent.sent == {}
     - accessport_to_intf_update is changed