Merge lp:~corey.bryant/nova/2014.1.4 into lp:~ubuntu-server-dev/nova/icehouse

[Corey Bryant]

[James Page (james-page)]

Build failure:

https://launchpad.net/~james-page/+archive/ubuntu/icehouse/+build/7089237

review: Needs Fixing

[lp:~corey.bryant/nova/2014.1.4]

701. By Corey Bryant on 2015-03-19

d/p/update-run-tests.patch: Run tests with default concurrencey.

702. By Corey Bryant on 2015-03-19

Update patch description for update-run-tests.patch

=== modified file 'debian/changelog'
--- debian/changelog	2014-11-17 17:54:05 +0000
+++ debian/changelog	2015-03-19 16:31:42 +0000
@@ -1,3 +1,59 @@
+nova (1:2014.1.4-0ubuntu1) trusty; urgency=medium
+
+  * Resynchronize with stable/icehouse (cac6472) (LP: #1432608):
+    - [0ff6742] Websocket Proxy should verify Origin header
+    - [c70e1fb] Fix kwargs['instance'] KeyError in @reverts_task_state decorator
+    - [07ec12c] Revert "Eventlet green threads not released back to pool"
+    - [e9cf07b] Compute: Catch binding failed exception while init host
+    - [e275961] Make tests use sha256 as openssl default digest algorithm
+    - [a657582] Eventlet green threads not released back to pool
+    - [4b46a86] Fix image metadata returned for volumes
+    - [58a6393] Check min_ram and min_disk when boot from volume
+    - [c5411d2] Extends use of ServiceProxy to more methods in HostAPI in cells
+    - [1e2abd6] Remove usage of self.__dict__ for message var replacement
+    - [54f9225] only emit deprecation warnings once
+    - [52103be] Fix disconnecting necessary iSCSI sessions issue
+    - [cca94d0] Fix connecting unnecessary iSCSI sessions issue
+    - [ac9f5c7] Fix wrong command for _rescan_multipath
+    - [d7c8e93] Fix unsafe SSL connection on TrustedFilter
+    - [9ecc468] Fix SecurityGroupExists error when booting instances
+    - [33be7d7] Update "num_instance" during delete instance
+    - [3de3f10] Fix nova evacuate issues for RBD
+    - [fe289fb] Fix nova-compute start issue after evacuate
+    - [f781656] Add _security_group_ensure_default() DBAPI method
+    - [8812672] Run build_and_run_instance in a separate greenthread
+    - [b6a080b] Fixes DOS issue in instance list ip filter
+    - [5ab0421] Make the block device mapping retries configurable
+    - [0695e14] Retry on closing of luks encrypted volume in case device is busy
+    - [dffa810] Add @_retry_on_deadlock to _instance_update()
+    - [f086ca3] Nova api service doesn't handle SIGHUP properly
+    - [7cdb643] Fix XML UnicodeEncode serialization error
+    - [98a6c1e] postgresql: use postgres db instead of template1
+    - [155664f] share neutron admin auth tokens
+    - [3e80433] VMware: validate that VM exists on backend prior to deletion
+    - [d71445c] VMWare: Fix VM leak when deletion of VM during resizing
+    - [56b62b7] Sync process utils from oslo
+    - [ddd62ff] VMware: prevent race condition with VNC port allocation
+    - [4174130] Fixes Hyper-V volume mapping issue on reboot
+    - [bfeae68] Fix CellStateManagerFile init to failure
+    - [5ec3cd3] Raise descriptive error for over volume quota
+    - [f9fad7a] Fixes missing ec2 api address disassociate error on failure
+    - [64ec1bf] Fix instance cross AZ check when attaching volumes
+    - [698c821] Ignore errors when deleting non-existing vifs
+    - [8141e7a] libvirt: Handle unsupported host capabilities
+    - [df9ead9] libvirt: Make `fakelibvirt.libvirtError` match
+    - [cac6472] Add _wrap_db_error() support to SessionTransaction.commit()
+  * d/p/drop-oslo-utils-usage.patch: Added to override new oslo.utils dep.
+  * d/p/disable-websockify-tests.patch: Added to disable websockify tests.
+  * d/p/block-device-mapping-config.patch: Dropped. Fixed upstream in [5ab0421].
+  * d/p/libvirt-Handle-unsupported-host-capabilities.patch: Dropped. Fixed
+    upstream in [8141e7a] and [df9ead9].
+  * d/p/cells-json-store.patch: Dropped. Fixed upstream in [bfeae68].
+  * d/p/fix-requirements.patch: Rebased.
+  * d/p/update-run-tests.patch: Run tests with default concurrencey.
+
+ -- Corey Bryant <[e-mail]>  Mon, 16 Mar 2015 08:29:39 -0400
+
 nova (1:2014.1.3-0ubuntu2) trusty; urgency=medium
 
   [ Corey Bryant ]
 
=== removed file 'debian/patches/block-device-mapping-config.patch'
--- debian/patches/block-device-mapping-config.patch	2014-11-10 16:31:07 +0000
+++ debian/patches/block-device-mapping-config.patch	1970-01-01 00:00:00 +0000
@@ -1,122 +0,0 @@
-Description: Make the block device mapping retries configurable
-Author: Akash Gangil <[e-mail]>
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/nova/+bug/1376927
-Forwarded: https://review.openstack.org/#/c/129276/
-diff --git a/nova/compute/manager.py b/nova/compute/manager.py
-index 260a2b7..45e143c 100644
---- a/nova/compute/manager.py
-+++ b/nova/compute/manager.py
-@@ -120,6 +120,10 @@ compute_opts = [
-     cfg.IntOpt('network_allocate_retries',
-                default=0,
-                help="Number of times to retry network allocation on failures"),
-+    cfg.IntOpt('block_device_allocate_retries',
-+               default=180,
-+               help='Number of times to retry block device'
-+                    ' allocation on failures')
-     ]
- 
- interval_opts = [
-@@ -153,7 +157,11 @@ interval_opts = [
-     cfg.IntOpt('instance_delete_interval',
-                default=300,
-                help=('Interval in seconds for retrying failed instance file '
--                     'deletes'))
-+                     'deletes')),
-+    cfg.IntOpt('block_device_allocate_retries_interval',
-+               default=1,
-+               help='Waiting time interval (seconds) between block'
-+                    ' device allocation retries on failures')
- ]
- 
- timeout_opts = [
-@@ -1135,24 +1143,21 @@ class ComputeManager(manager.Manager):
-                                                              instance)
-         return network_info
- 
--    def _await_block_device_map_created(self, context, vol_id, max_tries=180,
--                                        wait_between=1):
-+    def _await_block_device_map_created(self, context, vol_id):
-         # TODO(yamahata): creating volume simultaneously
-         #                 reduces creation time?
-         # TODO(yamahata): eliminate dumb polling
--        # TODO(harlowja): make the max_tries configurable or dynamic?
-         attempts = 0
-         start = time.time()
--        while attempts < max_tries:
-+        while attempts < CONF.block_device_allocate_retries:
-             volume = self.volume_api.get(context, vol_id)
-             volume_status = volume['status']
-             if volume_status not in ['creating', 'downloading']:
-                 if volume_status != 'available':
-                     LOG.warn(_("Volume id: %s finished being created but was"
-                                " not set as 'available'"), vol_id)
--                # NOTE(harlowja): return how many attempts were tried
-                 return attempts + 1
--            greenthread.sleep(wait_between)
-+            greenthread.sleep(CONF.block_device_allocate_retries_interval)
-             attempts += 1
-         # NOTE(harlowja): Should only happen if we ran out of attempts
-         raise exception.VolumeNotCreated(volume_id=vol_id,
-diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py
-index f1e334d..81765b4 100644
---- a/nova/tests/compute/test_compute.py
-+++ b/nova/tests/compute/test_compute.py
-@@ -34,6 +34,8 @@ from oslo import messaging
- import six
- from testtools import matchers as testtools_matchers
- 
-+from eventlet import greenthread
-+
- import nova
- from nova import availability_zones
- from nova import block_device
-@@ -378,6 +380,8 @@ class ComputeVolumeTestCase(BaseTestCase):
-                        lambda *a, **kw: None)
-         self.stubs.Set(self.compute.volume_api, 'check_attach',
-                        lambda *a, **kw: None)
-+        self.stubs.Set(greenthread, 'sleep',
-+                       lambda *a, **kw: None)
- 
-         def store_cinfo(context, *args, **kwargs):
-             self.cinfo = jsonutils.loads(args[-1].get('connection_info'))
-@@ -438,7 +442,9 @@ class ComputeVolumeTestCase(BaseTestCase):
-             mock_get_by_id.assert_called_once_with(self.context, 'fake')
-             self.assertTrue(mock_attach.called)
- 
--    def test_await_block_device_created_to_slow(self):
-+    def test_await_block_device_created_too_slow(self):
-+        self.flags(block_device_allocate_retries=2)
-+        self.flags(block_device_allocate_retries_interval=0.1)
- 
-         def never_get(context, vol_id):
-             return {
-@@ -449,13 +455,15 @@ class ComputeVolumeTestCase(BaseTestCase):
-         self.stubs.Set(self.compute.volume_api, 'get', never_get)
-         self.assertRaises(exception.VolumeNotCreated,
-                           self.compute._await_block_device_map_created,
--                          self.context, '1', max_tries=2, wait_between=0.1)
-+                          self.context, '1')
- 
-     def test_await_block_device_created_slow(self):
-         c = self.compute
-+        self.flags(block_device_allocate_retries=4)
-+        self.flags(block_device_allocate_retries_interval=0.1)
- 
-         def slow_get(context, vol_id):
--            while self.fetched_attempts < 2:
-+            if self.fetched_attempts < 2:
-                 self.fetched_attempts += 1
-                 return {
-                     'status': 'creating',
-@@ -467,9 +475,7 @@ class ComputeVolumeTestCase(BaseTestCase):
-             }
- 
-         self.stubs.Set(c.volume_api, 'get', slow_get)
--        attempts = c._await_block_device_map_created(self.context, '1',
--                                                     max_tries=4,
--                                                     wait_between=0.1)
-+        attempts = c._await_block_device_map_created(self.context, '1')
-         self.assertEqual(attempts, 3)
- 
-     def test_boot_volume_serial(self):
 
