64eba422ff
The change also implements blueprint agent-logging (this was due to the fact that the existing logging in the agents did not work with the change) Devstack support for the above is in https://review.openstack.org/10267 Notes: - The service and agent can be run with multiple configuration files by using the CLI parameters --config-file <filename> - The agent now makes use of the logging and debugging flags defined in quantum.conf. This follows the standard common configuration command line rules. Change-Id: I3bd7701526a950c360d7c2cf14b31045010b46ca
290 lines
11 KiB
Python
290 lines
11 KiB
Python
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
#
|
|
# Copyright 2012, Cisco Systems, Inc.
|
|
#
|
|
# 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: Rohit Agarwalla, Cisco Systems, Inc.
|
|
|
|
"""
|
|
test_database.py is an independent test suite
|
|
that tests the database api method calls
|
|
"""
|
|
|
|
import logging
|
|
import unittest2 as unittest
|
|
|
|
import quantum.db.api as db
|
|
from quantum.openstack.common import cfg
|
|
import quantum.plugins.linuxbridge.common.exceptions as c_exc
|
|
import quantum.plugins.linuxbridge.db.l2network_db as l2network_db
|
|
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
|
|
|
|
class L2networkDB(object):
|
|
|
|
"""Class conisting of methods to call L2network db methods"""
|
|
def get_all_vlan_bindings(self):
|
|
"""Get all vlan binding into a list of dict"""
|
|
vlans = []
|
|
try:
|
|
for vlan_bind in l2network_db.get_all_vlan_bindings():
|
|
LOG.debug("Getting vlan bindings for vlan: %s" %
|
|
vlan_bind.vlan_id)
|
|
vlan_dict = {}
|
|
vlan_dict["vlan-id"] = str(vlan_bind.vlan_id)
|
|
vlan_dict["net-id"] = str(vlan_bind.network_id)
|
|
vlans.append(vlan_dict)
|
|
except Exception, exc:
|
|
LOG.error("Failed to get all vlan bindings: %s" % str(exc))
|
|
return vlans
|
|
|
|
def get_vlan_binding(self, network_id):
|
|
"""Get a vlan binding"""
|
|
vlan = []
|
|
try:
|
|
for vlan_bind in l2network_db.get_vlan_binding(network_id):
|
|
LOG.debug("Getting vlan binding for vlan: %s" %
|
|
vlan_bind.vlan_id)
|
|
vlan_dict = {}
|
|
vlan_dict["vlan-id"] = str(vlan_bind.vlan_id)
|
|
vlan_dict["net-id"] = str(vlan_bind.network_id)
|
|
vlan.append(vlan_dict)
|
|
except Exception, exc:
|
|
LOG.error("Failed to get vlan binding: %s" % str(exc))
|
|
return vlan
|
|
|
|
def create_vlan_binding(self, vlan_id, network_id):
|
|
"""Create a vlan binding"""
|
|
vlan_dict = {}
|
|
try:
|
|
res = l2network_db.add_vlan_binding(vlan_id, network_id)
|
|
LOG.debug("Created vlan binding for vlan: %s" % res.vlan_id)
|
|
vlan_dict["vlan-id"] = str(res.vlan_id)
|
|
vlan_dict["net-id"] = str(res.network_id)
|
|
return vlan_dict
|
|
except Exception, exc:
|
|
LOG.error("Failed to create vlan binding: %s" % str(exc))
|
|
|
|
def delete_vlan_binding(self, network_id):
|
|
"""Delete a vlan binding"""
|
|
try:
|
|
res = l2network_db.remove_vlan_binding(network_id)
|
|
LOG.debug("Deleted vlan binding for vlan: %s" % res.vlan_id)
|
|
vlan_dict = {}
|
|
vlan_dict["vlan-id"] = str(res.vlan_id)
|
|
return vlan_dict
|
|
except Exception, exc:
|
|
raise Exception("Failed to delete vlan binding: %s" % str(exc))
|
|
|
|
def update_vlan_binding(self, network_id, vlan_id):
|
|
"""Update a vlan binding"""
|
|
try:
|
|
res = l2network_db.update_vlan_binding(network_id, vlan_id)
|
|
LOG.debug("Updating vlan binding for vlan: %s" % res.vlan_id)
|
|
vlan_dict = {}
|
|
vlan_dict["vlan-id"] = str(res.vlan_id)
|
|
vlan_dict["net-id"] = str(res.network_id)
|
|
return vlan_dict
|
|
except Exception, exc:
|
|
raise Exception("Failed to update vlan binding: %s" % str(exc))
|
|
|
|
|
|
class QuantumDB(object):
|
|
"""Class conisting of methods to call Quantum db methods"""
|
|
def get_all_networks(self, tenant_id):
|
|
"""Get all networks"""
|
|
nets = []
|
|
try:
|
|
for net in db.network_list(tenant_id):
|
|
LOG.debug("Getting network: %s" % net.uuid)
|
|
net_dict = {}
|
|
net_dict["tenant-id"] = net.tenant_id
|
|
net_dict["net-id"] = str(net.uuid)
|
|
net_dict["net-name"] = net.name
|
|
nets.append(net_dict)
|
|
except Exception, exc:
|
|
LOG.error("Failed to get all networks: %s" % str(exc))
|
|
return nets
|
|
|
|
def create_network(self, tenant_id, net_name):
|
|
"""Create a network"""
|
|
net_dict = {}
|
|
try:
|
|
res = db.network_create(tenant_id,
|
|
net_name,
|
|
op_status="UP")
|
|
LOG.debug("Created network: %s" % res.uuid)
|
|
net_dict["tenant-id"] = res.tenant_id
|
|
net_dict["net-id"] = str(res.uuid)
|
|
net_dict["net-name"] = res.name
|
|
return net_dict
|
|
except Exception, exc:
|
|
LOG.error("Failed to create network: %s" % str(exc))
|
|
|
|
def delete_network(self, net_id):
|
|
"""Delete a network"""
|
|
try:
|
|
net = db.network_destroy(net_id)
|
|
LOG.debug("Deleted network: %s" % net.uuid)
|
|
net_dict = {}
|
|
net_dict["net-id"] = str(net.uuid)
|
|
return net_dict
|
|
except Exception, exc:
|
|
raise Exception("Failed to delete port: %s" % str(exc))
|
|
|
|
|
|
class L2networkDBTest(unittest.TestCase):
|
|
"""Class conisting of L2network DB unit tests"""
|
|
def setUp(self):
|
|
"""Setup for tests"""
|
|
l2network_db.initialize()
|
|
l2network_db.create_vlanids()
|
|
self.dbtest = L2networkDB()
|
|
self.quantum = QuantumDB()
|
|
LOG.debug("Setup")
|
|
|
|
def tearDown(self):
|
|
"""Tear Down"""
|
|
db.clear_db()
|
|
|
|
def test_create_vlanbinding(self):
|
|
net1 = self.quantum.create_network("t1", "netid1")
|
|
vlan1 = self.dbtest.create_vlan_binding(10, net1["net-id"])
|
|
self.assertTrue(vlan1["vlan-id"] == "10")
|
|
self.teardown_vlanbinding()
|
|
self.teardown_network()
|
|
|
|
def test_getall_vlanbindings(self):
|
|
net1 = self.quantum.create_network("t1", "netid1")
|
|
net2 = self.quantum.create_network("t1", "netid2")
|
|
vlan1 = self.dbtest.create_vlan_binding(10, net1["net-id"])
|
|
self.assertTrue(vlan1["vlan-id"] == "10")
|
|
vlan2 = self.dbtest.create_vlan_binding(20, net2["net-id"])
|
|
self.assertTrue(vlan2["vlan-id"] == "20")
|
|
vlans = self.dbtest.get_all_vlan_bindings()
|
|
self.assertTrue(len(vlans) == 2)
|
|
self.teardown_vlanbinding()
|
|
self.teardown_network()
|
|
|
|
def test_delete_vlanbinding(self):
|
|
net1 = self.quantum.create_network("t1", "netid1")
|
|
vlan1 = self.dbtest.create_vlan_binding(10, net1["net-id"])
|
|
self.assertTrue(vlan1["vlan-id"] == "10")
|
|
self.dbtest.delete_vlan_binding(net1["net-id"])
|
|
vlans = self.dbtest.get_all_vlan_bindings()
|
|
count = 0
|
|
for vlan in vlans:
|
|
if vlan["vlan-id"] is "10":
|
|
count += 1
|
|
self.assertTrue(count == 0)
|
|
self.teardown_vlanbinding()
|
|
self.teardown_network()
|
|
|
|
def test_update_vlanbinding(self):
|
|
net1 = self.quantum.create_network("t1", "netid1")
|
|
vlan1 = self.dbtest.create_vlan_binding(10, net1["net-id"])
|
|
self.assertTrue(vlan1["vlan-id"] == "10")
|
|
vlan1 = self.dbtest.update_vlan_binding(net1["net-id"], 11)
|
|
self.assertTrue(vlan1["vlan-id"] == "11")
|
|
self.teardown_vlanbinding()
|
|
self.teardown_network()
|
|
|
|
def test_vlanids(self):
|
|
l2network_db.create_vlanids()
|
|
vlanids = l2network_db.get_all_vlanids()
|
|
self.assertGreater(len(vlanids), 0)
|
|
vlanid = l2network_db.reserve_vlanid()
|
|
used = l2network_db.is_vlanid_used(vlanid)
|
|
self.assertTrue(used)
|
|
used = l2network_db.release_vlanid(vlanid)
|
|
self.assertFalse(used)
|
|
self.teardown_vlanbinding()
|
|
self.teardown_network()
|
|
|
|
def test_specific_vlanid_outside(self):
|
|
l2network_db.create_vlanids()
|
|
orig_count = len(l2network_db.get_all_vlanids())
|
|
self.assertGreater(orig_count, 0)
|
|
vlan_id = 7 # outside range dynamically allocated
|
|
with self.assertRaises(c_exc.VlanIDNotFound):
|
|
l2network_db.is_vlanid_used(vlan_id)
|
|
l2network_db.reserve_specific_vlanid(vlan_id, "net-id")
|
|
self.assertTrue(l2network_db.is_vlanid_used(vlan_id))
|
|
count = len(l2network_db.get_all_vlanids())
|
|
self.assertEqual(count, orig_count + 1)
|
|
used = l2network_db.release_vlanid(vlan_id)
|
|
self.assertFalse(used)
|
|
with self.assertRaises(c_exc.VlanIDNotFound):
|
|
l2network_db.is_vlanid_used(vlan_id)
|
|
count = len(l2network_db.get_all_vlanids())
|
|
self.assertEqual(count, orig_count)
|
|
self.teardown_vlanbinding()
|
|
self.teardown_network()
|
|
|
|
def test_specific_vlanid_inside(self):
|
|
l2network_db.create_vlanids()
|
|
orig_count = len(l2network_db.get_all_vlanids())
|
|
self.assertGreater(orig_count, 0)
|
|
vlan_id = 1007 # inside range dynamically allocated
|
|
self.assertFalse(l2network_db.is_vlanid_used(vlan_id))
|
|
l2network_db.reserve_specific_vlanid(vlan_id, "net-id")
|
|
self.assertTrue(l2network_db.is_vlanid_used(vlan_id))
|
|
count = len(l2network_db.get_all_vlanids())
|
|
self.assertEqual(count, orig_count)
|
|
used = l2network_db.release_vlanid(vlan_id)
|
|
self.assertFalse(used)
|
|
self.assertFalse(l2network_db.is_vlanid_used(vlan_id))
|
|
count = len(l2network_db.get_all_vlanids())
|
|
self.assertEqual(count, orig_count)
|
|
self.teardown_vlanbinding()
|
|
self.teardown_network()
|
|
|
|
def teardown_network(self):
|
|
"""tearDown Network table"""
|
|
LOG.debug("Tearing Down Network")
|
|
nets = self.quantum.get_all_networks("t1")
|
|
for net in nets:
|
|
netid = net["net-id"]
|
|
self.quantum.delete_network(netid)
|
|
|
|
def teardown_vlanbinding(self):
|
|
"""tearDown VlanBinding table"""
|
|
LOG.debug("Tearing Down Vlan Binding")
|
|
vlans = self.dbtest.get_all_vlan_bindings()
|
|
for vlan in vlans:
|
|
netid = vlan["net-id"]
|
|
self.dbtest.delete_vlan_binding(netid)
|
|
|
|
|
|
class ConfigurationTest(unittest.TestCase):
|
|
|
|
def test_defaults(self):
|
|
self.assertEqual('sqlite://',
|
|
cfg.CONF.DATABASE.sql_connection)
|
|
self.assertEqual(-1,
|
|
cfg.CONF.DATABASE.sql_max_retries)
|
|
self.assertEqual(2,
|
|
cfg.CONF.DATABASE.reconnect_interval)
|
|
self.assertEqual(2,
|
|
cfg.CONF.AGENT.polling_interval)
|
|
self.assertEqual('sudo',
|
|
cfg.CONF.AGENT.root_helper)
|
|
self.assertEqual(1000,
|
|
cfg.CONF.VLANS.vlan_start)
|
|
self.assertEqual(3000,
|
|
cfg.CONF.VLANS.vlan_end)
|
|
self.assertEqual('eth1',
|
|
cfg.CONF.LINUX_BRIDGE.physical_interface)
|