Skip to content

W
White Rabbit Compliance Tests
Commit eef6a711 authored by Jean-Claude BAU's avatar Jean-Claude BAU
Browse files
Options

VLAN CLI update : Wrong mask 

Clear the CPU bit (19th) in VLAN mask.
parent b54ebb9c
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 3 deletions
ATTEST/Vlan/Net-O2/NECP_LIB/Cli/Vlan/vlan_array_wrs.tcl
View file @ eef6a711
......@@ -2844,6 +2844,8 @@ proc callback_vlan_admit_all_frames {args} {
if {[regexp $vlan_id $line]} {
if {[lindex $line 0] == $vlan_id} {
set previousvlan [string map {"0x0004" ""} [lindex $line 2]]
## Take into account only the 18 ports
set previousvlan [format 0x%x [expr {$previousvlan & 0x3FFFF}]]
set previousvlaninbin [string trimleft [HextoBin $previousvlan] 0]
set previousvlanindec [wrsbin2dec $previousvlaninbin]
set checkportsavail [Portfinder $previousvlaninbin]
......@@ -2943,6 +2945,8 @@ proc callback_vlan_admit_only_vlan_tagged_frames {args} {
if {[regexp $vlan_id $line]} {
if {[lindex $line 0] == $vlan_id} {
set previousvlan [string map {"0x0004" ""} [lindex $line 2]]
## Take into account only the 18 ports
set previousvlan [format 0x%x [expr {$previousvlan & 0x3FFFF}]]
set previousvlaninbin [string trimleft [HextoBin $previousvlan] 0]
set previousvlanindec [wrsbin2dec $previousvlaninbin]
set checkportsavail [Portfinder $previousvlaninbin]
......@@ -3045,7 +3049,9 @@ proc callback_vlan_set_tagged_port_vlan_membership {args} {
if {[regexp $vlan_id $line]} {
if {[lindex $line 0] == $vlan_id} {
set previousvlan [string map {"0x0004" ""} [lindex $line 2]]
set previousvlaninbin [string trimleft [HextoBin $previousvlan] 0]
## Take into account only the 18 ports
set previousvlan [format 0x%x [expr {$previousvlan & 0x3FFFF}]]
set previousvlaninbin [string trimleft [HextoBin $previousvlan] 0]
set previousvlanindec [wrsbin2dec $previousvlaninbin]
set checkportsavail [Portfinder $previousvlaninbin]
}
......@@ -3054,7 +3060,7 @@ proc callback_vlan_set_tagged_port_vlan_membership {args} {
########################## NEW ############################
lappend listofPorts_tpvlan "$vlan_id-$portInBin"
foreach LPorts $listofPorts_tpvlan {
foreach LPorts $listofPorts_tpvlan {
set Req [split $LPorts -]
if {$vlan_id == [lindex $Req 0]} {
set LPorts_[lindex $Req 0] [wrsbin2dec [lindex $Req 1]]
......@@ -3074,7 +3080,7 @@ proc callback_vlan_set_tagged_port_vlan_membership {args} {
set port_num "0x[string toupper [format %01x $finaladdedports]]"
}
}
########################## NEW ############################
########################## NEW ############################
if {![Send_cli_command -session_handler $session_handler \
-cmd_type $cmd_type\
......@@ -3198,6 +3204,8 @@ proc callback_vlan_set_pvid_to_untagged_port {args} {
if {[regexp $vlan_id $line]} {
if {[lindex $line 0] == $vlan_id} {
set previousvlan [string map {"0x0004" ""} [lindex $line 2]]
## Take into account only the 18 ports
set previousvlan [format 0x%x [expr {$previousvlan & 0x3FFFF}]]
set previousvlaninbin [string trimleft [HextoBin $previousvlan] 0]
set previousvlanindec [wrsbin2dec $previousvlaninbin]
set checkportsavail [Portfinder $previousvlaninbin]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment