mirror of
https://opendev.org/openstack/python-openstackclient.git
synced 2026-01-16 23:13:05 +00:00
dba57c85d5
Add commands to osc to call the two new API methods introduced by new Neutron extension: extraroute-atomic. Bump our openstacksdk requirement to >=0.38.0 which contains the corresponding sdk change. The lower-constraints of dogpile.cache and keystoneauth1 are bumped because of requirements bumps in openstacksdk. The lower-constraint of decorator is bumped because of problem already fixed by amotoki here: https://review.opendev.org/701706 Change-Id: Ia9b9c216f1d1161ebedac31594a2c464d77f4ae2 Depends-On: https://review.opendev.org/674324 Partial-Bug: #1826396 (rfe) Related-Change: https://review.opendev.org/655680 (spec)
306 lines
9.6 KiB
Python
306 lines
9.6 KiB
Python
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import json
|
|
import uuid
|
|
|
|
from openstackclient.tests.functional.network.v2 import common
|
|
|
|
|
|
class RouterTests(common.NetworkTagTests):
|
|
"""Functional tests for router"""
|
|
|
|
base_command = 'router'
|
|
|
|
def setUp(self):
|
|
super(RouterTests, self).setUp()
|
|
# Nothing in this class works with Nova Network
|
|
if not self.haz_network:
|
|
self.skipTest("No Network service present")
|
|
|
|
def test_router_create_and_delete(self):
|
|
"""Test create options, delete multiple"""
|
|
name1 = uuid.uuid4().hex
|
|
name2 = uuid.uuid4().hex
|
|
cmd_output = json.loads(self.openstack(
|
|
'router create -f json ' +
|
|
name1
|
|
))
|
|
self.assertEqual(
|
|
name1,
|
|
cmd_output["name"],
|
|
)
|
|
cmd_output = json.loads(self.openstack(
|
|
'router create -f json ' +
|
|
name2
|
|
))
|
|
self.assertEqual(
|
|
name2,
|
|
cmd_output["name"],
|
|
)
|
|
|
|
del_output = self.openstack(
|
|
'router delete ' + name1 + ' ' + name2)
|
|
self.assertOutput('', del_output)
|
|
|
|
def test_router_list(self):
|
|
"""Test create, list filter"""
|
|
# Get project IDs
|
|
cmd_output = json.loads(self.openstack('token issue -f json '))
|
|
auth_project_id = cmd_output['project_id']
|
|
|
|
cmd_output = json.loads(self.openstack('project list -f json '))
|
|
admin_project_id = None
|
|
demo_project_id = None
|
|
for p in cmd_output:
|
|
if p['Name'] == 'admin':
|
|
admin_project_id = p['ID']
|
|
if p['Name'] == 'demo':
|
|
demo_project_id = p['ID']
|
|
|
|
# Verify assumptions:
|
|
# * admin and demo projects are present
|
|
# * demo and admin are distinct projects
|
|
# * tests run as admin
|
|
self.assertIsNotNone(admin_project_id)
|
|
self.assertIsNotNone(demo_project_id)
|
|
self.assertNotEqual(admin_project_id, demo_project_id)
|
|
self.assertEqual(admin_project_id, auth_project_id)
|
|
|
|
name1 = uuid.uuid4().hex
|
|
name2 = uuid.uuid4().hex
|
|
cmd_output = json.loads(self.openstack(
|
|
'router create -f json ' +
|
|
'--disable ' +
|
|
name1
|
|
))
|
|
|
|
self.addCleanup(self.openstack, 'router delete ' + name1)
|
|
self.assertEqual(
|
|
name1,
|
|
cmd_output["name"],
|
|
)
|
|
self.assertEqual(
|
|
False,
|
|
cmd_output["admin_state_up"],
|
|
)
|
|
self.assertEqual(
|
|
admin_project_id,
|
|
cmd_output["project_id"],
|
|
)
|
|
cmd_output = json.loads(self.openstack(
|
|
'router create -f json ' +
|
|
'--project ' + demo_project_id +
|
|
' ' + name2
|
|
))
|
|
|
|
self.addCleanup(self.openstack, 'router delete ' + name2)
|
|
self.assertEqual(
|
|
name2,
|
|
cmd_output["name"],
|
|
)
|
|
self.assertEqual(
|
|
True,
|
|
cmd_output["admin_state_up"],
|
|
)
|
|
self.assertEqual(
|
|
demo_project_id,
|
|
cmd_output["project_id"],
|
|
)
|
|
|
|
# Test list --project
|
|
cmd_output = json.loads(self.openstack(
|
|
'router list -f json ' +
|
|
'--project ' + demo_project_id
|
|
))
|
|
names = [x["Name"] for x in cmd_output]
|
|
self.assertNotIn(name1, names)
|
|
self.assertIn(name2, names)
|
|
|
|
# Test list --disable
|
|
cmd_output = json.loads(self.openstack(
|
|
'router list -f json ' +
|
|
'--disable '
|
|
))
|
|
names = [x["Name"] for x in cmd_output]
|
|
self.assertIn(name1, names)
|
|
self.assertNotIn(name2, names)
|
|
|
|
# Test list --name
|
|
cmd_output = json.loads(self.openstack(
|
|
'router list -f json ' +
|
|
'--name ' + name1
|
|
))
|
|
names = [x["Name"] for x in cmd_output]
|
|
self.assertIn(name1, names)
|
|
self.assertNotIn(name2, names)
|
|
|
|
# Test list --long
|
|
cmd_output = json.loads(self.openstack(
|
|
'router list -f json ' +
|
|
'--long '
|
|
))
|
|
names = [x["Name"] for x in cmd_output]
|
|
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"""
|
|
|
|
name = uuid.uuid4().hex
|
|
new_name = name + "_"
|
|
cmd_output = json.loads(self.openstack(
|
|
'router create -f json ' +
|
|
'--description aaaa ' +
|
|
name
|
|
))
|
|
self.addCleanup(self.openstack, 'router delete ' + new_name)
|
|
self.assertEqual(
|
|
name,
|
|
cmd_output["name"],
|
|
)
|
|
self.assertEqual(
|
|
'aaaa',
|
|
cmd_output["description"],
|
|
)
|
|
|
|
# Test set --disable
|
|
cmd_output = self.openstack(
|
|
'router set ' +
|
|
'--name ' + new_name +
|
|
' --description bbbb ' +
|
|
'--disable ' +
|
|
name
|
|
)
|
|
self.assertOutput('', cmd_output)
|
|
|
|
cmd_output = json.loads(self.openstack(
|
|
'router show -f json ' +
|
|
new_name
|
|
))
|
|
self.assertEqual(
|
|
new_name,
|
|
cmd_output["name"],
|
|
)
|
|
self.assertEqual(
|
|
'bbbb',
|
|
cmd_output["description"],
|
|
)
|
|
self.assertEqual(
|
|
False,
|
|
cmd_output["admin_state_up"],
|
|
)
|
|
|
|
# Test set --ha --distributed
|
|
cmd_output = self.openstack(
|
|
'router set ' +
|
|
'--distributed ' +
|
|
'--external-gateway public ' +
|
|
new_name
|
|
)
|
|
self.assertOutput('', cmd_output)
|
|
|
|
cmd_output = json.loads(self.openstack(
|
|
'router show -f json ' +
|
|
new_name
|
|
))
|
|
self.assertTrue(cmd_output["distributed"])
|
|
self.assertIsNotNone(cmd_output["external_gateway_info"])
|
|
|
|
# Test unset
|
|
cmd_output = self.openstack(
|
|
'router unset ' +
|
|
'--external-gateway ' +
|
|
new_name
|
|
)
|
|
cmd_output = json.loads(self.openstack(
|
|
'router show -f json ' +
|
|
new_name
|
|
))
|
|
self.assertIsNone(cmd_output["external_gateway_info"])
|
|
|
|
def test_router_add_remove_route(self):
|
|
network_name = uuid.uuid4().hex
|
|
subnet_name = uuid.uuid4().hex
|
|
router_name = uuid.uuid4().hex
|
|
|
|
self.openstack('network create %s' % network_name)
|
|
self.addCleanup(self.openstack, 'network delete %s' % network_name)
|
|
|
|
self.openstack(
|
|
'subnet create %s '
|
|
'--network %s --subnet-range 10.0.0.0/24' % (
|
|
subnet_name, network_name))
|
|
|
|
self.openstack('router create %s' % router_name)
|
|
self.addCleanup(self.openstack, 'router delete %s' % router_name)
|
|
|
|
self.openstack('router add subnet %s %s' % (router_name, subnet_name))
|
|
self.addCleanup(self.openstack, 'router remove subnet %s %s' % (
|
|
router_name, subnet_name))
|
|
|
|
out1 = json.loads(self.openstack(
|
|
'router add route -f json %s '
|
|
'--route destination=10.0.10.0/24,gateway=10.0.0.10' %
|
|
router_name)),
|
|
self.assertEqual(1, len(out1[0]['routes']))
|
|
|
|
self.addCleanup(
|
|
self.openstack, 'router set %s --no-route' % router_name)
|
|
|
|
out2 = json.loads(self.openstack(
|
|
'router add route -f json %s '
|
|
'--route destination=10.0.10.0/24,gateway=10.0.0.10 '
|
|
'--route destination=10.0.11.0/24,gateway=10.0.0.11' %
|
|
router_name)),
|
|
self.assertEqual(2, len(out2[0]['routes']))
|
|
|
|
out3 = json.loads(self.openstack(
|
|
'router remove route -f json %s '
|
|
'--route destination=10.0.11.0/24,gateway=10.0.0.11 '
|
|
'--route destination=10.0.12.0/24,gateway=10.0.0.12' %
|
|
router_name)),
|
|
self.assertEqual(1, len(out3[0]['routes']))
|