From 4fffb10e43290871f08e432c1ebc5f813ddf350a Mon Sep 17 00:00:00 2001
From: Dan Wendlandt <dan@nicira.com>
Date: Sat, 6 Aug 2011 22:03:52 -0700
Subject: [PATCH 01/22] refactoring testing code to support plugin tests

---
 quantum/common/test_lib.py                    | 278 ++++++++++++++++++
 .../plugins/openvswitch/ovs_quantum_plugin.py | 143 ---------
 quantum/plugins/openvswitch/run_tests.py      |  82 ++++++
 quantum/plugins/openvswitch/tests/__init__.py |  32 ++
 .../openvswitch/tests/test_vlan_map.py        |  36 +++
 run_tests.py                                  | 246 +---------------
 run_tests.sh                                  |  17 +-
 tests/unit/test_api.py                        |   4 +-
 8 files changed, 445 insertions(+), 393 deletions(-)
 create mode 100644 quantum/common/test_lib.py
 create mode 100644 quantum/plugins/openvswitch/run_tests.py
 create mode 100644 quantum/plugins/openvswitch/tests/__init__.py
 create mode 100644 quantum/plugins/openvswitch/tests/test_vlan_map.py

diff --git a/quantum/common/test_lib.py b/quantum/common/test_lib.py
new file mode 100644
index 0000000000..2ccd681ce0
--- /dev/null
+++ b/quantum/common/test_lib.py
@@ -0,0 +1,278 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 OpenStack, LLC
+# 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.
+
+# Colorizer Code is borrowed from Twisted:
+# Copyright (c) 2001-2010 Twisted Matrix Laboratories.
+#
+#    Permission is hereby granted, free of charge, to any person obtaining
+#    a copy of this software and associated documentation files (the
+#    "Software"), to deal in the Software without restriction, including
+#    without limitation the rights to use, copy, modify, merge, publish,
+#    distribute, sublicense, and/or sell copies of the Software, and to
+#    permit persons to whom the Software is furnished to do so, subject to
+#    the following conditions:
+#
+#    The above copyright notice and this permission notice shall be
+#    included in all copies or substantial portions of the Software.
+#
+#    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+#    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+#    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+#    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+#    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+#    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+#    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+import gettext
+import os
+import unittest
+import sys
+import logging
+
+from nose import result
+from nose import core
+from nose import config
+
+
+class _AnsiColorizer(object):
+    """
+    A colorizer is an object that loosely wraps around a stream, allowing
+    callers to write text to the stream in a particular color.
+
+    Colorizer classes must implement C{supported()} and C{write(text, color)}.
+    """
+    _colors = dict(black=30, red=31, green=32, yellow=33,
+                   blue=34, magenta=35, cyan=36, white=37)
+
+    def __init__(self, stream):
+        self.stream = stream
+
+    def supported(cls, stream=sys.stdout):
+        """
+        A class method that returns True if the current platform supports
+        coloring terminal output using this method. Returns False otherwise.
+        """
+        if not stream.isatty():
+            return False  # auto color only on TTYs
+        try:
+            import curses
+        except ImportError:
+            return False
+        else:
+            try:
+                try:
+                    return curses.tigetnum("colors") > 2
+                except curses.error:
+                    curses.setupterm()
+                    return curses.tigetnum("colors") > 2
+            except:
+                raise
+                # guess false in case of error
+                return False
+    supported = classmethod(supported)
+
+    def write(self, text, color):
+        """
+        Write the given text to the stream in the given color.
+
+        @param text: Text to be written to the stream.
+
+        @param color: A string label for a color. e.g. 'red', 'white'.
+        """
+        color = self._colors[color]
+        self.stream.write('\x1b[%s;1m%s\x1b[0m' % (color, text))
+
+
+class _Win32Colorizer(object):
+    """
+    See _AnsiColorizer docstring.
+    """
+    def __init__(self, stream):
+        from win32console import GetStdHandle, STD_OUT_HANDLE, \
+             FOREGROUND_RED, FOREGROUND_BLUE, FOREGROUND_GREEN, \
+             FOREGROUND_INTENSITY
+        red, green, blue, bold = (FOREGROUND_RED, FOREGROUND_GREEN,
+                                  FOREGROUND_BLUE, FOREGROUND_INTENSITY)
+        self.stream = stream
+        self.screenBuffer = GetStdHandle(STD_OUT_HANDLE)
+        self._colors = {
+            'normal': red | green | blue,
+            'red': red | bold,
+            'green': green | bold,
+            'blue': blue | bold,
+            'yellow': red | green | bold,
+            'magenta': red | blue | bold,
+            'cyan': green | blue | bold,
+            'white': red | green | blue | bold}
+
+    def supported(cls, stream=sys.stdout):
+        try:
+            import win32console
+            screenBuffer = win32console.GetStdHandle(
+                win32console.STD_OUT_HANDLE)
+        except ImportError:
+            return False
+        import pywintypes
+        try:
+            screenBuffer.SetConsoleTextAttribute(
+                win32console.FOREGROUND_RED |
+                win32console.FOREGROUND_GREEN |
+                win32console.FOREGROUND_BLUE)
+        except pywintypes.error:
+            return False
+        else:
+            return True
+    supported = classmethod(supported)
+
+    def write(self, text, color):
+        color = self._colors[color]
+        self.screenBuffer.SetConsoleTextAttribute(color)
+        self.stream.write(text)
+        self.screenBuffer.SetConsoleTextAttribute(self._colors['normal'])
+
+
+class _NullColorizer(object):
+    """
+    See _AnsiColorizer docstring.
+    """
+    def __init__(self, stream):
+        self.stream = stream
+
+    def supported(cls, stream=sys.stdout):
+        return True
+    supported = classmethod(supported)
+
+    def write(self, text, color):
+        self.stream.write(text)
+
+
+class QuantumTestResult(result.TextTestResult):
+    def __init__(self, *args, **kw):
+        result.TextTestResult.__init__(self, *args, **kw)
+        self._last_case = None
+        self.colorizer = None
+        # NOTE(vish, tfukushima): reset stdout for the terminal check
+        stdout = sys.__stdout__
+        for colorizer in [_Win32Colorizer, _AnsiColorizer, _NullColorizer]:
+            if colorizer.supported():
+                self.colorizer = colorizer(self.stream)
+                break
+        sys.stdout = stdout
+
+    def getDescription(self, test):
+        return str(test)
+
+    # NOTE(vish, tfukushima): copied from unittest with edit to add color
+    def addSuccess(self, test):
+        unittest.TestResult.addSuccess(self, test)
+        if self.showAll:
+            self.colorizer.write("OK", 'green')
+            self.stream.writeln()
+        elif self.dots:
+            self.stream.write('.')
+            self.stream.flush()
+
+    # NOTE(vish, tfukushima): copied from unittest with edit to add color
+    def addFailure(self, test, err):
+        unittest.TestResult.addFailure(self, test, err)
+        if self.showAll:
+            self.colorizer.write("FAIL", 'red')
+            self.stream.writeln()
+        elif self.dots:
+            self.stream.write('F')
+            self.stream.flush()
+
+    # NOTE(vish, tfukushima): copied from unittest with edit to add color
+    def addError(self, test, err):
+        """Overrides normal addError to add support for errorClasses.
+        If the exception is a registered class, the error will be added
+        to the list for that class, not errors.
+        """
+        stream = getattr(self, 'stream', None)
+        ec, ev, tb = err
+        try:
+            exc_info = self._exc_info_to_string(err, test)
+        except TypeError:
+            # This is for compatibility with Python 2.3.
+            exc_info = self._exc_info_to_string(err)
+        for cls, (storage, label, isfail) in self.errorClasses.items():
+            if result.isclass(ec) and issubclass(ec, cls):
+                if isfail:
+                    test.passwd = False
+                storage.append((test, exc_info))
+                # Might get patched into a streamless result
+                if stream is not None:
+                    if self.showAll:
+                        message = [label]
+                        detail = result._exception_details(err[1])
+                        if detail:
+                            message.append(detail)
+                        stream.writeln(": ".join(message))
+                    elif self.dots:
+                        stream.write(label[:1])
+                return
+        self.errors.append((test, exc_info))
+        test.passed = False
+        if stream is not None:
+            if self.showAll:
+                self.colorizer.write("ERROR", 'red')
+                self.stream.writeln()
+            elif self.dots:
+                stream.write('E')
+
+    def startTest(self, test):
+        unittest.TestResult.startTest(self, test)
+        current_case = test.test.__class__.__name__
+
+        if self.showAll:
+            if current_case != self._last_case:
+                self.stream.writeln(current_case)
+                self._last_case = current_case
+
+            self.stream.write(
+                '    %s' % str(test.test._testMethodName).ljust(60))
+            self.stream.flush()
+
+
+class QuantumTestRunner(core.TextTestRunner):
+    def _makeResult(self):
+        return QuantumTestResult(self.stream,
+                              self.descriptions,
+                              self.verbosity,
+                              self.config)
+
+
+def run_tests(c):
+    logger = logging.getLogger()
+    hdlr = logging.StreamHandler()
+    formatter = logging.Formatter('%(asctime)s %(levelname)s %(message)s')
+    hdlr.setFormatter(formatter)
+    logger.addHandler(hdlr)
+    logger.setLevel(logging.DEBUG)
+
+    runner = QuantumTestRunner(stream=c.stream,
+                            verbosity=c.verbosity,
+                            config=c)
+    return not core.run(config=c, testRunner=runner)
+
+# describes parameters used by different unit/functional tests
+# a plugin-specific testing mechanism should import this dictionary
+# and override the values in it if needed (e.g., run_tests.py in
+# quantum/plugins/openvswitch/ )
+test_config = {
+    "plugin_name": "quantum.plugins.SamplePlugin.FakePlugin",
+}
diff --git a/quantum/plugins/openvswitch/ovs_quantum_plugin.py b/quantum/plugins/openvswitch/ovs_quantum_plugin.py
index 2f23517ec7..4765804c58 100644
--- a/quantum/plugins/openvswitch/ovs_quantum_plugin.py
+++ b/quantum/plugins/openvswitch/ovs_quantum_plugin.py
@@ -21,7 +21,6 @@ import ConfigParser
 import logging as LOG
 import os
 import sys
-import unittest
 
 from quantum.quantum_plugin_base import QuantumPluginBase
 from optparse import OptionParser
@@ -207,145 +206,3 @@ class OVSQuantumPlugin(QuantumPluginBase):
     def get_interface_details(self, tenant_id, net_id, port_id):
         res = db.port_get(port_id)
         return res.interface_id
-
-
-class VlanMapTest(unittest.TestCase):
-
-    def setUp(self):
-        self.vmap = VlanMap()
-
-    def tearDown(self):
-        pass
-
-    def testAddVlan(self):
-        vlan_id = self.vmap.acquire("foobar")
-        self.assertTrue(vlan_id == 2)
-
-    def testReleaseVlan(self):
-        vlan_id = self.vmap.acquire("foobar")
-        self.vmap.release("foobar")
-        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)
-    parser.add_option("-v", "--verbose", dest="verbose",
-      action="store_true", default=False, help="turn on verbose logging")
-
-    options, args = parser.parse_args()
-
-    if options.verbose:
-        LOG.basicConfig(level=LOG.DEBUG)
-    else:
-        LOG.basicConfig(level=LOG.WARN)
-
-    # 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)
diff --git a/quantum/plugins/openvswitch/run_tests.py b/quantum/plugins/openvswitch/run_tests.py
new file mode 100644
index 0000000000..12df8521e5
--- /dev/null
+++ b/quantum/plugins/openvswitch/run_tests.py
@@ -0,0 +1,82 @@
+#!/usr/bin/env python
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 OpenStack, LLC
+# 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.
+
+
+"""Unittest runner for quantum OVS plugin
+
+This file should be run from the top dir in the quantum directory
+
+To run all test::
+    python quantum/plugins/openvswitch/run_tests.py
+
+To run all unit tests::
+    python quantum/plugins/openvswitch/run_tests.py unit
+
+To run all functional tests::
+    python quantum/plugins/openvswitch/run_tests.py functional
+
+To run a single unit test::
+    python  quantum/plugins/openvswitch/run_tests.py \
+        unit.test_stores:TestSwiftBackend.test_get
+
+To run a single functional test::
+    python  quantum/plugins/openvswitch/run_tests.py \
+        functional.test_service:TestController.test_create
+
+To run a single unit test module::
+    python  quantum/plugins/openvswitch/run_tests.py unit.test_stores
+
+To run a single functional test module::
+    python quantum/plugins/openvswitch/run_tests.py functional.test_stores
+"""
+
+import gettext
+import logging
+import os
+import unittest
+import sys
+
+from nose import config
+
+sys.path.append(os.getcwd())
+
+from quantum.common.test_lib import run_tests, test_config
+from quantum.plugins.openvswitch.tests.test_vlan_map import VlanMapTest
+
+if __name__ == '__main__':
+    exit_status = False
+
+    cwd = os.getcwd()
+
+    working_dir = os.path.abspath("tests")
+    c = config.Config(stream=sys.stdout,
+                      env=os.environ,
+                      verbosity=3,
+                      workingDir=working_dir)
+    exit_status = run_tests(c)
+
+    os.chdir(cwd)
+
+    working_dir = os.path.abspath("quantum/plugins/openvswitch/tests")
+    c = config.Config(stream=sys.stdout,
+                      env=os.environ,
+                      verbosity=3,
+                      workingDir=working_dir)
+    exit_status = exit_status or run_tests(c)
+
+    sys.exit(exit_status)
diff --git a/quantum/plugins/openvswitch/tests/__init__.py b/quantum/plugins/openvswitch/tests/__init__.py
new file mode 100644
index 0000000000..5910e35494
--- /dev/null
+++ b/quantum/plugins/openvswitch/tests/__init__.py
@@ -0,0 +1,32 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2011 OpenStack LLC.
+# 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.
+
+# See http://code.google.com/p/python-nose/issues/detail?id=373
+# The code below enables nosetests to work with i18n _() blocks
+import __builtin__
+import unittest
+setattr(__builtin__, '_', lambda x: x)
+
+
+class BaseTest(unittest.TestCase):
+
+    def setUp(self):
+        pass
+
+
+def setUp():
+    pass
diff --git a/quantum/plugins/openvswitch/tests/test_vlan_map.py b/quantum/plugins/openvswitch/tests/test_vlan_map.py
new file mode 100644
index 0000000000..e67f5987a2
--- /dev/null
+++ b/quantum/plugins/openvswitch/tests/test_vlan_map.py
@@ -0,0 +1,36 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+# Copyright 2011 Nicira Networks, Inc.
+# 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.
+
+import unittest
+from quantum.plugins.openvswitch.ovs_quantum_plugin import VlanMap
+
+
+class VlanMapTest(unittest.TestCase):
+
+    def setUp(self):
+        self.vmap = VlanMap()
+
+    def tearDown(self):
+        pass
+
+    def testAddVlan(self):
+        vlan_id = self.vmap.acquire("foobar")
+        self.assertTrue(vlan_id == 2)
+
+    def testReleaseVlan(self):
+        vlan_id = self.vmap.acquire("foobar")
+        self.vmap.release("foobar")
+        self.assertTrue(self.vmap.get(vlan_id) == None)
diff --git a/run_tests.py b/run_tests.py
index d63cc34a42..d73c0d5188 100644
--- a/run_tests.py
+++ b/run_tests.py
@@ -16,27 +16,6 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-# Colorizer Code is borrowed from Twisted:
-# Copyright (c) 2001-2010 Twisted Matrix Laboratories.
-#
-#    Permission is hereby granted, free of charge, to any person obtaining
-#    a copy of this software and associated documentation files (the
-#    "Software"), to deal in the Software without restriction, including
-#    without limitation the rights to use, copy, modify, merge, publish,
-#    distribute, sublicense, and/or sell copies of the Software, and to
-#    permit persons to whom the Software is furnished to do so, subject to
-#    the following conditions:
-#
-#    The above copyright notice and this permission notice shall be
-#    included in all copies or substantial portions of the Software.
-#
-#    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-#    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-#    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-#    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-#    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-#    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-#    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 """Unittest runner for quantum
 
