change vlan_id to bv_id for fdb learning

oleksandrivantsiv · Feb 21, 2018 · 50a7062 · 50a7062
1 parent b235fc9
commit 50a7062
Show file tree

Hide file tree

Showing 19 changed files with 159 additions and 138 deletions.
diff --git a/tests/brcm/full.rec b/tests/brcm/full.rec
@@ -1,15 +1,15 @@
 2017-06-14.01:55:46.541806|#|recording on: ./sairedis.2017-06-14.01:55:46.541389.rec
 2017-06-14.01:55:46.543987|a|INIT_VIEW
 2017-06-14.01:55:46.551164|A|SAI_STATUS_SUCCESS
-2017-06-14.01:55:46.555975|c|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_INIT_SWITCH=true|SAI_SWITCH_ATTR_FDB_EVENT_NOTIFY=0x417890|SAI_SWITCH_ATTR_PORT_STATE_CHANGE_NOTIFY=0x4179f0|SAI_SWITCH_ATTR_SHUTDOWN_REQUEST_NOTIFY=0x417b50
+2017-06-14.01:55:46.555975|c|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_INIT_SWITCH=true|SAI_SWITCH_ATTR_FDB_EVENT_NOTIFY=0x417890|SAI_SWITCH_ATTR_PORT_STATE_CHANGE_NOTIFY=0x4179f0|SAI_SWITCH_ATTR_SWITCH_SHUTDOWN_REQUEST_NOTIFY=0x417b50
 2017-06-14.01:55:46.558259|s|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_SRC_MAC_ADDRESS=00:11:11:11:11:11
 2017-06-14.01:55:46.559177|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_DEFAULT_VIRTUAL_ROUTER_ID=oid:0x0
 2017-06-14.01:56:05.500382|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_DEFAULT_VIRTUAL_ROUTER_ID=oid:0x3000000000022
 2017-06-14.01:56:05.501109|c|SAI_OBJECT_TYPE_ROUTER_INTERFACE:oid:0x60000000005a3|SAI_ROUTER_INTERFACE_ATTR_VIRTUAL_ROUTER_ID=oid:0x3000000000022|SAI_ROUTER_INTERFACE_ATTR_TYPE=SAI_ROUTER_INTERFACE_TYPE_LOOPBACK
 2017-06-14.01:56:05.508992|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_CPU_PORT=oid:0x0
 2017-06-14.01:56:05.516398|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_CPU_PORT=oid:0x1000000000001
-2017-06-14.01:56:05.516767|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_PORT_NUMBER=1
-2017-06-14.01:56:05.519973|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_PORT_NUMBER=32
+2017-06-14.01:56:05.516767|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_NUMBER_OF_ACTIVE_PORTS=1
+2017-06-14.01:56:05.519973|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_NUMBER_OF_ACTIVE_PORTS=32
 2017-06-14.01:56:05.520538|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_PORT_LIST=32:oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0
 2017-06-14.01:56:05.525938|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_PORT_LIST=32:oid:0x1000000000002,oid:0x1000000000003,oid:0x1000000000004,oid:0x1000000000005,oid:0x1000000000006,oid:0x1000000000007,oid:0x1000000000008,oid:0x1000000000009,oid:0x100000000000a,oid:0x100000000000b,oid:0x100000000000c,oid:0x100000000000d,oid:0x100000000000e,oid:0x100000000000f,oid:0x1000000000010,oid:0x1000000000011,oid:0x1000000000012,oid:0x1000000000013,oid:0x1000000000014,oid:0x1000000000015,oid:0x1000000000016,oid:0x1000000000017,oid:0x1000000000018,oid:0x1000000000019,oid:0x100000000001a,oid:0x100000000001b,oid:0x100000000001c,oid:0x100000000001d,oid:0x100000000001e,oid:0x100000000001f,oid:0x1000000000020,oid:0x1000000000021
 2017-06-14.01:56:05.527212|g|SAI_OBJECT_TYPE_PORT:oid:0x1000000000002|SAI_PORT_ATTR_HW_LANE_LIST=4:0,0,0,0
@@ -5348,9 +5348,9 @@
 2017-06-14.01:56:34.445579|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x1800000000061f|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_POOL_ATTR_SIZE=5491712|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_INGRESS
 2017-06-14.01:56:34.449948|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x18000000000620|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_STATIC|SAI_BUFFER_POOL_ATTR_SIZE=113664|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_EGRESS
 2017-06-14.01:56:34.453554|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x18000000000621|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_POOL_ATTR_SIZE=5491712|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_EGRESS
