Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[vnetorch]: Add VNET/tunnel/route removal flows for Bitmap VNET imple… #816

Merged
merged 1 commit into from
Mar 26, 2019
Merged

[vnetorch]: Add VNET/tunnel/route removal flows for Bitmap VNET imple… #816

merged 1 commit into from
Mar 26, 2019

Conversation

volodymyrsamotiy
Copy link
Collaborator

…mentation

Signed-off-by: Volodymyr Samotiy volodymyrs@mellanox.com

What I did
Added support of VNET/tunnel/route removal flows for Bitmap VNET implementation.

Why I did it
Implemented new logic for Bitmap VNET implementation in order to add support of VNET/tunnel/route removal.

How I verified it

  1. Verified manually.
  2. Ran vnet_vxlan ansible test and verified that it passed.

Details if related
N/A

[vnetorch]: Add VNET/tunnel/route removal flows for Bitmap VNET imple…
ab581c0 
…mentation

Signed-off-by: Volodymyr Samotiy <volodymyrs@mellanox.com>
@prsunny
Copy link
Collaborator

prsunny commented Mar 21, 2019

retest this please

prsunny
prsunny reviewed Mar 23, 2019
View reviewed changes
orchagent/vnetorch.cpp
@@ -469,18 +476,115 @@ VnetBridgeInfo VNetBitmapObject::getBridgeInfoByVni(uint32_t vni, string tunnelN
throw std::runtime_error("vni creation failed");
}

tunnel->addEncapMapperEntry(info.bridge_id, vni);
// FIXME: Use "createVxlanTunnelMap()" for tunnel mapper creation
auto tunnelEncapMapperEntry = tunnel->addEncapMapperEntry(info.bridge_id, vni);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is better to call the orch function instead of directly invoking the addEncapMapper and insertMapperEntry. Do you want to fix it in this PR?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree, but currently it cannot be used due to some issue in MLNX SAI. That is why only "encap" mapper is created directly. So, I added a comment here and it will be fixed later on.

orchagent/vnetorch.cpp
@@ -793,6 +892,70 @@ bool VNetBitmapObject::addTunnelRoute(IpPrefix& ipPrefix, tunnelEndpoint& endp)
throw std::runtime_error("VNet route creation failed");
}

tunnelRouteInfo.vni = endp.vni == 0 ? getVni() : endp.vni;
tunnelRouteInfo.mac = mac;
tunnelRouteMap_.emplace(ipPrefix, tunnelRouteInfo);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you want to add a DEBUG log here for the create? Please ignore if it is logged elsewhere in the flow.

