diff --git a/orchagent/intfsorch.cpp b/orchagent/intfsorch.cpp index 2921393d7c..0c3786caa6 100644 --- a/orchagent/intfsorch.cpp +++ b/orchagent/intfsorch.cpp @@ -117,6 +117,16 @@ sai_object_id_t IntfsOrch::getRouterIntfsId(const string &alias) return port.m_rif_id; } +bool IntfsOrch::isIntfRemovalPending(const string &alias) const +{ + return m_removingIntfses.find(alias) != m_removingIntfses.end(); +} + +bool IntfsOrch::isIntfVrfUpdatePending(const string &alias) const +{ + return m_pendingVrfUpdates.find(alias) != m_pendingVrfUpdates.end(); +} + bool IntfsOrch::isPrefixSubnet(const IpPrefix &ip_prefix, const string &alias) { if (m_syncdIntfses.find(alias) == m_syncdIntfses.end()) @@ -478,7 +488,8 @@ set IntfsOrch:: getSubnetRoutes() } bool IntfsOrch::setIntf(const string& alias, sai_object_id_t vrf_id, const IpPrefix *ip_prefix, - const bool adminUp, const uint32_t mtu, string loopbackAction) + const bool adminUp, const uint32_t mtu, string loopbackAction, + const bool vrfIdIsExplicit) { SWSS_LOG_ENTER(); @@ -488,6 +499,11 @@ bool IntfsOrch::setIntf(const string& alias, sai_object_id_t vrf_id, const IpPre return false; } + if (ip_prefix && isIntfVrfUpdatePending(alias)) + { + return false; + } + Port port; gPortsOrch->getPort(alias, port); @@ -512,8 +528,10 @@ bool IntfsOrch::setIntf(const string& alias, sai_object_id_t vrf_id, const IpPre { intfs_entry.mac = gMacAddress; } + intfs_entry.loopback_action = loopbackAction; m_syncdIntfses[alias] = intfs_entry; m_vrfOrch->increaseVrfRefCount(vrf_id); + m_pendingVrfUpdates.erase(alias); } else { @@ -522,30 +540,107 @@ bool IntfsOrch::setIntf(const string& alias, sai_object_id_t vrf_id, const IpPre } else { - if (!ip_prefix && port.m_type == Port::SUBPORT) + // Treat an explicit VRF change as a RIF replacement and retain the SET + // until the old interface has no prefixes or dependent objects. + sai_object_id_t old_vrf_id = it_intfs->second.vrf_id; + if (!ip_prefix && vrfIdIsExplicit && old_vrf_id != vrf_id) { - // port represents a sub interface - // Change sub interface config at run time - bool attrChanged = false; - if (mtu && port.m_mtu != mtu) + m_pendingVrfUpdates.insert(alias); + if (!it_intfs->second.ip_addresses.empty()) { - port.m_mtu = mtu; - attrChanged = true; + return false; + } + + IntfsEntry intfs_entry = it_intfs->second; + if (intfs_entry.sag_enabled) + { + SWSS_LOG_WARN("Cannot move SAG-enabled interface %s between VRFs", alias.c_str()); + return false; + } - setRouterIntfsMtu(port); + Port rehome_port = port; + rehome_port.m_mac = intfs_entry.mac; + if (rehome_port.m_type == Port::SUBPORT) + { + rehome_port.m_admin_state_up = adminUp; + if (mtu) + { + rehome_port.m_mtu = mtu; + } + } + if (!removeRouterIntfs(port)) + { + return false; } - if (port.m_admin_state_up != adminUp) + rehome_port.m_rif_id = SAI_NULL_OBJECT_ID; + rehome_port.m_vr_id = SAI_NULL_OBJECT_ID; + string rehome_loopback_action = loopbackAction.empty() ? + intfs_entry.loopback_action : + loopbackAction; + try + { + if (!addRouterIntfs(vrf_id, rehome_port, rehome_loopback_action)) + { + return false; + } + } + catch (const std::exception& e) { - port.m_admin_state_up = adminUp; - attrChanged = true; + Port rollback_port = rehome_port; + rollback_port.m_rif_id = SAI_NULL_OBJECT_ID; + rollback_port.m_vr_id = SAI_NULL_OBJECT_ID; + if (!addRouterIntfs(old_vrf_id, rollback_port, intfs_entry.loopback_action)) + { + SWSS_LOG_ERROR("Failed to restore interface %s after VRF move failed: %s", + alias.c_str(), e.what()); + throw; + } + SWSS_LOG_ERROR("Failed to move interface %s to VRF %s; restored the old RIF and will retry: %s", + alias.c_str(), m_vrfOrch->getVRFname(vrf_id).c_str(), e.what()); + return false; + } + + m_vrfOrch->decreaseVrfRefCount(old_vrf_id); + m_vrfOrch->increaseVrfRefCount(vrf_id); + intfs_entry.vrf_id = vrf_id; + intfs_entry.loopback_action = rehome_loopback_action; + m_syncdIntfses[alias] = intfs_entry; - setRouterIntfsAdminStatus(port); + m_pendingVrfUpdates.erase(alias); + } + else if (!ip_prefix) + { + if (vrfIdIsExplicit) + { + m_pendingVrfUpdates.erase(alias); } - if (attrChanged) + if (port.m_type == Port::SUBPORT) { - gPortsOrch->setPort(alias, port); + // port represents a sub interface + // Change sub interface config at run time + bool attrChanged = false; + if (mtu && port.m_mtu != mtu) + { + port.m_mtu = mtu; + attrChanged = true; + + setRouterIntfsMtu(port); + } + + if (port.m_admin_state_up != adminUp) + { + port.m_admin_state_up = adminUp; + attrChanged = true; + + setRouterIntfsAdminStatus(port); + } + + if (attrChanged) + { + gPortsOrch->setPort(alias, port); + } } } } @@ -658,6 +753,7 @@ bool IntfsOrch::removeIntf(const string& alias, sai_object_id_t vrf_id, const Ip m_syncdIntfses.erase(alias); m_vrfOrch->decreaseVrfRefCount(vrf_id); + m_pendingVrfUpdates.erase(alias); if (port.m_type == Port::SUBPORT) { @@ -736,6 +832,9 @@ void IntfsOrch::doTask(Consumer &consumer) const vector& data = kfvFieldsValues(t); string vrf_name = "", vnet_name = "", nat_zone = ""; + bool vrfNameIsExplicit = false; + bool macIsExplicit = false; + bool mplsIsExplicit = false; MacAddress mac; uint32_t mtu = 0; @@ -770,6 +869,7 @@ void IntfsOrch::doTask(Consumer &consumer) if (field == "vrf_name") { vrf_name = value; + vrfNameIsExplicit = true; } else if (field == "vnet_name") { @@ -780,6 +880,7 @@ void IntfsOrch::doTask(Consumer &consumer) try { mac = MacAddress(value); + macIsExplicit = true; } catch (const std::invalid_argument &e) { @@ -790,6 +891,7 @@ void IntfsOrch::doTask(Consumer &consumer) else if (field == "mpls") { mpls = (value == "enable" ? true : false); + mplsIsExplicit = true; } else if (field == "nat_zone") { @@ -1011,7 +1113,8 @@ void IntfsOrch::doTask(Consumer &consumer) adminUp = port.m_admin_state_up; } - if (!setIntf(alias, vrf_id, ip_prefix_in_key ? &ip_prefix : nullptr, adminUp, mtu, loopbackAction)) + if (!setIntf(alias, vrf_id, ip_prefix_in_key ? &ip_prefix : nullptr, adminUp, mtu, + loopbackAction, vrfNameIsExplicit)) { it++; continue; @@ -1055,7 +1158,7 @@ void IntfsOrch::doTask(Consumer &consumer) gPortsOrch->setPort(alias, port); } /* Set MPLS */ - if ((!ip_prefix_in_key) && (port.m_mpls != mpls)) + if (mplsIsExplicit && !ip_prefix_in_key && port.m_mpls != mpls) { port.m_mpls = mpls; @@ -1066,18 +1169,21 @@ void IntfsOrch::doTask(Consumer &consumer) /* Set loopback action */ if (!loopbackAction.empty()) { - setIntfLoopbackAction(port, loopbackAction); + if (setIntfLoopbackAction(port, loopbackAction)) + { + m_syncdIntfses[alias].loopback_action = loopbackAction; + } } } } - if (!mac) + if (macIsExplicit && !mac) { mac = gMacAddress; } // update mac if it is changed - if (m_syncdIntfses.find(alias) != m_syncdIntfses.end()) + if (macIsExplicit && m_syncdIntfses.find(alias) != m_syncdIntfses.end()) { if ((!ip_prefix_in_key) && (m_syncdIntfses[alias].mac != mac)) { @@ -1105,6 +1211,8 @@ void IntfsOrch::doTask(Consumer &consumer) SWSS_LOG_NOTICE("Set router interface mac %s for port %s success", mac.to_string().c_str(), alias.c_str()); m_syncdIntfses[alias].mac = mac; + port.m_mac = mac; + gPortsOrch->setPort(alias, port); } } else @@ -1194,11 +1302,19 @@ void IntfsOrch::doTask(Consumer &consumer) if (vnet_orch->delIntf(alias, vnet_name, ip_prefix_in_key ? &ip_prefix : nullptr)) { + if (!ip_prefix_in_key) + { + m_removingIntfses.erase(alias); + } m_vnetInfses.erase(alias); it = consumer.m_toSync.erase(it); } else { + if (!ip_prefix_in_key) + { + m_removingIntfses.insert(alias); + } it++; continue; } @@ -1207,12 +1323,18 @@ void IntfsOrch::doTask(Consumer &consumer) { if (removeIntf(alias, port.m_vr_id, ip_prefix_in_key ? &ip_prefix : nullptr)) { - m_removingIntfses.erase(alias); + if (!ip_prefix_in_key) + { + m_removingIntfses.erase(alias); + } it = consumer.m_toSync.erase(it); } else { - m_removingIntfses.insert(alias); + if (!ip_prefix_in_key) + { + m_removingIntfses.insert(alias); + } it++; continue; } @@ -1975,4 +2097,3 @@ void IntfsOrch::voqSyncIntfState(string &alias, bool isUp) } } - diff --git a/orchagent/intfsorch.h b/orchagent/intfsorch.h index 5de9a7fb01..44a5093be5 100644 --- a/orchagent/intfsorch.h +++ b/orchagent/intfsorch.h @@ -28,6 +28,7 @@ struct IntfsEntry bool proxy_arp; bool sag_enabled = false; MacAddress mac; + std::string loopback_action; }; typedef map IntfsTable; @@ -39,6 +40,8 @@ class IntfsOrch : public Orch static const int intfsorch_pri; sai_object_id_t getRouterIntfsId(const string&); + bool isIntfRemovalPending(const string&) const; + bool isIntfVrfUpdatePending(const string&) const; bool isPrefixSubnet(const IpPrefix&, const string&); bool isInbandIntfInMgmtVrf(const string& alias); string getRouterIntfsAlias(const IpAddress &ip, const string &vrf_name = ""); @@ -60,7 +63,7 @@ class IntfsOrch : public Orch bool setIntfLoopbackAction(const Port &port, string actionStr); bool getSaiLoopbackAction(const string &actionStr, sai_packet_action_t &action); - bool setIntf(const string& alias, sai_object_id_t vrf_id = gVirtualRouterId, const IpPrefix *ip_prefix = nullptr, const bool adminUp = true, const uint32_t mtu = 0, string loopbackAction = ""); + bool setIntf(const string& alias, sai_object_id_t vrf_id = gVirtualRouterId, const IpPrefix *ip_prefix = nullptr, const bool adminUp = true, const uint32_t mtu = 0, string loopbackAction = "", const bool vrfIdIsExplicit = false); bool removeIntf(const string& alias, sai_object_id_t vrf_id = gVirtualRouterId, const IpPrefix *ip_prefix = nullptr); void addIp2MeRoute(sai_object_id_t vrf_id, const IpPrefix &ip_prefix); @@ -99,6 +102,7 @@ class IntfsOrch : public Orch unique_ptr m_vidToRidTable; std::set m_removingIntfses; + std::set m_pendingVrfUpdates; std::string getRifFlexCounterTableKey(std::string s); diff --git a/orchagent/neighorch.cpp b/orchagent/neighorch.cpp index 7ee60a9580..917b2d9db8 100644 --- a/orchagent/neighorch.cpp +++ b/orchagent/neighorch.cpp @@ -379,6 +379,14 @@ bool NeighOrch::addNextHop(NeighborContext& ctx) } assert(!hasNextHop(nexthop)); + if (!m_intfsOrch->isRemoteSystemPortIntf(nh.alias) && + (m_intfsOrch->isIntfRemovalPending(nh.alias) || + m_intfsOrch->isIntfVrfUpdatePending(nh.alias))) + { + SWSS_LOG_INFO("Interface %s is pending removal or VRF update", nh.alias.c_str()); + return false; + } + sai_object_id_t rif_id = m_intfsOrch->getRouterIntfsId(nh.alias); vector next_hop_attrs; @@ -1324,6 +1332,14 @@ bool NeighOrch::addNeighbor(NeighborContext& ctx) string alias = neighborEntry.alias; bool bulk_op = ctx.bulk_op; + if (!m_intfsOrch->isRemoteSystemPortIntf(alias) && + (m_intfsOrch->isIntfRemovalPending(alias) || + m_intfsOrch->isIntfVrfUpdatePending(alias))) + { + SWSS_LOG_INFO("Interface %s is pending removal or VRF update", alias.c_str()); + return false; + } + sai_object_id_t rif_id = m_intfsOrch->getRouterIntfsId(alias); if (rif_id == SAI_NULL_OBJECT_ID) { @@ -2065,6 +2081,7 @@ bool NeighOrch::enableNeighbors(std::list& bulk_ctx_list) if(!addNeighbor(*ctx)) { SWSS_LOG_ERROR("Neighbor %s create entry failed.", neighborEntry.ip_address.to_string().c_str()); + ret = false; continue; } } diff --git a/orchagent/routeorch.cpp b/orchagent/routeorch.cpp index 5ef3ba6f7e..3aedc878cb 100644 --- a/orchagent/routeorch.cpp +++ b/orchagent/routeorch.cpp @@ -1507,7 +1507,10 @@ bool RouteOrch::addNextHopGroup(const NextHopGroupKey &nexthops) m_neighOrch->hasNextHop(NextHopKey(it.ip_address, it.alias))) { NeighborContext ctx = NeighborContext(it); - m_neighOrch->addNextHop(ctx); + if (!m_neighOrch->addNextHop(ctx)) + { + return false; + } next_hop_id = m_neighOrch->getNextHopId(it); } else @@ -2083,6 +2086,14 @@ bool RouteOrch::addRoute(RouteBulkContext& ctx, const NextHopGroupKey &nextHops) return true; } + if (!m_intfsOrch->isRemoteSystemPortIntf(nexthop.alias) && + (m_intfsOrch->isIntfRemovalPending(nexthop.alias) || + m_intfsOrch->isIntfVrfUpdatePending(nexthop.alias))) + { + SWSS_LOG_INFO("Interface %s is pending removal or VRF update", nexthop.alias.c_str()); + return false; + } + next_hop_id = m_intfsOrch->getRouterIntfsId(nexthop.alias); /* rif is not created yet */ if (next_hop_id == SAI_NULL_OBJECT_ID) @@ -2118,7 +2129,10 @@ bool RouteOrch::addRoute(RouteBulkContext& ctx, const NextHopGroupKey &nextHops) { /* since IP neighbor NH exists, neighbor is resolved, add MPLS NH */ NeighborContext ctx = NeighborContext(nexthop); - m_neighOrch->addNextHop(ctx); + if (!m_neighOrch->addNextHop(ctx)) + { + return false; + } next_hop_id = m_neighOrch->getNextHopId(nexthop); } /* IP neighbor is not yet resolved */ diff --git a/tests/mock_tests/intfsorch_ut.cpp b/tests/mock_tests/intfsorch_ut.cpp index 5e50e73183..5d83692ae2 100644 --- a/tests/mock_tests/intfsorch_ut.cpp +++ b/tests/mock_tests/intfsorch_ut.cpp @@ -16,6 +16,9 @@ namespace intfsorch_test int create_rif_count = 0; int remove_rif_count = 0; + bool saw_loopback_action = false; + bool fail_next_rif_create = false; + sai_packet_action_t last_loopback_action = SAI_PACKET_ACTION_FORWARD; sai_router_interface_api_t *pold_sai_rif_api; sai_router_interface_api_t ut_sai_rif_api; @@ -26,14 +29,28 @@ namespace intfsorch_test _In_ const sai_attribute_t *attr_list) { ++create_rif_count; - return SAI_STATUS_SUCCESS; + if (fail_next_rif_create) + { + fail_next_rif_create = false; + return SAI_STATUS_INSUFFICIENT_RESOURCES; + } + for (uint32_t i = 0; i < attr_count; ++i) + { + if (attr_list[i].id == SAI_ROUTER_INTERFACE_ATTR_LOOPBACK_PACKET_ACTION) + { + saw_loopback_action = true; + last_loopback_action = static_cast(attr_list[i].value.s32); + } + } + return pold_sai_rif_api->create_router_interface( + router_interface_id, switch_id, attr_count, attr_list); } sai_status_t _ut_remove_router_interface( _In_ sai_object_id_t router_interface_id) { ++remove_rif_count; - return SAI_STATUS_SUCCESS; + return pold_sai_rif_api->remove_router_interface(router_interface_id); } struct IntfsOrchTest : public ::testing::Test @@ -61,6 +78,10 @@ namespace intfsorch_test sai_router_intfs_api->create_router_interface = _ut_create_router_interface; sai_router_intfs_api->remove_router_interface = _ut_remove_router_interface; + create_rif_count = 0; + remove_rif_count = 0; + saw_loopback_action = false; + fail_next_rif_create = false; m_app_db = make_shared("APPL_DB", 0); m_config_db = make_shared("CONFIG_DB", 0); @@ -313,17 +334,30 @@ namespace intfsorch_test static_cast(gIntfsOrch)->doTask(); ASSERT_EQ(current_create_count + 1, create_rif_count); + // Add a prefix so the whole-interface DEL is processed before its dependency DEL. + entries.clear(); + entries.push_back({"Ethernet0:10.0.0.1/24", "SET", { + {"scope", "global"}, + {"family", "IPv4"} + }}); + consumer->addToSync(entries); + static_cast(gIntfsOrch)->doTask(); + // create dependency to the interface gIntfsOrch->increaseRouterIntfsRefCount("Ethernet0"); - // delete the interface, expect retry because dependency exists + // Delete the interface and prefix in lexical order. The successful prefix + // DEL must not clear the whole-interface removal fence. entries.clear(); entries.push_back({"Ethernet0", "DEL", { {} }}); + entries.push_back({"Ethernet0:10.0.0.1/24", "DEL", { {} }}); consumer = dynamic_cast(gIntfsOrch->getExecutor(APP_INTF_TABLE_NAME)); consumer->addToSync(entries); auto current_remove_count = remove_rif_count; static_cast(gIntfsOrch)->doTask(); ASSERT_EQ(current_remove_count, remove_rif_count); + ASSERT_EQ(consumer->m_toSync.size(), 1u); + ASSERT_TRUE(gIntfsOrch->isIntfRemovalPending("Ethernet0")); // create the interface again, expect retry because interface is in removing entries.clear(); @@ -489,4 +523,198 @@ namespace intfsorch_test ASSERT_EQ(syncd["Loopback6"].vrf_id, gVrfOrch->getVRFid("Vrf-Blue")); ASSERT_EQ(gVrfOrch->getVrfRefCount("Vrf-Blue"), base_vrf_ref + 1); } + + TEST_F(IntfsOrchTest, IntfsOrchVrfUpdateWaitsForDrain) + { + std::deque entries{ + {"Vrf-Blue", "SET", {{"NULL", "NULL"}}} + }; + auto consumer = dynamic_cast(gVrfOrch->getExecutor(APP_VRF_TABLE_NAME)); + consumer->addToSync(entries); + static_cast(gVrfOrch)->doTask(); + + entries = { + {"Ethernet0", "SET", { + {"mtu", "9100"}, + {"loopback_action", "drop"}, + {"mpls", "enable"}, + {"mac_addr", "00:11:22:33:44:55"} + }}, + {"Ethernet0:10.0.0.1/24", "SET", {{"scope", "global"}, {"family", "IPv4"}}} + }; + consumer = dynamic_cast(gIntfsOrch->getExecutor(APP_INTF_TABLE_NAME)); + consumer->addToSync(entries); + static_cast(gIntfsOrch)->doTask(); + + Port port; + ASSERT_TRUE(gPortsOrch->getPort("Ethernet0", port)); + gIntfsOrch->increaseRouterIntfsRefCount("Ethernet0"); + + entries = { + {"Ethernet0", "SET", {{"vrf_name", "Vrf-Blue"}}}, + {"Ethernet0:10.0.0.1/24", "DEL", {}}, + {"Ethernet0:10.0.0.1/24", "SET", {{"scope", "global"}, {"family", "IPv4"}}} + }; + saw_loopback_action = false; + consumer->addToSync(entries); + + auto create_count = create_rif_count; + auto remove_count = remove_rif_count; + static_cast(gIntfsOrch)->doTask(); + ASSERT_EQ(consumer->m_toSync.size(), 2u); + ASSERT_EQ(create_count, create_rif_count); + ASSERT_EQ(remove_count, remove_rif_count); + ASSERT_TRUE(gIntfsOrch->isIntfVrfUpdatePending("Ethernet0")); + ASSERT_NE(gIntfsOrch->getRouterIntfsId("Ethernet0"), SAI_NULL_OBJECT_ID); + + static_cast(gIntfsOrch)->doTask(); + ASSERT_EQ(consumer->m_toSync.size(), 2u); + ASSERT_EQ(remove_count, remove_rif_count); + + gIntfsOrch->decreaseRouterIntfsRefCount("Ethernet0"); + static_cast(gIntfsOrch)->doTask(); + + ASSERT_TRUE(consumer->m_toSync.empty()); + ASSERT_EQ(create_count + 1, create_rif_count); + ASSERT_EQ(remove_count + 1, remove_rif_count); + ASSERT_EQ(gIntfsOrch->getSyncdIntfses().at("Ethernet0").vrf_id, + gVrfOrch->getVRFid("Vrf-Blue")); + ASSERT_EQ(gIntfsOrch->getSyncdIntfses().at("Ethernet0").ip_addresses.count( + IpPrefix("10.0.0.1/24")), + 1u); + ASSERT_TRUE(saw_loopback_action); + ASSERT_EQ(last_loopback_action, SAI_PACKET_ACTION_DROP); + ASSERT_TRUE(gPortsOrch->getPort("Ethernet0", port)); + ASSERT_TRUE(port.m_mpls); + ASSERT_EQ(port.m_mac, MacAddress("00:11:22:33:44:55")); + ASSERT_EQ(gIntfsOrch->getSyncdIntfses().at("Ethernet0").mac, + MacAddress("00:11:22:33:44:55")); + } + + TEST_F(IntfsOrchTest, IntfsOrchExplicitZeroMacRestoresSystemMac) + { + std::deque entries{ + {"Ethernet0", "SET", {{"mac_addr", "00:11:22:33:44:55"}}} + }; + auto consumer = dynamic_cast(gIntfsOrch->getExecutor(APP_INTF_TABLE_NAME)); + consumer->addToSync(entries); + static_cast(gIntfsOrch)->doTask(); + + ASSERT_EQ(gIntfsOrch->getSyncdIntfses().at("Ethernet0").mac, + MacAddress("00:11:22:33:44:55")); + + entries = { + {"Ethernet0", "SET", {{"mac_addr", "00:00:00:00:00:00"}}} + }; + consumer->addToSync(entries); + static_cast(gIntfsOrch)->doTask(); + + Port port; + ASSERT_TRUE(gPortsOrch->getPort("Ethernet0", port)); + ASSERT_EQ(port.m_mac, gMacAddress); + ASSERT_EQ(gIntfsOrch->getSyncdIntfses().at("Ethernet0").mac, gMacAddress); + } + + TEST_F(IntfsOrchTest, IntfsOrchPartialUpdatePreservesVrf) + { + std::deque entries{ + {"Vrf-Blue", "SET", {{"NULL", "NULL"}}} + }; + auto consumer = dynamic_cast(gVrfOrch->getExecutor(APP_VRF_TABLE_NAME)); + consumer->addToSync(entries); + static_cast(gVrfOrch)->doTask(); + + entries = { + {"Ethernet0.10", "SET", { + {"vlan", "10"}, + {"admin_status", "up"}, + {"mtu", "9100"} + }} + }; + consumer = dynamic_cast(gIntfsOrch->getExecutor(APP_INTF_TABLE_NAME)); + consumer->addToSync(entries); + static_cast(gIntfsOrch)->doTask(); + + auto create_count = create_rif_count; + auto remove_count = remove_rif_count; + entries = { + {"Ethernet0.10", "SET", { + {"vrf_name", "Vrf-Blue"}, + {"admin_status", "down"}, + {"mtu", "1500"} + }} + }; + consumer->addToSync(entries); + static_cast(gIntfsOrch)->doTask(); + + ASSERT_EQ(create_count + 1, create_rif_count); + ASSERT_EQ(remove_count + 1, remove_rif_count); + ASSERT_EQ(gIntfsOrch->getSyncdIntfses().at("Ethernet0.10").vrf_id, + gVrfOrch->getVRFid("Vrf-Blue")); + + Port port; + ASSERT_TRUE(gPortsOrch->getPort("Ethernet0.10", port)); + ASSERT_FALSE(port.m_admin_state_up); + ASSERT_EQ(port.m_mtu, 1500u); + + create_count = create_rif_count; + remove_count = remove_rif_count; + entries = { + {"Ethernet0.10", "SET", {{"admin_status", "up"}}} + }; + consumer->addToSync(entries); + static_cast(gIntfsOrch)->doTask(); + + ASSERT_EQ(create_count, create_rif_count); + ASSERT_EQ(remove_count, remove_rif_count); + ASSERT_EQ(gIntfsOrch->getSyncdIntfses().at("Ethernet0.10").vrf_id, + gVrfOrch->getVRFid("Vrf-Blue")); + ASSERT_TRUE(gPortsOrch->getPort("Ethernet0.10", port)); + ASSERT_TRUE(port.m_admin_state_up); + } + + TEST_F(IntfsOrchTest, IntfsOrchVrfUpdateRollsBackCreateFailure) + { + std::deque entries{ + {"Vrf-Blue", "SET", {{"NULL", "NULL"}}} + }; + auto consumer = dynamic_cast(gVrfOrch->getExecutor(APP_VRF_TABLE_NAME)); + consumer->addToSync(entries); + static_cast(gVrfOrch)->doTask(); + + entries = { + {"Ethernet0", "SET", {{"mtu", "9100"}, {"loopback_action", "drop"}}} + }; + consumer = dynamic_cast(gIntfsOrch->getExecutor(APP_INTF_TABLE_NAME)); + consumer->addToSync(entries); + static_cast(gIntfsOrch)->doTask(); + + auto create_count = create_rif_count; + auto remove_count = remove_rif_count; + fail_next_rif_create = true; + entries = { + {"Ethernet0", "SET", {{"vrf_name", "Vrf-Blue"}}}, + {"Ethernet4", "SET", {{"loopback_action", "drop"}}} + }; + consumer->addToSync(entries); + EXPECT_NO_THROW(gIntfsOrch->doTask(*consumer)); + + ASSERT_EQ(consumer->m_toSync.size(), 1u); + ASSERT_EQ(consumer->m_toSync.begin()->first, "Ethernet0"); + ASSERT_EQ(create_count + 3, create_rif_count); + ASSERT_EQ(remove_count + 1, remove_rif_count); + ASSERT_EQ(gIntfsOrch->getSyncdIntfses().at("Ethernet0").vrf_id, gVirtualRouterId); + ASSERT_TRUE(gIntfsOrch->isIntfVrfUpdatePending("Ethernet0")); + ASSERT_NE(gIntfsOrch->getRouterIntfsId("Ethernet0"), SAI_NULL_OBJECT_ID); + ASSERT_NE(gIntfsOrch->getSyncdIntfses().find("Ethernet4"), + gIntfsOrch->getSyncdIntfses().end()); + + static_cast(gIntfsOrch)->doTask(); + + ASSERT_TRUE(consumer->m_toSync.empty()); + ASSERT_EQ(create_count + 4, create_rif_count); + ASSERT_EQ(remove_count + 2, remove_rif_count); + ASSERT_EQ(gIntfsOrch->getSyncdIntfses().at("Ethernet0").vrf_id, + gVrfOrch->getVRFid("Vrf-Blue")); + } } diff --git a/tests/mock_tests/neighorch_ut.cpp b/tests/mock_tests/neighorch_ut.cpp index dc08749c37..c24cd5e526 100644 --- a/tests/mock_tests/neighorch_ut.cpp +++ b/tests/mock_tests/neighorch_ut.cpp @@ -189,6 +189,34 @@ namespace neighorch_test } }; + TEST_F(NeighOrchTest, LocalNeighborDependenciesRetryWhileInterfaceRemovalPending) + { + gIntfsOrch->m_removingIntfses.insert(VLAN_1000); + + NeighborContext neighbor_ctx(VLAN1000_NEIGH); + neighbor_ctx.mac = MacAddress(MAC1); + EXPECT_FALSE(gNeighOrch->addNeighbor(neighbor_ctx)); + + NeighborContext next_hop_ctx(VLAN1000_NEIGH); + EXPECT_FALSE(gNeighOrch->addNextHop(next_hop_ctx)); + + gIntfsOrch->m_removingIntfses.erase(VLAN_1000); + } + + TEST_F(NeighOrchTest, LocalNeighborDependenciesRetryWhileVrfUpdatePending) + { + gIntfsOrch->m_pendingVrfUpdates.insert(VLAN_1000); + + NeighborContext neighbor_ctx(VLAN1000_NEIGH); + neighbor_ctx.mac = MacAddress(MAC1); + EXPECT_FALSE(gNeighOrch->addNeighbor(neighbor_ctx)); + + NeighborContext next_hop_ctx(VLAN1000_NEIGH); + EXPECT_FALSE(gNeighOrch->addNextHop(next_hop_ctx)); + + gIntfsOrch->m_pendingVrfUpdates.erase(VLAN_1000); + } + TEST_F(NeighOrchTest, MultiVlanDuplicateNeighbor) { EXPECT_CALL(*mock_sai_neighbor_api, create_neighbor_entry);