diff --git a/lib/ansible/modules/network/aci/aci_switch_policy_leaf_profile.py b/lib/ansible/modules/network/aci/aci_switch_policy_leaf_profile.py
new file mode 100644
index 00000000000..e98f34b839e
--- /dev/null
+++ b/lib/ansible/modules/network/aci/aci_switch_policy_leaf_profile.py
@@ -0,0 +1,134 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+# 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)
+
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+
+ANSIBLE_METADATA = {'metadata_version': '1.1',
+                    'status': ['preview'],
+                    'supported_by': 'community'}
+
+DOCUMENTATION = r'''
+---
+module: aci_switch_policy_leaf_profile
+short_description: Create switch policy leaf profiles on Cisco ACI fabrics (infra:NodeP)
+description:
+- Create switch policy leaf profiles on Cisco ACI fabrics.
+- More information from the internal APIC class I(infra:NodeP) at
+  U(https://developer.cisco.com/site/aci/docs/apis/apic-mim-ref/).
+author:
+- Bruno Calogero (@brunocalogero)
+version_added: '2.5'
+options:
+  leaf_profile:
+    description:
+    - The name of the Leaf Profile.
+    aliases: [ name, leaf_profile_name ]
+  description:
+    description:
+    - Description for the Leaf Profile.
+    aliases: [ descr ]
+  state:
+    description:
+    - Use C(present) or C(absent) for adding or removing.
+    - Use C(query) for listing an object or multiple objects.
+    choices: [ absent, present, query ]
+    default: present
+extends_documentation_fragment: aci
+'''
+
+EXAMPLES = r'''
+- name: creating a Leaf Profile with description
+  aci_switch_policy_leaf_profile:
+    hostname: apic
+    username: someusername
+    password: somepassword
+    leaf_profile: sw_name
+    description: sw_description
+    state: present
+
+- name: Deleting a Leaf Profile
+  aci_switch_policy_leaf_profile:
+    hostname: apic
+    username: someusername
+    password: somepassword
+    leaf_profile: sw_name
+    state: absent
+
+- name: Query a Leaf Profile
+  aci_switch_policy_leaf_profile:
+    hostname: apic
+    username: someusername
+    password: somepassword
+    leaf_profile: sw_name
+    state: query
+'''
+
+RETURN = r'''
+#
+'''
+
+from ansible.module_utils.network.aci.aci import ACIModule, aci_argument_spec
+from ansible.module_utils.basic import AnsibleModule
+
+
+def main():
+    argument_spec = aci_argument_spec
+    argument_spec.update(
+        leaf_profile=dict(type='str', aliases=['name', 'leaf_profile_name']),
+        description=dict(type='str', aliases=['descr']),
+        state=dict(type='str', default='present', choices=['absent', 'present', 'query']),
+    )
+
+    module = AnsibleModule(
+        argument_spec=argument_spec,
+        supports_check_mode=True,
+        required_if=[
+            ['state', 'absent', ['leaf_profile']],
+            ['state', 'present', ['leaf_profile']],
+        ],
+    )
+
+    leaf_profile = module.params['leaf_profile']
+    description = module.params['description']
+    state = module.params['state']
+
+    aci = ACIModule(module)
+    aci.construct_url(
+        root_class=dict(
+            aci_class='infraNodeP',
+            aci_rn='infra/nprof-{0}'.format(leaf_profile),
+            filter_target='eq(infraNodeP.name, "{0}")'.format(leaf_profile),
+            module_object=leaf_profile
+        )
+    )
+
+    aci.get_existing()
+
+    if state == 'present':
+        # Filter out module parameters with null values
+        aci.payload(
+            aci_class='infraNodeP',
+            class_config=dict(
+                name=leaf_profile,
+                descr=description,
+            )
+        )
+
+        # Generate config diff which will be used as POST request body
+        aci.get_diff(aci_class='infraNodeP')
+
+        # Submit changes if module not in check_mode and the proposed is different than existing
+        aci.post_config()
+
+    elif state == 'absent':
+        aci.delete_config()
+
+    module.exit_json(**aci.result)
+
+
+if __name__ == "__main__":
+    main()