@@ -63,239 +42,18 @@ To run a single functional test module::
 """
 
 import gettext
-import logging
 import os
 import unittest
 import sys
 
+from quantum.common.test_lib import run_tests
 from nose import config
-from nose import result
-from nose import core
-
-
-class _AnsiColorizer(object):
-    """
-    A colorizer is an object that loosely wraps around a stream, allowing
-    callers to write text to the stream in a particular color.
-
-    Colorizer classes must implement C{supported()} and C{write(text, color)}.
-    """
-    _colors = dict(black=30, red=31, green=32, yellow=33,
-                   blue=34, magenta=35, cyan=36, white=37)
-
-    def __init__(self, stream):
-        self.stream = stream
-
-    def supported(cls, stream=sys.stdout):
-        """
-        A class method that returns True if the current platform supports
-        coloring terminal output using this method. Returns False otherwise.
-        """
-        if not stream.isatty():
-            return False  # auto color only on TTYs
-        try:
-            import curses
-        except ImportError:
-            return False
-        else:
-            try:
-                try:
-                    return curses.tigetnum("colors") > 2
-                except curses.error:
-                    curses.setupterm()
-                    return curses.tigetnum("colors") > 2
-            except:
-                raise
-                # guess false in case of error
-                return False
-    supported = classmethod(supported)
-
-    def write(self, text, color):
-        """
-        Write the given text to the stream in the given color.
-
-        @param text: Text to be written to the stream.
-
-        @param color: A string label for a color. e.g. 'red', 'white'.
-        """
-        color = self._colors[color]
-        self.stream.write('\x1b[%s;1m%s\x1b[0m' % (color, text))
-
-
-class _Win32Colorizer(object):
-    """
-    See _AnsiColorizer docstring.
-    """
-    def __init__(self, stream):
-        from win32console import GetStdHandle, STD_OUT_HANDLE, \
-             FOREGROUND_RED, FOREGROUND_BLUE, FOREGROUND_GREEN, \
-             FOREGROUND_INTENSITY
-        red, green, blue, bold = (FOREGROUND_RED, FOREGROUND_GREEN,
-                                  FOREGROUND_BLUE, FOREGROUND_INTENSITY)
-        self.stream = stream
-        self.screenBuffer = GetStdHandle(STD_OUT_HANDLE)
-        self._colors = {
-            'normal': red | green | blue,
-            'red': red | bold,
-            'green': green | bold,
-            'blue': blue | bold,
-            'yellow': red | green | bold,
-            'magenta': red | blue | bold,
-            'cyan': green | blue | bold,
-            'white': red | green | blue | bold}
-
-    def supported(cls, stream=sys.stdout):
-        try:
-            import win32console
-            screenBuffer = win32console.GetStdHandle(
-                win32console.STD_OUT_HANDLE)
-        except ImportError:
-            return False
-        import pywintypes
-        try:
-            screenBuffer.SetConsoleTextAttribute(
-                win32console.FOREGROUND_RED |
-                win32console.FOREGROUND_GREEN |
-                win32console.FOREGROUND_BLUE)
-        except pywintypes.error:
-            return False
-        else:
-            return True
-    supported = classmethod(supported)
-
-    def write(self, text, color):
-        color = self._colors[color]
-        self.screenBuffer.SetConsoleTextAttribute(color)
-        self.stream.write(text)
-        self.screenBuffer.SetConsoleTextAttribute(self._colors['normal'])
-
-
-class _NullColorizer(object):
-    """
-    See _AnsiColorizer docstring.
-    """
-    def __init__(self, stream):
-        self.stream = stream
-
-    def supported(cls, stream=sys.stdout):
-        return True
-    supported = classmethod(supported)
-
-    def write(self, text, color):
-        self.stream.write(text)
-
-
-class QuantumTestResult(result.TextTestResult):
-    def __init__(self, *args, **kw):
-        result.TextTestResult.__init__(self, *args, **kw)
-        self._last_case = None
-        self.colorizer = None
-        # NOTE(vish, tfukushima): reset stdout for the terminal check
-        stdout = sys.__stdout__
-        for colorizer in [_Win32Colorizer, _AnsiColorizer, _NullColorizer]:
-            if colorizer.supported():
-                self.colorizer = colorizer(self.stream)
-                break
-        sys.stdout = stdout
-
-    def getDescription(self, test):
-        return str(test)
-
-    # NOTE(vish, tfukushima): copied from unittest with edit to add color
-    def addSuccess(self, test):
-        unittest.TestResult.addSuccess(self, test)
-        if self.showAll:
-            self.colorizer.write("OK", 'green')
-            self.stream.writeln()
-        elif self.dots:
-            self.stream.write('.')
-            self.stream.flush()
-
-    # NOTE(vish, tfukushima): copied from unittest with edit to add color
-    def addFailure(self, test, err):
-        unittest.TestResult.addFailure(self, test, err)
-        if self.showAll:
-            self.colorizer.write("FAIL", 'red')
-            self.stream.writeln()
-        elif self.dots:
-            self.stream.write('F')
-            self.stream.flush()
-
-    # NOTE(vish, tfukushima): copied from unittest with edit to add color
-    def addError(self, test, err):
-        """Overrides normal addError to add support for errorClasses.
-        If the exception is a registered class, the error will be added
-        to the list for that class, not errors.
-        """
-        stream = getattr(self, 'stream', None)
-        ec, ev, tb = err
-        try:
-            exc_info = self._exc_info_to_string(err, test)
-        except TypeError:
-            # This is for compatibility with Python 2.3.
-            exc_info = self._exc_info_to_string(err)
-        for cls, (storage, label, isfail) in self.errorClasses.items():
-            if result.isclass(ec) and issubclass(ec, cls):
-                if isfail:
-                    test.passwd = False
-                storage.append((test, exc_info))
-                # Might get patched into a streamless result
-                if stream is not None:
-                    if self.showAll:
-                        message = [label]
-                        detail = result._exception_details(err[1])
-                        if detail:
-                            message.append(detail)
-                        stream.writeln(": ".join(message))
-                    elif self.dots:
-                        stream.write(label[:1])
-                return
-        self.errors.append((test, exc_info))
-        test.passed = False
-        if stream is not None:
-            if self.showAll:
-                self.colorizer.write("ERROR", 'red')
-                self.stream.writeln()
-            elif self.dots:
-                stream.write('E')
-
-    def startTest(self, test):
-        unittest.TestResult.startTest(self, test)
-        current_case = test.test.__class__.__name__
-
-        if self.showAll:
-            if current_case != self._last_case:
-                self.stream.writeln(current_case)
-                self._last_case = current_case
-
-            self.stream.write(
-                '    %s' % str(test.test._testMethodName).ljust(60))
-            self.stream.flush()
-
-
-class QuantumTestRunner(core.TextTestRunner):
-    def _makeResult(self):
-        return QuantumTestResult(self.stream,
-                              self.descriptions,
-                              self.verbosity,
-                              self.config)
 
 
 if __name__ == '__main__':
-    # Set up test logger.
-    logger = logging.getLogger()
-    hdlr = logging.StreamHandler()
-    formatter = logging.Formatter('%(asctime)s %(levelname)s %(message)s')
-    hdlr.setFormatter(formatter)
-    logger.addHandler(hdlr)
-    logger.setLevel(logging.DEBUG)
-
     working_dir = os.path.abspath("tests")
     c = config.Config(stream=sys.stdout,
                       env=os.environ,
                       verbosity=3,
                       workingDir=working_dir)
-    runner = QuantumTestRunner(stream=c.stream,
-                            verbosity=c.verbosity,
-                            config=c)
-    sys.exit(not core.run(config=c, testRunner=runner))
+    sys.exit(run_tests(c))
diff --git a/run_tests.sh b/run_tests.sh
index 9c603c9825..5ab6ac7299 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 function usage {
-  echo "Usage: $0 [OPTION]..."
+  echo "Usage: $0 [OPTION]"
   echo "Run Quantum's test suite(s)"
   echo ""
   echo "  -V, --virtual-env        Always use virtualenv.  Install automatically if not present"
@@ -39,11 +39,20 @@ done
 
 function run_tests {
   # Just run the test suites in current environment
-  ${wrapper} rm -f tests.sqlite
-  ${wrapper} $NOSETESTS 2> run_tests.err.log
+  ${wrapper} rm -f ./$PLUGIN_DIR/tests.sqlite
+  ${wrapper} $NOSETESTS 2> ./$PLUGIN_DIR/run_tests.err.log
 }
 
-NOSETESTS="python run_tests.py $noseargs"
+NOSETESTS="python ./$PLUGIN_DIR/run_tests.py $noseargs"
+
+if [ -n "$PLUGIN_DIR" ]
+then
+    if ! [ -f ./$PLUGIN_DIR/run_tests.py ]
+    then
+        echo "Could not find run_tests.py in plugin directory $PLUGIN_DIR"
+        exit 1
+    fi
+fi
 
 if [ $never_venv -eq 0 ]
 then
diff --git a/tests/unit/test_api.py b/tests/unit/test_api.py
index bf8cb8198d..e56a2cdd77 100644
--- a/tests/unit/test_api.py
+++ b/tests/unit/test_api.py
@@ -24,9 +24,9 @@ import tests.unit.testlib_api as testlib
 
 from quantum import api as server
 from quantum.db import api as db
+from quantum.common.test_lib import test_config
 from quantum.common.wsgi import Serializer
 
-
 LOG = logging.getLogger('quantum.tests.test_api')
 
 
@@ -650,7 +650,7 @@ class APITest(unittest.TestCase):
 
     def setUp(self):
         options = {}
-        options['plugin_provider'] = 'quantum.plugins.SamplePlugin.FakePlugin'
+        options['plugin_provider'] = test_config['plugin_name']
         self.api = server.APIRouterV01(options)
         self.tenant_id = "test_tenant"
         self.network_name = "test_network"

From 9e297d9f20016eaf3ee061467b1866a39b3a7d39 Mon Sep 17 00:00:00 2001
From: Dan Wendlandt <dan@nicira.com>
Date: Sat, 6 Aug 2011 22:05:52 -0700
Subject: [PATCH 02/22] remove unneeded __init__

---
 quantum/plugins/openvswitch/tests/__init__.py | 32 -------------------
 1 file changed, 32 deletions(-)

diff --git a/quantum/plugins/openvswitch/tests/__init__.py b/quantum/plugins/openvswitch/tests/__init__.py
index 5910e35494..e69de29bb2 100644
--- a/quantum/plugins/openvswitch/tests/__init__.py
+++ b/quantum/plugins/openvswitch/tests/__init__.py
@@ -1,32 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2011 OpenStack LLC.
-# 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.
-
-# See http://code.google.com/p/python-nose/issues/detail?id=373
-# The code below enables nosetests to work with i18n _() blocks
-import __builtin__
-import unittest
-setattr(__builtin__, '_', lambda x: x)
-
-
-class BaseTest(unittest.TestCase):
-
-    def setUp(self):
-        pass
-
-
-def setUp():
-    pass

From 2b17f003b87cc6093af01ccf3e9d508599151813 Mon Sep 17 00:00:00 2001
From: Dan Wendlandt <dan@nicira.com>
Date: Sat, 6 Aug 2011 22:18:25 -0700
Subject: [PATCH 03/22] undo unintentional formatting change in run_tests.sh

---
 run_tests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/run_tests.sh b/run_tests.sh
index 5ab6ac7299..b9079e9cae 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 function usage {
-  echo "Usage: $0 [OPTION]"
+  echo "Usage: $0 [OPTION]..."
   echo "Run Quantum's test suite(s)"
   echo ""
   echo "  -V, --virtual-env        Always use virtualenv.  Install automatically if not present"

From d2618faeaa1fda8ca780741c1ec7ca99513df4e2 Mon Sep 17 00:00:00 2001
From: Dan Wendlandt <dan@nicira.com>
Date: Tue, 9 Aug 2011 00:19:55 -0700
Subject: [PATCH 04/22] update batch_config.py to use new client lib, hooray
 for deleting code

---
 tools/batch_config.py | 107 +++++++++---------------------------------
 1 file changed, 23 insertions(+), 84 deletions(-)

diff --git a/tools/batch_config.py b/tools/batch_config.py
index 8415513d01..705f46fbc1 100644
--- a/tools/batch_config.py
+++ b/tools/batch_config.py
@@ -15,106 +15,46 @@
 #    under the License.
 # @author: Dan Wendlandt, Nicira Networks, Inc.
 
-import httplib
 import logging as LOG
-import json
-import socket
-import sys
-import urllib
-
-from quantum.manager import QuantumManager
 from optparse import OptionParser
-from quantum.common.wsgi import Serializer
-from quantum.cli import MiniClient
+import sys
+
+from quantum.client import Client
+from quantum.manager import QuantumManager
 
 FORMAT = "json"
 CONTENT_TYPE = "application/" + FORMAT
 
 
-def delete_all_nets(client, tenant_id):
-    res = client.do_request(tenant_id, 'GET', "/networks." + FORMAT)
-    resdict = json.loads(res.read())
-    LOG.debug(resdict)
-    for n in resdict["networks"]:
+def delete_all_nets(client):
+    res = client.list_networks()
+    for n in res["networks"]:
         nid = n["id"]
 
-        res = client.do_request(tenant_id, 'GET',
-            "/networks/%s/ports.%s" % (nid, FORMAT))
-        output = res.read()
-        if res.status != 200:
-            LOG.error("Failed to list ports: %s" % output)
-            continue
-        rd = json.loads(output)
-        LOG.debug(rd)
-        for port in rd["ports"]:
-            pid = port["id"]
-
-            data = {'port': {'attachment-id': ''}}
-            body = Serializer().serialize(data, CONTENT_TYPE)
-            res = client.do_request(tenant_id, 'DELETE',
-                "/networks/%s/ports/%s/attachment.%s" % \
-                (nid, pid, FORMAT), body=body)
-            output = res.read()
-            LOG.debug(output)
-            if res.status != 202:
-                LOG.error("Failed to unplug iface from port \"%s\": %s" % (vid,
-                pid, output))
-                continue
-            LOG.info("Unplugged interface from port:%s on network:%s" % (pid,
-                                                                        nid))
-
-            res = client.do_request(tenant_id, 'DELETE',
-                "/networks/%s/ports/%s.%s" % (nid, pid, FORMAT))
-            output = res.read()
-            if res.status != 202:
-                LOG.error("Failed to delete port: %s" % output)
-                continue
+        pres = client.list_ports(nid)
+        for port in pres["ports"]:
+            pid = port['id']
+            client.detach_resource(nid, pid)
+            client.delete_port(nid, pid)
             print "Deleted Virtual Port:%s " \
                 "on Virtual Network:%s" % (pid, nid)
-
-        res = client.do_request(tenant_id, 'DELETE',
-                    "/networks/" + nid + "." + FORMAT)
-        status = res.status
-        if status != 202:
-            Log.error("Failed to delete network: %s" % nid)
-            output = res.read()
-            print output
-        else:
-            print "Deleted Virtual Network with ID:%s" % nid
+        client.delete_network(nid)
+        print "Deleted Virtual Network with ID:%s" % nid
 
 
-def create_net_with_attachments(net_name, iface_ids):
+def create_net_with_attachments(client, net_name, iface_ids):
         data = {'network': {'net-name': '%s' % net_name}}
-        body = Serializer().serialize(data, CONTENT_TYPE)
-        res = client.do_request(tenant_id, 'POST',
-            "/networks." + FORMAT, body=body)
-        rd = json.loads(res.read())
-        LOG.debug(rd)
-        nid = rd["networks"]["network"]["id"]
+        res = client.create_network(data)
+        nid = res["networks"]["network"]["id"]
         print "Created a new Virtual Network %s with ID:%s" % (net_name, nid)
 
         for iface_id in iface_ids:
-            res = client.do_request(tenant_id, 'POST',
-                "/networks/%s/ports.%s" % (nid, FORMAT))
-            output = res.read()
-            if res.status != 200:
-                LOG.error("Failed to create port: %s" % output)
-                continue
-            rd = json.loads(output)
-            new_port_id = rd["ports"]["port"]["id"]
+            res = client.create_port(nid)
+            new_port_id = res["ports"]["port"]["id"]
             print "Created Virtual Port:%s " \
                 "on Virtual Network:%s" % (new_port_id, nid)
             data = {'port': {'attachment-id': '%s' % iface_id}}
-            body = Serializer().serialize(data, CONTENT_TYPE)
-            res = client.do_request(tenant_id, 'PUT',
-                "/networks/%s/ports/%s/attachment.%s" %\
-                 (nid, new_port_id, FORMAT), body=body)
-            output = res.read()
-            LOG.debug(output)
-            if res.status != 202:
-                LOG.error("Failed to plug iface \"%s\" to port \"%s\": %s" % \
-                        (iface_id, new_port_id, output))
-                continue
+            client.attach_resource(nid, new_port_id, data)
             print "Plugged interface \"%s\" to port:%s on network:%s" % \
                         (iface_id, new_port_id, nid)
 
@@ -149,7 +89,6 @@ if __name__ == "__main__":
 
     if len(args) < 1:
         parser.print_help()
-        help()
         sys.exit(1)
 
     nets = {}
@@ -163,12 +102,12 @@ if __name__ == "__main__":
 
     print "nets: %s" % str(nets)
 
-    client = MiniClient(options.host, options.port, options.ssl)
+    client = Client(options.host, options.port, options.ssl, tenant=tenant_id)
 
     if options.delete:
-        delete_all_nets(client, tenant_id)
+        delete_all_nets(client)
 
     for net_name, iface_ids in nets.items():
-        create_net_with_attachments(net_name, iface_ids)
+        create_net_with_attachments(client, net_name, iface_ids)
 
     sys.exit(0)

From 26b4bf0f4f4840f69d134b695977b114066e87e5 Mon Sep 17 00:00:00 2001
From: Dan Wendlandt <dan@nicira.com>
Date: Tue, 9 Aug 2011 01:03:32 -0700
Subject: [PATCH 05/22] force batch_config.py to use json, as XML has issues
 (see bug: 798262)

---
 tools/batch_config.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/batch_config.py b/tools/batch_config.py
index 705f46fbc1..f9684c82af 100644
--- a/tools/batch_config.py
+++ b/tools/batch_config.py
@@ -30,7 +30,6 @@ def delete_all_nets(client):
     res = client.list_networks()
     for n in res["networks"]:
         nid = n["id"]
-
         pres = client.list_ports(nid)
         for port in pres["ports"]:
             pid = port['id']
@@ -102,7 +101,8 @@ if __name__ == "__main__":
 
     print "nets: %s" % str(nets)
 
-    client = Client(options.host, options.port, options.ssl, tenant=tenant_id)
+    client = Client(options.host, options.port, options.ssl,
+                        format='json', tenant=tenant_id)
 
     if options.delete:
         delete_all_nets(client)

From 3094561df6cf5070bf53b3ef44612240a7ddce3d Mon Sep 17 00:00:00 2001
From: Arvind Somy <asomya@cisco.com>
Date: Tue, 9 Aug 2011 16:45:22 -0400
Subject: [PATCH 06/22] - Adding setup script.

---
 setup.py | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 setup.py

diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000000..da65ab1858
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,36 @@
+import os
+import sys
+from setuptools import setup, find_packages
+
+def read(fname):
+    return open(os.path.join(os.path.dirname(__file__), fname)).read()
+    
+requirements = ['httplib2', 'argparse']
+if sys.version_info < (2,6):
+    requirements.append('simplejson')
+    
+setup(
+    name = "Quantum",
+    version = "0.1",
+    description = "Layer 2 network as a service for Openstack",
+    long_description = read('README'),
+    url = 'http://launchpad.net/quantum',
+    license = 'BSD',
+    author = 'Netstack',
+    author_email = 'netstack@launchpad.net',
+    packages = find_packages(exclude=['tests']),
+    classifiers = [
+        'Development Status :: 4 - Beta',
+        'Environment :: Console',
+        'Intended Audience :: Developers',
+        'Intended Audience :: Information Technology',
+        'License :: OSI Approved :: BSD License',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python',
+    ],
+    namespace_packages = ["quantum"],
+    install_requires = requirements,
+    
+    tests_require = ["nose", "mock"],
+    test_suite = "nose.collector",
+)

From 2a89b0996d24decb9488a0ccd40ab7d275a2dba2 Mon Sep 17 00:00:00 2001
From: Arvind Somy <asomya@cisco.com>
Date: Wed, 10 Aug 2011 15:47:11 -0400
Subject: [PATCH 07/22] lp Bug#824145 : Adding a setup script for quantum.

---
 setup.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/setup.py b/setup.py
index da65ab1858..dad3ddcd63 100644
--- a/setup.py
+++ b/setup.py
@@ -5,17 +5,15 @@ from setuptools import setup, find_packages
 def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read()
     
-requirements = ['httplib2', 'argparse']
-if sys.version_info < (2,6):
-    requirements.append('simplejson')
-    
+requirements = ['httplib2','eventlet','routes','webob']
+
 setup(
     name = "Quantum",
     version = "0.1",
     description = "Layer 2 network as a service for Openstack",
     long_description = read('README'),
     url = 'http://launchpad.net/quantum',
-    license = 'BSD',
+    license = 'Apache',
     author = 'Netstack',
     author_email = 'netstack@launchpad.net',
     packages = find_packages(exclude=['tests']),
@@ -31,6 +29,6 @@ setup(
     namespace_packages = ["quantum"],
     install_requires = requirements,
     
-    tests_require = ["nose", "mock"],
+    tests_require = ["nose"],
     test_suite = "nose.collector",
 )

From 570c35e60d05b84f7936a2c1d05b817e59b50d91 Mon Sep 17 00:00:00 2001
From: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date: Thu, 11 Aug 2011 23:13:43 +0100
Subject: [PATCH 08/22] FIxing missing 'output' variable @ line 243 (syntax
 error)

Fixing main as the plugin was still being retrieved with get_manager. That method is now get_plugin
---
 quantum/cli.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/quantum/cli.py b/quantum/cli.py
index a015565d87..369fc6eed4 100644
--- a/quantum/cli.py
+++ b/quantum/cli.py
@@ -240,7 +240,7 @@ def api_plug_iface(client, *args):
         res = client.attach_resource(nid, pid, data)
     except Exception, e:
         LOG.error("Failed to plug iface \"%s\" to port \"%s\": %s" % (vid,
-          pid, output))
+          pid, e))
         return
     LOG.debug(res)
     print "Plugged interface \"%s\" to port:%s on network:%s" % (vid, pid, nid)
@@ -386,6 +386,6 @@ if __name__ == "__main__":
         commands[cmd]["api_func"](client, *args)
     else:
         quantum = QuantumManager()
-        manager = quantum.get_manager()
+        manager = quantum.get_plugin()
         commands[cmd]["func"](manager, *args)
     sys.exit(0)

From baa146cf6eedc5c2e203c190e915a96520c7c4b5 Mon Sep 17 00:00:00 2001
From: Dan Wendlandt <dan@nicira.com>
Date: Mon, 15 Aug 2011 18:13:52 -0700
Subject: [PATCH 09/22] exit unit tests if tests are invoked specifying a
 particular test

---
 quantum/plugins/openvswitch/run_tests.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/quantum/plugins/openvswitch/run_tests.py b/quantum/plugins/openvswitch/run_tests.py
index 12df8521e5..15a7583b43 100644
--- a/quantum/plugins/openvswitch/run_tests.py
+++ b/quantum/plugins/openvswitch/run_tests.py
@@ -61,6 +61,10 @@ from quantum.plugins.openvswitch.tests.test_vlan_map import VlanMapTest
 if __name__ == '__main__':
     exit_status = False
 
+    # if a single test case was specified,
+    # we should only invoked the tests once
+    invoke_once = len(sys.argv) > 1
+
     cwd = os.getcwd()
 
     working_dir = os.path.abspath("tests")
@@ -70,6 +74,9 @@ if __name__ == '__main__':
                       workingDir=working_dir)
     exit_status = run_tests(c)
 
+    if invoke_once:
+        sys.exit(0)
+
     os.chdir(cwd)
 
     working_dir = os.path.abspath("quantum/plugins/openvswitch/tests")

From 7c73d56e1183c93f90a3ffecfa0d7a92d68360f6 Mon Sep 17 00:00:00 2001
From: Santhosh Kumar <santhosh.m@thoughtworks.com>
Date: Tue, 16 Aug 2011 16:54:39 +0530
Subject: [PATCH 10/22] Santhosh/Deepak | Fixed an issue where collection
 actions for PUT and DELETE methods in resource extension were routing to
 update and delete action of the resource

---
 quantum/common/extensions.py  | 15 +++++++-
 tests/unit/test_extensions.py | 67 +++++++++++++++++++++++++++++++++--
 2 files changed, 79 insertions(+), 3 deletions(-)

diff --git a/quantum/common/extensions.py b/quantum/common/extensions.py
index f13a0c3370..79680b2254 100644
--- a/quantum/common/extensions.py
+++ b/quantum/common/extensions.py
@@ -226,9 +226,22 @@ class ExtensionMiddleware(wsgi.Middleware):
         for resource in self.ext_mgr.get_resources():
             LOG.debug(_('Extended resource: %s'),
                         resource.collection)
+            for action, method in resource.collection_actions.iteritems():
+                path_prefix = ""
+                parent = resource.parent
+                conditions = dict(method=[method])
+                path = "/%s/%s" % (resource.collection, action)
+                if parent:
+                    path_prefix = "/%s/{%s_id}" % (parent["collection_name"],
+                                                   parent["member_name"])
+                with mapper.submapper(controller=resource.controller,
+                                      action=action,
+                                      path_prefix=path_prefix,
+                                      conditions=conditions) as submap:
+                    submap.connect(path)
+                    submap.connect("%s.:(format)" % path)
             mapper.resource(resource.collection, resource.collection,
                             controller=resource.controller,
-                            collection=resource.collection_actions,
                             member=resource.member_actions,
                             parent_resource=resource.parent)
 
diff --git a/tests/unit/test_extensions.py b/tests/unit/test_extensions.py
index 5ad2a193e6..1cf36b33ba 100644
--- a/tests/unit/test_extensions.py
+++ b/tests/unit/test_extensions.py
@@ -62,7 +62,7 @@ class ResourceExtensionTest(unittest.TestCase):
         def custom_member_action(self, request, id):
             return {'member_action': 'value'}
 
-        def custom_collection_action(self, request):
+        def custom_collection_action(self, request, **kwargs):
             return {'collection': 'value'}
 
     def test_resource_can_be_added_as_extension(self):
@@ -88,7 +88,7 @@ class ResourceExtensionTest(unittest.TestCase):
         self.assertEqual(200, response.status_int)
         self.assertEqual(json.loads(response.body)['member_action'], "value")
 
-    def test_resource_extension_with_custom_collection_action(self):
+    def test_resource_extension_for_get_custom_collection_action(self):
         controller = self.ResourceExtensionController()
         collections = {'custom_collection_action': "GET"}
         res_ext = extensions.ResourceExtension('tweedles', controller,
@@ -99,6 +99,69 @@ class ResourceExtensionTest(unittest.TestCase):
         self.assertEqual(200, response.status_int)
         self.assertEqual(json.loads(response.body)['collection'], "value")
 
+    def test_resource_extension_for_put_custom_collection_action(self):
+        controller = self.ResourceExtensionController()
+        collections = {'custom_collection_action': "PUT"}
+        res_ext = extensions.ResourceExtension('tweedles', controller,
+                                               collection_actions=collections)
+        test_app = setup_extensions_test_app(SimpleExtensionManager(res_ext))
+
+        response = test_app.put("/tweedles/custom_collection_action")
+
+        self.assertEqual(200, response.status_int)
+        self.assertEqual(json.loads(response.body)['collection'], 'value')
+
+    def test_resource_extension_for_post_custom_collection_action(self):
+        controller = self.ResourceExtensionController()
+        collections = {'custom_collection_action': "POST"}
+        res_ext = extensions.ResourceExtension('tweedles', controller,
+                                               collection_actions=collections)
+        test_app = setup_extensions_test_app(SimpleExtensionManager(res_ext))
+
+        response = test_app.post("/tweedles/custom_collection_action")
+
+        self.assertEqual(200, response.status_int)
+        self.assertEqual(json.loads(response.body)['collection'], 'value')
+
+    def test_resource_extension_for_delete_custom_collection_action(self):
+        controller = self.ResourceExtensionController()
+        collections = {'custom_collection_action': "DELETE"}
+        res_ext = extensions.ResourceExtension('tweedles', controller,
+                                               collection_actions=collections)
+        test_app = setup_extensions_test_app(SimpleExtensionManager(res_ext))
+
+        response = test_app.delete("/tweedles/custom_collection_action")
+
+        self.assertEqual(200, response.status_int)
+        self.assertEqual(json.loads(response.body)['collection'], 'value')
+
+    def test_resource_ext_for_formatted_req_on_custom_collection_action(self):
+        controller = self.ResourceExtensionController()
+        collections = {'custom_collection_action': "GET"}
+        res_ext = extensions.ResourceExtension('tweedles', controller,
+                                               collection_actions=collections)
+        test_app = setup_extensions_test_app(SimpleExtensionManager(res_ext))
+
+        response = test_app.get("/tweedles/custom_collection_action.json")
+
+        self.assertEqual(200, response.status_int)
+        self.assertEqual(json.loads(response.body)['collection'], "value")
+
+    def test_resource_ext_for_nested_resource_custom_collection_action(self):
+        controller = self.ResourceExtensionController()
+        collections = {'custom_collection_action': "GET"}
+        parent = dict(collection_name='beetles', member_name='beetle')
+        res_ext = extensions.ResourceExtension('tweedles', controller,
+                                               collection_actions=collections,
+                                               parent=parent)
+        test_app = setup_extensions_test_app(SimpleExtensionManager(res_ext))
+
+        response = test_app.get("/beetles/beetle_id"
+                                "/tweedles/custom_collection_action")
+
+        self.assertEqual(200, response.status_int)
+        self.assertEqual(json.loads(response.body)['collection'], "value")
+
     def test_returns_404_for_non_existant_extension(self):
         test_app = setup_extensions_test_app(SimpleExtensionManager(None))
 

From ad0199a73c280279d7aac7f390f597b0c365975f Mon Sep 17 00:00:00 2001
From: Sumit Naiksatam <snaiksat@cisco.com>
Date: Wed, 17 Aug 2011 19:47:10 -0700
Subject: [PATCH 11/22] VIF driver for 802.1qbh and Quantum aware scheduler.

---
 quantum/plugins/cisco/nova/__init__.py        | 18 ++++
 .../cisco/nova/quantum_aware_scheduler.py     | 77 ++++++++++++++++
 quantum/plugins/cisco/nova/vifdirect.py       | 88 +++++++++++++++++++
 3 files changed, 183 insertions(+)
 create mode 100644 quantum/plugins/cisco/nova/__init__.py
 create mode 100644 quantum/plugins/cisco/nova/quantum_aware_scheduler.py
 create mode 100644 quantum/plugins/cisco/nova/vifdirect.py

diff --git a/quantum/plugins/cisco/nova/__init__.py b/quantum/plugins/cisco/nova/__init__.py
new file mode 100644
index 0000000000..db695fb0af
--- /dev/null
+++ b/quantum/plugins/cisco/nova/__init__.py
@@ -0,0 +1,18 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+#
+# Copyright 2011 Cisco Systems, Inc.  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: Sumit Naiksatam, Cisco Systems, Inc.
+#
diff --git a/quantum/plugins/cisco/nova/quantum_aware_scheduler.py b/quantum/plugins/cisco/nova/quantum_aware_scheduler.py
new file mode 100644
index 0000000000..8a2213d0da
--- /dev/null
+++ b/quantum/plugins/cisco/nova/quantum_aware_scheduler.py
@@ -0,0 +1,77 @@
+"""
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+#
+# Copyright 2011 Cisco Systems, Inc.  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: Sumit Naiksatam, Cisco Systems, Inc.
+#
+"""
+
+from nova import flags
+from nova import log as logging
+from nova.scheduler import driver
+from quantum.client import Client
+from quantum.common.wsgi import Serializer
+
+LOG = logging.getLogger('nova.scheduler.quantum_aware_scheduler')
+
+FLAGS = flags.FLAGS
+flags.DEFINE_string('quantum_host', "127.0.0.1",
+                     'IP address of the quantum network service.')
+flags.DEFINE_integer('quantum_port', 9696,
+                     'Listening port for Quantum network service')
+
+HOST = FLAGS.quantum_host
+PORT = FLAGS.quantum_port
+USE_SSL = False
+TENANT_ID = 'nova'
+
+
+class QuantumScheduler(driver.Scheduler):
+    """
+    Quantum network service dependent scheduler
+    Obtains the hostname from Quantum using an extension API
+    """
+
+    def schedule(self, context, topic, *_args, **_kwargs):
+        """Gets the host name from the Quantum service"""
+        instance_id = _kwargs['instance_id']
+        user_id = \
+                _kwargs['request_spec']['instance_properties']['user_id']
+        project_id = \
+                _kwargs['request_spec']['instance_properties']['project_id']
+
+        instance_data_dict = \
+                {'novatenant': \
+                 {'instance-id': instance_id,
+                  'instance-desc': \
+                  {'user_id': user_id,
+                   'project_id': project_id
+                  }}}
+        client = Client(HOST, PORT, USE_SSL)
+        content_type = "application/" + "json"
+        body = Serializer().serialize(instance_data_dict, content_type)
+        request_url = "/novatenants/" + project_id + "/get_host.json"
+        res = client.do_request(TENANT_ID, 'PUT', request_url, body=body)
+        content = res.read()
+        data = Serializer().deserialize(content, content_type)
+        hostname = data["host_list"]["host_1"]
+        if not hostname:
+            raise driver.NoValidHost(_("Scheduler was unable to locate a host"
+                                       " for this request. Is the appropriate"
+                                       " service running?"))
+
+        LOG.debug(_("Quantum service returned host: %s\n") % hostname)
+        return hostname
diff --git a/quantum/plugins/cisco/nova/vifdirect.py b/quantum/plugins/cisco/nova/vifdirect.py
new file mode 100644
index 0000000000..b9a48441c5
--- /dev/null
+++ b/quantum/plugins/cisco/nova/vifdirect.py
@@ -0,0 +1,88 @@
+"""
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+# Copyright 2011 Cisco Systems, Inc.  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: Sumit Naiksatam, Cisco Systems, Inc.
+#
+"""
+"""VIF drivers for interface type direct."""
+
+from nova import flags
+from nova import log as logging
+from nova import utils
+from nova.network import linux_net
+from nova.virt.libvirt import netutils
+from nova.virt.vif import VIFDriver
+from quantum.client import Client
+from quantum.common.wsgi import Serializer
+
+LOG = logging.getLogger('nova.virt.libvirt.vif')
+
+FLAGS = flags.FLAGS
+flags.DEFINE_string('quantum_host', "127.0.0.1",
+                     'IP address of the quantum network service.')
+flags.DEFINE_integer('quantum_port', 9696,
+                     'Listening port for Quantum network service')
+
+HOST = FLAGS.quantum_host
+PORT = FLAGS.quantum_port
+USE_SSL = False
+TENANT_ID = 'nova'
+
+
+class Libvirt802dot1QbhDriver(VIFDriver):
+    """VIF driver for Linux bridge."""
+
+    def _get_configurations(self, instance, network, mapping):
+        """Gets the device name and the profile name from Quantum"""
+
+        instance_id = instance['id']
+        user_id = instance['user_id']
+        project_id = instance['project_id']
+
+        instance_data_dict = \
+                {'novatenant': \
+                 {'instance-id': instance_id,
+                  'instance-desc': \
+                  {'user_id': user_id,
+                   'project_id': project_id
+                  }}}
+        client = Client(HOST, PORT, USE_SSL)
+        content_type = "application/" + "json"
+        body = Serializer().serialize(instance_data_dict, content_type)
+        request_url = "/novatenants/" + project_id + "/get_instance_port.json"
+        res = client.do_request(TENANT_ID, 'PUT', request_url, body=body)
+        content = res.read()
+        data = Serializer().deserialize(content, content_type)
+        device = data['vif_desc']['device']
+        portprofile = data['vif_desc']['portprofile']
+        LOG.debug(_("Quantum returned device: %s\n") % device)
+        LOG.debug(_("Quantum returned portprofile: %s\n") % portprofile)
+        mac_id = mapping['mac'].replace(':', '')
+
+        result = {
+            'id': mac_id,
+            'mac_address': mapping['mac'],
+            'device_name': device,
+            'profile_name': portprofile,
+        }
+
+        return result
+
+    def plug(self, instance, network, mapping):
+        return self._get_configurations(instance, network, mapping)
+
+    def unplug(self, instance, network, mapping):
+        pass

From 8ce8639f50ab48fffae8c99212570a30d5d18478 Mon Sep 17 00:00:00 2001
From: Sumit Naiksatam <snaiksat@cisco.com>
Date: Wed, 17 Aug 2011 19:52:52 -0700
Subject: [PATCH 12/22] Removed extra spaces to satisfy pep8.

---
 quantum/plugins/cisco/nova/quantum_aware_scheduler.py | 4 +---
 quantum/plugins/cisco/nova/vifdirect.py               | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/quantum/plugins/cisco/nova/quantum_aware_scheduler.py b/quantum/plugins/cisco/nova/quantum_aware_scheduler.py
index 8a2213d0da..b83dd698c0 100644
--- a/quantum/plugins/cisco/nova/quantum_aware_scheduler.py
+++ b/quantum/plugins/cisco/nova/quantum_aware_scheduler.py
@@ -57,9 +57,7 @@ class QuantumScheduler(driver.Scheduler):
                 {'novatenant': \
                  {'instance-id': instance_id,
                   'instance-desc': \
-                  {'user_id': user_id,
-                   'project_id': project_id
-                  }}}
+                  {'user_id': user_id, 'project_id': project_id}}}
         client = Client(HOST, PORT, USE_SSL)
         content_type = "application/" + "json"
         body = Serializer().serialize(instance_data_dict, content_type)
diff --git a/quantum/plugins/cisco/nova/vifdirect.py b/quantum/plugins/cisco/nova/vifdirect.py
index b9a48441c5..0d2369a787 100644
--- a/quantum/plugins/cisco/nova/vifdirect.py
+++ b/quantum/plugins/cisco/nova/vifdirect.py
@@ -56,9 +56,7 @@ class Libvirt802dot1QbhDriver(VIFDriver):
                 {'novatenant': \
                  {'instance-id': instance_id,
                   'instance-desc': \
-                  {'user_id': user_id,
-                   'project_id': project_id
-                  }}}
+                  {'user_id': user_id, 'project_id': project_id}}}
         client = Client(HOST, PORT, USE_SSL)
         content_type = "application/" + "json"
         body = Serializer().serialize(instance_data_dict, content_type)

From f5b1a6547dedf89fd4320f4c68eaa2df3604b890 Mon Sep 17 00:00:00 2001
From: rohitagarwalla <roagarwa@cisco.com>
Date: Thu, 18 Aug 2011 11:09:37 -0700
Subject: [PATCH 13/22] pep8 error fixed for l2network_db.py

---
 quantum/plugins/cisco/db/l2network_db.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/quantum/plugins/cisco/db/l2network_db.py b/quantum/plugins/cisco/db/l2network_db.py
index b2198c8eb8..a5b9f910f7 100644
--- a/quantum/plugins/cisco/db/l2network_db.py
+++ b/quantum/plugins/cisco/db/l2network_db.py
@@ -248,7 +248,7 @@ def remove_portprofile(tenantid, ppid):
         pass
 
 
-def update_portprofile(tenantid, ppid, newppname=None, newvlanid=None, 
+def update_portprofile(tenantid, ppid, newppname=None, newvlanid=None,
                        newqos=None):
     """Updates port profile"""
     session = db.get_session()
@@ -325,7 +325,7 @@ def remove_pp_binding(tenantid, portid, ppid):
         pass
 
 
-def update_pp_binding(tenantid, ppid, newtenantid=None, newportid=None, 
+def update_pp_binding(tenantid, ppid, newtenantid=None, newportid=None,
                                                     newdefault=None):
     """Updates port profile binding"""
     session = db.get_session()

From 4c2fc02c985927822e0fcef636b8139fed1962c3 Mon Sep 17 00:00:00 2001
From: Tyler Smith <tylesmit@cisco.com>
Date: Thu, 18 Aug 2011 12:49:20 -0700
Subject: [PATCH 14/22] Making the client raise the appropriate exception if
 needed.  Also increasing the pylint score to above 8.

---
 quantum/client.py            | 73 +++++++++++++++++++++++++-----------
 quantum/common/exceptions.py |  4 ++
 2 files changed, 55 insertions(+), 22 deletions(-)

diff --git a/quantum/client.py b/quantum/client.py
index 517ba6d667..b2459ea57d 100644
--- a/quantum/client.py
+++ b/quantum/client.py
@@ -20,16 +20,32 @@ import httplib
 import socket
 import urllib
 from quantum.common.wsgi import Serializer
+from quantum.common import exceptions
+
+EXCEPTIONS = {
+    400: exceptions.BadInputError,
+    401: exceptions.NotAuthorized,
+    420: exceptions.NetworkNotFound,
+    421: exceptions.NetworkInUse,
+    422: exceptions.NetworkNameExists,
+    430: exceptions.PortNotFound,
+    431: exceptions.StateInvalid,
+    432: exceptions.PortInUse,
+    440: exceptions.AlreadyAttached,
+    441: exceptions.AttachmentNotReady,
+}
 
 
-class api_call(object):
+class ApiCall(object):
     """A Decorator to add support for format and tenant overriding"""
-    def __init__(self, f):
-        self.f = f
+    def __init__(self, function):
+        self.function = function
 
     def __get__(self, instance, owner):
         def with_params(*args, **kwargs):
-            # Temporarily set format and tenant for this request
+            """
+            Temporarily sets the format and tenant for this request
+            """
             (format, tenant) = (instance.format, instance.tenant)
 
             if 'format' in kwargs:
@@ -37,7 +53,7 @@ class api_call(object):
             if 'tenant' in kwargs:
                 instance.tenant = kwargs['tenant']
 
-            ret = self.f(instance, *args)
+            ret = self.function(instance, *args)
             (instance.format, instance.tenant) = (format, tenant)
             return ret
         return with_params
@@ -49,7 +65,7 @@ class Client(object):
 
     action_prefix = '/v0.1/tenants/{tenant_id}'
 
-    """Action query strings"""
+    # Action query strings
     networks_path = "/networks"
     network_path = "/networks/%s"
     ports_path = "/networks/%s/ports"
@@ -133,9 +149,9 @@ class Client(object):
             certs = dict((x, certs[x]) for x in certs if certs[x] != None)
 
             if self.use_ssl and len(certs):
-                c = connection_type(self.host, self.port, **certs)
+                conn = connection_type(self.host, self.port, **certs)
             else:
-                c = connection_type(self.host, self.port)
+                conn = connection_type(self.host, self.port)
 
             if self.logger:
                 self.logger.debug("Quantum Client Request:\n" \
@@ -143,7 +159,7 @@ class Client(object):
                 if body:
                     self.logger.debug(body)
 
-            c.request(method, action, body, headers)
+            conn.request(method, action, body, headers)
             res = c.getresponse()
             status_code = self.get_status_code(res)
             data = res.read()
@@ -158,6 +174,8 @@ class Client(object):
                                httplib.NO_CONTENT):
                 return self.deserialize(data, status_code)
             else:
+                if res.status in EXCEPTIONS:
+                    raise EXCEPTIONS[res.status]()
                 raise Exception("Server returned error: %s" % res.read())
 
         except (socket.error, IOError), e:
@@ -175,6 +193,10 @@ class Client(object):
             return response.status
 
     def serialize(self, data):
+        """
+        Serializes a dictionary with a single key (which can contain any
+        structure) into either xml or json
+        """
         if data is None:
             return None
         elif type(data) is dict:
@@ -184,65 +206,72 @@ class Client(object):
                                 % type(data))
 
     def deserialize(self, data, status_code):
+        """
+        Deserializes a an xml or json string into a dictionary
+        """
         if status_code == 202:
             return data
         return Serializer().deserialize(data, self.content_type())
 
     def content_type(self, format=None):
+        """
+        Returns the mime-type for either 'xml' or 'json'.  Defaults to the
+        currently set format
+        """
         if not format:
             format = self.format
         return "application/%s" % (format)
 
-    @api_call
+    @ApiCall
     def list_networks(self):
         """
         Fetches a list of all networks for a tenant
         """
         return self.do_request("GET", self.networks_path)
 
-    @api_call
+    @ApiCall
     def show_network_details(self, network):
         """
         Fetches the details of a certain network
         """
         return self.do_request("GET", self.network_path % (network))
 
-    @api_call
+    @ApiCall
     def create_network(self, body=None):
         """
         Creates a new network
         """
         return self.do_request("POST", self.networks_path, body=body)
 
-    @api_call
+    @ApiCall
     def update_network(self, network, body=None):
         """
         Updates a network
         """
         return self.do_request("PUT", self.network_path % (network), body=body)
 
-    @api_call
+    @ApiCall
     def delete_network(self, network):
         """
         Deletes the specified network
         """
         return self.do_request("DELETE", self.network_path % (network))
 
-    @api_call
+    @ApiCall
     def list_ports(self, network):
         """
         Fetches a list of ports on a given network
         """
         return self.do_request("GET", self.ports_path % (network))
 
-    @api_call
+    @ApiCall
     def show_port_details(self, network, port):
         """
         Fetches the details of a certain port
         """
         return self.do_request("GET", self.port_path % (network, port))
 
-    @api_call
+    @ApiCall
     def create_port(self, network, body=None):
         """
         Creates a new port on a given network
