Skip to content

Commit 1c68706

Browse files
[bitmap_vnet] Remove BMTOR implementation (sonic-net#1496)
Signed-off-by: Volodymyr Samotiy <[email protected]>
1 parent d03c6cc commit 1c68706

File tree

6 files changed

+2
-1523
lines changed

6 files changed

+2
-1523
lines changed

orchagent/orchdaemon.cpp

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,8 @@ bool OrchDaemon::init()
102102
};
103103

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

orchagent/saihelper.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ sai_acl_api_t* sai_acl_api;
4040
sai_mirror_api_t* sai_mirror_api;
4141
sai_fdb_api_t* sai_fdb_api;
4242
sai_dtel_api_t* sai_dtel_api;
43-
sai_bmtor_api_t* sai_bmtor_api;
4443
sai_samplepacket_api_t* sai_samplepacket_api;
4544
sai_debug_counter_api_t* sai_debug_counter_api;
4645
sai_nat_api_t* sai_nat_api;
@@ -132,7 +131,6 @@ void initSaiApi()
132131
sai_api_query(SAI_API_SCHEDULER_GROUP, (void **)&sai_scheduler_group_api);
133132
sai_api_query(SAI_API_ACL, (void **)&sai_acl_api);
134133
sai_api_query(SAI_API_DTEL, (void **)&sai_dtel_api);
135-
sai_api_query((sai_api_t)SAI_API_BMTOR, (void **)&sai_bmtor_api);
136134
sai_api_query(SAI_API_SAMPLEPACKET, (void **)&sai_samplepacket_api);
137135
sai_api_query(SAI_API_DEBUG_COUNTER, (void **)&sai_debug_counter_api);
138136
sai_api_query(SAI_API_NAT, (void **)&sai_nat_api);
@@ -161,7 +159,6 @@ void initSaiApi()
161159
sai_log_set(SAI_API_SCHEDULER_GROUP, SAI_LOG_LEVEL_NOTICE);
162160
sai_log_set(SAI_API_ACL, SAI_LOG_LEVEL_NOTICE);
163161
sai_log_set(SAI_API_DTEL, SAI_LOG_LEVEL_NOTICE);
164-
sai_log_set((sai_api_t)SAI_API_BMTOR, SAI_LOG_LEVEL_NOTICE);
165162
sai_log_set(SAI_API_SAMPLEPACKET, SAI_LOG_LEVEL_NOTICE);
166163
sai_log_set(SAI_API_DEBUG_COUNTER, SAI_LOG_LEVEL_NOTICE);
167164
sai_log_set((sai_api_t)SAI_API_NAT, SAI_LOG_LEVEL_NOTICE);

0 commit comments

Comments
 (0)