ciscollm-cli 1.3.0 → 1.3.1

package/dist/server/index.js

@@ -20,14 +20,14 @@ function getTimestamp() {
 }
 function printDashboard(httpPort) {
     console.clear();
-    console.log(chalk_1.default.bold.cyan(`
-      :::::::::   ::::::::   ::::::::   ::::::::   ::::::::       ::::    ::::  ::::     ::::  
-     :+:    :+: :+:    :+: :+:    :+: :+:    :+: :+:    :+:      +:+:+: :+:+:+ +:+    +:+:+:   
-     +:+    +:+ +:+    +:+ +:+        +:+        +:+    +:+      +:+ +:+:+ +:+ +:+         +:+ 
-     +#++:++#+  +#+    +:+ +#++:++#++ +#++:++#++ +#+    +:+      +#+  +:+  +#+ +#+    +#++:++#+ 
-     +#+        +#+    +:+        +#+        +#+ +#+    +#+      +#+       +#+ +#+         +#+  
-     #+#        #+#    #+# #+#    #+# #+#    #+# #+#    #+#      #+#       #+# #+#         #+#  
-     ###         ########   ########   ########   ########       ###       ### #########   ###  
+    console.log(chalk_1.default.bold.cyan(`
+      :::::::::   ::::::::   ::::::::   ::::::::   ::::::::       ::::    ::::  ::::     ::::  
+     :+:    :+: :+:    :+: :+:    :+: :+:    :+: :+:    :+:      +:+:+: :+:+:+ +:+    +:+:+:   
+     +:+    +:+ +:+    +:+ +:+        +:+        +:+    +:+      +:+ +:+:+ +:+ +:+         +:+ 
+     +#++:++#+  +#+    +:+ +#++:++#++ +#++:++#++ +#+    +:+      +#+  +:+  +#+ +#+    +#++:++#+ 
+     +#+        +#+    +:+        +#+        +#+ +#+    +#+      +#+       +#+ +#+         +#+  
+     #+#        #+#    #+# #+#    #+# #+#    #+# #+#    #+#      #+#       #+# #+#         #+#  
+     ###         ########   ########   ########   ########       ###       ### #########   ###  
     `));
     console.log(chalk_1.default.bold.yellow('               Cisco IOS Multi-Protocol Test Simulator \n'));
     console.log(chalk_1.default.cyan('┌─────────────────────────────────────────────────────────────────────────────┐'));

package/dist/server/shell-simulator.d.ts

@@ -1,6 +1,6 @@
 import { EventEmitter } from 'events';
 export declare const simulatorEvents: EventEmitter<[never]>;
-export type CliMode = 'USER_EXEC' | 'PRIVILEGED_EXEC' | 'GLOBAL_CONFIG' | 'INTERFACE_CONFIG' | 'OSPF_CONFIG' | 'RIP_CONFIG' | 'BGP_CONFIG' | 'EIGRP_CONFIG' | 'DHCP_CONFIG' | 'ACL_CONFIG' | 'VLAN_CONFIG';
+export type CliMode = 'USER_EXEC' | 'PRIVILEGED_EXEC' | 'GLOBAL_CONFIG' | 'INTERFACE_CONFIG' | 'OSPF_CONFIG' | 'RIP_CONFIG' | 'BGP_CONFIG' | 'EIGRP_CONFIG' | 'DHCP_CONFIG' | 'ACL_CONFIG' | 'VLAN_CONFIG' | 'VPC_CONFIG' | 'VRF_CONFIG' | 'VRF_AF_CONFIG';
 export interface InterfaceState {
     name: string;
     ip: string | null;
@@ -12,6 +12,12 @@ export interface InterfaceState {
     switchportMode?: 'access' | 'trunk';
     vlan?: number;
     natType?: 'inside' | 'outside';
+    vpcMemberId?: number;
+    sourceInterface?: string;
+    memberVnis?: Map<number, {
+        mcastGroup?: string;
+        associateVrf?: boolean;
+    }>;
 }
 export interface RouteState {
     network: string;
@@ -60,6 +66,16 @@ export declare class ShellSimulator {
     natRules: string[];
     acls: Map<string, string[]>;
     ipRoutingEnabled: boolean;
+    featuresEnabled: Set<string>;
+    vpcDomainId: number | null;
+    vpcPeerKeepalive: string | null;
+    vnSegments: Map<number, number>;
+    vrfs: Map<string, {
+        vni?: number;
+        rd?: string;
+        routeTargets: string[];
+    }>;
+    activeVrf: string | null;
     flashFiles: Set<string>;
     private pendingCopyDest;
     private backupState;

package/dist/server/shell-simulator.js

@@ -69,6 +69,12 @@ class ShellSimulator {
     natRules = [];
     acls = new Map();
     ipRoutingEnabled = true;
+    featuresEnabled = new Set();
+    vpcDomainId = null;
+    vpcPeerKeepalive = null;
+    vnSegments = new Map();
+    vrfs = new Map();
+    activeVrf = null;
     flashFiles = new Set(['c2960-lanbasek9-mz.150-2.SE4.bin']);
     pendingCopyDest = null;
     backupState = null;
@@ -123,6 +129,12 @@ class ShellSimulator {
                 return `${this.hostname}(config-ext-nacl)# `;
             case 'VLAN_CONFIG':
                 return `${this.hostname}(config-vlan)# `;
+            case 'VPC_CONFIG':
+                return `${this.hostname}(config-vpc-domain)# `;
+            case 'VRF_CONFIG':
+                return `${this.hostname}(config-vrf)# `;
+            case 'VRF_AF_CONFIG':
+                return `${this.hostname}(config-vrf-af-ipv4)# `;
             default:
                 return `${this.hostname}# `;
         }
@@ -164,56 +176,57 @@ class ShellSimulator {
         }
         const args = commandToExecute.split(/\s+/);
         const cmd = args[0].toLowerCase();
+        const isShow = cmd === 'show' || cmd === 'sh' || (cmd === 'do' && (args[1]?.toLowerCase() === 'show' || args[1]?.toLowerCase() === 'sh'));
         if (cmd === '?' || cmd === 'help') {
             if (cmd === 'help') {
-                return `Help may be requested at any point in a command by entering
-a question mark '?'. If nothing matches, the help list will
+                return `Help may be requested at any point in a command by entering
+a question mark '?'. If nothing matches, the help list will
 show the available options.`;
             }
             if (this.mode === 'USER_EXEC') {
-                return `Exec commands:
-  disable            Turn off privileged commands
-  enable             Turn on privileged commands
-  exit               Exit from the EXEC
-  ping               Send echo messages
+                return `Exec commands:
+  disable            Turn off privileged commands
+  enable             Turn on privileged commands
+  exit               Exit from the EXEC
+  ping               Send echo messages
   show               Show running system information`;
             }
             else if (this.mode === 'PRIVILEGED_EXEC') {
-                return `Exec commands:
-  clear              Reset functions
-  configure          Enter configuration mode
-  copy               Copy from one file to another
-  dir                List files on a filesystem
-  disable            Turn off privileged commands
-  enable             Turn on privileged commands
-  exit               Exit from the EXEC
-  ping               Send echo messages
-  show               Show running system information
+                return `Exec commands:
+  clear              Reset functions
+  configure          Enter configuration mode
+  copy               Copy from one file to another
+  dir                List files on a filesystem
+  disable            Turn off privileged commands
+  enable             Turn on privileged commands
+  exit               Exit from the EXEC
+  ping               Send echo messages
+  show               Show running system information
   write              Write running configuration to memory or terminal`;
             }
             else if (this.mode === 'GLOBAL_CONFIG') {
-                return `Configure commands:
-  do                 To run EXEC commands in config mode
-  end                Exit from configure mode
-  exit               Exit from configure mode
-  hostname           Set system's network name
-  interface          Select an interface to configure
-  ip                 Global IP configuration subcommands
-  no                 Negate a command or set defaults
-  router             Enable a routing process
+                return `Configure commands:
+  do                 To run EXEC commands in config mode
+  end                Exit from configure mode
+  exit               Exit from configure mode
+  hostname           Set system's network name
+  interface          Select an interface to configure
+  ip                 Global IP configuration subcommands
+  no                 Negate a command or set defaults
+  router             Enable a routing process
   vlan               Vlan configuration commands`;
             }
             else if (this.mode === 'INTERFACE_CONFIG') {
-                return `Interface configuration commands:
-  description        Detailed description of this interface
-  exit               Exit from interface configuration mode
-  ip                 IP interface configuration subcommands
-  no                 Negate a command or set defaults
+                return `Interface configuration commands:
+  description        Detailed description of this interface
+  exit               Exit from interface configuration mode
+  ip                 IP interface configuration subcommands
+  no                 Negate a command or set defaults
   shutdown           Shutdown this interface`;
             }
             else {
-                return `Commands:
-  exit               Exit current mode
+                return `Commands:
+  exit               Exit current mode
   end                Exit to privileged EXEC mode`;
             }
         }
@@ -224,10 +237,15 @@ show the available options.`;
             return `% Incomplete command.`;
         }
         if (cmd === 'exit') {
-            if (this.mode === 'INTERFACE_CONFIG' || this.mode === 'OSPF_CONFIG' || this.mode === 'RIP_CONFIG' || this.mode === 'BGP_CONFIG' || this.mode === 'EIGRP_CONFIG' || this.mode === 'DHCP_CONFIG' || this.mode === 'ACL_CONFIG' || this.mode === 'VLAN_CONFIG') {
+            if (this.mode === 'INTERFACE_CONFIG' || this.mode === 'OSPF_CONFIG' || this.mode === 'RIP_CONFIG' || this.mode === 'BGP_CONFIG' || this.mode === 'EIGRP_CONFIG' || this.mode === 'DHCP_CONFIG' || this.mode === 'ACL_CONFIG' || this.mode === 'VLAN_CONFIG' || this.mode === 'VPC_CONFIG' || this.mode === 'VRF_CONFIG') {
                 this.mode = 'GLOBAL_CONFIG';
                 this.activeInterface = null;
                 this.activeVlan = null;
+                this.activeVrf = null;
+                return '';
+            }
+            else if (this.mode === 'VRF_AF_CONFIG') {
+                this.mode = 'VRF_CONFIG';
                 return '';
             }
             else if (this.mode === 'GLOBAL_CONFIG') {
@@ -247,6 +265,7 @@ show the available options.`;
                 this.mode = 'PRIVILEGED_EXEC';
                 this.activeInterface = null;
                 this.activeVlan = null;
+                this.activeVrf = null;
                 return '';
             }
         }