@@ -250,14 +279,14 @@ class Client(object):
         body = self.serialize(body)
         return self.do_request("POST", self.ports_path % (network), body=body)
 
-    @api_call
+    @ApiCall
     def delete_port(self, network, port):
         """
         Deletes the specified port from a network
         """
         return self.do_request("DELETE", self.port_path % (network, port))
 
-    @api_call
+    @ApiCall
     def set_port_state(self, network, port, body=None):
         """
         Sets the state of the specified port
@@ -265,14 +294,14 @@ class Client(object):
         return self.do_request("PUT",
             self.port_path % (network, port), body=body)
 
-    @api_call
+    @ApiCall
     def show_port_attachment(self, network, port):
         """
         Fetches the attachment-id associated with the specified port
         """
         return self.do_request("GET", self.attachment_path % (network, port))
 
-    @api_call
+    @ApiCall
     def attach_resource(self, network, port, body=None):
         """
         Sets the attachment-id of the specified port
@@ -280,7 +309,7 @@ class Client(object):
         return self.do_request("PUT",
             self.attachment_path % (network, port), body=body)
 
-    @api_call
+    @ApiCall
     def detach_resource(self, network, port):
         """
         Removes the attachment-id of the specified port
diff --git a/quantum/common/exceptions.py b/quantum/common/exceptions.py
index 478ddd551b..83fd9fabe9 100644
--- a/quantum/common/exceptions.py
+++ b/quantum/common/exceptions.py
@@ -111,6 +111,10 @@ class AlreadyAttached(QuantumException):
                 "already plugged into port %(att_port_id)s")
 
 
+class AttachmentNotReady(QuantumException):
+    message = _("The attachment %(att_id)s is not ready")
+
+
 class NetworkNameExists(QuantumException):
     message = _("Unable to set network name to %(net_name). " \
                 "Network with id %(net_id) already has this name for " \

From 19219e73db8a2a4df31bf92b5c3644a4f0b78f30 Mon Sep 17 00:00:00 2001
From: Tyler Smith <tylesmit@cisco.com>
Date: Thu, 18 Aug 2011 12:58:27 -0700
Subject: [PATCH 15/22] Fixing typo

---
 quantum/client.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quantum/client.py b/quantum/client.py
index b2459ea57d..2e55dfb3ec 100644
--- a/quantum/client.py
+++ b/quantum/client.py
@@ -160,7 +160,7 @@ class Client(object):
                     self.logger.debug(body)
 
             conn.request(method, action, body, headers)
-            res = c.getresponse()
+            res = conn.getresponse()
             status_code = self.get_status_code(res)
             data = res.read()
 

From 9939bc6748752852244b6e7165ccc161d3585c18 Mon Sep 17 00:00:00 2001
From: Sumit Naiksatam <snaiksat@cisco.com>
Date: Thu, 18 Aug 2011 16:53:57 -0700
Subject: [PATCH 16/22] Removed concatenation per review comments.

---
 quantum/plugins/cisco/nova/quantum_aware_scheduler.py | 2 +-
 quantum/plugins/cisco/nova/vifdirect.py               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/quantum/plugins/cisco/nova/quantum_aware_scheduler.py b/quantum/plugins/cisco/nova/quantum_aware_scheduler.py
index b83dd698c0..c82db878b7 100644
--- a/quantum/plugins/cisco/nova/quantum_aware_scheduler.py
+++ b/quantum/plugins/cisco/nova/quantum_aware_scheduler.py
@@ -59,7 +59,7 @@ class QuantumScheduler(driver.Scheduler):
                   'instance-desc': \
                   {'user_id': user_id, 'project_id': project_id}}}
         client = Client(HOST, PORT, USE_SSL)
-        content_type = "application/" + "json"
+        content_type = "application/json"
         body = Serializer().serialize(instance_data_dict, content_type)
         request_url = "/novatenants/" + project_id + "/get_host.json"
         res = client.do_request(TENANT_ID, 'PUT', request_url, body=body)
diff --git a/quantum/plugins/cisco/nova/vifdirect.py b/quantum/plugins/cisco/nova/vifdirect.py
index 0d2369a787..f3c3699576 100644
--- a/quantum/plugins/cisco/nova/vifdirect.py
+++ b/quantum/plugins/cisco/nova/vifdirect.py
@@ -58,7 +58,7 @@ class Libvirt802dot1QbhDriver(VIFDriver):
                   'instance-desc': \
                   {'user_id': user_id, 'project_id': project_id}}}
         client = Client(HOST, PORT, USE_SSL)
-        content_type = "application/" + "json"
+        content_type = "application/json"
         body = Serializer().serialize(instance_data_dict, content_type)
         request_url = "/novatenants/" + project_id + "/get_instance_port.json"
         res = client.do_request(TENANT_ID, 'PUT', request_url, body=body)

From efcbdde237cec0ca9689c9353cbc87596973f911 Mon Sep 17 00:00:00 2001
From: Sumit Naiksatam <snaiksat@cisco.com>
Date: Fri, 19 Aug 2011 18:46:34 -0700
Subject: [PATCH 17/22] Code refactored, made changes are per reviwer's
 suggestions.

---
 .../plugins/cisco/nova/quantum_aware_scheduler.py   | 12 +++++-------
 quantum/plugins/cisco/nova/vifdirect.py             | 13 ++++++-------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/quantum/plugins/cisco/nova/quantum_aware_scheduler.py b/quantum/plugins/cisco/nova/quantum_aware_scheduler.py
index c82db878b7..b5f21ac820 100644
--- a/quantum/plugins/cisco/nova/quantum_aware_scheduler.py
+++ b/quantum/plugins/cisco/nova/quantum_aware_scheduler.py
@@ -58,14 +58,12 @@ class QuantumScheduler(driver.Scheduler):
                  {'instance-id': instance_id,
                   'instance-desc': \
                   {'user_id': user_id, 'project_id': project_id}}}
-        client = Client(HOST, PORT, USE_SSL)
-        content_type = "application/json"
-        body = Serializer().serialize(instance_data_dict, content_type)
-        request_url = "/novatenants/" + project_id + "/get_host.json"
-        res = client.do_request(TENANT_ID, 'PUT', request_url, body=body)
-        content = res.read()
-        data = Serializer().deserialize(content, content_type)
+        client = Client(HOST, PORT, USE_SSL, format='json')
+        request_url = "/novatenants/" + project_id + "/get_host"
+        data = client.do_request(TENANT_ID, 'PUT', request_url,
+                                 body=instance_data_dict)
         hostname = data["host_list"]["host_1"]
+
         if not hostname:
             raise driver.NoValidHost(_("Scheduler was unable to locate a host"
                                        " for this request. Is the appropriate"
diff --git a/quantum/plugins/cisco/nova/vifdirect.py b/quantum/plugins/cisco/nova/vifdirect.py
index f3c3699576..1565bfe57e 100644
--- a/quantum/plugins/cisco/nova/vifdirect.py
+++ b/quantum/plugins/cisco/nova/vifdirect.py
@@ -57,15 +57,14 @@ class Libvirt802dot1QbhDriver(VIFDriver):
                  {'instance-id': instance_id,
                   'instance-desc': \
                   {'user_id': user_id, 'project_id': project_id}}}
-        client = Client(HOST, PORT, USE_SSL)
-        content_type = "application/json"
-        body = Serializer().serialize(instance_data_dict, content_type)
-        request_url = "/novatenants/" + project_id + "/get_instance_port.json"
-        res = client.do_request(TENANT_ID, 'PUT', request_url, body=body)
-        content = res.read()
-        data = Serializer().deserialize(content, content_type)
+
+        client = Client(HOST, PORT, USE_SSL, format='json')
+        request_url = "/novatenants/" + project_id + "/get_instance_port"
+        data = client.do_request(TENANT_ID, 'PUT', request_url,
+                                 body=instance_data_dict)
         device = data['vif_desc']['device']
         portprofile = data['vif_desc']['portprofile']
+
         LOG.debug(_("Quantum returned device: %s\n") % device)
         LOG.debug(_("Quantum returned portprofile: %s\n") % portprofile)
         mac_id = mapping['mac'].replace(':', '')

From 930d13ce4e1cc2a418d02e904b51582a34fb5ef6 Mon Sep 17 00:00:00 2001
From: rohitagarwalla <roagarwa@cisco.com>
Date: Tue, 23 Aug 2011 11:36:50 -0700
Subject: [PATCH 18/22] Fixes based on review comments

---
 quantum/plugins/cisco/README                  |  9 +++-
 quantum/plugins/cisco/db/l2network_db.py      |  9 ++--
 quantum/plugins/cisco/l2network_model.py      |  2 +-
 quantum/plugins/cisco/l2network_plugin.py     | 14 ------
 .../cisco/tests/unit/test_l2networkApi.py     | 46 -------------------
 .../cisco/tests/unit/test_ucs_plugin.py       |  2 -
 6 files changed, 13 insertions(+), 69 deletions(-)

diff --git a/quantum/plugins/cisco/README b/quantum/plugins/cisco/README
index 2ef3a0c082..6de59a0463 100755
--- a/quantum/plugins/cisco/README
+++ b/quantum/plugins/cisco/README
@@ -140,8 +140,15 @@ name=quantum.plugins.cisco.nexus.cisco_nexus_network_driver.CiscoNEXUSDriver
 	
 mysql -u<mysqlusername> -p<mysqlpassword> -e "create database quantum_l2network"
 
-	5b.  Enter the quantum_l2netowrk database configuration info in the 
+	5b.  Enter the quantum_l2network database configuration info in the 
          quantum/plugins/cisco/conf/db_conn.ini file.
+         
+    5c.  If there is a change in the plugin configuration, service would need 
+         to be restarted after dropping and re-creating the database using
+         the following commands -
+
+mysql -u<mysqlusername> -p<mysqlpassword> -e "drop database quantum_l2network"
+mysql -u<mysqlusername> -p<mysqlpassword> -e "create database quantum_l2network"
 
 6.  Verify that you have the correct credentials for each IP address listed
     in quantum/plugins/cisco/conf/credentials.ini.  Example:
diff --git a/quantum/plugins/cisco/db/l2network_db.py b/quantum/plugins/cisco/db/l2network_db.py
index a5b9f910f7..1f015cd799 100644
--- a/quantum/plugins/cisco/db/l2network_db.py
+++ b/quantum/plugins/cisco/db/l2network_db.py
@@ -20,8 +20,8 @@ from sqlalchemy.orm import exc
 from quantum.common import exceptions as q_exc
 from quantum.plugins.cisco import l2network_plugin_configuration as conf
 from quantum.plugins.cisco.common import cisco_exceptions as c_exc
+from quantum.plugins.cisco.db import l2network_models
 
-import l2network_models
 import quantum.plugins.cisco.db.api as db
 
 
@@ -108,17 +108,16 @@ def reserve_vlanid():
     """Reserves the first unused vlanid"""
     session = db.get_session()
     try:
-        vlanids = session.query(l2network_models.VlanID).\
+        rvlan = session.query(l2network_models.VlanID).\
          filter_by(vlan_used=False).\
-          all()
-        rvlan = vlanids[0]
+          first()
         rvlanid = session.query(l2network_models.VlanID).\
          filter_by(vlan_id=rvlan["vlan_id"]).\
           one()
         rvlanid["vlan_used"] = True
         session.merge(rvlanid)
         session.flush()
-        return vlanids[0]["vlan_id"]
+        return rvlan["vlan_id"]
     except exc.NoResultFound:
         raise c_exc.VlanIDNotAvailable()
 
diff --git a/quantum/plugins/cisco/l2network_model.py b/quantum/plugins/cisco/l2network_model.py
index cdffa594e4..f99a97bccf 100644
--- a/quantum/plugins/cisco/l2network_model.py
+++ b/quantum/plugins/cisco/l2network_model.py
@@ -43,7 +43,7 @@ class L2NetworkModel(L2NetworkModelBase):
         for key in conf.PLUGINS[const.PLUGINS].keys():
             self._plugins[key] = utils.import_object(
                 conf.PLUGINS[const.PLUGINS][key])
-            LOG.debug("Loaded device plugin %s\n" % \
+            LOG.debug("Loaded device plugin %s" % \
                     conf.PLUGINS[const.PLUGINS][key])
 
     def _func_name(self, offset=0):
diff --git a/quantum/plugins/cisco/l2network_plugin.py b/quantum/plugins/cisco/l2network_plugin.py
index 4d28400af5..4d2d00ee59 100644
--- a/quantum/plugins/cisco/l2network_plugin.py
+++ b/quantum/plugins/cisco/l2network_plugin.py
@@ -333,20 +333,6 @@ class L2Network(QuantumPluginBase):
 
         cdb.remove_pp_binding(tenant_id, port_id, portprofile_id)
 
-    def create_default_port_profile(self, tenant_id, network_id, profile_name,
-                                    qos):
-        "Create default port profile"""
-        portprofile = cdb.add_portprofile(tenant_id, profile_name,
-                                 const.NO_VLAN_ID, qos)
-        new_pp = self._make_portprofile_dict(tenant_id,
-                                             portprofile[const.UUID],
-                                             portprofile[const.PPNAME],
-                                             portprofile[const.PPQOS])
-        # TODO (Sumit): Need to check the following
-        port_id = None
-        cdb.add_pp_binding(tenant_id, port_id, portprofile[const.UUID], True)
-        return new_pp
-
     """
     Private functions
     """
