From aa9fc9313f36407cd376fd8a0775f7be3ba3988c Mon Sep 17 00:00:00 2001
From: Jacob McGill <jacob@networktocode.com>
Date: Sat, 13 Jan 2018 23:43:44 -0500
Subject: [PATCH] Aci access port to interface policy leaf profile (#34842)

* ACI_ACC_PORT_TO_INTF_POL_LEAF_PROF: Change from/to to standard used elsewhere

* ACI_ACC_PORT_TO_INTF_POL_LEAF_PROF: Add description options

* ACI_ACC_PORT_TO_INTF_POL_LEAF_PROF: Add missing trailing commas
---
 ...s_port_to_interface_policy_leaf_profile.py | 70 +++++++++++++------
 1 file changed, 49 insertions(+), 21 deletions(-)

diff --git a/lib/ansible/modules/network/aci/aci_access_port_to_interface_policy_leaf_profile.py b/lib/ansible/modules/network/aci/aci_access_port_to_interface_policy_leaf_profile.py
index 5a2ce68008..d9d420d41b 100644
--- a/lib/ansible/modules/network/aci/aci_access_port_to_interface_policy_leaf_profile.py
+++ b/lib/ansible/modules/network/aci/aci_access_port_to_interface_policy_leaf_profile.py
@@ -33,21 +33,29 @@ options:
     -  The name of the Fabric access policy leaf interface profile access port selector.
     required: yes
     aliases: [ name, access_port_selector_name ]
+  description:
+    description:
+    - The description to assign to the C(access_port_selector)
+    required: no
   leaf_port_blk:
     description:
     - The name of the Fabric access policy leaf interface profile access port block.
     required: yes
     aliases: [ leaf_port_blk_name ]
-  fromPort:
+  leaf_port_blk_description:
+    description:
+    - The description to assign to the C(leaf_port_blk)
+    required: no
+  from:
     description:
     - The beggining (from range) of the port range block for the leaf access port block.
     required: yes
-    aliases: [ from_port_range ]
-  toPort:
+    aliases: [ fromPort, from_port_range ]
+  to:
     description:
     - The end (to range) of the port range block for the leaf access port block.
     required: yes
-    aliases: [ to_port_range ]
+    aliases: [ toPort, to_port_range ]
   policy_group:
     description:
     - The name of the fabric access policy group to be associated with the leaf interface profile interface selector.
@@ -70,8 +78,8 @@ EXAMPLES = r'''
     leaf_interface_profile: leafintprfname
     access_port_selector: accessportselectorname
     leaf_port_blk: leafportblkname
-    fromPort: 13
-    toPort: 16
+    from: 13
+    to: 16
     policy_group: policygroupname
     state: present
 
@@ -83,8 +91,8 @@ EXAMPLES = r'''
     leaf_interface_profile: leafintprfname
     access_port_selector: accessportselectorname
     leaf_port_blk: leafportblkname
-    fromPort: 13
-    toPort: 16
+    from: 13
+    to: 16
     state: present
 
 - name: Remove an interface access port selector associated with an Interface Policy Leaf Profile
@@ -116,15 +124,17 @@ 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']),
-        access_port_selector=dict(type='str', aliases=['name', 'access_port_selector_name']),
-        leaf_port_blk=dict(type='str', aliases=['leaf_port_blk_name']),
-        fromPort=dict(type='str', aliases=['from_port_range']),
-        toPort=dict(type='str', aliases=['to_port_range']),
-        policy_group=dict(type='str', aliases=['policy_group_name']),
-        state=dict(type='str', default='present', choices=['absent', 'present', 'query']),
-    )
+    argument_spec.update({
+        'leaf_interface_profile': dict(type='str', aliases=['leaf_interface_profile_name']),
+        'access_port_selector': dict(type='str', aliases=['name', 'access_port_selector_name']),
+        'description': dict(typ='str'),
+        'leaf_port_blk': dict(type='str', aliases=['leaf_port_blk_name']),
+        'leaf_port_blk_description': dict(type='str'),
+        'from': dict(type='str', aliases=['fromPort', 'from_port_range']),
+        'to': dict(type='str', aliases=['toPort', 'to_port_range']),
+        'policy_group': dict(type='str', aliases=['policy_group_name']),
+        'state': dict(type='str', default='present', choices=['absent', 'present', 'query']),
+    })
 
     module = AnsibleModule(
         argument_spec=argument_spec,
@@ -137,9 +147,11 @@ def main():
 
     leaf_interface_profile = module.params['leaf_interface_profile']
     access_port_selector = module.params['access_port_selector']
+    description = module.params['description']
     leaf_port_blk = module.params['leaf_port_blk']
-    fromPort = module.params['fromPort']
-    toPort = module.params['toPort']
+    leaf_port_blk_description = module.params['leaf_port_blk_description']
+    from_ = module.params['from']
+    to_ = module.params['to']
     policy_group = module.params['policy_group']
     state = module.params['state']
 
@@ -167,11 +179,27 @@ def main():
         aci.payload(
             aci_class='infraHPortS',
             class_config=dict(
+                descr=description,
                 name=access_port_selector,
             ),
             child_configs=[
-                dict(infraPortBlk=dict(attributes=dict(name=leaf_port_blk, fromPort=fromPort, toPort=toPort))),
-                dict(infraRsAccBaseGrp=dict(attributes=dict(tDn='uni/infra/funcprof/accportgrp-{0}'.format(policy_group)))),
+                dict(
+                    infraPortBlk=dict(
+                        attributes=dict(
+                            descr=leaf_port_blk_description,
+                            name=leaf_port_blk,
+                            fromPort=from_,
+                            toPort=to_,
+                        )
+                    )
+                ),
+                dict(
+                    infraRsAccBaseGrp=dict(
+                        attributes=dict(
+                            tDn='uni/infra/funcprof/accportgrp-{0}'.format(policy_group),
+                        )
+                    )
+                ),
             ],
         )