-2017-06-14.01:56:34.460343|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000622|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000620|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=1518
-2017-06-14.01:56:34.466216|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000623|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061e|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432
-2017-06-14.01:56:34.471663|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000624|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061f|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=1518
+2017-06-14.01:56:34.460343|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000622|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000620|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518
+2017-06-14.01:56:34.466216|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000623|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061e|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432
+2017-06-14.01:56:34.471663|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000624|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061f|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518
 2017-06-14.01:56:34.473539|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000044|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000624
 2017-06-14.01:56:34.475407|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000045|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000624
 2017-06-14.01:56:34.477022|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a00000000008e|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000624
@@ -5447,7 +5447,7 @@
 2017-06-14.01:56:34.600428|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000529|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000623
 2017-06-14.01:56:34.601188|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000553|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000623
 2017-06-14.01:56:34.603197|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a00000000057d|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000623
-2017-06-14.01:56:34.605075|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000625|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061c|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432
+2017-06-14.01:56:34.605075|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000625|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061c|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432
 2017-06-14.01:56:34.606008|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000048|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625
 2017-06-14.01:56:34.606683|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000092|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625
 2017-06-14.01:56:34.607356|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a0000000000bc|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625
@@ -5480,8 +5480,8 @@
 2017-06-14.01:56:34.639098|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a00000000052a|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625
 2017-06-14.01:56:34.639964|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000554|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625
 2017-06-14.01:56:34.641601|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a00000000057e|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625
-2017-06-14.01:56:34.643791|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000626|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061d|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=1518
-2017-06-14.01:56:34.645336|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000627|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000621|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=1518
+2017-06-14.01:56:34.643791|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000626|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061d|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518
+2017-06-14.01:56:34.645336|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000627|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000621|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518
 2017-06-14.01:56:34.647623|s|SAI_OBJECT_TYPE_QUEUE:oid:0x1500000000006f|SAI_QUEUE_ATTR_BUFFER_PROFILE_ID=oid:0x19000000000622
 2017-06-14.01:56:34.648669|s|SAI_OBJECT_TYPE_QUEUE:oid:0x15000000000099|SAI_QUEUE_ATTR_BUFFER_PROFILE_ID=oid:0x19000000000622
 2017-06-14.01:56:34.649906|s|SAI_OBJECT_TYPE_QUEUE:oid:0x150000000000c3|SAI_QUEUE_ATTR_BUFFER_PROFILE_ID=oid:0x19000000000622

diff --git a/tests/brcm/full_nhg_bug.rec b/tests/brcm/full_nhg_bug.rec
@@ -1,7 +1,7 @@
 2017-06-14.01:55:46.541806|#|recording on: ./sairedis.2017-06-14.01:55:46.541389.rec
 2017-06-14.01:55:46.543987|a|INIT_VIEW
 2017-06-14.01:55:46.551164|A|SAI_STATUS_SUCCESS
-2017-06-14.01:55:46.555975|c|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_INIT_SWITCH=true|SAI_SWITCH_ATTR_FDB_EVENT_NOTIFY=0x417890|SAI_SWITCH_ATTR_PORT_STATE_CHANGE_NOTIFY=0x4179f0|SAI_SWITCH_ATTR_SHUTDOWN_REQUEST_NOTIFY=0x417b50
+2017-06-14.01:55:46.555975|c|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_INIT_SWITCH=true|SAI_SWITCH_ATTR_FDB_EVENT_NOTIFY=0x417890|SAI_SWITCH_ATTR_PORT_STATE_CHANGE_NOTIFY=0x4179f0|SAI_SWITCH_ATTR_SWITCH_SHUTDOWN_REQUEST_NOTIFY=0x417b50
 2017-06-14.01:56:40.192374|c|SAI_OBJECT_TYPE_NEXT_HOP_GROUP:oid:0x5000000000628|SAI_NEXT_HOP_GROUP_ATTR_TYPE=SAI_NEXT_HOP_GROUP_TYPE_ECMP
 2017-06-14.01:56:06.151337|a|APPLY_VIEW
 2017-06-14.01:56:06.156740|A|SAI_STATUS_SUCCESS
diff --git a/tests/brcm/full_nhg_bug_prio_flow_bug.rec b/tests/brcm/full_nhg_bug_prio_flow_bug.rec
@@ -1,7 +1,7 @@
 2017-06-14.01:55:46.541806|#|recording on: ./sairedis.2017-06-14.01:55:46.541389.rec
 2017-06-14.01:55:46.543987|a|INIT_VIEW
 2017-06-14.01:55:46.551164|A|SAI_STATUS_SUCCESS