diff --git a/quantum/plugins/cisco/tests/unit/test_l2networkApi.py b/quantum/plugins/cisco/tests/unit/test_l2networkApi.py
index 7ba966fb80..3c160beddb 100644
--- a/quantum/plugins/cisco/tests/unit/test_l2networkApi.py
+++ b/quantum/plugins/cisco/tests/unit/test_l2networkApi.py
@@ -19,13 +19,11 @@
 
 import logging
 import unittest
-#import time
 from quantum.common import exceptions as exc
 from quantum.plugins.cisco.common import cisco_constants as const
 from quantum.plugins.cisco.common import cisco_exceptions as cexc
 from quantum.plugins.cisco import l2network_plugin
 from quantum.plugins.cisco import l2network_plugin_configuration as conf
-#from quantum.plugins.cisco.common import cisco_utils as utils
 from quantum.plugins.cisco.db import api as db
 from quantum.plugins.cisco.db import l2network_db as cdb
 
@@ -72,7 +70,6 @@ class CoreAPITestFunc(unittest.TestCase):
                                 tenant_id, new_net_dict[const.NET_ID])
         self.assertRaises(exc.NetworkNotFound, db.network_get,
                           new_net_dict[const.NET_ID])
-        #self.assertEqual(net, None)
         self.assertEqual(
                 new_net_dict[const.NET_ID], delete_net_dict[const.NET_ID])
         LOG.debug("test_delete_network - END")
