Merge lp:~gandelman-a/ubuntu/precise/quantum/UCA_2012.2.1 into lp:~ubuntu-cloud-archive/ubuntu/precise/quantum/folsom

[Adam Gandelman]

Syncs the lp:~ubuntu-cloud-archive branch to current state of the package in the U.C.A., and imports current SRU pending in quantal-proposed.

=== modified file '.pc/fix-quantum-configuration.patch/etc/l3_agent.ini'
--- .pc/fix-quantum-configuration.patch/etc/l3_agent.ini	2012-09-21 13:01:18 +0000
+++ .pc/fix-quantum-configuration.patch/etc/l3_agent.ini	2013-01-08 00:32:21 +0000
@@ -34,7 +34,7 @@
 # value should be set to the UUID of that external network.  If empty,
 # the agent will enforce that only a single external networks exists and
 # use that external network id
-# gateway_external_net_id =
+# gateway_external_network_id =
 
 # Indicates that this L3 agent should also handle routers that do not have
 # an external network gateway configured.  This option should be True only

=== modified file '.pc/fix-quantum-configuration.patch/etc/quantum.conf'
--- .pc/fix-quantum-configuration.patch/etc/quantum.conf	2012-09-26 15:14:31 +0000
+++ .pc/fix-quantum-configuration.patch/etc/quantum.conf	2013-01-08 00:32:21 +0000
@@ -107,18 +107,6 @@
 # qpid_password = ''
 # Space separated list of SASL mechanisms to use for auth
 # qpid_sasl_mechanisms = ''
-# Automatically reconnect
-# qpid_reconnect = True
-# Reconnection timeout in seconds
-# qpid_reconnect_timeout = 0
-# Max reconnections before giving up
-# qpid_reconnect_limit = 0
-# Minimum seconds between reconnection attempts
-# qpid_reconnect_interval_min = 0
-# Maximum seconds between reconnection attempts
-# qpid_reconnect_interval_max = 0
-# Equivalent to setting max and min to the same value
-# qpid_reconnect_interval = 0
 # Seconds between connection keepalive heartbeats
 # qpid_heartbeat = 60
 # Transport to use, either 'tcp' or 'ssl'

=== modified file '.pc/fix-quantum-configuration.patch/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini'
--- .pc/fix-quantum-configuration.patch/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini	2012-09-12 13:41:20 +0000
+++ .pc/fix-quantum-configuration.patch/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini	2013-01-08 00:32:21 +0000
@@ -64,7 +64,7 @@
 # empty for the server. Set local-ip to be the local IP address of
 # this hypervisor.
 #
-# Default: local_ip = 10.0.0.3
+# Default: local_ip =
 
 # (ListOpt) Comma-separated list of <physical_network>:<bridge> tuples
 # mapping physical network names to the agent's node-specific OVS

