From 46e53f90a74bd122b7799f988794b3014cf15860 Mon Sep 17 00:00:00 2001 From: Dag Wieers Date: Mon, 22 Jan 2018 12:40:15 +0100 Subject: [PATCH] ACI: Rename aci_intf_policy_* to aci_interface_policy_* (#35170) * ACI: Rename aci_intf_policy_* to aci_interface_policy_* * Modify documentation accordingly * Fix validity ignore file --- .../modules/network/aci/_aci_intf_policy_fc.py | 1 + .../modules/network/aci/_aci_intf_policy_l2.py | 1 + .../modules/network/aci/_aci_intf_policy_lldp.py | 1 + .../modules/network/aci/_aci_intf_policy_mcp.py | 1 + .../network/aci/_aci_intf_policy_port_channel.py | 1 + .../network/aci/_aci_intf_policy_port_security.py | 1 + ..._intf_policy_fc.py => aci_interface_policy_fc.py} | 4 ++-- ..._intf_policy_l2.py => aci_interface_policy_l2.py} | 4 ++-- ...f_policy_lldp.py => aci_interface_policy_lldp.py} | 4 ++-- ...ntf_policy_mcp.py => aci_interface_policy_mcp.py} | 4 ++-- ...annel.py => aci_interface_policy_port_channel.py} | 4 ++-- ...rity.py => aci_interface_policy_port_security.py} | 4 ++-- test/sanity/validate-modules/ignore.txt | 12 ++++++------ 13 files changed, 24 insertions(+), 18 deletions(-) create mode 120000 lib/ansible/modules/network/aci/_aci_intf_policy_fc.py create mode 120000 lib/ansible/modules/network/aci/_aci_intf_policy_l2.py create mode 120000 lib/ansible/modules/network/aci/_aci_intf_policy_lldp.py create mode 120000 lib/ansible/modules/network/aci/_aci_intf_policy_mcp.py create mode 120000 lib/ansible/modules/network/aci/_aci_intf_policy_port_channel.py create mode 120000 lib/ansible/modules/network/aci/_aci_intf_policy_port_security.py rename lib/ansible/modules/network/aci/{aci_intf_policy_fc.py => aci_interface_policy_fc.py} (98%) rename lib/ansible/modules/network/aci/{aci_intf_policy_l2.py => aci_interface_policy_l2.py} (98%) rename lib/ansible/modules/network/aci/{aci_intf_policy_lldp.py => aci_interface_policy_lldp.py} (98%) rename lib/ansible/modules/network/aci/{aci_intf_policy_mcp.py => aci_interface_policy_mcp.py} (98%) rename lib/ansible/modules/network/aci/{aci_intf_policy_port_channel.py => aci_interface_policy_port_channel.py} (98%) rename lib/ansible/modules/network/aci/{aci_intf_policy_port_security.py => aci_interface_policy_port_security.py} (98%) diff --git a/lib/ansible/modules/network/aci/_aci_intf_policy_fc.py b/lib/ansible/modules/network/aci/_aci_intf_policy_fc.py new file mode 120000 index 00000000000..4f1118aa6de --- /dev/null +++ b/lib/ansible/modules/network/aci/_aci_intf_policy_fc.py @@ -0,0 +1 @@ +aci_interface_policy_fc.py \ No newline at end of file diff --git a/lib/ansible/modules/network/aci/_aci_intf_policy_l2.py b/lib/ansible/modules/network/aci/_aci_intf_policy_l2.py new file mode 120000 index 00000000000..924390568c0 --- /dev/null +++ b/lib/ansible/modules/network/aci/_aci_intf_policy_l2.py @@ -0,0 +1 @@ +aci_interface_policy_l2.py \ No newline at end of file diff --git a/lib/ansible/modules/network/aci/_aci_intf_policy_lldp.py b/lib/ansible/modules/network/aci/_aci_intf_policy_lldp.py new file mode 120000 index 00000000000..5d751deab32 --- /dev/null +++ b/lib/ansible/modules/network/aci/_aci_intf_policy_lldp.py @@ -0,0 +1 @@ +aci_interface_policy_lldp.py \ No newline at end of file diff --git a/lib/ansible/modules/network/aci/_aci_intf_policy_mcp.py b/lib/ansible/modules/network/aci/_aci_intf_policy_mcp.py new file mode 120000 index 00000000000..89b63092463 --- /dev/null +++ b/lib/ansible/modules/network/aci/_aci_intf_policy_mcp.py @@ -0,0 +1 @@ +aci_interface_policy_mcp.py \ No newline at end of file diff --git a/lib/ansible/modules/network/aci/_aci_intf_policy_port_channel.py b/lib/ansible/modules/network/aci/_aci_intf_policy_port_channel.py new file mode 120000 index 00000000000..bed0d328862 --- /dev/null +++ b/lib/ansible/modules/network/aci/_aci_intf_policy_port_channel.py @@ -0,0 +1 @@ +aci_interface_policy_port_channel.py \ No newline at end of file diff --git a/lib/ansible/modules/network/aci/_aci_intf_policy_port_security.py b/lib/ansible/modules/network/aci/_aci_intf_policy_port_security.py new file mode 120000 index 00000000000..ff1bc0fdc79 --- /dev/null +++ b/lib/ansible/modules/network/aci/_aci_intf_policy_port_security.py @@ -0,0 +1 @@ +aci_interface_policy_port_security.py \ No newline at end of file diff --git a/lib/ansible/modules/network/aci/aci_intf_policy_fc.py b/lib/ansible/modules/network/aci/aci_interface_policy_fc.py similarity index 98% rename from lib/ansible/modules/network/aci/aci_intf_policy_fc.py rename to lib/ansible/modules/network/aci/aci_interface_policy_fc.py index c3f712954a2..db43b16376f 100644 --- a/lib/ansible/modules/network/aci/aci_intf_policy_fc.py +++ b/lib/ansible/modules/network/aci/aci_interface_policy_fc.py @@ -12,7 +12,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = r''' --- -module: aci_intf_policy_fc +module: aci_interface_policy_fc short_description: Manage Fibre Channel interface policies on Cisco ACI fabrics (fc:IfPol) description: - Manage ACI Fiber Channel interface policies on Cisco ACI fabrics. @@ -46,7 +46,7 @@ extends_documentation_fragment: aci ''' EXAMPLES = r''' -- aci_intf_policy_fc: +- aci_interface_policy_fc: hostname: '{{ hostname }}' username: '{{ username }}' password: '{{ password }}' diff --git a/lib/ansible/modules/network/aci/aci_intf_policy_l2.py b/lib/ansible/modules/network/aci/aci_interface_policy_l2.py similarity index 98% rename from lib/ansible/modules/network/aci/aci_intf_policy_l2.py rename to lib/ansible/modules/network/aci/aci_interface_policy_l2.py index 8da00f3af3f..3bc0094e044 100644 --- a/lib/ansible/modules/network/aci/aci_intf_policy_l2.py +++ b/lib/ansible/modules/network/aci/aci_interface_policy_l2.py @@ -12,7 +12,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = r''' --- -module: aci_intf_policy_l2 +module: aci_interface_policy_l2 short_description: Manage Layer 2 interface policies on Cisco ACI fabrics (l2:IfPol) description: - Manage Layer 2 interface policies on Cisco ACI fabrics. @@ -56,7 +56,7 @@ extends_documentation_fragment: aci ''' EXAMPLES = r''' -- aci_intf_policy_l2: +- aci_interface_policy_l2: hostname: '{{ hostname }}' username: '{{ username }}' password: '{{ password }}' diff --git a/lib/ansible/modules/network/aci/aci_intf_policy_lldp.py b/lib/ansible/modules/network/aci/aci_interface_policy_lldp.py similarity index 98% rename from lib/ansible/modules/network/aci/aci_intf_policy_lldp.py rename to lib/ansible/modules/network/aci/aci_interface_policy_lldp.py index a3a5e1e81b0..fb323770c87 100644 --- a/lib/ansible/modules/network/aci/aci_intf_policy_lldp.py +++ b/lib/ansible/modules/network/aci/aci_interface_policy_lldp.py @@ -12,7 +12,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = r''' --- -module: aci_intf_policy_lldp +module: aci_interface_policy_lldp short_description: Manage LLDP interface policies on Cisco ACI fabrics (lldp:IfPol) description: - Manage LLDP interface policies on Cisco ACI fabrics. @@ -54,7 +54,7 @@ extends_documentation_fragment: aci # FIXME: Add more, better examples EXAMPLES = r''' -- aci_intf_policy_lldp: +- aci_interface_policy_lldp: hostname: '{{ hostname }}' username: '{{ username }}' password: '{{ password }}' diff --git a/lib/ansible/modules/network/aci/aci_intf_policy_mcp.py b/lib/ansible/modules/network/aci/aci_interface_policy_mcp.py similarity index 98% rename from lib/ansible/modules/network/aci/aci_intf_policy_mcp.py rename to lib/ansible/modules/network/aci/aci_interface_policy_mcp.py index 8eb8a67cc3c..ae9ee17e19d 100644 --- a/lib/ansible/modules/network/aci/aci_intf_policy_mcp.py +++ b/lib/ansible/modules/network/aci/aci_interface_policy_mcp.py @@ -12,7 +12,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = r''' --- -module: aci_intf_policy_mcp +module: aci_interface_policy_mcp short_description: Manage MCP interface policies on Cisco ACI fabrics (mcp:IfPol) description: - Manage MCP interface policies on Cisco ACI fabrics. @@ -47,7 +47,7 @@ extends_documentation_fragment: aci # FIXME: Add more, better examples EXAMPLES = r''' -- aci_mcp: +- aci_interface_policy_mcp: hostname: '{{ hostname }}' username: '{{ username }}' password: '{{ password }}' diff --git a/lib/ansible/modules/network/aci/aci_intf_policy_port_channel.py b/lib/ansible/modules/network/aci/aci_interface_policy_port_channel.py similarity index 98% rename from lib/ansible/modules/network/aci/aci_intf_policy_port_channel.py rename to lib/ansible/modules/network/aci/aci_interface_policy_port_channel.py index 61bade1d74b..5b639e1c0eb 100644 --- a/lib/ansible/modules/network/aci/aci_intf_policy_port_channel.py +++ b/lib/ansible/modules/network/aci/aci_interface_policy_port_channel.py @@ -12,7 +12,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = r''' --- -module: aci_intf_policy_port_channel +module: aci_interface_policy_port_channel short_description: Manage port channel interface policies on Cisco ACI fabrics (lacp:LagPol) description: - Manage port channel interface policies on Cisco ACI fabrics. @@ -100,7 +100,7 @@ extends_documentation_fragment: aci ''' EXAMPLES = r''' -- aci_intf_policy_port_channel: +- aci_interface_policy_port_channel: hostname: '{{ inventory_hostname }}' username: '{{ username }}' password: '{{ password }}' diff --git a/lib/ansible/modules/network/aci/aci_intf_policy_port_security.py b/lib/ansible/modules/network/aci/aci_interface_policy_port_security.py similarity index 98% rename from lib/ansible/modules/network/aci/aci_intf_policy_port_security.py rename to lib/ansible/modules/network/aci/aci_interface_policy_port_security.py index 34941ec9b17..5e5d5b25c54 100644 --- a/lib/ansible/modules/network/aci/aci_intf_policy_port_security.py +++ b/lib/ansible/modules/network/aci/aci_interface_policy_port_security.py @@ -12,7 +12,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = r''' --- -module: aci_intf_policy_port_security +module: aci_interface_policy_port_security short_description: Manage port security on Cisco ACI fabrics (l2:PortSecurityPol) description: - Manage port security on Cisco ACI fabrics. @@ -46,7 +46,7 @@ extends_documentation_fragment: aci # FIXME: Add more, better examples EXAMPLES = r''' -- aci_intf_policy_port_security: +- aci_interface_policy_port_security: hostname: '{{ inventory_hostname }}' username: '{{ username }}' password: '{{ password }}' diff --git a/test/sanity/validate-modules/ignore.txt b/test/sanity/validate-modules/ignore.txt index 82e8246f482..e868cf44f52 100644 --- a/test/sanity/validate-modules/ignore.txt +++ b/test/sanity/validate-modules/ignore.txt @@ -280,12 +280,12 @@ lib/ansible/modules/network/aci/aci_epg_monitoring_policy.py E322 lib/ansible/modules/network/aci/aci_epg_to_contract.py E322 lib/ansible/modules/network/aci/aci_epg_to_domain.py E322 lib/ansible/modules/network/aci/aci_filter.py E322 -lib/ansible/modules/network/aci/aci_intf_policy_fc.py E322 -lib/ansible/modules/network/aci/aci_intf_policy_l2.py E322 -lib/ansible/modules/network/aci/aci_intf_policy_lldp.py E322 -lib/ansible/modules/network/aci/aci_intf_policy_mcp.py E322 -lib/ansible/modules/network/aci/aci_intf_policy_port_channel.py E322 -lib/ansible/modules/network/aci/aci_intf_policy_port_security.py E322 +lib/ansible/modules/network/aci/aci_interface_policy_fc.py E322 +lib/ansible/modules/network/aci/aci_interface_policy_l2.py E322 +lib/ansible/modules/network/aci/aci_interface_policy_lldp.py E322 +lib/ansible/modules/network/aci/aci_interface_policy_mcp.py E322 +lib/ansible/modules/network/aci/aci_interface_policy_port_channel.py E322 +lib/ansible/modules/network/aci/aci_interface_policy_port_security.py E322 lib/ansible/modules/network/aci/aci_l3out_route_tag_policy.py E322 lib/ansible/modules/network/aci/aci_rest.py E322 lib/ansible/modules/network/aci/aci_taboo_contract.py E322