@@ -303,11 +300,6 @@ class CoreAPITestFunc(unittest.TestCase):
                                 port_dict[const.PORT_ID])
         self.assertRaises(exc.PortNotFound, db.port_get,
                           new_net_dict[const.NET_ID], port_dict[const.PORT_ID])
-        #self.assertEqual(port, None)
-       # self.assertEqual(delete_port_dict[const.PORT_STATE], port_state)
-#        self.assertEqual(delete_port_dict[const.NET_ID], new_net_dict[NET_ID])
-#        self.assertEqual(delete_port_dict[const.PORT_ID],
-#        new_net_dict[PORT_ID])
         self.tearDownNetwork(tenant_id, new_net_dict[const.NET_ID])
         self.assertEqual(delete_port_dict[const.PORT_ID],
                          port_dict[const.PORT_ID])
@@ -470,10 +462,6 @@ class CoreAPITestFunc(unittest.TestCase):
                         port_dict[const.PORT_ID], remote_interface)
         port = db.port_get(new_net_dict[const.NET_ID],
                            port_dict[const.PORT_ID])
-   #     self.assertEqual(
-    #            self._l2network_plugin._networks[new_net_dict[const.NET_ID]]
-     #                   [const.NET_PORTS][port_dict[const.PORT_ID]]
-      #                  [const.ATTACHMENT], remote_interface)
         self.assertEqual(port[const.INTERFACEID], remote_interface)
         self.tearDownNetworkPortInterface(
                         tenant_id, new_net_dict[const.NET_ID],
@@ -553,9 +541,6 @@ class CoreAPITestFunc(unittest.TestCase):
                         port_dict[const.PORT_ID])
         port = db.port_get(new_net_dict[const.NET_ID],
                            port_dict[const.PORT_ID])
