summaryrefslogtreecommitdiff
path: root/tests/integration
diff options
context:
space:
mode:
authorShawn Wilsher <656602+sdwilsh@users.noreply.github.com>2022-09-02 06:22:14 -0700
committerGitHub <noreply@github.com>2022-09-02 09:22:14 -0400
commit69a2882d106171f050fac193a552542cdab418a8 (patch)
tree03e419d47de81b473b96f4f2a2a6c8b9f2bee5f8 /tests/integration
parent4c116b506d4a529370dd63761f601a89d1adbf92 (diff)
downloadvyos-ansible-collection-69a2882d106171f050fac193a552542cdab418a8.tar.gz
vyos-ansible-collection-69a2882d106171f050fac193a552542cdab418a8.zip
Fix `pre-commit` Issues (#223)
* Fix `pre-commit` Issues This change fixes `.pre-commit-config.yaml` so that `main` no longer has errors on it. To accomplish that, two things had to be done: * Update the version of `black` that `pre-commit` uses to match what `tox` uses. * Run `pre-commit run --all-files` and commit the results Co-authored-by: Kate Case <this.is@katherineca.se>
Diffstat (limited to 'tests/integration')
-rw-r--r--tests/integration/target-prefixes.network2
-rw-r--r--tests/integration/targets/vyos_config/tests/cli/config.cfg1
-rw-r--r--tests/integration/targets/vyos_firewall_interfaces/14
-rw-r--r--tests/integration/targets/vyos_firewall_interfaces/tests/cli/_parsed_config.cfg1
-rw-r--r--tests/integration/targets/vyos_l3_interfaces/tests/cli/_parsed_config.cfg2
-rw-r--r--tests/integration/targets/vyos_lag_interfaces/tests/cli/_parsed_config.cfg2
-rw-r--r--tests/integration/targets/vyos_lldp_interfaces/tests/cli/_parsed_config.cfg2
-rw-r--r--tests/integration/targets/vyos_ospf_interfaces/tests/cli/_parsed_config.cfg1
-rw-r--r--tests/integration/targets/vyos_prefix_lists/tests/cli/_parsed.cfg2
-rw-r--r--tests/integration/targets/vyos_route_maps/tests/cli/_parsed.cfg2
10 files changed, 7 insertions, 12 deletions
diff --git a/tests/integration/target-prefixes.network b/tests/integration/target-prefixes.network
index 0c45eba..2d0f40c 100644
--- a/tests/integration/target-prefixes.network
+++ b/tests/integration/target-prefixes.network
@@ -1 +1 @@
-vyos \ No newline at end of file
+vyos
diff --git a/tests/integration/targets/vyos_config/tests/cli/config.cfg b/tests/integration/targets/vyos_config/tests/cli/config.cfg
index 36c98f1..b63703e 100644
--- a/tests/integration/targets/vyos_config/tests/cli/config.cfg
+++ b/tests/integration/targets/vyos_config/tests/cli/config.cfg
@@ -1,3 +1,2 @@
set service lldp
set protocols static
-
diff --git a/tests/integration/targets/vyos_firewall_interfaces/1 b/tests/integration/targets/vyos_firewall_interfaces/1
index 70ae90f..628ada5 100644
--- a/tests/integration/targets/vyos_firewall_interfaces/1
+++ b/tests/integration/targets/vyos_firewall_interfaces/1
@@ -6,11 +6,11 @@ merged:
commands:
- "set interfaces ethernet eth1 firewall in name 'INBOUND'"
- "set interfaces ethernet eth1 firewall out name 'OUTBOUND'"
- - "set interfaces ethernet eth1 firewall local name 'LOCAL'"
+ - "set interfaces ethernet eth1 firewall local name 'LOCAL'"
- "set interfaces ethernet eth1 firewall local ipv6-name 'V6-LOCAL'"
- "set interfaces ethernet eth3 firewall in name 'INBOUND'"
- "set interfaces ethernet eth3 firewall out name 'OUTBOUND'"
- - "set interfaces ethernet eth3 firewall local name 'LOCAL'"
+ - "set interfaces ethernet eth3 firewall local name 'LOCAL'"
- "set interfaces ethernet eth3 firewall local ipv6-name 'V6-LOCAL'"
after:
diff --git a/tests/integration/targets/vyos_firewall_interfaces/tests/cli/_parsed_config.cfg b/tests/integration/targets/vyos_firewall_interfaces/tests/cli/_parsed_config.cfg
index 54696e8..48f286e 100644
--- a/tests/integration/targets/vyos_firewall_interfaces/tests/cli/_parsed_config.cfg
+++ b/tests/integration/targets/vyos_firewall_interfaces/tests/cli/_parsed_config.cfg
@@ -7,4 +7,3 @@ set interfaces ethernet eth2 firewall out name 'OUTBOUND'
set interfaces ethernet eth2 firewall local name 'LOCAL'
set interfaces ethernet eth2 firewall local ipv6-name 'V6-LOCAL'
set interfaces ethernet eth0
-
diff --git a/tests/integration/targets/vyos_l3_interfaces/tests/cli/_parsed_config.cfg b/tests/integration/targets/vyos_l3_interfaces/tests/cli/_parsed_config.cfg
index ef070a7..9232a0a 100644
--- a/tests/integration/targets/vyos_l3_interfaces/tests/cli/_parsed_config.cfg
+++ b/tests/integration/targets/vyos_l3_interfaces/tests/cli/_parsed_config.cfg
@@ -5,5 +5,3 @@ set interfaces ethernet eth2 address '198.51.100.10/24'
set interfaces ethernet eth2 hw-id '08:00:27:d8:70:b0'
set interfaces ethernet eth2 vif 101 address '198.51.100.130/25'
set interfaces ethernet eth2 vif 101 address '2001:db8::20/32'
-
-
diff --git a/tests/integration/targets/vyos_lag_interfaces/tests/cli/_parsed_config.cfg b/tests/integration/targets/vyos_lag_interfaces/tests/cli/_parsed_config.cfg
index ea3bfce..1a275bd 100644
--- a/tests/integration/targets/vyos_lag_interfaces/tests/cli/_parsed_config.cfg
+++ b/tests/integration/targets/vyos_lag_interfaces/tests/cli/_parsed_config.cfg
@@ -5,4 +5,4 @@ set interfaces bonding bond1 hash-policy 'layer2+3'
set interfaces bonding bond1 mode 'active-backup'
set interfaces bonding bond1 primary 'eth2'
set interfaces ethernet eth1 bond-group 'bond0'
-set interfaces ethernet eth2 bond-group 'bond1' \ No newline at end of file
+set interfaces ethernet eth2 bond-group 'bond1'
diff --git a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/_parsed_config.cfg b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/_parsed_config.cfg
index 40c96c4..737449c 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/_parsed_config.cfg
+++ b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/_parsed_config.cfg
@@ -3,4 +3,4 @@ set service lldp interface eth1 location civic-based country-code 'US'
set service lldp interface eth2 location coordinate-based altitude '2200'
set service lldp interface eth2 location coordinate-based datum 'WGS84'
set service lldp interface eth2 location coordinate-based latitude '33.524449N'
-set service lldp interface eth2 location coordinate-based longitude '222.267255W' \ No newline at end of file
+set service lldp interface eth2 location coordinate-based longitude '222.267255W'
diff --git a/tests/integration/targets/vyos_ospf_interfaces/tests/cli/_parsed_config.cfg b/tests/integration/targets/vyos_ospf_interfaces/tests/cli/_parsed_config.cfg
index 54696e8..48f286e 100644
--- a/tests/integration/targets/vyos_ospf_interfaces/tests/cli/_parsed_config.cfg
+++ b/tests/integration/targets/vyos_ospf_interfaces/tests/cli/_parsed_config.cfg
@@ -7,4 +7,3 @@ set interfaces ethernet eth2 firewall out name 'OUTBOUND'
set interfaces ethernet eth2 firewall local name 'LOCAL'
set interfaces ethernet eth2 firewall local ipv6-name 'V6-LOCAL'
set interfaces ethernet eth0
-
diff --git a/tests/integration/targets/vyos_prefix_lists/tests/cli/_parsed.cfg b/tests/integration/targets/vyos_prefix_lists/tests/cli/_parsed.cfg
index 25744b3..0e508b3 100644
--- a/tests/integration/targets/vyos_prefix_lists/tests/cli/_parsed.cfg
+++ b/tests/integration/targets/vyos_prefix_lists/tests/cli/_parsed.cfg
@@ -15,4 +15,4 @@ set policy prefix-list6 AllowIPv6Prefix rule 5 prefix '2001:db8:8000::/35'
set policy prefix-list6 DenyIPv6Prefix description 'Configured by ansible for disallowing IPv6 networks'
set policy prefix-list6 DenyIPv6Prefix rule 8 action 'deny'
set policy prefix-list6 DenyIPv6Prefix rule 8 le '37'
-set policy prefix-list6 DenyIPv6Prefix rule 8 prefix '2001:db8:2000::/35' \ No newline at end of file
+set policy prefix-list6 DenyIPv6Prefix rule 8 prefix '2001:db8:2000::/35'
diff --git a/tests/integration/targets/vyos_route_maps/tests/cli/_parsed.cfg b/tests/integration/targets/vyos_route_maps/tests/cli/_parsed.cfg
index a4aa4d3..affbd28 100644
--- a/tests/integration/targets/vyos_route_maps/tests/cli/_parsed.cfg
+++ b/tests/integration/targets/vyos_route_maps/tests/cli/_parsed.cfg
@@ -10,4 +10,4 @@ set policy route-map test3 rule 1 set originator-id 192.0.2.34
set policy route-map test3 rule 1 set tag 5
set policy route-map test3 rule 1 set weight 4
set policy route-map test3 rule 1 match metric 1
-set policy route-map test3 rule 1 match peer 192.0.2.32 \ No newline at end of file
+set policy route-map test3 rule 1 match peer 192.0.2.32