orchagent/vnetorch.cpp
if (routeMap_.find(ipPrefix) == routeMap_.end())
{
SWSS_LOG_WARN("VNET route %s doesn't exist", ipPrefix.to_string().c_str());
return false;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if it doesn't exist, may be we can return true to avoid further retry.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it doesn't exist then something went wrong, so I believe we cannot just return true. Also false is returned here to handle situation when add and remove operations are received in wrong order for the same entry.

@prsunny prsunny merged commit 3dd37a4 into sonic-net:master Mar 26, 2019
@stcheng
Copy link
Contributor

stcheng commented Mar 28, 2019

hello @volodymyrsamotiy , could you address this issue?

vnetorch.cpp: In destructor 'virtual VNetBitmapObject::~VNetBitmapObject()':
vnetorch.cpp:1102:55: error: throw will always call terminate() [-Werror=terminate]
         throw std::runtime_error("VNET removal failed");
                                                       ^
vnetorch.cpp:1102:55: note: in C++11 destructors default to noexcept
vnetorch.cpp:1107:55: error: throw will always call terminate() [-Werror=terminate]
         throw std::runtime_error("VNET removal failed");
                                                       ^
vnetorch.cpp:1107:55: note: in C++11 destructors default to noexcept

@stcheng
Copy link
Contributor

stcheng commented Mar 28, 2019

This is blocking sonic-net/sonic-buildimage#2714

@jipanyang
Copy link
Contributor

@volodymyrsamotiy , as @stcheng mentioned, are you addressing this compiling issue with gcc 6.3.0 for swss stretch update? Since teamd and bgp depend on swss, those two dockers are also waiting for the fix. thanks!

@volodymyrsamotiy
Copy link
Collaborator Author

@stcheng, @jipanyang, I am addressing it, I will provide PR today

EdenGri pushed a commit to EdenGri/sonic-swss that referenced this pull request Feb 28, 2022
@jleveque
[Command-Reference.md] Unify Usage statments and Examples (including …
a4cb4dd 
…sample prompts) (sonic-net#816)
oleksandrivantsiv pushed a commit to oleksandrivantsiv/sonic-swss that referenced this pull request Mar 1, 2023
@abdosi @qbdwlr
Moved SAI Header to git tag v1.8.1 (sonic-net#816)
0d3749d 
What I did:

Moved the SAI header to v1.8.1.
   7cd3a7ed84db3fc9cec13496a5339b6fe1888bb7 (HEAD, tag: v1.8.1, origin/v1.8) Update SAI version to V1.8.1 (sonic-net#1218)
   5913e4cdd0c9c7ae859baa2e18086327b39a94da Fix error when compiling Broadcom SAI with v1.8.0 (sonic-net#1216)
   5a98bc3c7e86c01f3cf702054f9af7c7c5ca6daf (HEAD, tag: v1.8.0, origin/master, origin/HEAD, master) Update version to 1.8.0 (sonic-net#1207)
   b3244ceceb45184ffe37da55bb9a98ef126050ce saineighbor.h: Updated SAI_NEIGHBOR_ENTRY_ATTR_ENCAP_INDEX and deprecated SAI_NEIGHBOR_ENTRY_ATTR_ENCAP_IMPOSE_INDEX (sonic-net#1202)
   8731ca6e09c7ba99b0b009e5821d80598e216756 Add source/dest/double NAPT entry available attributes (sonic-net#1194)
   f053d899feb9517f2db43ee462589a30572b5ed1 Add switch attributes for hash offset configuration. (sonic-net#1195)
   13e5cd6940f9a0da1878d00f08e5941e09f16e7f PRBS RX State Data Type (sonic-net#1179)
   9755845a06525a3c17f03e7b936a70783e8ef068 Packet header based VRF classification (sonic-net#1185)
   2369ecb59fff1a5cae948d41eea06bf8b71330b2 SAI versioning (sonic-net#1183)
   744279839c176e68b19734657975e3f5ec6f1a32 Replaced SAI_SWITCH_ATTR_MACSEC_OBJECT_ID with SAI_SWITCH_ATTR_MACSEC_OBJECT_LIST (sonic-net#1199)
   584c724864fe565357e82d097ddcc7363bddefac [CI] Set up CI&PR with Azure Pipelines (sonic-net#1200)
   08192237963174cc60edae9b4812a39c43b291fd Add attribute to query available packet DMA pool size (sonic-net#1198)
   f092ef1e3ce695fc3f9552721025695312b961a2 Add IPv6 flow label hash attribute. (sonic-net#1192)
   cbc9562bb7a8f2c3a79702b99be55f3b3afa6957 Override VRF (sonic-net#1186)
   1eb35afdb2146baf40e6c2b8f2f8bfe99075eaee Add SAI_SWITCH_ATTR_SWITCH_HARDWARE_INFO format for GB MDIO sysfs access   (sonic-net#1171)
   b2d4c9a57c7f00b2632c35ca5eb3dd6480f7916a Switch scoped tunnel attributes (sonic-net#1173)
   96adc95bf8316e1905143d9ecd21f32a43e80d7f Enhancements for MPLS support (sonic-net#1181)
   3dcf1f2028da4060b345ad78e8a0c87d225bf5d0 Support for ACL extensions in metadata (sonic-net#1178)
   24076be95b871e8f82ecaeb908cad951dc68896c [meta] Add support for allow empty list tag (sonic-net#1190)
   a2b3344cdde0bf5a4f8e98e1c676a658c0c615b0 spell check fixes (sonic-net#1189)
   bf4271bab6e8884bd96050bcba44e3134adaaec3 Do not call sai_metadata_sai get APIs before checking if they are allocated (sonic-net#1182)
   5d5784dc3dbfc713c92ae7d2c472680b837bb002 [macsec]: Separate XPN configuration attribute from read-only attribute (sonic-net#1169)
   6d5a9bf5ad17cb82621cabbe2449524320930606 [macsec]: add SAI_MACSEC_ATTR_SUPPORTED_CIPHER_SUITE_LIST (sonic-net#1172)
   e72c8f3a0cc543cb228554be82c97a63db917740 [meta] Print each tool version in Makefile (sonic-net#1177)
   8f19677da88c7494d563ef7c5acb0529ecbd0b6e [meta] Add check for START, END and RANBE_BASE enums (sonic-net#1175)
   24ad7906f145930b2e25682b6248909289d39e72 [meta] Create sai_switch_pointers_t struct (sonic-net#1174)
   4f5f84df3fcd0e146707df41d3e2837c48f7c760 Tunnel loopback packet action as resource (sonic-net#1163)
   8a0e82c57aa0e22e696158735516904e7dc14052 [meta] Add create only oid attribute check on switch object (sonic-net#1170)
   14cf50772e478551920963ecf11f4fd019a0c106 Remove obsolete stub folder (sonic-net#1168)
   f14f406340e4f5f1b1d674f6fdd5fd861a54c877 [meta] Use safer calloc for integer overflow check (sonic-net#1166)

Also this PR include changes of this sonic-net#815

SAI commit b2d4c9a57c7f00b2632c35ca5eb3dd6480f7916a Switch scoped tunnel attributes (sonic-net#1173) needed change in sai_redis_switch.cpp and sai_vs_switch.cpp for compilation.

How I verify:

Verify Build is fine of libsairedis*.deb, syncd*.deb, swss*.deb

Co-authored-by: Ann Pokora <apokora@juniper.net>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@prsunny prsunny prsunny approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@volodymyrsamotiy @prsunny @stcheng @jipanyang