-    #    self.assertEqual(self._l2network_plugin._networks
-     #           [new_net_dict[const.NET_ID]][const.NET_PORTS]
-      #          [port_dict[const.PORT_ID]][const.ATTACHMENT], None)
         self.assertEqual(port[const.INTERFACEID], None)
         self.tearDownNetworkPort(tenant_id, new_net_dict[const.NET_ID],
                                  port_dict[const.PORT_ID])
@@ -616,12 +601,6 @@ class CoreAPITestFunc(unittest.TestCase):
         port_profile = cdb.get_portprofile(tenant_id, port_profile_id)
         self.assertEqual(port_profile[const.PPNAME], profile_name)
         self.assertEqual(port_profile[const.PPQOS], qos)
-       # self.assertEqual(
-        #    self._l2network_plugin._portprofiles[port_profile_id]['vlan-id'],
-         #                                                       vlan_id)
-        #self.assertEqual(
-         #   self._l2network_plugin._portprofiles[port_profile_id]
-          #  ['profile-name'], profile_name)
         self.tearDownPortProfile(tenant_id, port_profile_id)
         LOG.debug("test_create_portprofile - tenant id: %s - END",
                                                 net_tenant_id)
@@ -641,10 +620,7 @@ class CoreAPITestFunc(unittest.TestCase):
                                 tenant_id, self.profile_name, self.qos)
         port_profile_id = port_profile_dict['profile-id']
         self._l2network_plugin.delete_portprofile(tenant_id, port_profile_id)
-#        port_profile = cdb.get_portprofile(tenant_id, port_profile_id)
         self.assertRaises(Exception, cdb.get_portprofile, port_profile_id)
-#        self.assertEqual(port_profile, {})
-#        self.assertEqual(self._l2network_plugin._portprofiles, {})
         LOG.debug("test_delete_portprofile - tenant id: %s - END",
                                                      net_tenant_id)
 
@@ -714,14 +690,6 @@ class CoreAPITestFunc(unittest.TestCase):
             new_pplist.append(new_pp)
         self.assertTrue(new_pplist[0] in port_profile_list)
         self.assertTrue(new_pplist[1] in port_profile_list)
-#        self.assertEqual(self._l2network_plugin._portprofiles
- #                               [port_profile_id1]['vlan-id'], self.vlan_id)
-  #      self.assertEqual(self._l2network_plugin._portprofiles
-   #                     [port_profile_id1]['profile-name'], self.profile_name)
-    #    self.assertEqual(self._l2network_plugin._portprofiles
-     #                   [port_profile_id2]['vlan-id'], vlan_id2)
-      #  self.assertEqual(self._l2network_plugin._portprofiles
-       #                 [port_profile_id2]['profile-name'], profile_name2)
         self.tearDownPortProfile(tenant_id, port_profile_id1)
         self.tearDownPortProfile(tenant_id, port_profile_id2)
 
@@ -816,9 +784,6 @@ class CoreAPITestFunc(unittest.TestCase):
         port_profile_associate = cdb.get_pp_binding(tenant_id, port_profile_id)
         self.assertEqual(port_profile_associate[const.PORTID],
                          port_dict[const.PORT_ID])
-        #self.assertEqual(
-         #       self._l2network_plugin._portprofiles[port_profile_id]
-          #      [const.PROFILE_ASSOCIATIONS][0], port_id)
         self.tearDownAssociatePortProfile(
                      tenant_id, new_net_dict[const.NET_ID],
                      port_dict[const.PORT_ID], port_profile_id)
@@ -863,8 +828,6 @@ class CoreAPITestFunc(unittest.TestCase):
                           port_dict[const.PORT_ID], port_profile_id)
         port_profile_associate = cdb.get_pp_binding(tenant_id, port_profile_id)
         self.assertEqual(port_profile_associate, [])
-#        self.assertEqual(self._l2network_plugin._portprofiles
- #                       [port_profile_id][const.PROFILE_ASSOCIATIONS], [])
         self.tearDownPortProfile(tenant_id, port_profile_id)
         self.tearDownNetworkPort(
                           tenant_id, new_net_dict[const.NET_ID],
@@ -883,7 +846,6 @@ class CoreAPITestFunc(unittest.TestCase):
                           tenant_id, net_id, port_id, profile_id)
         LOG.debug("test_disassociate_portprofileDNE - END")
 
-#    def test_disassociate_portprofile_Unassociated
     def test_get_vlan_name(self, net_tenant_id=None, vlan_id="NewVlan",
                            vlan_prefix=conf.VLAN_NAME_PREFIX):
         """
@@ -926,19 +888,11 @@ class CoreAPITestFunc(unittest.TestCase):
         self.tenant_id = "test_tenant"
         self.network_name = "test_network"
         self.profile_name = "test_tenant_port_profile"
-       # self.vlan_id = "test_tenant_vlanid300"
         self.qos = "test_qos"
         self.port_state = const.PORT_UP
         self.net_id = '00005'
         self.port_id = 'p0005'
         self.remote_interface = 'new_interface'
-        #sql_query = "drop database quantum_l2network"
-        #sql_query_2 = "create database quantum_l2network"
-        #self._utils = utils.DBUtils()
-        #self._utils.execute_db_query(sql_query)
-        #time.sleep(10)
-        #self._utils.execute_db_query(sql_query_2)
-        #time.sleep(10)
         self._l2network_plugin = l2network_plugin.L2Network()
 
     """
diff --git a/quantum/plugins/cisco/tests/unit/test_ucs_plugin.py b/quantum/plugins/cisco/tests/unit/test_ucs_plugin.py
index 7fabe42673..6f4f109dc3 100644
--- a/quantum/plugins/cisco/tests/unit/test_ucs_plugin.py
+++ b/quantum/plugins/cisco/tests/unit/test_ucs_plugin.py
@@ -313,7 +313,6 @@ class UCSVICTestPlugin(unittest.TestCase):
              self.tenant_id, self.net_id, self.port_id)
         self.assertEqual(port[const.ATTACHMENT], remote_interface_id)
         port_profile = port[const.PORT_PROFILE]
-        #profile_name = port_profile[const.PROFILE_NAME]
         new_vlan_name = self._cisco_ucs_plugin._get_vlan_name_for_network(
              self.tenant_id, self.net_id)
         new_vlan_id = self._cisco_ucs_plugin._get_vlan_id_for_network(
@@ -346,7 +345,6 @@ class UCSVICTestPlugin(unittest.TestCase):
              self.tenant_id, self.net_id, self.port_id)
         self.assertEqual(port[const.ATTACHMENT], None)
         port_profile = port[const.PORT_PROFILE]
