rpc cleanup

- clean up RPC function names
- rewrite gobgp command to use the api instead of config package
- delete unused client package

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>

1 files changed, 9 insertions, 9 deletions

diff --git a/test/scenario_test/aspath_test.py b/test/scenario_test/aspath_test.py
index 25518bfa..d6349efe 100644
--- a/test/scenario_test/aspath_test.py
+++ b/test/scenario_test/aspath_test.py
@@ -73,12 +73,12 @@ class GoBGPTestBase(unittest.TestCase):
 
     def test_02_check_reject_as_loop(self):
         def f():
-            adj = self.g2.get_neighbor(self.q1)['state']['adj-table']
-            self.assertTrue('received' in adj)
-            self.assertEqual(adj['received'], 1)
+            s = self.g2.get_neighbor(self.q1)['state']
+            self.assertTrue('received' in s)
+            self.assertEqual(s.get('received', 0), 1)
             # hacky. 'accepted' is zero so the key was deleted due to
             # omitempty tag in bgp_configs.go.
-            self.assertFalse('accepted' in adj)
+            self.assertFalse('accepted' in s)
 
         assert_several_times(f)
 
@@ -89,11 +89,11 @@ class GoBGPTestBase(unittest.TestCase):
 
     def test_04_check_accept_as_loop(self):
         def f():
-            adj = self.g2.get_neighbor(self.q1)['state']['adj-table']
-            self.assertTrue('received' in adj)
-            self.assertEqual(adj['received'], 1)
-            self.assertTrue('accepted' in adj)
-            self.assertEqual(adj['accepted'], 1)
+            s = self.g2.get_neighbor(self.q1)['state']
+            self.assertTrue('received' in s)
+            self.assertEqual(s.get('received', 0), 1)
+            self.assertTrue('accepted' in s)
+            self.assertEqual(s.get('accepted', 0), 1)
 
         assert_several_times(f)