remove unneeded tests from ovs_quantum_plugin

diff --git a/quantum/api/faults.py b/quantum/api/faults.py
index 52b36109d7d2dcc3f99a8e8f5616ada74f9a339e..670ef9f89966062a50f3b6e47fdb345d84dd5f8c 100644 (file)
--- a/quantum/api/faults.py
+++ b/quantum/api/faults.py
@@ -91,6 +91,7 @@ class NetworkInUse(webob.exc.HTTPClientError):
     title = 'Network in Use'
     explanation = ('Unable to remove the network: attachments still plugged.')
 
+
 class NetworkNameExists(webob.exc.HTTPClientError):
     """
     subclass of :class:`~HTTPClientError`

diff --git a/quantum/common/exceptions.py b/quantum/common/exceptions.py
index b9705fb75ac91468cad6d50e0968eb26728920bf..478ddd551bf9226ecf850edb791913ef7002979d 100644 (file)
--- a/quantum/common/exceptions.py
+++ b/quantum/common/exceptions.py
@@ -21,6 +21,9 @@ Quantum-type exceptions. SHOULD include dedicated exception logging.
 """
 
 import logging
+import gettext
+
+gettext.install('quantum', unicode=1)
 
 
 class QuantumException(Exception):
@@ -107,6 +110,7 @@ class AlreadyAttached(QuantumException):
                 "%(port_id)s for network %(net_id)s. The attachment is " \
                 "already plugged into port %(att_port_id)s")
 
