Skip to content

Commit

Permalink
[bitmap_vnet] Remove BMTOR implementation (sonic-net#1494)
Browse files Browse the repository at this point in the history
Because BMTOR implementation is deprecated and now VRF is used instead

Signed-off-by: Volodymyr Samotiy <[email protected]>
  • Loading branch information
volodymyrsamotiy authored Nov 4, 2020
1 parent 582beae commit 62e6c5a
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 1,532 deletions.
10 changes: 2 additions & 8 deletions orchagent/orchdaemon.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -103,14 +103,8 @@ bool OrchDaemon::init()
};

VNetOrch *vnet_orch;
if (platform == MLNX_PLATFORM_SUBSTRING)
{
vnet_orch = new VNetOrch(m_applDb, APP_VNET_TABLE_NAME, VNET_EXEC::VNET_EXEC_BRIDGE);
}
else
{
vnet_orch = new VNetOrch(m_applDb, APP_VNET_TABLE_NAME);
}
vnet_orch = new VNetOrch(m_applDb, APP_VNET_TABLE_NAME);

gDirectory.set(vnet_orch);
VNetCfgRouteOrch *cfg_vnet_rt_orch = new VNetCfgRouteOrch(m_configDb, m_applDb, cfg_vnet_tables);
gDirectory.set(cfg_vnet_rt_orch);
Expand Down
3 changes: 0 additions & 3 deletions orchagent/saihelper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ sai_acl_api_t* sai_acl_api;
sai_mirror_api_t* sai_mirror_api;
sai_fdb_api_t* sai_fdb_api;
sai_dtel_api_t* sai_dtel_api;
sai_bmtor_api_t* sai_bmtor_api;
sai_samplepacket_api_t* sai_samplepacket_api;
sai_debug_counter_api_t* sai_debug_counter_api;
sai_nat_api_t* sai_nat_api;
Expand Down Expand Up @@ -166,7 +165,6 @@ void initSaiApi()
sai_api_query(SAI_API_SCHEDULER_GROUP, (void **)&sai_scheduler_group_api);
sai_api_query(SAI_API_ACL, (void **)&sai_acl_api);
sai_api_query(SAI_API_DTEL, (void **)&sai_dtel_api);
sai_api_query((sai_api_t)SAI_API_BMTOR, (void **)&sai_bmtor_api);
sai_api_query(SAI_API_SAMPLEPACKET, (void **)&sai_samplepacket_api);
sai_api_query(SAI_API_DEBUG_COUNTER, (void **)&sai_debug_counter_api);
sai_api_query(SAI_API_NAT, (void **)&sai_nat_api);
Expand Down Expand Up @@ -195,7 +193,6 @@ void initSaiApi()
sai_log_set(SAI_API_SCHEDULER_GROUP, SAI_LOG_LEVEL_NOTICE);
sai_log_set(SAI_API_ACL, SAI_LOG_LEVEL_NOTICE);
sai_log_set(SAI_API_DTEL, SAI_LOG_LEVEL_NOTICE);
sai_log_set((sai_api_t)SAI_API_BMTOR, SAI_LOG_LEVEL_NOTICE);
sai_log_set(SAI_API_SAMPLEPACKET, SAI_LOG_LEVEL_NOTICE);
sai_log_set(SAI_API_DEBUG_COUNTER, SAI_LOG_LEVEL_NOTICE);
sai_log_set((sai_api_t)SAI_API_NAT, SAI_LOG_LEVEL_NOTICE);
Expand Down
Loading

0 comments on commit 62e6c5a

Please sign in to comment.