-2017-06-14.01:55:46.555975|c|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_INIT_SWITCH=true|SAI_SWITCH_ATTR_FDB_EVENT_NOTIFY=0x417890|SAI_SWITCH_ATTR_PORT_STATE_CHANGE_NOTIFY=0x4179f0|SAI_SWITCH_ATTR_SHUTDOWN_REQUEST_NOTIFY=0x417b50
+2017-06-14.01:55:46.555975|c|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_INIT_SWITCH=true|SAI_SWITCH_ATTR_FDB_EVENT_NOTIFY=0x417890|SAI_SWITCH_ATTR_PORT_STATE_CHANGE_NOTIFY=0x4179f0|SAI_SWITCH_ATTR_SWITCH_SHUTDOWN_REQUEST_NOTIFY=0x417b50
 2017-06-14.01:56:05.520538|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_PORT_LIST=32:oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0
 2017-06-14.01:56:05.525938|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_PORT_LIST=32:oid:0x1000000000002,oid:0x1000000000003,oid:0x1000000000004,oid:0x1000000000005,oid:0x1000000000006,oid:0x1000000000007,oid:0x1000000000008,oid:0x1000000000009,oid:0x100000000000a,oid:0x100000000000b,oid:0x100000000000c,oid:0x100000000000d,oid:0x100000000000e,oid:0x100000000000f,oid:0x1000000000010,oid:0x1000000000011,oid:0x1000000000012,oid:0x1000000000013,oid:0x1000000000014,oid:0x1000000000015,oid:0x1000000000016,oid:0x1000000000017,oid:0x1000000000018,oid:0x1000000000019,oid:0x100000000001a,oid:0x100000000001b,oid:0x100000000001c,oid:0x100000000001d,oid:0x100000000001e,oid:0x100000000001f,oid:0x1000000000020,oid:0x1000000000021
 2017-06-14.01:56:24.727586|s|SAI_OBJECT_TYPE_PORT:oid:0x1000000000002|SAI_PORT_ATTR_PRIORITY_FLOW_CONTROL=24

diff --git a/tests/brcm/full_nhg_bug_trap_group_create_fail.rec b/tests/brcm/full_nhg_bug_trap_group_create_fail.rec
@@ -1,7 +1,7 @@
 2017-06-14.01:55:46.541806|#|recording on: ./sairedis.2017-06-14.01:55:46.541389.rec
 2017-06-14.01:55:46.543987|a|INIT_VIEW
 2017-06-14.01:55:46.551164|A|SAI_STATUS_SUCCESS
-2017-06-14.01:55:46.555975|c|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_INIT_SWITCH=true|SAI_SWITCH_ATTR_FDB_EVENT_NOTIFY=0x417890|SAI_SWITCH_ATTR_PORT_STATE_CHANGE_NOTIFY=0x4179f0|SAI_SWITCH_ATTR_SHUTDOWN_REQUEST_NOTIFY=0x417b50
+2017-06-14.01:55:46.555975|c|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_INIT_SWITCH=true|SAI_SWITCH_ATTR_FDB_EVENT_NOTIFY=0x417890|SAI_SWITCH_ATTR_PORT_STATE_CHANGE_NOTIFY=0x4179f0|SAI_SWITCH_ATTR_SWITCH_SHUTDOWN_REQUEST_NOTIFY=0x417b50
 2017-06-14.01:56:21.570181|c|SAI_OBJECT_TYPE_POLICER:oid:0x120000000005fb|SAI_POLICER_ATTR_CBS=600|SAI_POLICER_ATTR_CIR=600|SAI_POLICER_ATTR_METER_TYPE=SAI_METER_TYPE_PACKETS|SAI_POLICER_ATTR_MODE=SAI_POLICER_MODE_SR_TCM|SAI_POLICER_ATTR_RED_PACKET_ACTION=SAI_PACKET_ACTION_DROP
 2017-06-14.01:56:21.567734|c|SAI_OBJECT_TYPE_HOSTIF_TRAP_GROUP:oid:0x110000000005fa|SAI_HOSTIF_TRAP_GROUP_ATTR_QUEUE=4|SAI_HOSTIF_TRAP_GROUP_ATTR_POLICER=oid:0x120000000005fb
 2017-06-14.01:56:06.151337|a|APPLY_VIEW