=== removed file 'debian/patches/cells-json-store.patch'
--- debian/patches/cells-json-store.patch	2014-09-30 09:25:52 +0000
+++ debian/patches/cells-json-store.patch	1970-01-01 00:00:00 +0000
@@ -1,76 +0,0 @@
-Description: Fix nova cells failing with a json topology file bug
-Author: Liam Young <[e-mail]>
-Bug: https://bugs.launchpad.net/nova/+bug/1314677
-Forwarded: https://review.openstack.org/#/c/124811/
-diff --git a/nova/cells/state.py b/nova/cells/state.py
-index b9112bd..1e12450 100644
---- a/nova/cells/state.py
-+++ b/nova/cells/state.py
-@@ -152,10 +152,7 @@ class CellStateManager(base.Base):
-             cells_config = CONF.cells.cells_config
- 
-         if cells_config:
--            config_path = CONF.find_file(cells_config)
--            if not config_path:
--                raise cfg.ConfigFilesNotFoundError(config_files=[cells_config])
--            return CellStateManagerFile(cell_state_cls, config_path)
-+            return CellStateManagerFile(cell_state_cls)
- 
-         return CellStateManagerDB(cell_state_cls)
- 
-@@ -450,8 +447,11 @@ class CellStateManagerDB(CellStateManager):
- 
- 
- class CellStateManagerFile(CellStateManager):
--    def __init__(self, cell_state_cls, cells_config_path):
--        self.cells_config_path = cells_config_path
-+    def __init__(self, cell_state_cls=None):
-+        cells_config = CONF.cells.cells_config
-+        self.cells_config_path = CONF.find_file(cells_config)
-+        if not self.cells_config_path:
-+            raise cfg.ConfigFilesNotFoundError(config_files=[cells_config])
-         super(CellStateManagerFile, self).__init__(cell_state_cls)
- 
-     def _cell_data_sync(self, force=False):
-diff --git a/nova/tests/cells/test_cells_state_manager.py b/nova/tests/cells/test_cells_state_manager.py
-index 1c29927..4841e14 100644
---- a/nova/tests/cells/test_cells_state_manager.py
-+++ b/nova/tests/cells/test_cells_state_manager.py
-@@ -16,12 +16,16 @@
- Tests For CellStateManager
- """
- 
-+import mock
-+import six
-+
- from oslo.config import cfg
- 
- from nova.cells import state
- from nova import db
- from nova.db.sqlalchemy import models
- from nova import exception
-+from nova.openstack.common import fileutils
- from nova import test
- 
- 
-@@ -78,6 +82,19 @@ class TestCellsStateManager(test.TestCase):
-                               state.CellStateManager)
-         self.assertEqual(['no_such_file_exists.conf'], e.config_files)
- 
-+    @mock.patch.object(cfg.ConfigOpts, 'find_file')
-+    @mock.patch.object(fileutils, 'read_cached_file')
-+    def test_filemanager_returned(self, mock_read_cached_file, mock_find_file):
-+        mock_find_file.return_value = "/etc/nova/cells.json"
-+        mock_read_cached_file.return_value = (False, six.StringIO({}))
-+        self.flags(cells_config='cells.json', group='cells')
-+        self.assertIsInstance(state.CellStateManager(),
-+                              state.CellStateManagerFile)
-+
-+    def test_dbmanager_returned(self):
-+        self.assertIsInstance(state.CellStateManager(),
-+                              state.CellStateManagerDB)
-+
-     def test_capacity_no_reserve(self):
-         # utilize entire cell
-         cap = self._capacity(0.0)
-
 
=== added file 'debian/patches/disable-websockify-tests.patch'
--- debian/patches/disable-websockify-tests.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/disable-websockify-tests.patch	2015-03-19 16:31:42 +0000
@@ -0,0 +1,25 @@
+--- a/nova/tests/console/test_websocketproxy.py
++++ b/nova/tests/console/test_websocketproxy.py
+@@ -16,8 +16,13 @@
+ 
+ 
+ import mock
++import testtools
++
++try:
++    from nova.console import websocketproxy
++except:
++    websocketproxy = None
+ 
+-from nova.console import websocketproxy
+ from nova import exception
+ from nova import test
+ from oslo.config import cfg
+@@ -27,6 +32,7 @@
+ 
+ class NovaProxyRequestHandlerBaseTestCase(test.TestCase):
+ 
++    @testtools.skipIf(websocketproxy is None, "websockify not available")
+     def setUp(self):
+         super(NovaProxyRequestHandlerBaseTestCase, self).setUp()
+ 
 
=== added file 'debian/patches/drop-oslo-utils-usage.patch'
--- debian/patches/drop-oslo-utils-usage.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/drop-oslo-utils-usage.patch	2015-03-19 16:31:42 +0000
@@ -0,0 +1,41 @@
+Description: Override python-oslo.utils dependency as it's not in trusty.
+Author: Corey Bryant <[e-mail]>
+Bug: https://bugs.launchpad.net/bugs/1432685
+Forwarded: yes
+
+--- a/nova/compute/api.py
++++ b/nova/compute/api.py
+@@ -26,7 +26,6 @@
+ import uuid
+ 
+ from oslo.config import cfg
+-from oslo.utils import units
+ import six
+ 
+ from nova import availability_zones
+@@ -68,6 +67,7 @@
+ from nova.openstack.common import log as logging
+ from nova.openstack.common import strutils
+ from nova.openstack.common import timeutils
++from nova.openstack.common import units
+ from nova.openstack.common import uuidutils
+ import nova.policy
+ from nova import quota
+--- a/nova/tests/compute/test_compute.py
++++ b/nova/tests/compute/test_compute.py
+@@ -31,7 +31,6 @@
+ import mox
+ from oslo.config import cfg
+ from oslo import messaging
+-from oslo.utils import units
+ import six
+ from testtools import matchers as testtools_matchers
+ 
+@@ -69,6 +68,7 @@
+ from nova.openstack.common import jsonutils
+ from nova.openstack.common import log as logging
+ from nova.openstack.common import timeutils
++from nova.openstack.common import units
+ from nova.openstack.common import uuidutils
+ from nova import policy
+ from nova import quota
 
=== modified file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	2014-08-08 17:43:35 +0000
+++ debian/patches/fix-requirements.patch	2015-03-19 16:31:42 +0000
@@ -4,13 +4,13 @@
 --- a/requirements.txt
 +++ b/requirements.txt
 @@ -25,9 +25,8 @@
- python-neutronclient>=2.3.4,<3
- python-glanceclient>=0.9.0
- python-keystoneclient>=0.7.0
+ python-neutronclient>=2.3.4,<2.3.11
+ python-glanceclient>=0.9.0,!=0.14.0,<=0.14.2
+ python-keystoneclient>=0.7.0,<=0.11.2
 -six>=1.6.0
 +six>=1.5.2
- stevedore>=0.14
+ stevedore>=0.14,<1.2
 -websockify>=0.5.1,<0.6
  wsgiref>=0.1.2
- oslo.config>=1.2.0
- oslo.rootwrap
+ oslo.config>=1.2.0,<1.5
+ oslo.rootwrap<1.4
 
=== removed file 'debian/patches/libvirt-Handle-unsupported-host-capabilities.patch'
--- debian/patches/libvirt-Handle-unsupported-host-capabilities.patch	2014-10-03 17:24:01 +0000
+++ debian/patches/libvirt-Handle-unsupported-host-capabilities.patch	1970-01-01 00:00:00 +0000
@@ -1,303 +0,0 @@
-Description: Fix exception when starting LXC containers with libvirt-lxc.
-Author: Chuck Short <[e-mail]>
-Forwarded: Not Needed.
---- a/nova/tests/virt/libvirt/fakelibvirt.py
-+++ b/nova/tests/virt/libvirt/fakelibvirt.py
-@@ -172,18 +172,76 @@
- 
- 
- class libvirtError(Exception):
--    def __init__(self, msg,
--                 error_code=VIR_ERR_INTERNAL_ERROR,
--                 error_domain=VIR_FROM_QEMU):
--        self.error_code = error_code
--        self.error_domain = error_domain
--        Exception(self, msg)
-+    """This class was copied and slightly modified from
-+    `libvirt-python:libvirt-override.py`.
-+
-+    Since a test environment will use the real `libvirt-python` version of
-+    `libvirtError` if it's installed and not this fake, we need to maintain
-+    strict compatability with the original class, including `__init__` args
-+    and instance-attributes.
-+
-+    To create a libvirtError instance you should:
-+
-+        # Create an unsupported error exception
-+        exc = libvirtError('my message')
-+        exc.err = (libvirt.VIR_ERR_NO_SUPPORT,)
-+
-+    self.err is a tuple of form:
-+        (error_code, error_domain, error_message, error_level, str1, str2,
-+         str3, int1, int2)
-+
-+    Alternatively, you can use the `make_libvirtError` convenience function to
-+    allow you to specify these attributes in one shot.
-+    """
-+    def __init__(self, defmsg, conn=None, dom=None, net=None, pool=None,
-+                 vol=None):
-+        Exception.__init__(self, defmsg)
-+        self.err = None
- 
-     def get_error_code(self):
--        return self.error_code
-+        if self.err is None:
-+            return None
-+        return self.err[0]
- 
-     def get_error_domain(self):
--        return self.error_domain
-+        if self.err is None:
-+            return None
-+        return self.err[1]
-+
-+    def get_error_message(self):
-+        if self.err is None:
-+            return None
-+        return self.err[2]
-+
-+    def get_error_level(self):
-+        if self.err is None:
-+            return None
-+        return self.err[3]
-+
-+    def get_str1(self):
-+        if self.err is None:
-+            return None
-+        return self.err[4]
-+
-+    def get_str2(self):
-+        if self.err is None:
-+            return None
-+        return self.err[5]
-+
-+    def get_str3(self):
-+        if self.err is None:
-+            return None
-+        return self.err[6]
-+
-+    def get_int1(self):
-+        if self.err is None:
-+            return None
-+        return self.err[7]
-+
-+    def get_int2(self):
-+        if self.err is None:
-+            return None
-+        return self.err[8]
- 
- 
- class NWFilter(object):
-@@ -219,8 +277,10 @@
-         try:
-             tree = etree.fromstring(xml)
-         except etree.ParseError:
--            raise libvirtError("Invalid XML.",
--                               VIR_ERR_XML_DETAIL, VIR_FROM_DOMAIN)
-+            raise make_libvirtError(
-+                    libvirtError, "Invalid XML.",
-+                    error_code=VIR_ERR_XML_DETAIL,
-+                    error_domain=VIR_FROM_DOMAIN)
- 
-         definition = {}
- 
-@@ -369,7 +429,11 @@
-                 123456789L]
- 
-     def migrateToURI(self, desturi, flags, dname, bandwidth):
--        raise libvirtError("Migration always fails for fake libvirt!")
-+        raise make_libvirtError(
-+                libvirtError,
-+                "Migration always fails for fake libvirt!",
-+                error_code=VIR_ERR_INTERNAL_ERROR,
-+                error_domain=VIR_FROM_QEMU)
- 
-     def attachDevice(self, xml):
-         disk_info = _parse_disk_info(etree.fromstring(xml))
-@@ -380,7 +444,11 @@
-     def attachDeviceFlags(self, xml, flags):
-         if (flags & VIR_DOMAIN_AFFECT_LIVE and
-                 self._state != VIR_DOMAIN_RUNNING):
--            raise libvirtError("AFFECT_LIVE only allowed for running domains!")
-+            raise make_libvirtError(
-+                libvirtError,
-+                "AFFECT_LIVE only allowed for running domains!",
-+                error_code=VIR_ERR_INTERNAL_ERROR,
-+                error_domain=VIR_FROM_QEMU)
-         self.attachDevice(xml)
- 
-     def detachDevice(self, xml):
-@@ -533,9 +601,11 @@
-                          'test:///default']
- 
-         if uri not in uri_whitelist:
--            raise libvirtError("libvirt error: no connection driver "
--                               "available for No connection for URI %s" % uri,
--                               5, 0)
-+            raise make_libvirtError(
-+                    libvirtError,
-+                   "libvirt error: no connection driver "
-+                   "available for No connection for URI %s" % uri,
-+                   error_code=5, error_domain=0)
- 
-         self.readonly = readonly
-         self._uri = uri
-@@ -594,16 +664,20 @@
-     def lookupByID(self, id):
-         if id in self._running_vms:
-             return self._running_vms[id]
--        raise libvirtError('Domain not found: no domain with matching '
--                           'id %d' % id,
--                           VIR_ERR_NO_DOMAIN, VIR_FROM_QEMU)
-+        raise make_libvirtError(
-+                libvirtError,
-+                'Domain not found: no domain with matching id %d' % id,
-+                error_code=VIR_ERR_NO_DOMAIN,
-+                error_domain=VIR_FROM_QEMU)
- 
-     def lookupByName(self, name):
-         if name in self._vms:
-             return self._vms[name]
--        raise libvirtError('Domain not found: no domain with matching '
--                           'name "%s"' % name,
--                           VIR_ERR_NO_DOMAIN, VIR_FROM_QEMU)
-+        raise make_libvirtError(
-+                libvirtError,
-+                'Domain not found: no domain with matching name "%s"' % name,
-+                error_code=VIR_ERR_NO_DOMAIN,
-+                error_domain=VIR_FROM_QEMU)
- 
-     def _emit_lifecycle(self, dom, event, detail):
-         if VIR_DOMAIN_EVENT_ID_LIFECYCLE not in self._event_callbacks:
-@@ -904,14 +978,21 @@
-                     'user': 26728850000000L,
-                     'iowait': 6121490000000L}
-         else:
--            raise libvirtError("invalid argument: Invalid cpu number")
-+            raise make_libvirtError(
-+                    libvirtError,
-+                    "invalid argument: Invalid cpu number",
-+                    error_code=VIR_ERR_INTERNAL_ERROR,
-+                    error_domain=VIR_FROM_QEMU)
- 
-     def nwfilterLookupByName(self, name):
-         try:
-             return self._nwfilters[name]
-         except KeyError:
--            raise libvirtError("no nwfilter with matching name %s" % name,
--                               VIR_ERR_NO_NWFILTER, VIR_FROM_NWFILTER)
-+            raise make_libvirtError(
-+                    libvirtError,
-+                    "no nwfilter with matching name %s" % name,
-+                    error_code=VIR_ERR_NO_NWFILTER,
-+                    error_domain=VIR_FROM_NWFILTER)
- 
-     def nwfilterDefineXML(self, xml):
-         nwfilter = NWFilter(self, xml)
-@@ -964,6 +1045,24 @@
-     pass
- 
- 
-+def make_libvirtError(error_class, msg, error_code=None,
-+                       error_domain=None, error_message=None,
-+                       error_level=None, str1=None, str2=None, str3=None,
-+                       int1=None, int2=None):
-+    """Convenience function for creating `libvirtError` exceptions which
-+    allow you to specify arguments in constructor without having to manipulate
-+    the `err` tuple directly.
-+
-+    We need to pass in `error_class` to this function because it may be
-+    `libvirt.libvirtError` or `fakelibvirt.libvirtError` depending on whether
-+    `libvirt-python` is installed.
-+    """
-+    exc = error_class(msg)
-+    exc.err = (error_code, error_domain, error_message, error_level,
-+               str1, str2, str3, int1, int2)
-+    return exc
-+
-+
- virDomain = Domain
- 
- 
---- a/nova/virt/libvirt/driver.py
-+++ b/nova/virt/libvirt/driver.py
-@@ -77,6 +77,7 @@
- from nova.openstack.common import excutils
- from nova.openstack.common import fileutils
- from nova.openstack.common.gettextutils import _
-+from nova.openstack.common.gettextutils import _LW
- from nova.openstack.common import importutils
- from nova.openstack.common import jsonutils
- from nova.openstack.common import log as logging
-@@ -2888,9 +2889,14 @@
-                     #                 this -1 checking should be removed later.
-                     if features and features != -1:
-                         self._caps.host.cpu.parse_str(features)
--                except libvirt.VIR_ERR_NO_SUPPORT:
--                    # Note(yjiang5): ignore if libvirt has no support
--                    pass
-+                except libvirt.libvirtError as ex:
-+                    error_code = ex.get_error_code()
-+                    if error_code == libvirt.VIR_ERR_NO_SUPPORT:
-+                        LOG.warn(_LW("URI %(uri)s does not support full set"
-+                                     " of host capabilities: " "%(error)s"),
-+                                     {'uri': self.uri(), 'error': ex})
-+                    else:
-+                        raise
-         return self._caps
- 
-     def get_host_uuid(self):
---- a/nova/tests/virt/libvirt/test_libvirt.py
-+++ b/nova/tests/virt/libvirt/test_libvirt.py
-@@ -83,7 +83,7 @@
- try:
-     import libvirt
- except ImportError:
--    import nova.tests.virt.libvirt.fakelibvirt as libvirt
-+    libvirt = fakelibvirt
- libvirt_driver.libvirt = libvirt
- 
- 
-@@ -887,6 +887,42 @@
-             caps = conn.get_host_capabilities()
-             self.assertIn('aes', [x.name for x in caps.host.cpu.features])
- 
-+    def test_baseline_cpu_not_supported(self):
-+        conn = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True)
-+
-+        # `mock` has trouble stubbing attributes that don't exist yet, so
-+        # fallback to plain-Python attribute setting/deleting
-+        cap_str = 'VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES'
-+        if not hasattr(libvirt_driver.libvirt, cap_str):
-+            setattr(libvirt_driver.libvirt, cap_str, True)
-+            self.addCleanup(delattr, libvirt_driver.libvirt, cap_str)
-+
-+        # Handle just the NO_SUPPORT error
-+        not_supported_exc = fakelibvirt.make_libvirtError(
-+                libvirt.libvirtError,
-+                'this function is not supported by the connection driver:'
-+                ' virConnectBaselineCPU',
-+                error_code=libvirt.VIR_ERR_NO_SUPPORT)
-+
-+        with mock.patch.object(conn._conn, 'baselineCPU',
-+                               side_effect=not_supported_exc):
-+            caps = conn.get_host_capabilities()
-+            self.assertEqual(vconfig.LibvirtConfigCaps, type(caps))
-+            self.assertNotIn('aes', [x.name for x in caps.host.cpu.features])
-+
-+        # Clear cached result so we can test again...
-+        conn._caps = None
-+
-+        # Other errors should not be caught
-+        other_exc = fakelibvirt.make_libvirtError(
-+            libvirt.libvirtError,
-+            'other exc',
-+            error_code=libvirt.VIR_ERR_NO_DOMAIN)
-+
-+        with mock.patch.object(conn._conn, 'baselineCPU',
-+                               side_effect=other_exc):
-+            self.assertRaises(libvirt.libvirtError, conn.get_host_capabilities)
-+
-     def test_lxc_get_host_capabilities_failed(self):
-         conn = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True)
- 
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2014-11-10 16:31:07 +0000
+++ debian/patches/series	2015-03-19 16:31:42 +0000
@@ -1,8 +1,7 @@
 # Ubuntu specific patches below here. Note these can be dropped eventually.
-block-device-mapping-config.patch
+drop-oslo-utils-usage.patch
+disable-websockify-tests.patch
 fix-requirements.patch
 skip_ipv6_test.patch
 arm-console-patch.patch
 update-run-tests.patch
-libvirt-Handle-unsupported-host-capabilities.patch
-cells-json-store.patch
 
=== modified file 'debian/patches/update-run-tests.patch'
--- debian/patches/update-run-tests.patch	2014-03-05 14:00:22 +0000
+++ debian/patches/update-run-tests.patch	2015-03-19 16:31:42 +0000
@@ -1,20 +1,9 @@
-Description: Update run_tests.sh to show results and default the concurrency to 1.
+Description: Update run_tests.sh to show results.
 Author: Chuck Short <[e-mail]>
 Forwarded: Not needed.
-diff --git a/run_tests.sh b/run_tests.sh
-index 1fecc4c..84537cb 100755
 --- a/run_tests.sh
 +++ b/run_tests.sh
-@@ -86,7 +86,7 @@ no_pep8=0
- coverage=0
- debug=0
- update=0
--concurrency=0
-+concurrency=4
- 
- LANG=en_US.UTF-8
- LANGUAGE=en_US:en
-@@ -137,14 +137,7 @@ function run_tests {
+@@ -137,14 +137,7 @@
      ${wrapper} python setup.py egg_info
    fi
    echo "Running \`${wrapper} $TESTRTESTS\`"
@@ -30,6 +19,3 @@
    RESULT=$?
    set -e
  
--- 
-1.9.0
-