@@ -290,7 +309,35 @@ show the available options.`;
             this.shellEnabled = true;
             return '';
         }
-        if (this.mode === 'GLOBAL_CONFIG') {
+        const isGeneralCommand = isShow || cmd === 'ping' || cmd === 'write' || cmd === 'wr' || cmd === 'copy' || cmd === 'dir' || cmd === 'test';
+        if (this.mode === 'GLOBAL_CONFIG' && !isGeneralCommand) {
+            if (cmd === 'feature' && args[1]) {
+                const featureName = args.slice(1).join(' ').toLowerCase();
+                this.featuresEnabled.add(featureName);
+                return '';
+            }
+            if (cmd === 'no' && args[1] === 'feature' && args[2]) {
+                const featureName = args.slice(2).join(' ').toLowerCase();
+                this.featuresEnabled.delete(featureName);
+                return '';
+            }
+            if (cmd === 'vpc' && args[1] === 'domain' && args[2]) {
+                const domainId = parseInt(args[2], 10);
+                if (!isNaN(domainId)) {
+                    this.vpcDomainId = domainId;
+                    this.mode = 'VPC_CONFIG';
+                    return '';
+                }
+            }
+            if (cmd === 'vrf' && args[1] === 'context' && args[2]) {
+                const vrfName = args[2];
+                this.activeVrf = vrfName;
+                if (!this.vrfs.has(vrfName)) {
+                    this.vrfs.set(vrfName, { routeTargets: [] });
+                }
+                this.mode = 'VRF_CONFIG';
+                return '';
+            }
             if (cmd === 'hostname' && args[1]) {
                 this.hostname = args[1];
                 return '';
@@ -457,7 +504,7 @@ show the available options.`;
             }
             return `% Invalid input detected at '^' marker.`;
         }