=== modified file '.pc/fix-ubuntu-tests.patch/quantum/tests/unit/test_linux_ip_lib.py'
--- .pc/fix-ubuntu-tests.patch/quantum/tests/unit/test_linux_ip_lib.py	2012-09-21 13:01:18 +0000
+++ .pc/fix-ubuntu-tests.patch/quantum/tests/unit/test_linux_ip_lib.py	2013-01-08 00:32:21 +0000
@@ -72,6 +72,13 @@
 default via 10.35.19.254
 """)
 
+DEVICE_ROUTE_SAMPLE = ("10.0.0.0/24  scope link  src 10.0.0.2")
+
+SUBNET_SAMPLE1 = ("10.0.0.0/24 dev qr-23380d11-d2  scope link  src 10.0.0.1\n"
+                  "10.0.0.0/24 dev tap1d7888a7-10  scope link  src 10.0.0.2")
+SUBNET_SAMPLE2 = ("10.0.0.0/24 dev tap1d7888a7-10  scope link  src 10.0.0.2\n"
+                  "10.0.0.0/24 dev qr-23380d11-d2  scope link  src 10.0.0.1")
+
 
 class TestSubProcessBase(unittest.TestCase):
     def setUp(self):
@@ -543,6 +550,34 @@
             self.assertEquals(self.route_cmd.get_gateway(),
                               test_case['expected'])
 
+    def test_pullup_route(self):
+        # interface is not the first in the list - requires
+        # deleting and creating existing entries
+        output = [DEVICE_ROUTE_SAMPLE, SUBNET_SAMPLE1]
+
+        def pullup_side_effect(self, *args):
+            result = output.pop(0)
+            return result
+
+        self.parent._run = mock.Mock(side_effect=pullup_side_effect)
+        self.route_cmd.pullup_route('tap1d7888a7-10')
+        self._assert_sudo([], ('del', '10.0.0.0/24', 'dev', 'qr-23380d11-d2'))
+        self._assert_sudo([], ('append', '10.0.0.0/24', 'proto', 'kernel',
+                               'src', '10.0.0.1', 'dev', 'qr-23380d11-d2'))
+
+    def test_pullup_route_first(self):
+        # interface is first in the list - no changes
+        output = [DEVICE_ROUTE_SAMPLE, SUBNET_SAMPLE2]
+
+        def pullup_side_effect(self, *args):
+            result = output.pop(0)
+            return result
+
+        self.parent._run = mock.Mock(side_effect=pullup_side_effect)
+        self.route_cmd.pullup_route('tap1d7888a7-10')
+        # Check two calls - device get and subnet get
+        self.assertEqual(len(self.parent._run.mock_calls), 2)
+
 
 class TestIpNetnsCommand(TestIPCmdBase):
     def setUp(self):

=== modified file 'AUTHORS'
--- AUTHORS	2012-09-21 13:01:18 +0000
+++ AUTHORS	2013-01-08 00:32:21 +0000
@@ -11,6 +11,7 @@
 Brian Waldon <[e-mail]>
 chnm-kulkarni <[e-mail]>
 Clark Boylan <[e-mail]>
+Dan Prince <[e-mail]>
 Dan Wendlandt <[e-mail]>
 Dave Lapsley <[e-mail]>
 Debo <[e-mail]>
@@ -28,10 +29,12 @@
 Hiroaki KAWAI <[e-mail]>
 Hisaharu Ishii <[e-mail]>
 Ionuț Arțăriși <[e-mail]>
+Iryoung Jeong <[e-mail]>
 Isaku Yamahata <[e-mail]>
 James E. Blair <[e-mail]>
 James E. Blair <[e-mail]>
 Jason Kölker <[e-mail]>
+Jeremy Hanmer <[e-mail]>
 Jeremy Stanley <[e-mail]>
 Jesse Andrews <[e-mail]>
 Jiajun Liu <[e-mail]>
@@ -46,6 +49,7 @@
 Madhav Puri <[e-mail]>
 Major Hayden <[e-mail]>
 Mark McClain <[e-mail]>
+Mark McLoughlin <[e-mail]>
 Maru Newby <[e-mail]>
 mat <[e-mail]>
 Monty Taylor <[e-mail]>
@@ -76,8 +80,10 @@
 Shweta P <[e-mail]>
 siyingchun <[e-mail]>
 Soheil Hassas Yeganeh <[e-mail]>
+Somik Behera <[e-mail]>
 Somik Behera <[e-mail]>
 Sumit Naiksatam <[e-mail]>
+Takaaki Suzuki <[e-mail]>
 Thierry Carrez <[e-mail]>
 Tyler Smith <[e-mail]>
 vinkesh banka <[e-mail]>

=== modified file 'ChangeLog'
--- ChangeLog	2012-09-26 15:14:31 +0000
+++ ChangeLog	2013-01-08 00:32:21 +0000
@@ -1,3 +1,862 @@
+commit 3a6cc2f6dce82b6554618418a9424588a047ffc6
+Author: Mark McLoughlin <[e-mail]>
+Date:   Thu Nov 29 21:25:50 2012 +0000
+
+    Final 2012.2.1 versioning
+    
+    Change-Id: Iedbe1d2f4586f93e27a878a40ce00f65914035a7
+
+ quantum/version.py |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit aeabb42493e7889992fa8b1a32dabda4432174c5
+Author: Gary Kotton <[e-mail]>
+Date:   Mon Nov 26 17:07:12 2012 +0000
+
+    Fixes order of route entries.
+    
+    Fixes bug 1083238
+    
+    This patch makes sure that a route entry for dnsmasq is placed first
+    before any others (for example the l3-agent one). This makes DHCP work
+    when network namespaces are disabled.
+    
+    Change-Id: I241a8e30127d614f7582e10d999521f6486e5255
+
+ quantum/agent/dhcp_agent.py             |    5 ++++
+ quantum/agent/linux/ip_lib.py           |   40 +++++++++++++++++++++++++++++++
+ quantum/tests/unit/test_linux_ip_lib.py |   35 +++++++++++++++++++++++++++
+ 3 files changed, 80 insertions(+)
+
+commit abb2bd3a0d0d72c4e4183221c23321ad24623e30
+Merge: ca7fc10 04aab72
+Author: Jenkins <[e-mail]>
+Date:   Tue Nov 27 23:46:53 2012 +0000
+
+    Merge "Part of the patch set that enables VM's to use libvirts bridge type." into stable/folsom
+
+commit ca7fc10dac532fdea5398b394ac3e58b1c3d8791
+Author: Dan Wendlandt <[e-mail]>
+Date:   Tue Nov 27 13:14:54 2012 -0800
+
+    Use DB count to get resource counts.
+    
+    Fixes bug 1075369, and includes bugs 1081259, 1083696 which fixed
+    regression in the original version of this patch and bug 1083180
+    which improves the documentation of the original patch.
+    
+    During quota check we used to simply retrieve the entire collection
+    of resources from the database, then counting them in Python. This
+    patch introduces a specialized _get_collection_count() method, which
+    instead take advantage of the DB's built-in count capabilities.
+    
+    In order to take advantage of this, plugins can now implement
+    get_*_count() methods for their resources. This is used (if present)
+    by the quota checking function.
+    
+    Change-Id: Idc347cfacc363f2cac47356296514fe735625f29
+
+ quantum/db/db_base_plugin_v2.py         |   30 ++++++++++++--
+ quantum/db/l3_db.py                     |    8 ++++
+ quantum/extensions/l3.py                |    6 +++
+ quantum/plugins/cisco/network_plugin.py |    5 +++
+ quantum/quantum_plugin_base_v2.py       |   65 +++++++++++++++++++++++++++++--
+ quantum/quota.py                        |   16 ++++++--
+ quantum/tests/unit/test_api_v2.py       |   46 ++++++++++++++--------
+ quantum/tests/unit/test_db_plugin.py    |    9 ++++-
+ quantum/tests/unit/test_l3_plugin.py    |    1 +
+ 9 files changed, 158 insertions(+), 28 deletions(-)
+
+commit 66605e8d9121bca00b5b5245294d82b46b4708e0
+Author: gongysh <[e-mail]>
+Date:   Tue Nov 27 09:59:40 2012 +0800
+
+    Make sure we can update when there is no gateway port linked to it
+    
+    Bug #1083387
+    
+    Change-Id: I7e56d072a6e430ddde816781fe480c6028577c5f
+
+ quantum/db/l3_db.py                  |   10 ++++------
+ quantum/tests/unit/test_l3_plugin.py |   29 +++++++++++++++++++++++++++++
+ 2 files changed, 33 insertions(+), 6 deletions(-)
+
+commit 9f3d9119bb9b4e524b9fca2a6a7e77be81bc0672
+Merge: d334d5b c60051a
+Author: Jenkins <[e-mail]>
+Date:   Tue Nov 27 06:21:32 2012 +0000
+
+    Merge "Updates tearDown() to release instance objects" into stable/folsom
+
+commit d334d5b7fb918d5bfc379e8fab49db9c92771fad
+Merge: c1e19d7 3179dfc
+Author: Jenkins <[e-mail]>
+Date:   Tue Nov 27 06:20:56 2012 +0000
+
+    Merge "Updates clear_db() to unregister models and close session." into stable/folsom
+
+commit c1e19d7a903863f2343bf6068e0ff54ebcb5599b
+Author: Gary Kotton <[e-mail]>
+Date:   Wed Nov 7 05:46:08 2012 +0000
+
+    Treat case when pid is None
+    
+    Fixes bug 1077651
+    
+    Change-Id: Id80d923d36a0339eee860e8cf37aacc6866fc6bc
+
+ quantum/agent/linux/dhcp.py           |    3 +++
+ quantum/tests/unit/test_linux_dhcp.py |    8 ++++++++
+ 2 files changed, 11 insertions(+)
+
+commit c60051ac6b95d0e146f81d04dba0367edc8b9f78
+Author: Iryoung Jeong <[e-mail]>
+Date:   Thu Nov 22 12:58:47 2012 +0900
+
+    Updates tearDown() to release instance objects
+    
+    This change fixes the bug by releasing the objects of the instance
+    of class QuantumDbPluginV2TestCase. Removing unnecessary objects
+    explicitly reduces the memory required by unit tests.
+    
+    Fixes bug 1065276
+    
+    Change-Id: Ia003a7718e1aedc4e4c8fb02b723f4a511ebc319
+
+ quantum/tests/unit/test_db_plugin.py |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit 375b737ec350079693fe98da7ff68b4c0cb6653d
+Merge: 9a0a216 af9e076
+Author: Jenkins <[e-mail]>
+Date:   Thu Nov 22 16:55:48 2012 +0000
+
+    Merge "Ensure that the expiration time for leased IP is updated correctly" into stable/folsom
+
+commit 9a0a21698df6130d5ac07e7a3f9d8feb81ada648
+Merge: eacc9d3 e0d1a7d
+Author: Jenkins <[e-mail]>
+Date:   Thu Nov 22 16:55:37 2012 +0000
+
+    Merge "bug 1057844: improve floating-ip association checks" into stable/folsom
+
+commit af9e07628907bb6a2f2095325e9b6a47b9cbaedd
+Author: Gary Kotton <[e-mail]>
+Date:   Sat Nov 17 05:51:47 2012 +0000
+
+    Ensure that the expiration time for leased IP is updated correctly
+    
+    Fixes bug 1081664
+    
+    Change-Id: I77596ef65be817a874fad41b49e7ddbc0663c237
+
+ quantum/db/db_base_plugin_v2.py |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit aeef038f589b6e6a4be801ab5347f2d5d545d2cd
+Merge: fd8b072 8471d79
+Author: Jenkins <[e-mail]>
+Date:   Tue Nov 20 16:37:03 2012 +0000
+
+    Merge "Ensure that deleted gateway IP address is recycled correctly" into stable/folsom
+
+commit fd8b0729b25059c93caa29e077880c0098d47a48
+Merge: 51b4c82 aca8b4a
+Author: Jenkins <[e-mail]>
+Date:   Tue Nov 20 16:36:53 2012 +0000
+
+    Merge "Ensure that fixed port IP address is in valid allocation range." into stable/folsom
+
+commit 04aab72941894287f1f3bd0fd43351807ac0bcc0
+Author: Gary Kotton <[e-mail]>
+Date:   Thu Oct 25 03:22:03 2012 +0000
+
+    Part of the patch set that enables VM's to use libvirts bridge type.
+    
+    Fixes bug 1078210
+    
+    The patch set enables the following:
+    1. Bridges to be created by Nova
+    2. Bridges to be created by the agent
+    
+    The code is backward compatible, that is, if Nova does not create the brdige
+    then the agent will create the bridge.
+    
+    In addition to this it cleans gateway code no longer used.
+    
+    The patch enables the following Nova code to be backported:
+    https://review.openstack.org/#/c/14830/
+    
+    Change-Id: Ia621ba5edd12d8eb7ea412a2993fea43189bd511
+
+ .../linuxbridge/agent/linuxbridge_quantum_agent.py |  113 ++++++++------------
+ .../unit/linuxbridge/test_lb_quantum_agent.py      |   54 ++++++++++
+ 2 files changed, 100 insertions(+), 67 deletions(-)
+
+commit e0d1a7d61036074633fc9815ad96be244462d8f4
+Author: Dan Wendlandt <[e-mail]>
+Date:   Tue Nov 20 14:09:19 2012 -0800
+
+    bug 1057844: improve floating-ip association checks
+    
+    allow multiple floating ips to be associated with the same internal port
+    as long as they map to different external nets (not yet supported in
+    Folsom) or different internal fixed IPs.  With Quantum, there is no
+    need to disallow either scenario.
+    
+    Also improve check for a valid external network to router to internal
+    subnet path when a floating IP is bound.
+    
+    Change-Id: Iced675e1f064172ee8a5bb6b9e37032e83af5711
+
+ quantum/db/l3_db.py                  |   67 +++++++++++++++++++---------------
+ quantum/extensions/l3.py             |    8 ++--
+ quantum/tests/unit/test_l3_plugin.py |   15 +++-----
+ 3 files changed, 49 insertions(+), 41 deletions(-)
+
+commit eacc9d3c344d018e3d32b0352c90239e1e4c25b3
+Author: Bob Kukura <[e-mail]>
+Date:   Tue Nov 13 13:50:53 2012 -0500
+
+    Improve openvswitch and linuxbridge agents' parsing of mappings
+    
+    Created generic quantum.utils.parse_mappings function that detects
+    duplicate key or value strings, and changed openvswitch and
+    linuxbridge agents to use this to parse their mappings from physical
+    networks to bridges or interfaces. Fixes bug 1067669.
+    
+    Also fixed some typos in comments.
+    
+    Change-Id: I342eaeeb6ff4c6e25d57d631f250faac082011b8
+
+ quantum/common/utils.py                            |   31 ++++++++++
+ .../linuxbridge/agent/linuxbridge_quantum_agent.py |   22 ++++---
+ .../plugins/openvswitch/agent/ovs_quantum_agent.py |   25 ++++----
+ quantum/tests/unit/test_common_utils.py            |   60 ++++++++++++++++++++
+ 4 files changed, 111 insertions(+), 27 deletions(-)
+
+commit 3179dfc5805d5488483422a7483443f71fedcc44
+Author: Iryoung Jeong <[e-mail]>
+Date:   Thu Nov 15 15:23:12 2012 +0900
+
+    Updates clear_db() to unregister models and close session.
+    
+    fixes bug 1080988
+    
+    This change fixes the bug by ensuring the metadata and session objects
+    are properly cleaned up by clear_db(). Using the proper calls reduces
+    the memory required by unit tests.
+    
+    Change-Id: I1d1802b642eff83b7f96211608195afaf68e855a
+
+ quantum/db/api.py |   11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+commit 51b4c82fe548477c6c6a1d65d4af59686bdf9cae
+Author: Dan Wendlandt <[e-mail]>
+Date:   Mon Nov 19 09:29:52 2012 -0800
+
+    fix incorrect kwarg param name for region with l3-agent
+    
+    bug 1080793
+    
+    Change-Id: Iec600e98406b0210ab3a472c97f3b4d8f0f96d44
+
+ quantum/agent/l3_agent.py |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 82b1ac5a019fcaa6e21faf3b14eca9f8b8fa0e88
+Merge: 978d345 6f0a486
+Author: Jenkins <[e-mail]>
+Date:   Mon Nov 19 12:46:30 2012 +0000
+
+    Merge "Delete floating port and floatingip in the same transaction" into stable/folsom
+
+commit 978d345872557d0c4d977b7d8de5f1e871b7611e
+Merge: a112840 db6cda7
+Author: Jenkins <[e-mail]>
+Date:   Mon Nov 19 12:41:40 2012 +0000
+
+    Merge "Remove qpid configuration variables no longer supported" into stable/folsom
+
+commit a112840bc38d4a7d0d821740d06e4721b4086f82
+Author: Aaron Rosen <[e-mail]>
+Date:   Thu Nov 15 09:40:53 2012 -0800
+
+    Allow NVP plugin to use per-tenant quota extension
+    
+    Change-Id: I704b52471e44b2d4e75dcf4435d55d6c6974a870
+
+ quantum/extensions/extensions.py |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+commit 8471d79d5dc4a3eda1f0c86e2ffc47d4d74e7226
+Author: Gary Kotton <[e-mail]>
+Date:   Tue Nov 13 00:12:45 2012 +0000
+
+    Ensure that deleted gateway IP address is recycled correctly
+    
+    Fixes bug 1079980
+    
+    Change-Id: I6819899cae6f366423ade70613c85fd84d1a270d
+
+ quantum/db/db_base_plugin_v2.py      |    3 ++-
+ quantum/tests/unit/test_db_plugin.py |    2 ++
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+commit aca8b4a0f8c1d8d7191a58eef9feaab8169e8d64
+Author: Gary Kotton <[e-mail]>
+Date:   Wed Nov 7 00:44:35 2012 +0000
+
+    Ensure that fixed port IP address is in valid allocation range.
+    
+    Fixes bug 1077292
+    
+    Change-Id: I587655bece83d0f6aa665e522efbc0ecd5ef1734
+
+ quantum/db/db_base_plugin_v2.py      |   56 +++++++++++++++++++++++++---------
+ quantum/tests/unit/test_db_plugin.py |   34 +++++++++++++++++++++
+ 2 files changed, 76 insertions(+), 14 deletions(-)
+
+commit 6f0a4864dba3853fb92b26cd8468c9b5ddef3b35
+Author: gongysh <[e-mail]>
+Date:   Mon Nov 19 10:00:01 2012 +0800
+
+    Delete floating port and floatingip in the same transaction
+    
+    Bug #1080516
+    
+    Change-Id: Icb5b71e29af582cb0e381e22909f46b325063d71
+
+ quantum/db/l3_db.py |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+commit db6cda725e1f9dd6093bb45e029428bf5f465226
+Author: Gary Kotton <[e-mail]>
+Date:   Sat Nov 10 22:29:35 2012 +0000
+
+    Remove qpid configuration variables no longer supported
+    
+    Change-Id: I25396654fdd03ae54d7d7470a9d2952689836c50
+
+ etc/quantum.conf |   12 ------------
+ 1 file changed, 12 deletions(-)
+
+commit 82b1a55cc98519240169c27be0652ee00fd1dffc
+Author: Gary Kotton <[e-mail]>
+Date:   Sat Nov 10 06:59:33 2012 +0000
+
+    Update stable with stable oslo (aka common)
+    
+    This fixes bug 1073999
+    
+    Change-Id: I191af50a7b0ab6c3c19fd24757d7466e67549615
+
+ quantum/openstack/common/cfg.py            |    2 +-
+ quantum/openstack/common/log.py            |    9 ++-
+ quantum/openstack/common/notifier/api.py   |    6 +-
+ quantum/openstack/common/policy.py         |    5 +-
+ quantum/openstack/common/rpc/__init__.py   |   12 +++-
+ quantum/openstack/common/rpc/amqp.py       |    8 +++
+ quantum/openstack/common/rpc/impl_kombu.py |   30 ++++++----
+ quantum/openstack/common/rpc/impl_qpid.py  |   88 +++++++++++-----------------
+ quantum/openstack/common/timeutils.py      |   10 +++-
+ 9 files changed, 88 insertions(+), 82 deletions(-)
+
+commit 60cf2e04fd01389536628ee6a12d810b92090d6a
+Merge: fcd12ba c01a839
+Author: Jenkins <[e-mail]>
+Date:   Wed Nov 14 17:21:08 2012 +0000
+
+    Merge "Validate L3 inputs." into stable/folsom
+
+commit fcd12bab09330247dd654c1daf16d4493b38f72b
+Merge: 49f649c 26b383f
+Author: Jenkins <[e-mail]>
+Date:   Wed Nov 14 17:10:06 2012 +0000
+
+    Merge "Add check for cidr overrapping for adding external gateway" into stable/folsom
+
+commit 26b383f839bdd9933bda3eac7b39a36b6f472f12
+Author: Nachi Ueno <[e-mail]>
+Date:   Fri Sep 21 20:52:16 2012 +0000
+
+    Add check for cidr overrapping for adding external gateway
+    
+    Fixes bug 1053633
+    Also add check for cidr overrapping between external gateway and
+    interfaces
+    
+    Change-Id: I5bfb2fd96ea467b63e940893979a912caf550deb
+
+ quantum/db/l3_db.py                  |    9 ++++++--
+ quantum/tests/unit/test_l3_plugin.py |   40 +++++++++++++++++++++++++++++++---
+ 2 files changed, 44 insertions(+), 5 deletions(-)
+
+commit c01a8391d772f41685a7b06acb81993ca341e3ab
+Author: Gary Kotton <[e-mail]>
+Date:   Wed Nov 7 22:57:59 2012 +0000
+
+    Validate L3 inputs.
+    
+    Fixes bug 1064765
+    
+    Change-Id: Idb8d078f3c640d450bcb738cddf875b5e49f1b60
+
+ quantum/extensions/l3.py |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+commit 49f649c80d0d67feb4cdcb8ec7cb0570abbfbe4b
+Author: Gary Kotton <[e-mail]>
+Date:   Mon Oct 8 05:58:00 2012 +0000
+
+    Ensure that HTTP 400 codes are returned for invalid input
+    
+    Fixes bug 1062046
+    
+    A number of additional validation functions were added. They
+    do basic validations.
+    
+    Change-Id: I0fc207e996f11b50fdaa4d80075ae5704cba7003
+
+ quantum/api/v2/attributes.py          |  192 ++++++++++++++++++++++++++++++---
+ quantum/api/v2/base.py                |    6 +-
+ quantum/api/v2/resource.py            |    5 +-
+ quantum/db/db_base_plugin_v2.py       |    8 +-
+ quantum/tests/unit/test_attributes.py |  111 ++++++++++++++++---
+ quantum/tests/unit/test_db_plugin.py  |  180 ++++++++++++++++++++++++++++++-
+ 6 files changed, 461 insertions(+), 41 deletions(-)
+
+commit 4546a18cb4bfbd8b1a8fc0614e4236ec3e546b17
+Author: Jeremy Hanmer <[e-mail]>
+Date:   Thu Oct 18 16:26:41 2012 -0700
+
+    IP subnet validation fixes
+    
+    Fixes bug #1067959
+    
+    Assure prefix length is included in CIDR definition.
+    
+    Change-Id: I32bb3dd1e5bffb409b3adee03015e21cce71caea
+
+ quantum/api/v2/attributes.py          |   11 +++++----
+ quantum/tests/unit/test_attributes.py |   40 +++++++++++++++++++++++++++++++++
+ quantum/tests/unit/test_db_plugin.py  |   22 ++++++++++++++++++
+ 3 files changed, 69 insertions(+), 4 deletions(-)
+
+commit bab220a5091de2c46d2874606be271cf14ed93f8
+Merge: 63b81f6 9ba453a
+Author: Jenkins <[e-mail]>
+Date:   Wed Nov 7 07:59:19 2012 +0000
+
+    Merge "Update KillFilter to handle 'deleted' exe's." into stable/folsom
+
+commit 9ba453a1ae65b1ee450a3a42314038f6c9011630
+Author: Dan Prince <[e-mail]>
+Date:   Wed Oct 31 22:11:42 2012 -0400
+
+    Update KillFilter to handle 'deleted' exe's.
+    
+    Updates KillFilter so that it handles the case where the executable
+    linked to by /proc/PID/exe is updated or deleted.
+    
+    Includes new test case with coverage for this fix as well.
+    
+    Fixes LP Bug #1073768
+    
+    Change-Id: If568693e0b491f8806ff0156701766929ca0b3e0
+
+ quantum/rootwrap/filters.py         |    4 ++++
+ quantum/tests/unit/test_rootwrap.py |   14 ++++++++++++++
+ 2 files changed, 18 insertions(+)
+
+commit ec9f1a47bbaa7d0f3c45416fcb706038010274fa
+Merge: 70e07d7 7c8a55c
+Author: Jenkins <[e-mail]>
+Date:   Sun Nov 4 04:57:16 2012 +0000
+
+    Merge "Make create_floatingip support transaction" into stable/folsom
+
+commit 70e07d799ad94cf842e17c69c88c5a8a2d888cd1
+Merge: ee0fbe3 c9b84cf
+Author: Jenkins <[e-mail]>
+Date:   Thu Nov 1 14:39:16 2012 +0000
+
+    Merge "Fix exception when port status is updated with linux bridge plugin" into stable/folsom
+
+commit ee0fbe31ba085e413f0040b1f12b8abb107b5f18
+Merge: 574e278 cb57932
+Author: Jenkins <[e-mail]>
+Date:   Thu Nov 1 11:40:21 2012 +0000
+
+    Merge "Get subnets of router interfaces with an elevated context." into stable/folsom
+
+commit 574e278b7501016d7d8f071aa616b8f685cde839
+Author: Yoshihiro Kaneko <[e-mail]>
+Date:   Mon Oct 1 15:56:50 2012 +0900
+
+    Update vif driver of Ryu plugin
+    
+    Fixes bug 1059393
+    
+    This patch allows Ryu plugin to be compatible with Nova Security Groups.
+    
+    Change-Id: I55d0122f3b5b10c9b86eb300635a372eb800b658
+
+ quantum/plugins/ryu/nova/vif.py |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+commit c9b84cfc5ed9f99b57170e53d1d05d3dd1c2dfa7
+Author: Gary Kotton <[e-mail]>
+Date:   Thu Oct 25 03:30:24 2012 +0000
+
+    Fix exception when port status is updated with linux bridge plugin
+    
+    Fixes bug 1072713
+    
+    Change-Id: I3466e747764fc379d413d9493cf80ea35552179f
+
+ quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py |    2 ++
+ 1 file changed, 2 insertions(+)
+
+commit c35635366dac8213250dd0a58dbffc9bbece7dc1
+Merge: 168ce12 607f486
+Author: Jenkins <[e-mail]>
+Date:   Wed Oct 31 13:52:55 2012 +0000
+
+    Merge "Logging indicates when service starts and terminates" into stable/folsom
+
+commit 168ce12b42b62310a37f2cfdbb66189909d21cb6
+Merge: 067c7ee 21a0fdf
+Author: Jenkins <[e-mail]>
+Date:   Wed Oct 31 13:52:46 2012 +0000
+
+    Merge "Fix flag name for l3 agent external network id" into stable/folsom
+
+commit 067c7eeffb06c9db1ec0825c561e983e1f4dc606
+Merge: bff17fb 5cbaff4
+Author: Jenkins <[e-mail]>
+Date:   Wed Oct 31 13:49:59 2012 +0000
+
+    Merge "use object directly instead of the foreigh key to update master db object." into stable/folsom
+
+commit 63b81f648ea207d2618e4b48533c59f6d58184f8
+Author: gongysh <[e-mail]>
+Date:   Wed Oct 24 16:13:09 2012 +0800
+
+    Delete the child object via setting the parent's attribute to None.
+    
+    Bug #1070335
+    
+    We should not operate the foreigh key attribute of parent attribute
+    directly.
+    
+    Change-Id: I98dc8eae78fdf67f0e7189e73afba77c6affcc0e
+
+ quantum/db/l3_db.py                  |    2 +-
+ quantum/tests/unit/test_l3_plugin.py |   24 ++++++++++++++++++++++++
+ 2 files changed, 25 insertions(+), 1 deletion(-)
+
+commit 7c8a55ce9f4d5e1caa32cc7e14f53ce638686241
+Author: Nachi Ueno <[e-mail]>
+Date:   Thu Oct 25 21:14:48 2012 +0000
+
+    Make create_floatingip support transaction
+    
+    Fixes bug #1064748
+    Also added unit test
+    
+    Change-Id: I82b2031af0a87a92ace9a8b86f89772beaca5e8f
+
+ quantum/db/l3_db.py                  |   39 ++++++++++++++++------------------
+ quantum/tests/unit/test_l3_plugin.py |   39 ++++++++++++++++++++++++++++++++++
+ 2 files changed, 57 insertions(+), 21 deletions(-)
+
+commit cb5793241739dfb2c3b2b74cc1c5f6972f37cccc
+Author: Akihiro MOTOKI <[e-mail]>
+Date:   Mon Oct 29 22:37:37 2012 +0900
+
+    Get subnets of router interfaces with an elevated context.
+    
+    Fixes bug 1057558
+    
+    A router may have interfaces owned by other tenants (by admin operations).
+    An elevated context is required to get subnet information for such interfaces.
+    
+    Change-Id: Iaf24c842c2c1e3c52573e7f9831d5f6d8fc01885
+
+ quantum/db/l3_db.py                  |    3 ++-
+ quantum/tests/unit/test_l3_plugin.py |   40 ++++++++++++++++++++++++++++++++++
+ 2 files changed, 42 insertions(+), 1 deletion(-)
+
+commit bff17fb84038f31ec8869b412fba4789f803f868
+Author: Gary Kotton <[e-mail]>
+Date:   Sat Oct 27 02:36:25 2012 +0000
+
+    Ensure that the SqlSoup import is still supported.
+    
+    The sqlalchemy package 0.8.0b1 released on October 30, 2012
+    removed SQLSoup (http://docs.sqlalchemy.org/en/latest/changelog/migration_08.html#sqlsoup)
+    
+    A number of quantum agents make use of this code to access the
+    database.
+    
+    Change-Id: I6ed6424277d60598d9b2b66eb0b206f1a634991e
+
+ tools/pip-requires |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 607f486ef5483303bcb9c458b54bbaae6402150d
+Author: Gary Kotton <[e-mail]>
+Date:   Mon Oct 8 02:44:50 2012 +0000
+
+    Logging indicates when service starts and terminates
+    
+    Fixes bug 1064070
+    
+    The patch adds a log entry indication that the service has started. In
+    addition to this if there is an "exit" statement in the code, then the
+    log message will indicate that the service has been terminated.
+    
+    Change-Id: Idb6cff4b85d26331df2c6e14aa0680e82b4e2cd7
+
+ quantum/common/config.py                                   |    1 +
+ .../plugins/linuxbridge/agent/linuxbridge_quantum_agent.py |    6 ++++--
+ quantum/plugins/linuxbridge/lb_quantum_plugin.py           |    6 ++++--
+ quantum/plugins/openvswitch/agent/ovs_quantum_agent.py     |   10 +++++++---
+ quantum/plugins/openvswitch/ovs_quantum_plugin.py          |   12 ++++++++----
+ 5 files changed, 24 insertions(+), 11 deletions(-)
+
+commit 632e3c8d5a992c311ec983a1d05aa75a3ad002e7
+Merge: 5e1fe1c e091a29
+Author: Jenkins <[e-mail]>
+Date:   Sun Oct 28 23:03:45 2012 +0000
+
+    Merge "l3_nat_agent was renamed to l3_agent and this was missed." into stable/folsom
+
+commit 5e1fe1c48ebfc064f459accd11dec9f11377499a
+Merge: 122d927 9030969
+Author: Jenkins <[e-mail]>
+Date:   Sun Oct 28 22:48:44 2012 +0000
+
+    Merge "remove default value of local_ip in OVS agent" into stable/folsom
+
+commit 122d927237625b7dd27e2a3a42e7594ada10dcdd
+Merge: 0e2cb4c 425e942
+Author: Jenkins <[e-mail]>
+Date:   Sun Oct 28 22:38:51 2012 +0000
+
+    Merge "Call iptables without absolute path." into stable/folsom
+
+commit 0e2cb4cc19ce786fff115d411a3f249639527052
+Merge: d345667 51c8799
+Author: Jenkins <[e-mail]>
+Date:   Sun Oct 28 22:34:29 2012 +0000
+
+    Merge "Ensures port is not created when database exception occurs" into stable/folsom
+
+commit d345667736fd322b14f923fe596d4aaa0f502e73
+Merge: b4f9b1f fc97da9
+Author: Jenkins <[e-mail]>
+Date:   Sun Oct 28 22:02:17 2012 +0000
+
+    Merge "correct nvplib to update device_id" into stable/folsom
+
+commit 2504f628217099208982e14caa3a5afcb77e4d25
+Author: Aaron Rosen <[e-mail]>
+Date:   Thu Oct 4 16:18:58 2012 -0700
+
+    get_network in nvp plugin didn't return subnet information
+    
+    Adds unit test for show network which checks for subnet.
+    
+    Fixes bug 1061781
+    
+    Change-Id: I459a1f11a9e4294c31d002c8dbcfde873e43c800
+
+ quantum/plugins/nicira/nicira_nvp_plugin/QuantumPlugin.py |    4 +++-
+ quantum/tests/unit/test_db_plugin.py                      |    8 ++++++++
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+commit 21a0fdf8bdeca0edadbd2068795a7c27b4ee6fa2
+Author: Takaaki Suzuki <[e-mail]>
+Date:   Tue Sep 25 15:32:33 2012 +0900
+
+    Fix flag name for l3 agent external network id
+    
+    Bug #1056720
+    
+    Change-Id: I744da7e1584d5230a23c4fc8b6fc258814babfa9
+
+ etc/l3_agent.ini          |    2 +-
+ quantum/agent/l3_agent.py |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 5cbaff430fc85db80c5c36b6976f43a6367d5ddc
+Author: gongysh <[e-mail]>
+Date:   Tue Oct 23 22:40:26 2012 +0800
+
+    use object directly instead of the foreigh key to update master db object.
+    
+    Bug #1064235
+    
+    Change-Id: I74fe3e758681c40590de87c82fd093224d329f51
+
+ quantum/db/l3_db.py                  |    3 ++-
+ quantum/tests/unit/test_l3_plugin.py |   15 +++++++++++++++
+ 2 files changed, 17 insertions(+), 1 deletion(-)
+
+commit 9030969d047f12e9d30def3eb102ea74d7c8913e
+Author: Mark McClain <[e-mail]>
+Date:   Mon Sep 17 17:28:00 2012 -0400
+
+    remove default value of local_ip in OVS agent
+    
+    fixes bug 1051744
+    
+    Remove the default value for local_ip in the OVS agent config.
+    
+    Change-Id: Ie23ba8510c0cf5c17443c805e0befce6eccb253c
+
+ etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini |    2 +-
+ quantum/plugins/openvswitch/agent/ovs_quantum_agent.py |    4 ++++
+ quantum/plugins/openvswitch/common/config.py           |    2 +-
+ 3 files changed, 6 insertions(+), 2 deletions(-)
+
+commit 425e942fa28667f57282044f653a73c7fa60cfff
+Author: Akihiro MOTOKI <[e-mail]>
+Date:   Wed Oct 24 22:14:06 2012 +0900
+
+    Call iptables without absolute path.
+    
+    Fixes bug 1069966
+    
+    rootwrap expects the command name is not absolute. We need to call
+    the command without path to make rootwrap work well.
+    
+    Change-Id: I6120103908d10ca257d177a320294de06a89c646
+
+ quantum/agent/linux/iptables_manager.py     |    2 +-
+ quantum/tests/unit/test_iptables_manager.py |   48 +++++++++++++--------------
+ 2 files changed, 25 insertions(+), 25 deletions(-)
+
+commit fc97da9cf103542c6b8849cebf682b5211a9a29f
+Author: Aaron Rosen <[e-mail]>
+Date:   Wed Oct 3 21:52:43 2012 -0700
+
+    correct nvplib to update device_id
+    
+    Fixes bug 1061391
+    
+    Change-Id: Ide8efdfb12dd0f403d7e4f468b1c9f3cc024f9a9
+
+ quantum/plugins/nicira/nicira_nvp_plugin/QuantumPlugin.py |    2 ++
+ quantum/plugins/nicira/nicira_nvp_plugin/nvplib.py        |   11 +++++++++--
+ 2 files changed, 11 insertions(+), 2 deletions(-)
+
+commit e091a298c8126b14976bd5d6e4beeb421ba59696
+Author: Somik Behera <[e-mail]>
+Date:   Mon Oct 1 22:33:12 2012 -0700
+
+    l3_nat_agent was renamed to l3_agent
+    and this was missed.
+    
+    This broke quantum-l3-agent when setup.py was
+    used to install but  did not affect package installs.
+    
+    This change fixes the issue.
+    
+    Change-Id: I820d26fba5d2774262577ed4fbae81dc7362e93e
+
+ setup.py |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 51c87994700bc5cda4349d7cebcbc400ce7c1ee9
+Author: Gary Kotton <[e-mail]>
+Date:   Mon Oct 8 04:18:11 2012 +0000
+
+    Ensures port is not created when database exception occurs
+    
+    Fixes bug 1064261
+    
+    The port creation code did not correctly treat a database error. That is,
+    if there was an exception the port would be created and an error returned
+    to the client.
+    
+    Change-Id: I6cf36d1c641b46716afb16f228b8daa631099a5d
+
+ quantum/db/db_base_plugin_v2.py      |    5 ++---
+ quantum/tests/unit/test_db_plugin.py |   13 +++++++++++++
+ 2 files changed, 15 insertions(+), 3 deletions(-)
+
+commit b4f9b1f5f629e4be21ca51c17cfd72cab4aefe39
+Author: Gary Kotton <[e-mail]>
+Date:   Fri Oct 5 06:07:13 2012 -0400
+
+    Treat invalid namespace call
+    
+    Fixes bug 1060559
+    
+    Change-Id: I29250100416b87f55781fb7e97339f6d3761513f
+
+ quantum/agent/l3_agent.py |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit 4946d4bb286a603ac804b1a27e74aea6ada99a6c
+Merge: c623f72 3bbf281
+Author: Jenkins <[e-mail]>
+Date:   Sat Oct 13 23:21:51 2012 +0000
+
+    Merge "Restore SIGPIPE default action for subprocesses" into stable/folsom
+
+commit c623f725486271d2fa349c2a89fe25829c9d29ef
+Author: Mark McLoughlin <[e-mail]>
+Date:   Sat Oct 13 22:46:34 2012 +0100
+
+    Set defaultbranch in .gitreview to stable/folsom
+    
+    This allows people run git-review without any arguments.
+    
+    Change-Id: I2b2488ffffd783b64e5c760324e7d4a00d5a39db
+
+ .gitreview |    1 +
+ 1 file changed, 1 insertion(+)
+
+commit 3bbf281b15866fc6aecdf8283bca696e5c646300
+Author: Thierry Carrez <[e-mail]>
+Date:   Thu Sep 20 14:42:53 2012 +0200
+
+    Restore SIGPIPE default action for subprocesses
+    
+    Python ignores SIGPIPE on startup, because it prefers to check every
+    write and raise an IOError exception rather than taking the signal. Most
+    Unix subprocesses don't expect to work this way. This patch (adapted
+    from Colin Watson's post at http://tinyurl.com/2a7mzh5) sets SIGPIPE
+    back to the default action for quantum.agent.linux.utils.execute,
+    quantum.common.utils.execute and quantum-rootwrap created subprocesses.
+    
+    Fixes bug 1053364
+    
+    Change-Id: Ib805f1f8846c245b75a5ea64278c840b823c1fb2
+
+ bin/quantum-rootwrap         |    8 ++++++++
+ quantum/agent/linux/utils.py |    8 ++++++++
+ quantum/common/utils.py      |    8 ++++++++
+ 3 files changed, 24 insertions(+)
+
+commit 5a5dec2d65c5f6e5e97ea89278ee278470090b6c
+Author: Thierry Carrez <[e-mail]>
+Date:   Fri Sep 28 15:53:14 2012 +0200
+
+    Bump next version to 2012.2.1
+    
+    Open stable/folsom by bumping next version to 2012.2.1.
+    
+    Change-Id: I1d6d3a4dadc21427b5aa23a1f093850fd667f741
+
+ quantum/version.py |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
 commit a9b17b66b77c2bfeef52e11a8eff45f5d11d906f
 Merge: 22993a0 5dfc99b
 Author: Jenkins <[e-mail]>
@@ -527,7 +1386,7 @@
     
     Change-Id: I569e60aa1f8ab8313e5427bd16798cc6b4079a09
 
- .../plugins/openvswitch/agent/ovs_quantum_agent.py |    4 ++--
+ quantum/plugins/openvswitch/agent/ovs_quantum_agent.py |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 03694682b7437f1f71ba0769e1c0962aacbb22e6
@@ -1954,7 +2813,7 @@
     
     Change-Id: Icd2e79722cfcb816bfdfa85bd8b8ab5198908474
 
- .../plugins/openvswitch/agent/ovs_quantum_agent.py |    7 ++++---
+ quantum/plugins/openvswitch/agent/ovs_quantum_agent.py |    7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 commit 8e34320bbc844c42066b9499e6afff8feda1fa56
@@ -2187,8 +3046,8 @@
     
     Change-Id: Iafb7fd02d37415c3466213d28280bcb4573de4a8
 
- .../linuxbridge/agent/linuxbridge_quantum_agent.py |    2 +-
- .../plugins/openvswitch/agent/ovs_quantum_agent.py |    2 +-
+ quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py |    2 +-
+ quantum/plugins/openvswitch/agent/ovs_quantum_agent.py         |    2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit 7dcaeecfd51065cda93d2c88a24ba330efac6f73
@@ -2318,7 +3177,7 @@
     
     Change-Id: I54315831f240c6810707e7247e7a76c1bfa8742e
 
- .../linuxbridge/agent/linuxbridge_quantum_agent.py |   16 +++++++++-------
+ .../linuxbridge/agent/linuxbridge_quantum_agent.py     |   16 +++++++++-------
  1 file changed, 9 insertions(+), 7 deletions(-)
 
 commit 8fb4e6efe8dcf1987d41917f71da8db345647321
@@ -3027,10 +3886,10 @@
     
     Change-Id: Id8e5df04cc0183cd4b2a9ab23cd403a83a2db637
 
- .../linuxbridge/agent/linuxbridge_quantum_agent.py |    4 ----
- .../metaplugin/agent/linuxbridge_quantum_agent.py  |    3 ---
- .../plugins/metaplugin/agent/ovs_quantum_agent.py  |    4 ----
- .../plugins/openvswitch/agent/ovs_quantum_agent.py |    4 ----
+ quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py |    4 ----
+ quantum/plugins/metaplugin/agent/linuxbridge_quantum_agent.py  |    3 ---
+ quantum/plugins/metaplugin/agent/ovs_quantum_agent.py          |    4 ----
+ quantum/plugins/openvswitch/agent/ovs_quantum_agent.py         |    4 ----
  4 files changed, 15 deletions(-)
 
 commit 1b090e5365952fdc63ddd185dfdf5a21f4f48b12
@@ -3115,8 +3974,8 @@
     
     Change-Id: Ib6500813d4111ae42675459fac64dfb2e9c40d91
 
- .../plugins/openvswitch/agent/ovs_quantum_agent.py |   10 +++++++---
- .../plugins/openvswitch/tests/unit/test_tunnel.py  |   10 ++++++++--
+ quantum/plugins/openvswitch/agent/ovs_quantum_agent.py |   10 +++++++---
+ quantum/plugins/openvswitch/tests/unit/test_tunnel.py  |   10 ++++++++--
  2 files changed, 15 insertions(+), 5 deletions(-)
 
 commit 9c915b0d7f58a5da8f63ebf09b13853d52e520e6
@@ -3354,7 +4213,7 @@
     
     Change-Id: Iaa4778562b4efc13919341832f5281b1516f8f8c
 
- .../linuxbridge/agent/linuxbridge_quantum_agent.py |    9 +++++++--
+ .../plugins/linuxbridge/agent/linuxbridge_quantum_agent.py    |    9 +++++++--
  1 file changed, 7 insertions(+), 2 deletions(-)
 
 commit 1798c82dfa7de36de2502bb44e8b646d93574290
@@ -5070,10 +5929,10 @@
     
     Change-Id: I99130f863928abf30a521e9a2b6d1233a274d9c6
 
- .../plugins/linuxbridge/db/l2network_models_v2.py  |    3 ++-
- quantum/plugins/linuxbridge/lb_quantum_plugin.py   |    4 ++--
- quantum/plugins/openvswitch/ovs_quantum_plugin.py  |    3 ++-
- quantum/plugins/ryu/ryu_quantum_plugin.py          |    3 ++-
+ quantum/plugins/linuxbridge/db/l2network_models_v2.py |    3 ++-
+ quantum/plugins/linuxbridge/lb_quantum_plugin.py      |    4 ++--
+ quantum/plugins/openvswitch/ovs_quantum_plugin.py     |    3 ++-
+ quantum/plugins/ryu/ryu_quantum_plugin.py             |    3 ++-
  4 files changed, 8 insertions(+), 5 deletions(-)
 
 commit ddcc951f08dc24c2fc605b45937a429c2c354e51
@@ -5157,7 +6016,7 @@
     
     Change-Id: Ie37ef0c3355e86f504fa71417921bb828b40e347
 
- .../plugins/openvswitch/tests/unit/test_tunnel.py  |    3 ++-
+ quantum/plugins/openvswitch/tests/unit/test_tunnel.py |    3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 610017c460b85e1b7d11327d050972bb03fcc0c3
@@ -5212,7 +6071,7 @@
     
     Change-Id: I7c7e029fbf88e0fd62aba821e81a55d3aca02190
 
- .../tests/unit/_test_linuxbridgeAgent.py           |    4 +++-
+ quantum/plugins/linuxbridge/tests/unit/_test_linuxbridgeAgent.py |    4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit 5583de27c24a2ba8c045a3097d98312905dc5180
@@ -5682,7 +6541,7 @@
     
     Change-Id: Ica3aa3f6c81e4fd062b752867487c89515fb9446
 
- .../plugins/openvswitch/agent/ovs_quantum_agent.py |    3 ++-
+ quantum/plugins/openvswitch/agent/ovs_quantum_agent.py |    3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit f3e4b701fd9158cd7c167d9f188bfb71fa319671
@@ -5717,18 +6576,18 @@
     
     Change-Id: Ibfea9bac87ba36f301671a35de81577debcd460e
 
- .../plugins/linuxbridge/linuxbridge_conf.ini       |    3 +++
- .../plugins/openvswitch/ovs_quantum_plugin.ini     |    3 +++
- quantum/db/api.py                                  |   17 +++++++++++++----
- quantum/plugins/linuxbridge/common/config.py       |    1 +
- quantum/plugins/linuxbridge/db/l2network_db.py     |    1 +
- quantum/plugins/openvswitch/common/config.py       |    1 +
- quantum/plugins/openvswitch/ovs_quantum_plugin.py  |    4 ++++
- quantum/plugins/ryu/common/config.py               |    1 +
- quantum/plugins/ryu/ovs_quantum_plugin_base.py     |    2 ++
- quantum/tests/unit/test_lb_config.py               |    3 +++
- quantum/tests/unit/test_ovs_config.py              |    3 +++
- quantum/tests/unit/test_ryu_config.py              |    3 +++
+ etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini  |    3 +++
+ .../plugins/openvswitch/ovs_quantum_plugin.ini        |    3 +++
+ quantum/db/api.py                                     |   17 +++++++++++++----
+ quantum/plugins/linuxbridge/common/config.py          |    1 +
+ quantum/plugins/linuxbridge/db/l2network_db.py        |    1 +
+ quantum/plugins/openvswitch/common/config.py          |    1 +
+ quantum/plugins/openvswitch/ovs_quantum_plugin.py     |    4 ++++
+ quantum/plugins/ryu/common/config.py                  |    1 +
+ quantum/plugins/ryu/ovs_quantum_plugin_base.py        |    2 ++
+ quantum/tests/unit/test_lb_config.py                  |    3 +++
+ quantum/tests/unit/test_ovs_config.py                 |    3 +++
+ quantum/tests/unit/test_ryu_config.py                 |    3 +++
  12 files changed, 38 insertions(+), 4 deletions(-)
 
 commit eb6eded3d13b658a195a432dcde94605e951f3e4
@@ -5922,10 +6781,10 @@
     
     Change-Id: I58b6d4356b071624c725b4dd0d98a60592ef0b45
 
- .../cisco/nova/quantum_port_aware_scheduler.py     |    2 +-
- quantum/plugins/cisco/nova/vifdirect.py            |    2 +-
- quantum/plugins/ryu/nova/linux_net.py              |    2 +-
- quantum/plugins/ryu/nova/vif.py                    |    2 +-
+ quantum/plugins/cisco/nova/quantum_port_aware_scheduler.py |    2 +-
+ quantum/plugins/cisco/nova/vifdirect.py                    |    2 +-
+ quantum/plugins/ryu/nova/linux_net.py                      |    2 +-
+ quantum/plugins/ryu/nova/vif.py                            |    2 +-
  4 files changed, 4 insertions(+), 4 deletions(-)
 
 commit 13070251129155ba4eb435f0af3d61418e9775e2
@@ -6105,7 +6964,7 @@
     
     Change-Id: I8a1f6cc7be930c04ce302d7f87814b9bd5bed129
 
- .../linuxbridge/agent/linuxbridge_quantum_agent.py |   13 +++++++++++--
+ .../linuxbridge/agent/linuxbridge_quantum_agent.py        |   13 +++++++++++--
  1 file changed, 11 insertions(+), 2 deletions(-)
 
 commit 072dce2ad09a6b28813f9b8f13d3e8a7bcc0d987
@@ -6243,9 +7102,9 @@
     
     Change-Id: If11244d48a5c966bbbf8786e3e9f42d205a70164
 
- .../plugins/openvswitch/ovs_quantum_plugin.ini     |    2 ++
- .../plugins/openvswitch/agent/ovs_quantum_agent.py |    9 +++++++++
- quantum/plugins/openvswitch/common/config.py       |    1 +
+ etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini |    2 ++
+ quantum/plugins/openvswitch/agent/ovs_quantum_agent.py |    9 +++++++++
+ quantum/plugins/openvswitch/common/config.py           |    1 +
  3 files changed, 12 insertions(+)
 
 commit 7841b681f123e3b636d7ee6b5301de6358871c04
@@ -6335,7 +7194,7 @@
     
     Change-Id: I3105131e853d45609bc441482bf5b3c3e035a129
 
- .../linuxbridge/agent/linuxbridge_quantum_agent.py |   10 +++++-----
+ .../plugins/linuxbridge/agent/linuxbridge_quantum_agent.py   |   10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 commit a79b1c34258616eb25bd77e4ec5b253c32d90fa3
@@ -6348,46 +7207,46 @@
     
     Change-Id: I849d73fc756b830b78492a6ed0e8cf2d32fde8cd
 
- quantum/agent/linux/utils.py                       |    2 +-
- quantum/api/__init__.py                            |    2 +-
- quantum/api/api_common.py                          |    2 +-
- quantum/api/v2/resource.py                         |    4 ++--
- quantum/api/v2/router.py                           |    4 ++--
- quantum/api/versions.py                            |    2 +-
- quantum/db/db_base_plugin_v2.py                    |    2 +-
- quantum/db/model_base.py                           |    2 +-
- quantum/extensions/novatenant.py                   |    2 +-
- quantum/plugins/cisco/client/cli.py                |    2 +-
- quantum/plugins/cisco/db/l2network_db.py           |    2 +-
- quantum/plugins/cisco/db/l2network_models.py       |    2 +-
- quantum/plugins/cisco/db/ucs_models.py             |    2 +-
- quantum/plugins/cisco/l2network_plugin.py          |    4 ++--
- .../plugins/cisco/models/l2network_multi_blade.py  |    2 +-
- .../plugins/cisco/models/l2network_single_blade.py |    2 +-
- .../plugins/cisco/services/services_logistics.py   |    4 ++--
- quantum/plugins/cisco/tests/unit/__init__.py       |    2 ++
- .../plugins/cisco/tests/unit/test_l2networkApi.py  |    4 ++--
- quantum/plugins/cisco/tests/unit/test_vlan_mgr.py  |    2 +-
- quantum/plugins/cisco/ucs/cisco_ucs_inventory.py   |    6 +++---
- quantum/plugins/linuxbridge/db/l2network_db.py     |    2 +-
- .../tests/unit/_test_linuxbridgeAgent.py           |    2 +-
- .../api_client/client_eventlet.py                  |    2 +-
- .../api_client/request_eventlet.py                 |    2 +-
- .../nicira/nicira_nvp_plugin/tests/test_check.py   |    2 +-
- .../nicira/nicira_nvp_plugin/tests/test_network.py |    2 +-
- .../nicira/nicira_nvp_plugin/tests/test_port.py    |    2 +-
- quantum/plugins/openvswitch/ovs_quantum_plugin.py  |    2 +-
- .../plugins/openvswitch/tests/unit/test_tunnel.py  |    2 +-
- quantum/plugins/ryu/ovs_quantum_plugin_base.py     |    2 +-
- quantum/plugins/ryu/ryu_quantum_plugin.py          |    4 ++--
- quantum/plugins/ryu/tests/unit/test_plugin_base.py |    2 +-
- quantum/plugins/ryu/tests/unit/test_ryu_driver.py  |    2 +-
- quantum/plugins/ryu/tests/unit/utils.py            |    2 +-
- quantum/policy.py                                  |    2 +-
- quantum/quantum_plugin_base.py                     |    2 +-
- quantum/tests/unit/_test_api.py                    |    4 ++--
- quantum/tests/unit/test_api_v2.py                  |    6 +++---
- quantum/tests/unit/test_db_plugin.py               |    8 ++++----
+ quantum/agent/linux/utils.py                                   |    2 +-
+ quantum/api/__init__.py                                        |    2 +-
+ quantum/api/api_common.py                                      |    2 +-
+ quantum/api/v2/resource.py                                     |    4 ++--
+ quantum/api/v2/router.py                                       |    4 ++--
+ quantum/api/versions.py                                        |    2 +-
+ quantum/db/db_base_plugin_v2.py                                |    2 +-
+ quantum/db/model_base.py                                       |    2 +-
+ quantum/extensions/novatenant.py                               |    2 +-
+ quantum/plugins/cisco/client/cli.py                            |    2 +-
+ quantum/plugins/cisco/db/l2network_db.py                       |    2 +-
+ quantum/plugins/cisco/db/l2network_models.py                   |    2 +-
+ quantum/plugins/cisco/db/ucs_models.py                         |    2 +-
+ quantum/plugins/cisco/l2network_plugin.py                      |    4 ++--
+ quantum/plugins/cisco/models/l2network_multi_blade.py          |    2 +-
+ quantum/plugins/cisco/models/l2network_single_blade.py         |    2 +-
+ quantum/plugins/cisco/services/services_logistics.py           |    4 ++--
+ quantum/plugins/cisco/tests/unit/__init__.py                   |    2 ++
+ quantum/plugins/cisco/tests/unit/test_l2networkApi.py          |    4 ++--
+ quantum/plugins/cisco/tests/unit/test_vlan_mgr.py              |    2 +-
+ quantum/plugins/cisco/ucs/cisco_ucs_inventory.py               |    6 +++---
+ quantum/plugins/linuxbridge/db/l2network_db.py                 |    2 +-
+ .../plugins/linuxbridge/tests/unit/_test_linuxbridgeAgent.py   |    2 +-
+ .../nicira/nicira_nvp_plugin/api_client/client_eventlet.py     |    2 +-
+ .../nicira/nicira_nvp_plugin/api_client/request_eventlet.py    |    2 +-
+ quantum/plugins/nicira/nicira_nvp_plugin/tests/test_check.py   |    2 +-
+ quantum/plugins/nicira/nicira_nvp_plugin/tests/test_network.py |    2 +-
+ quantum/plugins/nicira/nicira_nvp_plugin/tests/test_port.py    |    2 +-
+ quantum/plugins/openvswitch/ovs_quantum_plugin.py              |    2 +-
+ quantum/plugins/openvswitch/tests/unit/test_tunnel.py          |    2 +-
+ quantum/plugins/ryu/ovs_quantum_plugin_base.py                 |    2 +-
+ quantum/plugins/ryu/ryu_quantum_plugin.py                      |    4 ++--
+ quantum/plugins/ryu/tests/unit/test_plugin_base.py             |    2 +-
+ quantum/plugins/ryu/tests/unit/test_ryu_driver.py              |    2 +-
+ quantum/plugins/ryu/tests/unit/utils.py                        |    2 +-
+ quantum/policy.py                                              |    2 +-
+ quantum/quantum_plugin_base.py                                 |    2 +-
+ quantum/tests/unit/_test_api.py                                |    4 ++--
+ quantum/tests/unit/test_api_v2.py                              |    6 +++---
+ quantum/tests/unit/test_db_plugin.py                           |    8 ++++----
  40 files changed, 55 insertions(+), 53 deletions(-)
 
 commit 0061c0ce4443395a258a99c70e1c1a7d0435e84e
@@ -6629,10 +7488,10 @@
     
     Change-Id: Iaba819e62d70a9c9935cae195718dbf74d13884a
 
- .../plugins/openvswitch/ovs_quantum_plugin.ini     |    4 ++++
- quantum/plugins/openvswitch/common/config.py       |    2 ++
- quantum/plugins/openvswitch/ovs_quantum_plugin.py  |   19 ++++++++++++++-----
- .../openvswitch/tests/unit/test_vlan_map.py        |   12 ++++++------
+ .../plugins/openvswitch/ovs_quantum_plugin.ini      |    4 ++++
+ quantum/plugins/openvswitch/common/config.py        |    2 ++
+ quantum/plugins/openvswitch/ovs_quantum_plugin.py   |   19 ++++++++++++++-----
+ .../plugins/openvswitch/tests/unit/test_vlan_map.py |   12 ++++++------
  4 files changed, 26 insertions(+), 11 deletions(-)
 
 commit 412c7aa0308974a5ba338383ef0da2f91f92f113
@@ -6892,7 +7751,7 @@
     
     Change-Id: Ifa81a5ddb4f2a9dcb6ce94fa0d941ba6e6c2e038
 
- .../plugins/openvswitch/agent/ovs_quantum_agent.py |    6 +++---
+ quantum/plugins/openvswitch/agent/ovs_quantum_agent.py |    6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit c0d0e891c000a7f2b8940b0bbf2c01957a33fa14
@@ -7013,40 +7872,40 @@
     
     Change-Id: Ie2ca545ecfaadd033652554c9e59d6a83d44ed09
 
- quantum/common/test_lib.py                         |    2 --
- quantum/extensions/multiport.py                    |    1 -
- quantum/plugins/cisco/client/cli.py                |    2 --
- quantum/plugins/cisco/common/cisco_configparser.py |    2 --
- quantum/plugins/cisco/common/cisco_credentials.py  |    1 -
- quantum/plugins/cisco/common/cisco_utils.py        |    4 ----
- quantum/plugins/cisco/db/l2network_db.py           |    3 ---
- quantum/plugins/cisco/db/services_db.py            |    1 -
- quantum/plugins/cisco/l2network_plugin.py          |    1 -
- .../cisco/l2network_plugin_configuration.py        |    2 --
- .../plugins/cisco/models/l2network_multi_blade.py  |    3 ---
- .../plugins/cisco/models/l2network_single_blade.py |    3 ---
- .../cisco/nexus/cisco_nexus_configuration.py       |    1 -
- .../cisco/nexus/cisco_nexus_network_driver.py      |    1 -
- .../plugins/cisco/nexus/cisco_nexus_snippets.py    |    2 --
- .../cisco/nova/quantum_port_aware_scheduler.py     |    1 -
- quantum/plugins/cisco/run_tests.py                 |    1 -
- .../plugins/cisco/ucs/cisco_ucs_configuration.py   |    2 --
- quantum/plugins/cisco/ucs/cisco_ucs_inventory.py   |    1 -
- .../cisco/ucs/cisco_ucs_inventory_configuration.py |    2 --
- .../plugins/cisco/ucs/cisco_ucs_network_driver.py  |    2 --
- quantum/plugins/cisco/ucs/cisco_ucs_plugin.py      |    1 -
- quantum/plugins/linuxbridge/db/l2network_models.py |    4 ----
- quantum/plugins/linuxbridge/run_tests.py           |    4 ----
- .../plugins/openvswitch/agent/ovs_quantum_agent.py |    2 --
- quantum/plugins/openvswitch/ovs_db.py              |    1 -
- quantum/plugins/openvswitch/ovs_models.py          |    6 +-----
- quantum/plugins/openvswitch/ovs_quantum_plugin.py  |    2 --
- quantum/plugins/openvswitch/run_tests.py           |    3 ---
- .../plugins/openvswitch/tests/unit/test_tunnel.py  |    1 -
- quantum/plugins/ryu/db/models.py                   |    1 -
- quantum/plugins/ryu/run_tests.py                   |    3 ---
- quantum/plugins/ryu/tests/unit/basetest.py         |    1 -
- quantum/tests/unit/test_api.py                     |    2 +-
+ quantum/common/test_lib.py                                     |    2 --
+ quantum/extensions/multiport.py                                |    1 -
+ quantum/plugins/cisco/client/cli.py                            |    2 --
+ quantum/plugins/cisco/common/cisco_configparser.py             |    2 --
+ quantum/plugins/cisco/common/cisco_credentials.py              |    1 -
+ quantum/plugins/cisco/common/cisco_utils.py                    |    4 ----
+ quantum/plugins/cisco/db/l2network_db.py                       |    3 ---
+ quantum/plugins/cisco/db/services_db.py                        |    1 -
+ quantum/plugins/cisco/l2network_plugin.py                      |    1 -
+ quantum/plugins/cisco/l2network_plugin_configuration.py        |    2 --
+ quantum/plugins/cisco/models/l2network_multi_blade.py          |    3 ---
+ quantum/plugins/cisco/models/l2network_single_blade.py         |    3 ---
+ quantum/plugins/cisco/nexus/cisco_nexus_configuration.py       |    1 -
+ quantum/plugins/cisco/nexus/cisco_nexus_network_driver.py      |    1 -
+ quantum/plugins/cisco/nexus/cisco_nexus_snippets.py            |    2 --
+ quantum/plugins/cisco/nova/quantum_port_aware_scheduler.py     |    1 -
+ quantum/plugins/cisco/run_tests.py                             |    1 -
+ quantum/plugins/cisco/ucs/cisco_ucs_configuration.py           |    2 --
+ quantum/plugins/cisco/ucs/cisco_ucs_inventory.py               |    1 -
+ quantum/plugins/cisco/ucs/cisco_ucs_inventory_configuration.py |    2 --
+ quantum/plugins/cisco/ucs/cisco_ucs_network_driver.py          |    2 --
+ quantum/plugins/cisco/ucs/cisco_ucs_plugin.py                  |    1 -
+ quantum/plugins/linuxbridge/db/l2network_models.py             |    4 ----
+ quantum/plugins/linuxbridge/run_tests.py                       |    4 ----
+ quantum/plugins/openvswitch/agent/ovs_quantum_agent.py         |    2 --
+ quantum/plugins/openvswitch/ovs_db.py                          |    1 -
+ quantum/plugins/openvswitch/ovs_models.py                      |    6 +-----
+ quantum/plugins/openvswitch/ovs_quantum_plugin.py              |    2 --
+ quantum/plugins/openvswitch/run_tests.py                       |    3 ---
+ quantum/plugins/openvswitch/tests/unit/test_tunnel.py          |    1 -
+ quantum/plugins/ryu/db/models.py                               |    1 -
+ quantum/plugins/ryu/run_tests.py                               |    3 ---
+ quantum/plugins/ryu/tests/unit/basetest.py                     |    1 -
+ quantum/tests/unit/test_api.py                                 |    2 +-
  34 files changed, 2 insertions(+), 67 deletions(-)
 
 commit 268040c3365aacef4e53bb7795ae598dd98bb77f
@@ -7224,7 +8083,7 @@
     
     Change-Id: If6673e59afc545e51df3625d8259ec3fca9aaefb
 
- .../plugins/openvswitch/agent/xenserver_install.sh |   10 ++++------
+ quantum/plugins/openvswitch/agent/xenserver_install.sh |   10 ++++------
  1 file changed, 4 insertions(+), 6 deletions(-)
 
 commit 0324ea3e63140428918b3192fd83f7bbacf8d9f5
@@ -7282,22 +8141,22 @@
     
     Change-Id: Iab4c2ada2bfcb99452f940666b25cb1f7d4d7e58
 
- quantum/api/api_common.py                          |    2 +-
- quantum/api/views/filters.py                       |    3 ++-
- quantum/common/utils.py                            |    7 ++++---
- quantum/openstack/common/setup.py                  |    4 ++--
- quantum/plugins/cisco/db/l2network_db.py           |    4 ++--
- quantum/plugins/cisco/db/services_db.py            |    2 +-
- quantum/plugins/cisco/db/ucs_db.py                 |    5 +++--
- quantum/plugins/cisco/l2network_plugin.py          |    2 +-
- quantum/plugins/cisco/nova/vifdirect.py            |   16 ++++++++--------
- .../plugins/cisco/services/service_insertion.py    |    4 ++--
- quantum/plugins/linuxbridge/LinuxBridgePlugin.py   |    2 +-
- .../linuxbridge/agent/linuxbridge_quantum_agent.py |    6 +++---
- .../nicira/nicira_nvp_plugin/QuantumPlugin.py      |    4 ++--
- quantum/plugins/nicira/nicira_nvp_plugin/cli.py    |    2 +-
- quantum/plugins/nicira/nicira_nvp_plugin/nvplib.py |    2 +-
- setup.py                                           |    9 +++------
+ quantum/api/api_common.py                              |    2 +-
+ quantum/api/views/filters.py                           |    3 ++-
+ quantum/common/utils.py                                |    7 ++++---
+ quantum/openstack/common/setup.py                      |    4 ++--
+ quantum/plugins/cisco/db/l2network_db.py               |    4 ++--
+ quantum/plugins/cisco/db/services_db.py                |    2 +-
+ quantum/plugins/cisco/db/ucs_db.py                     |    5 +++--
+ quantum/plugins/cisco/l2network_plugin.py              |    2 +-
+ quantum/plugins/cisco/nova/vifdirect.py                |   16 ++++++++--------
+ quantum/plugins/cisco/services/service_insertion.py    |    4 ++--
+ quantum/plugins/linuxbridge/LinuxBridgePlugin.py       |    2 +-
+ .../linuxbridge/agent/linuxbridge_quantum_agent.py     |    6 +++---
+ .../plugins/nicira/nicira_nvp_plugin/QuantumPlugin.py  |    4 ++--
+ quantum/plugins/nicira/nicira_nvp_plugin/cli.py        |    2 +-
+ quantum/plugins/nicira/nicira_nvp_plugin/nvplib.py     |    2 +-
+ setup.py                                               |    9 +++------
  16 files changed, 37 insertions(+), 37 deletions(-)
 
 commit 9895ac62c0ca73e9bcfa57b8609d21fb93129943
@@ -7345,8 +8204,8 @@
     
     Change-Id: Ic7a97179d6fbb90f8c7f544a5725e1ff56fd9653
 
- .../linuxbridge/agent/linuxbridge_quantum_agent.py |    2 +-
- quantum/plugins/linuxbridge/common/config.py       |    2 +-
+ quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py |    2 +-
+ quantum/plugins/linuxbridge/common/config.py                   |    2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit 93ee2838a2937e346e78c2e3ee21f5fed478d66f
@@ -7370,8 +8229,8 @@
     
     Change-Id: I437c3f13fa7a81aeabcdfca7ba03e94a0a7aa32b
 
- quantum/plugins/linuxbridge/LinuxBridgePlugin.py   |   10 +---------
- .../tests/unit/_test_linuxbridgeAgent.py           |   17 +++++++++++++++++
+ quantum/plugins/linuxbridge/LinuxBridgePlugin.py      |   10 +---------
+ .../linuxbridge/tests/unit/_test_linuxbridgeAgent.py  |   17 +++++++++++++++++
  2 files changed, 18 insertions(+), 9 deletions(-)
 
 commit 76b2d851af70adc52f53241e8bc864674ce9cfba
@@ -7384,7 +8243,7 @@
     
     Change-Id: Ib3530af9aa885a719cb712554d05e7d70834186a
 
- .../plugins/cisco/nexus/cisco_nexus_snippets.py    |    1 -
+ quantum/plugins/cisco/nexus/cisco_nexus_snippets.py |    1 -
  1 file changed, 1 deletion(-)
 
 commit 91d3b02bc1bdaa4ab3caf462aa93a8b9db45e6eb
@@ -7464,7 +8323,7 @@
     
     Change-Id: Id03dc4a12a0114c8597cb90f4eabcdd3dc9b3f5c
 
- .../plugins/openvswitch/agent/ovs_quantum_agent.py |    6 ------
+ quantum/plugins/openvswitch/agent/ovs_quantum_agent.py |    6 ------
  1 file changed, 6 deletions(-)
 
 commit d2a21ec921e4158a4fa7573c3d7541d92157dd52
@@ -7532,7 +8391,7 @@
     
     Change-Id: I95b1143702bc8f06067969c6b7040eea861bb56b
 
- .../plugins/openvswitch/agent/ovs_quantum_agent.py |    2 --
+ quantum/plugins/openvswitch/agent/ovs_quantum_agent.py |    2 --
  1 file changed, 2 deletions(-)
 
 commit c8091791412293f25e22a658ed3f4361429e4df2
@@ -7653,7 +8512,7 @@
     
     Change-Id: I733d80df8f87ff314f4233b10fa8afaf454eedf0
 
- .../cisco/nova/quantum_port_aware_scheduler.py     |    1 +
+ quantum/plugins/cisco/nova/quantum_port_aware_scheduler.py |    1 +
  1 file changed, 1 insertion(+)
 
 commit c73ab6d10fe40a7a63c9874de27a53cc7a7344bd
@@ -7799,7 +8658,7 @@
     
     Change-Id: I464080e433b4cad71da4510fb95dd5f902da0616
 
- .../plugins/openvswitch/agent/xenserver_install.sh |   16 ++++++++--------
+ quantum/plugins/openvswitch/agent/xenserver_install.sh |   16 ++++++++--------
  1 file changed, 8 insertions(+), 8 deletions(-)
 
 commit d1c563c57df14b4d968bd576bc366d7db86b3e79
@@ -7833,7 +8692,7 @@
     
     Change-Id: I1a951d60eb75384676309e8db29ea7baa48055bc
 
- .../plugins/openvswitch/agent/ovs_quantum_agent.py |    8 ++++++++
+ quantum/plugins/openvswitch/agent/ovs_quantum_agent.py |    8 ++++++++
  1 file changed, 8 insertions(+)
 
 commit ce93dca89aa4d0da55e71376853aafc142669362
@@ -8116,7 +8975,7 @@
     
     Change-Id: I62b3bd6ea9adac7c1f4995fc18af9838a7e25b43
 
- .../plugins/openvswitch/agent/ovs_quantum_agent.py |   10 +++++-----
+ quantum/plugins/openvswitch/agent/ovs_quantum_agent.py |   10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 commit 676ba0fd70a10e66e95fec47091ff0b494b95fec
@@ -8250,7 +9109,7 @@
     
     Change-Id: Ic7f633b59d963e8a14a993468048ccbded9aba34
 
- .../docbkx/quantum-api-1.0/quantum-api-guide.xml   |    2 +-
+ doc/source/docbkx/quantum-api-1.0/quantum-api-guide.xml |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 18aa80234864a1bf7d4c343d203469705d08f8f2
@@ -8554,7 +9413,7 @@
     
     Change-Id: I0bec330256f1dd3de43bc3202cedada2f9d40c01
 
- .../docbkx/quantum-api-1.0/quantum-api-guide.xml   |    4 ++--
+ doc/source/docbkx/quantum-api-1.0/quantum-api-guide.xml |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit beed3d11227e9e5c59e09297df579e4114aa7b88
@@ -8569,7 +9428,7 @@
     
     Change-Id: I0f7fae73efa80b617da0a895b80a95f60cb12c42
 
- .../docbkx/quantum-api-1.0/quantum-api-guide.xml   |    2 +-
+ doc/source/docbkx/quantum-api-1.0/quantum-api-guide.xml |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 4bacc462ea2cefc612c1df7bdd82029fa74b1b21
@@ -8908,7 +9767,7 @@
     
     Change-Id: I001e281145c3b6ba23a84e27e3f0e9315c879d96
 
- .../plugins/openvswitch/ovs_quantum_plugin.ini     |    2 +-
+ etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit b9805bd234edc0076ff69fafc2ab020562863b58
@@ -9630,7 +10489,7 @@
     
     Change-Id: Ie91b554e5549193fb3568cf0bb0dec7c58a6dfc5
 
- .../plugins/openvswitch/ovs_quantum_plugin.ini     |    2 +-
+ etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit f268b5e62ca8bbf1712225d4c8d6d38580f38fba
@@ -9727,22 +10586,22 @@
     
     Change-Id: Id5c797d3339d0d7015bac386088133540f0c0c9e
 
- quantum/api/api_common.py                          |    2 +-
- quantum/client/__init__.py                         |    6 +++---
- quantum/common/flags.py                            |    2 +-
- quantum/common/serializer.py                       |    4 ++--
- quantum/common/utils.py                            |   11 +++++------
- quantum/extensions/_pprofiles.py                   |    2 +-
- quantum/plugins/cisco/l2network_plugin.py          |    4 ++--
- .../plugins/cisco/models/l2network_single_blade.py |    2 +-
- .../plugins/cisco/services/services_logistics.py   |    4 ++--
- quantum/plugins/cisco/tests/unit/test_database.py  |    6 +++---
- .../plugins/cisco/tests/unit/test_ucs_plugin.py    |    2 +-
- quantum/plugins/cisco/ucs/cisco_ucs_inventory.py   |    8 ++++----
- quantum/plugins/openvswitch/ovs_quantum_plugin.py  |    6 +++---
- .../openvswitch/tests/unit/test_vlan_map.py        |    2 +-
- quantum/tests/unit/test_database.py                |    2 +-
- quantum/wsgi.py                                    |   12 ++++++------
+ quantum/api/api_common.py                               |    2 +-
+ quantum/client/__init__.py                              |    6 +++---
+ quantum/common/flags.py                                 |    2 +-
+ quantum/common/serializer.py                            |    4 ++--
+ quantum/common/utils.py                                 |   11 +++++------
+ quantum/extensions/_pprofiles.py                        |    2 +-
+ quantum/plugins/cisco/l2network_plugin.py               |    4 ++--
+ quantum/plugins/cisco/models/l2network_single_blade.py  |    2 +-
+ quantum/plugins/cisco/services/services_logistics.py    |    4 ++--
+ quantum/plugins/cisco/tests/unit/test_database.py       |    6 +++---
+ quantum/plugins/cisco/tests/unit/test_ucs_plugin.py     |    2 +-
+ quantum/plugins/cisco/ucs/cisco_ucs_inventory.py        |    8 ++++----
+ quantum/plugins/openvswitch/ovs_quantum_plugin.py       |    6 +++---
+ quantum/plugins/openvswitch/tests/unit/test_vlan_map.py |    2 +-
+ quantum/tests/unit/test_database.py                     |    2 +-
+ quantum/wsgi.py                                         |   12 ++++++------
  16 files changed, 37 insertions(+), 38 deletions(-)
 
 commit 98d04ae684ea761070d8df160a5f47e1701bc072
@@ -10497,8 +11356,8 @@
     
     Change-Id: I38053df8b398e3fadcc6820c1118b3685ccd4174
 
- .../plugins/cisco/ucs/cisco_ucs_inventory.py       |    6 +++---
- .../cisco/ucs/cisco_ucs_inventory_configuration.py |    4 ++--
+ .../lib/quantum/plugins/cisco/ucs/cisco_ucs_inventory.py         |    6 +++---
+ .../plugins/cisco/ucs/cisco_ucs_inventory_configuration.py       |    4 ++--
  2 files changed, 5 insertions(+), 5 deletions(-)
 
 commit d2bb51ca2529ef1ce8f8ffa412ac76778e6fd829
@@ -10515,7 +11374,7 @@
     
     Change-Id: Id01d9da1761016bcd983ad06621c62e94b2445c1
 
- .../plugins/openvswitch/agent/ovs_quantum_agent.py |   19 ++++++++++++++++++-
+ .../plugins/openvswitch/agent/ovs_quantum_agent.py  |   19 ++++++++++++++++++-
  1 file changed, 18 insertions(+), 1 deletion(-)
 
 commit a73ba62920e643355ce6e9b836c075f139623fd9
@@ -10571,13 +11430,13 @@
     
     Change-Id: I687793b0f8f7284019e05c044e53d91e0f3f09c2
 
- quantum/common/config.py                           |    8 ++++++--
- quantum/plugins/cisco/common/cisco_credentials.py  |    3 ++-
- .../cisco/l2network_plugin_configuration.py        |    6 +++---
- .../cisco/nexus/cisco_nexus_configuration.py       |    3 ++-
- .../cisco/tests/unit/test_cisco_extension.py       |    3 ++-
- .../plugins/cisco/ucs/cisco_ucs_configuration.py   |    5 +++--
- .../cisco/ucs/cisco_ucs_inventory_configuration.py |    2 +-
+ quantum/common/config.py                                       |    8 ++++++--
+ quantum/plugins/cisco/common/cisco_credentials.py              |    3 ++-
+ quantum/plugins/cisco/l2network_plugin_configuration.py        |    6 +++---
+ quantum/plugins/cisco/nexus/cisco_nexus_configuration.py       |    3 ++-
+ quantum/plugins/cisco/tests/unit/test_cisco_extension.py       |    3 ++-
+ quantum/plugins/cisco/ucs/cisco_ucs_configuration.py           |    5 +++--
+ quantum/plugins/cisco/ucs/cisco_ucs_inventory_configuration.py |    2 +-
  7 files changed, 19 insertions(+), 11 deletions(-)
 
 commit e95aa008efa6eeddd89e02487c8a06a9c45a4aec
@@ -10590,7 +11449,7 @@
     
     Change-Id: Iba76359d5ee4f625b6a7007b318cf0eb5f1119da
 
- .../plugins/openvswitch/agent/ovs_quantum_agent.py |    9 +++++++--
+ quantum/plugins/openvswitch/agent/ovs_quantum_agent.py |    9 +++++++--
  1 file changed, 7 insertions(+), 2 deletions(-)
 
 commit e85d007c074b1e7ab7e48612d8c8a6dc461d9665
@@ -11240,9 +12099,9 @@
     
     Change-Id: I900f8052416cbded698a806895fe145e61d47f1c
 
- .../cisco/nexus/cisco_nexus_network_driver.py      |    5 ++---
- quantum/plugins/cisco/nexus/cisco_nexus_plugin.py  |    5 ++---
- .../plugins/cisco/nexus/cisco_nexus_snippets.py    |    5 ++---
+ quantum/plugins/cisco/nexus/cisco_nexus_network_driver.py |    5 ++---
+ quantum/plugins/cisco/nexus/cisco_nexus_plugin.py         |    5 ++---
+ quantum/plugins/cisco/nexus/cisco_nexus_snippets.py       |    5 ++---
  3 files changed, 6 insertions(+), 9 deletions(-)
 
 commit 121a3fe444d6f72b654ebb0528716f1c20aa7221
@@ -11375,7 +12234,7 @@
     
     Change-Id: Ib54909082a0dca6e205ce25eadfa3987523892c0
 
- .../plugins/openvswitch/agent/xenserver_install.sh |    1 -
+ quantum/plugins/openvswitch/agent/xenserver_install.sh |    1 -
  1 file changed, 1 deletion(-)
 
 commit 7406b69aa4e2d2bc8e3035943011462fa1647f85
@@ -12229,9 +13088,9 @@
 
     Fixing the extensions URL to 1.0 and pep8 error.
 
- .../plugins/cisco/nova/quantum_aware_scheduler.py  |    2 +-
- quantum/plugins/cisco/nova/vifdirect.py            |    2 +-
- quantum/plugins/cisco/ucs/cisco_ucs_inventory.py   |    2 +-
+ quantum/plugins/cisco/nova/quantum_aware_scheduler.py |    2 +-
+ quantum/plugins/cisco/nova/vifdirect.py               |    2 +-
+ quantum/plugins/cisco/ucs/cisco_ucs_inventory.py      |    2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
 
 commit e87990643e34b2ebb8c614f248cb4c010d9abceb
@@ -12296,7 +13155,7 @@
 
     Dictionary key values changes in test_extension
 
- .../cisco/tests/unit/test_cisco_extension.py       |    8 ++++----
+ quantum/plugins/cisco/tests/unit/test_cisco_extension.py |    8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit 3c232b44ae21664b6a6d2a2142e0bfd6d821e855
@@ -12368,12 +13227,12 @@
     
     Also renaming API router: APIRouterV01 --> APIRouterV1
 
- etc/quantum.conf                                   |    2 +-
- quantum/api/__init__.py                            |    6 ++----
- quantum/common/extensions.py                       |    2 +-
- quantum/manager.py                                 |    2 +-
- .../cisco/tests/unit/test_cisco_extension.py       |    2 +-
- tests/unit/test_api.py                             |    2 +-
+ etc/quantum.conf                                         |    2 +-
+ quantum/api/__init__.py                                  |    6 ++----
+ quantum/common/extensions.py                             |    2 +-
+ quantum/manager.py                                       |    2 +-
+ quantum/plugins/cisco/tests/unit/test_cisco_extension.py |    2 +-
+ tests/unit/test_api.py                                   |    2 +-
  6 files changed, 7 insertions(+), 9 deletions(-)
 
 commit 976007b95188af757e5fbf7b75e6d7dc9b5fe7af
@@ -12487,10 +13346,10 @@
 
     Changes qos description to string; changes extension API names for get_host and get_instance_port
 
- quantum/plugins/cisco/l2network_plugin.py          |   10 +++++-----
- .../plugins/cisco/models/l2network_multi_blade.py  |    8 ++++----
- .../plugins/cisco/models/l2network_single_blade.py |    8 ++++----
- quantum/plugins/cisco/ucs/cisco_ucs_inventory.py   |    8 ++++----
+ quantum/plugins/cisco/l2network_plugin.py              |   10 +++++-----
+ quantum/plugins/cisco/models/l2network_multi_blade.py  |    8 ++++----
+ quantum/plugins/cisco/models/l2network_single_blade.py |    8 ++++----
+ quantum/plugins/cisco/ucs/cisco_ucs_inventory.py       |    8 ++++----
  4 files changed, 17 insertions(+), 17 deletions(-)
 
 commit 3f700ddb9e8fbea61c38015474eeb3f62e822a10
@@ -12536,9 +13395,9 @@
 
     Sorting correctly all imports for the Nexus Driver and Unit Test
 
- .../cisco/nexus/cisco_nexus_network_driver.py      |    2 +-
- quantum/plugins/cisco/nexus/cisco_nexus_plugin.py  |    2 +-
- .../plugins/cisco/tests/unit/test_nexus_plugin.py  |    4 ++--
+ quantum/plugins/cisco/nexus/cisco_nexus_network_driver.py |    2 +-
+ quantum/plugins/cisco/nexus/cisco_nexus_plugin.py         |    2 +-
+ quantum/plugins/cisco/tests/unit/test_nexus_plugin.py     |    4 ++--
  3 files changed, 4 insertions(+), 4 deletions(-)
 
 commit 51ddffa2641d0cf0725f7a5147ad0b90551e36a0
@@ -12547,8 +13406,8 @@
 
     Fixed the Unit Test for Nexus Driver
 
- .../cisco/nexus/cisco_nexus_network_driver.py      |    2 ++
- .../plugins/cisco/tests/unit/test_nexus_plugin.py  |   18 +++++++++++++++++-
+ .../cisco/nexus/cisco_nexus_network_driver.py        |    2 ++
+ .../plugins/cisco/tests/unit/test_nexus_plugin.py    |   18 +++++++++++++++++-
  2 files changed, 19 insertions(+), 1 deletion(-)
 
 commit 6b477714ba576b8a858b9ad222b14e7fe77e58ca
@@ -12595,11 +13454,11 @@
 
     Changing the order of imports (to satisfy convention).
 
- quantum/plugins/cisco/common/cisco_credentials.py  |    2 +-
- quantum/plugins/cisco/l2network_model.py           |    2 +-
- quantum/plugins/cisco/l2network_plugin.py          |    2 +-
- .../plugins/cisco/ucs/cisco_ucs_network_driver.py  |    2 +-
- quantum/plugins/cisco/ucs/cisco_ucs_plugin.py      |    2 +-
+ quantum/plugins/cisco/common/cisco_credentials.py     |    2 +-
+ quantum/plugins/cisco/l2network_model.py              |    2 +-
+ quantum/plugins/cisco/l2network_plugin.py             |    2 +-
+ quantum/plugins/cisco/ucs/cisco_ucs_network_driver.py |    2 +-
+ quantum/plugins/cisco/ucs/cisco_ucs_plugin.py         |    2 +-
  5 files changed, 5 insertions(+), 5 deletions(-)
 
 commit fd27733783a0f6f9f0db4f84084f206b7d05122a
@@ -12886,8 +13745,8 @@
 
     Noticed some pep8 errors, fixed them.
 
- .../plugins/cisco/nova/quantum_aware_scheduler.py  |    5 ++---
- quantum/plugins/cisco/nova/vifdirect.py            |    3 +--
+ quantum/plugins/cisco/nova/quantum_aware_scheduler.py |    5 ++---
+ quantum/plugins/cisco/nova/vifdirect.py               |    3 +--
  2 files changed, 3 insertions(+), 5 deletions(-)
 
 commit 0e88293280969683667c4d2e5c6b2c657a9e0659
@@ -12941,8 +13800,8 @@
     pep8 passed
     pylint 9.10
 
- .../cisco/nexus/cisco_nexus_network_driver.py      |   19 +++++++++++++------
- .../plugins/cisco/nexus/cisco_nexus_snippets.py    |   11 ++++-------
+ .../cisco/nexus/cisco_nexus_network_driver.py       |   19 +++++++++++++------
+ quantum/plugins/cisco/nexus/cisco_nexus_snippets.py |   11 ++++-------
  2 files changed, 17 insertions(+), 13 deletions(-)
 
 commit 8fe560cdaad3f84f81d806e664e9c059976f3106
@@ -13021,10 +13880,10 @@
 
     Code clean up as per reviewr's request; documentation strings, unused code, etc.
 
- quantum/plugins/cisco/common/cisco_exceptions.py   |   10 ++++++----
- quantum/plugins/cisco/db/nexus_models.py           |    2 --
- quantum/plugins/cisco/l2network_plugin.py          |    8 ++++----
- .../cisco/l2network_plugin_configuration.py        |    9 +++++++++
+ quantum/plugins/cisco/common/cisco_exceptions.py        |   10 ++++++----
+ quantum/plugins/cisco/db/nexus_models.py                |    2 --
+ quantum/plugins/cisco/l2network_plugin.py               |    8 ++++----
+ quantum/plugins/cisco/l2network_plugin_configuration.py |    9 +++++++++
  4 files changed, 19 insertions(+), 10 deletions(-)
 
 commit c72cb36ef93246051b2e1ac498161c3301b600df
@@ -13399,7 +14258,7 @@
 
     Change profile-id
 
- .../plugins/cisco/tests/unit/test_l2networkApi.py  |   18 +++++++++---------
+ .../plugins/cisco/tests/unit/test_l2networkApi.py    |   18 +++++++++---------
  1 file changed, 9 insertions(+), 9 deletions(-)
 
 commit 54368197605597cd1c10455ce5a788ec8c7d7b3b
@@ -13422,7 +14281,7 @@
 
     Review Changes
 
- .../cisco/tests/unit/test_cisco_extension.py       |    9 ++++-----
+ quantum/plugins/cisco/tests/unit/test_cisco_extension.py |    9 ++++-----
  1 file changed, 4 insertions(+), 5 deletions(-)
 
 commit 28daf38fa7ebcb11885d0705458d88847be7c6a4
@@ -13506,8 +14365,8 @@
 
     Code refactored, made changes are per reviwer's suggestions.
 
- .../plugins/cisco/nova/quantum_aware_scheduler.py  |   12 +++++-------
- quantum/plugins/cisco/nova/vifdirect.py            |   13 ++++++-------
+ quantum/plugins/cisco/nova/quantum_aware_scheduler.py |   12 +++++-------
+ quantum/plugins/cisco/nova/vifdirect.py               |   13 ++++++-------
  2 files changed, 11 insertions(+), 14 deletions(-)
 
 commit 2f1aba8dcf590d960040f625ad682593f7e15c76
@@ -13606,12 +14465,12 @@
     pep8 passed
     pylint 8.81/10
 
- quantum/plugins/cisco/README                       |    7 ++++---
- quantum/plugins/cisco/conf/nexus.ini               |    5 +++--
- .../cisco/nexus/cisco_nexus_configuration.py       |    3 ++-
- .../cisco/nexus/cisco_nexus_network_driver.py      |   14 +++++++++-----
- quantum/plugins/cisco/nexus/cisco_nexus_plugin.py  |   17 +++++++++++++----
- .../plugins/cisco/tests/unit/test_nexus_plugin.py  |    3 ++-
+ quantum/plugins/cisco/README                          |    7 ++++---
+ quantum/plugins/cisco/conf/nexus.ini                  |    5 +++--
+ .../plugins/cisco/nexus/cisco_nexus_configuration.py  |    3 ++-
+ .../plugins/cisco/nexus/cisco_nexus_network_driver.py |   14 +++++++++-----
+ quantum/plugins/cisco/nexus/cisco_nexus_plugin.py     |   17 +++++++++++++----
+ quantum/plugins/cisco/tests/unit/test_nexus_plugin.py |    3 ++-
  6 files changed, 33 insertions(+), 16 deletions(-)
 
 commit 84d0f0a4f7b280cdab2cb84773aaa10416a738c1
@@ -13712,8 +14571,8 @@
 
     Removed concatenation per review comments.
 
- .../plugins/cisco/nova/quantum_aware_scheduler.py  |    2 +-
- quantum/plugins/cisco/nova/vifdirect.py            |    2 +-
+ quantum/plugins/cisco/nova/quantum_aware_scheduler.py |    2 +-
+ quantum/plugins/cisco/nova/vifdirect.py               |    2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit 5834bcc8e20654feb4e22cab53c83502a315f071
@@ -13826,8 +14685,8 @@
 
     Removed extra spaces to satisfy pep8.
 
- .../plugins/cisco/nova/quantum_aware_scheduler.py  |    4 +---
- quantum/plugins/cisco/nova/vifdirect.py            |    4 +---
+ quantum/plugins/cisco/nova/quantum_aware_scheduler.py |    4 +---
+ quantum/plugins/cisco/nova/vifdirect.py               |    4 +---
  2 files changed, 2 insertions(+), 6 deletions(-)
 
 commit ad0199a73c280279d7aac7f390f597b0c365975f
@@ -14097,7 +14956,7 @@
 
     Adding the changed UCS Driver function names in test_ucs_driver.
 
- .../plugins/cisco/tests/unit/test_ucs_driver.py    |    4 ++--
+ quantum/plugins/cisco/tests/unit/test_ucs_driver.py |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 7c73d56e1183c93f90a3ffecfa0d7a92d68360f6
@@ -14312,7 +15171,7 @@
 
     Removing extra testing function on Nexus Driver
 
- .../cisco/nexus/cisco_nexus_network_driver.py      |   10 ----------
+ quantum/plugins/cisco/nexus/cisco_nexus_network_driver.py |   10 ----------
  1 file changed, 10 deletions(-)
 
 commit 0d8580a2239dc2fe45525c1a878e170651e06e3f
@@ -15237,9 +16096,9 @@
 
     Fixed issue with creating new port profiles (one configuration parameter got left out during the migration to the new configuration scheme). Also fixed a bug in the calculation of the profile id.
 
- quantum/plugins/cisco/conf/l2network_plugin.ini    |    4 +++-
- quantum/plugins/cisco/l2network_plugin.py          |   19 ++++++++++++++++---
- .../cisco/l2network_plugin_configuration.py        |    3 +++
+ quantum/plugins/cisco/conf/l2network_plugin.ini     |    4 +++-
+ quantum/plugins/cisco/l2network_plugin.py           |   19 ++++++++++++++++---
+ .../plugins/cisco/l2network_plugin_configuration.py |    3 +++
  3 files changed, 22 insertions(+), 4 deletions(-)
 
 commit d523ce7c18420c998f5f0e8bf16ffad64e005c42
@@ -15397,7 +16256,7 @@
 
     Fixed pep8 error.
 
- .../plugins/cisco/ucs/cisco_ucs_network_driver.py  |    6 ++++--
+ quantum/plugins/cisco/ucs/cisco_ucs_network_driver.py |    6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 commit e1c068a99968e664ae6778813d95433b74b50305
@@ -15420,8 +16279,8 @@
 
     Fixed an issue selecting the right port interface and also properly switching off the Nexus Interface
 
- .../cisco/nexus/cisco_nexus_network_driver.py      |   12 ++++++++++--
- quantum/plugins/cisco/nexus/cisco_nexus_plugin.py  |    2 +-
+ quantum/plugins/cisco/nexus/cisco_nexus_network_driver.py |   12 ++++++++++--
+ quantum/plugins/cisco/nexus/cisco_nexus_plugin.py         |    2 +-
  2 files changed, 11 insertions(+), 3 deletions(-)
 
 commit 303eb0bedbcdc6b711f9e048c408625f9e1811a1
@@ -15465,7 +16324,7 @@
 
     Earlier fix resulted in a different issue (profile client name, was also being used as profile name, hence breaking).
 
- .../plugins/cisco/ucs/cisco_ucs_network_driver.py  |    6 +++---
+ quantum/plugins/cisco/ucs/cisco_ucs_network_driver.py |    6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 9f8b25e53c9957f09bab49a14f198356e00bce6c
@@ -15474,7 +16333,7 @@
 
     Truncated the port profile client name length to 16 characters (ucsm excepts max 17 chars).
 
- .../plugins/cisco/ucs/cisco_ucs_network_driver.py  |    2 +-
+ quantum/plugins/cisco/ucs/cisco_ucs_network_driver.py |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit d67baf0657f4151686d168fc634901b5e24c8dec
@@ -15698,9 +16557,9 @@
 
     make ovs plugin pay attention to port state
 
- .../plugins/openvswitch/agent/ovs_quantum_agent.py |    2 +-
- quantum/plugins/openvswitch/ovs_quantum_plugin.py  |   12 ++++++------
- tests/unit/test_api.py                             |   17 +++++++++++++++++
+ .../plugins/openvswitch/agent/ovs_quantum_agent.py    |    2 +-
+ quantum/plugins/openvswitch/ovs_quantum_plugin.py     |   12 ++++++------
+ tests/unit/test_api.py                                |   17 +++++++++++++++++
  3 files changed, 24 insertions(+), 7 deletions(-)
 
 commit c1e123de812d2cb9012ae7464812e852acbdac8b
@@ -17808,7 +18667,7 @@
 
     Removing excess imports
 
- .../cisco/tests/unit/test_l2network_multi_blade.py |    2 --
+ quantum/plugins/cisco/tests/unit/test_l2network_multi_blade.py |    2 --
  1 file changed, 2 deletions(-)
 
 commit e6dc574255821d2a97c91426fafd42bababfbddd
@@ -17952,7 +18811,7 @@
 
     Removing a couple extra lines
 
- .../cisco/tests/unit/test_l2network_multi_blade.py |    4 ----
+ quantum/plugins/cisco/tests/unit/test_l2network_multi_blade.py |    4 ----
  1 file changed, 4 deletions(-)
 
 commit 891d938d9755d392bdbc5e090d1a1fc0b1fb22cc
@@ -17970,7 +18829,7 @@
 
     Adding author information
 
- .../cisco/tests/unit/test_l2network_multi_blade.py |    3 +++
+ quantum/plugins/cisco/tests/unit/test_l2network_multi_blade.py |    3 +++
  1 file changed, 3 insertions(+)
 
 commit 4cd616014cebe413c6802aeae1c55dc7bdc9c572
@@ -17979,7 +18838,7 @@
 
     Removing a negative test until I can figure out how to implement it
 
- .../cisco/tests/unit/test_l2network_multi_blade.py |   19 -------------------
+ .../cisco/tests/unit/test_l2network_multi_blade.py  |   19 -------------------
  1 file changed, 19 deletions(-)
 
 commit 9fc4f1ba33e56aa22a8000de6838e7140ca1329e
@@ -18006,7 +18865,7 @@
 
     Fixing port-related calls
 
- .../cisco/tests/unit/test_l2network_multi_blade.py |   15 ++++++++-------
+ .../cisco/tests/unit/test_l2network_multi_blade.py      |   15 ++++++++-------
  1 file changed, 8 insertions(+), 7 deletions(-)
 
 commit aa98712148ed3f4377246fd30eb6210d6a29f05d

=== modified file 'PKG-INFO'
--- PKG-INFO	2012-06-22 12:49:23 +0000
+++ PKG-INFO	2013-01-08 00:32:21 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: quantum
-Version: 2012.2
+Version: 2012.2.1
 Summary: Quantum (virtual network service)
 Home-page: https://launchpad.net/quantum
 Author: Netstack

=== modified file 'bin/quantum-rootwrap'
--- bin/quantum-rootwrap	2012-09-07 18:50:09 +0000
+++ bin/quantum-rootwrap	2013-01-08 00:32:21 +0000
@@ -38,6 +38,7 @@
 
 import ConfigParser
 import os
+import signal
 import subprocess
 import sys
 
@@ -47,6 +48,12 @@
 RC_BADCONFIG = 97
 
 
+def _subprocess_setup():
+    # Python installs a SIGPIPE handler by default. This is usually not what
+    # non-Python subprocesses expect.
+    signal.signal(signal.SIGPIPE, signal.SIG_DFL)
+
+
 if __name__ == '__main__':
     # Split arguments, require at least a command
     execname = sys.argv.pop(0)
@@ -84,6 +91,7 @@
                                stdin=sys.stdin,
                                stdout=sys.stdout,
                                stderr=sys.stderr,
+                               preexec_fn=_subprocess_setup,
                                env=filtermatch.get_environment(userargs))
         obj.wait()
         sys.exit(obj.returncode)

=== modified file 'debian/changelog'
--- debian/changelog	2012-09-27 15:53:04 +0000
+++ debian/changelog	2013-01-08 00:32:21 +0000
@@ -1,3 +1,76 @@
+quantum (2012.2.1-0ubuntu1~cloud0) precise-folsom; urgency=low
+
+  * Stable update for the Ubuntu Cloud Archive.
+
+ -- Adam Gandelman <[e-mail]>  Mon, 07 Jan 2013 16:19:50 -0800
+
+quantum (2012.2.1-0ubuntu1) quantal-proposed; urgency=low
+
+  * Resynchronize with stable/folsom (1e774867) (LP: #1085255):
+    - [aeabb42] There are routing problems when the dnsmasq port does not come
+      first in the routing table (LP: #1083238)
+    - [04aab72] Quantum linux bridge not optimized with libvirt (LP: #1078210)
+    - [ca7fc10] getting quotas from database has severe performance implications
+      (LP: #1075369)
+    - [66605e8] failed to update an external network into non external network
+      (LP: #1083387)
+    - [c60051a] Quantum test suite leaks memory like a sieve (LP: #1065276)
+    - [3179dfc] clear_db() does incomplete db teardown (LP: #1080988)
+    - [c1e19d7] Unauthorized command: cat /proc/None/cmdline (LP: #1077651)
+    - [af9e076] At times a instance will not receive an IP address from the DHCP
+      agent (LP: #1081664)
+    - [e0d1a7d] allow multiple floating-ip on single port if they use different
+      fixed ips and/or external nets (LP: #1057844)
+    - [8471d79] Delete port fails to gateway ip (LP: #1079980)
+    - [aca8b4a] fixed_ip allocation which is not included within
+      allocation_pools makes error when delete port or re-create port
+      (LP: #1077292)
+    - [eacc9d3] Mapping same bridge to different phyiscal networks succeed
+      (LP: #1067669)
+    - [51b4c82] python-quantum: not region aware (LP: #1080793)
+    - [6f0a486] delete floatingip should be in one transaction to delete port
+      (LP: #1080516)
+    - [db6cda7] Remove qpid configuration variables no longer supported
+    - [a112840] Allow NVP plugin to use per-tenant quota extension
+    - [82b1a55] Quantum service does not restart after reboot (LP: #1073999)
+    - [c01a839] There are some cases that L3 API with an invalid parameter
+      returns 500. (LP: #1064765)
+    - [26b383f] external network can be plugged also as internal network for one 
+      router (LP: #1053633)
+    - [49f649c] There is a lot of cases that API with an invalid parameter
+      returns 500. (LP: #1062046)
+    - [4546a18] When create subnet, you con set up the value as cidr (the value
+      isn't cidr form). (LP: #1067959)
+    - [9ba453a] killfilter should handle updated/deleted executables
+      (LP: #1073768)
+    - [7c8a55c] a port which is not able to delete is made when floatingip
+      create fails. (LP: #1064748)
+    - [c9b84cf] Linux bridge port update causes exception (LP: #1072713)
+    - [cb57932] I can't add interface to router, if there is another port in
+      non-shared network of other tenant (LP: #1057558)
+    - [574e278] Ryu plugin does not support Security Groups (LP: #1059393)
+    - [607f486] tap device added to integration bridge without tag 
+      (LP: #1064070)
+    - [21a0fdf] L3 agent external network flag (LP: #1056720)
+    - [5cbaff4] router create with external_gateway_info fails with 500 always.
+      (LP: #1064235)
+    - [63b81f6] l3 db operations failed in multiple transactions (LP: #1070335)
+    - [bff17fb] Ensure that the SqlSoup import is still supported.
+    - [e091a29] l3_nat_agent was renamed to l3_agent
+    - [9030969] remove default value of 'local_ip' of 10.0.0.3 in
+      ovs_quantum_plugin.ini  (LP: #1051744)
+    - [425e942] rootwrap error with L3 agent (LP: #1069966)
+    - [51c8799] Port create with invalid IP data creates port. (LP: #1064261)
+    - [fc97da9] nvp_plugin does not update device_id in nvplib (LP: #1061391)
+    - [2504f62] get_network in nvp plugin didn't return subnet information
+      (LP: #1061781)
+    - [b4f9b1f] l3_agent not disabling namespace use (LP: #1060559)
+    - [3bbf281] Add SIGPIPE handler to subprocess execution in rootwrap and 
+      utils.execute (LP: #1053364)
+    - [c623f72] Set defaultbranch in .gitreview to stable/folsom
+
+ -- Adam Gandelman <[e-mail]>  Tue, 04 Dec 2012 09:19:46 -0800
+
 quantum (2012.2-0ubuntu1~cloud0) precise-folsom; urgency=low
 
   * New release candidate for the Ubuntu Cloud Archive.

=== modified file 'debian/control'
--- debian/control	2012-09-27 15:53:04 +0000
+++ debian/control	2013-01-08 00:32:21 +0000
@@ -10,7 +10,6 @@
  python-anyjson,
  python-cliff,
  python-configobj,
- python-cliff,
  python-coverage,
  python-eventlet,
  python-gflags,

=== modified file 'debian/rules'
--- debian/rules	2012-09-27 15:53:04 +0000
+++ debian/rules	2013-01-08 00:32:21 +0000
@@ -17,5 +17,5 @@
 
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-	./run_tests.sh -N -P || true
+	./run_tests.sh -N -P
 endif

=== modified file 'etc/l3_agent.ini'
--- etc/l3_agent.ini	2012-09-21 13:01:18 +0000
+++ etc/l3_agent.ini	2013-01-08 00:32:21 +0000
@@ -34,7 +34,7 @@
 # value should be set to the UUID of that external network.  If empty,
 # the agent will enforce that only a single external networks exists and
 # use that external network id
-# gateway_external_net_id =
+# gateway_external_network_id =
 
 # Indicates that this L3 agent should also handle routers that do not have
 # an external network gateway configured.  This option should be True only

=== modified file 'etc/quantum.conf'
--- etc/quantum.conf	2012-09-26 15:14:31 +0000
+++ etc/quantum.conf	2013-01-08 00:32:21 +0000
@@ -107,18 +107,6 @@
 # qpid_password = ''
 # Space separated list of SASL mechanisms to use for auth
 # qpid_sasl_mechanisms = ''
-# Automatically reconnect
-# qpid_reconnect = True
-# Reconnection timeout in seconds
-# qpid_reconnect_timeout = 0
-# Max reconnections before giving up
-# qpid_reconnect_limit = 0
-# Minimum seconds between reconnection attempts
-# qpid_reconnect_interval_min = 0
-# Maximum seconds between reconnection attempts
-# qpid_reconnect_interval_max = 0
-# Equivalent to setting max and min to the same value
-# qpid_reconnect_interval = 0
 # Seconds between connection keepalive heartbeats
 # qpid_heartbeat = 60
 # Transport to use, either 'tcp' or 'ssl'

=== modified file 'etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini'
--- etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini	2012-09-12 13:41:20 +0000
+++ etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini	2013-01-08 00:32:21 +0000
@@ -64,7 +64,7 @@
 # empty for the server. Set local-ip to be the local IP address of
 # this hypervisor.
 #
-# Default: local_ip = 10.0.0.3
+# Default: local_ip =
 
 # (ListOpt) Comma-separated list of <physical_network>:<bridge> tuples
 # mapping physical network names to the agent's node-specific OVS

=== modified file 'quantum.egg-info/PKG-INFO'
--- quantum.egg-info/PKG-INFO	2012-06-22 12:49:23 +0000
+++ quantum.egg-info/PKG-INFO	2013-01-08 00:32:21 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: quantum
-Version: 2012.2
+Version: 2012.2.1
 Summary: Quantum (virtual network service)
 Home-page: https://launchpad.net/quantum
 Author: Netstack

=== modified file 'quantum.egg-info/SOURCES.txt'
--- quantum.egg-info/SOURCES.txt	2012-09-26 15:14:31 +0000
+++ quantum.egg-info/SOURCES.txt	2013-01-08 00:32:21 +0000
@@ -478,6 +478,7 @@
 quantum/tests/unit/test_api_v2.py
 quantum/tests/unit/test_attributes.py
 quantum/tests/unit/test_auth.py
+quantum/tests/unit/test_common_utils.py
 quantum/tests/unit/test_db_plugin.py
 quantum/tests/unit/test_db_rpc_base.py
 quantum/tests/unit/test_debug_commands.py
@@ -503,6 +504,7 @@
 quantum/tests/unit/linuxbridge/__init__.py
 quantum/tests/unit/linuxbridge/test_defaults.py
 quantum/tests/unit/linuxbridge/test_lb_db.py
+quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py
 quantum/tests/unit/linuxbridge/test_linuxbridge_plugin.py
 quantum/tests/unit/linuxbridge/test_rpcapi.py
 quantum/tests/unit/metaplugin/__init__.py

=== modified file 'quantum.egg-info/entry_points.txt'
--- quantum.egg-info/entry_points.txt	2012-09-07 18:50:09 +0000
+++ quantum.egg-info/entry_points.txt	2013-01-08 00:32:21 +0000
@@ -4,7 +4,7 @@
 quantum-dhcp-agent-dnsmasq-lease-update = quantum.agent.linux.dhcp:Dnsmasq.lease_update
 quantum-dhcp-agent = quantum.agent.dhcp_agent:main
 quantum-ryu-agent = quantum.plugins.ryu.agent.ryu_quantum_agent:main
-quantum-l3-agent = quantum.agent.l3_nat_agent:main
+quantum-l3-agent = quantum.agent.l3_agent:main
 quantum-openvswitch-agent = quantum.plugins.openvswitch.agent.ovs_quantum_agent:main
 quantum-server = quantum.server:main
 quantum-linuxbridge-agent = quantum.plugins.linuxbridge.agent.linuxbridge_quantum_agent:main

=== modified file 'quantum.egg-info/requires.txt'
--- quantum.egg-info/requires.txt	2012-09-07 18:50:09 +0000
+++ quantum.egg-info/requires.txt	2013-01-08 00:32:21 +0000
@@ -12,5 +12,5 @@
 netaddr
 python-quantumclient>=2.0
 pyudev
-sqlalchemy>0.6.4
+sqlalchemy>0.6.4,<=0.7.9
 webob==1.0.8
\ No newline at end of file

=== modified file 'quantum.egg-info/top_level.txt'
--- quantum.egg-info/top_level.txt	2012-06-22 12:49:23 +0000
+++ quantum.egg-info/top_level.txt	2013-01-08 00:32:21 +0000
@@ -1,3 +1,3 @@
+bin
 quantum
-bin
 tools

=== modified file 'quantum/agent/dhcp_agent.py'
--- quantum/agent/dhcp_agent.py	2012-09-12 13:41:20 +0000
+++ quantum/agent/dhcp_agent.py	2013-01-08 00:32:21 +0000
@@ -444,6 +444,11 @@
         self.driver.init_l3(interface_name, ip_cidrs,
                             namespace=namespace)
 
+        # ensure that the dhcp interface is first in the list
+        if namespace is None:
+            device = ip_lib.IPDevice(interface_name, self.conf.root_helper)
+            device.route.pullup_route(interface_name)
+
         return interface_name
 
     def destroy(self, network, device_name):

=== modified file 'quantum/agent/l3_agent.py'
--- quantum/agent/l3_agent.py	2012-09-21 13:01:18 +0000
+++ quantum/agent/l3_agent.py	2013-01-08 00:32:21 +0000
@@ -123,10 +123,11 @@
             tenant_name=self.conf.admin_tenant_name,
             auth_url=self.conf.auth_url,
             auth_strategy=self.conf.auth_strategy,
-            auth_region=self.conf.auth_region
+            region_name=self.conf.auth_region
         )
 
-        self._destroy_all_router_namespaces()
+        if self.conf.use_namespaces:
+            self._destroy_all_router_namespaces()
 
     def _destroy_all_router_namespaces(self):
         """Destroy all router namespaces on the host to eliminate
