Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Tor agent crashes during addition of multicast route.
Problem: When VN to VRF link is not present addition of multicast route in tor agent used to crash as addition routine tries to access VN name from VRF entry. Absence of link used to return NULL VN and accessing it for VN name results in crash. Solution: Use VN name from VN OVSDB entry. Pass it along in API. Multicast OVSDB does not gets resolved till VN OVSDB is resolved, hence using VN name from same is safe. Conflicts: src/vnsw/agent/oper/vn.cc src/vnsw/agent/oper/vn.h src/vnsw/agent/test/test_util.cc Change-Id: If9cf04ba8a424957dcdb9559d0b99b67d868d32f Closes-bug: 1443318
- Loading branch information
1 parent
9d8be4a
commit a904a76
Showing
14 changed files
with
378 additions
and
17 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
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
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
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
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
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
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
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
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
188 changes: 188 additions & 0 deletions
188
src/vnsw/agent/ovs_tor_agent/ovsdb_client/test/test_ovs_multicast_local.cc
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,188 @@ | ||
| /* | ||
| * Copyright (c) 2015 Juniper Networks, Inc. All rights reserved. | ||
| */ | ||
|
|
||
| #include "base/os.h" | ||
| #include "testing/gunit.h" | ||
|
|
||
| #include <base/logging.h> | ||
| #include <io/event_manager.h> | ||
| #include <io/test/event_manager_test.h> | ||
| #include <tbb/task.h> | ||
| #include <base/task.h> | ||
|
|
||
| #include <cmn/agent_cmn.h> | ||
|
|
||
| #include "cfg/cfg_init.h" | ||
| #include "cfg/cfg_interface.h" | ||
| #include "pkt/pkt_init.h" | ||
| #include "services/services_init.h" | ||
| #include "vrouter/ksync/ksync_init.h" | ||
| #include "oper/interface_common.h" | ||
| #include "oper/nexthop.h" | ||
| #include "oper/tunnel_nh.h" | ||
| #include "route/route.h" | ||
| #include "oper/vrf.h" | ||
| #include "oper/mpls.h" | ||
| #include "oper/vm.h" | ||
| #include "oper/vn.h" | ||
| #include "oper/physical_device_vn.h" | ||
| #include "filter/acl.h" | ||
| #include "openstack/instance_service_server.h" | ||
| #include "test_cmn_util.h" | ||
| #include "vr_types.h" | ||
|
|
||
| #include "openstack/instance_service_server.h" | ||
| #include "xmpp/xmpp_init.h" | ||
| #include "xmpp/test/xmpp_test_util.h" | ||
| #include "vr_types.h" | ||
| #include "control_node_mock.h" | ||
| #include "xml/xml_pugi.h" | ||
| #include "controller/controller_peer.h" | ||
| #include "controller/controller_export.h" | ||
| #include "controller/controller_vrf_export.h" | ||
|
|
||
| #include "ovs_tor_agent/ovsdb_client/ovsdb_route_peer.h" | ||
| #include "ovs_tor_agent/ovsdb_client/physical_switch_ovsdb.h" | ||
| #include "ovs_tor_agent/ovsdb_client/logical_switch_ovsdb.h" | ||
| #include "ovs_tor_agent/ovsdb_client/physical_port_ovsdb.h" | ||
| #include "test_ovs_agent_init.h" | ||
| #include "test-xml/test_xml.h" | ||
| #include "test-xml/test_xml_oper.h" | ||
| #include "test_xml_physical_device.h" | ||
| #include "test_xml_ovsdb.h" | ||
|
|
||
| #include <ovsdb_types.h> | ||
|
|
||
| using namespace pugi; | ||
| using namespace OVSDB; | ||
|
|
||
| EventManager evm1; | ||
| ServerThread *thread1; | ||
| test::ControlNodeMock *bgp_peer1; | ||
|
|
||
| EventManager evm2; | ||
| ServerThread *thread2; | ||
| test::ControlNodeMock *bgp_peer2; | ||
|
|
||
| void RouterIdDepInit(Agent *agent) { | ||
| Agent::GetInstance()->controller()->Connect(); | ||
| } | ||
|
|
||
| class OvsBaseTest : public ::testing::Test { | ||
| protected: | ||
| OvsBaseTest() { | ||
| } | ||
|
|
||
| virtual void SetUp() { | ||
| agent_ = Agent::GetInstance(); | ||
| init_ = static_cast<TestOvsAgentInit *>(client->agent_init()); | ||
| peer_manager_ = init_->ovs_peer_manager(); | ||
| WAIT_FOR(100, 10000, | ||
| (tcp_session_ = static_cast<OvsdbClientTcpSession *> | ||
| (init_->ovsdb_client()->NextSession(NULL))) != NULL); | ||
| WAIT_FOR(100, 10000, | ||
| (tcp_session_->client_idl() != NULL)); | ||
| } | ||
|
|
||
| virtual void TearDown() { | ||
| } | ||
|
|
||
| void AddPhysicalDeviceVn(int dev_id, int vn_id) { | ||
| DBRequest req(DBRequest::DB_ENTRY_ADD_CHANGE); | ||
| req.key.reset(new PhysicalDeviceVnKey(MakeUuid(dev_id), | ||
| MakeUuid(vn_id))); | ||
| agent_->physical_device_vn_table()->Enqueue(&req); | ||
| PhysicalDeviceVn key(MakeUuid(dev_id), MakeUuid(vn_id)); | ||
| WAIT_FOR(100, 10000, | ||
| (agent_->physical_device_vn_table()->Find(&key, false) != NULL)); | ||
| } | ||
|
|
||
| void DelPhysicalDeviceVn(int dev_id, int vn_id) { | ||
| DBRequest req(DBRequest::DB_ENTRY_DELETE); | ||
| req.key.reset(new PhysicalDeviceVnKey(MakeUuid(dev_id), | ||
| MakeUuid(vn_id))); | ||
| agent_->physical_device_vn_table()->Enqueue(&req); | ||
| PhysicalDeviceVn key(MakeUuid(dev_id), MakeUuid(vn_id)); | ||
| WAIT_FOR(100, 10000, | ||
| (agent_->physical_device_vn_table()->Find(&key, false) == NULL)); | ||
| } | ||
|
|
||
| Agent *agent_; | ||
| TestOvsAgentInit *init_; | ||
| OvsPeerManager *peer_manager_; | ||
| OvsdbClientTcpSession *tcp_session_; | ||
| }; | ||
|
|
||
| TEST_F(OvsBaseTest, BasicOvsdb) { | ||
| WAIT_FOR(100, 10000, (tcp_session_->status() == string("Established"))); | ||
| } | ||
|
|
||
| TEST_F(OvsBaseTest, MulticastLocalBasic) { | ||
| AgentUtXmlTest | ||
| test("controller/src/vnsw/agent/ovs_tor_agent/ovsdb_client/test/xml/multicast-local-base.xml"); | ||
| // set current session in test context | ||
| OvsdbTestSetSessionContext(tcp_session_); | ||
| AgentUtXmlOperInit(&test); | ||
| AgentUtXmlPhysicalDeviceInit(&test); | ||
| AgentUtXmlOvsdbInit(&test); | ||
| if (test.Load() == true) { | ||
| test.ReadXml(); | ||
| string str; | ||
| test.ToString(&str); | ||
| cout << str << endl; | ||
| test.Run(); | ||
| } | ||
| } | ||
|
|
||
| TEST_F(OvsBaseTest, MulticastLocal_add_mcroute_without_vrf_vn_link_present) { | ||
| //Add vrf | ||
| VrfAddReq("vrf1"); | ||
| WAIT_FOR(100, 10000, (VrfGet("vrf1", false) != NULL)); | ||
| //Add VN | ||
| VnAddReq(1, "vn1", "vrf1"); | ||
| WAIT_FOR(100, 10000, (VnGet(1) != NULL)); | ||
| //Add device | ||
| DBRequest device_req(DBRequest::DB_ENTRY_ADD_CHANGE); | ||
| device_req.key.reset(new PhysicalDeviceKey(MakeUuid(1))); | ||
| device_req.data.reset(new PhysicalDeviceData(agent_, "test-router", | ||
| "test-router", "", | ||
| Ip4Address::from_string("1.1.1.1"), | ||
| Ip4Address::from_string("2.2.2.2"), | ||
| "OVS", NULL)); | ||
| agent_->physical_device_table()->Enqueue(&device_req); | ||
| WAIT_FOR(100, 10000, | ||
| (agent_->physical_device_table()->Find(MakeUuid(1)) != NULL)); | ||
| //Add device_vn | ||
| AddPhysicalDeviceVn(1, 1); | ||
|
|
||
| //Initialization done, now delete VRF VN link and then update VXLAN id in | ||
| //VN. | ||
| TestClient::WaitForIdle(); | ||
| VxLanNetworkIdentifierMode(true); | ||
| TestClient::WaitForIdle(); | ||
|
|
||
| //Delete | ||
| DelPhysicalDeviceVn(1, 1); | ||
| DBRequest del_dev_req(DBRequest::DB_ENTRY_DELETE); | ||
| del_dev_req.key.reset(new PhysicalDeviceVnKey(MakeUuid(1), | ||
| MakeUuid(1))); | ||
| agent_->physical_device_table()->Enqueue(&del_dev_req); | ||
| WAIT_FOR(1000, 10000, | ||
| (agent_->physical_device_table()-> | ||
| Find(MakeUuid(1)) == NULL)); | ||
| VrfDelReq("vrf1"); | ||
| VnDelReq(1); | ||
| WAIT_FOR(1000, 10000, (VrfGet("vrf1", true) != NULL)); | ||
| WAIT_FOR(1000, 10000, (VnGet(1) != NULL)); | ||
| } | ||
|
|
||
| int main(int argc, char *argv[]) { | ||
| GETUSERARGS(); | ||
| // override with true to initialize ovsdb server and client | ||
| ksync_init = true; | ||
| client = OvsTestInit(init_file, ksync_init); | ||
| int ret = RUN_ALL_TESTS(); | ||
| TestShutdown(); | ||
| return ret; | ||
| } |
Oops, something went wrong.