From ace111dbd6284288dcd7bf8bd962e47197a72174 Mon Sep 17 00:00:00 2001 From: tsimson Date: Wed, 13 Sep 2017 22:34:38 -0400 Subject: [PATCH 1/6] Adjusted hp_procurve_show_vlans.template to account for varying outputs. --- templates/hp_procurve_show_vlans.template | 2 +- .../show_vlans/hp_procurve_show_vlans.parsed | 17 ++++++++++++----- .../show_vlans/hp_procurve_show_vlans.raw | 14 ++++++++------ 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/templates/hp_procurve_show_vlans.template b/templates/hp_procurve_show_vlans.template index a5f5d961f6..c3e9cfb02d 100644 --- a/templates/hp_procurve_show_vlans.template +++ b/templates/hp_procurve_show_vlans.template @@ -8,4 +8,4 @@ Start ^.*VLAN ID -> VLAN VLAN - ^\s+${VLAN_ID}\s+${NAME}\s+${STATUS}\s+${VOICE}\s+${JUMBO} -> Record + ^\s+${VLAN_ID}\s+${NAME}\s+\|?\s?${STATUS}\s+${VOICE}\s+${JUMBO}? -> Record diff --git a/tests/hp_procurve/show_vlans/hp_procurve_show_vlans.parsed b/tests/hp_procurve/show_vlans/hp_procurve_show_vlans.parsed index 67f95024a1..92383c4afc 100644 --- a/tests/hp_procurve/show_vlans/hp_procurve_show_vlans.parsed +++ b/tests/hp_procurve/show_vlans/hp_procurve_show_vlans.parsed @@ -14,18 +14,25 @@ parsed_sample: voice: "No" jumbo: "No" -- name: "DEVOPS" - vlan_id: "100" +- name: "MANAGEMENT" + vlan_id: "996" status: "Port-based" voice: "No" jumbo: "No" + +- name: "Router" + vlan_id: "10" status: "Port-based" voice: "No" jumbo: "No" -- name: "MANAGEMENT" - vlan_id: "996" +- name: "Voice" + vlan_id: "50" status: "Port-based" - voice: "No" + voice: "Yes" jumbo: "No" +- name: "VoiceVlan" + vlan_id: "100" + status: "Port-based" + voice: "Yes" diff --git a/tests/hp_procurve/show_vlans/hp_procurve_show_vlans.raw b/tests/hp_procurve/show_vlans/hp_procurve_show_vlans.raw index 6924f3a244..99a4e25ef2 100644 --- a/tests/hp_procurve/show_vlans/hp_procurve_show_vlans.raw +++ b/tests/hp_procurve/show_vlans/hp_procurve_show_vlans.raw @@ -1,12 +1,14 @@ Status and Counters - VLAN Information - Maximum VLANs to support : 8 + Maximum VLANs to support : 8 Primary VLAN : DEFAULT_VLAN - Management VLAN : + Management VLAN : 802.1Q VLAN ID Name Status Voice Jumbo -------------- ------------ ------------ ----- ----- - 1 DEFAULT_VLAN Port-based No No - 66 sixty-six Port-based No No - 100 DEVOPS Port-based No No - 996 MANAGEMENT Port-based No No + 1 DEFAULT_VLAN Port-based No No + 66 sixty-six Port-based No No + 996 MANAGEMENT Port-based No No + 10 Router Vlan | Port-based No No + 50 Voice | Port-based Yes No + 100 VoiceVlan Port-based Yes From 2e9149855883be2ee7f06d0fd809395192b12110 Mon Sep 17 00:00:00 2001 From: tsimson Date: Wed, 13 Sep 2017 23:15:40 -0400 Subject: [PATCH 2/6] Created separate raw/parsed file pairs for the observed outputs. --- .../show_vlans/hp_procurve_show_vlans.parsed | 17 +++++---------- .../show_vlans/hp_procurve_show_vlans.raw | 14 ++++++------- .../show_vlans/hp_procurve_show_vlans2.parsed | 21 +++++++++++++++++++ .../show_vlans/hp_procurve_show_vlans2.raw | 11 ++++++++++ .../show_vlans/hp_procurve_show_vlans3.parsed | 13 ++++++++++++ .../show_vlans/hp_procurve_show_vlans3.raw | 10 +++++++++ 6 files changed, 66 insertions(+), 20 deletions(-) create mode 100644 tests/hp_procurve/show_vlans/hp_procurve_show_vlans2.parsed create mode 100644 tests/hp_procurve/show_vlans/hp_procurve_show_vlans2.raw create mode 100644 tests/hp_procurve/show_vlans/hp_procurve_show_vlans3.parsed create mode 100644 tests/hp_procurve/show_vlans/hp_procurve_show_vlans3.raw diff --git a/tests/hp_procurve/show_vlans/hp_procurve_show_vlans.parsed b/tests/hp_procurve/show_vlans/hp_procurve_show_vlans.parsed index 92383c4afc..67f95024a1 100644 --- a/tests/hp_procurve/show_vlans/hp_procurve_show_vlans.parsed +++ b/tests/hp_procurve/show_vlans/hp_procurve_show_vlans.parsed @@ -14,25 +14,18 @@ parsed_sample: voice: "No" jumbo: "No" -- name: "MANAGEMENT" - vlan_id: "996" +- name: "DEVOPS" + vlan_id: "100" status: "Port-based" voice: "No" jumbo: "No" - -- name: "Router" - vlan_id: "10" status: "Port-based" voice: "No" jumbo: "No" -- name: "Voice" - vlan_id: "50" +- name: "MANAGEMENT" + vlan_id: "996" status: "Port-based" - voice: "Yes" + voice: "No" jumbo: "No" -- name: "VoiceVlan" - vlan_id: "100" - status: "Port-based" - voice: "Yes" diff --git a/tests/hp_procurve/show_vlans/hp_procurve_show_vlans.raw b/tests/hp_procurve/show_vlans/hp_procurve_show_vlans.raw index 99a4e25ef2..6924f3a244 100644 --- a/tests/hp_procurve/show_vlans/hp_procurve_show_vlans.raw +++ b/tests/hp_procurve/show_vlans/hp_procurve_show_vlans.raw @@ -1,14 +1,12 @@ Status and Counters - VLAN Information - Maximum VLANs to support : 8 + Maximum VLANs to support : 8 Primary VLAN : DEFAULT_VLAN - Management VLAN : + Management VLAN : 802.1Q VLAN ID Name Status Voice Jumbo -------------- ------------ ------------ ----- ----- - 1 DEFAULT_VLAN Port-based No No - 66 sixty-six Port-based No No - 996 MANAGEMENT Port-based No No - 10 Router Vlan | Port-based No No - 50 Voice | Port-based Yes No - 100 VoiceVlan Port-based Yes + 1 DEFAULT_VLAN Port-based No No + 66 sixty-six Port-based No No + 100 DEVOPS Port-based No No + 996 MANAGEMENT Port-based No No diff --git a/tests/hp_procurve/show_vlans/hp_procurve_show_vlans2.parsed b/tests/hp_procurve/show_vlans/hp_procurve_show_vlans2.parsed new file mode 100644 index 0000000000..878c3e5548 --- /dev/null +++ b/tests/hp_procurve/show_vlans/hp_procurve_show_vlans2.parsed @@ -0,0 +1,21 @@ +--- + +parsed_sample: + +- name: "DEFAULT_VLAN" + vlan_id: "1" + status: "Port-based" + voice: "No" + jumbo: "No" + +- name: "Router Vlan" + vlan_id: "10" + status: "Port-based" + voice: "No" + jumbo: "No" + +- name: "Voice" + vlan_id: "50" + status: "Port-based" + voice: "Yes" + jumbo: "No" diff --git a/tests/hp_procurve/show_vlans/hp_procurve_show_vlans2.raw b/tests/hp_procurve/show_vlans/hp_procurve_show_vlans2.raw new file mode 100644 index 0000000000..e5d733a0bd --- /dev/null +++ b/tests/hp_procurve/show_vlans/hp_procurve_show_vlans2.raw @@ -0,0 +1,11 @@ + Status and Counters - VLAN Information + + Maximum VLANs to support : 256 + Primary VLAN : DEFAULT_VLAN + Management VLAN : + + VLAN ID Name | Status Voice Jumbo + ------- -------------------------------- + ---------- ----- ----- + 1 DEFAULT_VLAN | Port-based No No + 10 Router Vlan | Port-based No No + 50 Voice | Port-based Yes No diff --git a/tests/hp_procurve/show_vlans/hp_procurve_show_vlans3.parsed b/tests/hp_procurve/show_vlans/hp_procurve_show_vlans3.parsed new file mode 100644 index 0000000000..01e5e02473 --- /dev/null +++ b/tests/hp_procurve/show_vlans/hp_procurve_show_vlans3.parsed @@ -0,0 +1,13 @@ +--- + +parsed_sample: + +- name: "DEFAULT_VLAN" + vlan_id: "1" + status: "Port-based" + voice: "No" + +- name: "VoiceVlan" + vlan_id: "100" + status: "Port-based" + voice: "Yes" diff --git a/tests/hp_procurve/show_vlans/hp_procurve_show_vlans3.raw b/tests/hp_procurve/show_vlans/hp_procurve_show_vlans3.raw new file mode 100644 index 0000000000..0af68e54a4 --- /dev/null +++ b/tests/hp_procurve/show_vlans/hp_procurve_show_vlans3.raw @@ -0,0 +1,10 @@ + Status and Counters - VLAN Information + + Maximum VLANs to support : 8 + Primary VLAN : DEFAULT_VLAN + Management VLAN : + + 802.1Q VLAN ID Name Status Voice + -------------- ------------ ------------ ----- + 1 DEFAULT_VLAN Port-based No + 100 VoiceVlan Port-based Yes From 3a8ac7003a530b79eaa2689df5fa6f3e13c92c31 Mon Sep 17 00:00:00 2001 From: tsimson Date: Wed, 13 Sep 2017 23:25:44 -0400 Subject: [PATCH 3/6] Removed raw/parsed pair that was missing the jumbo field. --- .../show_vlans/hp_procurve_show_vlans3.parsed | 13 ------------- .../show_vlans/hp_procurve_show_vlans3.raw | 10 ---------- 2 files changed, 23 deletions(-) delete mode 100644 tests/hp_procurve/show_vlans/hp_procurve_show_vlans3.parsed delete mode 100644 tests/hp_procurve/show_vlans/hp_procurve_show_vlans3.raw diff --git a/tests/hp_procurve/show_vlans/hp_procurve_show_vlans3.parsed b/tests/hp_procurve/show_vlans/hp_procurve_show_vlans3.parsed deleted file mode 100644 index 01e5e02473..0000000000 --- a/tests/hp_procurve/show_vlans/hp_procurve_show_vlans3.parsed +++ /dev/null @@ -1,13 +0,0 @@ ---- - -parsed_sample: - -- name: "DEFAULT_VLAN" - vlan_id: "1" - status: "Port-based" - voice: "No" - -- name: "VoiceVlan" - vlan_id: "100" - status: "Port-based" - voice: "Yes" diff --git a/tests/hp_procurve/show_vlans/hp_procurve_show_vlans3.raw b/tests/hp_procurve/show_vlans/hp_procurve_show_vlans3.raw deleted file mode 100644 index 0af68e54a4..0000000000 --- a/tests/hp_procurve/show_vlans/hp_procurve_show_vlans3.raw +++ /dev/null @@ -1,10 +0,0 @@ - Status and Counters - VLAN Information - - Maximum VLANs to support : 8 - Primary VLAN : DEFAULT_VLAN - Management VLAN : - - 802.1Q VLAN ID Name Status Voice - -------------- ------------ ------------ ----- - 1 DEFAULT_VLAN Port-based No - 100 VoiceVlan Port-based Yes From 852ca4c943152611def24e07cf15f2acfcb1813c Mon Sep 17 00:00:00 2001 From: tsimson Date: Thu, 14 Sep 2017 11:46:25 -0400 Subject: [PATCH 4/6] Fixed hp_procurve_show_vlans3 parsed files. --- .../show_vlans/hp_procurve_show_vlans3.parsed | 15 +++++++++++++++ .../show_vlans/hp_procurve_show_vlans3.raw | 10 ++++++++++ 2 files changed, 25 insertions(+) create mode 100644 tests/hp_procurve/show_vlans/hp_procurve_show_vlans3.parsed create mode 100644 tests/hp_procurve/show_vlans/hp_procurve_show_vlans3.raw diff --git a/tests/hp_procurve/show_vlans/hp_procurve_show_vlans3.parsed b/tests/hp_procurve/show_vlans/hp_procurve_show_vlans3.parsed new file mode 100644 index 0000000000..6f96a61425 --- /dev/null +++ b/tests/hp_procurve/show_vlans/hp_procurve_show_vlans3.parsed @@ -0,0 +1,15 @@ +--- + +parsed_sample: + +- name: "DEFAULT_VLAN" + jumbo: "" + vlan_id: "1" + status: "Port-based" + voice: "No" + +- name: "VoiceVlan" + jumbo: "" + vlan_id: "100" + status: "Port-based" + voice: "Yes" diff --git a/tests/hp_procurve/show_vlans/hp_procurve_show_vlans3.raw b/tests/hp_procurve/show_vlans/hp_procurve_show_vlans3.raw new file mode 100644 index 0000000000..0af68e54a4 --- /dev/null +++ b/tests/hp_procurve/show_vlans/hp_procurve_show_vlans3.raw @@ -0,0 +1,10 @@ + Status and Counters - VLAN Information + + Maximum VLANs to support : 8 + Primary VLAN : DEFAULT_VLAN + Management VLAN : + + 802.1Q VLAN ID Name Status Voice + -------------- ------------ ------------ ----- + 1 DEFAULT_VLAN Port-based No + 100 VoiceVlan Port-based Yes From 7b521eea4ea0dfdc4f1affc3dcce98ee5a10a71a Mon Sep 17 00:00:00 2001 From: tsimson Date: Mon, 16 Oct 2017 12:32:09 -0400 Subject: [PATCH 5/6] Corrected Value regexp for vlan name. --- templates/hp_procurve_show_vlans.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/hp_procurve_show_vlans.template b/templates/hp_procurve_show_vlans.template index c3e9cfb02d..723e2c75af 100644 --- a/templates/hp_procurve_show_vlans.template +++ b/templates/hp_procurve_show_vlans.template @@ -1,5 +1,5 @@ Value VLAN_ID (\d+) -Value NAME (\S+) +Value NAME ([\S+\s+]+) Value STATUS (\S+) Value VOICE (Yes|No) Value JUMBO (Yes|No) From 931bf3309449ee0a79faaee7fe9631faf0c2dd20 Mon Sep 17 00:00:00 2001 From: tsimson Date: Mon, 16 Oct 2017 13:20:45 -0400 Subject: [PATCH 6/6] Corrected Value regexp for vlan name. --- templates/hp_procurve_show_vlans.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/hp_procurve_show_vlans.template b/templates/hp_procurve_show_vlans.template index 723e2c75af..0000531e57 100644 --- a/templates/hp_procurve_show_vlans.template +++ b/templates/hp_procurve_show_vlans.template @@ -1,5 +1,5 @@ Value VLAN_ID (\d+) -Value NAME ([\S+\s+]+) +Value NAME ([\S+\s+].*(?=\|)) Value STATUS (\S+) Value VOICE (Yes|No) Value JUMBO (Yes|No)