@@ -181,7 +182,7 @@
         params = {'router:external': True}
         ex_nets = self.qclient.list_networks(**params)['networks']
         if len(ex_nets) > 1:
-            raise Exception("must configure 'external_network_id' if "
+            raise Exception("must configure 'gateway_external_network_id' if "
                             "Quantum has more than one external network.")
         if len(ex_nets) == 0:
             return None

=== modified file 'quantum/agent/linux/dhcp.py'
--- quantum/agent/linux/dhcp.py	2012-09-07 18:50:09 +0000
+++ quantum/agent/linux/dhcp.py	2013-01-08 00:32:21 +0000
@@ -167,6 +167,9 @@
     @property
     def active(self):
         pid = self.pid
+        if pid is None:
+            return False
+
         cmd = ['cat', '/proc/%s/cmdline' % pid]
         try:
             return self.network.id in utils.execute(cmd, self.root_helper)

=== modified file 'quantum/agent/linux/ip_lib.py'
--- quantum/agent/linux/ip_lib.py	2012-09-12 13:41:20 +0000
+++ quantum/agent/linux/ip_lib.py	2013-01-08 00:32:21 +0000
@@ -327,6 +327,46 @@
 
         return retval
 
+    def pullup_route(self, interface_name):
+        """
+        Ensures that the route entry for the interface is before all
+        others on the same subnet.
+        """
+        device_list = []
+        device_route_list_lines = self._run('list', 'proto', 'kernel',
+                                            'dev', interface_name).split('\n')
+        for device_route_line in device_route_list_lines:
+            try:
+                subnet = device_route_line.split()[0]
+            except:
+                continue
+            subnet_route_list_lines = self._run('list', 'proto', 'kernel',
+                                                'match', subnet).split('\n')
+            for subnet_route_line in subnet_route_list_lines:
+                i = iter(subnet_route_line.split())
+                while(i.next() != 'dev'):
+                    pass
+                device = i.next()
+                try:
+                    while(i.next() != 'src'):
+                        pass
+                    src = i.next()
+                except:
+                    src = ''
+                if device != interface_name:
+                    device_list.append((device, src))
+                else:
+                    break
+
+            for (device, src) in device_list:
+                self._as_root('del', subnet, 'dev', device)
+                if (src != ''):
+                    self._as_root('append', subnet, 'proto', 'kernel',
+                                  'src', src, 'dev', device)
+                else:
+                    self._as_root('append', subnet, 'proto', 'kernel',
+                                  'dev', device)
+
 
 class IpNetnsCommand(IpCommandBase):
     COMMAND = 'netns'

=== modified file 'quantum/agent/linux/iptables_manager.py'
--- quantum/agent/linux/iptables_manager.py	2012-09-12 13:41:20 +0000
+++ quantum/agent/linux/iptables_manager.py	2013-01-08 00:32:21 +0000
@@ -269,7 +269,7 @@
         rules. This happens atomically, thanks to iptables-restore.
 
         """
-        s = [('/sbin/iptables', self.ipv4)]
+        s = [('iptables', self.ipv4)]
         if self.use_ipv6:
             s += [('ip6tables', self.ipv6)]
 

=== modified file 'quantum/agent/linux/utils.py'
--- quantum/agent/linux/utils.py	2012-08-17 10:42:58 +0000
+++ quantum/agent/linux/utils.py	2013-01-08 00:32:21 +0000
@@ -21,6 +21,7 @@
 import logging
 import os
 import shlex
+import signal
 import socket
 import struct
 
@@ -30,6 +31,12 @@
 LOG = logging.getLogger(__name__)
 
 
+def _subprocess_setup():
+    # Python installs a SIGPIPE handler by default. This is usually not what
+    # non-Python subprocesses expect.
+    signal.signal(signal.SIGPIPE, signal.SIG_DFL)
+
+
 def execute(cmd, root_helper=None, process_input=None, addl_env=None,
             check_exit_code=True, return_stderr=False):
     if root_helper:
@@ -42,6 +49,7 @@
         env.update(addl_env)
     obj = subprocess.Popen(cmd, shell=False, stdin=subprocess.PIPE,
                            stdout=subprocess.PIPE, stderr=subprocess.PIPE,
+                           preexec_fn=_subprocess_setup,
                            env=env)
 
     _stdout, _stderr = (process_input and

=== modified file 'quantum/api/v2/attributes.py'
--- quantum/api/v2/attributes.py	2012-09-21 13:01:18 +0000
+++ quantum/api/v2/attributes.py	2013-01-08 00:32:21 +0000
@@ -35,7 +35,7 @@
     if data in [True, False]:
         return
     else:
-        msg = _("%s is not boolean") % data
+        msg = _("'%s' is not boolean") % data
         LOG.debug("validate_boolean: %s", msg)
         return msg
 
@@ -50,6 +50,19 @@
         return msg
 
 
+def _validate_string(data, max_len=None):
+    if not isinstance(data, basestring):
+        msg = _("'%s' is not a valid string") % data
+        LOG.debug("validate_string: %s", msg)
+        return msg
+    if max_len is not None:
+        if len(data) > max_len:
+            msg = _("'%(data)s' exceeds maximum length of "
+                    "%(max_len)s.") % locals()
+            LOG.debug("validate_string: %s", msg)
+            return msg
+
+
 def _validate_range(data, valid_values=None):
     min_value = valid_values[0]
     max_value = valid_values[1]
@@ -68,7 +81,7 @@
         netaddr.EUI(data)
         return
     except Exception:
-        msg = _("%s is not a valid MAC address") % data
+        msg = _("'%s' is not a valid MAC address") % data
         LOG.debug("validate_mac_address: %s", msg)
         return msg
 
@@ -78,11 +91,131 @@
         netaddr.IPAddress(data)
         return
     except Exception:
-        msg = _("%s is not a valid IP address") % data
+        msg = _("'%s' is not a valid IP address") % data
         LOG.debug("validate_ip_address: %s", msg)
         return msg
 
 
+def _validate_ip_pools(data, valid_values=None):
+    """Validate that start and end IP addresses are present
+
+    In addition to this the IP addresses will also be validated"""
+    if not isinstance(data, list):
+        msg = _("'%s' in not a valid IP pool") % data
+        LOG.debug("validate_ip_pools: %s", msg)
+        return msg
+
+    expected_keys = set(['start', 'end'])
+    try:
+        for ip_pool in data:
+            if set(ip_pool.keys()) != expected_keys:
+                msg = _("Expected keys not found. Expected: %s "
+                        "Provided: %s") % (expected_keys, ip_pool.keys())
+                LOG.debug("validate_ip_pools: %s", msg)
+                return msg
+            for k in expected_keys:
+                msg = _validate_ip_address(ip_pool[k])
+                if msg:
+                    LOG.debug("validate_ip_pools: %s", msg)
+                    return msg
+    except KeyError, e:
+        args = {'key_name': e.message, 'ip_pool': ip_pool}
+        msg = _("Invalid input. Required key: '%(key_name)s' "
+                "missing from %(ip_pool)s.") % args
+        LOG.debug("validate_ip_pools: %s", msg)
+        return msg
+    except TypeError, e:
+        msg = _("Invalid input. Pool %s must be a dictionary.") % ip_pool
+        LOG.debug("validate_ip_pools: %s", msg)
+        return msg
+    except Exception:
+        msg = _("'%s' in not a valid IP pool") % data
+        LOG.debug("validate_ip_pools: %s", msg)
+        return msg
+
+
+def _validate_fixed_ips(data, valid_values=None):
+    if not isinstance(data, list):
+        msg = _("'%s' in not a valid fixed IP") % data
+        LOG.debug("validate_fixed_ips: %s", msg)
+        return msg
+    ips = []
+    try:
+        for fixed_ip in data:
+            if 'ip_address' in fixed_ip:
+                msg = _validate_ip_address(fixed_ip['ip_address'])
+                if msg:
+                    LOG.debug("validate_fixed_ips: %s", msg)
+                    return msg
+            if 'subnet_id' in fixed_ip:
+                msg = _validate_regex(fixed_ip['subnet_id'], UUID_PATTERN)
+                if msg:
+                    LOG.debug("validate_fixed_ips: %s", msg)
+                    return msg
+            # Ensure that duplicate entries are not set - just checking IP
+            # suffices. Duplicate subnet_id's are legitimate.
+            if 'ip_address' in fixed_ip:
+                if fixed_ip['ip_address'] in ips:
+                    msg = _("Duplicate entry %s") % fixed_ip
+                    LOG.debug("validate_fixed_ips: %s", msg)
+                    return msg
+                ips.append(fixed_ip['ip_address'])
+    except Exception:
+        msg = _("'%s' in not a valid fixed IP") % data
+        LOG.debug("validate_fixed_ips: %s", msg)
+        return msg
+
+
+def _validate_nameservers(data, valid_values=None):
+    if not hasattr(data, '__iter__'):
+        msg = _("'%s' in not a valid nameserver") % data
+        LOG.debug("validate_nameservers: %s", msg)
+        return msg
+    ips = set()
+    for ip in data:
+        msg = _validate_ip_address(ip)
+        if msg:
+            # This may be a hostname
+            msg = _validate_regex(ip, HOSTNAME_PATTERN)
+            if msg:
+                msg = _("'%s' in not a valid nameserver") % ip
+                LOG.debug("validate_nameservers: %s", msg)
+                return msg
+        if ip in ips:
+            msg = _("Duplicate nameserver %s") % ip
+            LOG.debug("validate_nameservers: %s", msg)
+            return msg
+        ips.add(ip)
+
+
+def _validate_hostroutes(data, valid_values=None):
+    if not isinstance(data, list):
+        msg = _("'%s' in not a valid hostroute") % data
+        LOG.debug("validate_hostroutes: %s", msg)
+        return msg
+    hostroutes = []
+    try:
+        for hostroute in data:
+            msg = _validate_subnet(hostroute['destination'])
+            if msg:
+                LOG.debug("validate_hostroutes: %s", msg)
+                return msg
+            msg = _validate_ip_address(hostroute['nexthop'])
+            if msg:
+                LOG.debug("validate_hostroutes: %s", msg)
+                return msg
+            if hostroute in hostroutes:
+                msg = _("Duplicate hostroute %s") % hostroute
+                LOG.debug("validate_hostroutes: %s", msg)
+                if msg:
+                    return msg
+            hostroutes.append(hostroute)
+    except:
+        msg = _("'%s' in not a valid hostroute") % data
+        LOG.debug("validate_hostroutes: %s", msg)
+        return msg
+
+
 def _validate_ip_address_or_none(data, valid_values=None):
     if data is None:
         return None
@@ -92,21 +225,26 @@
 def _validate_subnet(data, valid_values=None):
     try:
         netaddr.IPNetwork(data)
-        return
+        if len(data.split('/')) == 2:
+            return
     except Exception:
-        msg = _("%s is not a valid IP subnet") % data
-        LOG.debug("validate_subnet: %s", msg)
-        return msg
+        pass
+
+    msg = _("'%s' is not a valid IP subnet") % data
+    LOG.debug("validate_subnet: %s", msg)
+    return msg
 
 
 def _validate_regex(data, valid_values=None):
-    match = re.match(valid_values, data)
-    if match:
-        return
-    else:
-        msg = _("%s is not valid") % data
-        LOG.debug("validate_regex: %s", msg)
-        return msg
+    try:
+        if re.match(valid_values, data):
+            return
+    except TypeError:
+        pass
+
+    msg = _("'%s' is not valid input") % data
+    LOG.debug("validate_regex: %s", msg)
+    return msg
 
 
 def convert_to_boolean(data):
@@ -118,15 +256,23 @@
                 return True
             else:
                 return False
-    except ValueError, TypeError:
+    except (ValueError, TypeError):
         if (data == "True" or data == "true"):
             return True
         if (data == "False" or data == "false"):
             return False
-    msg = _("%s is not boolean") % data
+    msg = _("'%s' is not boolean") % data
     raise q_exc.InvalidInput(error_message=msg)
 
 
+def convert_to_int(data):
+    try:
+        return int(data)
+    except (ValueError, TypeError):
+        msg = _("'%s' is not a integer") % data
+        raise q_exc.InvalidInput(error_message=msg)
+
+
 def convert_kvp_str_to_list(data):
     """Convert a value of the form 'key=value' to ['key', 'value'].
 
@@ -157,6 +303,8 @@
         kvp_map[key].add(value)
     return dict((x, list(y)) for x, y in kvp_map.iteritems())
 
+HOSTNAME_PATTERN = ("(?=^.{1,254}$)(^(?:(?!\d+\.|-)[a-zA-Z0-9_\-]"
+                    "{1,63}(?<!-)\.?)+(?:[a-zA-Z]{2,})$)")
 
 HEX_ELEM = '[0-9A-Fa-f]'
 UUID_PATTERN = '-'.join([HEX_ELEM + '{8}', HEX_ELEM + '{4}',
@@ -169,12 +317,17 @@
 # Dictionary that maintains a list of validation functions
 validators = {'type:boolean': _validate_boolean,
               'type:values': _validate_values,
+              'type:string': _validate_string,
               'type:range': _validate_range,
               'type:mac_address': _validate_mac_address,
+              'type:fixed_ips': _validate_fixed_ips,
               'type:ip_address': _validate_ip_address,
               'type:ip_address_or_none': _validate_ip_address_or_none,
               'type:subnet': _validate_subnet,
-              'type:regex': _validate_regex}
+              'type:regex': _validate_regex,
+              'type:ip_pools': _validate_ip_pools,
+              'type:hostroutes': _validate_hostroutes,
+              'type:nameservers': _validate_nameservers}
 
 # Note: a default of ATTR_NOT_SPECIFIED indicates that an
 # attribute is not required, but will be generated by the plugin
@@ -205,6 +358,7 @@
                'validate': {'type:regex': UUID_PATTERN},
                'is_visible': True},
         'name': {'allow_post': True, 'allow_put': True,
+                 'validate': {'type:string': None},
                  'default': '', 'is_visible': True},
         'subnets': {'allow_post': False, 'allow_put': False,
                     'default': [],
@@ -217,6 +371,7 @@
         'status': {'allow_post': False, 'allow_put': False,
                    'is_visible': True},
         'tenant_id': {'allow_post': True, 'allow_put': False,
+                      'validate': {'type:string': None},
                       'required_by_policy': True,
                       'is_visible': True},
         SHARED: {'allow_post': True,
@@ -233,6 +388,7 @@
                'validate': {'type:regex': UUID_PATTERN},
                'is_visible': True},
         'name': {'allow_post': True, 'allow_put': True, 'default': '',
+                 'validate': {'type:string': None},
                  'is_visible': True},
         'network_id': {'allow_post': True, 'allow_put': False,
                        'required_by_policy': True,
@@ -251,15 +407,19 @@
         'fixed_ips': {'allow_post': True, 'allow_put': True,
                       'default': ATTR_NOT_SPECIFIED,
                       'convert_list_to': convert_kvp_list_to_dict,
+                      'validate': {'type:fixed_ips': None},
                       'enforce_policy': True,
                       'is_visible': True},
         'device_id': {'allow_post': True, 'allow_put': True,
+                      'validate': {'type:string': None},
                       'default': '',
                       'is_visible': True},
         'device_owner': {'allow_post': True, 'allow_put': True,
+                         'validate': {'type:string': None},
                          'default': '',
                          'is_visible': True},
         'tenant_id': {'allow_post': True, 'allow_put': False,
+                      'validate': {'type:string': None},
                       'required_by_policy': True,
                       'is_visible': True},
         'status': {'allow_post': False, 'allow_put': False,
@@ -270,9 +430,10 @@
                'validate': {'type:regex': UUID_PATTERN},
                'is_visible': True},
         'name': {'allow_post': True, 'allow_put': True, 'default': '',
+                 'validate': {'type:string': None},
                  'is_visible': True},
         'ip_version': {'allow_post': True, 'allow_put': False,
-                       'convert_to': int,
+                       'convert_to': convert_to_int,
                        'validate': {'type:values': [4, 6]},
                        'is_visible': True},
         'network_id': {'allow_post': True, 'allow_put': False,
@@ -289,14 +450,18 @@
         #TODO(salvatore-orlando): Enable PUT on allocation_pools
         'allocation_pools': {'allow_post': True, 'allow_put': False,
                              'default': ATTR_NOT_SPECIFIED,
+                             'validate': {'type:ip_pools': None},
                              'is_visible': True},
         'dns_nameservers': {'allow_post': True, 'allow_put': True,
                             'default': ATTR_NOT_SPECIFIED,
+                            'validate': {'type:nameservers': None},
                             'is_visible': True},
         'host_routes': {'allow_post': True, 'allow_put': True,
                         'default': ATTR_NOT_SPECIFIED,
+                        'validate': {'type:hostroutes': None},
                         'is_visible': True},
         'tenant_id': {'allow_post': True, 'allow_put': False,
+                      'validate': {'type:string': None},
                       'required_by_policy': True,
                       'is_visible': True},
         'enable_dhcp': {'allow_post': True, 'allow_put': True,

=== modified file 'quantum/api/v2/base.py'
--- quantum/api/v2/base.py	2012-09-21 13:01:18 +0000
+++ quantum/api/v2/base.py	2013-01-08 00:32:21 +0000
@@ -16,6 +16,7 @@
 import logging
 import socket
 
+import netaddr
 import webob.exc
 
 from quantum.api.v2 import attributes
@@ -44,7 +45,10 @@
              exceptions.HostRoutesExhausted: webob.exc.HTTPBadRequest,
              exceptions.DNSNameServersExhausted: webob.exc.HTTPBadRequest,
              # Some plugins enforce policies as well
-             exceptions.PolicyNotAuthorized: webob.exc.HTTPForbidden
+             exceptions.PolicyNotAuthorized: webob.exc.HTTPForbidden,
+             netaddr.AddrFormatError: webob.exc.HTTPBadRequest,
+             AttributeError: webob.exc.HTTPBadRequest,
+             ValueError: webob.exc.HTTPBadRequest,
              }
 
 QUOTAS = quota.QUOTAS

=== modified file 'quantum/api/v2/resource.py'
--- quantum/api/v2/resource.py	2012-09-12 13:41:20 +0000
+++ quantum/api/v2/resource.py	2013-01-08 00:32:21 +0000
@@ -18,6 +18,7 @@
 """
 import logging
 
+import netaddr
 import webob
 import webob.dec
 import webob.exc
@@ -93,7 +94,9 @@
             method = getattr(controller, action)
 
             result = method(request=request, **args)
-        except exceptions.QuantumException as e:
+        except (ValueError, AttributeError,
+                exceptions.QuantumException,
+                netaddr.AddrFormatError) as e:
             LOG.exception('%s failed' % action)
             body = serializer({'QuantumError': str(e)})
             kwargs = {'body': body, 'content_type': content_type}

=== modified file 'quantum/common/config.py'
--- quantum/common/config.py	2012-09-26 15:14:31 +0000
+++ quantum/common/config.py	2013-01-08 00:32:21 +0000
@@ -114,6 +114,7 @@
 
     handler.setFormatter(formatter)
     root_logger.addHandler(handler)
+    LOG.info("Logging enabled!")
 
 
 def load_paste_app(app_name):

=== modified file 'quantum/common/utils.py'
--- quantum/common/utils.py	2012-09-12 13:41:20 +0000
+++ quantum/common/utils.py	2013-01-08 00:32:21 +0000
@@ -23,6 +23,7 @@
 
 import logging
 import os
+import signal
 import subprocess
 import uuid
 
@@ -47,6 +48,12 @@
     return subject
 
 
+def _subprocess_setup():
+    # Python installs a SIGPIPE handler by default. This is usually not what
+    # non-Python subprocesses expect.
+    signal.signal(signal.SIGPIPE, signal.SIG_DFL)
+
+
 def execute(cmd, process_input=None, addl_env=None, check_exit_code=True):
     logging.debug("Running cmd: %s", cmd)
     env = os.environ.copy()
@@ -54,6 +61,7 @@
         env.update(addl_env)
     obj = subprocess.Popen(cmd, shell=True, stdin=subprocess.PIPE,
                            stdout=subprocess.PIPE, stderr=subprocess.PIPE,
+                           preexec_fn=_subprocess_setup,
                            env=env)
     result = None
     if process_input is not None:
@@ -144,3 +152,34 @@
 def str_uuid():
     """Return a uuid as a string"""
     return str(uuid.uuid4())
+
+
+def parse_mappings(mapping_list, unique_values=True):
+    """Parse a list of of mapping strings into a dictionary.
+
+    :param mapping_list: a list of strings of the form '<key>:<value>'
+    :param unique_values: values must be unique if True
+    :returns: a dict mapping keys to values
+    """
+    mappings = {}
+    for mapping in mapping_list:
+        mapping = mapping.strip()
+        if not mapping:
+            continue
+        split_result = mapping.split(':')
+        if len(split_result) != 2:
+            raise ValueError(_("Invalid mapping: '%s'") % mapping)
+        key = split_result[0].strip()
+        if not key:
+            raise ValueError(_("Missing key in mapping: '%s'") % mapping)
+        value = split_result[1].strip()
+        if not value:
+            raise ValueError(_("Missing value in mapping: '%s'") % mapping)
+        if key in mappings:
+            raise ValueError(_("Key %s in mapping: '%s' not unique") %
+                             (key, mapping))
+        if unique_values and value in mappings.itervalues():
+            raise ValueError(_("Value %s in mapping: '%s' not unique") %
+                             (value, mapping))
+        mappings[key] = value
+    return mappings

=== modified file 'quantum/db/api.py'
--- quantum/db/api.py	2012-09-12 13:41:20 +0000
+++ quantum/db/api.py	2013-01-08 00:32:21 +0000
@@ -85,10 +85,15 @@
 
 
 def clear_db(base=BASE):
-    global _ENGINE
+    global _ENGINE, _MAKER
     assert _ENGINE
-    for table in reversed(base.metadata.sorted_tables):
-        _ENGINE.execute(table.delete())
+
+    unregister_models(base)
+    if _MAKER:
+        _MAKER.close_all()
+        _MAKER = None
+    _ENGINE.dispose()
+    _ENGINE = None
 
 
 def get_session(autocommit=True, expire_on_commit=False):

=== modified file 'quantum/db/db_base_plugin_v2.py'
--- quantum/db/db_base_plugin_v2.py	2012-09-26 15:14:31 +0000
+++ quantum/db/db_base_plugin_v2.py	2013-01-08 00:32:21 +0000
@@ -207,11 +207,18 @@
                     query = query.filter(column.in_(value))
         return query
 
+    def _get_collection_query(self, context, model, filters=None):
+        collection = self._model_query(context, model)
+        collection = self._apply_filters_to_query(collection, model, filters)
+        return collection
+
     def _get_collection(self, context, model, dict_func, filters=None,
                         fields=None):
-        collection = self._model_query(context, model)
-        collection = self._apply_filters_to_query(collection, model, filters)
-        return [dict_func(c, fields) for c in collection.all()]
+        query = self._get_collection_query(context, model, filters)
+        return [dict_func(c, fields) for c in query.all()]
+
+    def _get_collection_count(self, context, model, filters=None):
+        return self._get_collection_query(context, model, filters).count()
 
     @staticmethod
     def _generate_mac(context, network_id):
@@ -374,7 +381,8 @@
     def update_fixed_ip_lease_expiration(self, context, network_id,
                                          ip_address, lease_remaining):
 
-        expiration = timeutils.utcnow() + datetime.timedelta(lease_remaining)
+        expiration = (timeutils.utcnow() +
+                      datetime.timedelta(seconds=lease_remaining))
 
         query = context.session.query(models_v2.IPAllocation)
         query = query.filter_by(network_id=network_id, ip_address=ip_address)
@@ -486,6 +494,31 @@
             return True
         return False
 
+    @staticmethod
+    def _check_ip_in_allocation_pool(context, subnet_id, gateway_ip,
+                                     ip_address):
+        """Validate IP in allocation pool.
+
+        Validates that the IP address is either the default gateway or
+        in the allocation pools of the subnet.
+        """
+        # Check if the IP is the gateway
+        if ip_address == gateway_ip:
+            # Gateway is not in allocation pool
+            return False
+
+        # Check if the requested IP is in a defined allocation pool
+        pool_qry = context.session.query(models_v2.IPAllocationPool)
+        allocation_pools = pool_qry.filter_by(subnet_id=subnet_id).all()
+        ip = netaddr.IPAddress(ip_address)
+        for allocation_pool in allocation_pools:
+            allocation_pool_range = netaddr.IPRange(
+                allocation_pool['first_ip'],
+                allocation_pool['last_ip'])
+            if ip in allocation_pool_range:
+                return True
+        return False
+
     def _test_fixed_ips_for_port(self, context, network_id, fixed_ips):
         """Test fixed IPs for port.
 
@@ -929,6 +962,10 @@
                                     self._make_network_dict,
                                     filters=filters, fields=fields)
 
+    def get_networks_count(self, context, filters=None):
+        return self._get_collection_count(context, models_v2.Network,
+                                          filters=filters)
+
     def create_subnet_bulk(self, context, subnets):
         return self._create_bulk('subnet', context, subnets)
 
@@ -956,8 +993,8 @@
             s['gateway_ip'] != attributes.ATTR_NOT_SPECIFIED):
             self._validate_ip_version(ip_ver, s['gateway_ip'], 'gateway_ip')
 
-        if 'dns_nameservers' in s and \
-                s['dns_nameservers'] != attributes.ATTR_NOT_SPECIFIED:
+        if ('dns_nameservers' in s and
+            s['dns_nameservers'] != attributes.ATTR_NOT_SPECIFIED):
             if len(s['dns_nameservers']) > cfg.CONF.max_dns_nameservers:
                 raise q_exc.DNSNameServersExhausted(
                     subnet_id=id,
@@ -970,8 +1007,8 @@
                         error_message=("error parsing dns address %s" % dns))
                 self._validate_ip_version(ip_ver, dns, 'dns_nameserver')
 
-        if 'host_routes' in s and \
-                s['host_routes'] != attributes.ATTR_NOT_SPECIFIED:
+        if ('host_routes' in s and
+            s['host_routes'] != attributes.ATTR_NOT_SPECIFIED):
             if len(s['host_routes']) > cfg.CONF.max_subnet_host_routes:
                 raise q_exc.HostRoutesExhausted(
                     subnet_id=id,
@@ -1120,6 +1157,10 @@
                                     self._make_subnet_dict,
                                     filters=filters, fields=fields)
 
+    def get_subnets_count(self, context, filters=None):
+        return self._get_collection_count(context, models_v2.Subnet,
+                                          filters=filters)
+
     def create_port_bulk(self, context, ports):
         return self._create_bulk('port', context, ports)
 
@@ -1160,9 +1201,8 @@
                                   device_owner=p['device_owner'])
             context.session.add(port)
 
-        # Update the allocated IP's
-        if ips:
-            with context.session.begin(subtransactions=True):
+            # Update the allocated IP's
+            if ips:
                 for ip in ips:
                     LOG.debug("Allocated IP %s (%s/%s/%s)", ip['ip_address'],
                               port['network_id'], ip['subnet_id'], port.id)
@@ -1216,34 +1256,38 @@
 
         allocated_qry = context.session.query(models_v2.IPAllocation)
         # recycle all of the IP's
-        # NOTE(garyk) this may be have to be addressed differently when
-        # working with a DHCP server.
         allocated = allocated_qry.filter_by(port_id=id).all()
         if allocated:
             for a in allocated:
                 subnet = self._get_subnet(context, a['subnet_id'])
-                if a['ip_address'] == subnet['gateway_ip']:
-                    # Gateway address will not be recycled, but we do
-                    # need to delete the allocation from the DB
+                # Check if IP was allocated from allocation pool
+                if QuantumDbPluginV2._check_ip_in_allocation_pool(
+                    context, a['subnet_id'], subnet['gateway_ip'],
+                    a['ip_address']):
+                    QuantumDbPluginV2._hold_ip(context,
+                                               a['network_id'],
+                                               a['subnet_id'],
+                                               id,
+                                               a['ip_address'])
+                else:
+                    # IPs out of allocation pool will not be recycled, but
+                    # we do need to delete the allocation from the DB
                     QuantumDbPluginV2._delete_ip_allocation(
                         context, a['network_id'],
                         a['subnet_id'], a['ip_address'])
-                    LOG.debug("Gateway address (%s/%s) is not recycled",
-                              a['ip_address'], a['subnet_id'])
-                    continue
+                    msg_dict = dict(address=a['ip_address'],
+                                    subnet_id=a['subnet_id'])
+                    msg = _("%(address)s (%(subnet_id)s) is not "
+                            "recycled") % msg_dict
+                    LOG.debug(msg)
 
-                QuantumDbPluginV2._hold_ip(context,
-                                           a['network_id'],
-                                           a['subnet_id'],
-                                           id,
-                                           a['ip_address'])
         context.session.delete(port)
 
     def get_port(self, context, id, fields=None):
         port = self._get_port(context, id)
         return self._make_port_dict(port, fields)
 
-    def get_ports(self, context, filters=None, fields=None):
+    def _get_ports_query(self, context, filters=None):
         Port = models_v2.Port
         IPAllocation = models_v2.IPAllocation
 
@@ -1263,4 +1307,11 @@
                 query = query.filter(IPAllocation.subnet_id.in_(subnet_ids))
 
         query = self._apply_filters_to_query(query, Port, filters)
+        return query
+
+    def get_ports(self, context, filters=None, fields=None):
+        query = self._get_ports_query(context, filters)
         return [self._make_port_dict(c, fields) for c in query.all()]
+
+    def get_ports_count(self, context, filters=None):
+        return self._get_ports_query(context, filters).count()

=== modified file 'quantum/db/l3_db.py'
--- quantum/db/l3_db.py	2012-09-12 13:41:20 +0000
+++ quantum/db/l3_db.py	2013-01-08 00:32:21 +0000
@@ -186,13 +186,19 @@
         # figure out if we need to delete existing port
         if gw_port and gw_port['network_id'] != network_id:
             with context.session.begin(subtransactions=True):
-                router.update({'gw_port_id': None})
+                router.gw_port = None
                 context.session.add(router)
             self.delete_port(context.elevated(), gw_port['id'],
                              l3_port_check=False)
 
         if network_id is not None and (gw_port is None or
                                        gw_port['network_id'] != network_id):
+            subnets = self._get_subnets_by_network(context,
+                                                   network_id)
+            for subnet in subnets:
+                self._check_for_dup_router_subnet(context, router_id,
+                                                  network_id, subnet['id'])
+
             # Port has no 'tenant-id', as it is hidden from user
             gw_port = self.create_port(context.elevated(), {
                 'port':
@@ -213,7 +219,8 @@
                 raise q_exc.BadRequest(resource='router', msg=msg)
 
             with context.session.begin(subtransactions=True):
-                router.update({'gw_port_id': gw_port['id']})
+                router.gw_port = self._get_port(context.elevated(),
+                                                gw_port['id'])
                 context.session.add(router)
 
     def delete_router(self, context, id):
@@ -244,13 +251,16 @@
                                     self._make_router_dict,
                                     filters=filters, fields=fields)
 
+    def get_routers_count(self, context, filters=None):
+        return self._get_collection_count(context, Router,
+                                          filters=filters)
+
     def _check_for_dup_router_subnet(self, context, router_id,
                                      network_id, subnet_id):
         try:
             rport_qry = context.session.query(models_v2.Port)
             rports = rport_qry.filter_by(
-                device_id=router_id,
-                device_owner=DEVICE_OWNER_ROUTER_INTF,).all()
+                device_id=router_id).all()
             # its possible these ports on on the same network, but
             # different subnet
             new_cidr = self._get_subnet(context, subnet_id)['cidr']
@@ -261,7 +271,8 @@
                         msg = ("Router already has a port on subnet %s"
                                % subnet_id)
                         raise q_exc.BadRequest(resource='router', msg=msg)
-                    cidr = self._get_subnet(context, ip['subnet_id'])['cidr']
+                    cidr = self._get_subnet(context.elevated(),
+                                            ip['subnet_id'])['cidr']
                     ipnet = netaddr.IPNetwork(cidr)
                     match1 = netaddr.all_matching_cidrs(new_ipnet, [cidr])
                     match2 = netaddr.all_matching_cidrs(ipnet, [new_cidr])
@@ -408,34 +419,35 @@
                'fixed_ip_address': floatingip['fixed_ip_address']}
         return self._fields(res, fields)
 
-    def _get_router_for_internal_subnet(self, context, internal_port,
-                                        internal_subnet_id):
+    def _get_router_for_floatingip(self, context, internal_port,
+                                   internal_subnet_id,
+                                   external_network_id):
         subnet_db = self._get_subnet(context, internal_subnet_id)
         if not subnet_db['gateway_ip']:
             msg = ('Cannot add floating IP to port on subnet %s '
                    'which has no gateway_ip' % internal_subnet_id)
             raise q_exc.BadRequest(resource='floatingip', msg=msg)
 
-        #FIXME(danwent): can do join, but cannot use standard F-K syntax?
-        # just do it inefficiently for now
-        port_qry = context.session.query(models_v2.Port)
-        ports = port_qry.filter_by(network_id=internal_port['network_id'])
-        for p in ports:
-            ips = [ip['ip_address'] for ip in p['fixed_ips']]
-            if len(ips) != 1:
-                continue
-            fixed = p['fixed_ips'][0]
-            if (fixed['ip_address'] == subnet_db['gateway_ip'] and
-                    fixed['subnet_id'] == internal_subnet_id):
-                router_qry = context.session.query(Router)
-                try:
-                    router = router_qry.filter_by(id=p['device_id']).one()
-                    return router['id']
-                except exc.NoResultFound:
-                    pass
+        # find router interface ports on this network
+        router_intf_qry = context.session.query(models_v2.Port)
+        router_intf_ports = router_intf_qry.filter_by(
+            network_id=internal_port['network_id'],
+            device_owner=DEVICE_OWNER_ROUTER_INTF)
+
+        for intf_p in router_intf_ports:
+            if intf_p['fixed_ips'][0]['subnet_id'] == internal_subnet_id:
+                router_id = intf_p['device_id']
+                router_gw_qry = context.session.query(models_v2.Port)
+                has_gw_port = router_gw_qry.filter_by(
+                    network_id=external_network_id,
+                    device_id=router_id,
+                    device_owner=DEVICE_OWNER_ROUTER_GW).count()
+                if has_gw_port:
+                    return router_id
 
         raise l3.ExternalGatewayForFloatingIPNotFound(
             subnet_id=internal_subnet_id,
+            external_network_id=external_network_id,
             port_id=internal_port['id'])
 
     def get_assoc_data(self, context, fip, floating_network_id):
@@ -483,9 +495,10 @@
             internal_ip_address = internal_port['fixed_ips'][0]['ip_address']
             internal_subnet_id = internal_port['fixed_ips'][0]['subnet_id']
 
-        router_id = self._get_router_for_internal_subnet(context,
-                                                         internal_port,
-                                                         internal_subnet_id)
+        router_id = self._get_router_for_floatingip(context,
+                                                    internal_port,
+                                                    internal_subnet_id,
+                                                    floating_network_id)
         # confirm that this router has a floating
         # ip enabled gateway with support for this floating IP network
         try:
@@ -508,17 +521,24 @@
             msg = "fixed_ip_address cannot be specified without a port_id"
             raise q_exc.BadRequest(resource='floatingip', msg=msg)
         if 'port_id' in fip and fip['port_id']:
-            port_qry = context.session.query(FloatingIP)
-            try:
-                port_qry.filter_by(fixed_port_id=fip['port_id']).one()
-                raise l3.FloatingIPPortAlreadyAssociated(
-                    port_id=fip['port_id'])
-            except exc.NoResultFound:
-                pass
             port_id, internal_ip_address, router_id = self.get_assoc_data(
                 context,
                 fip,
                 floatingip_db['floating_network_id'])
+            fip_qry = context.session.query(FloatingIP)
+            try:
+                fip_qry.filter_by(
+                    fixed_port_id=fip['port_id'],
+                    floating_network_id=floatingip_db['floating_network_id'],
+                    fixed_ip_address=internal_ip_address).one()
+                raise l3.FloatingIPPortAlreadyAssociated(
+                    port_id=fip['port_id'],
+                    fip_id=floatingip_db['id'],
+                    floating_ip_address=floatingip_db['floating_ip_address'],
+                    fixed_ip=internal_ip_address,
+                    net_id=floatingip_db['floating_network_id'])
+            except exc.NoResultFound:
+                pass
         floatingip_db.update({'fixed_ip_address': internal_ip_address,
                               'fixed_port_id': port_id,
                               'router_id': router_id})
@@ -536,27 +556,26 @@
         # This external port is never exposed to the tenant.
         # it is used purely for internal system and admin use when
         # managing floating IPs.
-        external_port = self.create_port(context.elevated(), {
-            'port':
-            {'tenant_id': '',  # tenant intentionally not set
-             'network_id': f_net_id,
-             'mac_address': attributes.ATTR_NOT_SPECIFIED,
-             'fixed_ips': attributes.ATTR_NOT_SPECIFIED,
-             'admin_state_up': True,
-             'device_id': fip_id,
-             'device_owner': DEVICE_OWNER_FLOATINGIP,
-             'name': ''}})
-        # Ensure IP addresses are allocated on external port
-        if not external_port['fixed_ips']:
-            msg = "Unable to find any IP address on external network"
-            # remove the external port
-            self.delete_port(context.elevated(), external_port['id'],
-                             l3_port_check=False)
-            raise q_exc.BadRequest(resource='floatingip', msg=msg)
-
-        floating_ip_address = external_port['fixed_ips'][0]['ip_address']
         try:
             with context.session.begin(subtransactions=True):
+                external_port = self.create_port(context.elevated(), {
+                    'port':
+                    {'tenant_id': '',  # tenant intentionally not set
+                     'network_id': f_net_id,
+                     'mac_address': attributes.ATTR_NOT_SPECIFIED,
+                     'fixed_ips': attributes.ATTR_NOT_SPECIFIED,
+                     'admin_state_up': True,
+                     'device_id': fip_id,
+                     'device_owner': DEVICE_OWNER_FLOATINGIP,
+                     'name': ''}})
+                # Ensure IP addresses are allocated on external port
+                if not external_port['fixed_ips']:
+                    msg = "Unable to find any IP address on external network"
+                    # remove the external port
+                    raise q_exc.BadRequest(resource='floatingip', msg=msg)
+
+                floating_fixed_ip = external_port['fixed_ips'][0]
+                floating_ip_address = floating_fixed_ip['ip_address']
                 floatingip_db = FloatingIP(
                     id=fip_id,
                     tenant_id=tenant_id,
@@ -578,8 +597,6 @@
         except Exception:
             LOG.exception("Floating IP association failed")
             # Remove the port created for internal purposes
-            self.delete_port(context.elevated(), external_port['id'],
-                             l3_port_check=False)
             raise
 
         return self._make_floatingip_dict(floatingip_db)
@@ -600,9 +617,9 @@
         floatingip = self._get_floatingip(context, id)
         with context.session.begin(subtransactions=True):
             context.session.delete(floatingip)
-        self.delete_port(context.elevated(),
-                         floatingip['floating_port_id'],
-                         l3_port_check=False)
+            self.delete_port(context.elevated(),
+                             floatingip['floating_port_id'],
+                             l3_port_check=False)
 
     def get_floatingip(self, context, id, fields=None):
         floatingip = self._get_floatingip(context, id)
@@ -613,6 +630,10 @@
                                     self._make_floatingip_dict,
                                     filters=filters, fields=fields)
 
+    def get_floatingips_count(self, context, filters=None):
+        return self._get_collection_count(context, FloatingIP,
+                                          filters=filters)
+
     def prevent_l3_port_deletion(self, context, port_id):
         """ Checks to make sure a port is allowed to be deleted, raising
         an exception if this is not the case.  This should be called by
@@ -697,13 +718,11 @@
             # must make sure we do not have any external gateway ports
             # (and thus, possible floating IPs) on this network before
             # allow it to be update to external=False
-            try:
-                context.session.query(models_v2.Port).filter_by(
-                    device_owner=DEVICE_OWNER_ROUTER_GW,
-                    network_id=net_id).first()
+            port = context.session.query(models_v2.Port).filter_by(
+                device_owner=DEVICE_OWNER_ROUTER_GW,
+                network_id=net_id).first()
+            if port:
                 raise l3.ExternalNetworkInUse(net_id=net_id)
-            except exc.NoResultFound:
-                pass  # expected
 
             context.session.query(ExternalNetwork).filter_by(
                 network_id=net_id).delete()

=== modified file 'quantum/extensions/extensions.py'
--- quantum/extensions/extensions.py	2012-09-07 18:50:09 +0000
+++ quantum/extensions/extensions.py	2013-01-08 00:32:21 +0000
@@ -50,6 +50,11 @@
         'ext_alias': ["quotas"],
         'ext_db_models': ['quantum.extensions._quotav2_model.Quota'],
     },
+    'quantum.plugins.nicira.nicira_nvp_plugin.QuantumPlugin.NvpPluginV2':
+    {
+        'ext_alias': ["quotas"],
+        'ext_db_models': ['quantum.extensions._quotav2_model.Quota'],
+    },
 }
 
 

=== modified file 'quantum/extensions/l3.py'
--- quantum/extensions/l3.py	2012-09-12 13:41:20 +0000
+++ quantum/extensions/l3.py	2013-01-08 00:32:21 +0000
@@ -44,14 +44,16 @@
 
 
 class ExternalGatewayForFloatingIPNotFound(qexception.NotFound):
-    message = _("Could not find an external network gateway reachable "
+    message = _("External network %(external_network_id)s is not reachable "
                 "from subnet %(subnet_id)s.  Therefore, cannot associate "
                 "Port %(port_id)s with a Floating IP.")
 
 
 class FloatingIPPortAlreadyAssociated(qexception.InUse):
-    message = _("Port %(port_id)s already has a floating IP"
-                " associated with it")
+    message = _("Cannot associate floating IP %(floating_ip_address)s "
+                "(%(fip_id)s) with port %(port_id)s "
+                "using fixed IP %(fixed_ip)s, as that fixed IP already "
+                "has a floating IP on external network %(net_id)s.")
 
 
 class L3PortInUse(qexception.InUse):
@@ -78,6 +80,7 @@
                'validate': {'type:regex': attr.UUID_PATTERN},
                'is_visible': True},
         'name': {'allow_post': True, 'allow_put': True,
+                 'validate': {'type:string': None},
                  'is_visible': True, 'default': ''},
         'admin_state_up': {'allow_post': True, 'allow_put': True,
                            'default': True,
@@ -88,19 +91,23 @@
                    'is_visible': True},
         'tenant_id': {'allow_post': True, 'allow_put': False,
                       'required_by_policy': True,
+                      'validate': {'type:string': None},
                       'is_visible': True},
         'external_gateway_info': {'allow_post': True, 'allow_put': True,
                                   'is_visible': True, 'default': None}
     },
     'floatingips': {
         'id': {'allow_post': False, 'allow_put': False,
+               'validate': {'type:uuid': None},
                'is_visible': True},
         'floating_ip_address': {'allow_post': False, 'allow_put': False,
+                                'validate': {'type:ip_address_or_none': None},
                                 'is_visible': True},
         'floating_network_id': {'allow_post': True, 'allow_put': False,
                                 'validate': {'type:regex': attr.UUID_PATTERN},
                                 'is_visible': True},
         'router_id': {'allow_post': False, 'allow_put': False,
+                      'validate': {'type:uuid_or_none': None},
                       'is_visible': True, 'default': None},
         'port_id': {'allow_post': True, 'allow_put': True,
                     'validate': {'type:uuid_or_none': None},
@@ -110,6 +117,7 @@
                              'is_visible': True, 'default': None},
         'tenant_id': {'allow_post': True, 'allow_put': False,
                       'required_by_policy': True,
+                      'validate': {'type:string': None},
                       'is_visible': True}
     },
 }
@@ -245,3 +253,9 @@
     @abstractmethod
     def get_floatingips(self, context, filters=None, fields=None):
         pass
+
+    def get_routers_count(self, context, filters=None):
+        raise qexception.NotImplementedError()
+
+    def get_floatingips_count(self, context, filters=None):
+        raise qexception.NotImplementedError()

=== modified file 'quantum/openstack/common/cfg.py'
--- quantum/openstack/common/cfg.py	2012-09-07 18:50:09 +0000
+++ quantum/openstack/common/cfg.py	2013-01-08 00:32:21 +0000
@@ -1507,7 +1507,7 @@
                 if ('default' in info or 'override' in info):
                     continue
 
-                if self._get(opt.name, group) is None:
+                if self._get(opt.dest, group) is None:
                     raise RequiredOptError(opt.name, group)
 
     def _parse_cli_opts(self, args):

=== modified file 'quantum/openstack/common/log.py'
--- quantum/openstack/common/log.py	2012-08-17 10:42:58 +0000
+++ quantum/openstack/common/log.py	2013-01-08 00:32:21 +0000
@@ -54,15 +54,14 @@
                        '%(message)s',
                help='format string to use for log messages with context'),
     cfg.StrOpt('logging_default_format_string',
-               default='%(asctime)s %(levelname)s %(name)s [-] %(instance)s'
-                       '%(message)s',
+               default='%(asctime)s %(process)d %(levelname)s %(name)s [-]'
+                       ' %(instance)s%(message)s',
                help='format string to use for log messages without context'),
     cfg.StrOpt('logging_debug_format_suffix',
-               default='from (pid=%(process)d) %(funcName)s '
-                       '%(pathname)s:%(lineno)d',
+               default='%(funcName)s %(pathname)s:%(lineno)d',
                help='data to append to log format when level is DEBUG'),
     cfg.StrOpt('logging_exception_prefix',
-               default='%(asctime)s TRACE %(name)s %(instance)s',
+               default='%(asctime)s %(process)d TRACE %(name)s %(instance)s',
                help='prefix each line of exception output with this format'),
     cfg.ListOpt('default_log_levels',
                 default=[

=== modified file 'quantum/openstack/common/notifier/api.py'
--- quantum/openstack/common/notifier/api.py	2012-09-07 18:50:09 +0000
+++ quantum/openstack/common/notifier/api.py	2013-01-08 00:32:21 +0000
@@ -139,8 +139,8 @@
             driver.notify(context, msg)
         except Exception, e:
             LOG.exception(_("Problem '%(e)s' attempting to "
-              "send to notification system. Payload=%(payload)s") %
-                            locals())
+                            "send to notification system. "
+                            "Payload=%(payload)s") % locals())
 
 
 _drivers = None
@@ -169,7 +169,7 @@
         except ImportError as e:
             LOG.exception(_("Failed to load notifier %s. "
                             "These notifications will not be sent.") %
-                            notification_driver)
+                          notification_driver)
     else:
         # Driver is already loaded; just add the object.
         _drivers[notification_driver] = notification_driver

=== modified file 'quantum/openstack/common/policy.py'
--- quantum/openstack/common/policy.py	2012-09-07 18:50:09 +0000
+++ quantum/openstack/common/policy.py	2013-01-08 00:32:21 +0000
@@ -172,8 +172,9 @@
         else:
             LOG.warning(_("Inheritance-based rules are deprecated; update "
                           "_check_%s") % match_kind)
-            func = (lambda brain, kind, value, target, cred:
-                        old_func(value, target, cred))
+            func = lambda brain, kind, value, target, cred: old_func(value,
+                                                                     target,
+                                                                     cred)
 
         if not func:
             LOG.error(_("No handler for matches of kind %s") % match_kind)

=== modified file 'quantum/openstack/common/rpc/__init__.py'
--- quantum/openstack/common/rpc/__init__.py	2012-08-17 10:42:58 +0000
+++ quantum/openstack/common/rpc/__init__.py	2013-01-08 00:32:21 +0000
@@ -49,15 +49,21 @@
     cfg.ListOpt('allowed_rpc_exception_modules',
                 default=['quantum.openstack.common.exception',
                          'nova.exception',
+                         'cinder.exception',
                          ],
                 help='Modules of exceptions that are permitted to be recreated'
                      'upon receiving exception data from an rpc call.'),
-    cfg.StrOpt('control_exchange',
-               default='nova',
-               help='AMQP exchange to connect to if using RabbitMQ or Qpid'),
     cfg.BoolOpt('fake_rabbit',
                 default=False,
                 help='If passed, use a fake RabbitMQ provider'),
+    #
+    # The following options are not registered here, but are expected to be
+    # present. The project using this library must register these options with
+    # the configuration so that project-specific defaults may be defined.
+    #
+    #cfg.StrOpt('control_exchange',
+    #           default='nova',
+    #           help='AMQP exchange to connect to if using RabbitMQ or Qpid'),
 ]
 
 cfg.CONF.register_opts(rpc_opts)

=== modified file 'quantum/openstack/common/rpc/amqp.py'
--- quantum/openstack/common/rpc/amqp.py	2012-08-17 10:42:58 +0000
+++ quantum/openstack/common/rpc/amqp.py	2013-01-08 00:32:21 +0000
@@ -34,6 +34,7 @@
 from eventlet import pools
 from eventlet import semaphore
 
+from quantum.openstack.common import cfg
 from quantum.openstack.common import excutils
 from quantum.openstack.common.gettextutils import _
 from quantum.openstack.common import local
@@ -416,3 +417,10 @@
 def cleanup(connection_pool):
     if connection_pool:
         connection_pool.empty()
+
+
+def get_control_exchange(conf):
+    try:
+        return conf.control_exchange
+    except cfg.NoSuchOptError:
+        return 'openstack'

=== modified file 'quantum/openstack/common/rpc/impl_kombu.py'
--- quantum/openstack/common/rpc/impl_kombu.py	2012-08-17 10:42:58 +0000
+++ quantum/openstack/common/rpc/impl_kombu.py	2013-01-08 00:32:21 +0000
@@ -210,7 +210,8 @@
                    'auto_delete': False,
                    'exclusive': False}
         options.update(kwargs)
-        exchange = kombu.entity.Exchange(name=conf.control_exchange,
+        exchange_name = rpc_amqp.get_control_exchange(conf)
+        exchange = kombu.entity.Exchange(name=exchange_name,
                                          type='topic',
                                          durable=options['durable'],
                                          auto_delete=options['auto_delete'])
@@ -307,8 +308,12 @@
                    'auto_delete': False,
                    'exclusive': False}
         options.update(kwargs)
-        super(TopicPublisher, self).__init__(channel, conf.control_exchange,
-                                             topic, type='topic', **options)
+        exchange_name = rpc_amqp.get_control_exchange(conf)
+        super(TopicPublisher, self).__init__(channel,
+                                             exchange_name,
+                                             topic,
+                                             type='topic',
+                                             **options)
 
 
 class FanoutPublisher(Publisher):
@@ -486,9 +491,9 @@
             log_info.update(self.params)
 
             if self.max_retries and attempt == self.max_retries:
-                LOG.exception(_('Unable to connect to AMQP server on '
-                              '%(hostname)s:%(port)d after %(max_retries)d '
-                              'tries: %(err_str)s') % log_info)
+                LOG.error(_('Unable to connect to AMQP server on '
+                            '%(hostname)s:%(port)d after %(max_retries)d '
+                            'tries: %(err_str)s') % log_info)
                 # NOTE(comstud): Copied from original code.  There's
                 # really no better recourse because if this was a queue we
                 # need to consume on, we have no way to consume anymore.
@@ -502,9 +507,9 @@
                 sleep_time = min(sleep_time, self.interval_max)
 
             log_info['sleep_time'] = sleep_time
-            LOG.exception(_('AMQP server on %(hostname)s:%(port)d is'
-                          ' unreachable: %(err_str)s. Trying again in '
-                          '%(sleep_time)d seconds.') % log_info)
+            LOG.error(_('AMQP server on %(hostname)s:%(port)d is '
+                        'unreachable: %(err_str)s. Trying again in '
+                        '%(sleep_time)d seconds.') % log_info)
             time.sleep(sleep_time)
 
     def ensure(self, error_callback, method, *args, **kwargs):
@@ -512,7 +517,8 @@
             try:
                 return method(*args, **kwargs)
             except (self.connection_errors, socket.timeout, IOError), e:
-                pass
+                if error_callback:
+                    error_callback(e)
             except Exception, e:
                 # NOTE(comstud): Unfortunately it's possible for amqplib
                 # to return an error not covered by its transport
@@ -522,8 +528,8 @@
                 # and try to reconnect in this case.
                 if 'timeout' not in str(e):
                     raise
-            if error_callback:
-                error_callback(e)
+                if error_callback:
+                    error_callback(e)
             self.reconnect()
 
     def get_channel(self):

=== modified file 'quantum/openstack/common/rpc/impl_qpid.py'
--- quantum/openstack/common/rpc/impl_qpid.py	2012-09-21 13:01:18 +0000
+++ quantum/openstack/common/rpc/impl_qpid.py	2013-01-08 00:32:21 +0000
@@ -50,24 +50,6 @@
     cfg.StrOpt('qpid_sasl_mechanisms',
                default='',
                help='Space separated list of SASL mechanisms to use for auth'),
-    cfg.BoolOpt('qpid_reconnect',
-                default=True,
-                help='Automatically reconnect'),
-    cfg.IntOpt('qpid_reconnect_timeout',
-               default=0,
-               help='Reconnection timeout in seconds'),
-    cfg.IntOpt('qpid_reconnect_limit',
-               default=0,
-               help='Max reconnections before giving up'),
-    cfg.IntOpt('qpid_reconnect_interval_min',
-               default=0,
-               help='Minimum seconds between reconnection attempts'),
-    cfg.IntOpt('qpid_reconnect_interval_max',
-               default=0,
-               help='Maximum seconds between reconnection attempts'),
-    cfg.IntOpt('qpid_reconnect_interval',
-               default=0,
-               help='Equivalent to setting max and min to the same value'),
     cfg.IntOpt('qpid_heartbeat',
                default=60,
                help='Seconds between connection keepalive heartbeats'),
@@ -180,9 +162,9 @@
         :param name: optional queue name, defaults to topic
         """
 
+        exchange_name = rpc_amqp.get_control_exchange(conf)
         super(TopicConsumer, self).__init__(session, callback,
-                                            "%s/%s" % (conf.control_exchange,
-                                                       topic),
+                                            "%s/%s" % (exchange_name, topic),
                                             {}, name or topic, {})
 
 
@@ -256,9 +238,9 @@
     def __init__(self, conf, session, topic):
         """init a 'topic' publisher.
         """
-        super(TopicPublisher, self).__init__(
-            session,
-            "%s/%s" % (conf.control_exchange, topic))
+        exchange_name = rpc_amqp.get_control_exchange(conf)
+        super(TopicPublisher, self).__init__(session,
+                                             "%s/%s" % (exchange_name, topic))
 
 
 class FanoutPublisher(Publisher):
@@ -276,10 +258,10 @@
     def __init__(self, conf, session, topic):
         """init a 'topic' publisher.
         """
-        super(NotifyPublisher, self).__init__(
-            session,
-            "%s/%s" % (conf.control_exchange, topic),
-            {"durable": True})
+        exchange_name = rpc_amqp.get_control_exchange(conf)
+        super(NotifyPublisher, self).__init__(session,
+                                              "%s/%s" % (exchange_name, topic),
+                                              {"durable": True})
 
 
 class Connection(object):
@@ -306,37 +288,27 @@
             params.setdefault(key, default_params[key])
 
         self.broker = params['hostname'] + ":" + str(params['port'])
+        self.username = params['username']
+        self.password = params['password']
+        self.connection_create()
+        self.reconnect()
+
+    def connection_create(self):
         # Create the connection - this does not open the connection
         self.connection = qpid.messaging.Connection(self.broker)
 
         # Check if flags are set and if so set them for the connection
         # before we call open
-        self.connection.username = params['username']
-        self.connection.password = params['password']
+        self.connection.username = self.username
+        self.connection.password = self.password
+
         self.connection.sasl_mechanisms = self.conf.qpid_sasl_mechanisms
-        self.connection.reconnect = self.conf.qpid_reconnect
-        if self.conf.qpid_reconnect_timeout:
-            self.connection.reconnect_timeout = (
-                self.conf.qpid_reconnect_timeout)
-        if self.conf.qpid_reconnect_limit:
-            self.connection.reconnect_limit = self.conf.qpid_reconnect_limit
-        if self.conf.qpid_reconnect_interval_max:
-            self.connection.reconnect_interval_max = (
-                self.conf.qpid_reconnect_interval_max)
-        if self.conf.qpid_reconnect_interval_min:
-            self.connection.reconnect_interval_min = (
-                self.conf.qpid_reconnect_interval_min)
-        if self.conf.qpid_reconnect_interval:
-            self.connection.reconnect_interval = (
-                self.conf.qpid_reconnect_interval)
+        # Reconnection is done by self.reconnect()
+        self.connection.reconnect = False
         self.connection.heartbeat = self.conf.qpid_heartbeat
         self.connection.protocol = self.conf.qpid_protocol
         self.connection.tcp_nodelay = self.conf.qpid_tcp_nodelay
 
-        # Open is part of reconnect -
-        # NOTE(WGH) not sure we need this with the reconnect flags
-        self.reconnect()
-
     def _register_consumer(self, consumer):
         self.consumers[str(consumer.get_receiver())] = consumer
 
@@ -351,12 +323,18 @@
             except qpid.messaging.exceptions.ConnectionError:
                 pass
 
+        delay = 1
         while True:
             try:
+                self.connection_create()
                 self.connection.open()
             except qpid.messaging.exceptions.ConnectionError, e:
-                LOG.error(_('Unable to connect to AMQP server: %s'), e)
-                time.sleep(self.conf.qpid_reconnect_interval or 1)
+                msg_dict = dict(e=e, delay=delay)
+                msg = _("Unable to connect to AMQP server: %(e)s. "
+                        "Sleeping %(delay)s seconds") % msg_dict
+                LOG.error(msg)
+                time.sleep(delay)
+                delay = min(2 * delay, 60)
             else:
                 break
 
@@ -364,10 +342,14 @@
 
         self.session = self.connection.session()
 
-        for consumer in self.consumers.itervalues():
-            consumer.reconnect(self.session)
-
         if self.consumers:
+            consumers = self.consumers
+            self.consumers = {}
+
+            for consumer in consumers.itervalues():
+                consumer.reconnect(self.session)
+                self._register_consumer(consumer)
+
             LOG.debug(_("Re-established AMQP queues"))
 
     def ensure(self, error_callback, method, *args, **kwargs):

=== modified file 'quantum/openstack/common/timeutils.py'
--- quantum/openstack/common/timeutils.py	2012-09-07 18:50:09 +0000
+++ quantum/openstack/common/timeutils.py	2013-01-08 00:32:21 +0000
@@ -121,6 +121,10 @@
 
 def unmarshall_time(tyme):
     """Unmarshall a datetime dict."""
-    return datetime.datetime(day=tyme['day'], month=tyme['month'],
-                 year=tyme['year'], hour=tyme['hour'], minute=tyme['minute'],
-                 second=tyme['second'], microsecond=tyme['microsecond'])
+    return datetime.datetime(day=tyme['day'],
+                             month=tyme['month'],
+                             year=tyme['year'],
+                             hour=tyme['hour'],
+                             minute=tyme['minute'],
+                             second=tyme['second'],
+                             microsecond=tyme['microsecond'])

=== modified file 'quantum/plugins/cisco/network_plugin.py'
--- quantum/plugins/cisco/network_plugin.py	2012-09-07 18:50:09 +0000
+++ quantum/plugins/cisco/network_plugin.py	2013-01-08 00:32:21 +0000
@@ -92,6 +92,11 @@
         """
         if hasattr(self._model, name):
             return getattr(self._model, name)
+        else:
+            # Must make sure we re-raise the error that led us here, since
+            # otherwise getattr() and even hasattr() doesn't work corretly.
+            raise AttributeError("'%s' object has no attribute '%s'" %
+                                 (self._model, name))
 
     """
     Core API implementation

=== modified file 'quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py'
--- quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py	2012-09-12 13:41:20 +0000
+++ quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py	2013-01-08 00:32:21 +0000
@@ -40,6 +40,7 @@
 from quantum.common import config as logging_config
 from quantum.common import constants
 from quantum.common import topics
+from quantum.common import utils as q_utils
 from quantum.openstack.common import cfg
 from quantum.openstack.common import context
 from quantum.openstack.common import rpc
@@ -51,7 +52,6 @@
 LOG = logging.getLogger(__name__)
 
 BRIDGE_NAME_PREFIX = "brq"
-GATEWAY_INTERFACE_PREFIX = "gw-"
 TAP_INTERFACE_PREFIX = "tap"
 BRIDGE_FS = "/sys/devices/virtual/net/"
 BRIDGE_NAME_PLACEHOLDER = "bridge_name"
@@ -147,12 +147,6 @@
         except RuntimeError:
             return self._get_prefixed_ip_link_devices(TAP_INTERFACE_PREFIX)
 
-    def get_all_gateway_devices(self):
-        try:
-            return self._get_prefixed_tap_devices(GATEWAY_INTERFACE_PREFIX)
-        except RuntimeError:
-            return self._get_prefixed_ip_link_devices(GATEWAY_INTERFACE_PREFIX)
-
     def get_bridge_for_tap_device(self, tap_device_name):
         bridges = self.get_all_quantum_bridges()
         for bridge in bridges:
@@ -281,72 +275,64 @@
                           bridge_name, e)
                 return
 
+    def ensure_physical_in_bridge(self, network_id,
+                                  physical_network,
+                                  vlan_id):
+        physical_interface = self.interface_mappings.get(physical_network)
+        if not physical_interface:
+            LOG.error("No mapping for physical network %s" %
+                      physical_network)
+            return False
+
+        if int(vlan_id) == lconst.FLAT_VLAN_ID:
+            self.ensure_flat_bridge(network_id, physical_interface)
+        else:
+            self.ensure_vlan_bridge(network_id, physical_interface,
+                                    vlan_id)
+        return True
+
     def add_tap_interface(self, network_id, physical_network, vlan_id,
                           tap_device_name):
         """
         If a VIF has been plugged into a network, this function will
         add the corresponding tap device to the relevant bridge
         """
-        if not tap_device_name:
-            return False
-
         if not self.device_exists(tap_device_name):
-            LOG.debug("Tap device: %s does not exist on this host, skipped" %
-                      tap_device_name)
+            LOG.debug(_("Tap device: %s does not exist on "
+                        "this host, skipped" % tap_device_name))
             return False
 
-        current_bridge_name = self.get_bridge_for_tap_device(tap_device_name)
         bridge_name = self.get_bridge_name(network_id)
-        if bridge_name == current_bridge_name:
-            return False
-        LOG.debug("Adding device %s to bridge %s" % (tap_device_name,
-                                                     bridge_name))
-        if current_bridge_name:
-            if utils.execute(['brctl', 'delif', current_bridge_name,
-                              tap_device_name], root_helper=self.root_helper):
-                return False
-
         if int(vlan_id) == lconst.LOCAL_VLAN_ID:
             self.ensure_local_bridge(network_id)
         else:
-            physical_interface = self.interface_mappings.get(physical_network)
-            if not physical_interface:
-                LOG.error("No mapping for physical network %s" %
-                          physical_network)
-                return False
-
-            if int(vlan_id) == lconst.FLAT_VLAN_ID:
-                self.ensure_flat_bridge(network_id, physical_interface)
-            else:
-                self.ensure_vlan_bridge(network_id, physical_interface,
-                                        vlan_id)
-
-        if utils.execute(['brctl', 'addif', bridge_name, tap_device_name],
-                         root_helper=self.root_helper):
-            return False
-
-        LOG.debug("Done adding device %s to bridge %s" % (tap_device_name,
-                                                          bridge_name))
+            result = self.ensure_physical_in_bridge(network_id,
+                                                    physical_network,
+                                                    vlan_id)
+            if not result:
+                return False
+
+        # Check if device needs to be added to bridge
+        tap_device_in_bridge = self.get_bridge_for_tap_device(tap_device_name)
+        if not tap_device_in_bridge:
+            msg = _("Adding device %(tap_device_name)s to bridge "
+                    "%(bridge_name)s") % locals()
+            LOG.debug(msg)
+            if utils.execute(['brctl', 'addif', bridge_name, tap_device_name],
+                             root_helper=self.root_helper):
+                return False
+        else:
+            msg = _("%(tap_device_name)s already exists on bridge "
+                    "%(bridge_name)s") % locals()
+            LOG.debug(msg)
         return True
 
     def add_interface(self, network_id, physical_network, vlan_id,
-                      interface_id):
-        if not interface_id:
-            """
-            Since the VIF id is null, no VIF is plugged into this port
-            no more processing is required
-            """
-            return False
-
-        if interface_id.startswith(GATEWAY_INTERFACE_PREFIX):
-            return self.add_tap_interface(network_id,
-                                          physical_network, vlan_id,
-                                          interface_id)
-        else:
-            tap_device_name = self.get_tap_device_name(interface_id)
-            return self.add_tap_interface(network_id,
-                                          physical_network, vlan_id,
-                                          tap_device_name)
+                      port_id):
+        tap_device_name = self.get_tap_device_name(port_id)
+        return self.add_tap_interface(network_id,
+                                      physical_network, vlan_id,
+                                      tap_device_name)
 
     def delete_vlan_bridge(self, bridge_name):
         if self.device_exists(bridge_name):
@@ -427,8 +413,10 @@
         port = kwargs.get('port')
         if port['admin_state_up']:
             vlan_id = kwargs.get('vlan_id')
+            physical_network = kwargs.get('physical_network')
             # create the networking for the port
             self.linux_br.add_interface(port['network_id'],
+                                        physical_network,
                                         vlan_id,
                                         port['id'])
         else:
@@ -636,7 +624,8 @@
             if devices:
                 mac = utils.get_interface_mac(devices[0].name)
             else:
-                LOG.error("Unable to obtain MAC of any device for agent_id")
+                LOG.error("Unable to obtain MAC address for unique ID. "
+                          "Agent terminated!")
                 exit(1)
         self.agent_id = '%s%s' % ('lb', (mac.replace(":", "")))
         LOG.info("RPC agent_id: %s" % self.agent_id)
@@ -664,12 +653,6 @@
     def setup_linux_bridge(self, interface_mappings):
         self.linux_br = LinuxBridge(interface_mappings, self.root_helper)
 
-    def process_port_binding(self, network_id, interface_id,
-                             physical_network, vlan_id):
-        return self.linux_br.add_interface(network_id,
-                                           physical_network, vlan_id,
-                                           interface_id)
-
     def remove_port_binding(self, network_id, interface_id):
         bridge_name = self.linux_br.get_bridge_name(network_id)
         tap_device_name = self.linux_br.get_tap_device_name(interface_id)
@@ -712,7 +695,7 @@
     def treat_devices_added(self, devices):
         resync = False
         for device in devices:
-            LOG.info("Port %s added", device)
+            LOG.debug("Port %s added", device)
             try:
                 details = self.plugin_rpc.get_device_details(self.context,
                                                              device,
@@ -725,15 +708,15 @@
                 LOG.info("Port %s updated. Details: %s", device, details)
                 if details['admin_state_up']:
                     # create the networking for the port
-                    self.process_port_binding(details['network_id'],
-                                              details['port_id'],
-                                              details['physical_network'],
-                                              details['vlan_id'])
+                    self.linux_br.add_interface(details['network_id'],
+                                                details['physical_network'],
+                                                details['vlan_id'],
+                                                details['port_id'])
                 else:
                     self.remove_port_binding(details['network_id'],
                                              details['port_id'])
             else:
-                LOG.debug("Device %s not defined on plugin", device)
+                LOG.info("Device %s not defined on plugin", device)
         return resync
 
     def treat_devices_removed(self, devices):
@@ -792,17 +775,14 @@
     # (TODO) gary - swap with common logging
     logging_config.setup_logging(cfg.CONF)
 
-    interface_mappings = {}
-    for mapping in cfg.CONF.LINUX_BRIDGE.physical_interface_mappings:
-        try:
-            physical_network, physical_interface = mapping.split(':')
-            interface_mappings[physical_network] = physical_interface
-            LOG.debug("physical network %s mapped to physical interface %s" %
-                      (physical_network, physical_interface))
-        except ValueError as ex:
-            LOG.error("Invalid physical interface mapping: \'%s\' - %s" %
-                      (mapping, ex))
-            sys.exit(1)
+    try:
+        interface_mappings = q_utils.parse_mappings(
+            cfg.CONF.LINUX_BRIDGE.physical_interface_mappings)
+    except ValueError as e:
+        LOG.error(_("Parsing physical_interface_mappings failed: %s."
+                    " Agent terminated!"), e)
+        sys.exit(1)
+    LOG.info(_("Interface mappings: %s") % interface_mappings)
 
     polling_interval = cfg.CONF.AGENT.polling_interval
     reconnect_interval = cfg.CONF.DATABASE.reconnect_interval
@@ -823,5 +803,6 @@
     plugin.daemon_loop()
     sys.exit(0)
 
+
 if __name__ == "__main__":
     main()

=== modified file 'quantum/plugins/linuxbridge/lb_quantum_plugin.py'
--- quantum/plugins/linuxbridge/lb_quantum_plugin.py	2012-09-12 13:41:20 +0000
+++ quantum/plugins/linuxbridge/lb_quantum_plugin.py	2013-01-08 00:32:21 +0000
@@ -163,7 +163,8 @@
         if self.tenant_network_type not in [constants.TYPE_LOCAL,
                                             constants.TYPE_VLAN,
                                             constants.TYPE_NONE]:
-            LOG.error("Invalid tenant_network_type: %s" %
+            LOG.error("Invalid tenant_network_type: %s. "
+                      "Service terminated!" %
                       self.tenant_network_type)
             sys.exit(1)
         self.agent_rpc = cfg.CONF.AGENT.rpc
@@ -194,7 +195,8 @@
                                                  int(vlan_min),
                                                  int(vlan_max))
                 except ValueError as ex:
-                    LOG.error("Invalid network VLAN range: \'%s\' - %s" %
+                    LOG.error("Invalid network VLAN range: '%s' - %s. "
+                              "Service terminated!" %
                               (entry, ex))
                     sys.exit(1)
             else:

=== modified file 'quantum/plugins/nicira/nicira_nvp_plugin/QuantumPlugin.py'
--- quantum/plugins/nicira/nicira_nvp_plugin/QuantumPlugin.py	2012-09-21 13:01:18 +0000
+++ quantum/plugins/nicira/nicira_nvp_plugin/QuantumPlugin.py	2013-01-08 00:32:21 +0000
@@ -453,13 +453,15 @@
         if 'lswitch-display-name' not in result:
             raise exception.NetworkNotFound(net_id=id)
 
+        # Fetch network in quantum
+        quantum_db = super(NvpPluginV2, self).get_network(context, id, fields)
         d = {'id': id,
              'name': result['lswitch-display-name'],
              'tenant_id': network['tenant_id'],
              'admin_state_up': True,
              'status': constants.NET_STATUS_ACTIVE,
              'shared': network['shared'],
-             'subnets': []}
+             'subnets': quantum_db.get('subnets', [])}
 
         LOG.debug("get_network() completed for tenant %s: %s" % (
                   context.tenant_id, d))
@@ -811,6 +813,8 @@
 
         params["cluster"] = cluster
         params["port"] = port["port"]
+        params["port"]["id"] = quantum_db["id"]
+        params["port"]["tenant_id"] = quantum_db["tenant_id"]
         result = nvplib.update_port(quantum_db["network_id"],
                                     port_nvp["uuid"], **params)
         LOG.debug("update_port() completed for tenant: %s" % context.tenant_id)

=== modified file 'quantum/plugins/nicira/nicira_nvp_plugin/nvplib.py'
--- quantum/plugins/nicira/nicira_nvp_plugin/nvplib.py	2012-09-07 18:50:09 +0000
+++ quantum/plugins/nicira/nicira_nvp_plugin/nvplib.py	2013-01-08 00:32:21 +0000
@@ -373,11 +373,20 @@
 
     admin_state_up = params['port'].get('admin_state_up')
     name = params["port"].get("name")
+    device_id = params["port"].get("device_id")
     if admin_state_up:
         lport_obj["admin_status_enabled"] = admin_state_up
     if name:
         lport_obj["display_name"] = name
 
+    if device_id:
+        # device_id can be longer than 40 so we rehash it
+        device_id = hashlib.sha1(device_id).hexdigest()
+        lport_obj["tags"] = (
+            [dict(scope='os_tid', tag=params["port"].get("tenant_id")),
+             dict(scope='q_port_id', tag=params["port"]["id"]),
+             dict(scope='vm_id', tag=device_id)])
+
     uri = "/ws.v1/lswitch/" + network + "/lport/" + port_id
     try:
         resp_obj = do_single_request("PUT", uri, json.dumps(lport_obj),
@@ -394,8 +403,6 @@
 
 
 def create_port(tenant, **params):
-    print "create_port_nvplib"
-    print params
     clusters = params["clusters"]
     dest_cluster = clusters[0]  # primary cluster
 

=== modified file 'quantum/plugins/openvswitch/agent/ovs_quantum_agent.py'
--- quantum/plugins/openvswitch/agent/ovs_quantum_agent.py	2012-09-21 13:01:18 +0000
+++ quantum/plugins/openvswitch/agent/ovs_quantum_agent.py	2013-01-08 00:32:21 +0000
@@ -34,6 +34,7 @@
 from quantum.common import constants as q_const
 from quantum.common import config as logging_config
 from quantum.common import topics
+from quantum.common import utils as q_utils
 from quantum.openstack.common import cfg
 from quantum.openstack.common import context
 from quantum.openstack.common import rpc
@@ -141,7 +142,7 @@
         :param integ_br: name of the integration bridge.
         :param tun_br: name of the tunnel bridge.
         :param local_ip: local IP address of this hypervisor.
-        :param bridge_mappings: mappings from phyiscal interface to bridge.
+        :param bridge_mappings: mappings from physical network name to bridge.
         :param root_helper: utility to use when running shell cmds.
         :param polling_interval: interval (secs) to poll DB.
         :param reconnect_internal: retry interval (secs) on DB error.
@@ -452,7 +453,8 @@
         if int(self.patch_tun_ofport) < 0 or int(self.patch_int_ofport) < 0:
             LOG.error("Failed to create OVS patch port. Cannot have tunneling "
                       "enabled on this agent, since this version of OVS does "
-                      "not support tunnels or patch ports.")
+                      "not support tunnels or patch ports. "
+                      "Agent terminated!")
             exit(1)
         self.tun_br.remove_all_flows()
         self.tun_br.add_flow(priority=1, actions="drop")
@@ -460,7 +462,7 @@
     def setup_physical_bridges(self, bridge_mappings):
         '''Setup the physical network bridges.
 
-        Creates phyiscal network bridges and links them to the
+        Creates physical network bridges and links them to the
         integration bridge using veths.
 
         :param bridge_mappings: map physical network names to bridge names.'''
@@ -471,7 +473,8 @@
         for physical_network, bridge in bridge_mappings.iteritems():
             # setup physical bridge
             if not ip_lib.device_exists(bridge, self.root_helper):
-                LOG.error("Bridge %s for physical network %s does not exist",
+                LOG.error("Bridge %s for physical network %s does not exist. "
+                          "Agent terminated!",
                           bridge, physical_network)
                 sys.exit(1)
             br = ovs_lib.OVSBridge(bridge, self.root_helper)
@@ -802,24 +805,24 @@
     local_ip = cfg.CONF.OVS.local_ip
     enable_tunneling = cfg.CONF.OVS.enable_tunneling
 
-    bridge_mappings = {}
-    for mapping in cfg.CONF.OVS.bridge_mappings:
-        mapping = mapping.strip()
-        if mapping != '':
-            try:
-                physical_network, bridge = mapping.split(':')
-                bridge_mappings[physical_network] = bridge
-                LOG.info("Physical network %s mapped to bridge %s",
-                         physical_network, bridge)
-            except ValueError as ex:
-                LOG.error("Invalid bridge mapping: \'%s\' - %s", mapping, ex)
-                sys.exit(1)
+    if enable_tunneling and not local_ip:
+        LOG.error("Tunnelling cannot be enabled without a valid local_ip.")
+        sys.exit(1)
+
+    try:
+        bridge_mappings = q_utils.parse_mappings(cfg.CONF.OVS.bridge_mappings)
+    except ValueError as e:
+        LOG.error(_("Parsing bridge mappings failed: %s."
+                    " Agent terminated!"), e)
+        sys.exit(1)
+    LOG.info(_("Bridge mappings: %s") % bridge_mappings)
 
     plugin = OVSQuantumAgent(integ_br, tun_br, local_ip, bridge_mappings,
                              root_helper, polling_interval,
                              reconnect_interval, rpc, enable_tunneling)
 
     # Start everything.
+    LOG.info("Agent initialized successfully, now running... ")
     plugin.daemon_loop(db_connection_url)
 
     sys.exit(0)

=== modified file 'quantum/plugins/openvswitch/common/config.py'
--- quantum/plugins/openvswitch/common/config.py	2012-09-12 13:41:20 +0000
+++ quantum/plugins/openvswitch/common/config.py	2013-01-08 00:32:21 +0000
@@ -31,7 +31,7 @@
     cfg.StrOpt('integration_bridge', default='br-int'),
     cfg.BoolOpt('enable_tunneling', default=False),
     cfg.StrOpt('tunnel_bridge', default='br-tun'),
-    cfg.StrOpt('local_ip', default='10.0.0.3'),
+    cfg.StrOpt('local_ip', default=''),
     cfg.ListOpt('bridge_mappings',
                 default=DEFAULT_BRIDGE_MAPPINGS,
                 help="List of <physical_network>:<bridge>"),

=== modified file 'quantum/plugins/openvswitch/ovs_quantum_plugin.py'
--- quantum/plugins/openvswitch/ovs_quantum_plugin.py	2012-09-12 13:41:20 +0000
+++ quantum/plugins/openvswitch/ovs_quantum_plugin.py	2013-01-08 00:32:21 +0000
@@ -200,7 +200,8 @@
                                             constants.TYPE_VLAN,
                                             constants.TYPE_GRE,
                                             constants.TYPE_NONE]:
-            LOG.error("Invalid tenant_network_type: %s",
+            LOG.error("Invalid tenant_network_type: %s. "
+                      "Agent terminated!",
                       self.tenant_network_type)
             sys.exit(1)
         self.enable_tunneling = cfg.CONF.OVS.enable_tunneling
@@ -209,7 +210,8 @@
             self._parse_tunnel_id_ranges()
             ovs_db_v2.sync_tunnel_allocations(self.tunnel_id_ranges)
         elif self.tenant_network_type == constants.TYPE_GRE:
-            LOG.error("Tunneling disabled but tenant_network_type is 'gre'")
+            LOG.error("Tunneling disabled but tenant_network_type is 'gre'. "
+                      "Agent terminated!")
             sys.exit(1)
         self.agent_rpc = cfg.CONF.AGENT.rpc
         self.setup_rpc()
@@ -239,7 +241,8 @@
                                                  int(vlan_min),
                                                  int(vlan_max))
                 except ValueError as ex:
-                    LOG.error("Invalid network VLAN range: \'%s\' - %s",
+                    LOG.error("Invalid network VLAN range: '%s' - %s. "
+                              "Agent terminated!",
                               entry, ex)
                     sys.exit(1)
             else:
@@ -261,7 +264,8 @@
                 tun_min, tun_max = entry.split(':')
                 self.tunnel_id_ranges.append((int(tun_min), int(tun_max)))
             except ValueError as ex:
-                LOG.error("Invalid tunnel ID range: \'%s\' - %s", entry, ex)
+                LOG.error("Invalid tunnel ID range: '%s' - %s. "
+                          "Agent terminated!", entry, ex)
                 sys.exit(1)
         LOG.info("Tunnel ID ranges: %s", self.tunnel_id_ranges)
 

=== modified file 'quantum/plugins/ryu/nova/vif.py'
--- quantum/plugins/ryu/nova/vif.py	2012-08-17 10:42:58 +0000
+++ quantum/plugins/ryu/nova/vif.py	2013-01-08 00:32:21 +0000
@@ -48,7 +48,7 @@
     return int(out.strip())
 
 
-class LibvirtOpenVswitchOFPRyuDriver(libvirt_vif.LibvirtOpenVswitchDriver):
+class LibvirtOpenVswitchOFPRyuDriver(libvirt_vif.LibvirtHybridOVSBridgeDriver):
     def __init__(self, **kwargs):
         super(LibvirtOpenVswitchOFPRyuDriver, self).__init__()
         LOG.debug('ryu rest host %s', FLAGS.libvirt_ovs_bridge)
@@ -57,8 +57,8 @@
 
     def _get_port_no(self, mapping):
         iface_id = mapping['vif_uuid']
-        dev = self.get_dev_name(iface_id)
-        return _get_port_no(dev)
+        _v1_name, v2_name = self.get_veth_pair_names(iface_id)
+        return _get_port_no(v2_name)
 
     def plug(self, instance, vif):
         result = super(LibvirtOpenVswitchOFPRyuDriver, self).plug(

=== modified file 'quantum/quantum_plugin_base_v2.py'
--- quantum/quantum_plugin_base_v2.py	2012-09-07 18:50:09 +0000
+++ quantum/quantum_plugin_base_v2.py	2013-01-08 00:32:21 +0000
@@ -23,6 +23,8 @@
 
 from abc import ABCMeta, abstractmethod
 
+from quantum.common import exceptions
+
 
 class QuantumPluginBaseV2(object):
 
@@ -70,7 +72,7 @@
     def get_subnets(self, context, filters=None, fields=None):
         """
         Retrieve a list of subnets.  The contents of the list depends on
-        the identify of the user making the request (as indicated by the
+        the identity of the user making the request (as indicated by the
         context) as well as any filters.
         : param context: quantum api request context
         : param filters: a dictionary with keys that are valid keys for
@@ -87,6 +89,25 @@
         """
         pass
 
+    def get_subnets_count(self, context, filters=None):
+        """
+        Return the number of subnets.  The result depends on the identity of
+        the user making the request (as indicated by the context) as well as
+        any filters.
+        : param context: quantum api request context
+        : param filters: a dictionary with keys that are valid keys for
+            a network as listed in the RESOURCE_ATTRIBUTE_MAP object
+            in quantum/api/v2/attributes.py.  Values in this dictiontary
+            are an iterable containing values that will be used for an exact
+            match comparison for that value.  Each result returned by this
+            function will have matched one of the values for each key in
+            filters.
+
+        NOTE: this method is optional, as it was not part of the originally
+              defined plugin API.
+        """
+        raise exceptions.NotImplementedError()
+
     @abstractmethod
     def delete_subnet(self, context, id):
         """
@@ -138,7 +159,7 @@
     def get_networks(self, context, filters=None, fields=None):
         """
         Retrieve a list of networks.  The contents of the list depends on
-        the identify of the user making the request (as indicated by the
+        the identity of the user making the request (as indicated by the
         context) as well as any filters.
         : param context: quantum api request context
         : param filters: a dictionary with keys that are valid keys for
@@ -155,6 +176,25 @@
         """
         pass
 
+    def get_networks_count(self, context, filters=None):
+        """
+        Return the number of networks.  The result depends on the identity
+        of the user making the request (as indicated by the context) as well
+        as any filters.
+        : param context: quantum api request context
+        : param filters: a dictionary with keys that are valid keys for
+            a network as listed in the RESOURCE_ATTRIBUTE_MAP object
+            in quantum/api/v2/attributes.py.  Values in this dictiontary
+            are an iterable containing values that will be used for an exact
+            match comparison for that value.  Each result returned by this
+            function will have matched one of the values for each key in
+            filters.
+
+        NOTE: this method is optional, as it was not part of the originally
+              defined plugin API.
+        """
+        raise exceptions.NotImplementedError()
+
     @abstractmethod
     def delete_network(self, context, id):
         """
@@ -206,7 +246,7 @@
     def get_ports(self, context, filters=None, fields=None):
         """
         Retrieve a list of ports.  The contents of the list depends on
-        the identify of the user making the request (as indicated by the
+        the identity of the user making the request (as indicated by the
         context) as well as any filters.
         : param context: quantum api request context
         : param filters: a dictionary with keys that are valid keys for
@@ -223,6 +263,25 @@
         """
         pass
 
+    def get_ports_count(self, context, filters=None):
+        """
+        Return the number of ports.  The result depends on the identity of
+        the user making the request (as indicated by the context) as well as
+        any filters.
+        : param context: quantum api request context
+        : param filters: a dictionary with keys that are valid keys for
+            a network as listed in the RESOURCE_ATTRIBUTE_MAP object
+            in quantum/api/v2/attributes.py.  Values in this dictiontary
+            are an iterable containing values that will be used for an exact
+            match comparison for that value.  Each result returned by this
+            function will have matched one of the values for each key in
+            filters.
+
+        NOTE: this method is optional, as it was not part of the originally
+              defined plugin API.
+        """
+        raise exceptions.NotImplementedError()
+
     @abstractmethod
     def delete_port(self, context, id):
         """

=== modified file 'quantum/quota.py'
--- quantum/quota.py	2012-08-17 10:42:58 +0000
+++ quantum/quota.py	2013-01-08 00:32:21 +0000
@@ -267,9 +267,19 @@
 
 
 def _count_resource(context, plugin, resources, tenant_id):
-    obj_getter = getattr(plugin, "get_%s" % resources)
-    obj_list = obj_getter(context, filters={'tenant_id': [tenant_id]})
-    return len(obj_list) if obj_list else 0
+    count_getter_name = "get_%s_count" % resources
+
+    # Some plugins support a count method for particular resources,
+    # using a DB's optimized counting features. We try to use that one
+    # if present. Otherwise just use regular getter to retrieve all objects
+    # and count in python, allowing older plugins to still be supported
+    try:
+        obj_count_getter = getattr(plugin, count_getter_name)
+        return obj_count_getter(context, filters={'tenant_id': [tenant_id]})
+    except (exceptions.NotImplementedError, AttributeError):
+        obj_getter = getattr(plugin, "get_%s" % resources)
+        obj_list = obj_getter(context, filters={'tenant_id': [tenant_id]})
+        return len(obj_list) if obj_list else 0
 
 
 resources = []

=== modified file 'quantum/rootwrap/filters.py'
--- quantum/rootwrap/filters.py	2012-09-26 15:14:31 +0000
+++ quantum/rootwrap/filters.py	2013-01-08 00:32:21 +0000
@@ -158,6 +158,10 @@
 
         try:
             command = os.readlink("/proc/%d/exe" % int(args[1]))
+            # NOTE(dprince): /proc/PID/exe may have ' (deleted)' on
+            # the end if an executable is updated or deleted
+            if command.endswith(" (deleted)"):
+                command = command[:command.rindex(" ")]
             if command != self.args[0]:
                 # Affected executable doesn't match
                 return False

=== added file 'quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py'
--- quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py	1970-01-01 00:00:00 +0000
+++ quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py	2013-01-08 00:32:21 +0000
@@ -0,0 +1,54 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright (c) 2012 OpenStack, LLC.
+#
+#    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 mock
+import unittest2 as unittest
+
+from quantum.openstack.common import cfg
+from quantum.plugins.linuxbridge.agent import linuxbridge_quantum_agent
+from quantum.plugins.linuxbridge.common import config
+from quantum.plugins.linuxbridge.common import constants as lconst
+
+
+class TestLinuxBridge(unittest.TestCase):
+
+    def setUp(self):
+        self.addCleanup(cfg.CONF.reset)
+        interface_mappings = {'physnet1': 'eth1'}
+        root_helper = cfg.CONF.AGENT.root_helper
+
+        self.linux_bridge = linuxbridge_quantum_agent.LinuxBridge(
+            interface_mappings, root_helper)
+
+    def test_ensure_physical_in_bridge_invalid(self):
+        result = self.linux_bridge.ensure_physical_in_bridge('network_id',
+                                                             'physnetx',
+                                                             7)
+        self.assertFalse(result)
+
+    def test_ensure_physical_in_bridge_flat(self):
+        with mock.patch.object(self.linux_bridge,
+                               'ensure_flat_bridge') as flat_bridge_func:
+            result = self.linux_bridge.ensure_physical_in_bridge(
+                'network_id', 'physnet1', lconst.FLAT_VLAN_ID)
+        self.assertTrue(flat_bridge_func.called)
+
+    def test_ensure_physical_in_bridge_vlan(self):
+        with mock.patch.object(self.linux_bridge,
+                               'ensure_vlan_bridge') as vlan_bridge_func:
+            result = self.linux_bridge.ensure_physical_in_bridge(
+                'network_id', 'physnet1', 7)
+        self.assertTrue(vlan_bridge_func.called)

=== modified file 'quantum/tests/unit/test_api_v2.py'
--- quantum/tests/unit/test_api_v2.py	2012-09-21 13:01:18 +0000
+++ quantum/tests/unit/test_api_v2.py	2013-01-08 00:32:21 +0000
@@ -369,6 +369,7 @@
 
         instance = self.plugin.return_value
         instance.create_network.return_value = return_value
+        instance.get_networks_count.return_value = 0
 
         res = self.api.post_json(_get_path('networks'), data)
 
@@ -390,6 +391,7 @@
 
         instance = self.plugin.return_value
         instance.create_network.return_value = return_value
+        instance.get_networks_count.return_value = 0
 
         res = self.api.post_json(_get_path('networks'), initial_input)
 
@@ -423,6 +425,7 @@
 
         instance = self.plugin.return_value
         instance.create_network.return_value = return_value
+        instance.get_networks_count.return_value = 0
 
         res = self.api.post_json(_get_path('networks'), initial_input,
                                  extra_environ=env)
@@ -479,6 +482,7 @@
 
         instance = self.plugin.return_value
         instance.create_network.side_effect = side_effect
+        instance.get_networks_count.return_value = 0
 
         res = self.api.post_json(_get_path('networks'), data)
         self.assertEqual(res.status_int, exc.HTTPCreated.code)
@@ -525,6 +529,7 @@
 
         instance = self.plugin.return_value
         instance.get_network.return_value = {'tenant_id': unicode(tenant_id)}
+        instance.get_ports_count.return_value = 1
         instance.create_port.return_value = return_value
         res = self.api.post_json(_get_path('ports'), initial_input)
 
@@ -545,6 +550,7 @@
 
         instance = self.plugin.return_value
         instance.create_network.return_value = return_value
+        instance.get_networks_count.return_value = 0
 
         res = self.api.post_json(_get_path('networks'), data)
 
@@ -699,6 +705,7 @@
         initial_input = {resource: {'name': 'myname'}}
         instance = self.plugin.return_value
         instance.get_networks.return_value = initial_input
+        instance.get_networks_count.return_value = 0
         expected_code = exc.HTTPCreated.code
         with mock.patch.object(notifer_api, 'notify') as mynotifier:
             if opname == 'create':
@@ -742,37 +749,41 @@
 class QuotaTest(APIv2TestBase):
     def test_create_network_quota(self):
         cfg.CONF.set_override('quota_network', 1, group='QUOTAS')
-        net_id = _uuid()
-        initial_input = {'network': {'name': 'net1', 'tenant_id': _uuid()}}
-        full_input = {'network': {'admin_state_up': True, 'subnets': []}}
-        full_input['network'].update(initial_input['network'])
-
-        return_value = {'id': net_id, 'status': "ACTIVE"}
-        return_value.update(full_input['network'])
-        return_networks = {'networks': [return_value]}
-        instance = self.plugin.return_value
-        instance.get_networks.return_value = return_networks
-        res = self.api.post_json(
-            _get_path('networks'), initial_input, expect_errors=True)
-        instance.get_networks.assert_called_with(mock.ANY,
-                                                 filters=mock.ANY)
+        initial_input = {'network': {'name': 'net1', 'tenant_id': _uuid()}}
+        full_input = {'network': {'admin_state_up': True, 'subnets': []}}
+        full_input['network'].update(initial_input['network'])
+
+        instance = self.plugin.return_value
+        instance.get_networks_count.return_value = 1
+        res = self.api.post_json(
+            _get_path('networks'), initial_input, expect_errors=True)
+        instance.get_networks_count.assert_called_with(mock.ANY,
+                                                       filters=mock.ANY)
+        self.assertTrue("Quota exceeded for resources" in
+                        res.json['QuantumError'])
+
+    def test_create_network_quota_no_counts(self):
+        cfg.CONF.set_override('quota_network', 1, group='QUOTAS')
+        initial_input = {'network': {'name': 'net1', 'tenant_id': _uuid()}}
+        full_input = {'network': {'admin_state_up': True, 'subnets': []}}
+        full_input['network'].update(initial_input['network'])
+
+        instance = self.plugin.return_value
+        instance.get_networks_count.side_effect = (
+            q_exc.NotImplementedError())
+        instance.get_networks.return_value = ["foo"]
+        res = self.api.post_json(
+            _get_path('networks'), initial_input, expect_errors=True)
+        instance.get_networks_count.assert_called_with(mock.ANY,
+                                                       filters=mock.ANY)
         self.assertTrue("Quota exceeded for resources" in
                         res.json['QuantumError'])
 
     def test_create_network_quota_without_limit(self):
         cfg.CONF.set_override('quota_network', -1, group='QUOTAS')
-        net_id = _uuid()
         initial_input = {'network': {'name': 'net1', 'tenant_id': _uuid()}}
-        full_input = {'network': {'admin_state_up': True, 'subnets': []}}
-        full_input['network'].update(initial_input['network'])
-        return_networks = []
-        for i in xrange(0, 3):
-            return_value = {'id': net_id + str(i), 'status': "ACTIVE"}
-            return_value.update(full_input['network'])
-            return_networks.append(return_value)
-        self.assertEquals(3, len(return_networks))
         instance = self.plugin.return_value
-        instance.get_networks.return_value = return_networks
+        instance.get_networks_count.return_value = 3
         res = self.api.post_json(
             _get_path('networks'), initial_input)
         self.assertEqual(res.status_int, exc.HTTPCreated.code)
@@ -836,6 +847,7 @@
 
         instance = self.plugin.return_value
         instance.create_network.return_value = return_value
+        instance.get_networks_count.return_value = 0
 
         res = self.api.post_json(_get_path('networks'), initial_input)
 

=== modified file 'quantum/tests/unit/test_attributes.py'
--- quantum/tests/unit/test_attributes.py	2012-09-21 13:01:18 +0000
+++ quantum/tests/unit/test_attributes.py	2013-01-08 00:32:21 +0000
@@ -23,6 +23,90 @@
 
 class TestAttributes(unittest2.TestCase):
 
+    def test_strings(self):
+        msg = attributes._validate_string(None, None)
+        self.assertEquals(msg, "'None' is not a valid string")
+
+        msg = attributes._validate_string("OK", None)
+        self.assertEquals(msg, None)
+
+        msg = attributes._validate_string("123456789", 9)
+        self.assertIsNone(msg)
+
+        msg = attributes._validate_string("1234567890", 9)
+        self.assertIsNotNone(msg)
+
+    def test_ip_pools(self):
+        pools = [[{'end': '10.0.0.254'}],
+                 [{'start': '10.0.0.254'}],
+                 [{'start': '1000.0.0.254',
+                   'end': '1.1.1.1'}],
+                 [{'start': '10.0.0.2', 'end': '10.0.0.254',
+                   'forza': 'juve'}],
+                 [{'start': '10.0.0.2', 'end': '10.0.0.254'},
+                  {'end': '10.0.0.254'}],
+                 None]
+        for pool in pools:
+            msg = attributes._validate_ip_pools(pool, None)
+            self.assertIsNotNone(msg)
+
+        pools = [[{'end': '10.0.0.254', 'start': '10.0.0.2'},
+                  {'start': '11.0.0.2', 'end': '11.1.1.1'}],
+                 [{'start': '11.0.0.2', 'end': '11.0.0.100'}]]
+        for pool in pools:
+            msg = attributes._validate_ip_pools(pool, None)
+            self.assertIsNone(msg)
+
+    def test_fixed_ips(self):
+        fixed_ips = [[{'subnet_id': '00000000-ffff-ffff-ffff-000000000000',
+                       'ip_address': '1111.1.1.1'}],
+                     [{'subnet_id': 'invalid'}],
+                     None,
+                     [{'subnet_id': '00000000-0fff-ffff-ffff-000000000000',
+                       'ip_address': '1.1.1.1'},
+                      {'subnet_id': '00000000-ffff-ffff-ffff-000000000000',
+                       'ip_address': '1.1.1.1'}],
+                     [{'subnet_id': '00000000-ffff-ffff-ffff-000000000000',
+                       'ip_address': '1.1.1.1'},
+                      {'subnet_id': '00000000-ffff-ffff-ffff-000000000000',
+                       'ip_address': '1.1.1.1'}]]
+        for fixed in fixed_ips:
+            msg = attributes._validate_fixed_ips(fixed, None)
+            self.assertIsNotNone(msg)
+
+    def test_nameservers(self):
+        ns_pools = [['1.1.1.2', '1.1.1.2'],
+                    ['www.hostname.com', 'www.hostname.com'],
+                    ['77.hostname.com'],
+                    ['1000.0.0.1'],
+                    None]
+
+        for ns in ns_pools:
+            msg = attributes._validate_nameservers(ns, None)
+            self.assertIsNotNone(msg)
+
+        ns_pools = [['100.0.0.2'],
+                    ['www.hostname.com'],
+                    ['www.great.marathons.to.travel'],
+                    ['valid'],
+                    ['www.internal.hostname.com']]
+
+        for ns in ns_pools:
+            msg = attributes._validate_nameservers(ns, None)
+            self.assertIsNone(msg)
+
+    def test_hostroutes(self):
+        hostroute_pools = [[{'destination': '100.0.0.0/24'}],
+                           [{'nexthop': '10.0.2.20'}],
+                           [{'nexthop': '10.0.2.20',
+                             'destination': '100.0.0.0/8'},
+                            {'nexthop': '10.0.2.20',
+                             'destination': '100.0.0.0/8'}],
+                           None]
+        for host_routes in hostroute_pools:
+            msg = attributes._validate_hostroutes(host_routes, None)
+            self.assertIsNotNone(msg)
+
     def test_mac_addresses(self):
         # Valid - 3 octets
         base_mac = "fa:16:3e:00:00:00"
@@ -40,49 +124,82 @@
         base_mac = "01:16:3e:4f:00:00"
         msg = attributes._validate_regex(base_mac,
                                          attributes.MAC_PATTERN)
-        error = '%s is not valid' % base_mac
-        self.assertEquals(msg, error)
+        self.assertIsNotNone(msg)
 
         # Invalid - invalid format
         base_mac = "a:16:3e:4f:00:00"
         msg = attributes._validate_regex(base_mac,
                                          attributes.MAC_PATTERN)
-        error = '%s is not valid' % base_mac
-        self.assertEquals(msg, error)
+        self.assertIsNotNone(msg)
 
         # Invalid - invalid format
         base_mac = "ffa:16:3e:4f:00:00"
         msg = attributes._validate_regex(base_mac,
                                          attributes.MAC_PATTERN)
-        error = '%s is not valid' % base_mac
-        self.assertEquals(msg, error)
+        self.assertIsNotNone(msg)
 
         # Invalid - invalid format
         base_mac = "01163e4f0000"
         msg = attributes._validate_regex(base_mac,
                                          attributes.MAC_PATTERN)
-        error = '%s is not valid' % base_mac
-        self.assertEquals(msg, error)
+        self.assertIsNotNone(msg)
 
         # Invalid - invalid format
         base_mac = "01-16-3e-4f-00-00"
         msg = attributes._validate_regex(base_mac,
                                          attributes.MAC_PATTERN)
-        error = '%s is not valid' % base_mac
-        self.assertEquals(msg, error)
+        self.assertIsNotNone(msg)
 
         # Invalid - invalid format
         base_mac = "00:16:3:f:00:00"
         msg = attributes._validate_regex(base_mac,
                                          attributes.MAC_PATTERN)
-        error = '%s is not valid' % base_mac
-        self.assertEquals(msg, error)
+        self.assertIsNotNone(msg)
 
         # Invalid - invalid format
         base_mac = "12:3:4:5:67:89ab"
         msg = attributes._validate_regex(base_mac,
                                          attributes.MAC_PATTERN)
-        error = '%s is not valid' % base_mac
+        self.assertIsNotNone(msg)
+
+    def test_cidr(self):
+        # Valid - IPv4
+        cidr = "10.0.2.0/24"
+        msg = attributes._validate_subnet(cidr,
+                                          None)
+        self.assertEquals(msg, None)
+
+        # Valid - IPv6 without final octets
+        cidr = "fe80::/24"
+        msg = attributes._validate_subnet(cidr,
+                                          None)
+        self.assertEquals(msg, None)
+
+        # Valid - IPv6 with final octets
+        cidr = "fe80::0/24"
+        msg = attributes._validate_subnet(cidr,
+                                          None)
+        self.assertEquals(msg, None)
+
+        # Invalid - IPv4 missing mask
+        cidr = "10.0.2.0"
+        msg = attributes._validate_subnet(cidr,
+                                          None)
+        error = "'%s' is not a valid IP subnet" % cidr
+        self.assertEquals(msg, error)
+
+        # Invalid - IPv6 without final octets, missing mask
+        cidr = "fe80::"
+        msg = attributes._validate_subnet(cidr,
+                                          None)
+        error = "'%s' is not a valid IP subnet" % cidr
+        self.assertEquals(msg, error)
+
+        # Invalid - IPv6 with final octets, missing mask
+        cidr = "fe80::0"
+        msg = attributes._validate_subnet(cidr,
+                                          None)
+        error = "'%s' is not a valid IP subnet" % cidr
         self.assertEquals(msg, error)
 
 

=== added file 'quantum/tests/unit/test_common_utils.py'
--- quantum/tests/unit/test_common_utils.py	1970-01-01 00:00:00 +0000
+++ quantum/tests/unit/test_common_utils.py	2013-01-08 00:32:21 +0000
@@ -0,0 +1,60 @@
+# Copyright (c) 2012 OpenStack, LLC.
+#
+#    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 unittest2 as unittest
+
+from quantum.common import utils
+
+
+class TestParseMappings(unittest.TestCase):
+    def parse(self, mapping_list, unique_values=True):
+        return utils.parse_mappings(mapping_list, unique_values)
+
+    def test_parse_mappings_fails_for_missing_separator(self):
+        with self.assertRaises(ValueError):
+            self.parse(['key'])
+
+    def test_parse_mappings_fails_for_missing_key(self):
+        with self.assertRaises(ValueError):
+            self.parse([':val'])
+
+    def test_parse_mappings_fails_for_missing_value(self):
+        with self.assertRaises(ValueError):
+            self.parse(['key:'])
+
+    def test_parse_mappings_fails_for_extra_separator(self):
+        with self.assertRaises(ValueError):
+            self.parse(['key:val:junk'])
+
+    def test_parse_mappings_fails_for_duplicate_key(self):
+        with self.assertRaises(ValueError):
+            self.parse(['key:val1', 'key:val2'])
+
+    def test_parse_mappings_fails_for_duplicate_value(self):
+        with self.assertRaises(ValueError):
+            self.parse(['key1:val', 'key2:val'])
+
+    def test_parse_mappings_succeeds_for_one_mapping(self):
+        self.assertEqual(self.parse(['key:val']), {'key': 'val'})
+
+    def test_parse_mappings_succeeds_for_n_mappings(self):
+        self.assertEqual(self.parse(['key1:val1', 'key2:val2']),
+                         {'key1': 'val1', 'key2': 'val2'})
+
+    def test_parse_mappings_succeeds_for_duplicate_value(self):
+        self.assertEqual(self.parse(['key1:val', 'key2:val'], False),
+                         {'key1': 'val', 'key2': 'val'})
+
+    def test_parse_mappings_succeeds_for_no_mappings(self):
+        self.assertEqual(self.parse(['']), {})

=== modified file 'quantum/tests/unit/test_db_plugin.py'
--- quantum/tests/unit/test_db_plugin.py	2012-09-26 15:14:31 +0000
+++ quantum/tests/unit/test_db_plugin.py	2013-01-08 00:32:21 +0000
@@ -112,6 +112,10 @@
 
     def tearDown(self):
         super(QuantumDbPluginV2TestCase, self).tearDown()
+        self.api = None
+        self._deserializers = None
+        self._skip_native_bulk = None
+        self.ext_api = None
         # NOTE(jkoelker) for a 'pluggable' framework, Quantum sure
         #                doesn't like when the plugin changes ;)
         db._ENGINE = None
@@ -354,12 +358,12 @@
     def _do_side_effect(self, patched_plugin, orig, *args, **kwargs):
         """ Invoked by test cases for injecting failures in plugin """
         def second_call(*args, **kwargs):
-            raise Exception('boom')
+            raise AttributeError
         patched_plugin.side_effect = second_call
         return orig(*args, **kwargs)
 
     def _validate_behavior_on_bulk_failure(self, res, collection):
-        self.assertEqual(res.status_int, 500)
+        self.assertEqual(res.status_int, 400)
         req = self.new_list_request(collection)
         res = req.get_response(self.api)
         self.assertEquals(res.status_int, 200)
@@ -378,6 +382,7 @@
     def network(self, name='net1',
                 admin_status_up=True,