Merge "Handle SG-ID update in route for dest-ip"

Juniper · Jul 9, 2015 · 74b1aa5 · 74b1aa5
2 parents 491ba63 + 85362a8
commit 74b1aa5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/vnsw/agent/pkt/flow_table.cc b/src/vnsw/agent/pkt/flow_table.cc
@@ -1987,7 +1987,7 @@ bool RouteFlowKey::FlowDestMatch(const FlowEntry *flow) const {
         return (flow->data().dmac == mac);
     }
 
-    if (flow->data().source_plen != plen ||
+    if (flow->data().dest_plen != plen ||
         flow->key().family != family)
         return false;
 

diff --git a/src/vnsw/agent/pkt/test/test_sg_flow.cc b/src/vnsw/agent/pkt/test/test_sg_flow.cc
@@ -472,6 +472,15 @@ bool sg_introspec_test = false;
 static void SgListResponse(Sandesh *sandesh, int id, int sg_id, int num_entries)
 {
     SgListResp *resp = dynamic_cast<SgListResp *>(sandesh);
+    if (resp == NULL) {
+            Pagination *page = dynamic_cast<Pagination *>(sandesh);
+            if (page != NULL) {
+                    return;
+                }
+            sg_introspec_test = false;
+            return;
+    }
+
     EXPECT_EQ(resp->get_sg_list().size(), num_entries);
     if (!sg_id) {
         EXPECT_EQ(resp->get_sg_list()[0].sg_uuid, UuidToString(MakeUuid(id)));