Merge branch 'main' into consolidate

.pre-commit-config.yaml

@@ -1,4 +1,10 @@
 ---
+ci:
+  skip:
+    # pre-commit.ci has trouble with this one
+    - update-docs
+    - end-of-file-fixer
+    - trailing-whitespace
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v3.1.0

changelogs/fragments/enable_upgrade_black.yml

@@ -0,0 +1,4 @@
+---
+trivial:
+  - Enable black via pre-commit.ci
+  - Update black version to latest

changelogs/fragments/pre-commit-skip.yml

@@ -0,0 +1,6 @@
+---
+trivial:
+  - Exempt update-docs from pre-commit.ci
+  - Disable black temporarily until it can be upgraded
+  - Disable end-of-file-fixer
+  - Disable trailing-whitespace

tests/integration/targets/utils_cli_parse/files/nxos_show_version.txt

@@ -34,4 +34,4 @@ Kernel uptime is 110 day(s), 12 hour(s), 32 minute(s), 10 second(s)
 plugin
   Core Plugin, Ethernet Plugin
 
-Active Package(s)
+Active Package(s)

tests/integration/targets/utils_cli_parse/output/nxos_show_interface_json_text.txt

@@ -15,4 +15,4 @@
             }
         ]
     ]
-]
+]

tests/integration/targets/utils_cli_parse/output/nxos_show_interface_ttp_parsed.json

@@ -15,4 +15,4 @@
             }
         ]
     ]
-]
+]

tests/integration/targets/utils_cli_parse/templates/centos_df_-h.ttp

@@ -1 +1 @@
-Filesystem      Size  Used Avail Use Mounted_on {{ _headers_ }}
+Filesystem      Size  Used Avail Use Mounted_on {{ _headers_ }}

tests/integration/targets/utils_cli_parse/templates/centos_ifconfig.textfsm

@@ -16,4 +16,4 @@ Start
   ^${Interface}:.* mtu ${MTU}
   ^\s+ether ${MAC}
   ^\s+inet6 ${Inet6} prefixlen ${Prefix}
-  ^\s+inet ${Inet} netmask ${Netmask}
+  ^\s+inet ${Inet} netmask ${Netmask}

tests/integration/targets/utils_cli_parse/templates/fedora_df_-h.ttp

@@ -1 +1 @@
-Filesystem      Size  Used Avail Use Mounted_on {{ _headers_ }}
+Filesystem      Size  Used Avail Use Mounted_on {{ _headers_ }}

tests/integration/targets/utils_cli_parse/templates/fedora_ifconfig.textfsm

@@ -16,4 +16,4 @@ Start
   ^${Interface}:.* mtu ${MTU}
   ^\s+ether ${MAC}
   ^\s+inet6 ${Inet6} prefixlen ${Prefix}
-  ^\s+inet ${Inet} netmask ${Netmask}
+  ^\s+inet ${Inet} netmask ${Netmask}

tests/integration/targets/utils_cli_parse/templates/ubuntu_df_-h.ttp

@@ -1 +1 @@
-Filesystem      Size  Used Avail Use Mounted_on {{ _headers_ }}
+Filesystem      Size  Used Avail Use Mounted_on {{ _headers_ }}

tests/integration/targets/utils_cli_parse/templates/ubuntu_ifconfig.textfsm

@@ -16,4 +16,4 @@ Start
   ^${Interface}:.* mtu ${MTU}
   ^\s+ether ${MAC}
   ^\s+inet6 ${Inet6} prefixlen ${Prefix}
-  ^\s+inet ${Inet} netmask ${Netmask}
+  ^\s+inet ${Inet} netmask ${Netmask}

tests/integration/targets/utils_ipaddr_filter/vars/main.yaml

@@ -40,7 +40,7 @@ ipwrap_result1:
     - "[fe80::100]/10"
     - "[2001:db8:32c:faad::]/64"
     - True
-    
+
 ipv6_result1:
     - "::ffff:192.168.32.0/120"
     - "::ffff:192.24.2.1/128"

tests/integration/targets/utils_validate/files/criteria/check_list_data.json

@@ -14,4 +14,4 @@
 		],
 		"default": 0
 	}
-}
+}

tests/integration/targets/utils_validate/files/criteria/crc_error_check.json

@@ -15,4 +15,4 @@
 			}
 		}
 	}
-}
+}

tests/integration/targets/utils_validate/files/criteria/enabled_check.json

@@ -10,4 +10,4 @@
 			}
 		}
 	}
-}
+}

tests/integration/targets/utils_validate/files/criteria/in_rate_check.json

@@ -19,4 +19,4 @@
 			}
 		}
 	}
-}
+}

tests/integration/targets/utils_validate/files/criteria/oper_status_up.json

@@ -11,4 +11,4 @@
 			}
 		}
 	}
-}
+}

tests/unit/module_utils/fixtures/large.json

@@ -55315,4 +55315,4 @@
         },
         "xmlns": "http://cisco.com/ns/yang/cisco-nx-os-device"
     }
-}
+}

tests/unit/plugins/action/fixtures/nxos_show_version.txt

@@ -35,4 +35,4 @@ Last reset
 plugin
   Core Plugin, Ethernet Plugin
 
-Active Package(s):
+Active Package(s):

tests/unit/plugins/sub_plugins/cli_parsers/fixtures/nxos_show_version.cfg

@@ -12,15 +12,15 @@ http://www.gnu.org/licenses/gpl.html.
 Nexus 9000v is a demo version of the Nexus Operating System
 
 Software
-  BIOS: version 
+  BIOS: version
   NXOS: version 7.0(3)I7(1)
-  BIOS compile time:  
+  BIOS compile time:
   NXOS image file is: bootflash:///nxos.7.0.3.I7.1.bin
   NXOS compile time:  8/31/2017 14:00:00 [08/31/2017 22:29:32]
 
 
 Hardware
-  cisco Nexus9000 9000v Chassis 
+  cisco Nexus9000 9000v Chassis
    with 4041236 kB of memory.
   Processor Board ID 96NK4OUJH32
 
@@ -28,10 +28,10 @@ Hardware
   bootflash:    3509454 kB
 Kernel uptime is 12 day(s), 23 hour(s), 48 minute(s), 10 second(s)
 
-Last reset 
+Last reset
   Reason: Unknown
-  System version: 
-  Service: 
+  System version:
+  Service:
 
 plugin
   Core Plugin, Ethernet Plugin

tests/unit/plugins/sub_plugins/cli_parsers/fixtures/nxos_show_version.ttp

@@ -4,4 +4,4 @@
 Kernel uptime is {{ uptime | ORPHRASE }}
   cisco Nexus9000 {{ platform }} Chassis
 </group>
-"""
+"""