-        if (this.mode === 'VLAN_CONFIG' && this.activeVlan !== null) {
+        if (this.mode === 'VLAN_CONFIG' && this.activeVlan !== null && !isGeneralCommand) {
             if (cmd === 'name' && args[1]) {
                 this.vlanNames.set(this.activeVlan, args.slice(1).join(' '));
                 return '';
@@ -466,10 +513,40 @@ show the available options.`;
                 this.vlanNames.set(this.activeVlan, `VLAN${this.activeVlan.toString().padStart(4, '0')}`);
                 return '';
             }
+            if (cmd === 'vn-segment' && args[1]) {
+                const vni = parseInt(args[1], 10);
+                if (!isNaN(vni)) {
+                    this.vnSegments.set(this.activeVlan, vni);
+                    return '';
+                }
+            }
             return `% Invalid input detected at '^' marker.`;
         }
-        if (this.mode === 'INTERFACE_CONFIG' && this.activeInterface) {
+        if (this.mode === 'INTERFACE_CONFIG' && this.activeInterface && !isGeneralCommand) {
             const iface = this.interfaces.get(this.activeInterface);
+            if (cmd === 'vpc' && args[1]) {
+                const vpcId = parseInt(args[1], 10);
+                if (!isNaN(vpcId)) {
+                    iface.vpcMemberId = vpcId;
+                    return '';
+                }
+            }
+            if (cmd === 'source-interface' && args[1]) {
+                iface.sourceInterface = args[1];
+                return '';
+            }
+            if (cmd === 'member' && args[1] === 'vni' && args[2]) {
+                const vni = parseInt(args[2], 10);
+                if (!isNaN(vni)) {
+                    if (!iface.memberVnis) {
+                        iface.memberVnis = new Map();
+                    }
+                    const mcastGroup = args[3] === 'mcast-group' ? args[4] : undefined;
+                    const associateVrf = args.includes('associate-vrf');
+                    iface.memberVnis.set(vni, { mcastGroup, associateVrf });
+                    return '';
+                }
+            }
             if (cmd === 'shutdown') {
                 iface.adminShutdown = true;
                 iface.lineProtocolUp = false;
@@ -599,7 +676,7 @@ show the available options.`;
             }
             return `% Invalid input detected at '^' marker.`;
         }
-        if (this.mode === 'OSPF_CONFIG') {
+        if (this.mode === 'OSPF_CONFIG' && !isGeneralCommand) {
             if (cmd === 'network' || cmd === 'router-id') {
                 return '';
             }
@@ -608,7 +685,7 @@ show the available options.`;
             }
             return `% Invalid input detected at '^' marker.`;
         }
-        if (this.mode === 'RIP_CONFIG') {
+        if (this.mode === 'RIP_CONFIG' && !isGeneralCommand) {
             if (cmd === 'version' && (args[1] === '1' || args[1] === '2')) {
                 this.ripVersion = parseInt(args[1], 10);
                 return '';
@@ -629,7 +706,7 @@ show the available options.`;
             }
             return `% Invalid input detected at '^' marker.`;
         }
-        if (this.mode === 'BGP_CONFIG') {
+        if (this.mode === 'BGP_CONFIG' && !isGeneralCommand) {
             if (cmd === 'neighbor' && args[1]) {
                 return '';
             }
@@ -645,9 +722,49 @@ show the available options.`;
             if (cmd === 'auto-summary') {
                 return '';
             }
+            if (cmd === 'address-family' && args[1] === 'l2vpn' && args[2] === 'evpn') {
+                return '';
+            }
+            if (cmd === 'send-community') {
+                return '';
+            }
+            return `% Invalid input detected at '^' marker.`;
+        }
+        if (this.mode === 'VPC_CONFIG' && !isGeneralCommand) {
+            if (cmd === 'peer-keepalive' && args[1] === 'destination') {
+                this.vpcPeerKeepalive = commandToExecute;
+                return '';
+            }
+            if (cmd === 'system-priority' || cmd === 'role' || cmd === 'peer-gateway' || cmd === 'peer-switch') {
+                return '';
+            }
+            return `% Invalid input detected at '^' marker.`;
+        }
+        if (this.mode === 'VRF_CONFIG' && this.activeVrf && !isGeneralCommand) {
+            const vrf = this.vrfs.get(this.activeVrf);
+            if (cmd === 'vni' && args[1]) {
+                vrf.vni = parseInt(args[1], 10);
+                return '';
+            }
+            if (cmd === 'rd' && args[1]) {
+                vrf.rd = args.slice(1).join(' ');
+                return '';
+            }
+            if (cmd === 'address-family' && args[1] === 'ipv4' && args[2] === 'unicast') {
+                this.mode = 'VRF_AF_CONFIG';
+                return '';
+            }
+            return `% Invalid input detected at '^' marker.`;
+        }
+        if (this.mode === 'VRF_AF_CONFIG' && this.activeVrf && !isGeneralCommand) {
+            const vrf = this.vrfs.get(this.activeVrf);
+            if (cmd === 'route-target' && args[1] === 'both' && args[2]) {
+                vrf.routeTargets.push(args.slice(1).join(' '));
+                return '';
+            }
             return `% Invalid input detected at '^' marker.`;
         }
-        if (this.mode === 'EIGRP_CONFIG') {
+        if (this.mode === 'EIGRP_CONFIG' && !isGeneralCommand) {
             if (cmd === 'network' && args[1]) {
                 return '';
             }
@@ -662,36 +779,85 @@ show the available options.`;
             }
             return `% Invalid input detected at '^' marker.`;
         }
-        if (this.mode === 'DHCP_CONFIG') {
+        if (this.mode === 'DHCP_CONFIG' && !isGeneralCommand) {
             if (cmd === 'network' || cmd === 'default-router' || cmd === 'dns-server') {
                 return '';
             }
             return `% Invalid input detected at '^' marker.`;
         }
-        if (this.mode === 'ACL_CONFIG') {
+        if (this.mode === 'ACL_CONFIG' && !isGeneralCommand) {
             if (cmd === 'permit' || cmd === 'deny') {
                 return '';
             }
             return `% Invalid input detected at '^' marker.`;
         }
-        const isShow = cmd === 'show' || cmd === 'sh' || (cmd === 'do' && (args[1]?.toLowerCase() === 'show' || args[1]?.toLowerCase() === 'sh'));
         if (isShow) {
             const showArgs = cmd === 'do' ? args.slice(2) : args.slice(1);
             const showCmd = showArgs[0]?.toLowerCase();
+            if (showCmd === 'vpc') {
+                const domainId = this.vpcDomainId || 10;
+                const peerStatus = this.vpcPeerKeepalive ? 'peer adjacency formed ok' : 'peer link not configured';
+                const keepaliveStatus = this.vpcPeerKeepalive ? 'peer is alive' : 'peer keep-alive not configured';
+                return `Legend:
+                (*) - local vPC is down, dynamic backup loop preventer
+
+vPC domain id                     : ${domainId}
+Peer status                       : ${peerStatus}
+vPC keep-alive status             : ${keepaliveStatus}
+Configuration-consistency status  : success 
+Per-vlan consistency status       : success 
+Type-2 consistency status         : success 
+vPC role                          : primary                       
+Number of vPCs configured         : ${Array.from(this.interfaces.values()).filter(i => i.vpcMemberId !== undefined).length}
+Peer Gateway                      : Enabled
+`;
+            }
+            if (showCmd === 'nve' && showArgs[1] === 'interface') {
+                const nveIface = Array.from(this.interfaces.values()).find(i => i.name.toLowerCase().startsWith('nve'));
+                if (!nveIface) {
+                    return '% NVE interface is not configured';
+                }
+                const sourceInt = nveIface.sourceInterface || 'Loopback0';
+                return `Interface: ${nveIface.name}, State: Up, Encapsulation: VXLAN
+Source-Interface: ${sourceInt} (10.0.0.1)
+`;
+            }
+            if (showCmd === 'nve' && showArgs[1] === 'vni') {
+                const nveIface = Array.from(this.interfaces.values()).find(i => i.name.toLowerCase().startsWith('nve'));
+                if (!nveIface || !nveIface.memberVnis) {
+                    return `Interface VNI      Multicast-group   State Mode vPC Dev\n` +
+                        `--------- -------- ----------------- ----- ---- -------\n`;
+                }
+                let out = `Interface VNI      Multicast-group   State Mode vPC Dev\n` +
+                    `--------- -------- ----------------- ----- ---- -------\n`;
+                for (const [vni, details] of nveIface.memberVnis.entries()) {
+                    const mcast = details.mcastGroup || 'n/a';
+                    out += `${nveIface.name.padEnd(9)} ${vni.toString().padEnd(8)} ${mcast.padEnd(17)} Up    CP   n/a\n`;
+                }
+                return out;
+            }
+            if (showCmd === 'bgp' && showArgs[1] === 'l2vpn' && showArgs[2] === 'evpn' && showArgs[3] === 'summary') {
+                const bgpAs = this.bgpAsn || '65000';
+                return `BGP summary information for VRF default, address family L2VPN EVPN
+BGP router identifier 10.0.0.1, local AS number ${bgpAs}
+Neighbor        V    AS MsgRcvd MsgSent   TblVer  InQ OutQ Up/Down  State/PfxRcd
+10.0.0.2        4 ${bgpAs}     120     125       47    0    0 01:24:55 2
+`;
+            }
             if (showCmd === 'version' || showCmd === 'ver') {
-                return `Cisco IOS Software, C2960 Software (C2960-LANBASEK9-M), Version 15.0(2)SE4, RELEASE SOFTWARE (fc1)
-Technical Support: http://www.cisco.com/techsupport
-Copyright (c) 1986-2013 by Cisco Systems, Inc.
-Compiled Wed 26-Jun-13 02:49 by prod_rel_team
-
-ROM: Bootstrap program is 12.2(44)SE Version
-BOOTLDR: C2960 Boot Loader (C2960-HBOOT-M) Version 12.2(44)SE, RELEASE SOFTWARE (fc1)
-
-Switch1 uptime is 2 hours, 15 minutes
-System returned to ROM by power-on
-System image file is "flash:/c2960-lanbasek9-mz.150-2.SE4.bin"
-
-This product contains cryptographic features and is subject to Y...
+                return `Cisco IOS Software, C2960 Software (C2960-LANBASEK9-M), Version 15.0(2)SE4, RELEASE SOFTWARE (fc1)
+Technical Support: http://www.cisco.com/techsupport
+Copyright (c) 1986-2013 by Cisco Systems, Inc.
+Compiled Wed 26-Jun-13 02:49 by prod_rel_team
+
+ROM: Bootstrap program is 12.2(44)SE Version
+BOOTLDR: C2960 Boot Loader (C2960-HBOOT-M) Version 12.2(44)SE, RELEASE SOFTWARE (fc1)
+
+Switch1 uptime is 2 hours, 15 minutes
+System returned to ROM by power-on
+System image file is "flash:/c2960-lanbasek9-mz.150-2.SE4.bin"
+
+This product contains cryptographic features and is subject to Y...
 `;
             }
             if (showCmd === 'ip' && showArgs[1]?.startsWith('int') && showArgs[2]?.startsWith('br')) {
@@ -842,11 +1008,11 @@ This product contains cryptographic features and is subject to Y...
                 return out;
             }
             if (showCmd === 'cdp' && showArgs[1]?.startsWith('ne')) {
-                return `Capability Codes: R - Router, T - Trans Bridge, B - Source Route Bridge
-                  S - Switch, H - Host, I - IGMP, r - Repeater, P - Phone
-
-Device ID        Local Intrfce     Holdtme    Capability  Platform  Port ID
-Switch2          Gig 0/1           125              S I   WS-C2960- Gig 0/1
+                return `Capability Codes: R - Router, T - Trans Bridge, B - Source Route Bridge
+                  S - Switch, H - Host, I - IGMP, r - Repeater, P - Phone
+
+Device ID        Local Intrfce     Holdtme    Capability  Platform  Port ID
+Switch2          Gig 0/1           125              S I   WS-C2960- Gig 0/1
 `;
             }
             if (showCmd === 'vtp' && showArgs[1] === 'status') {
@@ -912,9 +1078,9 @@ Switch2          Gig 0/1           125              S I   WS-C2960- Gig 0/1
                 return out;
             }
             if (showCmd === 'lldp' && showArgs[1]?.startsWith('ne')) {
-                return `Device ID           Local Intf         Hold-time  Capability      Port ID
-Switch2             Gi0/1              120        S               Gi0/1
-Total entries displayed: 1
+                return `Device ID           Local Intf         Hold-time  Capability      Port ID
+Switch2             Gi0/1              120        S               Gi0/1
+Total entries displayed: 1
 `;
             }
             return `% Unrecognized show command: show ${showArgs.join(' ')}`;
@@ -955,9 +1121,9 @@ Total entries displayed: 1
         }
         if (cmd === 'ping' && args[1]) {
             const ip = args[1];
-            return `Sending 5, 100-byte ICMP Echos to ${ip}, timeout is 2 seconds:
-!!!!!
-Success rate is 100 percent (5/5), round-trip min/avg/max = 1/1/4 ms
+            return `Sending 5, 100-byte ICMP Echos to ${ip}, timeout is 2 seconds:
+!!!!!
+Success rate is 100 percent (5/5), round-trip min/avg/max = 1/1/4 ms
 `;
         }
         if (cmd === 'test' && args[1] === 'trigger-syslog') {
@@ -1005,6 +1171,21 @@ Success rate is 100 percent (5/5), round-trip min/avg/max = 1/1/4 ms
         if (lower.startsWith('vl')) {
             return 'Vlan' + name.substring(2);
         }
+        if (lower.startsWith('ethernet')) {
+            return 'Ethernet' + name.substring(8);
+        }
+        if (lower.startsWith('eth')) {
+            return 'Ethernet' + name.substring(3);
+        }
+        if (lower.startsWith('port-channel')) {
+            return 'Port-channel' + name.substring(12);
+        }
+        if (lower.startsWith('po')) {
+            return 'Port-channel' + name.substring(2);
+        }
+        if (lower.startsWith('nve')) {
+            return 'Nve' + name.substring(3);
+        }
         return name;
     }
     shortenInterfaceName(name) {
@@ -1012,7 +1193,10 @@ Success rate is 100 percent (5/5), round-trip min/avg/max = 1/1/4 ms
             .replace('GigabitEthernet', 'Gi')
             .replace('FastEthernet', 'Fa')
             .replace('TenGigabitEthernet', 'Te')
-            .replace('Loopback', 'Lo');
+            .replace('Loopback', 'Lo')
+            .replace('Ethernet', 'Eth')
+            .replace('Port-channel', 'Po')
+            .replace('Nve', 'Nve');
     }
     getPrefixLength(mask) {
         const parts = mask.split('.').map(Number);