From 86c627100a8edd637c98557c2dafd8160b76726b Mon Sep 17 00:00:00 2001 From: Chris Van Heuveln Date: Thu, 17 Jan 2019 13:50:02 -0500 Subject: [PATCH 1/6] MT: bgp_af --- tests/test_bgp_af.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/test_bgp_af.rb b/tests/test_bgp_af.rb index 4dae7284..d888d0a1 100644 --- a/tests/test_bgp_af.rb +++ b/tests/test_bgp_af.rb @@ -170,6 +170,9 @@ def check_test_exceptions(test_, os_, vrf_, af_) # triggers a version check below. if expect == :runtime case Platform.image_version + when /7\.3/ + expect = :success if test == :additional_paths_send || + test == :additional_paths_receive when /8.0|8.1|8.2|8.3|F3.2/ expect = :success expect = :runtime if test == :additional_paths_receive && Platform.image_version[/8.0|8.1/] From c2137fee0b32bc6f96f4197401f355a02d35b2e6 Mon Sep 17 00:00:00 2001 From: Chris Van Heuveln Date: Thu, 17 Jan 2019 14:02:15 -0500 Subject: [PATCH 2/6] MT: snmpserver --- tests/test_snmpserver.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_snmpserver.rb b/tests/test_snmpserver.rb index 24723db3..fceb25f4 100644 --- a/tests/test_snmpserver.rb +++ b/tests/test_snmpserver.rb @@ -155,7 +155,7 @@ def test_location_special_chars end def test_packet_size - skip_legacy_defect?('7.0.3.I2.2e|7.0.3.I2.5|7.0.3.I3.1', + skip_legacy_defect?('7.0.3.I2.2e|7.0.3.I2.5|7.0.3.I3.1|7.3.2.D', 'CSCuz14217: CLI shows default snmp packet-size incorrectly as 0') if validate_property_excluded?('snmp_server', 'packet_size') From d9f023354f612d34f9c404f3fa5dc7568a32f217 Mon Sep 17 00:00:00 2001 From: Chris Van Heuveln Date: Thu, 17 Jan 2019 14:16:47 -0500 Subject: [PATCH 3/6] MT: vtp --- tests/test_vtp.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_vtp.rb b/tests/test_vtp.rb index aa7b26da..84dd4f61 100755 --- a/tests/test_vtp.rb +++ b/tests/test_vtp.rb @@ -175,10 +175,10 @@ def test_password_valid end # this fails on n7k running 7.3(0)D1.1 image but it - # is fixed in later releases. The bugID is CSCuy87970 + # is fixed in some later releases. The bugID is CSCuy87970 # which is already verified. def test_password_special_characters - skip_legacy_defect?('7.3.0.(N1|D1).1.bin', + skip_legacy_defect?('7.3.[012].(N1|D1)', 'CSCuy87970: NXAPI incorrect backslash escape') vtp = vtp_domain('password') vtp.password = 'hello!//\\#%$x' From 526200db276f5361e10a61f850f36f9a1587c570 Mon Sep 17 00:00:00 2001 From: Chris Van Heuveln Date: Thu, 17 Jan 2019 14:51:55 -0500 Subject: [PATCH 4/6] MT: tacacs_global --- tests/test_tacacs_global.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/test_tacacs_global.rb b/tests/test_tacacs_global.rb index a232e7d5..6eb8bd60 100644 --- a/tests/test_tacacs_global.rb +++ b/tests/test_tacacs_global.rb @@ -75,7 +75,9 @@ def test_tacacs_global global.encryption_key_set(nil, key) # Device encypts key - verify return value assert_equal(7, global.key_format) - assert_equal('"WAWY_NZB"', global.key) + key = 'WAWY_NZB' + key = "\"#{key}\"" unless Platform.image_version[/7\.3/] + assert_equal(key, global.key) skip_versions = ['7.0.3.(I2|I3)', '7.0.3.I4.[1-7]'] if step_unless_legacy_defect(skip_versions, 'CSCvh72911: Cannot configure tacacs-server key 6') @@ -85,7 +87,9 @@ def test_tacacs_global key = 'JDYkqyIFWeBvzpljSfWmRZrmRSRE8' global.encryption_key_set(key_format, key) assert_equal(key_format, global.key_format) - assert_equal("\"#{key}\"", global.key) + + key = "\"#{key}\"" unless Platform.image_version[/7\.3/] + assert_equal(key, global.key) end # Remove global key From b771c903111879191a28c1f125e555c79dce343c Mon Sep 17 00:00:00 2001 From: Chris Van Heuveln Date: Thu, 17 Jan 2019 15:18:10 -0500 Subject: [PATCH 5/6] MT: interface_svi --- tests/test_interface_svi.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_interface_svi.rb b/tests/test_interface_svi.rb index f3456e7a..3e79d0bb 100644 --- a/tests/test_interface_svi.rb +++ b/tests/test_interface_svi.rb @@ -195,7 +195,7 @@ def test_description def test_sys_def_svi_autostate skip_autostate_test? - skip_legacy_defect?('8.0.1|8.1.1', 'CSC: Behavior change after helsinki') + skip_legacy_defect?('8.0.1|8.1.1|8\.3', 'CSC: Behavior change after helsinki') interface = Interface.new(interfaces[0]) system_default_svi_autostate('no ') From 6038fc79012c7a696a47db695fff548a3515ec58 Mon Sep 17 00:00:00 2001 From: Chris Van Heuveln Date: Thu, 17 Jan 2019 15:57:33 -0500 Subject: [PATCH 6/6] route_map.yaml: regex cleanup ruby was raising a warning on this regex: warning: nested repeat operator '+' and '?' was replaced with '*' in regular expression: /^set extcomm-list (\S+)(?:\s+)? delete$/ --- lib/cisco_node_utils/cmd_ref/route_map.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/cisco_node_utils/cmd_ref/route_map.yaml b/lib/cisco_node_utils/cmd_ref/route_map.yaml index 42b80567..93018ccb 100644 --- a/lib/cisco_node_utils/cmd_ref/route_map.yaml +++ b/lib/cisco_node_utils/cmd_ref/route_map.yaml @@ -361,7 +361,7 @@ set_distance_local: # there is more than one space before delete on some platforms set_extcomm_list: - get_value: '/^set extcomm-list (\S+)(?:\s+)? delete$/' + get_value: '/^set extcomm-list (\S+)\s+delete$/' set_value: " set extcomm-list delete" default_value: false