From e638efd1fb35062dab92a9cdaf7327d759ba41c3 Mon Sep 17 00:00:00 2001
From: Kit <crahl@christianrahl.com>
Date: Mon, 6 Jan 2025 17:04:15 -0600
Subject: [PATCH] Updated Aruba AOSCX show_vsf_detail with additional values
 (#1942)

Co-authored-by: Michael Bear <38406045+mjbear@users.noreply.github.com>
---
 .../aruba_aoscx_show_vsf_detail.textfsm       | 16 ++++++++----
 .../show_vsf_detail/show_vsf_detail.yml       |  9 +++++++
 .../show_vsf_detail/show_vsf_detail2.raw      | 26 +++++++++++++++++++
 .../show_vsf_detail/show_vsf_detail2.yml      | 22 ++++++++++++++++
 4 files changed, 68 insertions(+), 5 deletions(-)
 create mode 100644 tests/aruba_aoscx/show_vsf_detail/show_vsf_detail2.raw
 create mode 100644 tests/aruba_aoscx/show_vsf_detail/show_vsf_detail2.yml

diff --git a/ntc_templates/templates/aruba_aoscx_show_vsf_detail.textfsm b/ntc_templates/templates/aruba_aoscx_show_vsf_detail.textfsm
index ce38134a6a..9ec954400c 100644
--- a/ntc_templates/templates/aruba_aoscx_show_vsf_detail.textfsm
+++ b/ntc_templates/templates/aruba_aoscx_show_vsf_detail.textfsm
@@ -1,18 +1,24 @@
 Value MEMBER_ID (\S+)
+Value TOPOLOGY (\S+)
+Value NAME (\S+)
 Value MAC_ADDRESS (\S+)
 Value STATUS (.*)
+Value SERIAL_NUMBER (\S+)
 Value CPU (\d+%)
 Value MEMORY (\d+%)
 Value VSF_LINK_1 (.*)
 Value VSF_LINK_2 (.*)
 
 Start
-  ^VSF\s*${MEMBER_ID}
+  ^VSF\s+${MEMBER_ID}
+  ^\s+Topology\s+:\s+${TOPOLOGY}
+  ^\s+Name\s+:\s+${NAME}
   ^Member.* -> Continue.Record
   ^Member\s+ID\s+:\s+${MEMBER_ID}
-  ^\s+MAC\s+Address\s+:\s+${MAC_ADDRESS}                                                                          
-  ^\s+Status\s+:\s+${STATUS}                                                                       
-  ^\s+CPU\sUtilization\s+:\s+${CPU}                                                                      
-  ^\s+Memory\sUtilization\s+:\s+${MEMORY}
+  ^\s+MAC\s+Address\s+:\s+${MAC_ADDRESS}
+  ^\s+Status\s+:\s+${STATUS}
+  ^\s+Serial\s+Number\s+:\s+${SERIAL_NUMBER}
+  ^\s+CPU\s+Utilization\s+:\s+${CPU}
+  ^\s+Memory\s+Utilization\s+:\s+${MEMORY}
   ^\s+VSF\s+Link\s+1\s+:${VSF_LINK_1}
   ^\s+VSF\s+Link\s+2\s+:${VSF_LINK_2}
diff --git a/tests/aruba_aoscx/show_vsf_detail/show_vsf_detail.yml b/tests/aruba_aoscx/show_vsf_detail/show_vsf_detail.yml
index fe8709803f..f486c78990 100644
--- a/tests/aruba_aoscx/show_vsf_detail/show_vsf_detail.yml
+++ b/tests/aruba_aoscx/show_vsf_detail/show_vsf_detail.yml
@@ -4,20 +4,29 @@ parsed_sample:
     mac_address: "88:3a:30:97:d0:40"
     member_id: "Stack"
     memory: ""
+    name: "Aruba-VSF-6300"
+    serial_number: ""
     status: "No Split"
+    topology: "chain"
     vsf_link_1: ""
     vsf_link_2: ""
   - cpu: "9%"
     mac_address: "88:3a:30:97:d0:40"
     member_id: "1"
     memory: "18%"
+    name: ""
+    serial_number: "LTRSN123124"
     status: "Master"
+    topology: ""
     vsf_link_1: " Up, connected to peer member 2, link 1"
     vsf_link_2: ""
   - cpu: "1%"
     mac_address: "88:3a:30:96:4d:c0"
     member_id: "2"
     memory: "11%"
+    name: ""
+    serial_number: "LTRSN123124"
     status: "Standby"
+    topology: ""
     vsf_link_1: " Up, connected to peer member 1, link 1"
     vsf_link_2: ""
diff --git a/tests/aruba_aoscx/show_vsf_detail/show_vsf_detail2.raw b/tests/aruba_aoscx/show_vsf_detail/show_vsf_detail2.raw
new file mode 100644
index 0000000000..86557ebc04
--- /dev/null
+++ b/tests/aruba_aoscx/show_vsf_detail/show_vsf_detail2.raw
@@ -0,0 +1,26 @@
+VSF Stack
+        MAC Address                  : 89:ab:cd:ef:01:23
+        Secondary                    :
+        Topology                     : standalone
+        Status                       : No Split
+        Split Detection Method       : None
+        Software Version             : FL.10.10.1030
+        Force Autojoin               : Disabled
+        Autojoin Eligibility Status  : Not Eligible
+        Autojoin Ineligibility Reason: Configuration changes detected
+        Name                         : Aruba-VSF-6300
+        Contact                      :
+        Location                     :
+
+Member ID                            : 1
+        MAC Address                  : 89:ab:cd:ef:01:23
+        Type                         : JL659A
+        Model                        : 6300M 48-port HPE Smart Rate 1/2.5/5GbE Class 6 PoE and 4-port SFP56 Switch
+        Status                       : Conductor
+        ROM Version                  : FL.01.11.0001
+        Serial Number                : SG1234ABCD
+        Uptime                       : 4 weeks, 2 hours, 35 minutes
+        CPU Utilization              : 23%
+        Memory Utilization           : 35%
+        VSF Link 1                   :
+        VSF Link 2                   :
diff --git a/tests/aruba_aoscx/show_vsf_detail/show_vsf_detail2.yml b/tests/aruba_aoscx/show_vsf_detail/show_vsf_detail2.yml
new file mode 100644
index 0000000000..1f96d81c5a
--- /dev/null
+++ b/tests/aruba_aoscx/show_vsf_detail/show_vsf_detail2.yml
@@ -0,0 +1,22 @@
+---
+parsed_sample:
+  - cpu: ""
+    mac_address: "89:ab:cd:ef:01:23"
+    member_id: "Stack"
+    memory: ""
+    name: "Aruba-VSF-6300"
+    serial_number: ""
+    status: "No Split"
+    topology: "standalone"
+    vsf_link_1: ""
+    vsf_link_2: ""
+  - cpu: "23%"
+    mac_address: "89:ab:cd:ef:01:23"
+    member_id: "1"
+    memory: "35%"
+    name: ""
+    serial_number: "SG1234ABCD"
+    status: "Conductor"
+    topology: ""
+    vsf_link_1: ""
+    vsf_link_2: ""