Merge branch 'master' into alcatel_aos_show_linkagg_port

ntc_templates/templates/alcatel_aos_show_interfaces_alias.textfsm

@@ -0,0 +1,19 @@
+Value PORT (\S+)
+Value ADMIN_STATUS (\S+)
+Value LINK_STATUS (\S+)
+Value WAIT_TO_RESTORE (\d+)
+Value WAIT_TO_SHUTDOWN (\d+)
+Value ALIAS (.*)
+
+Start
+  ^\s*-+\+ -> Table
+  ^\s*Chas\/\s*$$
+  ^\s*Slot\/\s+Admin\s+Link\s+WTR\s+WTS\s+Alias\s*$$
+  ^\s*Port\s+Status\s+Status\s+\(sec\)\s+\(msec\)\s*$$
+  ^\s*$$
+  ^.*$$ -> Error
+
+Table
+  ^\s*${PORT}\s+${ADMIN_STATUS}\s+${LINK_STATUS}\s+${WAIT_TO_RESTORE}\s+${WAIT_TO_SHUTDOWN}\s+"${ALIAS}"\s*$$ -> Record
+  ^\s*$$
+  ^.*$$ -> Error

ntc_templates/templates/alcatel_aos_show_linkagg_alias.textfsm

@@ -0,0 +1,16 @@
+Value NUMBER (\d+)
+Value AGGREGATE (\S+)
+Value SIZE (\d+)
+Value ADMIN_STATE (\S+)
+Value OPERATIONAL_STATE (\S+)
+Value N_ATTACHED_PORTS (\d+)
+Value N_POSSIBLE_PORTS (\d+)
+Value NAME (\S.+\S)
+
+Start
+  ^\s*Admin\s*Oper\s*Att\/Sel\s*$$
+  ^\s*Number\s+Aggregate\s+Size\s+state\s+state\s+Ports\s+Name\s*$$
+  ^\s*-+
+  ^\s*${NUMBER}\s+${AGGREGATE}\s+${SIZE}\s+${ADMIN_STATE}\s+${OPERATIONAL_STATE}\s+${N_ATTACHED_PORTS}\s+${N_POSSIBLE_PORTS}\s+${NAME}\s*$$ -> Record
+  ^\s*$$
+  ^.*$$ -> Error

ntc_templates/templates/alcatel_aos_show_mac-address-table.textfsm

@@ -11,9 +11,10 @@ Start
   ^\s+Vlan\s+Mac\s+Address\s+Type\s+Protocol\s+Operation\s+Interface\s+$$
   ^\s*-+\+
   ^\s*${ADDRESS_NOT_VALID}${VLAN_ID}\s+${MAC}\s+${TYPE}\s+(---|${PROTOCOL})\s+${OPERATION}\s+${INTERFACE}\s*$$ -> Record
-  ^\s*Domain\s+Vlan\/SrvcId\[ISId\/vnId\]\s+Mac\s+Address\s+Type\s+Operation\s+Interface\s*$$
+  ^\s*Domain\s+Vlan\/SrvcId\[(ISId\/vnId|:ID)\]\s+Mac\s+Address\s+Type\s+Operation\s+Interface\s*$$
   ^\s*${DOMAIN}\s+${VLAN_ID}\s+${MAC}\s+${TYPE}\s+${OPERATION}\s+${INTERFACE}\s*$$ -> Record
   ^\s*Total\s+number\s+of\s+Valid\s+MAC\s+addresses\s+above\s+=\s+\d+\s*$$ -> Record
   ^\s*(Legend:\s+)?Mac\s+Address:
+  ^\s*ID\s+=\s+ISID\/Vnid\/vplsid\s*$$
   ^\s*$$
   ^.*$$ -> Error

ntc_templates/templates/index

@@ -14,7 +14,9 @@ Template, Hostname, Platform, Command
 alcatel_aos_show_lldp_remote-system.textfsm, .*, alcatel_aos, sh[[ow]] lldp r[[emote-system]]
 alcatel_aos_show_interfaces_status.textfsm, .*, alcatel_aos, sh[[ow]] in[[terfaces]] st[[atus]]
 alcatel_aos_show_mac-address-table.textfsm, .*, alcatel_aos, sh[[ow]] mac-(a[[ddress-table]]|l[[earning]])
+alcatel_aos_show_interfaces_alias.textfsm, .*, alcatel_aos, sh[[ow]] in[[terfaces]] al[[ias]]
 alcatel_aos_show_interfaces_port.textfsm, .*, alcatel_aos, sh[[ow]] in[[terfaces]] p[[ort]]
+alcatel_aos_show_linkagg_alias.textfsm, .*, alcatel_aos, sh[[ow]] li[[nkagg]] al[[ias]]
 alcatel_aos_show_port-security.textfsm, .*, alcatel_aos, sh[[ow]] port-[[security]]
 alcatel_aos_show_linkagg_port.textfsm, .*, alcatel_aos, sh[[ow]] li[[nkagg]] po[[rt]]
 alcatel_aos_show_vlan_port.textfsm, .*, alcatel_aos, sh[[ow]] vl[[an]] (p[[ort]]|m[[embers]])

tests/alcatel_aos/show_interfaces_alias/alcatel_aos_show_interfaces_alias.raw

