Skip to content

Commit 62e6c5a

Browse files
[bitmap_vnet] Remove BMTOR implementation (sonic-net#1494)
Because BMTOR implementation is deprecated and now VRF is used instead Signed-off-by: Volodymyr Samotiy <[email protected]>
1 parent 582beae commit 62e6c5a

File tree

6 files changed

+2
-1532
lines changed

6 files changed

+2
-1532
lines changed

orchagent/orchdaemon.cpp

+2-8
Original file line numberDiff line numberDiff line change
@@ -103,14 +103,8 @@ bool OrchDaemon::init()
103103
};
104104

105105
VNetOrch *vnet_orch;
106-
if (platform == MLNX_PLATFORM_SUBSTRING)
107-
{
108-
vnet_orch = new VNetOrch(m_applDb, APP_VNET_TABLE_NAME, VNET_EXEC::VNET_EXEC_BRIDGE);
109-
}
110-
else
111-
{
112-
vnet_orch = new VNetOrch(m_applDb, APP_VNET_TABLE_NAME);
113-
}
106+
vnet_orch = new VNetOrch(m_applDb, APP_VNET_TABLE_NAME);
107+
114108
gDirectory.set(vnet_orch);
115109
VNetCfgRouteOrch *cfg_vnet_rt_orch = new VNetCfgRouteOrch(m_configDb, m_applDb, cfg_vnet_tables);
116110
gDirectory.set(cfg_vnet_rt_orch);

orchagent/saihelper.cpp

-3
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ sai_acl_api_t* sai_acl_api;
4747
sai_mirror_api_t* sai_mirror_api;
4848
sai_fdb_api_t* sai_fdb_api;
4949
sai_dtel_api_t* sai_dtel_api;
50-
sai_bmtor_api_t* sai_bmtor_api;
5150
sai_samplepacket_api_t* sai_samplepacket_api;
5251
sai_debug_counter_api_t* sai_debug_counter_api;
5352
sai_nat_api_t* sai_nat_api;
@@ -166,7 +165,6 @@ void initSaiApi()
166165
sai_api_query(SAI_API_SCHEDULER_GROUP, (void **)&sai_scheduler_group_api);
167166
sai_api_query(SAI_API_ACL, (void **)&sai_acl_api);
168167
sai_api_query(SAI_API_DTEL, (void **)&sai_dtel_api);
169-
sai_api_query((sai_api_t)SAI_API_BMTOR, (void **)&sai_bmtor_api);
170168
sai_api_query(SAI_API_SAMPLEPACKET, (void **)&sai_samplepacket_api);
171169
sai_api_query(SAI_API_DEBUG_COUNTER, (void **)&sai_debug_counter_api);
172170
sai_api_query(SAI_API_NAT, (void **)&sai_nat_api);
@@ -195,7 +193,6 @@ void initSaiApi()
195193
sai_log_set(SAI_API_SCHEDULER_GROUP, SAI_LOG_LEVEL_NOTICE);
196194
sai_log_set(SAI_API_ACL, SAI_LOG_LEVEL_NOTICE);
197195
sai_log_set(SAI_API_DTEL, SAI_LOG_LEVEL_NOTICE);
198-
sai_log_set((sai_api_t)SAI_API_BMTOR, SAI_LOG_LEVEL_NOTICE);
199196
sai_log_set(SAI_API_SAMPLEPACKET, SAI_LOG_LEVEL_NOTICE);
200197
sai_log_set(SAI_API_DEBUG_COUNTER, SAI_LOG_LEVEL_NOTICE);
201198
sai_log_set((sai_api_t)SAI_API_NAT, SAI_LOG_LEVEL_NOTICE);

0 commit comments

Comments
 (0)