+
 class NetworkNameExists(QuantumException):
     message = _("Unable to set network name to %(net_name). " \
                 "Network with id %(net_id) already has this name for " \

diff --git a/quantum/db/api.py b/quantum/db/api.py
index 5711a47ddeb47b61ea13bbfdcb2e48dc19934fad..75f09e36d7e9c3ffb71d297c79044e5907f45015 100644 (file)
--- a/quantum/db/api.py
+++ b/quantum/db/api.py
@@ -89,6 +89,7 @@ def _check_duplicate_net_name(tenant_id, net_name):
         # that net-names are unique within a tenant
         pass
 
+
 def network_create(tenant_id, name):
     session = get_session()
 

diff --git a/quantum/plugins.ini b/quantum/plugins.ini
index 307d2b48d2c7b167a10112cf1990eb0441ff579f..cb669f9e791f04f2c6dd791a98aadf66bc504cef 100644 (file)
--- a/quantum/plugins.ini
+++ b/quantum/plugins.ini
@@ -1,3 +1,3 @@
 [PLUGIN]
 # Quantum plugin provider module
-provider = quantum.plugins.SamplePlugin.FakePlugin
+provider = quantum.plugins.openvswitch.ovs_quantum_plugin.OVSQuantumPlugin

diff --git a/quantum/plugins/openvswitch/ovs_quantum_plugin.ini b/quantum/plugins/openvswitch/ovs_quantum_plugin.ini
index 66095d85d1bc8ef8277a4fc28c587654c3607d39..e6dc431e09e4c1be649c181c33deac88e266352d 100644 (file)
--- a/quantum/plugins/openvswitch/ovs_quantum_plugin.ini
+++ b/quantum/plugins/openvswitch/ovs_quantum_plugin.ini
@@ -6,4 +6,4 @@ host = 127.0.0.1
 port = 3306
 
 [OVS]
-integration-bridge = br100
+integration-bridge = br-int

diff --git a/quantum/plugins/openvswitch/ovs_quantum_plugin.py b/quantum/plugins/openvswitch/ovs_quantum_plugin.py
index 505468ce9f6c4633df0f853a4e135926f75a422f..1ca17b94096234c846b812b8de89a093f66cf5ca 100644 (file)
--- a/quantum/plugins/openvswitch/ovs_quantum_plugin.py
+++ b/quantum/plugins/openvswitch/ovs_quantum_plugin.py
@@ -35,7 +35,6 @@ CONF_FILE = "ovs_quantum_plugin.ini"
 LOG.basicConfig(level=LOG.WARN)
 LOG.getLogger("ovs_quantum_plugin")
 
-
 def find_config(basepath):
     for root, dirs, files in os.walk(basepath):
         if CONF_FILE in files:
@@ -220,108 +219,6 @@ class VlanMapTest(unittest.TestCase):
         self.assertTrue(self.vmap.get(vlan_id) == None)
 
 
-# TODO(bgh): Make the tests use a sqlite database instead of mysql
-class OVSPluginTest(unittest.TestCase):
-
-    def setUp(self):
-        self.quantum = OVSQuantumPlugin()
-        self.tenant_id = "testtenant"
-
-    def testCreateNetwork(self):
-        net1 = self.quantum.create_network(self.tenant_id, "plugin_test1")
-        self.assertTrue(net1["net-name"] == "plugin_test1")
-
-    def testGetNetworks(self):
-        net1 = self.quantum.create_network(self.tenant_id, "plugin_test1")
-        net2 = self.quantum.create_network(self.tenant_id, "plugin_test2")
-        nets = self.quantum.get_all_networks(self.tenant_id)
-        count = 0
-        for x in nets:
-            if "plugin_test" in x["net-name"]:
-                count += 1
-        self.assertTrue(count == 2)
-
-    def testDeleteNetwork(self):
-        net = self.quantum.create_network(self.tenant_id, "plugin_test1")
-        self.quantum.delete_network(self.tenant_id, net["net-id"])
-        nets = self.quantum.get_all_networks(self.tenant_id)
-        count = 0
-        for x in nets:
-            if "plugin_test" in x["net-name"]:
-                count += 1
-        self.assertTrue(count == 0)
-
-    def testRenameNetwork(self):
-        net = self.quantum.create_network(self.tenant_id, "plugin_test1")
-        net = self.quantum.rename_network(self.tenant_id, net["net-id"],
-          "plugin_test_renamed")
-        self.assertTrue(net["net-name"] == "plugin_test_renamed")
-
-    def testCreatePort(self):
-        net1 = self.quantum.create_network(self.tenant_id, "plugin_test1")
-        port = self.quantum.create_port(self.tenant_id, net1["net-id"])
-        ports = self.quantum.get_all_ports(self.tenant_id, net1["net-id"])
-        count = 0
-        for p in ports:
-            count += 1
-        self.assertTrue(count == 1)
-
-    def testDeletePort(self):
-        net1 = self.quantum.create_network(self.tenant_id, "plugin_test1")
-        port = self.quantum.create_port(self.tenant_id, net1["net-id"])
-        ports = self.quantum.get_all_ports(self.tenant_id, net1["net-id"])
-        count = 0
-        for p in ports:
-            count += 1
-        self.assertTrue(count == 1)
-        for p in ports:
-            self.quantum.delete_port(self.tenant_id, id, p["port-id"])
-        ports = self.quantum.get_all_ports(self.tenant_id, net1["net-id"])
-        count = 0
-        for p in ports:
-            count += 1
-        self.assertTrue(count == 0)
-
-    def testGetPorts(self):
-        pass
-
-    def testPlugInterface(self):
-        net1 = self.quantum.create_network(self.tenant_id, "plugin_test1")
-        port = self.quantum.create_port(self.tenant_id, net1["net-id"])
-        self.quantum.plug_interface(self.tenant_id, net1["net-id"],
-          port["port-id"], "vif1.1")
-        port = self.quantum.get_port_details(self.tenant_id, net1["net-id"],
-          port["port-id"])
-        self.assertTrue(port["attachment"] == "vif1.1")
-
-    def testUnPlugInterface(self):
-        net1 = self.quantum.create_network(self.tenant_id, "plugin_test1")
-        port = self.quantum.create_port(self.tenant_id, net1["net-id"])
-        self.quantum.plug_interface(self.tenant_id, net1["net-id"],
-          port["port-id"], "vif1.1")
-        port = self.quantum.get_port_details(self.tenant_id, net1["net-id"],
-          port["port-id"])
-        self.assertTrue(port["attachment"] == "vif1.1")
-        self.quantum.unplug_interface(self.tenant_id, net1["net-id"],
-          port["port-id"])
-        port = self.quantum.get_port_details(self.tenant_id, net1["net-id"],
-          port["port-id"])
-        self.assertTrue(port["attachment"] == "")
-
-    def tearDown(self):
-        networks = self.quantum.get_all_networks(self.tenant_id)
-        # Clean up any test networks lying around
-        for net in networks:
-            id = net["net-id"]
-            name = net["net-name"]
-            if "plugin_test" in name:
-                # Clean up any test ports lying around
-                ports = self.quantum.get_all_ports(self.tenant_id, id)
-                for p in ports:
-                    self.quantum.delete_port(self.tenant_id, id, p["port-id"])
-                self.quantum.delete_network(self.tenant_id, id)
-
-
 if __name__ == "__main__":
     usagestr = "Usage: %prog [OPTIONS] <command> [args]"
     parser = OptionParser(usage=usagestr)
@@ -338,7 +235,5 @@ if __name__ == "__main__":
     # Make sqlalchemy quieter
     LOG.getLogger('sqlalchemy.engine').setLevel(LOG.WARN)
     # Run the tests
-    suite = unittest.TestLoader().loadTestsFromTestCase(OVSPluginTest)
-    unittest.TextTestRunner(verbosity=2).run(suite)
     suite = unittest.TestLoader().loadTestsFromTestCase(VlanMapTest)
     unittest.TextTestRunner(verbosity=2).run(suite)