@@ -0,0 +1,7 @@
+ Chas/
+ Slot/     Admin     Link        WTR      WTS       Alias
+ Port      Status   Status      (sec)    (msec)
+--------+----------+---------+----------+----------+-----------------------
+ 1/1/1     enable     up      0          0          "This is an example"
+ 2/1/10    enable     down    0          0          "This_is_an_example"
+ 2/1/11    enable     down    0          0          "This"

tests/alcatel_aos/show_interfaces_alias/alcatel_aos_show_interfaces_alias.yml

@@ -0,0 +1,20 @@
+---
+parsed_sample:
+  - admin_status: "enable"
+    alias: "This is an example"
+    link_status: "up"
+    port: "1/1/1"
+    wait_to_restore: "0"
+    wait_to_shutdown: "0"
+  - admin_status: "enable"
+    alias: "This_is_an_example"
+    link_status: "down"
+    port: "2/1/10"
+    wait_to_restore: "0"
+    wait_to_shutdown: "0"
+  - admin_status: "enable"
+    alias: "This"
+    link_status: "down"
+    port: "2/1/11"
+    wait_to_restore: "0"
+    wait_to_shutdown: "0"

tests/alcatel_aos/show_linkagg_alias/alcatel_aos_show_linkagg_alias_R8.raw

@@ -0,0 +1,7 @@
+
+                         Admin        Oper     Att/Sel  
+Number  Aggregate  Size  state        state      Ports      Name 
+-------+----------+----+------------+-------+---------+--------------
+   2     Dynamic      2    ENABLED    UP      2  2     LINK_LACP_CORE
+  31     Dynamic      8    ENABLED    DOWN    0  0     Created by Auto-Fabric on Mon Oct 6 00:00:00 2000
+  32     Dynamic      8    ENABLED    DOWN    0  0     Created by Auto-Fabric on Mon Oct 01 00:00:00 2000

tests/alcatel_aos/show_linkagg_alias/alcatel_aos_show_linkagg_alias_R8.yml

@@ -0,0 +1,26 @@
+---
+parsed_sample:
+  - admin_state: "ENABLED"
+    aggregate: "Dynamic"
+    n_attached_ports: "2"
+    n_possible_ports: "2"
+    name: "LINK_LACP_CORE"
+    number: "2"
+    operational_state: "UP"
+    size: "2"
+  - admin_state: "ENABLED"
+    aggregate: "Dynamic"
+    n_attached_ports: "0"
+    n_possible_ports: "0"
+    name: "Created by Auto-Fabric on Mon Oct 6 00:00:00 2000"
+    number: "31"
+    operational_state: "DOWN"
+    size: "8"
+  - admin_state: "ENABLED"
+    aggregate: "Dynamic"
+    n_attached_ports: "0"
+    n_possible_ports: "0"
+    name: "Created by Auto-Fabric on Mon Oct 01 00:00:00 2000"
+    number: "32"
+    operational_state: "DOWN"
+    size: "8"

tests/alcatel_aos/show_mac-address-table/alcatel_aos_show_mac-address-table_2.raw → tests/alcatel_aos/show_mac-address-table/alcatel_aos_show_mac-address-table_R8.raw

@@ -10,4 +10,3 @@ Legend: Mac Address: * = address not valid,
       VLAN                        1   dd:dd:dd:dd:dd:dd            dynamic     bridging                     1/1/1 
 
  Total number of Valid MAC addresses above = 4
-

tests/alcatel_aos/show_mac-address-table/alcatel_aos_show_mac-address-table_R8_9.raw

@@ -0,0 +1,12 @@
+Legend: Mac Address: * = address not valid,
+        Mac Address: & = duplicate static address,
+        ID = ISID/Vnid/vplsid
+
+    Domain    Vlan/SrvcId[:ID]           Mac Address           Type          Operation          Interface
+------------+----------------------+-------------------+------------------+-------------+-------------------------
+      VLAN                        1   aa:aa:aa:aa:aa:aa            dynamic     bridging                     1/1/1 
+      VLAN                        1   bb:bb:bb:bb:bb:bb            dynamic     bridging                     1/1/1 
+      VLAN                        1   cc:cc:cc:cc:cc:cc            dynamic     bridging                    1/1/10 
+      VLAN                        1   dd:dd:dd:dd:dd:dd            dynamic     bridging                     1/1/1 
+
+ Total number of Valid MAC addresses above = 4

tests/alcatel_aos/show_mac-address-table/alcatel_aos_show_mac-address-table_R8_9.yml

@@ -0,0 +1,34 @@
+---
+parsed_sample:
+  - address_not_valid: ""
+    domain: "VLAN"
+    interface: "1/1/1"
+    mac: "aa:aa:aa:aa:aa:aa"
+    operation: "bridging"
+    protocol: ""
+    type: "dynamic"
+    vlan_id: "1"
+  - address_not_valid: ""
+    domain: "VLAN"
+    interface: "1/1/1"
+    mac: "bb:bb:bb:bb:bb:bb"
+    operation: "bridging"
+    protocol: ""
+    type: "dynamic"
+    vlan_id: "1"
+  - address_not_valid: ""
+    domain: "VLAN"
+    interface: "1/1/10"
+    mac: "cc:cc:cc:cc:cc:cc"
+    operation: "bridging"
+    protocol: ""
+    type: "dynamic"
+    vlan_id: "1"
+  - address_not_valid: ""
+    domain: "VLAN"
+    interface: "1/1/1"
+    mac: "dd:dd:dd:dd:dd:dd"
+    operation: "bridging"
+    protocol: ""
+    type: "dynamic"
+    vlan_id: "1"