Final set of lint changes

Author: sivakasi-cisco

playbooks/roles/dcnm_bootflash/nxos_vars.yaml

@@ -1,9 +1,9 @@
 nxos_vars:
-    switch1_file1: air.ndfc_ut
-    switch1_file2: earth.ndfc_ut
-    switch1_file3: fire.ndfc_ut
-    switch1_file4: water.ndfc_ut
-    switch2_file1: black.ndfc_ut
-    switch2_file2: blue.ndfc_ut
-    switch2_file3: green.ndfc_ut
-    switch2_file4: red.ndfc_ut
+  switch1_file1: air.ndfc_ut
+  switch1_file2: earth.ndfc_ut
+  switch1_file3: fire.ndfc_ut
+  switch1_file4: water.ndfc_ut
+  switch2_file1: black.ndfc_ut
+  switch2_file2: blue.ndfc_ut
+  switch2_file3: green.ndfc_ut
+  switch2_file4: red.ndfc_ut

playbooks/roles/dcnm_vrf/dcnm_tests.yaml

@@ -31,22 +31,22 @@
   hosts: dcnm
   gather_facts: false
   connection: ansible.netcommon.httpapi
-# Uncomment and modify if not using dynamic_inventory.py
-# See the individual test yaml files for a description of
-# how each var below is used in each test.  Some tests,
-# for example, do not use interface_1.
-#   vars:
-    # fabric_1: f1
-    # switch_1: 10.1.1.2
-    # switch_2: 10.1.1.3
-    # switch_3: 10.1.1.4
-    # interface_1: Ethernet1/1
-    # interface_2: Ethernet1/2
-    # interface_3: Ethernet1/3
-    ## Uncomment ONE of the following testcases
-    # testcase: deleted
-    # testcase: merged
-    # testcase: query
+  # Uncomment and modify if not using dynamic_inventory.py
+  # See the individual test yaml files for a description of
+  # how each var below is used in each test.  Some tests,
+  # for example, do not use interface_1.
+  #   vars:
+  # fabric_1: f1
+  # fabric_1: f1
+  # switch_1: 10.1.1.2
+  # switch_3: 10.1.1.4
+  # switch_3: 10.1.1.4
+  # switch_4: 10.1.1.5
+  # interface_3: Ethernet1/3
+  ## Uncomment ONE of the following testcases
+  # testcase: deleted
+  # testcase: merged
+  # testcase: query
 
   roles:
     - dcnm_vrf

plugins/modules/dcnm_links.py

@@ -405,10 +405,10 @@
             srvr_vrf: vrf_10
         attach:
           - ip_address: 192.168.1.224
-          # Replace the ports with new ports
-          # ports: [Ethernet1/13, Ethernet1/14]
+            # Replace the ports with new ports
+            # ports: [Ethernet1/13, Ethernet1/14]
             ports: [Ethernet1/16, Ethernet1/17]
-          # Delete this attachment
+        # Delete this attachment
         # - ip_address: 192.168.1.225
         #   ports: [Ethernet1/13, Ethernet1/14]
         deploy: true
@@ -448,20 +448,20 @@
         # - ip_address: 192.168.1.225
         #   ports: [Ethernet1/13, Ethernet1/14]
         deploy: true
-      # Delete this network
-      # - net_name: ansible-net12
-      #   vrf_name: Tenant-2
-      #   net_id: 7002
-      #   net_template: Default_Network_Universal
-      #   net_extension_template: Default_Network_Extension_Universal
-      #   vlan_id: 151
-      #   gw_ip_subnet: '192.168.40.1/24'
-      #   attach:
-      #   - ip_address: 192.168.1.224
-      #     ports: [Ethernet1/11, Ethernet1/12]
-      #   - ip_address: 192.168.1.225
-      #     ports: [Ethernet1/11, Ethernet1/12]
-      #   deploy: false
+# Delete this network
+# - net_name: ansible-net12
+#   vrf_name: Tenant-2
+#   net_id: 7002
+#   net_template: Default_Network_Universal
+#   net_extension_template: Default_Network_Extension_Universal
+#   vlan_id: 151
+#   gw_ip_subnet: '192.168.40.1/24'
+#   attach:
+#   - ip_address: 192.168.1.224
+#     ports: [Ethernet1/11, Ethernet1/12]
+#   - ip_address: 192.168.1.225
+#     ports: [Ethernet1/11, Ethernet1/12]
+#   deploy: false
 
 - name: Delete selected networks
   cisco.dcnm.dcnm_network:
@@ -677,16 +677,16 @@ def diff_for_attach_deploy(self, want_a, have_a, replace=False):
 
                                                     torconfig = tor_w["switch"] + "(" + ",".join(atch_tor_ports) + ")"
                                                     want.update({"torPorts": torconfig})
-                                                    # Update torports_configured to True. If there is no other config change for attach
-                                                    # We will still append this attach to attach_list as there is tor port change
+        # Update torports_configured to True. If there is no other config change for attach
+        # We will still append this attach to attach_list as there is tor port change
                                                     if sorted(atch_tor_ports) != sorted(h_tor_ports):
                                                         torports_configured = True
 
                                         if not torports_present:
                                             torconfig = tor_w["switch"] + "(" + tor_w["torPorts"] + ")"
                                             want.update({"torPorts": torconfig})
