Merge "Network L3 Router Commands for OSC"

2 files changed, 70 insertions, 0 deletions

diff --git a/openstackclient/tests/functional/network/v2/test_network_agent.py b/openstackclient/tests/functional/network/v2/test_network_agent.py
index 16487955..0c74ea1d 100644
--- a/openstackclient/tests/functional/network/v2/test_network_agent.py
+++ b/openstackclient/tests/functional/network/v2/test_network_agent.py
@@ -137,3 +137,39 @@ class NetworkAgentListTests(common.NetworkTests):
         self.assertIn(
             agent_id, col_name
         )
+
+    def test_network_agent_list_routers(self):
+        """Add agent to router, list agents on router, delete."""
+        name = uuid.uuid4().hex
+        cmd_output = json.loads(self.openstack(
+            'router create -f json ' + name))
+
+        self.addCleanup(self.openstack, 'router delete ' + name)
+        # Get router ID
+        router_id = cmd_output['id']
+        # Get l3 agent id
+        cmd_output = json.loads(self.openstack(
+            'network agent list -f json --agent-type l3'))
+
+        # Check at least one L3 agent is included in the response.
+        self.assertTrue(cmd_output)
+        agent_id = cmd_output[0]['ID']
+
+        # Add router to agent
+        self.openstack(
+            'network agent add router --l3 ' + agent_id + ' ' + router_id)
+
+        # Test router list --agent
+        cmd_output = json.loads(self.openstack(
+            'network agent list -f json --router ' + router_id))
+
+        agent_ids = [x['ID'] for x in cmd_output]
+        self.assertIn(agent_id, agent_ids)
+
+        # Remove router from agent
+        self.openstack(
+            'network agent remove router --l3 ' + agent_id + ' ' + router_id)
+        cmd_output = json.loads(self.openstack(
+            'network agent list -f json --router ' + router_id))
+        agent_ids = [x['ID'] for x in cmd_output]
+        self.assertNotIn(agent_id, agent_ids)
diff --git a/openstackclient/tests/functional/network/v2/test_router.py b/openstackclient/tests/functional/network/v2/test_router.py
index 313feefc..2e5cb5ef 100644
--- a/openstackclient/tests/functional/network/v2/test_router.py
+++ b/openstackclient/tests/functional/network/v2/test_router.py
@@ -151,6 +151,40 @@ class RouterTests(common.NetworkTests):
         self.assertIn(name1, names)
         self.assertIn(name2, names)
 
+    def test_router_list_l3_agent(self):
+        """Tests create router, add l3 agent, list, delete"""
+        name = uuid.uuid4().hex
+        cmd_output = json.loads(self.openstack(
+            'router create -f json ' + name))
+
+        self.addCleanup(self.openstack, 'router delete ' + name)
+        # Get router ID
+        router_id = cmd_output['id']
+        # Get l3 agent id
+        cmd_output = json.loads(self.openstack(
+            'network agent list -f json --agent-type l3'))
+
+        # Check at least one L3 agent is included in the response.
+        self.assertTrue(cmd_output)
+        agent_id = cmd_output[0]['ID']
+
+        # Add router to agent
+        self.openstack(
+            'network agent add router --l3 ' + agent_id + ' ' + router_id)
+
+        cmd_output = json.loads(self.openstack(
+            'router list -f json --agent ' + agent_id))
+        router_ids = [x['ID'] for x in cmd_output]
+        self.assertIn(router_id, router_ids)
+
+        # Remove router from agent
+        self.openstack(
+            'network agent remove router --l3 ' + agent_id + ' ' + router_id)
+        cmd_output = json.loads(self.openstack(
+            'router list -f json --agent ' + agent_id))
+        router_ids = [x['ID'] for x in cmd_output]
+        self.assertNotIn(router_id, router_ids)
+
     def test_router_set_show_unset(self):
         """Tests create router, set, unset, show"""