Fix bgp_config_test compilation errors

Two different reviews have been merged that break bgp_config_test compilation - fixing both to get tests to compile and run again. Change-Id: Id8d57096747b4b7ec8a946dcabc0ae23b08fa1a1 Closes-Bug: #1737492
Juniper · Dec 11, 2017 · 86dd2d9 · 86dd2d9
1 parent 399b2e5
commit 86dd2d9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/bgp/test/bgp_config_test.cc b/src/bgp/test/bgp_config_test.cc
@@ -2890,7 +2890,7 @@ TEST_F(BgpConfigTest, InstanceCreateUpdate10) {
         TASK_UTIL_EXPECT_TRUE(mgr->GetRoutingInstance(name) != NULL);
         RoutingInstance *rtinstance = mgr->GetRoutingInstance(name);
         TASK_UTIL_EXPECT_EQ(idx, rtinstance->virtual_network_index());
-        TASK_UTIL_EXPECT_FALSE(sc_mgr->IsPending(rtinstance));
+        TASK_UTIL_EXPECT_FALSE(sc_mgr->ServiceChainIsPending(rtinstance));
     }
 
     boost::replace_all(content1, "<config>", "<delete>");
@@ -3820,21 +3820,21 @@ TEST_F(BgpConfigTest, RouteDistinguisherClusterSeedChange) {
     EXPECT_TRUE(parser_.Parse(content_a));
     task_util::WaitForIdle();
     TASK_UTIL_EXPECT_EQ(0,
-        server_.global_config()->route_distinguisher_cluster_seed());
+        server_.global_config()->rd_cluster_seed());
 
     string content_b =
         FileRead("controller/src/bgp/testdata/config_test_47b.xml");
     EXPECT_TRUE(parser_.Parse(content_b));
     task_util::WaitForIdle();
     TASK_UTIL_EXPECT_EQ(100,
-        server_.global_config()->route_distinguisher_cluster_seed());
+        server_.global_config()->rd_cluster_seed());
 
     string content_c =
         FileRead("controller/src/bgp/testdata/config_test_47c.xml");
     EXPECT_TRUE(parser_.Parse(content_c));
     task_util::WaitForIdle();
     TASK_UTIL_EXPECT_EQ(200,
-        server_.global_config()->route_distinguisher_cluster_seed());
+        server_.global_config()->rd_cluster_seed());
 
     boost::replace_all(content_c, "<config>", "<delete>");
     boost::replace_all(content_c, "</config>", "</delete>");

diff --git a/src/bgp/testdata/config_test_47b.xml b/src/bgp/testdata/config_test_47b.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config>
     <global-system-config>
-        <route-distinguisher-cluster-seed>100</route-distinguisher-cluster-seed>
+        <rd-cluster-seed>100</rd-cluster-seed>
     </global-system-config>
     <routing-instance name='default-domain:default-project:ip-fabric:__default__'>
       <bgp-router name='local'>

diff --git a/src/bgp/testdata/config_test_47c.xml b/src/bgp/testdata/config_test_47c.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config>
     <global-system-config>
-        <route-distinguisher-cluster-seed>200</route-distinguisher-cluster-seed>
+        <rd-cluster-seed>200</rd-cluster-seed>
     </global-system-config>
     <routing-instance name='default-domain:default-project:ip-fabric:__default__'>
       <bgp-router name='local'>