-        #profile_name = port_profile[const.PROFILE_NAME]
         self.assertEqual(port_profile[const.PROFILE_VLAN_NAME],
                               conf.DEFAULT_VLAN_NAME)
         self.assertEqual(port_profile[const.PROFILE_VLAN_ID],

From 53f70ede18ae6d3002c015ed3b35b9d4df7a0f1e Mon Sep 17 00:00:00 2001
From: rohitagarwalla <roagarwa@cisco.com>
Date: Tue, 23 Aug 2011 12:34:18 -0700
Subject: [PATCH 19/22] merging from lp:quantum

---
 quantum/common/test_lib.py | 278 -------------------------------------
 1 file changed, 278 deletions(-)
 delete mode 100644 quantum/common/test_lib.py

diff --git a/quantum/common/test_lib.py b/quantum/common/test_lib.py
deleted file mode 100644
index 2ccd681ce0..0000000000
--- a/quantum/common/test_lib.py
+++ /dev/null
@@ -1,278 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2010 OpenStack, LLC
-# 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.
-
-# Colorizer Code is borrowed from Twisted:
-# Copyright (c) 2001-2010 Twisted Matrix Laboratories.
-#
-#    Permission is hereby granted, free of charge, to any person obtaining
-#    a copy of this software and associated documentation files (the
-#    "Software"), to deal in the Software without restriction, including
-#    without limitation the rights to use, copy, modify, merge, publish,
-#    distribute, sublicense, and/or sell copies of the Software, and to
-#    permit persons to whom the Software is furnished to do so, subject to
-#    the following conditions:
-#
-#    The above copyright notice and this permission notice shall be
-#    included in all copies or substantial portions of the Software.
-#
-#    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-#    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-#    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-#    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-#    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-#    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-#    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-import gettext
-import os
-import unittest
-import sys
-import logging
-
-from nose import result
-from nose import core
-from nose import config
-
-
-class _AnsiColorizer(object):
-    """
-    A colorizer is an object that loosely wraps around a stream, allowing
-    callers to write text to the stream in a particular color.
-
-    Colorizer classes must implement C{supported()} and C{write(text, color)}.
-    """
-    _colors = dict(black=30, red=31, green=32, yellow=33,
-                   blue=34, magenta=35, cyan=36, white=37)
-
-    def __init__(self, stream):
-        self.stream = stream
-
-    def supported(cls, stream=sys.stdout):
-        """
-        A class method that returns True if the current platform supports
-        coloring terminal output using this method. Returns False otherwise.
-        """
-        if not stream.isatty():
-            return False  # auto color only on TTYs
-        try:
-            import curses
-        except ImportError:
-            return False
-        else:
-            try:
-                try:
-                    return curses.tigetnum("colors") > 2
-                except curses.error:
-                    curses.setupterm()
-                    return curses.tigetnum("colors") > 2
-            except:
-                raise
-                # guess false in case of error
-                return False
-    supported = classmethod(supported)
-
-    def write(self, text, color):
-        """
-        Write the given text to the stream in the given color.
-
-        @param text: Text to be written to the stream.
-
-        @param color: A string label for a color. e.g. 'red', 'white'.
-        """
-        color = self._colors[color]
-        self.stream.write('\x1b[%s;1m%s\x1b[0m' % (color, text))
-
-
-class _Win32Colorizer(object):
-    """
-    See _AnsiColorizer docstring.
-    """
-    def __init__(self, stream):
-        from win32console import GetStdHandle, STD_OUT_HANDLE, \
-             FOREGROUND_RED, FOREGROUND_BLUE, FOREGROUND_GREEN, \
-             FOREGROUND_INTENSITY
-        red, green, blue, bold = (FOREGROUND_RED, FOREGROUND_GREEN,
-                                  FOREGROUND_BLUE, FOREGROUND_INTENSITY)
-        self.stream = stream
-        self.screenBuffer = GetStdHandle(STD_OUT_HANDLE)
-        self._colors = {
-            'normal': red | green | blue,
-            'red': red | bold,
-            'green': green | bold,
-            'blue': blue | bold,
-            'yellow': red | green | bold,
-            'magenta': red | blue | bold,
-            'cyan': green | blue | bold,
-            'white': red | green | blue | bold}
-
-    def supported(cls, stream=sys.stdout):
-        try:
-            import win32console
-            screenBuffer = win32console.GetStdHandle(
-                win32console.STD_OUT_HANDLE)
-        except ImportError:
-            return False
-        import pywintypes
-        try:
-            screenBuffer.SetConsoleTextAttribute(
-                win32console.FOREGROUND_RED |
-                win32console.FOREGROUND_GREEN |
-                win32console.FOREGROUND_BLUE)
-        except pywintypes.error:
-            return False
-        else:
-            return True
-    supported = classmethod(supported)
-
-    def write(self, text, color):
-        color = self._colors[color]
-        self.screenBuffer.SetConsoleTextAttribute(color)
-        self.stream.write(text)
-        self.screenBuffer.SetConsoleTextAttribute(self._colors['normal'])
-
-
-class _NullColorizer(object):
-    """
-    See _AnsiColorizer docstring.
-    """
-    def __init__(self, stream):
-        self.stream = stream
-
-    def supported(cls, stream=sys.stdout):
-        return True
-    supported = classmethod(supported)
-
-    def write(self, text, color):
-        self.stream.write(text)
-
-
-class QuantumTestResult(result.TextTestResult):
-    def __init__(self, *args, **kw):
-        result.TextTestResult.__init__(self, *args, **kw)
-        self._last_case = None
-        self.colorizer = None
-        # NOTE(vish, tfukushima): reset stdout for the terminal check
-        stdout = sys.__stdout__
-        for colorizer in [_Win32Colorizer, _AnsiColorizer, _NullColorizer]:
-            if colorizer.supported():
-                self.colorizer = colorizer(self.stream)
-                break
-        sys.stdout = stdout
-
-    def getDescription(self, test):
-        return str(test)
-
-    # NOTE(vish, tfukushima): copied from unittest with edit to add color
-    def addSuccess(self, test):
-        unittest.TestResult.addSuccess(self, test)
-        if self.showAll:
-            self.colorizer.write("OK", 'green')
-            self.stream.writeln()
-        elif self.dots:
-            self.stream.write('.')
-            self.stream.flush()
-
-    # NOTE(vish, tfukushima): copied from unittest with edit to add color
-    def addFailure(self, test, err):
-        unittest.TestResult.addFailure(self, test, err)
-        if self.showAll:
-            self.colorizer.write("FAIL", 'red')
-            self.stream.writeln()
-        elif self.dots:
-            self.stream.write('F')
-            self.stream.flush()
-
-    # NOTE(vish, tfukushima): copied from unittest with edit to add color
-    def addError(self, test, err):
-        """Overrides normal addError to add support for errorClasses.
-        If the exception is a registered class, the error will be added
-        to the list for that class, not errors.
-        """
-        stream = getattr(self, 'stream', None)
-        ec, ev, tb = err
-        try:
-            exc_info = self._exc_info_to_string(err, test)
-        except TypeError:
-            # This is for compatibility with Python 2.3.
-            exc_info = self._exc_info_to_string(err)
-        for cls, (storage, label, isfail) in self.errorClasses.items():
-            if result.isclass(ec) and issubclass(ec, cls):
-                if isfail:
-                    test.passwd = False
-                storage.append((test, exc_info))
-                # Might get patched into a streamless result
-                if stream is not None:
-                    if self.showAll:
-                        message = [label]
-                        detail = result._exception_details(err[1])
-                        if detail:
-                            message.append(detail)
-                        stream.writeln(": ".join(message))
-                    elif self.dots:
-                        stream.write(label[:1])
-                return
-        self.errors.append((test, exc_info))
-        test.passed = False
-        if stream is not None:
-            if self.showAll:
-                self.colorizer.write("ERROR", 'red')
-                self.stream.writeln()
-            elif self.dots:
-                stream.write('E')
-
-    def startTest(self, test):
-        unittest.TestResult.startTest(self, test)
-        current_case = test.test.__class__.__name__
-
-        if self.showAll:
-            if current_case != self._last_case:
-                self.stream.writeln(current_case)
-                self._last_case = current_case
-
-            self.stream.write(
-                '    %s' % str(test.test._testMethodName).ljust(60))
-            self.stream.flush()
-
-
-class QuantumTestRunner(core.TextTestRunner):
-    def _makeResult(self):
-        return QuantumTestResult(self.stream,
-                              self.descriptions,
-                              self.verbosity,
-                              self.config)
-
-
-def run_tests(c):
-    logger = logging.getLogger()
-    hdlr = logging.StreamHandler()
-    formatter = logging.Formatter('%(asctime)s %(levelname)s %(message)s')
-    hdlr.setFormatter(formatter)
-    logger.addHandler(hdlr)
-    logger.setLevel(logging.DEBUG)
-
-    runner = QuantumTestRunner(stream=c.stream,
-                            verbosity=c.verbosity,
-                            config=c)
-    return not core.run(config=c, testRunner=runner)
-
-# describes parameters used by different unit/functional tests
-# a plugin-specific testing mechanism should import this dictionary
-# and override the values in it if needed (e.g., run_tests.py in
-# quantum/plugins/openvswitch/ )
-test_config = {
-    "plugin_name": "quantum.plugins.SamplePlugin.FakePlugin",
-}

From 4ce8facd2ce9284187ded0098739952b6ca653e8 Mon Sep 17 00:00:00 2001
From: Edgar Magana <eperdomo@cisco.com>
Date: Tue, 23 Aug 2011 13:05:22 -0700
Subject: [PATCH 20/22] Code changed base on Reviews pep8 passed pylint 9.10

---
 .../cisco/nexus/cisco_nexus_network_driver.py | 19 +++++++++++++------
 .../cisco/nexus/cisco_nexus_snippets.py       | 11 ++++-------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/quantum/plugins/cisco/nexus/cisco_nexus_network_driver.py b/quantum/plugins/cisco/nexus/cisco_nexus_network_driver.py
index 3f92353492..3720bb1aa2 100644
--- a/quantum/plugins/cisco/nexus/cisco_nexus_network_driver.py
+++ b/quantum/plugins/cisco/nexus/cisco_nexus_network_driver.py
@@ -48,12 +48,19 @@ class CiscoNEXUSDriver():
                                 username=nexus_user, password=nexus_password)
         return man
 
+    def create_xml_snippet(self, cutomized_config):
+        """
+        Creates the Proper XML structure for the Nexus Switch Configuration
+        """
+        conf_xml_snippet = snipp.EXEC_CONF_SNIPPET % (cutomized_config)
+        return conf_xml_snippet
+
     def enable_vlan(self, mgr, vlanid, vlanname):
         """
         Creates a VLAN on Nexus Switch given the VLAN ID and Name
         """
         confstr = snipp.CMD_VLAN_CONF_SNIPPET % (vlanid, vlanname)
-        confstr = snipp.EXEC_CONF_PREFIX + confstr + snipp.EXEC_CONF_POSTFIX
+        confstr = self.create_xml_snippet(confstr)
         mgr.edit_config(target='running', config=confstr)
 
     def disable_vlan(self, mgr, vlanid):
@@ -61,7 +68,7 @@ class CiscoNEXUSDriver():
         Delete a VLAN on Nexus Switch given the VLAN ID
         """
         confstr = snipp.CMD_NO_VLAN_CONF_SNIPPET % vlanid
-        confstr = snipp.EXEC_CONF_PREFIX + confstr + snipp.EXEC_CONF_POSTFIX
+        confstr = self.create_xml_snippet(confstr)
         mgr.edit_config(target='running', config=confstr)
 
     def enable_port_trunk(self, mgr, interface):
@@ -69,7 +76,7 @@ class CiscoNEXUSDriver():
         Enables trunk mode an interface on Nexus Switch
         """
         confstr = snipp.CMD_PORT_TRUNK % (interface)
-        confstr = snipp.EXEC_CONF_PREFIX + confstr + snipp.EXEC_CONF_POSTFIX
+        confstr = self.create_xml_snippet(confstr)
         LOG.debug("NexusDriver: %s" % confstr)
         mgr.edit_config(target='running', config=confstr)
 
@@ -78,7 +85,7 @@ class CiscoNEXUSDriver():
         Disables trunk mode an interface on Nexus Switch
         """
         confstr = snipp.CMD_NO_SWITCHPORT % (interface)
-        confstr = snipp.EXEC_CONF_PREFIX + confstr + snipp.EXEC_CONF_POSTFIX
+        confstr = self.create_xml_snippet(confstr)
         LOG.debug("NexusDriver: %s" % confstr)
         mgr.edit_config(target='running', config=confstr)
 
@@ -88,7 +95,7 @@ class CiscoNEXUSDriver():
         VLANID
         """
         confstr = snipp.CMD_VLAN_INT_SNIPPET % (interface, vlanid)
-        confstr = snipp.EXEC_CONF_PREFIX + confstr + snipp.EXEC_CONF_POSTFIX
+        confstr = self.create_xml_snippet(confstr)
         LOG.debug("NexusDriver: %s" % confstr)
         mgr.edit_config(target='running', config=confstr)
 
@@ -98,7 +105,7 @@ class CiscoNEXUSDriver():
         VLANID
         """
         confstr = snipp.CMD_NO_VLAN_INT_SNIPPET % (interface, vlanid)
-        confstr = snipp.EXEC_CONF_PREFIX + confstr + snipp.EXEC_CONF_POSTFIX
+        confstr = self.create_xml_snippet(confstr)
         LOG.debug("NexusDriver: %s" % confstr)
         mgr.edit_config(target='running', config=confstr)
 
diff --git a/quantum/plugins/cisco/nexus/cisco_nexus_snippets.py b/quantum/plugins/cisco/nexus/cisco_nexus_snippets.py
index 9c7dab058e..df713fb5bc 100644
--- a/quantum/plugins/cisco/nexus/cisco_nexus_snippets.py
+++ b/quantum/plugins/cisco/nexus/cisco_nexus_snippets.py
@@ -29,14 +29,10 @@ LOG.getLogger(const.LOGGER_COMPONENT_NAME)
 
 
 # The following are standard strings, messages used to communicate with Nexus,
-EXEC_CONF_PREFIX = """
+EXEC_CONF_SNIPPET = """
       <config xmlns:xc="urn:ietf:params:xml:ns:netconf:base:1.0">
         <configure xmlns="http://www.cisco.com/nxos:1.0:vlan_mgr_cli">
-          <__XML__MODE__exec_configure>
-"""
-
-
-EXEC_CONF_POSTFIX = """
+          <__XML__MODE__exec_configure>%s
           </__XML__MODE__exec_configure>
         </configure>
       </config>
@@ -156,4 +152,5 @@ FILTER_SHOW_VLAN_BRIEF_SNIPPET = """
         <vlan>
           <brief/>
         </vlan>
