Skip to content

Commit 0c286f9

Browse files
kcudnikkcudnik
authored
Add specific comparison logic for tunnel map (sonic-net#475)
* Add default bridge id for bridge port id of type PORT in virtual switch * Update recording Virtual switch now supports Queue TYPE, so tests must be updated * Add specific comparison logic for tunnel map
1 parent bea4fe8 commit 0c286f9

File tree

4 files changed

+133
-1
lines changed

4 files changed

+133
-1
lines changed

‎syncd/syncd_applyview.cpp

+81
Original file line numberDiff line numberDiff line change
@@ -3613,6 +3613,83 @@ std::shared_ptr<SaiObj> findCurrentBestMatchForBufferProfile(
36133613
return nullptr;
36143614
}
36153615

3616+
std::shared_ptr<SaiObj> findCurrentBestMatchForTunnelMap(
3617+
_In_ const AsicView &currentView,
3618+
_In_ const AsicView &temporaryView,
3619+
_In_ const std::shared_ptr<const SaiObj> &temporaryObj,
3620+
_In_ const std::vector<sai_object_compare_info_t> &candidateObjects)
3621+
{
3622+
SWSS_LOG_ENTER();
3623+
3624+
/*
3625+
* For tunnel map, lets find tunnel map entry with unique
3626+
* SAI_TUNNEL_MAP_ENTRY_ATTR_VLAN_ID_VALUE and use it's value for matching.
3627+
*/
3628+
3629+
auto tmpTunnelMapEntries = temporaryView.getObjectsByObjectType(SAI_OBJECT_TYPE_TUNNEL_MAP_ENTRY);
3630+
3631+
for (auto& tmpTunnelMapEntry: tmpTunnelMapEntries)
3632+
{
3633+
auto tmpTunnelMapAttr = tmpTunnelMapEntry->tryGetSaiAttr(SAI_TUNNEL_MAP_ENTRY_ATTR_TUNNEL_MAP);
3634+
3635+
if (tmpTunnelMapAttr == nullptr)
3636+
continue;
3637+
3638+
if (tmpTunnelMapAttr->getOid() != temporaryObj->getVid())
3639+
continue;
3640+
3641+
auto tmpVlanIdValueAttr = tmpTunnelMapEntry->tryGetSaiAttr(SAI_TUNNEL_MAP_ENTRY_ATTR_VLAN_ID_VALUE);
3642+
3643+
if (tmpVlanIdValueAttr == nullptr)
3644+
continue;
3645+
3646+
uint16_t vlanId = tmpVlanIdValueAttr->getSaiAttr()->value.u16;
3647+
3648+
// now find map entry with same vlan id on current object list
3649+
3650+
auto curTunnelMapEntries = currentView.getObjectsByObjectType(SAI_OBJECT_TYPE_TUNNEL_MAP_ENTRY);
3651+
3652+
for (auto& curTunnelMapEntry: curTunnelMapEntries)
3653+
{
3654+
auto curVlanIdValueAttr = curTunnelMapEntry->tryGetSaiAttr(SAI_TUNNEL_MAP_ENTRY_ATTR_VLAN_ID_VALUE);
3655+
3656+
if (curVlanIdValueAttr == nullptr)
3657+
continue;
3658+
3659+
if (curVlanIdValueAttr->getSaiAttr()->value.u16 != vlanId)
3660+
continue; // wrong vlan id, keep looking
3661+
3662+
auto curTunnelMapAttr = curTunnelMapEntry->tryGetSaiAttr(SAI_TUNNEL_MAP_ENTRY_ATTR_TUNNEL_MAP);
3663+
3664+
if (curTunnelMapAttr == nullptr)
3665+
continue;
3666+
3667+
if (curTunnelMapAttr->getOid() == SAI_NULL_OBJECT_ID)
3668+
continue;
3669+
3670+
auto curTunnelMap = currentView.oOids.at(curTunnelMapAttr->getOid());
3671+
3672+
if (curTunnelMap->getObjectStatus() == SAI_OBJECT_STATUS_MATCHED)
3673+
continue; // object already matched, we need to search more
3674+
3675+
// we have current tunnel map, see if it's on candidate list
3676+
3677+
for (auto c: candidateObjects)
3678+
{
3679+
if (c.obj->getVid() != curTunnelMap->getVid())
3680+
continue;
3681+
3682+
SWSS_LOG_INFO("found best TUNNEL MAP based on tunnel map entry vlan id value %s", c.obj->str_object_id.c_str());
3683+
3684+
return c.obj;
3685+
}
3686+
}
3687+
}
3688+
3689+
SWSS_LOG_NOTICE("failed to find best candidate for TUNNEL_MAP using tunnel map entry vlan id value");
3690+
3691+
return nullptr;
3692+
}
36163693

36173694
std::shared_ptr<SaiObj> findCurrentBestMatchForWred(
36183695
_In_ const AsicView &currentView,
@@ -3759,6 +3836,10 @@ std::shared_ptr<SaiObj> findCurrentBestMatchForGenericObjectUsingGraph(
37593836
candidate = findCurrentBestMatchForBufferProfile(currentView, temporaryView, temporaryObj, candidateObjects);
37603837
break;
37613838

3839+
case SAI_OBJECT_TYPE_TUNNEL_MAP:
3840+
candidate = findCurrentBestMatchForTunnelMap(currentView, temporaryView, temporaryObj, candidateObjects);
3841+
break;
3842+
37623843
default:
37633844
break;
37643845
}

‎tests/brcm.pl

+14
Original file line numberDiff line numberDiff line change
@@ -440,8 +440,22 @@ sub test_bridge_create
440440
play "bridge_create_2.rec", 0;
441441
}
442442

443+
sub test_tunnel_map
444+
{
445+
fresh_start;
446+
447+
play "tunnel_map.rec";
448+
play "tunnel_map.rec", 0;
449+
play "tunnel_map.rec", 0;
450+
play "tunnel_map.rec", 0;
451+
play "tunnel_map.rec", 0;
452+
play "tunnel_map.rec", 0;
453+
}
454+
455+
443456
# RUN TESTS
444457

458+
test_tunnel_map;
445459
test_bridge_create;
446460
test_ntf;
447461
test_acl_mask;

‎tests/brcm/tunnel_map.rec

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
2019-06-15.02:10:14.315284|a|INIT_VIEW
2+
2019-06-15.02:10:19.123287|A|SAI_STATUS_SUCCESS
3+
2019-06-15.02:10:19.125126|c|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_INIT_SWITCH=true|SAI_SWITCH_ATTR_FDB_EVENT_NOTIFY=0x42c470|SAI_SWITCH_ATTR_PORT_STATE_CHANGE_NOTIFY=0x42c480|SAI_SWITCH_ATTR_SWITCH_SHUTDOWN_REQUEST_NOTIFY=0x42c490|SAI_SWITCH_ATTR_SRC_MAC_ADDRESS=4C:76:25:F5:48:80
4+
2019-06-15.02:10:19.125358|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_DEFAULT_VIRTUAL_ROUTER_ID=oid:0x0
5+
2019-06-15.02:11:08.839459|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_DEFAULT_VIRTUAL_ROUTER_ID=oid:0x3000000000044
6+
2019-06-15.02:11:08.839747|c|SAI_OBJECT_TYPE_ROUTER_INTERFACE:oid:0x6000000000b1e|SAI_ROUTER_INTERFACE_ATTR_VIRTUAL_ROUTER_ID=oid:0x3000000000044|SAI_ROUTER_INTERFACE_ATTR_TYPE=SAI_ROUTER_INTERFACE_TYPE_LOOPBACK
7+
2019-06-15.02:11:08.861276|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
8+
2019-06-15.02:11:08.868998|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
9+
2019-06-15.02:11:14.615453|c|SAI_OBJECT_TYPE_VLAN:oid:0x26000000000b6c|SAI_VLAN_ATTR_VLAN_ID=2
10+
2019-06-15.02:11:14.616229|c|SAI_OBJECT_TYPE_VLAN:oid:0x26000000000b6d|SAI_VLAN_ATTR_VLAN_ID=5
11+
2019-06-15.02:11:14.616660|c|SAI_OBJECT_TYPE_ROUTER_INTERFACE:oid:0x6000000000b6e|SAI_ROUTER_INTERFACE_ATTR_VIRTUAL_ROUTER_ID=oid:0x3000000000044|SAI_ROUTER_INTERFACE_ATTR_SRC_MAC_ADDRESS=4C:76:25:F5:48:80|SAI_ROUTER_INTERFACE_ATTR_TYPE=SAI_ROUTER_INTERFACE_TYPE_VLAN|SAI_ROUTER_INTERFACE_ATTR_VLAN_ID=oid:0x26000000000b6c|SAI_ROUTER_INTERFACE_ATTR_MTU=9100
12+
2019-06-15.02:11:14.618426|c|SAI_OBJECT_TYPE_ROUTER_INTERFACE:oid:0x6000000000b6f|SAI_ROUTER_INTERFACE_ATTR_VIRTUAL_ROUTER_ID=oid:0x3000000000044|SAI_ROUTER_INTERFACE_ATTR_SRC_MAC_ADDRESS=4C:76:25:F5:48:80|SAI_ROUTER_INTERFACE_ATTR_TYPE=SAI_ROUTER_INTERFACE_TYPE_VLAN|SAI_ROUTER_INTERFACE_ATTR_VLAN_ID=oid:0x26000000000b6d|SAI_ROUTER_INTERFACE_ATTR_MTU=9100
13+
2019-06-15.02:11:14.651607|c|SAI_OBJECT_TYPE_ROUTER_INTERFACE:oid:0x6000000000b81|SAI_ROUTER_INTERFACE_ATTR_VIRTUAL_ROUTER_ID=oid:0x3000000000044|SAI_ROUTER_INTERFACE_ATTR_TYPE=SAI_ROUTER_INTERFACE_TYPE_LOOPBACK
14+
2019-06-15.02:11:14.651995|c|SAI_OBJECT_TYPE_TUNNEL:oid:0x2a000000000b82|SAI_TUNNEL_ATTR_TYPE=SAI_TUNNEL_TYPE_IPINIP|SAI_TUNNEL_ATTR_OVERLAY_INTERFACE=oid:0x6000000000b81|SAI_TUNNEL_ATTR_UNDERLAY_INTERFACE=oid:0x6000000000b1e|SAI_TUNNEL_ATTR_DECAP_ECN_MODE=SAI_TUNNEL_DECAP_ECN_MODE_COPY_FROM_OUTER|SAI_TUNNEL_ATTR_DECAP_TTL_MODE=SAI_TUNNEL_TTL_MODE_PIPE_MODEL|SAI_TUNNEL_ATTR_DECAP_DSCP_MODE=SAI_TUNNEL_DSCP_MODE_PIPE_MODEL
15+
2019-06-15.02:11:14.652299|c|SAI_OBJECT_TYPE_TUNNEL_TERM_TABLE_ENTRY:oid:0x2b000000000b83|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_VR_ID=oid:0x3000000000044|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_TYPE=SAI_TUNNEL_TERM_TABLE_ENTRY_TYPE_P2MP|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_TUNNEL_TYPE=SAI_TUNNEL_TYPE_IPINIP|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_ACTION_TUNNEL_ID=oid:0x2a000000000b82|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_DST_IP=10.0.0.0
16+
2019-06-15.02:11:14.653623|c|SAI_OBJECT_TYPE_TUNNEL_TERM_TABLE_ENTRY:oid:0x2b000000000b84|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_VR_ID=oid:0x3000000000044|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_TYPE=SAI_TUNNEL_TERM_TABLE_ENTRY_TYPE_P2MP|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_TUNNEL_TYPE=SAI_TUNNEL_TYPE_IPINIP|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_ACTION_TUNNEL_ID=oid:0x2a000000000b82|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_DST_IP=172.0.0.1
17+
2019-06-15.02:11:14.653990|c|SAI_OBJECT_TYPE_TUNNEL_TERM_TABLE_ENTRY:oid:0x2b000000000b85|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_VR_ID=oid:0x3000000000044|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_TYPE=SAI_TUNNEL_TERM_TABLE_ENTRY_TYPE_P2MP|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_TUNNEL_TYPE=SAI_TUNNEL_TYPE_IPINIP|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_ACTION_TUNNEL_ID=oid:0x2a000000000b82|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_DST_IP=175.0.0.1
18+
2019-06-15.02:11:14.654308|c|SAI_OBJECT_TYPE_TUNNEL_TERM_TABLE_ENTRY:oid:0x2b000000000b86|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_VR_ID=oid:0x3000000000044|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_TYPE=SAI_TUNNEL_TERM_TABLE_ENTRY_TYPE_P2MP|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_TUNNEL_TYPE=SAI_TUNNEL_TYPE_IPINIP|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_ACTION_TUNNEL_ID=oid:0x2a000000000b82|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_DST_IP=10.0.0.4
19+
2019-06-15.02:11:14.654595|c|SAI_OBJECT_TYPE_TUNNEL_TERM_TABLE_ENTRY:oid:0x2b000000000b87|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_VR_ID=oid:0x3000000000044|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_TYPE=SAI_TUNNEL_TERM_TABLE_ENTRY_TYPE_P2MP|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_TUNNEL_TYPE=SAI_TUNNEL_TYPE_IPINIP|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_ACTION_TUNNEL_ID=oid:0x2a000000000b82|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_DST_IP=10.0.0.8
20+
2019-06-15.02:11:14.654957|c|SAI_OBJECT_TYPE_TUNNEL_TERM_TABLE_ENTRY:oid:0x2b000000000b88|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_VR_ID=oid:0x3000000000044|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_TYPE=SAI_TUNNEL_TERM_TABLE_ENTRY_TYPE_P2MP|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_TUNNEL_TYPE=SAI_TUNNEL_TYPE_IPINIP|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_ACTION_TUNNEL_ID=oid:0x2a000000000b82|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_DST_IP=10.0.0.12
21+
2019-06-15.02:11:14.655208|c|SAI_OBJECT_TYPE_TUNNEL_TERM_TABLE_ENTRY:oid:0x2b000000000b89|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_VR_ID=oid:0x3000000000044|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_TYPE=SAI_TUNNEL_TERM_TABLE_ENTRY_TYPE_P2MP|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_TUNNEL_TYPE=SAI_TUNNEL_TYPE_IPINIP|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_ACTION_TUNNEL_ID=oid:0x2a000000000b82|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_DST_IP=10.1.0.32
22+
2019-06-15.02:11:14.664892|c|SAI_OBJECT_TYPE_ROUTER_INTERFACE:oid:0x6000000000b8a|SAI_ROUTER_INTERFACE_ATTR_VIRTUAL_ROUTER_ID=oid:0x3000000000044|SAI_ROUTER_INTERFACE_ATTR_TYPE=SAI_ROUTER_INTERFACE_TYPE_LOOPBACK
23+
2019-06-15.02:11:14.668973|c|SAI_OBJECT_TYPE_TUNNEL:oid:0x2a000000000b8b|SAI_TUNNEL_ATTR_TYPE=SAI_TUNNEL_TYPE_IPINIP|SAI_TUNNEL_ATTR_OVERLAY_INTERFACE=oid:0x6000000000b8a|SAI_TUNNEL_ATTR_UNDERLAY_INTERFACE=oid:0x6000000000b1e|SAI_TUNNEL_ATTR_DECAP_ECN_MODE=SAI_TUNNEL_DECAP_ECN_MODE_COPY_FROM_OUTER|SAI_TUNNEL_ATTR_DECAP_TTL_MODE=SAI_TUNNEL_TTL_MODE_PIPE_MODEL|SAI_TUNNEL_ATTR_DECAP_DSCP_MODE=SAI_TUNNEL_DSCP_MODE_PIPE_MODEL
24+
2019-06-15.02:11:14.669719|c|SAI_OBJECT_TYPE_TUNNEL_TERM_TABLE_ENTRY:oid:0x2b000000000b8c|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_VR_ID=oid:0x3000000000044|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_TYPE=SAI_TUNNEL_TERM_TABLE_ENTRY_TYPE_P2MP|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_TUNNEL_TYPE=SAI_TUNNEL_TYPE_IPINIP|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_ACTION_TUNNEL_ID=oid:0x2a000000000b8b|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_DST_IP=fc00::1
25+
2019-06-15.02:11:14.671992|c|SAI_OBJECT_TYPE_TUNNEL_TERM_TABLE_ENTRY:oid:0x2b000000000b8d|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_VR_ID=oid:0x3000000000044|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_TYPE=SAI_TUNNEL_TERM_TABLE_ENTRY_TYPE_P2MP|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_TUNNEL_TYPE=SAI_TUNNEL_TYPE_IPINIP|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_ACTION_TUNNEL_ID=oid:0x2a000000000b8b|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_DST_IP=fc00::9
26+
2019-06-15.02:11:14.672354|c|SAI_OBJECT_TYPE_TUNNEL_TERM_TABLE_ENTRY:oid:0x2b000000000b8e|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_VR_ID=oid:0x3000000000044|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_TYPE=SAI_TUNNEL_TERM_TABLE_ENTRY_TYPE_P2MP|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_TUNNEL_TYPE=SAI_TUNNEL_TYPE_IPINIP|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_ACTION_TUNNEL_ID=oid:0x2a000000000b8b|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_DST_IP=fc00::11
27+
2019-06-15.02:11:14.672989|c|SAI_OBJECT_TYPE_TUNNEL_TERM_TABLE_ENTRY:oid:0x2b000000000b8f|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_VR_ID=oid:0x3000000000044|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_TYPE=SAI_TUNNEL_TERM_TABLE_ENTRY_TYPE_P2MP|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_TUNNEL_TYPE=SAI_TUNNEL_TYPE_IPINIP|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_ACTION_TUNNEL_ID=oid:0x2a000000000b8b|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_DST_IP=fc00::19
28+
2019-06-15.02:11:14.673276|c|SAI_OBJECT_TYPE_TUNNEL_TERM_TABLE_ENTRY:oid:0x2b000000000b90|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_VR_ID=oid:0x3000000000044|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_TYPE=SAI_TUNNEL_TERM_TABLE_ENTRY_TYPE_P2MP|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_TUNNEL_TYPE=SAI_TUNNEL_TYPE_IPINIP|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_ACTION_TUNNEL_ID=oid:0x2a000000000b8b|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_DST_IP=fc00:1::32
29+
2019-06-15.02:16:59.248501|c|SAI_OBJECT_TYPE_TUNNEL_MAP:oid:0x29000000000c68|SAI_TUNNEL_MAP_ATTR_TYPE=SAI_TUNNEL_MAP_TYPE_VNI_TO_VLAN_ID
30+
2019-06-15.02:16:59.248809|c|SAI_OBJECT_TYPE_TUNNEL:oid:0x2a000000000c69|SAI_TUNNEL_ATTR_TYPE=SAI_TUNNEL_TYPE_VXLAN|SAI_TUNNEL_ATTR_UNDERLAY_INTERFACE=oid:0x6000000000b1e|SAI_TUNNEL_ATTR_DECAP_MAPPERS=1:oid:0x29000000000c68
31+
2019-06-15.02:16:59.249094|c|SAI_OBJECT_TYPE_TUNNEL_TERM_TABLE_ENTRY:oid:0x2b000000000c6a|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_TYPE=SAI_TUNNEL_TERM_TABLE_ENTRY_TYPE_P2P|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_SRC_IP=8.8.8.8|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_VR_ID=oid:0x3000000000044|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_DST_IP=10.1.0.32|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_TUNNEL_TYPE=SAI_TUNNEL_TYPE_VXLAN|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_ACTION_TUNNEL_ID=oid:0x2a000000000c69
32+
2019-06-15.02:16:59.249528|c|SAI_OBJECT_TYPE_TUNNEL_MAP_ENTRY:oid:0x3b000000000c6b|SAI_TUNNEL_MAP_ENTRY_ATTR_TUNNEL_MAP_TYPE=SAI_TUNNEL_MAP_TYPE_VNI_TO_VLAN_ID|SAI_TUNNEL_MAP_ENTRY_ATTR_TUNNEL_MAP=oid:0x29000000000c68|SAI_TUNNEL_MAP_ENTRY_ATTR_VLAN_ID_VALUE=2|SAI_TUNNEL_MAP_ENTRY_ATTR_VNI_ID_KEY=336
33+
2019-06-15.02:17:06.333027|c|SAI_OBJECT_TYPE_TUNNEL_MAP:oid:0x29000000000c6c|SAI_TUNNEL_MAP_ATTR_TYPE=SAI_TUNNEL_MAP_TYPE_VNI_TO_VLAN_ID
34+
2019-06-15.02:17:06.333283|c|SAI_OBJECT_TYPE_TUNNEL:oid:0x2a000000000c6d|SAI_TUNNEL_ATTR_TYPE=SAI_TUNNEL_TYPE_VXLAN|SAI_TUNNEL_ATTR_UNDERLAY_INTERFACE=oid:0x6000000000b1e|SAI_TUNNEL_ATTR_DECAP_MAPPERS=1:oid:0x29000000000c6c
35+
2019-06-15.02:17:06.333693|c|SAI_OBJECT_TYPE_TUNNEL_TERM_TABLE_ENTRY:oid:0x2b000000000c6e|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_TYPE=SAI_TUNNEL_TERM_TABLE_ENTRY_TYPE_P2P|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_SRC_IP=8.8.8.8|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_VR_ID=oid:0x3000000000044|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_DST_IP=10.1.0.32|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_TUNNEL_TYPE=SAI_TUNNEL_TYPE_VXLAN|SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_ACTION_TUNNEL_ID=oid:0x2a000000000c6d
36+
2019-06-15.02:17:06.334180|c|SAI_OBJECT_TYPE_TUNNEL_MAP_ENTRY:oid:0x3b000000000c6f|SAI_TUNNEL_MAP_ENTRY_ATTR_TUNNEL_MAP_TYPE=SAI_TUNNEL_MAP_TYPE_VNI_TO_VLAN_ID|SAI_TUNNEL_MAP_ENTRY_ATTR_TUNNEL_MAP=oid:0x29000000000c6c|SAI_TUNNEL_MAP_ENTRY_ATTR_VLAN_ID_VALUE=5|SAI_TUNNEL_MAP_ENTRY_ATTR_VNI_ID_KEY=337
37+
2019-06-15.02:11:10.059839|a|APPLY_VIEW
38+
2019-06-15.02:11:10.062237|A|SAI_STATUS_SUCCESS

‎vslib/src/sai_vs_switch_BCM56850.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,6 @@ static sai_status_t create_qos_queues_per_port(
440440
queues.push_back(queue_id);
441441

442442
attr.id = SAI_QUEUE_ATTR_TYPE;
443-
444443
attr.value.s32 = (i < port_qos_queues_count / 2) ? SAI_QUEUE_TYPE_UNICAST : SAI_QUEUE_TYPE_MULTICAST;
445444

446445
CHECK_STATUS(vs_generic_set(SAI_OBJECT_TYPE_QUEUE, queue_id, &attr));

0 commit comments

Comments
 (0)