c3fd3feba6
Fixes bug 1127664 Network cannot be created in NEC plugin when OFC network ID is unique inside a tenant. Some OFC implmenetations generate a network ID unique inside a tenant. In this case generated network IDs on can be duplicated in system-wide. To fix it, this changes resource ID on OFC to REST URI to make sure IDs on OFC globally unique. Fixes bug 1120962 Make sure NEC plugin creates shared networks In Quantum resource relationship is not limited inside a tenant. E.g., a non-owner tenant can create a port on a shared network. To deal with it the provider layer should not be aware of tenants each resource belongs to even when it has a kind of tenant concept. This commit changes ofc_manager to pass a parent resource for resource creation and identify a resouce by REST URI used to access OFC resources. It decouples Quantum resource access model from OFC resource models. OFC IDs created before this commit are also looked up. Primary keys of OFC ID mapping tables are changed to quantum_id because most of all accesses to these mapping tables are done by quantum_id. However the current version of alembic does not support changing primary keys, so new OFC ID mapping tables for tenant, network, port and packet filter are created. Dropping the previous mapping tables will be done along with the data migration logic. This commit also changes the following minor issues. - Make sure ID on ProgrammableFlow OpenFlow controller (PFC) is less than 32 chars. The current PFC accepts only 31 chars max as ID and 127 chars as a description string. - Some database accesses created their own session and did not support subtransactions. Make sure to use context.session passed from the API layer. - Removes Unused methods (update_network, update_port) in trema/pfc drivers. Change-Id: Ib4bb830e5f537c789974fa7b77f06eaeacb65333
359 lines
13 KiB
Python
359 lines
13 KiB
Python
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
|
|
# Copyright 2012 NEC Corporation. All rights reserved.
|
|
#
|
|
# 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.
|
|
# @author: Ryota MIBU
|
|
|
|
import random
|
|
import string
|
|
|
|
import mox
|
|
import unittest
|
|
|
|
from quantum import context
|
|
from quantum.openstack.common import uuidutils
|
|
from quantum.plugins.nec.common import ofc_client as ofc
|
|
from quantum.plugins.nec.db import api as ndb
|
|
from quantum.plugins.nec.db import models as nmodels
|
|
from quantum.plugins.nec import drivers
|
|
|
|
|
|
class TestConfig(object):
|
|
"""Configuration for this test"""
|
|
host = '127.0.0.1'
|
|
port = 8888
|
|
use_ssl = False
|
|
key_file = None
|
|
cert_file = None
|
|
|
|
|
|
def _ofc(id):
|
|
"""OFC ID converter"""
|
|
return "ofc-%s" % id
|
|
|
|
|
|
class PFCDriverTestBase():
|
|
|
|
driver = 'quantum.plugins.nec.drivers.pfc.PFCDriverBase'
|
|
|
|
def setUp(self):
|
|
self.mox = mox.Mox()
|
|
self.driver = drivers.get_driver(self.driver)(TestConfig)
|
|
self.mox.StubOutWithMock(ofc.OFCClient, 'do_request')
|
|
|
|
def tearDown(self):
|
|
self.mox.UnsetStubs()
|
|
|
|
def get_ofc_item_random_params(self):
|
|
"""create random parameters for ofc_item test"""
|
|
tenant_id = uuidutils.generate_uuid()
|
|
network_id = uuidutils.generate_uuid()
|
|
port_id = uuidutils.generate_uuid()
|
|
portinfo = nmodels.PortInfo(id=port_id, datapath_id="0x123456789",
|
|
port_no=1234, vlan_id=321,
|
|
mac="11:22:33:44:55:66")
|
|
return tenant_id, network_id, portinfo
|
|
|
|
def _generate_ofc_tenant_id(self, tenant_id):
|
|
fields = tenant_id.split('-')
|
|
# Strip 1st character (UUID version) of 3rd field
|
|
fields[2] = fields[2][1:]
|
|
return ''.join(fields)
|
|
|
|
def get_ofc_description(self, desc):
|
|
"""OFC description consists of [A-Za-z0-9_]."""
|
|
return desc.replace('-', '_').replace(' ', '_')
|
|
|
|
def _create_tenant(self, t, ofc_t, post_id=False, post_desc=False):
|
|
tenant_path = '/tenants/%s' % ofc_t
|
|
path = "/tenants"
|
|
description = "desc of %s" % t
|
|
body = {}
|
|
if post_desc:
|
|
ofc_description = self.get_ofc_description(description)
|
|
body['description'] = ofc_description
|
|
if post_id:
|
|
body['id'] = ofc_t
|
|
ofc.OFCClient.do_request("POST", path, body=body)
|
|
else:
|
|
ofc.OFCClient.do_request("POST", path, body=body).\
|
|
AndReturn({'id': ofc_t})
|
|
self.mox.ReplayAll()
|
|
|
|
ret = self.driver.create_tenant(description, t)
|
|
self.mox.VerifyAll()
|
|
self.assertEqual(ret, tenant_path)
|
|
|
|
def testa_create_tenant(self):
|
|
t, n, p = self.get_ofc_item_random_params()
|
|
ofc_t = self._generate_ofc_tenant_id(t)
|
|
self._create_tenant(t, ofc_t, post_id=True)
|
|
|
|
def testc_delete_tenant(self):
|
|
t, n, p = self.get_ofc_item_random_params()
|
|
|
|
path = "/tenants/%s" % _ofc(t)
|
|
ofc.OFCClient.do_request("DELETE", path)
|
|
self.mox.ReplayAll()
|
|
|
|
self.driver.delete_tenant(path)
|
|
self.mox.VerifyAll()
|
|
|
|
def testd_create_network(self):
|
|
t, n, p = self.get_ofc_item_random_params()
|
|
description = "desc of %s" % n
|
|
ofc_description = self.get_ofc_description(description)
|
|
|
|
tenant_path = "/tenants/%s" % _ofc(t)
|
|
post_path = "%s/networks" % tenant_path
|
|
body = {'description': ofc_description}
|
|
network = {'id': _ofc(n)}
|
|
ofc.OFCClient.do_request("POST", post_path, body=body).\
|
|
AndReturn(network)
|
|
self.mox.ReplayAll()
|
|
|
|
ret = self.driver.create_network(tenant_path, description, n)
|
|
self.mox.VerifyAll()
|
|
net_path = "/tenants/%s/networks/%s" % (_ofc(t), _ofc(n))
|
|
self.assertEqual(ret, net_path)
|
|
|
|
def testf_delete_network(self):
|
|
t, n, p = self.get_ofc_item_random_params()
|
|
|
|
net_path = "/tenants/%s/networks/%s" % (_ofc(t), _ofc(n))
|
|
ofc.OFCClient.do_request("DELETE", net_path)
|
|
self.mox.ReplayAll()
|
|
|
|
self.driver.delete_network(net_path)
|
|
self.mox.VerifyAll()
|
|
|
|
def testg_create_port(self):
|
|
t, n, p = self.get_ofc_item_random_params()
|
|
|
|
net_path = "/tenants/%s/networks/%s" % (_ofc(t), _ofc(n))
|
|
post_path = "%s/ports" % net_path
|
|
port_path = "/tenants/%s/networks/%s/ports/%s" % (_ofc(t), _ofc(n),
|
|
_ofc(p.id))
|
|
body = {'datapath_id': p.datapath_id,
|
|
'port': str(p.port_no),
|
|
'vid': str(p.vlan_id)}
|
|
port = {'id': _ofc(p.id)}
|
|
ofc.OFCClient.do_request("POST", post_path, body=body).AndReturn(port)
|
|
self.mox.ReplayAll()
|
|
|
|
ret = self.driver.create_port(net_path, p, p.id)
|
|
self.mox.VerifyAll()
|
|
self.assertEqual(ret, port_path)
|
|
|
|
def testh_delete_port(self):
|
|
t, n, p = self.get_ofc_item_random_params()
|
|
|
|
port_path = "/tenants/%s/networks/%s/ports/%s" % (_ofc(t), _ofc(n),
|
|
_ofc(p.id))
|
|
ofc.OFCClient.do_request("DELETE", port_path)
|
|
self.mox.ReplayAll()
|
|
|
|
self.driver.delete_port(port_path)
|
|
self.mox.VerifyAll()
|
|
|
|
|
|
class PFCDriverBaseTest(PFCDriverTestBase, unittest.TestCase):
|
|
pass
|
|
|
|
|
|
class PFCV3DriverTest(PFCDriverTestBase, unittest.TestCase):
|
|
driver = 'pfc_v3'
|
|
|
|
def testa_create_tenant(self):
|
|
t, n, p = self.get_ofc_item_random_params()
|
|
self.mox.ReplayAll()
|
|
|
|
ret = self.driver.create_tenant('dummy_desc', t)
|
|
self.mox.VerifyAll()
|
|
|
|
ofc_t_path = "/tenants/" + self._generate_ofc_tenant_id(t)
|
|
self.assertEqual(ofc_t_path, ret)
|
|
|
|
def testc_delete_tenant(self):
|
|
pass
|
|
|
|
|
|
class PFCV4DriverTest(PFCDriverTestBase, unittest.TestCase):
|
|
driver = 'pfc_v4'
|
|
|
|
|
|
class PFCDriverStringTest(unittest.TestCase):
|
|
|
|
driver = 'quantum.plugins.nec.drivers.pfc.PFCDriverBase'
|
|
|
|
def setUp(self):
|
|
self.driver = drivers.get_driver(self.driver)(TestConfig)
|
|
|
|
def tearDown(self):
|
|
pass
|
|
|
|
def test_generate_pfc_id_uuid(self):
|
|
id_str = uuidutils.generate_uuid()
|
|
exp_str = (id_str[:14] + id_str[15:]).replace('-', '')[:31]
|
|
|
|
ret_str = self.driver._generate_pfc_id(id_str)
|
|
self.assertEqual(exp_str, ret_str)
|
|
|
|
def test_generate_pfc_id_uuid_no_hyphen(self):
|
|
# Keystone tenant_id style uuid
|
|
id_str = uuidutils.generate_uuid()
|
|
id_no_hyphen = id_str.replace('-', '')
|
|
exp_str = (id_str[:14] + id_str[15:]).replace('-', '')[:31]
|
|
|
|
ret_str = self.driver._generate_pfc_id(id_no_hyphen)
|
|
self.assertEqual(exp_str, ret_str)
|
|
|
|
def test_generate_pfc_id_string(self):
|
|
id_str = uuidutils.generate_uuid() + 'x'
|
|
exp_str = id_str[:31].replace('-', '_')
|
|
|
|
ret_str = self.driver._generate_pfc_id(id_str)
|
|
self.assertEqual(exp_str, ret_str)
|
|
|
|
def test_generate_pfc_desc(self):
|
|
random_list = [random.choice(string.printable) for x in range(128)]
|
|
random_str = ''.join(random_list)
|
|
|
|
accept_letters = string.letters + string.digits
|
|
exp_list = [x if x in accept_letters else '_' for x in random_list]
|
|
exp_str = ''.join(exp_list)[:127]
|
|
|
|
ret_str = self.driver._generate_pfc_description(random_str)
|
|
self.assertEqual(exp_str, ret_str)
|
|
|
|
|
|
class PFCIdConvertTest(unittest.TestCase):
|
|
driver = 'quantum.plugins.nec.drivers.pfc.PFCDriverBase'
|
|
|
|
def setUp(self):
|
|
self.mox = mox.Mox()
|
|
self.driver = drivers.get_driver(self.driver)(TestConfig)
|
|
self.ctx = self.mox.CreateMock(context.Context)
|
|
self.ctx.session = "session"
|
|
self.mox.StubOutWithMock(ndb, 'get_ofc_id_lookup_both')
|
|
|
|
def tearDown(self):
|
|
self.mox.UnsetStubs()
|
|
|
|
def generate_random_ids(self, count=1):
|
|
if count == 1:
|
|
return uuidutils.generate_uuid()
|
|
else:
|
|
return [uuidutils.generate_uuid() for _ in xrange(count)]
|
|
|
|
def test_convert_tenant_id(self):
|
|
ofc_t_id = self.generate_random_ids(1)
|
|
print ofc_t_id
|
|
ret = self.driver.convert_ofc_tenant_id(self.ctx, ofc_t_id)
|
|
self.assertEqual(ret, '/tenants/%s' % ofc_t_id)
|
|
|
|
def test_convert_tenant_id_noconv(self):
|
|
ofc_t_id = '/tenants/%s' % self.generate_random_ids(1)
|
|
ret = self.driver.convert_ofc_tenant_id(self.ctx, ofc_t_id)
|
|
self.assertEqual(ret, ofc_t_id)
|
|
|
|
def test_convert_network_id(self):
|
|
t_id, ofc_t_id, ofc_n_id = self.generate_random_ids(3)
|
|
ndb.get_ofc_id_lookup_both(
|
|
self.ctx.session, 'ofc_tenant', t_id).AndReturn(ofc_t_id)
|
|
self.mox.ReplayAll()
|
|
|
|
ret = self.driver.convert_ofc_network_id(self.ctx, ofc_n_id, t_id)
|
|
self.assertEqual(ret, ('/tenants/%(tenant)s/networks/%(network)s' %
|
|
{'tenant': ofc_t_id, 'network': ofc_n_id}))
|
|
self.mox.VerifyAll()
|
|
|
|
def test_convert_network_id_with_new_tenant_id(self):
|
|
t_id, ofc_t_id, ofc_n_id = self.generate_random_ids(3)
|
|
ofc_t_path = '/tenants/%s' % ofc_t_id
|
|
ndb.get_ofc_id_lookup_both(
|
|
self.ctx.session, 'ofc_tenant', t_id).AndReturn(ofc_t_path)
|
|
self.mox.ReplayAll()
|
|
|
|
ret = self.driver.convert_ofc_network_id(self.ctx, ofc_n_id, t_id)
|
|
self.assertEqual(ret, ('/tenants/%(tenant)s/networks/%(network)s' %
|
|
{'tenant': ofc_t_id, 'network': ofc_n_id}))
|
|
self.mox.VerifyAll()
|
|
|
|
def test_convert_network_id_noconv(self):
|
|
t_id = 'dummy'
|
|
ofc_t_id, ofc_n_id = self.generate_random_ids(2)
|
|
ofc_n_id = ('/tenants/%(tenant)s/networks/%(network)s' %
|
|
{'tenant': ofc_t_id, 'network': ofc_n_id})
|
|
ret = self.driver.convert_ofc_network_id(self.ctx, ofc_n_id, t_id)
|
|
self.assertEqual(ret, ofc_n_id)
|
|
|
|
def test_convert_port_id(self):
|
|
t_id, n_id = self.generate_random_ids(2)
|
|
ofc_t_id, ofc_n_id, ofc_p_id = self.generate_random_ids(3)
|
|
|
|
ndb.get_ofc_id_lookup_both(
|
|
self.ctx.session, 'ofc_network', n_id).AndReturn(ofc_n_id)
|
|
ndb.get_ofc_id_lookup_both(
|
|
self.ctx.session, 'ofc_tenant', t_id).AndReturn(ofc_t_id)
|
|
self.mox.ReplayAll()
|
|
|
|
ret = self.driver.convert_ofc_port_id(self.ctx, ofc_p_id, t_id, n_id)
|
|
exp = ('/tenants/%(tenant)s/networks/%(network)s/ports/%(port)s' %
|
|
{'tenant': ofc_t_id, 'network': ofc_n_id, 'port': ofc_p_id})
|
|
self.assertEqual(ret, exp)
|
|
self.mox.VerifyAll()
|
|
|
|
def test_convert_port_id_with_new_tenant_id(self):
|
|
t_id, n_id = self.generate_random_ids(2)
|
|
ofc_t_id, ofc_n_id, ofc_p_id = self.generate_random_ids(3)
|
|
|
|
ofc_t_path = '/tenants/%s' % ofc_t_id
|
|
ndb.get_ofc_id_lookup_both(
|
|
self.ctx.session, 'ofc_network', n_id).AndReturn(ofc_n_id)
|
|
ndb.get_ofc_id_lookup_both(
|
|
self.ctx.session, 'ofc_tenant', t_id).AndReturn(ofc_t_path)
|
|
self.mox.ReplayAll()
|
|
|
|
ret = self.driver.convert_ofc_port_id(self.ctx, ofc_p_id, t_id, n_id)
|
|
exp = ('/tenants/%(tenant)s/networks/%(network)s/ports/%(port)s' %
|
|
{'tenant': ofc_t_id, 'network': ofc_n_id, 'port': ofc_p_id})
|
|
self.assertEqual(ret, exp)
|
|
self.mox.VerifyAll()
|
|
|
|
def test_convert_port_id_with_new_network_id(self):
|
|
t_id, n_id = self.generate_random_ids(2)
|
|
ofc_t_id, ofc_n_id, ofc_p_id = self.generate_random_ids(3)
|
|
|
|
ofc_n_path = ('/tenants/%(tenant)s/networks/%(network)s' %
|
|
{'tenant': ofc_t_id, 'network': ofc_n_id})
|
|
ndb.get_ofc_id_lookup_both(
|
|
self.ctx.session, 'ofc_network', n_id).AndReturn(ofc_n_path)
|
|
self.mox.ReplayAll()
|
|
|
|
ret = self.driver.convert_ofc_port_id(self.ctx, ofc_p_id, t_id, n_id)
|
|
exp = ('/tenants/%(tenant)s/networks/%(network)s/ports/%(port)s' %
|
|
{'tenant': ofc_t_id, 'network': ofc_n_id, 'port': ofc_p_id})
|
|
self.assertEqual(ret, exp)
|
|
self.mox.VerifyAll()
|
|
|
|
def test_convert_port_id_noconv(self):
|
|
t_id = n_id = 'dummy'
|
|
ofc_t_id, ofc_n_id, ofc_p_id = self.generate_random_ids(3)
|
|
ofc_p_id = ('/tenants/%(tenant)s/networs/%(network)s/ports/%(port)s'
|
|
% {'tenant': ofc_t_id, 'network': ofc_n_id,
|
|
'port': ofc_p_id})
|
|
ret = self.driver.convert_ofc_port_id(self.ctx, ofc_p_id, t_id, n_id)
|
|
self.assertEqual(ret, ofc_p_id)
|