-      </show> """
+      </show>
+"""

From ec9c06cf84fb9566035fc6f4cac5f2847de1c6d4 Mon Sep 17 00:00:00 2001
From: Sumit Naiksatam <snaiksat@cisco.com>
Date: Wed, 24 Aug 2011 03:15:54 -0700
Subject: [PATCH 21/22] Changes to incorporate reviwer's comments. Also changed
 client.py to handle extension URLs.

---
 quantum/client.py                             |  7 ++-
 quantum/plugins/cisco/nova/__init__.py        | 18 -------
 .../cisco/nova/quantum_aware_scheduler.py     | 54 +++++++++++++------
 quantum/plugins/cisco/nova/vifdirect.py       | 54 ++++++++++++++-----
 4 files changed, 83 insertions(+), 50 deletions(-)

diff --git a/quantum/client.py b/quantum/client.py
index 2e55dfb3ec..74ac1958ba 100644
--- a/quantum/client.py
+++ b/quantum/client.py
@@ -63,8 +63,6 @@ class Client(object):
 
     """A base client class - derived from Glance.BaseClient"""
 
-    action_prefix = '/v0.1/tenants/{tenant_id}'
-
     # Action query strings
     networks_path = "/networks"
     network_path = "/networks/%s"
@@ -74,7 +72,7 @@ class Client(object):
 
     def __init__(self, host="127.0.0.1", port=9696, use_ssl=False, tenant=None,
                 format="xml", testingStub=None, key_file=None, cert_file=None,
-                logger=None):
+                logger=None, action_prefix="/v0.1/tenants/{tenant_id}"):
         """
         Creates a new client to some service.
 
@@ -97,6 +95,7 @@ class Client(object):
         self.key_file = key_file
         self.cert_file = cert_file
         self.logger = logger
+        self.action_prefix = action_prefix
 
     def get_connection_type(self):
         """
@@ -130,7 +129,7 @@ class Client(object):
 
         # Add format and tenant_id
         action += ".%s" % self.format
-        action = Client.action_prefix + action
+        action = self.action_prefix + action
         action = action.replace('{tenant_id}', self.tenant)
 
         if type(params) is dict:
diff --git a/quantum/plugins/cisco/nova/__init__.py b/quantum/plugins/cisco/nova/__init__.py
index db695fb0af..e69de29bb2 100644
--- a/quantum/plugins/cisco/nova/__init__.py
+++ b/quantum/plugins/cisco/nova/__init__.py
@@ -1,18 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
-# Copyright 2011 Cisco Systems, Inc.  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: Sumit Naiksatam, Cisco Systems, Inc.
-#
diff --git a/quantum/plugins/cisco/nova/quantum_aware_scheduler.py b/quantum/plugins/cisco/nova/quantum_aware_scheduler.py
index b5f21ac820..4d30ccd4a1 100644
--- a/quantum/plugins/cisco/nova/quantum_aware_scheduler.py
+++ b/quantum/plugins/cisco/nova/quantum_aware_scheduler.py
@@ -1,4 +1,3 @@
-"""
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 #
 # Copyright 2011 Cisco Systems, Inc.  All rights reserved.
@@ -17,15 +16,15 @@
 #
 # @author: Sumit Naiksatam, Cisco Systems, Inc.
 #
-"""
 
+from nova import exception as excp
 from nova import flags
 from nova import log as logging
 from nova.scheduler import driver
 from quantum.client import Client
 from quantum.common.wsgi import Serializer
 
-LOG = logging.getLogger('nova.scheduler.quantum_aware_scheduler')
+LOG = logging.getLogger('quantum.plugins.cisco.nova.quantum_aware_scheduler')
 
 FLAGS = flags.FLAGS
 flags.DEFINE_string('quantum_host', "127.0.0.1",
@@ -36,7 +35,11 @@ flags.DEFINE_integer('quantum_port', 9696,
 HOST = FLAGS.quantum_host
 PORT = FLAGS.quantum_port
 USE_SSL = False
+ACTION_PREFIX_EXT = '/v0.1'
+ACTION_PREFIX_CSCO = ACTION_PREFIX_EXT + \
+        '/extensions/csco/tenants/{tenant_id}'
 TENANT_ID = 'nova'
+CSCO_EXT_NAME = 'Cisco Nova Tenant'
 
 
 class QuantumScheduler(driver.Scheduler):
@@ -44,26 +47,47 @@ class QuantumScheduler(driver.Scheduler):
     Quantum network service dependent scheduler
     Obtains the hostname from Quantum using an extension API
     """
+    def __init__(self):
+        # We have to send a dummy tenant name here since the client
+        # needs some tenant name, but the tenant name will not be used
+        # since the extensions URL does not require it
+        client = Client(HOST, PORT, USE_SSL, format='json',
+                        action_prefix=ACTION_PREFIX_EXT, tenant="dummy")
+        request_url = "/extensions"
+        data = client.do_request('GET', request_url)
+        LOG.debug("Obtained supported extensions from Quantum: %s" % data)
+        for ext in data['extensions']:
+            name = ext['name']
+            if name == CSCO_EXT_NAME:
+                LOG.debug("Quantum plugin supports required \"%s\" extension"
+                          "for the scheduler." % name)
+                return
+        LOG.error("Quantum plugin does not support required \"%s\" extension"
+                  " for the scheduler. Scheduler will quit." % CSCO_EXT_NAME)
+        raise excp.ServiceUnavailable()
 
-    def schedule(self, context, topic, *_args, **_kwargs):
+    def schedule(self, context, topic, *args, **kwargs):
         """Gets the host name from the Quantum service"""
-        instance_id = _kwargs['instance_id']
+        instance_id = kwargs['instance_id']
         user_id = \
-                _kwargs['request_spec']['instance_properties']['user_id']
+                kwargs['request_spec']['instance_properties']['user_id']
         project_id = \
-                _kwargs['request_spec']['instance_properties']['project_id']
+                kwargs['request_spec']['instance_properties']['project_id']
 
         instance_data_dict = \
                 {'novatenant': \
-                 {'instance-id': instance_id,
-                  'instance-desc': \
-                  {'user_id': user_id, 'project_id': project_id}}}
-        client = Client(HOST, PORT, USE_SSL, format='json')
-        request_url = "/novatenants/" + project_id + "/get_host"
-        data = client.do_request(TENANT_ID, 'PUT', request_url,
-                                 body=instance_data_dict)
-        hostname = data["host_list"]["host_1"]
+                 {'instance_id': instance_id,
+                  'instance_desc': \
+                  {'user_id': user_id,
+                   'project_id': project_id
+                  }}}
 
+        client = Client(HOST, PORT, USE_SSL, format='json', tenant=TENANT_ID,
+                        action_prefix=ACTION_PREFIX_CSCO)
+        request_url = "/novatenants/" + project_id + "/get_host"
+        data = client.do_request('PUT', request_url, body=instance_data_dict)
+
+        hostname = data["host_list"]["host_1"]
         if not hostname:
             raise driver.NoValidHost(_("Scheduler was unable to locate a host"
                                        " for this request. Is the appropriate"
diff --git a/quantum/plugins/cisco/nova/vifdirect.py b/quantum/plugins/cisco/nova/vifdirect.py
index 1565bfe57e..6581c32f3c 100644
--- a/quantum/plugins/cisco/nova/vifdirect.py
+++ b/quantum/plugins/cisco/nova/vifdirect.py
@@ -1,4 +1,3 @@
-"""
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 # Copyright 2011 Cisco Systems, Inc.  All rights reserved.
 #
@@ -16,19 +15,20 @@
 #
 # @author: Sumit Naiksatam, Cisco Systems, Inc.
 #
-"""
+
 """VIF drivers for interface type direct."""
 
+from nova import exception as excp
 from nova import flags
 from nova import log as logging
-from nova import utils
 from nova.network import linux_net
 from nova.virt.libvirt import netutils
+from nova import utils
 from nova.virt.vif import VIFDriver
 from quantum.client import Client
 from quantum.common.wsgi import Serializer
 
-LOG = logging.getLogger('nova.virt.libvirt.vif')
+LOG = logging.getLogger('quantum.plugins.cisco.nova.vifdirect')
 
 FLAGS = flags.FLAGS
 flags.DEFINE_string('quantum_host', "127.0.0.1",
@@ -40,10 +40,34 @@ HOST = FLAGS.quantum_host
 PORT = FLAGS.quantum_port
 USE_SSL = False
 TENANT_ID = 'nova'
+ACTION_PREFIX_EXT = '/v0.1'
+ACTION_PREFIX_CSCO = ACTION_PREFIX_EXT + \
+        '/extensions/csco/tenants/{tenant_id}'
+TENANT_ID = 'nova'
+CSCO_EXT_NAME = 'Cisco Nova Tenant'
 
 
 class Libvirt802dot1QbhDriver(VIFDriver):
     """VIF driver for Linux bridge."""
+    def __init__(self):
+        # We have to send a dummy tenant name here since the client
+        # needs some tenant name, but the tenant name will not be used
+        # since the extensions URL does not require it
+        client = Client(HOST, PORT, USE_SSL, format='json',
+                        action_prefix=ACTION_PREFIX_EXT, tenant="dummy")
+        request_url = "/extensions"
+        data = client.do_request('GET', request_url)
+        LOG.debug("Obtained supported extensions from Quantum: %s" % data)
+        for ext in data['extensions']:
+            name = ext['name']
+            if name == CSCO_EXT_NAME:
+                LOG.debug("Quantum plugin supports required \"%s\" extension"
+                          "for the VIF driver." % name)
+                return
+        LOG.error("Quantum plugin does not support required \"%s\" extension"
+                  " for the VIF driver. nova-compute will quit." \
+                  % CSCO_EXT_NAME)
+        raise excp.ServiceUnavailable()
 
     def _get_configurations(self, instance, network, mapping):
         """Gets the device name and the profile name from Quantum"""
@@ -51,22 +75,26 @@ class Libvirt802dot1QbhDriver(VIFDriver):
         instance_id = instance['id']
         user_id = instance['user_id']
         project_id = instance['project_id']
+        vif_id = mapping['vif_uuid']
 
         instance_data_dict = \
                 {'novatenant': \
-                 {'instance-id': instance_id,
-                  'instance-desc': \
-                  {'user_id': user_id, 'project_id': project_id}}}
+                 {'instance_id': instance_id,
+                  'instance_desc': \
+                  {'user_id': user_id,
+                   'project_id': project_id,
+                   'vif_id': vif_id
+                  }}}
 
-        client = Client(HOST, PORT, USE_SSL, format='json')
+        client = Client(HOST, PORT, USE_SSL, format='json', tenant=TENANT_ID,
+                        action_prefix=ACTION_PREFIX_CSCO)
         request_url = "/novatenants/" + project_id + "/get_instance_port"
-        data = client.do_request(TENANT_ID, 'PUT', request_url,
-                                 body=instance_data_dict)
+        data = client.do_request('PUT', request_url, body=instance_data_dict)
+
         device = data['vif_desc']['device']
         portprofile = data['vif_desc']['portprofile']
-
-        LOG.debug(_("Quantum returned device: %s\n") % device)
-        LOG.debug(_("Quantum returned portprofile: %s\n") % portprofile)
+        LOG.debug(_("Quantum provided the device: %s") % device)
+        LOG.debug(_("Quantum provided the portprofile: %s") % portprofile)
         mac_id = mapping['mac'].replace(':', '')
 
         result = {

From 0bb571f24bd23ed9f4b38888ed05fd87c50301a8 Mon Sep 17 00:00:00 2001
From: Sumit Naiksatam <snaiksat@cisco.com>
Date: Wed, 24 Aug 2011 03:27:54 -0700
Subject: [PATCH 22/22] Noticed some pep8 errors, fixed them.

---
 quantum/plugins/cisco/nova/quantum_aware_scheduler.py | 5 ++---
 quantum/plugins/cisco/nova/vifdirect.py               | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/quantum/plugins/cisco/nova/quantum_aware_scheduler.py b/quantum/plugins/cisco/nova/quantum_aware_scheduler.py
index 4d30ccd4a1..0f73618ee0 100644
--- a/quantum/plugins/cisco/nova/quantum_aware_scheduler.py
+++ b/quantum/plugins/cisco/nova/quantum_aware_scheduler.py
@@ -79,8 +79,7 @@ class QuantumScheduler(driver.Scheduler):
                  {'instance_id': instance_id,
                   'instance_desc': \
                   {'user_id': user_id,
-                   'project_id': project_id
-                  }}}
+                   'project_id': project_id}}}
 
         client = Client(HOST, PORT, USE_SSL, format='json', tenant=TENANT_ID,
                         action_prefix=ACTION_PREFIX_CSCO)
@@ -93,5 +92,5 @@ class QuantumScheduler(driver.Scheduler):
                                        " for this request. Is the appropriate"
                                        " service running?"))
 
-        LOG.debug(_("Quantum service returned host: %s\n") % hostname)
+        LOG.debug(_("Quantum service returned host: %s") % hostname)
         return hostname
diff --git a/quantum/plugins/cisco/nova/vifdirect.py b/quantum/plugins/cisco/nova/vifdirect.py
index 6581c32f3c..c1fd09af46 100644
--- a/quantum/plugins/cisco/nova/vifdirect.py
+++ b/quantum/plugins/cisco/nova/vifdirect.py
@@ -83,8 +83,7 @@ class Libvirt802dot1QbhDriver(VIFDriver):
                   'instance_desc': \
                   {'user_id': user_id,
                    'project_id': project_id,
-                   'vif_id': vif_id
-                  }}}
+                   'vif_id': vif_id}}}
 
         client = Client(HOST, PORT, USE_SSL, format='json', tenant=TENANT_ID,
                         action_prefix=ACTION_PREFIX_CSCO)