Merge pull request ytti#3365 from ytti/3351-fix-aos7-prompt

3351 fix aos7 prompt
frederic-loui · Jan 11, 2025 · 6afc21d · 6afc21d
2 parents 0e19aed + c4f5d34
commit 6afc21d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 - sonicos: fix prompt for hostnames containing "-" . Fixes #3333 (@robertcheramy)
 - xos: Hide radius accounting secret
 - fsos: Hide AAA and SNMP secrets (@RayaneB35)
+- aos7: fix prompt for version 8.8x. Fixes #3351 (@robertcheramy)
 
 ## [0.31.0 – 2024-11-29]
 

diff --git a/docs/Supported-OS-Types.md b/docs/Supported-OS-Types.md
@@ -8,8 +8,8 @@
 |AddPack             |AddPack                       |[addpack](/lib/oxidized/model/addpack.rb)
 |Adtran              |Total Access (AOS)            |[adtran](/lib/oxidized/model/adtran.rb)
 |                    |ADVA                          |[adva](/lib/oxidized/model/adva.rb)              |                 |[ADVA](Model-Notes/ADVA.md)
-|Alcatel-Lucent      |AOS                           |[aos](/lib/oxidized/model/aos.rb)
-|                    |AOS7                          |[aos7](/lib/oxidized/model/aos7.rb)
+|Alcatel-Lucent      |AOS                           |[aos](/lib/oxidized/model/aos.rb)                |                 |AOS6 - vxworks-based
+|                    |AOS7                          |[aos7](/lib/oxidized/model/aos7.rb)              |                 |AOS7 and AOS8 - linux-based
 |                    |ISAM                          |[isam](/lib/oxidized/model/isam.rb)
 |                    |SR OS (Formerly TiMOS)        |[sros](/lib/oxidized/model/sros.rb)
 |                    |Wireless                      |[aosw](/lib/oxidized/model/aosw.rb)              |                 |Same model as Aruba Wireless

diff --git a/lib/oxidized/model/aos7.rb b/lib/oxidized/model/aos7.rb
@@ -4,6 +4,8 @@ class AOS7 < Oxidized::Model
   # Alcatel-Lucent Operating System Version 7 (Linux based)
   # used in OmniSwitch 6900/10k
 
+  prompt /^([\w.@-]+ ?[#>]\s?)$/
+
   comment  '! '
 
   cmd :all do |cfg, cmdstring|

diff --git a/spec/model/data/aos7:generic:prompt.yaml b/spec/model/data/aos7:generic:prompt.yaml
@@ -0,0 +1,7 @@
+pass:
+  - "S01-P1-RK13-SW01> "
+  - "S01-P1-RK13-SW01# "
+  # Issue #3351: Firmware 8.8x adds a space after the hostname
+  - "S01-P1-RK13-SW01 > "
+  - "S01-P1-RK13-SW01 # "
+