Merge "Send agent name in Prouter UVE"

Juniper · Nov 20, 2015 · 577eaf3 · 577eaf3
2 parents 1b8858c + d49ffb0
commit 577eaf3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/src/vnsw/agent/uve/prouter.sandesh b/src/vnsw/agent/uve/prouter.sandesh
@@ -8,6 +8,7 @@ struct ProuterData {
     3: string uuid
     4: optional list<string> physical_interface_list
     5: optional list<string> logical_interface_list
+    6: optional string agent_name
 }
 
 uve sandesh UveProuterAgent {

diff --git a/src/vnsw/agent/uve/prouter_uve_table.cc b/src/vnsw/agent/uve/prouter_uve_table.cc
@@ -354,6 +354,7 @@ void ProuterUveTable::FrameProuterMsg(ProuterUveEntry *entry,
      * both these information to be seen in same UVE */
     uve->set_name(entry->name_);
     uve->set_uuid(to_string(entry->uuid_));
+    uve->set_agent_name(agent_->agent_name());
     InterfaceSet::iterator pit = entry->physical_interface_set_.begin();
     while (pit != entry->physical_interface_set_.end()) {
         phy_if_list.push_back(*pit);

diff --git a/src/vnsw/agent/uve/test/test_prouter_uve.cc b/src/vnsw/agent/uve/test/test_prouter_uve.cc
@@ -63,6 +63,8 @@ TEST_F(UveProuterUveTest, ProuterAddDel_1) {
     WAIT_FOR(1000, 500, (vr->vrouter_msg_count() == 1U));
     const VrouterAgent &uve = vr->last_sent_vrouter();
     EXPECT_EQ(1U, uve.get_embedded_prouter_list().size());
+    const ProuterData &pr_uve = pr->last_sent_uve();
+    EXPECT_STREQ(pr_uve.get_agent_name().c_str(), agent_->agent_name().c_str());
 
     DeletePhysicalDevice("prouter1");
     client->WaitForIdle();