-                                            # Update torports_configured to True. If there is no other config change for attach
-                                            # We will still append this attach to attach_list as there is tor port change
+        # Update torports_configured to True. If there is no other config change for attach
+        # We will still append this attach to attach_list as there is tor port change
                                             torports_configured = True
 
                                     if have.get("torports"):

plugins/modules/dcnm_network.py

@@ -205,55 +205,55 @@
     config:
       - name: SN-11
         type: firewall
-   #  Replace can only modify the form factor
-   #  form_factor: virtual  # the virtual will be changed to new physical
-   #  form_factor: physical
+        #  Replace can only modify the form factor
+        #  form_factor: virtual  # the virtual will be changed to new physical
+        #  form_factor: physical
         svc_int_name: svc1
         attach_interface: Ethernet1/1
         switches:
           - 192.168.1.224
-   #   Nothing will be replaced in the below service node as there is no change
-   #   Dont touch this if its present on DCNM
-   # - name: SN-12
-   #   type: firewall
-   #   form_factor: virtual
-   #   svc_int_name: svc1
-   #   attach_interface: vPC1
-   #   switches:  # up to two switches, if two switches are provided, vpc is only option
-   #   - 192.168.1.224
-   #   - 192.168.1.225
+#   Nothing will be replaced in the below service node as there is no change
+#   Dont touch this if its present on DCNM
+# - name: SN-12
+#   type: firewall
+#   form_factor: virtual
+#   svc_int_name: svc1
+#   attach_interface: vPC1
+#   switches:  # up to two switches, if two switches are provided, vpc is only option
+#   - 192.168.1.224
+#   - 192.168.1.225
 
 - name: Override Service Nodes
   cisco.dcnm.dcnm_service_node:
     fabric: Fabric1
     service_fabric: external
     state: overridden
     config:
-   # Create this service node
+      # Create this service node
       - name: SN-13
         type: firewall
         form_factor: virtual
         svc_int_name: svc1
         attach_interface: Ethernet1/1
         switches:
           - 192.168.1.224
-   # Delete this service node from the DCNM
-   # - name: SN-11
-   #   type: firewall
-   #   form_factor: virtual
-   #   svc_int_name: svc1
-   #   attach_interface: Ethernet1/1
-   #   switches:
-   #   - 192.168.1.224
-   # Delete this service node from the DCNM
-   # - name: SN-12
-   #   type: firewall
-   #   form_factor: virtual
-   #   svc_int_name: svc1
-   #   attach_interface: vPC1
-   #   switches:  # up to two switches, if two switches are provided, vpc is only option
-   #   - 192.168.1.224
-   #   - 192.168.1.225
+# Delete this service node from the DCNM
+# - name: SN-11
+#   type: firewall
+#   form_factor: virtual
+#   svc_int_name: svc1
+#   attach_interface: Ethernet1/1
+#   switches:
+#   - 192.168.1.224
+# Delete this service node from the DCNM
+# - name: SN-12
+#   type: firewall
+#   form_factor: virtual
+#   svc_int_name: svc1
+#   attach_interface: vPC1
+#   switches:  # up to two switches, if two switches are provided, vpc is only option
+#   - 192.168.1.224
+#   - 192.168.1.225
 
 - name: Delete selected Service Nodes
   cisco.dcnm.dcnm_service_node:

plugins/modules/dcnm_service_node.py

@@ -508,14 +508,14 @@
       # - ip_address: 192.168.1.225
       # Create the following attachment
       - ip_address: 192.168.1.226
-    # Dont touch this if its present on DCNM
-    # - vrf_name: ansible-vrf-r2
-    #   vrf_id: 9008012
-    #   vrf_template: Default_VRF_Universal
-    #   vrf_extension_template: Default_VRF_Extension_Universal
-    #   attach:
-    #   - ip_address: 192.168.1.224
-    #   - ip_address: 192.168.1.225
+      # Dont touch this if its present on DCNM
+      # - vrf_name: ansible-vrf-r2
+      #   vrf_id: 9008012
+      #   vrf_template: Default_VRF_Universal
+      #   vrf_extension_template: Default_VRF_Extension_Universal
+      #   attach:
+      #   - ip_address: 192.168.1.224
+      #   - ip_address: 192.168.1.225
 
 # The two VRFs below will be overridden in the target fabric.
 - name: Override vrfs
@@ -535,16 +535,16 @@
       # - ip_address: 192.168.1.225
       # Create the following attachment
       - ip_address: 192.168.1.226
-    # Delete this vrf
-    # - vrf_name: ansible-vrf-r2
-    #   vrf_id: 9008012
-    #   vrf_template: Default_VRF_Universal
-    #   vrf_extension_template: Default_VRF_Extension_Universal
-    #   vlan_id: 2000
-    #   service_vrf_template: null
-    #   attach:
-    #   - ip_address: 192.168.1.224
-    #   - ip_address: 192.168.1.225
+      # Delete this vrf
+      # - vrf_name: ansible-vrf-r2
+      #   vrf_id: 9008012
+      #   vrf_template: Default_VRF_Universal
+      #   vrf_extension_template: Default_VRF_Extension_Universal
+      #   vlan_id: 2000
+      #   service_vrf_template: null
+      #   attach:
+      #   - ip_address: 192.168.1.224
+      #   - ip_address: 192.168.1.225
 
 - name: Delete selected vrfs
   cisco.dcnm.dcnm_vrf: