forked from sonic-net/sonic-buildimage
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[vs] SAI support for VOQ switches (sonic-net#698)
Core Port Index Map for VOQ system port vs test support. This class has stores <core, core port index> mapping for all the local ports. The core port index mapping is supplied via coreportindexmap.ini file
- Loading branch information
1 parent
036ffba
commit 3778673
Showing
2 changed files
with
251 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
#pragma once | ||
|
||
#include "swss/sal.h" | ||
|
||
#include <inttypes.h> | ||
|
||
#include <map> | ||
#include <vector> | ||
#include <string> | ||
#include <memory> | ||
|
||
namespace saivs | ||
{ | ||
class CorePortIndexMap | ||
{ | ||
public: | ||
|
||
constexpr static uint32_t DEFAULT_SWITCH_INDEX = 0; | ||
|
||
public: | ||
|
||
CorePortIndexMap( | ||
_In_ uint32_t switchIndex); | ||
|
||
virtual ~CorePortIndexMap() = default; | ||
|
||
public: | ||
|
||
bool add( | ||
_In_ const std::string& ifname, | ||
_In_ const std::vector<uint32_t>& lanes); | ||
|
||
bool remove( | ||
_In_ const std::string& ifname); | ||
|
||
uint32_t getSwitchIndex() const; | ||
|
||
bool isEmpty() const; | ||
|
||
bool hasInterface( | ||
_In_ const std::string& ifname) const; | ||
|
||
const std::vector<std::vector<uint32_t>> getCorePortIndexVector() const; | ||
|
||
/** | ||
* @brief Get interface from core and core port index. | ||
* | ||
* @return Interface name or empty string if core and core port index are not found. | ||
*/ | ||
std::string getInterfaceFromCorePortIndex( | ||
_In_ const std::vector<uint32_t>& corePortIndex) const; | ||
|
||
public: | ||
|
||
static std::shared_ptr<CorePortIndexMap> getDefaultCorePortIndexMap( | ||
_In_ uint32_t switchIndex = DEFAULT_SWITCH_INDEX); | ||
|
||
private: | ||
|
||
uint32_t m_switchIndex; | ||
|
||
std::map<std::vector<uint32_t>, std::string> m_corePortIndexToIfName; | ||
|
||
std::map<std::string, std::vector<uint32_t>> m_ifNameToCorePortIndex; | ||
|
||
std::vector<std::vector<uint32_t>> m_corePortIndexMap; | ||
}; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,183 @@ | ||
#include "CorePortIndexMap.h" | ||
|
||
#include "swss/logger.h" | ||
|
||
#include <set> | ||
|
||
using namespace saivs; | ||
|
||
#define VS_IF_PREFIX "eth" | ||
|
||
CorePortIndexMap::CorePortIndexMap( | ||
_In_ uint32_t switchIndex): | ||
m_switchIndex(switchIndex) | ||
{ | ||
SWSS_LOG_ENTER(); | ||
|
||
// empty | ||
} | ||
|
||
uint32_t CorePortIndexMap::getSwitchIndex() const | ||
{ | ||
SWSS_LOG_ENTER(); | ||
|
||
return m_switchIndex; | ||
} | ||
|
||
bool CorePortIndexMap::add( | ||
_In_ const std::string& ifname, | ||
_In_ const std::vector<uint32_t>& corePortIndex) | ||
{ | ||
SWSS_LOG_ENTER(); | ||
|
||
auto n = corePortIndex.size(); | ||
|
||
if (n != 2) | ||
{ | ||
SWSS_LOG_ERROR("Invalid corePortIndex. Core port index must have core and core port index %d, %s", n, ifname.c_str()); | ||
return false; | ||
} | ||
|
||
if (m_ifNameToCorePortIndex.find(ifname) != m_ifNameToCorePortIndex.end()) | ||
{ | ||
SWSS_LOG_ERROR("interface %s already in core port index map (%d, %d)", ifname.c_str(), corePortIndex[0], corePortIndex[1]); | ||
return false; | ||
} | ||
|
||
m_corePortIndexMap.push_back(corePortIndex); | ||
|
||
m_corePortIndexToIfName[corePortIndex] = ifname; | ||
|
||
m_ifNameToCorePortIndex[ifname] = corePortIndex; | ||
|
||
return true; | ||
} | ||
|
||
bool CorePortIndexMap::remove( | ||
_In_ const std::string& ifname) | ||
{ | ||
SWSS_LOG_ENTER(); | ||
|
||
auto it = m_ifNameToCorePortIndex.find(ifname); | ||
|
||
if (it == m_ifNameToCorePortIndex.end()) | ||
{ | ||
SWSS_LOG_ERROR("interfce %s does not have core port index in switch %d", ifname.c_str(), m_switchIndex); | ||
return false; | ||
} | ||
|
||
auto corePortIndex = it->second; | ||
|
||
m_corePortIndexToIfName.erase(corePortIndex); | ||
|
||
for (size_t idx = 0; idx < m_corePortIndexMap.size(); idx++) | ||
{ | ||
if (m_corePortIndexMap[idx][0] == corePortIndex[0] && m_corePortIndexMap[idx][1] == corePortIndex[1]) | ||
{ | ||
m_corePortIndexMap.erase(m_corePortIndexMap.begin() + idx); | ||
break; | ||
} | ||
} | ||
|
||
m_ifNameToCorePortIndex.erase(it); | ||
|
||
return true; | ||
} | ||
|
||
std::shared_ptr<CorePortIndexMap> CorePortIndexMap::getDefaultCorePortIndexMap( | ||
_In_ uint32_t switchIndex) | ||
{ | ||
SWSS_LOG_ENTER(); | ||
|
||
const uint32_t defaultPortCount = 32; | ||
|
||
uint32_t defaultCorePortIndexMap[defaultPortCount * 2] = { | ||
0,1, | ||
0,2, | ||
0,3, | ||
0,4, | ||
0,5, | ||
0,6, | ||
0,7, | ||
0,8, | ||
0,9, | ||
0,10, | ||
0,11, | ||
0,12, | ||
0,13, | ||
0,14, | ||
0,15, | ||
0,16, | ||
1,1, | ||
1,2, | ||
1,3, | ||
1,4, | ||
1,5, | ||
1,6, | ||
1,7, | ||
1,8, | ||
1,9, | ||
1,10, | ||
1,11, | ||
1,12, | ||
1,13, | ||
1,14, | ||
1,15, | ||
1,16 | ||
}; | ||
|
||
auto corePortIndexMap = std::make_shared<CorePortIndexMap>(switchIndex); | ||
|
||
for (uint32_t idx = 0; idx < defaultPortCount; idx++) | ||
{ | ||
auto ifname = VS_IF_PREFIX + std::to_string(idx); | ||
|
||
std::vector<uint32_t> cpidx; | ||
|
||
cpidx.push_back(defaultCorePortIndexMap[idx * 2]); | ||
cpidx.push_back(defaultCorePortIndexMap[idx * 2 + 1]); | ||
|
||
corePortIndexMap->add(ifname, cpidx); | ||
} | ||
|
||
return corePortIndexMap; | ||
} | ||
|
||
bool CorePortIndexMap::isEmpty() const | ||
{ | ||
SWSS_LOG_ENTER(); | ||
|
||
return m_ifNameToCorePortIndex.size() == 0; | ||
} | ||
|
||
bool CorePortIndexMap::hasInterface( | ||
_In_ const std::string& ifname) const | ||
{ | ||
SWSS_LOG_ENTER(); | ||
|
||
return m_ifNameToCorePortIndex.find(ifname) != m_ifNameToCorePortIndex.end(); | ||
} | ||
|
||
const std::vector<std::vector<uint32_t>> CorePortIndexMap::getCorePortIndexVector() const | ||
{ | ||
SWSS_LOG_ENTER(); | ||
|
||
return m_corePortIndexMap; | ||
} | ||
|
||
std::string CorePortIndexMap::getInterfaceFromCorePortIndex( | ||
_In_ const std::vector<uint32_t>& corePortIndex) const | ||
{ | ||
SWSS_LOG_ENTER(); | ||
|
||
auto it = m_corePortIndexToIfName.find(corePortIndex); | ||
|
||
if (it == m_corePortIndexToIfName.end()) | ||
{ | ||
SWSS_LOG_WARN("Core port index (%d, %d) not found on index %u", corePortIndex.at(0), corePortIndex.at(1), m_switchIndex); | ||
|
||
return ""; | ||
} | ||
|
||
return it->second; | ||
} |