Merge ~zioproto/ubuntu/+source/nova:stable/newton into ~ubuntu-server-dev/ubuntu/+source/nova:stable/newton

[Saverio Proto]

Nova version bump to 14.0.5 for stable/newton

diff --git a/AUTHORS b/AUTHORS
index 3c5ca47..197ca31 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -126,6 +126,7 @@ Armando Migliaccio <[e-mail]>
 Arnaud Legendre <[e-mail]>
 Arnaud Legendre <[e-mail]>
 Arnaud Morin <[e-mail]>
+Arne Recknagel <[e-mail]>
 Artom Lifshitz <[e-mail]>
 Artur Malinowski <[e-mail]>
 Arvind Somya <[e-mail]>
@@ -703,6 +704,7 @@ Matt Fischer <[e-mail]>
 Matt Joyce <[e-mail]>
 Matt Odden <[e-mail]>
 Matt Rabe <[e-mail]>
+Matt Riedemann <[e-mail]>
 Matt Riedemann <[e-mail]>
 Matt Stephenson <[e-mail]>
 Matt Thompson <[e-mail]>
@@ -733,6 +735,7 @@ Michael Still <[e-mail]>
 Michael Turek <[e-mail]>
 Michael Wilson <[e-mail]>
 Michael Wurtz <[e-mail]>
+Michal <[e-mail]>
 Michal Dulko <[e-mail]>
 Michal Pryc <[e-mail]>
 Miguel Lavalle <[e-mail]>
@@ -827,6 +830,7 @@ Pranali Deore <[e-mail]>
 PranaliDeore <[e-mail]>
 Pranav Salunke <[e-mail]>
 Pranav Salunke <[e-mail]>
+Prateek Arora <[e-mail]>
 Praveen Yalagandula <[e-mail]>
 Prem Karat <[e-mail]>
 Przemyslaw Czesnowicz <[e-mail]>
@@ -1290,6 +1294,7 @@ lrqrun <[e-mail]>
 lvdongbing <[e-mail]>
 lyanchih <[e-mail]>
 [e-mail] <[e-mail]>
+m4cr0v <[e-mail]>
 maqi <[e-mail]>
 mark.sturdevant <[e-mail]>
 mathieu-rohon <[e-mail]>
diff --git a/ChangeLog b/ChangeLog
index 2289ac9..8eab1d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,21 @@
 CHANGES
 =======
 
+14.0.5
+------
+
+* Add release note for CVE-2017-7214
+* do not include context to exception notification
+* Fix exception message formatting error in test
+* Fix invalid exception mock for InvalidNUMANodesNumber
+* Fix s390 "connector not found" issue
+* Fix spice channel type
+* Updated from global requirements
+* Add release note for live_migration_progress_timeout issue
+* Ignore deleted services in minimum version calculation
+* Imported Translations from Zanata
+* Fresh resource provider in RT must have generation 0
+
 14.0.4
 ------
 
@@ -10,9 +25,11 @@ CHANGES
 * Skip test_stamp_pattern in cells v1 job
 * Prepare for using standard python tests
 * Allow None for block_device_mapping_v2.boot_index
+* libvirt: Remove redundant bdm serial mangling and saving during swap_volume
 * Catch error and log warning when not able to update mtimes
 * libvirt: Limit destroying disks during cleanup to spawn
 * libvirt: fix nova can't delete the instance with nvram
+* Pre-load info_cache when handling external events and handle NotFound
 * libvirt: Use the mirror element to detect job completion
 * libvirt: Mock is_job_complete in test_driver
 * libvirt: Fix BlockDevice.wait_for_job when qemu reports no job
@@ -22,16 +39,27 @@ CHANGES
 * Raise DeviceNotFound detaching volume from persistent domain
 * libvirt: Detach volumes from a domain before detaching any encryptors
 * Ensure we mark baremetal links as phy links
+* Do not post allocations that are zero
+* placement: Do not save 0-valued inventory
+* [placement] Enforce min_unit, max_unit and step_size
+* Correct wrong max_unit in placement inventory
+* placement: genericize on resource providers
+* placement: refactor instance translate function
+* placement: refactor translate from node to dict
+* Removal of tests with different result depending on testing env
 * Let nova-manage cell_v2 commands use transport_url from CONF
 * Make simple_cell_setup fully idempotent
 * Make placement client keep trying to connect
 * Handle Unauthorized exception in report client's safe_connect()
+* Handle ImageNotFound exception during instance backup
 * Guestfs handle no passwd or group in image
 * libvirt: Improve _is_booted_from_volume implementation
 * libvirt: Delete duplicate check when live-migrating
 * Fix cold migration with qcow2 ephemeral disks
+* Catch VolumeEncryptionNotSupported during spawn
 * Provide an online data migration to cleanup orphaned build requests
 * Don't apply multi-queue to SRIOV ports
+* libvirt: Acquire TCP ports for console during live migration
 * libvirt: prepare domain XML update for serial ports
 * libvirt: do not return serial address if disabled on destination
 * Fix BDM JSON-Schema validation
@@ -41,6 +69,7 @@ CHANGES
 ------
 
 * Catch ImageNotAuthorized during boot instance
+* fix for auth during live-migration
 * Fix crashing during guest config with pci_devices=None
 * Bump prlimit cpu time for qemu from 2 to 8
 * Don't trace on ImageNotFound in delete_image_on_error
diff --git a/PKG-INFO b/PKG-INFO
index 0dfed1d..aaa5e3a 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: nova
-Version: 14.0.4
+Version: 14.0.5
 Summary: Cloud computing fabric controller
 Home-page: http://docs.openstack.org/developer/nova/
 Author: OpenStack
diff --git a/debian/changelog b/debian/changelog
index d934cf6..aad93fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nova (2:14.0.5-0ubuntu1) UNRELEASED; urgency=medium
+
+  * New upstream point release for OpenStack Newton
+
+ -- Saverio Proto <[e-mail]>  Mon, 24 Apr 2017 08:22:54 +0000
+
 nova (2:14.0.4-0ubuntu1.2) yakkety; urgency=medium
 
   * d/p/libvirt-set-vlan-tag-for-macvtap.patch: Pick dependent patch
diff --git a/nova.egg-info/PKG-INFO b/nova.egg-info/PKG-INFO
index 0dfed1d..aaa5e3a 100644
--- a/nova.egg-info/PKG-INFO
+++ b/nova.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: nova
-Version: 14.0.4
+Version: 14.0.5
 Summary: Cloud computing fabric controller
 Home-page: http://docs.openstack.org/developer/nova/
 Author: OpenStack
diff --git a/nova.egg-info/SOURCES.txt b/nova.egg-info/SOURCES.txt
index 5f00a54..72b1f25 100644
--- a/nova.egg-info/SOURCES.txt
+++ b/nova.egg-info/SOURCES.txt
@@ -2720,6 +2720,7 @@ releasenotes/notes/bp-virtuozzo-rescue-support-a0f69357a93e5e92.yaml
 releasenotes/notes/bug-1559026-47c3fa3468d66b07.yaml
 releasenotes/notes/bug-1635446-newton-2351fe93f9af67e5.yaml
 releasenotes/notes/bug-1662699-06203e7262e02aa6.yaml
+releasenotes/notes/bug-1673569-cve-2017-7214-2d7644b356015c93.yaml
 releasenotes/notes/bug_1632723-2a4bd74e4a942a06.yaml
 releasenotes/notes/cell-id-db-sync-nova-manage-8504b54dd115a2e9.yaml
 releasenotes/notes/cells-discover-hosts-06a3079ba687e092.yaml
@@ -2795,6 +2796,7 @@ releasenotes/notes/libvirt_hardware_policy_from_libosinfo-19e261851d1ad93a.yaml
 releasenotes/notes/libvirt_ppc64le_hugepage_support-b9fd39cf20c8e91d.yaml
 releasenotes/notes/list-invalid-status-af07af378728bc57.yaml
 releasenotes/notes/list-server-bad-status-fix-7db504b38c8d732f.yaml
+releasenotes/notes/live-migration-progress-known-issue-20176f49da4d3c91.yaml
 releasenotes/notes/live_migration_uri-dependent-on-virt_type-595c46c2310f45c3.yaml
 releasenotes/notes/lock_policy-75bea372036acbd5.yaml
 releasenotes/notes/min-required-libvirt-b948948949669b02.yaml
diff --git a/nova.egg-info/pbr.json b/nova.egg-info/pbr.json
index 58fcfde..6a0ab56 100644
--- a/nova.egg-info/pbr.json
+++ b/nova.egg-info/pbr.json
@@ -1 +1 @@
-{"is_release": true, "git_version": "642caf0"}
\ No newline at end of file
+{"git_version": "c2c91ce", "is_release": true}
\ No newline at end of file
diff --git a/nova.egg-info/requires.txt b/nova.egg-info/requires.txt
index cc1c89b..ee9e996 100644
--- a/nova.egg-info/requires.txt
+++ b/nova.egg-info/requires.txt
@@ -27,7 +27,7 @@ python-glanceclient!=2.4.0,>=2.3.0
 requests>=2.10.0
 six>=1.9.0
 stevedore>=1.16.0
-setuptools!=24.0.0,>=16.0
+setuptools!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,>=16.0
 websockify>=0.8.0
 oslo.cache>=1.5.0
 oslo.concurrency>=3.8.0
diff --git a/nova/api/openstack/compute/server_external_events.py b/nova/api/openstack/compute/server_external_events.py
index 2ed3399..2789b66 100644
--- a/nova/api/openstack/compute/server_external_events.py
+++ b/nova/api/openstack/compute/server_external_events.py
@@ -65,11 +65,11 @@ class ServerExternalEventsController(wsgi.Controller):
             instance = instances.get(event.instance_uuid)
             if not instance:
                 try:
-                    # Load migration_context here in a single DB operation
-                    # because we need it later on
+                    # Load migration_context and info_cache here in a single DB
+                    # operation because we need them later on
                     instance = objects.Instance.get_by_uuid(
                         context, event.instance_uuid,
-                        expected_attrs=['migration_context'])
+                        expected_attrs=['migration_context', 'info_cache'])
                     instances[event.instance_uuid] = instance
                 except exception.InstanceNotFound:
                     LOG.debug('Dropping event %(name)s:%(tag)s for unknown '
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index fb58012..7b403e9 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -1968,7 +1968,8 @@ class ComputeManager(manager.Manager):
                 exception.ImageUnacceptable,
                 exception.InvalidDiskInfo,
                 exception.InvalidDiskFormat,
-                exception.SignatureVerificationError) as e:
+                exception.SignatureVerificationError,
+                exception.VolumeEncryptionNotSupported) as e:
             self._notify_about_instance_usage(context, instance,
                     'create.error', fault=e)
             raise exception.BuildAbortException(instance_uuid=instance.uuid,
@@ -3149,7 +3150,12 @@ class ComputeManager(manager.Manager):
                 image_id = image['id']
                 LOG.debug("Deleting image %s", image_id,
                           instance=instance)
-                self.image_api.delete(context, image_id)
+                try:
+                    self.image_api.delete(context, image_id)
+                except exception.ImageNotFound:
+                    LOG.info(_LI("Failed to find image %(image_id)s to "
+                                 "delete"), {'image_id': image_id},
+                             instance=instance)
 
     @wrap_exception()
     @reverts_task_state
@@ -4859,7 +4865,11 @@ class ComputeManager(manager.Manager):
         old_cinfo = jsonutils.loads(bdm['connection_info'])
         if old_cinfo and 'serial' not in old_cinfo:
             old_cinfo['serial'] = old_volume_id
-        new_cinfo['serial'] = old_cinfo['serial']
+        # NOTE(lyarwood): serial is not always present in the returned
+        # connection_info so set it if it is missing as we do in
+        # DriverVolumeBlockDevice.attach().
+        if 'serial' not in new_cinfo:
+            new_cinfo['serial'] = new_volume_id
         return (old_cinfo, new_cinfo)
 
     def _swap_volume(self, context, instance, bdm, connector,
@@ -4874,6 +4884,10 @@ class ComputeManager(manager.Manager):
                                                                 connector,
                                                                 instance,
                                                                 bdm)
+            # NOTE(lyarwood): The Libvirt driver, the only virt driver
+            # currently implementing swap_volume, will modify the contents of
+            # new_cinfo when connect_volume is called. This is then saved to
+            # the BDM in swap_volume for future use outside of this flow.
             LOG.debug("swap_volume: Calling driver volume swap with "
                       "connection infos: new: %(new_cinfo)s; "
                       "old: %(old_cinfo)s",
@@ -4881,6 +4895,9 @@ class ComputeManager(manager.Manager):
                       contex=context, instance=instance)
             self.driver.swap_volume(old_cinfo, new_cinfo, instance, mountpoint,
                                     resize_to)
+            LOG.debug("swap_volume: Driver volume swap returned, new "
+                      "connection_info is now : %(new_cinfo)s",
+                      {'new_cinfo': new_cinfo})
         except Exception:
             failed = True
             with excutils.save_and_reraise_exception():
@@ -4909,8 +4926,13 @@ class ComputeManager(manager.Manager):
                 self.volume_api.terminate_connection(context,
                                                      conn_volume,
                                                      connector)
-            # If Cinder initiated the swap, it will keep
-            # the original ID
+            # NOTE(lyarwood): The following call to
+            # os-migrate-volume-completion returns a dict containing
+            # save_volume_id, this volume id has two possible values :
+            # 1. old_volume_id if we are migrating (retyping) volumes
+            # 2. new_volume_id if we are swapping between two existing volumes
+            # This volume id is later used to update the volume_id and
+            # connection_info['serial'] of the BDM.
             comp_ret = self.volume_api.migrate_volume_completion(
                                                       context,
                                                       old_volume_id,
@@ -4949,9 +4971,10 @@ class ComputeManager(manager.Manager):
                                                          new_volume_id,
                                                          resize_to)
 
+        # NOTE(lyarwood): Update the BDM with the modified new_cinfo and
+        # correct volume_id returned by Cinder.
         save_volume_id = comp_ret['save_volume_id']
-
-        # Update bdm
+        new_cinfo['serial'] = save_volume_id
         values = {
             'connection_info': jsonutils.dumps(new_cinfo),
             'source_type': 'volume',
@@ -6690,9 +6713,15 @@ class ComputeManager(manager.Manager):
                              {'event': event.key, 'error': six.text_type(e)},
                              instance=instance)
             elif event.name == 'network-vif-deleted':
-                self._process_instance_vif_deleted_event(context,
-                                                         instance,
-                                                         event.tag)
+                try:
+                    self._process_instance_vif_deleted_event(context,
+                                                             instance,
+                                                             event.tag)
+                except exception.NotFound as e:
+                    LOG.info(_LI('Failed to process external instance event '
+                                 '%(event)s due to: %(error)s'),
+                             {'event': event.key, 'error': six.text_type(e)},
+                             instance=instance)
             else:
                 self._process_instance_event(instance, event)
 
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 5527c0e..29baac5 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -453,6 +453,7 @@ def service_get_minimum_version(context, binaries):
         models.Service.binary,
         func.min(models.Service.version)).\
                          filter(models.Service.binary.in_(binaries)).\
+                         filter(models.Service.deleted == 0).\
                          filter(models.Service.forced_down == false()).\
                          group_by(models.Service.binary)
     return dict(min_versions)
diff --git a/nova/exception.py b/nova/exception.py
index c9e5212..5006175 100644
--- a/nova/exception.py
+++ b/nova/exception.py
@@ -2140,6 +2140,12 @@ class InvalidAllocationCapacityExceeded(InvalidInventory):
                 "amount would exceed the capacity.")
 
 
+class InvalidAllocationConstraintsViolated(InvalidInventory):
+    msg_fmt = _("Unable to create allocation for '%(resource_class)s' on "
+                "resource provider '%(resource_provider)s'. The requested "
+                "amount would violate inventory constraints.")
+
+
 class UnsupportedPointerModelRequested(Invalid):
     msg_fmt = _("Pointer model '%(model)s' requested is not supported by "
                 "host.")
diff --git a/nova/exception_wrapper.py b/nova/exception_wrapper.py
index 5b74c3b..5051b83 100644
--- a/nova/exception_wrapper.py
+++ b/nova/exception_wrapper.py
@@ -86,6 +86,9 @@ def _get_call_dict(function, self, context, *args, **kw):
     # self can't be serialized and shouldn't be in the
     # payload
     call_dict.pop('self', None)
+    # NOTE(gibi) remove context as well as it contains sensitive information
+    # and it can also contain circular references
+    call_dict.pop('context', None)
     return _cleanse_dict(call_dict)
 
 
diff --git a/nova/locale/cs/LC_MESSAGES/nova.po b/nova/locale/cs/LC_MESSAGES/nova.po
index 954f4ab..d369753 100644
--- a/nova/locale/cs/LC_MESSAGES/nova.po
+++ b/nova/locale/cs/LC_MESSAGES/nova.po
@@ -10,9 +10,9 @@
 # Andreas Jaeger <[e-mail]>, 2016. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: nova 14.0.2.dev16\n"
+"Project-Id-Version: nova 14.0.4.dev59\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2016-10-23 09:20+0000\n"
+"POT-Creation-Date: 2017-02-18 03:18+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -4234,9 +4234,6 @@ msgstr "libguestfs je nainstalováno ale nelze použít (%s)"
 msgid "libguestfs is not installed (%s)"
 msgstr "libguestfs není nainstalováno (%s)"
 
-msgid "libvirt error while requesting blockjob info."
-msgstr "chyba libvirt při žádání informací o práci s blokem."
-
 #, python-format
 msgid "marker [%s] not found"
 msgstr "značka [%s] nenalezena"
diff --git a/nova/locale/de/LC_MESSAGES/nova.po b/nova/locale/de/LC_MESSAGES/nova.po
index 4af7307..36ad13e 100644
--- a/nova/locale/de/LC_MESSAGES/nova.po
+++ b/nova/locale/de/LC_MESSAGES/nova.po
@@ -13,9 +13,9 @@
 # Andreas Jaeger <[e-mail]>, 2016. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: nova 14.0.2.dev16\n"
+"Project-Id-Version: nova 14.0.4.dev59\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2016-10-23 09:20+0000\n"
+"POT-Creation-Date: 2017-02-18 03:18+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -4760,9 +4760,6 @@ msgstr "libguestfs installiert, aber nicht benutzbar (%s)"
 msgid "libguestfs is not installed (%s)"
 msgstr "libguestfs ist nicht installiert (%s)"
 
-msgid "libvirt error while requesting blockjob info."
-msgstr "libvirt-Fehler beim Anfordern der blockjob-Informationen."
-
 #, python-format
 msgid "marker [%s] not found"
 msgstr "Marker [%s] nicht gefunden"
diff --git a/nova/locale/es/LC_MESSAGES/nova.po b/nova/locale/es/LC_MESSAGES/nova.po
index ab71042..8def410 100644
--- a/nova/locale/es/LC_MESSAGES/nova.po
+++ b/nova/locale/es/LC_MESSAGES/nova.po
@@ -14,9 +14,9 @@
 # Andreas Jaeger <[e-mail]>, 2016. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: nova 14.0.2.dev16\n"
+"Project-Id-Version: nova 14.0.4.dev59\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2016-10-23 09:20+0000\n"
+"POT-Creation-Date: 2017-02-18 03:18+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -4664,9 +4664,6 @@ msgstr "libguestfs está instalado pero no puede ser usado (%s)"
 msgid "libguestfs is not installed (%s)"
 msgstr "libguestfs no está nstalado (%s)"
 
-msgid "libvirt error while requesting blockjob info."
-msgstr "error de libvirt al solicitar información de blockjob."
-
 #, python-format
 msgid "marker [%s] not found"
 msgstr "no se ha encontrado el marcador [%s]"
diff --git a/nova/locale/fr/LC_MESSAGES/nova.po b/nova/locale/fr/LC_MESSAGES/nova.po
index 86f72f6..9bd1a96 100644
--- a/nova/locale/fr/LC_MESSAGES/nova.po
+++ b/nova/locale/fr/LC_MESSAGES/nova.po
@@ -25,9 +25,9 @@
 # Andreas Jaeger <[e-mail]>, 2016. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: nova 14.0.2.dev16\n"
+"Project-Id-Version: nova 14.0.4.dev59\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2016-10-23 09:20+0000\n"
+"POT-Creation-Date: 2017-02-18 03:18+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -4676,9 +4676,6 @@ msgstr "libguestfs est installé mais n'est pas utilisable (%s)"
 msgid "libguestfs is not installed (%s)"
 msgstr "libguestfs n'est pas installé (%s)"
 
-msgid "libvirt error while requesting blockjob info."
-msgstr "Erreur de libvirt lors de la demande des informations de blockjob."
-
 #, python-format
 msgid "marker [%s] not found"
 msgstr "le marqueur [%s] est introuvable"
diff --git a/nova/locale/it/LC_MESSAGES/nova.po b/nova/locale/it/LC_MESSAGES/nova.po
index c4b4dfb..d8dbf19 100644
--- a/nova/locale/it/LC_MESSAGES/nova.po
+++ b/nova/locale/it/LC_MESSAGES/nova.po
@@ -11,9 +11,9 @@
 # Andreas Jaeger <[e-mail]>, 2016. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: nova 14.0.2.dev16\n"
+"Project-Id-Version: nova 14.0.4.dev59\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2016-10-23 09:20+0000\n"
+"POT-Creation-Date: 2017-02-18 03:18+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -4632,9 +4632,6 @@ msgstr "libguestfs installato, ma non utilizzabile (%s)"
 msgid "libguestfs is not installed (%s)"
 msgstr "libguestfs non è installato (%s)"
 
-msgid "libvirt error while requesting blockjob info."
-msgstr "errore libvirt durante la richiesta delle informazioni blockjob."
-
 #, python-format
 msgid "marker [%s] not found"
 msgstr "indicatore [%s] non trovato"
diff --git a/nova/locale/ja/LC_MESSAGES/nova.po b/nova/locale/ja/LC_MESSAGES/nova.po
index dee81c9..38e5cac 100644
--- a/nova/locale/ja/LC_MESSAGES/nova.po
+++ b/nova/locale/ja/LC_MESSAGES/nova.po
@@ -11,9 +11,9 @@
 # Andreas Jaeger <[e-mail]>, 2016. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: nova 14.0.2.dev16\n"
+"Project-Id-Version: nova 14.0.4.dev59\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2016-10-23 09:20+0000\n"
+"POT-Creation-Date: 2017-02-18 03:18+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -4612,9 +4612,6 @@ msgstr "libguestfs はインストールされていますが、使用できま�
 msgid "libguestfs is not installed (%s)"
 msgstr "libguestfs がインストールされていません (%s)"
 
-msgid "libvirt error while requesting blockjob info."
-msgstr "blockjob 情報を要求しているときに libvirt エラーが発生しました。"
-
 #, python-format
 msgid "marker [%s] not found"
 msgstr "マーカー [%s] が見つかりません"
diff --git a/nova/locale/ko_KR/LC_MESSAGES/nova.po b/nova/locale/ko_KR/LC_MESSAGES/nova.po
index 21aa3a7..363ecad 100644
--- a/nova/locale/ko_KR/LC_MESSAGES/nova.po
+++ b/nova/locale/ko_KR/LC_MESSAGES/nova.po
@@ -11,9 +11,9 @@
 # Jongwon Lee <[e-mail]>, 2016. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: nova 14.0.2.dev16\n"
+"Project-Id-Version: nova 14.0.4.dev59\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2016-10-23 09:20+0000\n"
+"POT-Creation-Date: 2017-02-18 03:18+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -4743,9 +4743,6 @@ msgstr "libguestfs가 설치되었지만 사용할 수 없음(%s)"
 msgid "libguestfs is not installed (%s)"
 msgstr "libguestfs가 설치되지 않음(%s)"
 
-msgid "libvirt error while requesting blockjob info."
-msgstr "블록 작업 정보를 요청하는 중에 libvirt 오류 발생."
-
 #, python-format
 msgid "marker [%s] not found"
 msgstr "마커 [%s]을(를) 찾을 수 없음"
diff --git a/nova/locale/pt_BR/LC_MESSAGES/nova.po b/nova/locale/pt_BR/LC_MESSAGES/nova.po
index e78a688..c695e7d 100644
--- a/nova/locale/pt_BR/LC_MESSAGES/nova.po
+++ b/nova/locale/pt_BR/LC_MESSAGES/nova.po
@@ -17,9 +17,9 @@
 # Andreas Jaeger <[e-mail]>, 2016. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: nova 14.0.2.dev16\n"
+"Project-Id-Version: nova 14.0.4.dev59\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2016-10-23 09:20+0000\n"
+"POT-Creation-Date: 2017-02-18 03:18+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -4601,9 +4601,6 @@ msgstr "libguestfs instalado, mas não utilizável (%s)"
 msgid "libguestfs is not installed (%s)"
 msgstr "libguestfs não está instalado (%s)"
 
-msgid "libvirt error while requesting blockjob info."
-msgstr "Erro de libvirt ao solicitar informações de blockjob."
-
 #, python-format
 msgid "marker [%s] not found"
 msgstr "marcador [%s] não localizado"
diff --git a/nova/locale/ru/LC_MESSAGES/nova.po b/nova/locale/ru/LC_MESSAGES/nova.po
index 5c01ad6..70c845d 100644
--- a/nova/locale/ru/LC_MESSAGES/nova.po
+++ b/nova/locale/ru/LC_MESSAGES/nova.po
@@ -14,9 +14,9 @@
 # Andreas Jaeger <[e-mail]>, 2016. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: nova 14.0.2.dev16\n"
+"Project-Id-Version: nova 14.0.4.dev59\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2016-10-23 09:20+0000\n"
+"POT-Creation-Date: 2017-02-18 03:18+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -4570,9 +4570,6 @@ msgstr "libguestfs установлена, но ее невозможно исп
 msgid "libguestfs is not installed (%s)"
 msgstr "Не установлена libguestfs (%s)"
 
-msgid "libvirt error while requesting blockjob info."
-msgstr "Ошибка libvirt при запросе информации о blockjob."
-
 #, python-format
 msgid "marker [%s] not found"
 msgstr "маркер [%s] не найден"
diff --git a/nova/locale/tr_TR/LC_MESSAGES/nova.po b/nova/locale/tr_TR/LC_MESSAGES/nova.po
index b9a2bbc..8affc82 100644
--- a/nova/locale/tr_TR/LC_MESSAGES/nova.po
+++ b/nova/locale/tr_TR/LC_MESSAGES/nova.po
@@ -8,9 +8,9 @@
 # Andreas Jaeger <[e-mail]>, 2016. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: nova 14.0.2.dev16\n"
+"Project-Id-Version: nova 14.0.4.dev59\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2016-10-23 09:20+0000\n"
+"POT-Creation-Date: 2017-02-18 03:18+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -3700,9 +3700,6 @@ msgstr "libguestfs kurulu ama kullanılabilir değil (%s)"
 msgid "libguestfs is not installed (%s)"
 msgstr "libguestfs kurulu değil (%s)"
 
-msgid "libvirt error while requesting blockjob info."
-msgstr "blockjob bilgisi istenirken libvirt hatası."
-
 #, python-format
 msgid "marker [%s] not found"
 msgstr " [%s] göstergesi bulunamadı"
diff --git a/nova/locale/zh_CN/LC_MESSAGES/nova.po b/nova/locale/zh_CN/LC_MESSAGES/nova.po
index eac80b5..de47550 100644
--- a/nova/locale/zh_CN/LC_MESSAGES/nova.po
+++ b/nova/locale/zh_CN/LC_MESSAGES/nova.po
@@ -30,16 +30,17 @@
 # English translations for nova.
 # Andreas Jaeger <[e-mail]>, 2016. #zanata
 # zzxwill <[e-mail]>, 2016. #zanata
+# TigerFang <[e-mail]>, 2017. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: nova 14.0.2.dev16\n"
+"Project-Id-Version: nova 14.0.4.dev59\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2016-10-23 09:20+0000\n"
+"POT-Creation-Date: 2017-02-18 03:18+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2016-08-23 02:11+0000\n"
-"Last-Translator: zzxwill <[e-mail]>\n"
+"PO-Revision-Date: 2017-02-27 03:31+0000\n"
+"Last-Translator: TigerFang <[e-mail]>\n"
 "Language: zh-CN\n"
 "Language-Team: Chinese (China)\n"
 "Plural-Forms: nplurals=1; plural=0\n"
@@ -126,6 +127,13 @@ msgid "%(name)s has more than %(max_length)s characters."
 msgstr "%(name)s 包含的字符超过 %(max_length)s 个。"
 
 #, python-format
+msgid ""
+"%(operation)s is not supported in conjunction with the current %(option)s "
+"setting.  Please refer to the nova config-reference."
+msgstr ""
+"在设置了当前的配置项%(option)s时不支持%(operation)s。请参考nova配置手册。"
+
+#, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr "%(path)s 没有在本地存储器上：%(reason)s"
 
@@ -246,6 +254,10 @@ msgid "Action: '%(action)s', calling method: %(meth)s, body: %(body)s"
 msgstr "操作：“%(action)s”，调用方法：%(meth)s，主体：%(body)s"
 
 #, python-format
+msgid "Active live migration for instance %(instance_id)s not found"
+msgstr "无法找到针对实例%(instance_id)s的正在进行的实时迁移"
+
+#, python-format
 msgid "Add metadata failed for aggregate %(id)s after %(retries)s retries"
 msgstr "在%(retries)s尝试后，为聚合%(id)s 添加元数据"
 
@@ -304,6 +316,16 @@ msgid "All hosts are already mapped to cell(s), exiting."
 msgstr "所有主机已映射至单元，正在退出。"
 
 #, python-format
+msgid "Allocation for resource provider '%(rp_uuid)s' that does not exist."
+msgstr "分配给不存在的资源提供者 '%(rp_uuid)s' 。"
+
+#, python-format
+msgid ""
+"Allocation of class '%(class)s' for resource provider '%(rp_uuid)s' invalid: "
+"%(error)s"
+msgstr "为资源提供者'%(rp_uuid)s' 分配类型'%(class)s'失败，详情如下：%(error)s"
+
+#, python-format
 msgid "An invalid 'name' value was provided. The name must be: %(reason)s"
 msgstr "提供了无效“name”值。name 必须为：%(reason)s"
 
@@ -313,6 +335,9 @@ msgstr "发生了一个未知的错误. 请重试你的请求."
 msgid "An unknown exception occurred."
 msgstr "发生未知异常。"
 
+msgid "Another thread concurrently updated the data. Please retry your update"
+msgstr "另外一个进程也在同时更新数据。请您重试"
+
 msgid "Anti-affinity instance group policy was violated."
 msgstr "违反反亲和力实例组策略。"
 
@@ -332,6 +357,10 @@ msgstr ""
 "和内存。"
 
 #, python-format
+msgid "Attaching interfaces is not supported for instance %(instance)s."
+msgstr "无法向实例%(instance)s挂载接口。"
+
+#, python-format
 msgid ""
 "Attempt to consume PCI device %(compute_node_id)s:%(address)s from empty pool"
 msgstr "尝试从空池子中消费PCI设备%(compute_node_id)s:%(address)s"
@@ -347,6 +376,10 @@ msgid "Bad Request - Invalid Parameters"
 msgstr "错误请求——参数无效"
 
 #, python-format
+msgid "Bad inventory %(class)s for resource provider %(rp_uuid)s: %(error)s"
+msgstr "资源提供者%(rp_uuid)s的存量%(class)s无效，详情如下：%(error)s"
+
+#, python-format
 msgid "Bad mac for to_global_ipv6: %s"
 msgstr "错误的to_global_ipv6 mac：%s"
 
@@ -428,6 +461,9 @@ msgstr "块设备映射无效：未能获取快照 %(id)s。"
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr "块设备映射无效：未能获取卷 %(id)s。"
 
+msgid "Block device tags are not yet supported."
+msgstr "暂不支持块设备标签。"
+
 msgid "Block migration can not be used with shared storage."
 msgstr "块存储迁移无法在共享存储使用"
 
@@ -479,6 +515,25 @@ msgstr "CPU 编号 %(cpuset)s 未分配为任何节点"
 msgid "CPU pinning is not supported by the host: %(reason)s"
 msgstr "主机不支持CPU 绑定：%(reason)s"
 
+#, python-format
+msgid "CPU set to pin %(requested)s must be a subset of free CPU set %(free)s"
+msgstr "要绑定的CPU值%(requested)s必须是可用CPU值%(free)s的子集"
+
+#, python-format
+msgid ""
+"CPU set to pin %(requested)s must be a subset of known CPU set %(cpuset)s"
+msgstr "要绑定的CPU值%(requested)s必须是已知CPU值%(cpuset)s的子集"
+
+#, python-format
+msgid ""
+"CPU set to unpin %(requested)s must be a subset of known CPU set %(cpuset)s"
+msgstr "取消绑定的CPU值%(requested)s必须是已知的CPU值%(cpuset)s的子集"
+
+#, python-format
+msgid ""
+"CPU set to unpin %(requested)s must be a subset of pinned CPU set %(pinned)s"
+msgstr "取消绑定的CPU值%(requested)s必须是已经绑定的CPU值%(pinned)s的子集"
+
 msgid "Can not add access to a public flavor."
 msgstr "不能添加访问到公共云主机类型。"
 
@@ -496,6 +551,9 @@ msgstr "只能再多运行 %s 个此类型的实例。"
 msgid "Can't detach root device volume"
 msgstr "不能断开root设备卷"
 
+msgid "Can't force to a non-provided destination"
+msgstr "无法强制到一个未指定的目标"
+
 msgid "Can't resize a disk to 0 GB."
 msgstr "不能调整磁盘到0GB."
 
@@ -666,6 +724,10 @@ msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr "找不到类 %(class_name)s ：异常 %(exception)s"
 
 #, python-format
+msgid "Client exception during Migration Pre check: %(reason)s"
+msgstr "在迁移预检查的过程中出现客户端错误，原因是：%(reason)s"
+
+#, python-format
 msgid ""
 "Command Not supported. Please use Ironic command %(cmd)s to perform this "
 "action."
@@ -949,6 +1011,14 @@ msgid ""
 "the project %(project_id)s."
 msgstr "网络uuid %(network_uuid)s不存在或者没有分配到项目%(project_id)s。"
 
+msgid ""
+"Ephemeral disks requested are larger than the instance type allows. If no "
+"size is given in one block device mapping, flavor ephemeral size will be "
+"used."
+msgstr ""
+"请求的临时磁盘大小比实例类型允许值要大。在一个块存储设备进行映射时，如果磁盘"
+"的大小没有给出，则会使用配置类型中的大小值。"
+
 #, python-format
 msgid "Error attempting to run %(method)s"
 msgstr "尝试运行 %(method)s 时出错"
@@ -1213,6 +1283,10 @@ msgstr "无法终止云主机：%(reason)s"
 msgid "Failed to unplug vif %s"
 msgstr "拔除 vif %s 失败"
 
+#, python-format
+msgid "Failed to unplug virtual interface: %(reason)s"
+msgstr "移除虚拟接口失败:%(reason)s"
+
 msgid "Failure prepping block device."
 msgstr "准备块设备失败。"
 
@@ -1422,6 +1496,9 @@ msgstr "剩余%(type)s %(free).02f %(unit)s<请求%(requested)d %(unit)s"
 msgid "Group not valid. Reason: %(reason)s"
 msgstr "组无效。原因：%(reason)s"
 
+msgid "Guest agent is not enabled for the instance"
+msgstr "实例中的客户代理没有启用"
+
 msgid "Guest does not have a console available."
 msgstr "访客没有可用控制台。"
 
@@ -1736,6 +1813,9 @@ msgstr "实例已处于救援模式：%s"
 msgid "Instance is not a member of specified network"
 msgstr "实例并不是指定网络的成员"
 
+msgid "Instance network is not ready yet"
+msgstr "实例的网络尚未就绪"
+
 msgid "Instance recreate is not supported."
 msgstr "不支持实例重创建"
 
@@ -1840,6 +1920,9 @@ msgstr "控制台类型 %(console_type)s 无效"
 msgid "Invalid content type %(content_type)s."
 msgstr "无效的内容类型 %(content_type)s。"
 
+msgid "Invalid data supplied to HashRing.get_hosts."
+msgstr "对 HashRing.get_hosts 提供的数据无效。"
+
 #, python-format
 msgid "Invalid datetime string: %(reason)s"
 msgstr "日期字符串无效：  %(reason)s"
@@ -1875,6 +1958,9 @@ msgstr "请求中无效固定IP地址%s"
 msgid "Invalid floating IP %s in request"
 msgstr "请求中无效浮动IP %s"
 
+msgid "Invalid hosts supplied when building HashRing."
+msgstr "在创建HashRing时提供的主机不正确。"
+
 #, python-format
 msgid "Invalid id: %(instance_id)s (expecting \"i-...\")"
 msgstr "无效id：%(instance_id)s (期望 \"i-...\")"
@@ -1911,6 +1997,15 @@ msgid "Invalid instance image."
 msgstr "无效实例镜像。"
 
 #, python-format
+msgid ""
+"Invalid inventory for '%(resource_class)s' on resource provider "
+"'%(resource_provider)s'. The reserved value is greater than or equal to "
+"total."
+msgstr ""
+"资源提供者'%(resource_provider)s'上的'%(resource_class)s'清单无效。预留值大于"
+"或者等于总值。"
+
+#, python-format
 msgid "Invalid is_public filter [%s]"
 msgstr "is_public 过滤器 [%s] 无效"
 
@@ -1937,6 +2032,10 @@ msgid "Invalid metadata: %(reason)s"
 msgstr "元数据无效：  %(reason)s"
 
 #, python-format
+msgid "Invalid microversion: %(error)s"
+msgstr "微转化无效详情如下：%(error)s"
+
+#, python-format
 msgid "Invalid minDisk filter [%s]"
 msgstr "minDisk 过滤器 [%s] 无效"
 
@@ -1998,6 +2097,9 @@ msgstr "开始时间无效。开始时间不能出现在结束时间之后。"
 msgid "Invalid state of instance files on shared storage"
 msgstr "共享存储器上实例文件的状态无效"
 
+msgid "Invalid status value"
+msgstr "状态值无效"
+
 msgid "Invalid target_lun"
 msgstr "无效 target_lun"
 
@@ -2051,6 +2153,23 @@ msgid "Invalid volume_size."
 msgstr "无效volume_size."
 
 #, python-format
+msgid "Inventory changed while attempting to allocate: %(error)s"
+msgstr "在进行分配时存量发现改变，详情如下：%(error)s"
+
+#, python-format
+msgid ""
+"Inventory for '%(resource_class)s' on resource provider "
+"'%(resource_provider)s' invalid."
+msgstr "资源提供者'%(resource_provider)s'上的'%(resource_class)s'清单无效。"
+
+#, python-format
+msgid ""
+"Inventory for '%(resource_classes)s' on resource provider "
+"'%(resource_provider)s' in use."
+msgstr ""
+"资源提供者'%(resource_provider)s'上的'%(resource_classes)s'清单正在使用中。"
+
+#, python-format
 msgid "Ironic node uuid not supplied to driver for instance %s."
 msgstr "Ironic节点uuid不提供实例 %s的驱动。"
 
@@ -2069,6 +2188,10 @@ msgid ""
 msgstr "在外部网络%(network_uuid)s创建一个接口是不允许的"
 
 #, python-format
+msgid "JSON does not validate: %(error)s"
+msgstr "未验证的JSON文件，详情如下：%(error)s"
+
+#, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d bytes"
 msgstr "内核/内存盘镜像太大：%(vdi_size)d 字节，最大 %(max_size)d 字节"
@@ -2104,6 +2227,9 @@ msgstr "密钥对必须是字符串，并且长度在1到255个字符"
 msgid "Last %s nova syslog entries:-"
 msgstr "最近的nova 系统日志nova syslog 输出 %s:-"
 
+msgid "Libguestfs does not have permission to read host kernel."
+msgstr "Libguestfs没有权限读取主机内核"
+
 msgid "Limit"
 msgstr "限制"
 
@@ -2143,6 +2269,10 @@ msgid ""
 msgstr "使用 API V2.25 进行的实时迁移要求所有 Mitaka 升级完成才可用。"
 
 #, python-format
+msgid "Malformed JSON: %(error)s"
+msgstr "JSON格式错误，详情如下：%(error)s"
+
+#, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr "错误格式的消息体： %(reason)s"
 
@@ -2186,6 +2316,10 @@ msgstr "超过端口的最大数"
 msgid "Maximum number of security groups or rules exceeded"
 msgstr "已超过最大安全组数或最大规则数"
 
+#, python-format
+msgid "Maximum number of serial port exceeds %(allowed)d for %(virt_type)s"
+msgstr "超出最大串行端口限制，允许值为%(allowed)d，请求值为%(virt_type)s"
+
 msgid "Metadata item was not found"
 msgstr "元数据项目未找到"
 
@@ -2400,6 +2534,9 @@ msgstr "网络驱动程序不支持此功能。"
 msgid "Network host %(host)s has zero fixed IPs in network %(network_id)s."
 msgstr "网络主机 %(host)s 在网络 %(network_id)s 中没有固定 IP。"
 
+msgid "Network interface tags are not yet supported."
+msgstr "暂不支持网络接口标签。"
+
 #, python-format
 msgid ""
 "Network must be disassociated from project %(project_id)s before it can be "
@@ -2418,6 +2555,9 @@ msgstr "网络需要关联的 port_security_enabled 和子网，以便应用安�
 msgid "Network set host failed for network %(network_id)s."
 msgstr "网络为网络%(network_id)s设置主机失败。"
 
+msgid "Networking client is experiencing an unauthorized exception."
+msgstr "网络客户端正在发生一项非授权的异常。"
+
 msgid "New volume must be detached in order to swap."
 msgstr "为了进行交换，新卷必须断开。"
 
@@ -2442,6 +2582,10 @@ msgstr "在协议nnection_info中没有access_url。不能验证协议"
 msgid "No agent-build associated with id %(id)s."
 msgstr "不存在任何与标识 %(id)s 关联的代理构建。"
 
+#, python-format
+msgid "No allocations for consumer '%(consumer_uuid)s'"
+msgstr "消耗者'%(consumer_uuid)s'没有被分配的资源"
+
 msgid "No cell given in routing path."
 msgstr "在路由路径中未给定单元。"
 
@@ -2604,6 +2748,12 @@ msgid ""
 "Not all Virtual Functions of PF %(compute_node_id)s:%(address)s are free."
 msgstr "并非 PF %(compute_node_id)s:%(address)s 的所有虚拟功能都可用。"
 
+msgid "Not all aggregates have been migrated to the API database"
+msgstr "迁移到API数据库的主机组不完整"
+
+msgid "Not all flavors have been migrated to the API database"
+msgstr "迁移到API数据库的配置信息不完整"
+
 msgid "Not an rbd snapshot"
 msgstr "不是 rbd 快照"
 
@@ -2662,6 +2812,10 @@ msgstr "旧卷绑定到一个不同的实例。"
 msgid "One or more hosts already in availability zone(s) %s"
 msgstr "在可用区域%s中，已经有一个或多个主机"
 
+#, python-format
+msgid "Only %(type)s is provided"
+msgstr "只提供了%(type)s"
+
 msgid "Only administrators may list deleted instances"
 msgstr "仅管理员可列示已删除的实例"
 
@@ -2793,6 +2947,10 @@ msgid "Plugin version mismatch (Expected %(exp)s, got %(got)s)"
 msgstr "插件版本不匹配 (预期 %(exp)s，获取 %(got)s)"
 
 #, python-format
+msgid "Pointer model '%(model)s' requested is not supported by host."
+msgstr "主机不支持请求的指针模型'%(model)s'"
+
+#, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr "政策不允许 %(action)s 被执行。"
 
@@ -2826,6 +2984,10 @@ msgid "Port id %(port_id)s could not be found."
 msgstr "找不到端口标识 %(port_id)s。"
 
 #, python-format
+msgid "Port update failed for port %(port_id)s: %(reason)s"
+msgstr "对端口%(port_id)s的更新失败，原因是：%(reason)s"
+
+#, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr "项目 %(project_id)s 没有找到。"
 
@@ -2934,6 +3096,17 @@ msgid "Quota usage for project %(project_id)s could not be found."
 msgstr "找不到项目 %(project_id)s 的配额使用量。"
 
 #, python-format
+msgid ""
+"Quota usage refresh of resource %(resource)s for project %(project_id)s, "
+"user %(user_id)s, is not allowed. The allowed resources are %(syncable)s."
+msgstr ""
+"不允许对项目%(project_id)s中用户%(user_id)s的资源%(resource)s配额使用率进行刷"
+"新。允许使用的资源是%(syncable)s。"
+
+msgid "RPC is pinned to old version"
+msgstr "RPC版本过老"
+
+#, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr "已达到尝试拔出 VBD %s 的最大重试次数"
 
@@ -3032,6 +3205,13 @@ msgstr "不允许将云主机类型的磁盘大小缩减为零。"
 msgid "Resource could not be found."
 msgstr "资源没有找到。"
 
+#, python-format
+msgid "Resource provider '%(rp_uuid)s' not found: %(error)s"
+msgstr "无法找到资源提供者 '%(rp_uuid)s' ,详情如下：%(error)s"
+
+msgid "Resource provider has allocations."
+msgstr "资源提供者已经分配。"
+
 msgid "Resumed"
 msgstr "已恢复"
 
@@ -3143,6 +3323,10 @@ msgid "Security group with rule %(rule_id)s not found."
 msgstr "带有规则 %(rule_id)s 的安全组没有找到。"
 
 #, python-format
+msgid "Server %(server_id)s has no tag '%(tag)s'"
+msgstr "服务器%(server_id)s上未发现标签'%(tag)s'"
+
+#, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr "由于: %(reason)s，实例磁盘空间不能修改"
 
@@ -3237,6 +3421,14 @@ msgstr "分类大小超过分类关键值大小"
 msgid "Sort key supplied was not valid."
 msgstr "提供的排序键无效。"
 
+#, python-format
+msgid ""
+"Specified Fixed IP '%(addr)s' cannot be used with port '%(port)s': the two "
+"cannot be specified together."
+msgstr ""
+"指定的固定IP地址'%(addr)s'无法使用在接口'%(port)s'上，原因是：这两者无法同时"
+"指定。"
+
 msgid "Specified fixed address not assigned to instance"
 msgstr "指定的固定IP地址没有分配给实例"
 
@@ -3276,6 +3468,28 @@ msgid "Table"
 msgstr "表"
 
 #, python-format
+msgid ""
+"Tag '%(tag)s' is invalid. It must be a string without characters '/' and "
+"','. Validation error message: %(err)s"
+msgstr ""
+"标签 '%(tag)s' 无效。它必须是字符串，且不能包含‘/’和‘,’。验证错误相关的情况"
+"为：%(err)s"
+
+#, python-format
+msgid "Tag '%(tag)s' is too long. Maximum length of a tag is %(length)d"
+msgstr "标签'%(tag)s'过长。最大的标签长度是%(length)d"
+
+#, python-format
+msgid "Tags %(tags)s are too long. Maximum length of a tag is %(length)d"
+msgstr "标签%(tags)s过长。标签的最大长度为%(length)d"
+
+#, python-format
+msgid ""
+"Tags '%s' are invalid. Each tag must be a string without characters '/' and "
+"','."
+msgstr "标签 '%s'无效。标签必须是不包含‘/’和‘,’的字符串。"
+
+#, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr "任务 %(task_name)s 已在主机 %(host)s 上运行"
 
@@ -3327,10 +3541,24 @@ msgstr "在后台，缺省的PBM策略不存在。"
 msgid "The firewall filter for %s does not exist"
 msgstr "%s 的防火墙过滤器不存在"
 
+#, python-format
+msgid ""
+"The fixed IP associated with port %(port_id)s is not compatible with the "
+"host."
+msgstr "端口%(port_id)s对应的固定IP地址无法与主机适配。"
+
 msgid "The floating IP request failed with a BadRequest"
 msgstr "由于坏的请求，浮动IP请求失败"
 
 #, python-format
+msgid ""
+"The format of the option 'reserved_huge_pages' is invalid. (found "
+"'%(conf)s') Please refer to the nova config-reference."
+msgstr ""
+"配置项'reserved_huge_pages'的格式不正确。（配置内容为'%(conf)s'）请参照nova配"
+"置说明手册。"
+
+#, python-format
 msgid "The group %(group_name)s must be configured with an id."
 msgstr "组%(group_name)s必须配置一个id。"
 
@@ -3351,6 +3579,10 @@ msgid "The key %s is required in all file system descriptions."
 msgstr "在所有文件系统描述中，关键字%s是必须的。"
 
 #, python-format
+msgid "The media type %(bad_type)s is not supported, use %(good_type)s"
+msgstr "不支持%(bad_type)s这个媒体类型，请使用%(good_type)s"
+
+#, python-format
 msgid ""
 "The metadata for this location will not work with this module %(module)s.  "
 "%(reason)s."
@@ -3360,6 +3592,9 @@ msgstr "这个定位的元数据与模块%(module)s不能正常工作。%(reason
 msgid "The method %(method_name)s is not implemented."
 msgstr "方法%(method_name)s没有实现。"
 
+msgid "The method specified is not allowed for this resource."
+msgstr "指定的方法无权使用在这个资源上。"
+
 #, python-format
 msgid "The module %(module)s is misconfigured: %(reason)s."
 msgstr "模块%(module)s配置错误：%(reason)s。"
@@ -3381,17 +3616,39 @@ msgid ""
 msgstr ""
 "网络范围不够大，无法容纳 %(num_networks)s 个网络。网络大小为 %(network_size)s"
 
+msgid "The networks quota is disabled"
+msgstr "网络配额被禁用"
+
 #, python-format
 msgid "The number of defined ports: %(ports)d is over the limit: %(quota)d"
 msgstr "定义的端口数量：%(ports)d 超过限制：%(quota)d"
 
+#, python-format
+msgid ""
+"The number of tags exceeded the per-server limit %(max)d. The number of tags "
+"in request is %(count)d."
+msgstr "标签数量超过了保护限制%(max)d。请求的标签数量是%(count)d。"
+
+#, python-format
+msgid "The number of tags exceeded the per-server limit %d"
+msgstr "标签数量超过了保护限制，上限数量为%d"
+
 msgid "The only partition should be partition 1."
 msgstr "唯一的分区应该是分区1。"
 
 #, python-format
+msgid ""
+"The property 'numa_nodes' cannot be '%(nodes)s'. It must be a number greater "
+"than 0"
+msgstr " 'numa_nodes' 的属性不能是'%(nodes)s'。它必须是一个比0大的数"
+
+#, python-format
 msgid "The provided RNG device path: (%(path)s) is not present on the host."
 msgstr "主机上不存在提供的RNG设备路径：(%(path)s)。"
 
+msgid "The regex for server name is incorrect"
+msgstr "服务器名称的正则表达式不正确"
+
 msgid "The request body can't be empty"
 msgstr "请求题不能为空"
 
@@ -3583,6 +3840,10 @@ msgid "UUID is required to delete Neutron Networks"
 msgstr "删除Neutron网络需要UUID"
 
 #, python-format
+msgid "Unable to allocate inventory: %(error)s"
+msgstr "无法确定存量，详情如下： %(error)s"
+
+#, python-format
 msgid ""
 "Unable to associate floating IP %(address)s to any fixed IPs for instance "
 "%(id)s. Instance has no fixed IPv4 addresses to associate."
@@ -3601,6 +3862,10 @@ msgstr ""
 msgid "Unable to authenticate Ironic client."
 msgstr "不能认证Ironic客户端。"
 
+#, python-format
+msgid "Unable to automatically allocate a network for project %(project_id)s"
+msgstr "无法为项目%(project_id)s自动分配一个网络"
+
 msgid ""
 "Unable to claim IP for VPN instances, ensure it isn't running, and try again "
 "in a few minutes"
@@ -3619,6 +3884,14 @@ msgid "Unable to convert image to raw: %(exp)s"
 msgstr "无法将镜像转换为原始格式：%(exp)s"
 
 #, python-format
+msgid ""
+"Unable to create allocation for '%(resource_class)s' on resource provider "
+"'%(resource_provider)s'. The requested amount would exceed the capacity."
+msgstr ""
+"无法在资源提供者'%(resource_provider)s'上分配'%(resource_class)s'。请求的数量"
+"已经超过可用的总量。"
+
+#, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "无法删除系统组“%s”"
 
@@ -3972,6 +4245,11 @@ msgid ""
 msgstr ""
 "API不支持版本%(req_ver)s。小版本号是%(min_ver)s，大版本号是%(max_ver)s。"
 
+#, python-format
+msgid ""
+"Version of %(name)s %(min_ver)s %(max_ver)s intersects with another versions."
+msgstr "%(name)s %(min_ver)s %(max_ver)s的版本会取代其它版本。"
+
 msgid "Virtual Interface creation failed"
 msgstr "虚拟接口创建失败"
 
@@ -4140,6 +4418,9 @@ msgstr "没有浮动 IP。"
 msgid "admin password can't be changed on existing disk"
 msgstr "无法在现有磁盘上更改管理员密码"
 
+msgid "admin required"
+msgstr "需要管理员身份"
+
 msgid "aggregate deleted"
 msgstr "删除的聚合"
 
@@ -4164,6 +4445,9 @@ msgstr "连接信息：%s"
 msgid "connecting to: %(host)s:%(port)s"
 msgstr "连接到：%(host)s:%(port)s"
 
+msgid "content-type header required"
+msgstr "需要content-type头文件信息"
+
 #, python-format
 msgid "destination is %(target_cell)s but routing_path is %(routing_path)s"
 msgstr "目标为 %(target_cell)s，但是 routing_path 为 %(routing_path)s"
@@ -4293,9 +4577,6 @@ msgstr "libguestfs安装了，但是不可用(%s)"
 msgid "libguestfs is not installed (%s)"
 msgstr "libguestfs没有安装 (%s)"
 
-msgid "libvirt error while requesting blockjob info."
-msgstr "当请求blockjob 信息时，libvirt出错"
-
 #, python-format
 msgid "marker [%s] not found"
 msgstr "没有找到标记 [%s]"
diff --git a/nova/locale/zh_TW/LC_MESSAGES/nova.po b/nova/locale/zh_TW/LC_MESSAGES/nova.po
index 3913043..c1fc35c 100644
--- a/nova/locale/zh_TW/LC_MESSAGES/nova.po
+++ b/nova/locale/zh_TW/LC_MESSAGES/nova.po
@@ -10,9 +10,9 @@
 # Andreas Jaeger <[e-mail]>, 2016. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: nova 14.0.2.dev16\n"
+"Project-Id-Version: nova 14.0.4.dev59\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2016-10-23 09:20+0000\n"
+"POT-Creation-Date: 2017-02-18 03:18+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -4276,9 +4276,6 @@ msgstr "libguestfs 已安裝，但卻無法使用 (%s)"
 msgid "libguestfs is not installed (%s)"
 msgstr "未安裝 libguestfs (%s)"
 
-msgid "libvirt error while requesting blockjob info."
-msgstr "要求 blockjob 資訊時發生 libVirt 錯誤。"
-
 #, python-format
 msgid "marker [%s] not found"
 msgstr "找不到標記 [%s]"
diff --git a/nova/network/neutronv2/api.py b/nova/network/neutronv2/api.py
index 5c41c87..9eac724 100644
--- a/nova/network/neutronv2/api.py
+++ b/nova/network/neutronv2/api.py
@@ -1284,7 +1284,7 @@ class API(base_api.NetworkAPI):
         return network_model.NetworkInfo.hydrate(nw_info)
 
     def _gather_port_ids_and_networks(self, context, instance, networks=None,
-                                      port_ids=None):
+                                      port_ids=None, neutron=None):
         """Return an instance's complete list of port_ids and networks."""
 
         if ((networks is None and port_ids is not None) or
@@ -1303,7 +1303,7 @@ class API(base_api.NetworkAPI):
         if networks is None:
             networks = self._get_available_networks(context,
                                                     instance.project_id,
-                                                    net_ids)
+                                                    net_ids, neutron)
         # an interface was added/removed from instance.
         else:
 
@@ -2050,8 +2050,8 @@ class API(base_api.NetworkAPI):
             network_IPs.append(fixed)
         return network_IPs
 
-    def _nw_info_get_subnets(self, context, port, network_IPs):
-        subnets = self._get_subnets_from_port(context, port)
+    def _nw_info_get_subnets(self, context, port, network_IPs, client=None):
+        subnets = self._get_subnets_from_port(context, port, client)
         for subnet in subnets:
             subnet['ips'] = [fixed_ip for fixed_ip in network_IPs
                              if fixed_ip.is_in_subnet(subnet)]
@@ -2168,7 +2168,7 @@ class API(base_api.NetworkAPI):
         current_neutron_ports = data.get('ports', [])
         nw_info_refresh = networks is None and port_ids is None
         networks, port_ids = self._gather_port_ids_and_networks(
-                context, instance, networks, port_ids)
+                context, instance, networks, port_ids, client)
         nw_info = network_model.NetworkInfo()
 
         if preexisting_port_ids is None:
@@ -2193,7 +2193,7 @@ class API(base_api.NetworkAPI):
                                                     current_neutron_port)
                 subnets = self._nw_info_get_subnets(context,
                                                     current_neutron_port,
-                                                    network_IPs)
+                                                    network_IPs, client)
 
                 devname = "tap" + current_neutron_port['id']
                 devname = devname[:network_model.NIC_NAME_LEN]
@@ -2226,7 +2226,7 @@ class API(base_api.NetworkAPI):
 
         return nw_info
 
-    def _get_subnets_from_port(self, context, port):
+    def _get_subnets_from_port(self, context, port, client=None):
         """Return the subnets for a given port."""
 
         fixed_ips = port['fixed_ips']
@@ -2237,8 +2237,10 @@ class API(base_api.NetworkAPI):
         # related to the port. To avoid this, the method returns here.
         if not fixed_ips:
             return []
+        if not client:
+            client = get_client(context)
         search_opts = {'id': [ip['subnet_id'] for ip in fixed_ips]}
-        data = get_client(context).list_subnets(**search_opts)
+        data = client.list_subnets(**search_opts)
         ipam_subnets = data.get('subnets', [])
         subnets = []
 
@@ -2252,7 +2254,7 @@ class API(base_api.NetworkAPI):
             # attempt to populate DHCP server field
             search_opts = {'network_id': subnet['network_id'],
                            'device_owner': 'network:dhcp'}
-            data = get_client(context).list_ports(**search_opts)
+            data = client.list_ports(**search_opts)
             dhcp_ports = data.get('ports', [])
             for p in dhcp_ports:
                 for ip_pair in p['fixed_ips']:
diff --git a/nova/objects/resource_provider.py b/nova/objects/resource_provider.py
index 2e02ede..3036a4f 100644
--- a/nova/objects/resource_provider.py
+++ b/nova/objects/resource_provider.py
@@ -657,9 +657,14 @@ def _check_capacity_exceeded(conn, allocs):
     the inventories involved having their capacity exceeded.
 
     Raises an InvalidAllocationCapacityExceeded exception if any inventory
-    would be exhausted by the allocation. If no inventories would be exceeded
-    by the allocation, the function returns a list of `ResourceProvider`
-    objects that contain the generation at the time of the check.
+    would be exhausted by the allocation. Raises an
+    InvalidAllocationConstraintsViolated exception if any of the `step_size`,
+    `min_unit` or `max_unit` constraints in an inventory will be violated
+    by any one of the allocations.
+
+    If no inventories would be exceeded or violated by the allocations, the
+    function returns a list of `ResourceProvider` objects that contain the
+    generation at the time of the check.
 
     :param conn: SQLalchemy Connection object to use
     :param allocs: List of `Allocation` objects to check
@@ -718,6 +723,9 @@ def _check_capacity_exceeded(conn, allocs):
         _INV_TBL.c.total,
         _INV_TBL.c.reserved,
         _INV_TBL.c.allocation_ratio,
+        _INV_TBL.c.min_unit,
+        _INV_TBL.c.max_unit,
+        _INV_TBL.c.step_size,
         usage.c.used,
     ]
 
@@ -749,6 +757,28 @@ def _check_capacity_exceeded(conn, allocs):
         usage = usage_map[key]
         amount_needed = alloc.used
         allocation_ratio = usage['allocation_ratio']
+        min_unit = usage['min_unit']
+        max_unit = usage['max_unit']
+        step_size = usage['step_size']
+
+        # check min_unit, max_unit, step_size
+        if (amount_needed < min_unit or amount_needed > max_unit or
+                amount_needed % step_size != 0):
+            LOG.warning(
+                _LW("Allocation for %(rc)s on resource provider %(rp)s "
+                    "violates min_unit, max_unit, or step_size. "
+                    "Requested: %(requested)s, min_unit: %(min_unit)s, "
+                    "max_unit: %(max_unit)s, step_size: %(step_size)s"),
+                {'rc': alloc.resource_class,
+                 'rp': rp_uuid,
+                 'requested': amount_needed,
+                 'min_unit': min_unit,
+                 'max_unit': max_unit,
+                 'step_size': step_size})
+            raise exception.InvalidAllocationConstraintsViolated(
+                resource_class=alloc.resource_class,
+                resource_provider=rp_uuid)
+
         # usage["used"] can be returned as None
         used = usage['used'] or 0
         capacity = (usage['total'] - usage['reserved']) * allocation_ratio
diff --git a/nova/scheduler/client/report.py b/nova/scheduler/client/report.py
index 141ec37..dbfecdc 100644
--- a/nova/scheduler/client/report.py
+++ b/nova/scheduler/client/report.py
@@ -14,6 +14,7 @@
 #    under the License.
 
 import functools
+import re
 import time
 
 from keystoneauth1 import exceptions as ks_exc
@@ -32,6 +33,8 @@ LOG = logging.getLogger(__name__)
 VCPU = fields.ResourceClass.VCPU
 MEMORY_MB = fields.ResourceClass.MEMORY_MB
 DISK_GB = fields.ResourceClass.DISK_GB
+_RE_INV_IN_USE = re.compile("Inventory for (.+) on resource provider "
+                            "(.+) in use")
 WARN_EVERY = 10
 
 
@@ -74,6 +77,80 @@ def safe_connect(f):
     return wrapper
 
 
+def _compute_node_to_inventory_dict(compute_node):
+    """Given a supplied `objects.ComputeNode` object, return a dict, keyed
+    by resource class, of various inventory information.
+
+    :param compute_node: `objects.ComputeNode` object to translate
+    """
+    result = {}
+
+    # NOTE(jaypipes): Ironic virt driver will return 0 values for vcpus,
+    # memory_mb and disk_gb if the Ironic node is not available/operable
+    if compute_node.vcpus > 0:
+        result[VCPU] = {
+            'total': compute_node.vcpus,
+            'reserved': 0,
+            'min_unit': 1,
+            'max_unit': compute_node.vcpus,
+            'step_size': 1,
+            'allocation_ratio': compute_node.cpu_allocation_ratio,
+        }
+    if compute_node.memory_mb > 0:
+        result[MEMORY_MB] = {
+            'total': compute_node.memory_mb,
+            'reserved': CONF.reserved_host_memory_mb,
+            'min_unit': 1,
+            'max_unit': compute_node.memory_mb,
+            'step_size': 1,
+            'allocation_ratio': compute_node.ram_allocation_ratio,
+        }
+    if compute_node.local_gb > 0:
+        result[DISK_GB] = {
+            'total': compute_node.local_gb,
+            'reserved': CONF.reserved_host_disk_mb * 1024,
+            'min_unit': 1,
+            'max_unit': compute_node.local_gb,
+            'step_size': 1,
+            'allocation_ratio': compute_node.disk_allocation_ratio,
+        }
+    return result
+
+
+def _instance_to_allocations_dict(instance):
+    """Given an `objects.Instance` object, return a dict, keyed by resource
+    class of the amount used by the instance.
+
+    :param instance: `objects.Instance` object to translate
+    """
+    # NOTE(danms): Boot-from-volume instances consume no local disk
+    is_bfv = compute_utils.is_volume_backed_instance(instance._context,
+                                                     instance)
+    disk = ((0 if is_bfv else instance.flavor.root_gb) +
+            instance.flavor.swap +
+            instance.flavor.ephemeral_gb)
+    alloc_dict = {
+        MEMORY_MB: instance.flavor.memory_mb,
+        VCPU: instance.flavor.vcpus,
+        DISK_GB: disk,
+    }
+    # Remove any zero allocations.
+    return {key: val for key, val in alloc_dict.items() if val}
+
+
+def _extract_inventory_in_use(body):
+    """Given an HTTP response body, extract the resource classes that were
+    still in use when we tried to delete inventory.
+
+    :returns: String of resource classes or None if there was no InventoryInUse
+              error in the response body.
+    """
+    match = _RE_INV_IN_USE.search(body)
+    if match:
+        return match.group(1)
+    return None
+
+
 class SchedulerReportClient(object):
     """Client class for updating the scheduler."""
 
@@ -174,7 +251,7 @@ class SchedulerReportClient(object):
             return objects.ResourceProvider(
                     uuid=uuid,
                     name=name,
-                    generation=1,
+                    generation=0,
             )
         elif resp.status_code == 409:
             # Another thread concurrently created a resource provider with the
@@ -225,89 +302,71 @@ class SchedulerReportClient(object):
         self._resource_providers[uuid] = rp
         return rp
 
-    def _compute_node_inventory(self, compute_node):
-        inventories = {
-            'VCPU': {
-                'total': compute_node.vcpus,
-                'reserved': 0,
-                'min_unit': 1,
-                'max_unit': 1,
-                'step_size': 1,
-                'allocation_ratio': compute_node.cpu_allocation_ratio,
-            },
-            'MEMORY_MB': {
-                'total': compute_node.memory_mb,
-                'reserved': CONF.reserved_host_memory_mb,
-                'min_unit': 1,
-                'max_unit': 1,
-                'step_size': 1,
-                'allocation_ratio': compute_node.ram_allocation_ratio,
-            },
-            'DISK_GB': {
-                'total': compute_node.local_gb,
-                'reserved': CONF.reserved_host_disk_mb * 1024,
-                'min_unit': 1,
-                'max_unit': 1,
-                'step_size': 1,
-                'allocation_ratio': compute_node.disk_allocation_ratio,
-            },
-        }
-        data = {
-            'inventories': inventories,
-        }
-        return data
-
-    def _get_inventory(self, compute_node):
-        url = '/resource_providers/%s/inventories' % compute_node.uuid
+    def _get_inventory(self, rp_uuid):
+        url = '/resource_providers/%s/inventories' % rp_uuid
         result = self.get(url)
         if not result:
             return {'inventories': {}}
         return result.json()
 
-    def _update_inventory_attempt(self, compute_node):
-        """Update the inventory for this compute node if needed.
-
-        :param compute_node: The objects.ComputeNode for the operation
-        :returns: True if the inventory was updated (or did not need to be),
-                  False otherwise.
+    def _get_inventory_and_update_provider_generation(self, rp_uuid):
+        """Helper method that retrieves the current inventory for the supplied
+        resource provider according to the placement API. If the cached
+        generation of the resource provider is not the same as the generation
+        returned from the placement API, we update the cached generation.
         """
-        data = self._compute_node_inventory(compute_node)
-        curr = self._get_inventory(compute_node)
+        curr = self._get_inventory(rp_uuid)
 
         # Update our generation immediately, if possible. Even if there
         # are no inventories we should always have a generation but let's
         # be careful.
         server_gen = curr.get('resource_provider_generation')
         if server_gen:
-            my_rp = self._resource_providers[compute_node.uuid]
+            my_rp = self._resource_providers[rp_uuid]
             if server_gen != my_rp.generation:
                 LOG.debug('Updating our resource provider generation '
                           'from %(old)i to %(new)i',
                           {'old': my_rp.generation,
                            'new': server_gen})
             my_rp.generation = server_gen
+        return curr
+
+    def _update_inventory_attempt(self, rp_uuid, inv_data):
+        """Update the inventory for this resource provider if needed.
+
+        :param rp_uuid: The resource provider UUID for the operation
+        :param inv_data: The new inventory for the resource provider
+        :returns: True if the inventory was updated (or did not need to be),
+                  False otherwise.
+        """
+        curr = self._get_inventory_and_update_provider_generation(rp_uuid)
 
         # Check to see if we need to update placement's view
-        if data['inventories'] == curr.get('inventories', {}):
+        if inv_data == curr.get('inventories', {}):
             return True
 
-        data['resource_provider_generation'] = (
-            self._resource_providers[compute_node.uuid].generation)
-        url = '/resource_providers/%s/inventories' % compute_node.uuid
-        result = self.put(url, data)
+        cur_rp_gen = self._resource_providers[rp_uuid].generation
+        payload = {
+            'resource_provider_generation': cur_rp_gen,
+            'inventories': inv_data,
+        }
+        url = '/resource_providers/%s/inventories' % rp_uuid
+        result = self.put(url, payload)
         if result.status_code == 409:
             LOG.info(_LI('Inventory update conflict for %s'),
-                     compute_node.uuid)
+                     rp_uuid)
             # Invalidate our cache and re-fetch the resource provider
             # to be sure to get the latest generation.
-            del self._resource_providers[compute_node.uuid]
-            self._ensure_resource_provider(compute_node.uuid,
-                                           compute_node.hypervisor_hostname)
+            del self._resource_providers[rp_uuid]
+            # NOTE(jaypipes): We don't need to pass a name parameter to
+            # _ensure_resource_provider() because we know the resource provider
+            # record already exists. We're just reloading the record here.
+            self._ensure_resource_provider(rp_uuid)
             return False
         elif not result:
-            LOG.warning(_LW('Failed to update inventory for '
+            LOG.warning(_LW('Failed to update inventory for resource provider '
                             '%(uuid)s: %(status)i %(text)s'),
-                        {'uuid': compute_node.uuid,
+                        {'uuid': rp_uuid,
                          'status': result.status_code,
                          'text': result.text})
             return False
@@ -315,9 +374,9 @@ class SchedulerReportClient(object):
         if result.status_code != 200:
             LOG.info(
                 _LI('Received unexpected response code %(code)i while '
-                    'trying to update inventory for compute node %(uuid)s'
+                    'trying to update inventory for resource provider %(uuid)s'
                     ': %(text)s'),
-                {'uuid': compute_node.uuid,
+                {'uuid': rp_uuid,
                  'code': result.status_code,
                  'text': result.text})
             return False
@@ -326,15 +385,15 @@ class SchedulerReportClient(object):
         updated_inventories_result = result.json()
         new_gen = updated_inventories_result['resource_provider_generation']
 
-        self._resource_providers[compute_node.uuid].generation = new_gen
+        self._resource_providers[rp_uuid].generation = new_gen
         LOG.debug('Updated inventory for %s at generation %i' % (
-            compute_node.uuid, new_gen))
+            rp_uuid, new_gen))
         return True
 
     @safe_connect
-    def _update_inventory(self, compute_node):
+    def _update_inventory(self, rp_uuid, inv_data):
         for attempt in (1, 2, 3):
-            if compute_node.uuid not in self._resource_providers:
+            if rp_uuid not in self._resource_providers:
                 # NOTE(danms): Either we failed to fetch/create the RP
                 # on our first attempt, or a previous attempt had to
                 # invalidate the cache, and we were unable to refresh
@@ -342,11 +401,71 @@ class SchedulerReportClient(object):
                 LOG.warning(_LW(
                     'Unable to refresh my resource provider record'))
                 return False
-            if self._update_inventory_attempt(compute_node):
+            if self._update_inventory_attempt(rp_uuid, inv_data):
                 return True
             time.sleep(1)
         return False
 
+    @safe_connect
+    def _delete_inventory(self, rp_uuid):
+        """Deletes all inventory records for a resource provider with the
+        supplied UUID.
+        """
+        curr = self._get_inventory_and_update_provider_generation(rp_uuid)
+
+        # Check to see if we need to update placement's view
+        if not curr.get('inventories', {}):
+            msg = "No inventory to delete from resource provider %s."
+            LOG.debug(msg, rp_uuid)
+            return
+
+        msg = _LI("Compute node %s reported no inventory but previous "
+                  "inventory was detected. Deleting existing inventory "
+                  "records.")
+        LOG.info(msg, rp_uuid)
+
+        url = '/resource_providers/%s/inventories' % rp_uuid
+        cur_rp_gen = self._resource_providers[rp_uuid].generation
+        payload = {
+            'resource_provider_generation': cur_rp_gen,
+            'inventories': {},
+        }
+        r = self.put(url, payload)
+        if r.status_code == 200:
+            # Update our view of the generation for next time
+            updated_inv = r.json()
+            new_gen = updated_inv['resource_provider_generation']
+
+            self._resource_providers[rp_uuid].generation = new_gen
+            msg_args = {
+                'rp_uuid': rp_uuid,
+                'generation': new_gen,
+            }
+            LOG.info(_LI('Deleted all inventory for resource provider '
+                         '%(rp_uuid)s at generation %(generation)i'),
+                     msg_args)
+            return
+        elif r.status_code == 409:
+            rc_str = _extract_inventory_in_use(r.text)
+            if rc_str is not None:
+                msg = _LW("We cannot delete inventory %(rc_str)s for resource "
+                          "provider %(rp_uuid)s because the inventory is "
+                          "in use.")
+                msg_args = {
+                    'rp_uuid': rp_uuid,
+                    'rc_str': rc_str,
+                }
+                LOG.warning(msg, msg_args)
+                return
+
+        msg = _LE("Failed to delete inventory for resource provider "
+                  "%(rp_uuid)s. Got error response: %(err)s")
+        msg_args = {
+            'rp_uuid': rp_uuid,
+            'err': r.text,
+        }
+        LOG.error(msg, msg_args)
+
     def update_resource_stats(self, compute_node):
         """Creates or updates stats for the supplied compute node.
 
@@ -355,39 +474,30 @@ class SchedulerReportClient(object):
         compute_node.save()
         self._ensure_resource_provider(compute_node.uuid,
                                        compute_node.hypervisor_hostname)
-        self._update_inventory(compute_node)
-
-    def _allocations(self, instance):
-        # NOTE(danms): Boot-from-volume instances consume no local disk
-        is_bfv = compute_utils.is_volume_backed_instance(instance._context,
-                                                         instance)
-        disk = ((0 if is_bfv else instance.flavor.root_gb) +
-                instance.flavor.swap +
-                instance.flavor.ephemeral_gb)
-        return {
-            MEMORY_MB: instance.flavor.memory_mb,
-            VCPU: instance.flavor.vcpus,
-            DISK_GB: disk,
-        }
+        inv_data = _compute_node_to_inventory_dict(compute_node)
+        if inv_data:
+            self._update_inventory(compute_node.uuid, inv_data)
+        else:
+            self._delete_inventory(compute_node.uuid)
 
-    def _get_allocations_for_instance(self, compute_node, instance):
+    def _get_allocations_for_instance(self, rp_uuid, instance):
         url = '/allocations/%s' % instance.uuid
         resp = self.get(url)
         if not resp:
             return {}
         else:
             # NOTE(cdent): This trims to just the allocations being
-            # used on this compute node. In the future when there
+            # used on this resource provider. In the future when there
             # are shared resources there might be other providers.
             return resp.json()['allocations'].get(
-                compute_node.uuid, {}).get('resources', {})
+                rp_uuid, {}).get('resources', {})
 
     @safe_connect
-    def _allocate_for_instance(self, compute_node, instance):
+    def _allocate_for_instance(self, rp_uuid, instance):
         url = '/allocations/%s' % instance.uuid
 
-        my_allocations = self._allocations(instance)
-        current_allocations = self._get_allocations_for_instance(compute_node,
+        my_allocations = _instance_to_allocations_dict(instance)
+        current_allocations = self._get_allocations_for_instance(rp_uuid,
                                                                  instance)
         if current_allocations == my_allocations:
             allocstr = ','.join(['%s=%s' % (k, v)
@@ -400,7 +510,7 @@ class SchedulerReportClient(object):
             'allocations': [
                 {
                     'resource_provider': {
-                        'uuid': compute_node.uuid,
+                        'uuid': rp_uuid,
                     },
                     'resources': my_allocations,
                 },
@@ -438,13 +548,13 @@ class SchedulerReportClient(object):
 
     def update_instance_allocation(self, compute_node, instance, sign):
         if sign > 0:
-            self._allocate_for_instance(compute_node, instance)
+            self._allocate_for_instance(compute_node.uuid, instance)
         else:
             self._delete_allocation_for_instance(instance.uuid)
 
     @safe_connect
-    def _get_allocations(self, compute_node):
-        url = '/resource_providers/%s/allocations' % compute_node.uuid
+    def _get_allocations(self, rp_uuid):
+        url = '/resource_providers/%s/allocations' % rp_uuid
         resp = self.get(url)
         if not resp:
             return {}
@@ -452,7 +562,7 @@ class SchedulerReportClient(object):
             return resp.json()['allocations']
 
     def remove_deleted_instances(self, compute_node, instance_uuids):
-        allocations = self._get_allocations(compute_node)
+        allocations = self._get_allocations(compute_node.uuid)
         if allocations is None:
             allocations = {}
 
diff --git a/nova/tests/functional/api/openstack/placement/gabbits/allocations.yaml b/nova/tests/functional/api/openstack/placement/gabbits/allocations.yaml
index adc9c31..7b84a2d 100644
--- a/nova/tests/functional/api/openstack/placement/gabbits/allocations.yaml
+++ b/nova/tests/functional/api/openstack/placement/gabbits/allocations.yaml
@@ -263,28 +263,28 @@ tests:
   request_headers:
       content-type: application/json
   data:
-      # TODO(cdent): This format is going to go out of date because
-      # of other changes
       resource_provider_generation: 0
       inventories:
         VCPU:
           total: 32
+          max_unit: 32
         DISK_GB:
           total: 10
+          max_unit: 10
 
 - name: set inventory on rp2
   PUT: /resource_providers/fcfa516a-abbe-45d1-8152-d5225d82e596/inventories
   request_headers:
       content-type: application/json
   data:
-      # TODO(cdent): This format is going to go out of date because
-      # of other changes
       resource_provider_generation: 0
       inventories:
         VCPU:
           total: 16
+          max_unit: 16
         DISK_GB:
           total: 20
+          max_unit: 20
   status: 200
 
 - name: put allocations on both those providers one
diff --git a/nova/tests/functional/api/openstack/placement/gabbits/unicode.yaml b/nova/tests/functional/api/openstack/placement/gabbits/unicode.yaml
index 113c515..367f79a 100644
--- a/nova/tests/functional/api/openstack/placement/gabbits/unicode.yaml
+++ b/nova/tests/functional/api/openstack/placement/gabbits/unicode.yaml
@@ -43,30 +43,3 @@ tests:
 - name: delete that one
   DELETE: /resource_providers/$ENVIRON['RP_UUID']
   status: 204
-
-# These next three are expected to fail on many mysql
-# installations. It works with the local in-RAM sqlite
-# test database.
-- name: four byte utf8 smiley
-  xfail: true
-  POST: /resource_providers
-  request_headers:
-    content-type: application/json
-  data:
-      name: "\U0001F601"
-      uuid: $ENVIRON['RP_UUID']
-  status: 201
-  response_headers:
-      location: //resource_providers/[a-f0-9-]+/
-
-- name: get that wide resource provider
-  xfail: true
-  GET: $LOCATION
-  response_json_paths:
-      $.name: "\U0001F601"
-
-- name: query by wide name
-  xfail: true
-  GET: /resource_providers?name=%F0%9F%98%81
-  response_json_paths:
-      $.resource_providers[0].name: "\U0001F601"
diff --git a/nova/tests/functional/api/openstack/placement/test_report_client.py b/nova/tests/functional/api/openstack/placement/test_report_client.py
index 1ccb971..bdd8d09 100644
--- a/nova/tests/functional/api/openstack/placement/test_report_client.py
+++ b/nova/tests/functional/api/openstack/placement/test_report_client.py
@@ -140,3 +140,15 @@ class SchedulerReportClientTests(test.TestCase):
             usage_data = resp.json()['usages']
             vcpu_data = usage_data[res_class]
             self.assertEqual(0, vcpu_data)
+
+            # Trigger the reporting client deleting all inventory by setting
+            # the compute node's CPU, RAM and disk amounts to 0.
+            self.compute_node.vcpus = 0
+            self.compute_node.memory_mb = 0
+            self.compute_node.local_gb = 0
+            self.client.update_resource_stats(self.compute_node)
+
+            # Check there's no more inventory records
+            resp = self.client.get(inventory_url)
+            inventory_data = resp.json()['inventories']
+            self.assertEqual({}, inventory_data)
diff --git a/nova/tests/functional/db/test_resource_provider.py b/nova/tests/functional/db/test_resource_provider.py
index 1774195..b0db2dc 100644
--- a/nova/tests/functional/db/test_resource_provider.py
+++ b/nova/tests/functional/db/test_resource_provider.py
@@ -639,6 +639,7 @@ class TestAllocationListCreateDelete(ResourceProviderBaseCase):
         If this fails, we get a KeyError at create_all()
         """
 
+        max_unit = 10
         consumer_uuid = uuidsentinel.consumer
         consumer_uuid2 = uuidsentinel.consumer2
 
@@ -657,12 +658,13 @@ class TestAllocationListCreateDelete(ResourceProviderBaseCase):
 
         inv = objects.Inventory(resource_provider=rp1,
                                 resource_class=rp1_class,
-                                total=1024)
+                                total=1024, max_unit=max_unit)
         inv.obj_set_defaults()
 
         inv2 = objects.Inventory(resource_provider=rp1,
-                                resource_class=rp2_class,
-                                total=255, reserved=2)
+                                 resource_class=rp2_class,
+                                 total=255, reserved=2,
+                                 max_unit=max_unit)
         inv2.obj_set_defaults()
         inv_list = objects.InventoryList(objects=[inv, inv2])
         rp1.set_inventory(inv_list)
@@ -698,6 +700,7 @@ class TestAllocationListCreateDelete(ResourceProviderBaseCase):
         allocation_list.create_all()
 
     def test_allocation_list_create(self):
+        max_unit = 10
         consumer_uuid = uuidsentinel.consumer
 
         # Create two resource providers
@@ -753,7 +756,21 @@ class TestAllocationListCreateDelete(ResourceProviderBaseCase):
         inv_list = objects.InventoryList(objects=[inv])
         rp2.set_inventory(inv_list)
 
-        # Now the allocations will work.
+        # Now the allocations will still fail because max_unit 1
+        self.assertRaises(exception.InvalidAllocationConstraintsViolated,
+                          allocation_list.create_all)
+        inv1 = objects.Inventory(resource_provider=rp1,
+                                resource_class=rp1_class,
+                                total=1024, max_unit=max_unit)
+        inv1.obj_set_defaults()
+        rp1.set_inventory(objects.InventoryList(objects=[inv1]))
+        inv2 = objects.Inventory(resource_provider=rp2,
+                                resource_class=rp2_class,
+                                total=255, reserved=2, max_unit=max_unit)
+        inv2.obj_set_defaults()
+        rp2.set_inventory(objects.InventoryList(objects=[inv2]))
+
+        # Now we can finally allocate.
         allocation_list.create_all()
 
         # Check that those allocations changed usage on each
@@ -797,6 +814,75 @@ class TestAllocationListCreateDelete(ResourceProviderBaseCase):
         self.assertEqual(0, rp1_usage[0].usage)
         self.assertEqual(0, rp2_usage[0].usage)
 
+    def _make_rp_and_inventory(self, **kwargs):
+        # Create one resource provider and set some inventory
+        rp_name = uuidsentinel.rp_name
+        rp_uuid = uuidsentinel.rp_uuid
+        rp = objects.ResourceProvider(
+            self.context, name=rp_name, uuid=rp_uuid)
+        rp.create()
+        inv = objects.Inventory(resource_provider=rp,
+                                total=1024, allocation_ratio=1,
+                                reserved=0, **kwargs)
+        inv.obj_set_defaults()
+        rp.set_inventory(objects.InventoryList(objects=[inv]))
+        return rp
+
+    def _validate_usage(self, rp, usage):
+        rp_usage = objects.UsageList.get_all_by_resource_provider_uuid(
+            self.context, rp.uuid)
+        self.assertEqual(usage, rp_usage[0].usage)
+
+    def _check_create_allocations(self, inventory_kwargs,
+                                  bad_used, good_used):
+        consumer_uuid = uuidsentinel.consumer
+        rp_class = fields.ResourceClass.DISK_GB
+        rp = self._make_rp_and_inventory(resource_class=rp_class,
+                                         **inventory_kwargs)
+
+        # allocation, bad step_size
+        allocation = objects.Allocation(resource_provider=rp,
+                                        consumer_id=consumer_uuid,
+                                        resource_class=rp_class,
+                                        used=bad_used)
+        allocation_list = objects.AllocationList(self.context,
+                                                 objects=[allocation])
+        self.assertRaises(exception.InvalidAllocationConstraintsViolated,
+                          allocation_list.create_all)
+
+        # correct for step size
+        allocation.used = good_used
+        allocation_list = objects.AllocationList(self.context,
+                                                 objects=[allocation])
+        allocation_list.create_all()
+
+        # check usage
+        self._validate_usage(rp, allocation.used)
+
+    def test_create_all_step_size(self):
+        bad_used = 4
+        good_used = 5
+        inventory_kwargs = {'max_unit': 9999, 'step_size': 5}
+
+        self._check_create_allocations(inventory_kwargs,
+                                       bad_used, good_used)
+
+    def test_create_all_min_unit(self):
+        bad_used = 4
+        good_used = 5
+        inventory_kwargs = {'max_unit': 9999, 'min_unit': 5}
+
+        self._check_create_allocations(inventory_kwargs,
+                                       bad_used, good_used)
+
+    def test_create_all_max_unit(self):
+        bad_used = 5
+        good_used = 3
+        inventory_kwargs = {'max_unit': 3}
+
+        self._check_create_allocations(inventory_kwargs,
+                                       bad_used, good_used)
+
 
 class UsageListTestCase(ResourceProviderBaseCase):
 
diff --git a/nova/tests/unit/api/openstack/compute/test_serversV21.py b/nova/tests/unit/api/openstack/compute/test_serversV21.py
index a427da1..95180a5 100644
--- a/nova/tests/unit/api/openstack/compute/test_serversV21.py
+++ b/nova/tests/unit/api/openstack/compute/test_serversV21.py
@@ -3243,7 +3243,7 @@ class ServersControllerCreateTest(test.TestCase):
 
     @mock.patch.object(compute_api.API, 'create',
                        side_effect=exception.ImageNotAuthorized(
-                           project_id=FAKE_UUID))
+                           image_id=FAKE_UUID))
     def test_create_instance_with_image_not_authorized(self,
                                                        mock_create):
         self.assertRaises(webob.exc.HTTPBadRequest,
@@ -3266,6 +3266,7 @@ class ServersControllerCreateTest(test.TestCase):
 
     @mock.patch.object(compute_api.API, 'create',
                        side_effect=exception.InvalidNUMANodesNumber(
+                           nodes='-1',
                            details=''))
     def test_create_instance_raise_invalid_numa_nodes(self, mock_create):
         self.assertRaises(webob.exc.HTTPBadRequest,
diff --git a/nova/tests/unit/compute/test_compute.py b/nova/tests/unit/compute/test_compute.py
index 601a4f6..02d0598 100644
--- a/nova/tests/unit/compute/test_compute.py
+++ b/nova/tests/unit/compute/test_compute.py
@@ -3303,6 +3303,52 @@ class ComputeTestCase(BaseTestCase):
             self.assertEqual(state_dict['power_state'],
                              instances[0]['power_state'])
 
+    @mock.patch('nova.image.api.API.get_all')
+    @mock.patch('nova.image.api.API.delete')
+    def test_rotate_backups(self, mock_delete, mock_get_all_images):
+        instance = self._create_fake_instance_obj()
+        instance_uuid = instance['uuid']
+        fake_images = [{
+            'id': uuids.image_id_1,
+            'name': 'fake_name_1',
+            'status': 'active',
+            'properties': {'kernel_id': uuids.kernel_id_1,
+                           'ramdisk_id': uuids.ramdisk_id_1,
+                           'image_type': 'backup',
+                           'backup_type': 'daily',
+                           'instance_uuid': instance_uuid},
+        },
+        {
+            'id': uuids.image_id_2,
+            'name': 'fake_name_2',
+            'status': 'active',
+            'properties': {'kernel_id': uuids.kernel_id_2,
+                           'ramdisk_id': uuids.ramdisk_id_2,
+                           'image_type': 'backup',
+                           'backup_type': 'daily',
+                           'instance_uuid': instance_uuid},
+        },
+        {
+            'id': uuids.image_id_3,
+            'name': 'fake_name_3',
+            'status': 'active',
+            'properties': {'kernel_id': uuids.kernel_id_3,
+                           'ramdisk_id': uuids.ramdisk_id_3,
+                           'image_type': 'backup',
+                           'backup_type': 'daily',
+                           'instance_uuid': instance_uuid},
+        }]
+
+        mock_get_all_images.return_value = fake_images
+
+        mock_delete.side_effect = (exception.ImageNotFound(
+                                   image_id=uuids.image_id_1), None)
+
+        self.compute._rotate_backups(self.context, instance=instance,
+                                     backup_type='daily',
+                                     rotation=1)
+        self.assertEqual(2, mock_delete.call_count)
+
     def test_console_output(self):
         # Make sure we can get console output from instance.
         instance = self._create_fake_instance_obj()
diff --git a/nova/tests/unit/compute/test_compute_mgr.py b/nova/tests/unit/compute/test_compute_mgr.py
index 235c46d..694f014 100755
--- a/nova/tests/unit/compute/test_compute_mgr.py
+++ b/nova/tests/unit/compute/test_compute_mgr.py
@@ -1883,7 +1883,7 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase):
                     'delete_on_termination': True,
                     'connection_info': '{"foo": "bar"}'})
         comp_ret = {'save_volume_id': old_volume_id}
-        new_info = {"foo": "bar"}
+        new_info = {"foo": "bar", "serial": old_volume_id}
         swap_volume_mock.return_value = (comp_ret, new_info)
         volume_connector_mock.return_value = {}
         update_bdm_mock.return_value = fake_bdm
@@ -1893,7 +1893,7 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase):
                 fake_instance.fake_instance_obj(self.context,
                                                 **{'uuid': uuids.instance}))
         update_values = {'no_device': False,
-                         'connection_info': u'{"foo": "bar"}',
+                         'connection_info': jsonutils.dumps(new_info),
                          'volume_id': old_volume_id,
                          'source_type': u'volume',
                          'snapshot_id': None,
@@ -2147,7 +2147,10 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase):
             objects.Instance(id=1, uuid=uuids.instance_1),
             objects.Instance(id=2, uuid=uuids.instance_2,
                              info_cache=info_cache),
-            objects.Instance(id=3, uuid=uuids.instance_3)]
+            objects.Instance(id=3, uuid=uuids.instance_3),
+            # instance_4 doesn't have info_cache set so it will be lazy-loaded
+            # and blow up with an InstanceNotFound error.
+            objects.Instance(id=4, uuid=uuids.instance_4)]
         events = [
             objects.InstanceExternalEvent(name='network-changed',
                                           tag='tag1',
@@ -2157,10 +2160,17 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase):
                                           tag='2'),
             objects.InstanceExternalEvent(name='network-vif-plugged',
                                           instance_uuid=uuids.instance_3,
-                                          tag='tag3')]
-
-        # Make sure all the three events are handled despite the exceptions in
-        # processing events 1 and 2
+                                          tag='tag3'),
+            objects.InstanceExternalEvent(name='network-vif-deleted',
+                                          instance_uuid=uuids.instance_4,
+                                          tag='tag4'),
+        ]
+
+        # Make sure all the four events are handled despite the exceptions in
+        # processing events 1, 2, and 4.
+        @mock.patch.object(instances[3], 'obj_load_attr',
+                           side_effect=exception.InstanceNotFound(
+                               instance_id=uuids.instance_4))
         @mock.patch.object(manager.base_net_api,
                            'update_instance_cache_with_nw_info')
         @mock.patch.object(self.compute.driver, 'detach_interface',
@@ -2170,7 +2180,8 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase):
                                          instance_uuid=uuids.instance_1))
         @mock.patch.object(self.compute, '_process_instance_event')
         def do_test(_process_instance_event, get_instance_nw_info,
-                    detach_interface, update_instance_cache_with_nw_info):
+                    detach_interface, update_instance_cache_with_nw_info,
+                    obj_load_attr):
             self.compute.external_instance_event(self.context,
                                                  instances, events)
             get_instance_nw_info.assert_called_once_with(self.context,
@@ -2183,6 +2194,7 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase):
             detach_interface.assert_called_once_with(instances[1], vif2)
             _process_instance_event.assert_called_once_with(instances[2],
                                                             events[2])
+            obj_load_attr.assert_called_once_with('info_cache')
         do_test()
 
     def test_cancel_all_events(self):
@@ -3970,6 +3982,11 @@ class ComputeManagerBuildInstanceTestCase(test.NoDBTestCase):
         self._test_build_and_run_spawn_exceptions(
             exception.SignatureVerificationError(reason=""))
 
+    def test_build_and_run_volume_encryption_not_supported(self):
+        self._test_build_and_run_spawn_exceptions(
+            exception.VolumeEncryptionNotSupported(volume_type="fake",
+                                                   volume_id=uuids.volume_id))
+
     def _test_build_and_run_spawn_exceptions(self, exc):
         with test.nested(
                 mock.patch.object(self.compute.driver, 'spawn',
diff --git a/nova/tests/unit/db/test_db_api.py b/nova/tests/unit/db/test_db_api.py
index a4483c4..926486a 100644
--- a/nova/tests/unit/db/test_db_api.py
+++ b/nova/tests/unit/db/test_db_api.py
@@ -3481,6 +3481,10 @@ class ServiceTestCase(test.TestCase, ModelsObjectComparatorMixin):
         self._create_service({'version': 3,
                               'host': 'host2',
                               'binary': 'compute'})
+        self._create_service({'version': 0,
+                              'host': 'host0',
+                              'binary': 'compute',
+                              'deleted': 1})
         self.assertEqual({'compute': 2},
                          db.service_get_minimum_version(self.ctxt,
                                                         ['compute']))
diff --git a/nova/tests/unit/network/test_neutronv2.py b/nova/tests/unit/network/test_neutronv2.py
index 69c2f5a..f2e7abc 100644
--- a/nova/tests/unit/network/test_neutronv2.py
+++ b/nova/tests/unit/network/test_neutronv2.py
@@ -800,11 +800,6 @@ class TestNeutronv2Base(test.TestCase):
 
 class TestNeutronv2(TestNeutronv2Base):
 
-    def setUp(self):
-        super(TestNeutronv2, self).setUp()
-        neutronapi.get_client(mox.IgnoreArg()).MultipleTimes().AndReturn(
-            self.moxed_client)
-
     def test_get_instance_nw_info_1(self):
         # Test to get one port in one network and subnet.
         neutronapi.get_client(mox.IgnoreArg(),
@@ -1023,6 +1018,8 @@ class TestNeutronv2(TestNeutronv2Base):
         api.db.instance_info_cache_update(
             mox.IgnoreArg(),
             self.instance['uuid'], mox.IgnoreArg()).AndReturn(fake_info_cache)
+        neutronapi.get_client(mox.IgnoreArg(), admin=True).AndReturn(
+            self.moxed_client)
         self.moxed_client.list_ports(
             tenant_id=self.instance['project_id'],
             device_id=self.instance['uuid']).AndReturn(
@@ -1030,9 +1027,6 @@ class TestNeutronv2(TestNeutronv2Base):
         self.moxed_client.list_networks(
             id=[self.port_data1[0]['network_id']]).AndReturn(
                 {'networks': self.nets1})
-        neutronapi.get_client(mox.IgnoreArg(),
-                             admin=True).MultipleTimes().AndReturn(
-            self.moxed_client)
 
         net_info_cache = []
         for port in self.port_data3:
@@ -1095,10 +1089,12 @@ class TestNeutronv2(TestNeutronv2Base):
 
     def test_allocate_for_instance_1(self):
         # Allocate one port in one network env.
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self._allocate_for_instance(1)
 
     def test_allocate_for_instance_2(self):
         # Allocate one port in two networks env.
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         api = self._stub_allocate_for_instance(net_idx=2)
         self.assertRaises(exception.NetworkAmbiguous,
                           api.allocate_for_instance,
@@ -1106,17 +1102,20 @@ class TestNeutronv2(TestNeutronv2Base):
 
     def test_allocate_for_instance_accepts_macs_kwargs_None(self):
         # The macs kwarg should be accepted as None.
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self._allocate_for_instance(1, macs=None)
 
     def test_allocate_for_instance_accepts_macs_kwargs_set(self):
         # The macs kwarg should be accepted, as a set, the
         # _allocate_for_instance helper checks that the mac is used to create a
         # port.
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self._allocate_for_instance(1, macs=set(['ab:cd:ef:01:23:45']))
 
     def test_allocate_for_instance_with_mac_added_to_port(self):
         requested_networks = objects.NetworkRequestList(
             objects=[objects.NetworkRequest(port_id=uuids.portid_1)])
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         # NOTE(johngarbutt) we override the provided mac with a new one
         self._allocate_for_instance(net_idx=1,
                                     requested_networks=requested_networks,
@@ -1127,6 +1126,7 @@ class TestNeutronv2(TestNeutronv2Base):
     def test_allocate_for_instance_accepts_only_portid(self):
         # Make sure allocate_for_instance works when only a portid is provided
         self._returned_nw_info = self.port_data1
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         result = self._allocate_for_instance(
             requested_networks=objects.NetworkRequestList(
                 objects=[objects.NetworkRequest(port_id=uuids.portid_1,
@@ -1152,6 +1152,7 @@ class TestNeutronv2(TestNeutronv2Base):
             objects = [
                 objects.NetworkRequest(network_id=self.nets2[1]['id']),
                 objects.NetworkRequest(port_id=uuids.portid_1)])
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         api = self._stub_allocate_for_instance(
             net_idx=2, requested_networks=requested_networks,
             macs=set(['my_mac1']),
@@ -1173,6 +1174,7 @@ class TestNeutronv2(TestNeutronv2Base):
         requested_networks = objects.NetworkRequestList(
             objects=[objects.NetworkRequest(network_id=self.nets2[1]['id']),
                      objects.NetworkRequest(network_id=self.nets2[0]['id'])])
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         api = self._stub_allocate_for_instance(
             net_idx=2, requested_networks=requested_networks,
             macs=set(['my_mac2']),
@@ -1192,11 +1194,13 @@ class TestNeutronv2(TestNeutronv2Base):
         requested_networks = objects.NetworkRequestList(
             objects=[objects.NetworkRequest(network_id=self.nets2[1]['id']),
                      objects.NetworkRequest(network_id=self.nets2[0]['id'])])
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self._allocate_for_instance(
             net_idx=2, requested_networks=requested_networks,
             macs=set(['my_mac2', 'my_mac1']))
 
     def test_allocate_for_instance_without_requested_networks(self):
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         api = self._stub_allocate_for_instance(net_idx=3)
         self.assertRaises(exception.NetworkAmbiguous,
                           api.allocate_for_instance,
@@ -1211,6 +1215,7 @@ class TestNeutronv2(TestNeutronv2Base):
             objects=[objects.NetworkRequest(network_id=net['id'])
                      for net in (self.nets3[0], self.nets3[2], self.nets3[1])])
         requested_networks[0].tag = 'foo'
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self._allocate_for_instance(net_idx=2,
                                     requested_networks=requested_networks)
         self.assertEqual(2, len(self._vifs_created))
@@ -1229,6 +1234,7 @@ class TestNeutronv2(TestNeutronv2Base):
         requested_networks = objects.NetworkRequestList(
             objects=[objects.NetworkRequest(network_id=net['id'])
                      for net in (self.nets3[1], self.nets3[0], self.nets3[2])])
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self._allocate_for_instance(net_idx=3,
                                     requested_networks=requested_networks)
 
@@ -1238,6 +1244,7 @@ class TestNeutronv2(TestNeutronv2Base):
         # able to associate the default security group to the port
         # requested to be created. We expect an exception to be
         # raised.
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.assertRaises(exception.SecurityGroupCannotBeApplied,
                           self._allocate_for_instance, net_idx=4,
                           _break='post_list_extensions')
@@ -1246,6 +1253,7 @@ class TestNeutronv2(TestNeutronv2Base):
         requested_networks = objects.NetworkRequestList(
             objects=[objects.NetworkRequest(
                 network_id=uuids.non_existent_uuid)])
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         api = self._stub_allocate_for_instance(net_idx=9,
             requested_networks=requested_networks,
             _break='post_list_networks')
@@ -1259,12 +1267,14 @@ class TestNeutronv2(TestNeutronv2Base):
         requested_networks = objects.NetworkRequestList(
             objects=[objects.NetworkRequest(network_id=self.nets1[0]['id'],
                                             address='10.0.1.0')])
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self._allocate_for_instance(net_idx=1,
                                     requested_networks=requested_networks)
 
     def test_allocate_for_instance_with_requested_networks_with_port(self):
         requested_networks = objects.NetworkRequestList(
             objects=[objects.NetworkRequest(port_id=uuids.portid_1)])
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self._allocate_for_instance(net_idx=1,
                                     requested_networks=requested_networks)
 
@@ -1277,6 +1287,7 @@ class TestNeutronv2(TestNeutronv2Base):
             tenant_id=self.instance.project_id,
             shared=False).AndReturn(
                 {'networks': model.NetworkInfo([])})
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.list_networks(shared=True).AndReturn(
             {'networks': model.NetworkInfo([])})
         self.mox.ReplayAll()
@@ -1302,6 +1313,7 @@ class TestNeutronv2(TestNeutronv2Base):
         requested_networks = objects.NetworkRequestList(
             objects=[objects.NetworkRequest(network_id=net['id'])
                      for net in (self.nets2[0], self.nets2[1])])
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.list_networks(
             id=[uuids.my_netid1, uuids.my_netid2]).AndReturn(
             {'networks': self.nets2})
@@ -1367,6 +1379,7 @@ class TestNeutronv2(TestNeutronv2Base):
         requested_networks = objects.NetworkRequestList(
             objects=[objects.NetworkRequest(network_id=net['id'])
                      for net in (self.nets2[0], self.nets2[1])])
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.list_networks(
             id=[uuids.my_netid1, uuids.my_netid2]).AndReturn(
             {'networks': self.nets2})
@@ -1392,6 +1405,7 @@ class TestNeutronv2(TestNeutronv2Base):
         self.instance = fake_instance.fake_instance_obj(self.context,
                                                         **self.instance)
         api = neutronapi.API()
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.mox.StubOutWithMock(api, '_get_available_networks')
         # Make sure we get an empty list and then bail out of the rest
         # of the function
@@ -1413,6 +1427,7 @@ class TestNeutronv2(TestNeutronv2Base):
         # allocated during _that_ run.
         new_port = {'id': uuids.fake}
         self._returned_nw_info = self.port_data1 + [new_port]
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         nw_info = self._allocate_for_instance()
         self.assertEqual([new_port], nw_info)
 
@@ -1420,6 +1435,7 @@ class TestNeutronv2(TestNeutronv2Base):
         # If a port is already in use, an exception should be raised.
         requested_networks = objects.NetworkRequestList(
             objects=[objects.NetworkRequest(port_id=uuids.portid_1)])
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         api = self._stub_allocate_for_instance(
             requested_networks=requested_networks,
             _break='pre_list_networks',
@@ -1432,6 +1448,7 @@ class TestNeutronv2(TestNeutronv2Base):
         # If a port is not found, an exception should be raised.
         requested_networks = objects.NetworkRequestList(
             objects=[objects.NetworkRequest(port_id=uuids.non_existent_uuid)])
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         api = self._stub_allocate_for_instance(
             requested_networks=requested_networks,
             _break='pre_list_networks')
@@ -1443,6 +1460,7 @@ class TestNeutronv2(TestNeutronv2Base):
         self.tenant_id = 'invalid_id'
         requested_networks = objects.NetworkRequestList(
             objects=[objects.NetworkRequest(port_id=uuids.portid_1)])
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         api = self._stub_allocate_for_instance(
             requested_networks=requested_networks,
             _break='pre_list_networks')
@@ -1456,6 +1474,7 @@ class TestNeutronv2(TestNeutronv2Base):
         """
         self.instance = fake_instance.fake_instance_obj(self.context,
                                                         **self.instance)
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         # no networks in the tenant
         self.moxed_client.list_networks(
             tenant_id=self.instance.project_id,
@@ -1476,6 +1495,7 @@ class TestNeutronv2(TestNeutronv2Base):
         """
         self.instance = fake_instance.fake_instance_obj(self.context,
                                                         **self.instance)
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         # network found in the tenant
         self.moxed_client.list_networks(
             tenant_id=self.instance.project_id,
@@ -1497,12 +1517,14 @@ class TestNeutronv2(TestNeutronv2Base):
         """
         admin_ctx = context.RequestContext('userid', uuids.my_tenant,
                                            is_admin=True)
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         api = self._stub_allocate_for_instance(net_idx=8)
         api.allocate_for_instance(admin_ctx, self.instance)
 
     def test_allocate_for_instance_with_external_shared_net(self):
         """Only one network is available, it's external and shared."""
         ctx = context.RequestContext('userid', uuids.my_tenant)
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         api = self._stub_allocate_for_instance(net_idx=10)
         api.allocate_for_instance(ctx, self.instance)
 
@@ -1529,6 +1551,7 @@ class TestNeutronv2(TestNeutronv2Base):
                                  'admin_state_up': True,
                                  'fixed_ips': [],
                                  'mac_address': 'fake_mac', })
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.list_ports(
             device_id=self.instance.uuid).AndReturn(
                 {'ports': ret_data})
@@ -1591,6 +1614,7 @@ class TestNeutronv2(TestNeutronv2Base):
                                                         **self.instance)
         mock_preexisting.return_value = []
         port_data = self.port_data1
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.list_ports(
             device_id=self.instance.uuid).AndReturn(
                 {'ports': port_data})
@@ -1617,15 +1641,15 @@ class TestNeutronv2(TestNeutronv2Base):
         self.instance['info_cache'] = self._fake_instance_info_cache(
             net_info_cache, self.instance['uuid'])
         api = neutronapi.API()
-        neutronapi.get_client(mox.IgnoreArg(), admin=True).AndReturn(
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(
             self.moxed_client)
         self.moxed_client.list_ports(
             tenant_id=self.instance['project_id'],
             device_id=self.instance['uuid']).AndReturn(
                 {'ports': port_data[1:]})
-        neutronapi.get_client(mox.IgnoreArg()).MultipleTimes().AndReturn(
-            self.moxed_client)
         net_ids = [port['network_id'] for port in port_data]
+        neutronapi.get_client(mox.IgnoreArg(), admin=True).AndReturn(
+            self.moxed_client)
         self.moxed_client.list_networks(id=net_ids).AndReturn(
             {'networks': nets})
         float_data = number == 1 and self.float_data1 or self.float_data2
@@ -1662,11 +1686,13 @@ class TestNeutronv2(TestNeutronv2Base):
 
     def test_list_ports(self):
         search_opts = {'parm': 'value'}
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.list_ports(**search_opts)
         self.mox.ReplayAll()
         neutronapi.API().list_ports(self.context, **search_opts)
 
     def test_show_port(self):
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.show_port('foo').AndReturn(
                 {'port': self.port_data1[0]})
         self.mox.ReplayAll()
@@ -1676,6 +1702,7 @@ class TestNeutronv2(TestNeutronv2Base):
         requested_networks = [(uuids.my_netid1, None, None, None),
                               (uuids.my_netid2, None, None, None)]
         ids = [uuids.my_netid1, uuids.my_netid2]
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.list_networks(
             id=mox.SameElementsAs(ids)).AndReturn(
                 {'networks': self.nets2})
@@ -1693,6 +1720,7 @@ class TestNeutronv2(TestNeutronv2Base):
         requested_networks = [(uuids.my_netid1, None, None, None),
                               (uuids.my_netid2, None, None, None)]
         ids = [uuids.my_netid1, uuids.my_netid2]
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.list_networks(
             id=mox.SameElementsAs(ids)).AndReturn(
                 {'networks': self.nets2})
@@ -1705,6 +1733,7 @@ class TestNeutronv2(TestNeutronv2Base):
 
     def test_validate_networks_ex_1(self):
         requested_networks = [(uuids.my_netid1, None, None, None)]
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.list_networks(
             id=mox.SameElementsAs([uuids.my_netid1])).AndReturn(
                 {'networks': self.nets1})
@@ -1726,6 +1755,7 @@ class TestNeutronv2(TestNeutronv2Base):
                               (uuids.my_netid2, None, None, None),
                               (uuids.my_netid3, None, None, None)]
         ids = [uuids.my_netid1, uuids.my_netid2, uuids.my_netid3]
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.list_networks(
             id=mox.SameElementsAs(ids)).AndReturn(
                 {'networks': self.nets1})
@@ -1744,7 +1774,7 @@ class TestNeutronv2(TestNeutronv2Base):
             objects=[objects.NetworkRequest(network_id=uuids.my_netid1),
                      objects.NetworkRequest(network_id=uuids.my_netid1)])
         ids = [uuids.my_netid1, uuids.my_netid1]
-
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.list_networks(
             id=mox.SameElementsAs(ids)).AndReturn(
                  {'networks': self.nets1})
@@ -1763,6 +1793,8 @@ class TestNeutronv2(TestNeutronv2Base):
         requested_networks = objects.NetworkRequestList(
             objects=[objects.NetworkRequest(network_id=net['id'])
                      for net in (self.nets6[0], self.nets6[1])])
+        neutronapi.get_client(mox.IgnoreArg()).MultipleTimes().AndReturn(
+            self.moxed_client)
         self._allocate_for_instance(net_idx=6,
                                     requested_networks=requested_networks)
 
@@ -1771,6 +1803,8 @@ class TestNeutronv2(TestNeutronv2Base):
         requested_networks = objects.NetworkRequestList(
             objects=[objects.NetworkRequest(port_id=port['id'])
                      for port in (self.port_data1[0], self.port_data3[0])])
+        neutronapi.get_client(mox.IgnoreArg()).MultipleTimes().AndReturn(
+            self.moxed_client)
         self._allocate_for_instance(net_idx=6,
                                     requested_networks=requested_networks)
 
@@ -1781,11 +1815,14 @@ class TestNeutronv2(TestNeutronv2Base):
                      objects.NetworkRequest(port_id=self.port_data1[0]['id']),
                      objects.NetworkRequest(network_id=uuids.my_netid2),
                      objects.NetworkRequest(port_id=self.port_data3[0]['id'])])
+        neutronapi.get_client(mox.IgnoreArg()).MultipleTimes().AndReturn(
+            self.moxed_client)
         self._allocate_for_instance(net_idx=7,
                                     requested_networks=requested_networks)
 
     def test_validate_networks_not_specified(self):
         requested_networks = objects.NetworkRequestList(objects=[])
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.list_networks(
             tenant_id=self.context.project_id,
             shared=False).AndReturn(
@@ -1809,11 +1846,10 @@ class TestNeutronv2(TestNeutronv2Base):
                 port_id=uuids.portid_1)])
 
         PortNotFound = exceptions.PortNotFoundClient()
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.show_port(requested_networks[0].port_id).AndRaise(
             PortNotFound)
         self.mox.ReplayAll()
-        # Expected call from setUp.
-        neutronapi.get_client(None)
         api = neutronapi.API()
         self.assertRaises(exception.PortNotFound,
                           api.validate_networks,
@@ -1830,11 +1866,10 @@ class TestNeutronv2(TestNeutronv2Base):
                 port_id=fake_port_id)])
 
         NeutronNotFound = exceptions.NeutronClientException(status_code=0)
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.show_port(requested_networks[0].port_id).AndRaise(
                                                         NeutronNotFound)
         self.mox.ReplayAll()
-        # Expected call from setUp.
-        neutronapi.get_client(None)
         api = neutronapi.API()
         exc = self.assertRaises(exception.NovaException,
                                 api.validate_networks,
@@ -1847,6 +1882,7 @@ class TestNeutronv2(TestNeutronv2Base):
     def test_validate_networks_port_in_use(self):
         requested_networks = objects.NetworkRequestList(
             objects=[objects.NetworkRequest(port_id=self.port_data3[0]['id'])])
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.show_port(self.port_data3[0]['id']).\
             AndReturn({'port': self.port_data3[0]})
 
@@ -1864,6 +1900,7 @@ class TestNeutronv2(TestNeutronv2Base):
 
         requested_networks = objects.NetworkRequestList(
             objects=[objects.NetworkRequest(port_id=port_a['id'])])
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.show_port(port_a['id']).AndReturn({'port': port_a})
 
         self.mox.ReplayAll()
@@ -1877,6 +1914,7 @@ class TestNeutronv2(TestNeutronv2Base):
         requested_networks = objects.NetworkRequestList(
             objects=[objects.NetworkRequest(network_id='his_netid4')])
         ids = ['his_netid4']
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.list_networks(
             id=mox.SameElementsAs(ids)).AndReturn(
                 {'networks': self.nets4})
@@ -1901,6 +1939,7 @@ class TestNeutronv2(TestNeutronv2Base):
         requested_networks = objects.NetworkRequestList(
             objects=[objects.NetworkRequest(port_id=port_a['id']),
                      objects.NetworkRequest(port_id=port_b['id'])])
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.show_port(port_a['id']).AndReturn(
                                                  {'port': port_a})
         self.moxed_client.show_port(port_b['id']).AndReturn(
@@ -1924,6 +1963,7 @@ class TestNeutronv2(TestNeutronv2Base):
         requested_networks = objects.NetworkRequestList(
             objects=[objects.NetworkRequest(port_id=port_a['id']),
                      objects.NetworkRequest(port_id=port_b['id'])])
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.show_port(port_a['id']).AndReturn({'port': port_a})
         self.moxed_client.show_port(port_b['id']).AndReturn({'port': port_b})
         self.mox.ReplayAll()
@@ -1939,6 +1979,7 @@ class TestNeutronv2(TestNeutronv2Base):
             objects=[objects.NetworkRequest(network_id=uuids.my_netid1),
                      objects.NetworkRequest(network_id=uuids.my_netid2)])
         ids = [uuids.my_netid1, uuids.my_netid2]
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.list_networks(
             id=mox.SameElementsAs(ids)).AndReturn(
                 {'networks': self.nets2})
@@ -1963,6 +2004,7 @@ class TestNeutronv2(TestNeutronv2Base):
         requested_networks = objects.NetworkRequestList(
             objects=[objects.NetworkRequest(network_id=uuids.my_netid1),
                      objects.NetworkRequest(port_id=port_b['id'])])
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.show_port(port_b['id']).AndReturn({'port': port_b})
         ids = [uuids.my_netid1]
         self.moxed_client.list_networks(
@@ -1988,6 +2030,7 @@ class TestNeutronv2(TestNeutronv2Base):
         port_b['device_owner'] = None
         requested_networks = objects.NetworkRequestList(
             objects=[objects.NetworkRequest(port_id=port_b['id'])])
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.show_port(port_b['id']).AndReturn({'port': port_b})
         self.mox.ReplayAll()
         api = neutronapi.API()
@@ -2003,6 +2046,7 @@ class TestNeutronv2(TestNeutronv2Base):
             objects=[objects.NetworkRequest(network_id=uuids.my_netid1),
                      objects.NetworkRequest(network_id=uuids.my_netid2)])
         ids = [uuids.my_netid1, uuids.my_netid2]
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.list_networks(
             id=mox.SameElementsAs(ids)).AndReturn(
                 {'networks': self.nets2})
@@ -2026,6 +2070,7 @@ class TestNeutronv2(TestNeutronv2Base):
             objects=[objects.NetworkRequest(network_id=uuids.my_netid1),
                      objects.NetworkRequest(network_id=uuids.my_netid2)])
         ids = [uuids.my_netid1, uuids.my_netid2]
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.list_networks(
             id=mox.SameElementsAs(ids)).AndReturn(
                 {'networks': self.nets2})
@@ -2051,6 +2096,7 @@ class TestNeutronv2(TestNeutronv2Base):
         requested_networks = objects.NetworkRequestList(
             objects=[objects.NetworkRequest(port_id=port_a['id']),
                      objects.NetworkRequest(port_id=port_b['id'])])
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.show_port(port_a['id']).AndReturn({'port': port_a})
         self.moxed_client.show_port(port_b['id']).AndReturn({'port': port_b})
 
@@ -2065,6 +2111,7 @@ class TestNeutronv2(TestNeutronv2Base):
         if port_data is None:
             port_data = self.port_data2
         address = self.port_address
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.list_ports(
             fixed_ips=MyComparator('ip_address=%s' % address)).AndReturn(
                 {'ports': port_data})
@@ -2094,6 +2141,7 @@ class TestNeutronv2(TestNeutronv2Base):
     def _get_available_networks(self, prv_nets, pub_nets,
                                 req_ids=None, context=None):
         api = neutronapi.API()
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         nets = prv_nets + pub_nets
         if req_ids:
             mox_list_params = {'id': req_ids}
@@ -2140,6 +2188,7 @@ class TestNeutronv2(TestNeutronv2Base):
     def test_get_floating_ip_pools(self):
         api = neutronapi.API()
         search_opts = {'router:external': True}
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.list_networks(**search_opts).\
             AndReturn({'networks': [self.fip_pool, self.fip_pool_nova]})
         self.mox.ReplayAll()
@@ -2175,6 +2224,7 @@ class TestNeutronv2(TestNeutronv2Base):
         fip_id = fip_data['id']
         net_id = fip_data['floating_network_id']
         address = fip_data['floating_ip_address']
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         if by_address:
             self.moxed_client.list_floatingips(floating_ip_address=address).\
                 AndReturn({'floatingips': [fip_data]})
@@ -2213,6 +2263,7 @@ class TestNeutronv2(TestNeutronv2Base):
     def test_get_floating_ip_by_address_not_found(self):
         api = neutronapi.API()
         address = self.fip_unassociated['floating_ip_address']
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.list_floatingips(floating_ip_address=address).\
             AndReturn({'floatingips': []})
         self.mox.ReplayAll()
@@ -2224,6 +2275,7 @@ class TestNeutronv2(TestNeutronv2Base):
         api = neutronapi.API()
         NeutronNotFound = exceptions.NeutronClientException(status_code=404)
         floating_ip_id = self.fip_unassociated['id']
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.show_floatingip(floating_ip_id).\
             AndRaise(NeutronNotFound)
         self.mox.ReplayAll()
@@ -2235,6 +2287,7 @@ class TestNeutronv2(TestNeutronv2Base):
         api = neutronapi.API()
         NeutronNotFound = exceptions.NeutronClientException(status_code=0)
         floating_ip_id = self.fip_unassociated['id']
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.show_floatingip(floating_ip_id).\
             AndRaise(NeutronNotFound)
         self.mox.ReplayAll()
@@ -2245,6 +2298,7 @@ class TestNeutronv2(TestNeutronv2Base):
     def test_get_floating_ip_by_address_multiple_found(self):
         api = neutronapi.API()
         address = self.fip_unassociated['floating_ip_address']
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.list_floatingips(floating_ip_address=address).\
             AndReturn({'floatingips': [self.fip_unassociated] * 2})
         self.mox.ReplayAll()
@@ -2255,6 +2309,7 @@ class TestNeutronv2(TestNeutronv2Base):
     def test_get_floating_ips_by_project(self):
         api = neutronapi.API()
         project_id = self.context.project_id
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.list_floatingips(tenant_id=project_id).\
             AndReturn({'floatingips': [self.fip_unassociated,
                                        self.fip_associated]})
@@ -2276,6 +2331,7 @@ class TestNeutronv2(TestNeutronv2Base):
                                                   associated=False):
         api = neutronapi.API()
         address = fip_data['floating_ip_address']
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.list_floatingips(floating_ip_address=address).\
                 AndReturn({'floatingips': [fip_data]})
         if associated:
@@ -2304,6 +2360,7 @@ class TestNeutronv2(TestNeutronv2Base):
         search_opts = {'router:external': True,
                        'fields': 'id',
                        'name': pool_name}
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.list_networks(**search_opts).\
             AndReturn({'networks': [self.fip_pool]})
         self.moxed_client.create_floatingip(
@@ -2320,6 +2377,7 @@ class TestNeutronv2(TestNeutronv2Base):
         search_opts = {'router:external': True,
                        'fields': 'id',
                        'name': pool_name}
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.list_networks(**search_opts).\
             AndReturn({'networks': [self.fip_pool]})
         self.moxed_client.create_floatingip(
@@ -2336,6 +2394,7 @@ class TestNeutronv2(TestNeutronv2Base):
         search_opts = {'router:external': True,
                        'fields': 'id',
                        'name': pool_name}
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.list_networks(**search_opts).\
             AndReturn({'networks': [self.fip_pool]})
         self.moxed_client.create_floatingip(
@@ -2351,6 +2410,7 @@ class TestNeutronv2(TestNeutronv2Base):
         search_opts = {'router:external': True,
                        'fields': 'id',
                        'id': pool_id}
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.list_networks(**search_opts).\
             AndReturn({'networks': [self.fip_pool]})
         self.moxed_client.create_floatingip(
@@ -2367,6 +2427,7 @@ class TestNeutronv2(TestNeutronv2Base):
         search_opts = {'router:external': True,
                        'fields': 'id',
                        'name': pool_name}
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.list_networks(**search_opts).\
             AndReturn({'networks': [self.fip_pool_nova]})
         self.moxed_client.create_floatingip(
@@ -2380,7 +2441,7 @@ class TestNeutronv2(TestNeutronv2Base):
         api = neutronapi.API()
         address = self.fip_unassociated['floating_ip_address']
         fip_id = self.fip_unassociated['id']
-
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.list_floatingips(floating_ip_address=address).\
             AndReturn({'floatingips': [self.fip_unassociated]})
         self.moxed_client.delete_floatingip(fip_id)
@@ -2392,7 +2453,7 @@ class TestNeutronv2(TestNeutronv2Base):
         address = self.fip_unassociated['floating_ip_address']
         fip_id = self.fip_unassociated['id']
         floating_ip = {'address': address}
-
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.list_floatingips(floating_ip_address=address).\
             AndReturn({'floatingips': [self.fip_unassociated]})
         self.moxed_client.delete_floatingip(fip_id)
@@ -2406,7 +2467,7 @@ class TestNeutronv2(TestNeutronv2Base):
         fip_id = self.fip_unassociated['id']
         floating_ip = {'address': address}
         instance = self._fake_instance_object(self.instance)
-
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.list_floatingips(floating_ip_address=address).\
             AndReturn({'floatingips': [self.fip_unassociated]})
         self.moxed_client.delete_floatingip(fip_id)
@@ -2418,7 +2479,7 @@ class TestNeutronv2(TestNeutronv2Base):
     def test_release_floating_ip_associated(self):
         api = neutronapi.API()
         address = self.fip_associated['floating_ip_address']
-
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.list_floatingips(floating_ip_address=address).\
             AndReturn({'floatingips': [self.fip_associated]})
         self.mox.ReplayAll()
@@ -2446,6 +2507,8 @@ class TestNeutronv2(TestNeutronv2Base):
 
         search_opts = {'device_owner': 'compute:nova',
                        'device_id': instance.uuid}
+
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.list_ports(**search_opts).\
             AndReturn({'ports': [self.port_data2[1]]})
         self.moxed_client.list_floatingips(floating_ip_address=address).\
@@ -2468,6 +2531,7 @@ class TestNeutronv2(TestNeutronv2Base):
 
         search_opts = {'device_owner': 'compute:nova',
                        'device_id': self.instance2['uuid']}
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.list_ports(**search_opts).\
             AndReturn({'ports': [self.port_data2[0]]})
         self.moxed_client.list_floatingips(floating_ip_address=address).\
@@ -2496,6 +2560,7 @@ class TestNeutronv2(TestNeutronv2Base):
 
         search_opts = {'device_owner': 'compute:nova',
                        'device_id': self.instance['uuid']}
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.list_ports(**search_opts).\
             AndReturn({'ports': [self.port_data2[0]]})
 
@@ -2509,7 +2574,7 @@ class TestNeutronv2(TestNeutronv2Base):
         api = neutronapi.API()
         address = self.fip_associated['floating_ip_address']
         fip_id = self.fip_associated['id']
-
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.list_floatingips(floating_ip_address=address).\
             AndReturn({'floatingips': [self.fip_associated]})
         self.moxed_client.update_floatingip(
@@ -2525,6 +2590,7 @@ class TestNeutronv2(TestNeutronv2Base):
         self._setup_mock_for_refresh_cache(api, [instance])
         network_id = uuids.my_netid1
         search_opts = {'network_id': network_id}
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.list_subnets(
             **search_opts).AndReturn({'subnets': self.subnet_data_n})
 
@@ -2558,6 +2624,7 @@ class TestNeutronv2(TestNeutronv2Base):
         search_opts = {'device_id': self.instance['uuid'],
                        'device_owner': zone,
                        'fixed_ips': 'ip_address=%s' % address}
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.list_ports(
             **search_opts).AndReturn({'ports': self.port_data1})
         port_req_body = {
@@ -2577,6 +2644,7 @@ class TestNeutronv2(TestNeutronv2Base):
     def test_list_floating_ips_without_l3_support(self):
         api = neutronapi.API()
         NeutronNotFound = exceptions.NotFound()
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.list_floatingips(
             fixed_ip_address='1.1.1.1', port_id=1).AndRaise(NeutronNotFound)
         self.mox.ReplayAll()
@@ -2592,6 +2660,7 @@ class TestNeutronv2(TestNeutronv2Base):
             'id': 'port-id',
             }
         api = neutronapi.API()
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.mox.StubOutWithMock(api, '_get_floating_ips_by_fixed_and_port')
         api._get_floating_ips_by_fixed_and_port(
             self.moxed_client, '1.1.1.1', 'port-id').AndReturn(
@@ -2614,10 +2683,10 @@ class TestNeutronv2(TestNeutronv2Base):
         fake_ips = [model.IP(x['ip_address']) for x in fake_port['fixed_ips']]
         api = neutronapi.API()
         self.mox.StubOutWithMock(api, '_get_subnets_from_port')
-        api._get_subnets_from_port(self.context, fake_port).AndReturn(
+        api._get_subnets_from_port(
+            self.context, fake_port, None).AndReturn(
             [fake_subnet])
         self.mox.ReplayAll()
-        neutronapi.get_client(uuids.fake)
         subnets = api._nw_info_get_subnets(self.context, fake_port, fake_ips)
         self.assertEqual(1, len(subnets))
         self.assertEqual(1, len(subnets[0]['ips']))
@@ -2634,6 +2703,7 @@ class TestNeutronv2(TestNeutronv2Base):
         fake_nets = [{'id': 'net-id', 'name': 'foo', 'tenant_id': 'tenant',
                       'mtu': 9000}]
         api = neutronapi.API()
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.mox.ReplayAll()
         neutronapi.get_client(uuids.fake)
         net, iid = api._nw_info_build_network(fake_port, fake_nets,
@@ -2688,6 +2758,7 @@ class TestNeutronv2(TestNeutronv2Base):
         fake_subnets = [model.Subnet(cidr='1.0.0.0/8')]
         fake_nets = [{'id': 'net-id2', 'name': 'foo', 'tenant_id': 'tenant'}]
         api = neutronapi.API()
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.mox.ReplayAll()
         neutronapi.get_client(uuids.fake)
         net, iid = api._nw_info_build_network(fake_port, fake_nets,
@@ -2709,6 +2780,7 @@ class TestNeutronv2(TestNeutronv2Base):
         fake_subnets = [model.Subnet(cidr='1.0.0.0/8')]
         fake_nets = [{'id': 'net-id', 'name': 'foo', 'tenant_id': 'tenant'}]
         api = neutronapi.API()
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.mox.ReplayAll()
         neutronapi.get_client(uuids.fake)
         net, iid = api._nw_info_build_network(fake_port, fake_nets,
@@ -2737,6 +2809,7 @@ class TestNeutronv2(TestNeutronv2Base):
         fake_subnets = [model.Subnet(cidr='1.0.0.0/8')]
         fake_nets = [{'id': 'net-id', 'name': 'foo', 'tenant_id': 'tenant'}]
         api = neutronapi.API()
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.mox.ReplayAll()
         neutronapi.get_client(uuids.fake)
         net, iid = api._nw_info_build_network(fake_port, fake_nets,
@@ -2852,8 +2925,8 @@ class TestNeutronv2(TestNeutronv2Base):
              'tenant_id': uuids.fake,
              }
             ]
-        neutronapi.get_client(mox.IgnoreArg(), admin=True).MultipleTimes(
-            ).AndReturn(self.moxed_client)
+        neutronapi.get_client(mox.IgnoreArg(), admin=True).AndReturn(
+            self.moxed_client)
         self.moxed_client.list_ports(
             tenant_id=uuids.fake, device_id=uuids.instance).AndReturn(
                 {'ports': fake_ports})
@@ -2867,13 +2940,13 @@ class TestNeutronv2(TestNeutronv2Base):
                 self.moxed_client, '1.1.1.1', requested_port['id']).AndReturn(
                     [{'floating_ip_address': '10.0.0.1'}])
         for requested_port in requested_ports:
-            api._get_subnets_from_port(self.context, requested_port
-                ).AndReturn(fake_subnets)
+            api._get_subnets_from_port(self.context, requested_port,
+                                       self.moxed_client).AndReturn(
+                fake_subnets)
 
         self.mox.StubOutWithMock(api, '_get_preexisting_port_ids')
         api._get_preexisting_port_ids(fake_inst).AndReturn(['port5'])
         self.mox.ReplayAll()
-        neutronapi.get_client(uuids.fake)
         fake_inst.info_cache = objects.InstanceInfoCache.new(
             self.context, uuids.instance)
         fake_inst.info_cache.network_info = model.NetworkInfo.hydrate([])
@@ -2963,8 +3036,8 @@ class TestNeutronv2(TestNeutronv2Base):
             ]
         fake_subnets = [model.Subnet(cidr='1.0.0.0/8')]
 
-        neutronapi.get_client(mox.IgnoreArg(), admin=True).MultipleTimes(
-        ).AndReturn(self.moxed_client)
+        neutronapi.get_client(mox.IgnoreArg(), admin=True).AndReturn(
+            self.moxed_client)
         self.moxed_client.list_ports(
             tenant_id=uuids.fake, device_id=uuids.instance).AndReturn(
                 {'ports': fake_ports})
@@ -2976,7 +3049,6 @@ class TestNeutronv2(TestNeutronv2Base):
         mock_nw_info_get_subnets.return_value = fake_subnets
 
         self.mox.ReplayAll()
-        neutronapi.get_client(uuids.fake)
 
         nw_infos = api._build_network_info_model(
             self.context, fake_inst)
@@ -2990,7 +3062,7 @@ class TestNeutronv2(TestNeutronv2Base):
         subnet_data1[0]['host_routes'] = [
             {'destination': '192.168.0.0/24', 'nexthop': '1.0.0.10'}
         ]
-
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.list_subnets(
             id=[port_data['fixed_ips'][0]['subnet_id']]
         ).AndReturn({'subnets': subnet_data1})
@@ -3010,6 +3082,7 @@ class TestNeutronv2(TestNeutronv2Base):
 
     def test_get_all_empty_list_networks(self):
         api = neutronapi.API()
+        neutronapi.get_client(mox.IgnoreArg()).AndReturn(self.moxed_client)
         self.moxed_client.list_networks().AndReturn({'networks': []})
         self.mox.ReplayAll()
         networks = api.get_all(self.context)
diff --git a/nova/tests/unit/scheduler/client/test_report.py b/nova/tests/unit/scheduler/client/test_report.py
index a85bf82..7af78e4 100644
--- a/nova/tests/unit/scheduler/client/test_report.py
+++ b/nova/tests/unit/scheduler/client/test_report.py
@@ -11,11 +11,13 @@
 #    under the License.
 
 import mock
+import six
 
 from keystoneauth1 import exceptions as ks_exc
 
 import nova.conf
 from nova import context
+from nova import exception
 from nova import objects
 from nova.objects import base as obj_base
 from nova.scheduler.client import report
@@ -120,6 +122,16 @@ class SchedulerReportClientTestCase(test.NoDBTestCase):
         super(SchedulerReportClientTestCase, self).setUp()
         self.context = context.get_admin_context()
         self.ks_sess_mock = mock.Mock()
+        self.compute_node = objects.ComputeNode(
+            uuid=uuids.compute_node,
+            hypervisor_hostname='foo',
+            vcpus=8,
+            cpu_allocation_ratio=16.0,
+            memory_mb=1024,
+            ram_allocation_ratio=1.5,
+            local_gb=10,
+            disk_allocation_ratio=1.0,
+        )
 
         with test.nested(
                 mock.patch('keystoneauth1.session.Session',
@@ -304,7 +316,7 @@ class SchedulerReportClientTestCase(test.NoDBTestCase):
         expected_provider = objects.ResourceProvider(
             uuid=uuid,
             name=name,
-            generation=1,
+            generation=0,
         )
         expected_url = '/resource_providers'
         self.ks_sess_mock.post.assert_called_once_with(
@@ -372,8 +384,6 @@ class SchedulerReportClientTestCase(test.NoDBTestCase):
         self.assertFalse(result)
 
     def test_compute_node_inventory(self):
-        # This is for making sure we only check once the I/O so we can directly
-        # call this helper method for the next tests.
         uuid = uuids.compute_node
         name = 'computehost'
         compute_node = objects.ComputeNode(uuid=uuid,
@@ -384,20 +394,18 @@ class SchedulerReportClientTestCase(test.NoDBTestCase):
                                            ram_allocation_ratio=1.5,
                                            local_gb=10,
                                            disk_allocation_ratio=1.0)
-        rp = objects.ResourceProvider(uuid=uuid, name=name, generation=42)
-        self.client._resource_providers[uuid] = rp
 
         self.flags(reserved_host_memory_mb=1000)
         self.flags(reserved_host_disk_mb=2000)
 
-        result = self.client._compute_node_inventory(compute_node)
+        result = report._compute_node_to_inventory_dict(compute_node)
 
-        expected_inventories = {
+        expected = {
             'VCPU': {
                 'total': compute_node.vcpus,
                 'reserved': 0,
                 'min_unit': 1,
-                'max_unit': 1,
+                'max_unit': compute_node.vcpus,
                 'step_size': 1,
                 'allocation_ratio': compute_node.cpu_allocation_ratio,
             },
@@ -405,7 +413,7 @@ class SchedulerReportClientTestCase(test.NoDBTestCase):
                 'total': compute_node.memory_mb,
                 'reserved': CONF.reserved_host_memory_mb,
                 'min_unit': 1,
-                'max_unit': 1,
+                'max_unit': compute_node.memory_mb,
                 'step_size': 1,
                 'allocation_ratio': compute_node.ram_allocation_ratio,
             },
@@ -413,77 +421,343 @@ class SchedulerReportClientTestCase(test.NoDBTestCase):
                 'total': compute_node.local_gb,
                 'reserved': CONF.reserved_host_disk_mb * 1024,
                 'min_unit': 1,
-                'max_unit': 1,
+                'max_unit': compute_node.local_gb,
                 'step_size': 1,
                 'allocation_ratio': compute_node.disk_allocation_ratio,
             },
         }
-        expected = {
-            'inventories': expected_inventories,
-        }
         self.assertEqual(expected, result)
 
+    def test_compute_node_inventory_empty(self):
+        uuid = uuids.compute_node
+        name = 'computehost'
+        compute_node = objects.ComputeNode(uuid=uuid,
+                                           hypervisor_hostname=name,
+                                           vcpus=0,
+                                           cpu_allocation_ratio=16.0,
+                                           memory_mb=0,
+                                           ram_allocation_ratio=1.5,
+                                           local_gb=0,
+                                           disk_allocation_ratio=1.0)
+        result = report._compute_node_to_inventory_dict(compute_node)
+        self.assertEqual({}, result)
+
+    @mock.patch('nova.scheduler.client.report.SchedulerReportClient.'
+                '_ensure_resource_provider')
+    @mock.patch('nova.scheduler.client.report.SchedulerReportClient.'
+                '_delete_inventory')
+    @mock.patch('nova.scheduler.client.report.SchedulerReportClient.'
+                '_update_inventory')
+    @mock.patch('nova.objects.ComputeNode.save')
+    def test_update_resource_stats(self, mock_save, mock_ui, mock_delete,
+            mock_erp):
+        cn = self.compute_node
+        self.client.update_resource_stats(cn)
+        mock_save.assert_called_once_with()
+        mock_erp.assert_called_once_with(cn.uuid, cn.hypervisor_hostname)
+        expected_inv_data = {
+            'VCPU': {
+                'total': 8,
+                'reserved': 0,
+                'min_unit': 1,
+                'max_unit': 8,
+                'step_size': 1,
+                'allocation_ratio': 16.0,
+            },
+            'MEMORY_MB': {
+                'total': 1024,
+                'reserved': 512,
+                'min_unit': 1,
+                'max_unit': 1024,
+                'step_size': 1,
+                'allocation_ratio': 1.5,
+            },
+            'DISK_GB': {
+                'total': 10,
+                'reserved': 0,
+                'min_unit': 1,
+                'max_unit': 10,
+                'step_size': 1,
+                'allocation_ratio': 1.0,
+            },
+        }
+        mock_ui.assert_called_once_with(
+            cn.uuid,
+            expected_inv_data,
+        )
+        self.assertFalse(mock_delete.called)
+
+    @mock.patch('nova.scheduler.client.report.SchedulerReportClient.'
+                '_ensure_resource_provider')
+    @mock.patch('nova.scheduler.client.report.SchedulerReportClient.'
+                '_delete_inventory')
+    @mock.patch('nova.scheduler.client.report.SchedulerReportClient.'
+                '_update_inventory')
+    @mock.patch('nova.objects.ComputeNode.save')
+    def test_update_resource_stats_no_inv(self, mock_save, mock_ui,
+            mock_delete, mock_erp):
+        """Ensure that if there are no inventory records, that we call
+        _delete_inventory() instead of _update_inventory().
+        """
+        cn = self.compute_node
+        cn.vcpus = 0
+        cn.memory_mb = 0
+        cn.local_gb = 0
+        self.client.update_resource_stats(cn)
+        mock_save.assert_called_once_with()
+        mock_erp.assert_called_once_with(cn.uuid, cn.hypervisor_hostname)
+        mock_delete.assert_called_once_with(cn.uuid)
+        self.assertFalse(mock_ui.called)
+
+    @mock.patch('nova.scheduler.client.report._extract_inventory_in_use')
+    @mock.patch('nova.scheduler.client.report.SchedulerReportClient.'
+                'put')
+    @mock.patch('nova.scheduler.client.report.SchedulerReportClient.'
+                'get')
+    def test_delete_inventory_already_no_inventory(self, mock_get, mock_put,
+            mock_extract):
+        cn = self.compute_node
+        rp = objects.ResourceProvider(uuid=cn.uuid, generation=42)
+        # Make sure the ResourceProvider exists for preventing to call the API
+        self.client._resource_providers[cn.uuid] = rp
+
+        mock_get.return_value.json.return_value = {
+            'resource_provider_generation': 1,
+            'inventories': {
+            }
+        }
+        result = self.client._delete_inventory(cn.uuid)
+        self.assertIsNone(result)
+        self.assertFalse(mock_put.called)
+        self.assertFalse(mock_extract.called)
+        new_gen = self.client._resource_providers[cn.uuid].generation
+        self.assertEqual(1, new_gen)
+
+    @mock.patch('nova.scheduler.client.report._extract_inventory_in_use')
+    @mock.patch('nova.scheduler.client.report.SchedulerReportClient.'
+                'put')
+    @mock.patch('nova.scheduler.client.report.SchedulerReportClient.'
+                'get')
+    def test_delete_inventory(self, mock_get, mock_put, mock_extract):
+        cn = self.compute_node
+        rp = objects.ResourceProvider(uuid=cn.uuid, generation=42)
+        # Make sure the ResourceProvider exists for preventing to call the API
+        self.client._resource_providers[cn.uuid] = rp
+
+        mock_get.return_value.json.return_value = {
+            'resource_provider_generation': 1,
+            'inventories': {
+                'VCPU': {'total': 16},
+                'MEMORY_MB': {'total': 1024},
+                'DISK_GB': {'total': 10},
+            }
+        }
+        mock_put.return_value.status_code = 200
+        mock_put.return_value.json.return_value = {
+            'resource_provider_generation': 44,
+            'inventories': {
+            }
+        }
+        result = self.client._delete_inventory(cn.uuid)
+        self.assertIsNone(result)
+        self.assertFalse(mock_extract.called)
+        new_gen = self.client._resource_providers[cn.uuid].generation
+        self.assertEqual(44, new_gen)
+
+    @mock.patch.object(report.LOG, 'warning')
+    @mock.patch('nova.scheduler.client.report.SchedulerReportClient.'
+                'put')
     @mock.patch('nova.scheduler.client.report.SchedulerReportClient.'
                 'get')
+    def test_delete_inventory_inventory_in_use(self, mock_get, mock_put,
+            mock_warn):
+        cn = self.compute_node
+        rp = objects.ResourceProvider(uuid=cn.uuid, generation=42)
+        # Make sure the ResourceProvider exists for preventing to call the API
+        self.client._resource_providers[cn.uuid] = rp
+
+        mock_get.return_value.json.return_value = {
+            'resource_provider_generation': 1,
+            'inventories': {
+                'VCPU': {'total': 16},
+                'MEMORY_MB': {'total': 1024},
+                'DISK_GB': {'total': 10},
+            }
+        }
+        mock_put.return_value.status_code = 409
+        rc_str = "VCPU, MEMORY_MB"
+        in_use_exc = exception.InventoryInUse(
+            resource_classes=rc_str,
+            resource_provider=cn.uuid,
+        )
+        fault_text = """
+409 Conflict
+
+There was a conflict when trying to complete your request.
+
+ update conflict: %s
+ """ % six.text_type(in_use_exc)
+        mock_put.return_value.text = fault_text
+        mock_put.return_value.json.return_value = {
+            'resource_provider_generation': 44,
+            'inventories': {
+            }
+        }
+        result = self.client._delete_inventory(cn.uuid)
+        self.assertIsNone(result)
+        self.assertTrue(mock_warn.called)
+
+    @mock.patch.object(report.LOG, 'error')
+    @mock.patch.object(report.LOG, 'warning')
     @mock.patch('nova.scheduler.client.report.SchedulerReportClient.'
                 'put')
     @mock.patch('nova.scheduler.client.report.SchedulerReportClient.'
-                '_compute_node_inventory')
-    def test_update_inventory(self, mock_inv, mock_put, mock_get):
+                'get')
+    def test_delete_inventory_inventory_error(self, mock_get, mock_put,
+            mock_warn, mock_error):
+        cn = self.compute_node
+        rp = objects.ResourceProvider(uuid=cn.uuid, generation=42)
+        # Make sure the ResourceProvider exists for preventing to call the API
+        self.client._resource_providers[cn.uuid] = rp
+
+        mock_get.return_value.json.return_value = {
+            'resource_provider_generation': 1,
+            'inventories': {
+                'VCPU': {'total': 16},
+                'MEMORY_MB': {'total': 1024},
+                'DISK_GB': {'total': 10},
+            }
+        }
+        mock_put.return_value.status_code = 409
+        mock_put.return_value.text = (
+            'There was a failure'
+        )
+        mock_put.return_value.json.return_value = {
+            'resource_provider_generation': 44,
+            'inventories': {
+            }
+        }
+        result = self.client._delete_inventory(cn.uuid)
+        self.assertIsNone(result)
+        self.assertFalse(mock_warn.called)
+        self.assertTrue(mock_error.called)
+
+    @mock.patch('nova.scheduler.client.report.SchedulerReportClient.'
+                'get')
+    @mock.patch('nova.scheduler.client.report.SchedulerReportClient.'
+                'put')
+    def test_update_inventory(self, mock_put, mock_get):
         # Ensure _update_inventory() returns a list of Inventories objects
         # after creating or updating the existing values
         uuid = uuids.compute_node
-        compute_node = objects.ComputeNode(uuid=uuid,
-                                           hypervisor_hostname='foo')
+        compute_node = self.compute_node
         rp = objects.ResourceProvider(uuid=uuid, name='foo', generation=42)
         # Make sure the ResourceProvider exists for preventing to call the API
         self.client._resource_providers[uuid] = rp
 
-        mock_inv.return_value = {'inventories': []}
         mock_get.return_value.json.return_value = {
             'resource_provider_generation': 43,
-            'inventories': {'VCPU': {'total': 16}},
+            'inventories': {
+                'VCPU': {'total': 16},
+                'MEMORY_MB': {'total': 1024},
+                'DISK_GB': {'total': 10},
+            }
         }
         mock_put.return_value.status_code = 200
         mock_put.return_value.json.return_value = {
             'resource_provider_generation': 44,
-            'inventories': {'VCPU': {'total': 16}},
+            'inventories': {
+                'VCPU': {'total': 16},
+                'MEMORY_MB': {'total': 1024},
+                'DISK_GB': {'total': 10},
+            }
         }
 
-        result = self.client._update_inventory_attempt(compute_node)
+        inv_data = report._compute_node_to_inventory_dict(compute_node)
+        result = self.client._update_inventory_attempt(
+            compute_node.uuid, inv_data
+        )
         self.assertTrue(result)
 
         exp_url = '/resource_providers/%s/inventories' % uuid
         mock_get.assert_called_once_with(exp_url)
-        # Called with the newly-found generation from the existing inventory
-        self.assertEqual(43,
-                         mock_inv.return_value['resource_provider_generation'])
         # Updated with the new inventory from the PUT call
         self.assertEqual(44, rp.generation)
-        mock_put.assert_called_once_with(exp_url, mock_inv.return_value)
+        expected = {
+            # Called with the newly-found generation from the existing
+            # inventory
+            'resource_provider_generation': 43,
+            'inventories': {
+                'VCPU': {
+                    'total': 8,
+                    'reserved': 0,
+                    'min_unit': 1,
+                    'max_unit': compute_node.vcpus,
+                    'step_size': 1,
+                    'allocation_ratio': compute_node.cpu_allocation_ratio,
+                },
+                'MEMORY_MB': {
+                    'total': 1024,
+                    'reserved': CONF.reserved_host_memory_mb,
+                    'min_unit': 1,
+                    'max_unit': compute_node.memory_mb,
+                    'step_size': 1,
+                    'allocation_ratio': compute_node.ram_allocation_ratio,
+                },
+                'DISK_GB': {
+                    'total': 10,
+                    'reserved': CONF.reserved_host_disk_mb * 1024,
+                    'min_unit': 1,
+                    'max_unit': compute_node.local_gb,
+                    'step_size': 1,
+                    'allocation_ratio': compute_node.disk_allocation_ratio,
+                },
+            }
+        }
+        mock_put.assert_called_once_with(exp_url, expected)
 
     @mock.patch('nova.scheduler.client.report.SchedulerReportClient.'
                 'get')
     @mock.patch('nova.scheduler.client.report.SchedulerReportClient.'
                 'put')
-    @mock.patch('nova.scheduler.client.report.SchedulerReportClient.'
-                '_compute_node_inventory')
-    def test_update_inventory_no_update(self, mock_inv, mock_put, mock_get):
+    def test_update_inventory_no_update(self, mock_put, mock_get):
         uuid = uuids.compute_node
-        compute_node = objects.ComputeNode(uuid=uuid,
-                                           hypervisor_hostname='foo')
+        compute_node = self.compute_node
         rp = objects.ResourceProvider(uuid=uuid, name='foo', generation=42)
         self.client._resource_providers[uuid] = rp
-        mock_inv.return_value = {'inventories': {
-            'VCPU': {'total': 8},
-        }}
         mock_get.return_value.json.return_value = {
             'resource_provider_generation': 43,
             'inventories': {
-                'VCPU': {'total': 8}
+                'VCPU': {
+                    'total': 8,
+                    'reserved': 0,
+                    'min_unit': 1,
+                    'max_unit': compute_node.vcpus,
+                    'step_size': 1,
+                    'allocation_ratio': compute_node.cpu_allocation_ratio,
+                },
+                'MEMORY_MB': {
+                    'total': 1024,
+                    'reserved': CONF.reserved_host_memory_mb,
+                    'min_unit': 1,
+                    'max_unit': compute_node.memory_mb,
+                    'step_size': 1,
+                    'allocation_ratio': compute_node.ram_allocation_ratio,
+                },
+                'DISK_GB': {
+                    'total': 10,
+                    'reserved': CONF.reserved_host_disk_mb * 1024,
+                    'min_unit': 1,
+                    'max_unit': compute_node.local_gb,
+                    'step_size': 1,
+                    'allocation_ratio': compute_node.disk_allocation_ratio,
+                },
             }
         }
-        result = self.client._update_inventory_attempt(compute_node)
+        inv_data = report._compute_node_to_inventory_dict(compute_node)
+        result = self.client._update_inventory_attempt(
+            compute_node.uuid, inv_data
+        )
         self.assertTrue(result)
         exp_url = '/resource_providers/%s/inventories' % uuid
         mock_get.assert_called_once_with(exp_url)
@@ -497,54 +771,51 @@ class SchedulerReportClientTestCase(test.NoDBTestCase):
     @mock.patch('nova.scheduler.client.report.SchedulerReportClient.'
                 'put')
     @mock.patch('nova.scheduler.client.report.SchedulerReportClient.'
-                '_compute_node_inventory')
-    @mock.patch('nova.scheduler.client.report.SchedulerReportClient.'
                 '_ensure_resource_provider')
-    def test_update_inventory_conflicts(self, mock_ensure, mock_inv,
+    def test_update_inventory_conflicts(self, mock_ensure,
                                         mock_put, mock_get):
         # Ensure _update_inventory() returns a list of Inventories objects
         # after creating or updating the existing values
         uuid = uuids.compute_node
-        compute_node = objects.ComputeNode(uuid=uuid,
-                                           hypervisor_hostname='foo')
+        compute_node = self.compute_node
         rp = objects.ResourceProvider(uuid=uuid, name='foo', generation=42)
         # Make sure the ResourceProvider exists for preventing to call the API
         self.client._resource_providers[uuid] = rp
 
-        mock_inv.return_value = {'inventories': [{'resource_class': 'VCPU'}]}
         mock_get.return_value = {}
         mock_put.return_value.status_code = 409
 
-        result = self.client._update_inventory_attempt(compute_node)
+        inv_data = report._compute_node_to_inventory_dict(compute_node)
+        result = self.client._update_inventory_attempt(
+            compute_node.uuid, inv_data
+        )
         self.assertFalse(result)
 
         # Invalidated the cache
         self.assertNotIn(uuid, self.client._resource_providers)
         # Refreshed our resource provider
-        mock_ensure.assert_called_once_with(uuid, 'foo')
+        mock_ensure.assert_called_once_with(uuid)
 
     @mock.patch('nova.scheduler.client.report.SchedulerReportClient.'
                 '_get_inventory')
     @mock.patch('nova.scheduler.client.report.SchedulerReportClient.'
                 'put')
-    @mock.patch('nova.scheduler.client.report.SchedulerReportClient.'
-                '_compute_node_inventory')
-    def test_update_inventory_unknown_response(self, mock_inv,
-                                               mock_put, mock_get):
+    def test_update_inventory_unknown_response(self, mock_put, mock_get):
         # Ensure _update_inventory() returns a list of Inventories objects
         # after creating or updating the existing values
         uuid = uuids.compute_node
-        compute_node = objects.ComputeNode(uuid=uuid,
-                                           hypervisor_hostname='foo')
+        compute_node = self.compute_node
         rp = objects.ResourceProvider(uuid=uuid, name='foo', generation=42)
         # Make sure the ResourceProvider exists for preventing to call the API
         self.client._resource_providers[uuid] = rp
 
-        mock_inv.return_value = {'inventories': [{'resource_class': 'VCPU'}]}
         mock_get.return_value = {}
         mock_put.return_value.status_code = 234
 
-        result = self.client._update_inventory_attempt(compute_node)
+        inv_data = report._compute_node_to_inventory_dict(compute_node)
+        result = self.client._update_inventory_attempt(
+            compute_node.uuid, inv_data
+        )
         self.assertFalse(result)
 
         # No cache invalidation
@@ -554,20 +825,15 @@ class SchedulerReportClientTestCase(test.NoDBTestCase):
                 '_get_inventory')
     @mock.patch('nova.scheduler.client.report.SchedulerReportClient.'
                 'put')
-    @mock.patch('nova.scheduler.client.report.SchedulerReportClient.'
-                '_compute_node_inventory')
-    def test_update_inventory_failed(self, mock_inv,
-                                     mock_put, mock_get):
+    def test_update_inventory_failed(self, mock_put, mock_get):
         # Ensure _update_inventory() returns a list of Inventories objects
         # after creating or updating the existing values
         uuid = uuids.compute_node
-        compute_node = objects.ComputeNode(uuid=uuid,
-                                           hypervisor_hostname='foo')
+        compute_node = self.compute_node
         rp = objects.ResourceProvider(uuid=uuid, name='foo', generation=42)
         # Make sure the ResourceProvider exists for preventing to call the API
         self.client._resource_providers[uuid] = rp
 
-        mock_inv.return_value = {'inventories': [{'resource_class': 'VCPU'}]}
         mock_get.return_value = {}
         try:
             mock_put.return_value.__nonzero__.return_value = False
@@ -575,7 +841,10 @@ class SchedulerReportClientTestCase(test.NoDBTestCase):
             # Thanks py3
             mock_put.return_value.__bool__.return_value = False
 
-        result = self.client._update_inventory_attempt(compute_node)
+        inv_data = report._compute_node_to_inventory_dict(compute_node)
+        result = self.client._update_inventory_attempt(
+            compute_node.uuid, inv_data
+        )
         self.assertFalse(result)
 
         # No cache invalidation
@@ -595,7 +864,9 @@ class SchedulerReportClientTestCase(test.NoDBTestCase):
         mock_update.side_effect = (False, True)
 
         self.client._resource_providers[cn.uuid] = True
-        result = self.client._update_inventory(cn)
+        result = self.client._update_inventory(
+            cn.uuid, mock.sentinel.inv_data
+        )
         self.assertTrue(result)
 
         # Only slept once
@@ -614,43 +885,29 @@ class SchedulerReportClientTestCase(test.NoDBTestCase):
         mock_update.side_effect = (False, False, False)
 
         self.client._resource_providers[cn.uuid] = True
-        result = self.client._update_inventory(cn)
+        result = self.client._update_inventory(
+            cn.uuid, mock.sentinel.inv_data
+        )
         self.assertFalse(result)
 
         # Slept three times
         mock_sleep.assert_has_calls([mock.call(1), mock.call(1), mock.call(1)])
 
         # Three attempts to update
-        mock_update.assert_has_calls([mock.call(cn), mock.call(cn),
-                                      mock.call(cn)])
+        mock_update.assert_has_calls([
+            mock.call(cn.uuid, mock.sentinel.inv_data),
+            mock.call(cn.uuid, mock.sentinel.inv_data),
+            mock.call(cn.uuid, mock.sentinel.inv_data),
+        ])
 
         # Slept three times
         mock_sleep.assert_has_calls([mock.call(1), mock.call(1), mock.call(1)])
 
-    @mock.patch('nova.scheduler.client.report.SchedulerReportClient.'
-                '_ensure_resource_provider')
-    @mock.patch('nova.scheduler.client.report.SchedulerReportClient.'
-                '_update_inventory_attempt')
-    def test_update_resource_stats_rp_fail(self, mock_ui, mock_erp):
-        cn = mock.MagicMock()
-        self.client.update_resource_stats(cn)
-        cn.save.assert_called_once_with()
-        mock_erp.assert_called_once_with(cn.uuid, cn.hypervisor_hostname)
-        self.assertFalse(mock_ui.called)
 
-    @mock.patch('nova.scheduler.client.report.SchedulerReportClient.'
-                '_ensure_resource_provider')
-    @mock.patch.object(objects.ComputeNode, 'save')
-    def test_update_resource_stats_saves(self, mock_save, mock_ensure):
-        cn = objects.ComputeNode(context=self.context,
-                                 uuid=uuids.compute_node,
-                                 hypervisor_hostname='host1')
-        self.client.update_resource_stats(cn)
-        mock_save.assert_called_once_with()
-        mock_ensure.assert_called_once_with(uuids.compute_node, 'host1')
+class TestAllocations(SchedulerReportClientTestCase):
 
     @mock.patch('nova.compute.utils.is_volume_backed_instance')
-    def test_allocations(self, mock_vbi):
+    def test_instance_to_allocations_dict(self, mock_vbi):
         mock_vbi.return_value = False
         inst = objects.Instance(
             uuid=uuids.inst,
@@ -659,15 +916,16 @@ class SchedulerReportClientTestCase(test.NoDBTestCase):
                                   ephemeral_gb=100,
                                   memory_mb=1024,
                                   vcpus=2))
+        result = report._instance_to_allocations_dict(inst)
         expected = {
             'MEMORY_MB': 1024,
             'VCPU': 2,
             'DISK_GB': 111,
         }
-        self.assertEqual(expected, self.client._allocations(inst))
+        self.assertEqual(expected, result)
 
     @mock.patch('nova.compute.utils.is_volume_backed_instance')
-    def test_allocations_boot_from_volume(self, mock_vbi):
+    def test_instance_to_allocations_dict_boot_from_volume(self, mock_vbi):
         mock_vbi.return_value = True
         inst = objects.Instance(
             uuid=uuids.inst,
@@ -676,38 +934,61 @@ class SchedulerReportClientTestCase(test.NoDBTestCase):
                                   ephemeral_gb=100,
                                   memory_mb=1024,
                                   vcpus=2))
+        result = report._instance_to_allocations_dict(inst)
         expected = {
             'MEMORY_MB': 1024,
             'VCPU': 2,
             'DISK_GB': 101,
         }
-        self.assertEqual(expected, self.client._allocations(inst))
+        self.assertEqual(expected, result)
+
+    @mock.patch('nova.compute.utils.is_volume_backed_instance')
+    def test_instance_to_allocations_dict_zero_disk(self, mock_vbi):
+        mock_vbi.return_value = True
+        inst = objects.Instance(
+            uuid=uuids.inst,
+            flavor=objects.Flavor(root_gb=10,
+                                  swap=0,
+                                  ephemeral_gb=0,
+                                  memory_mb=1024,
+                                  vcpus=2))
+        result = report._instance_to_allocations_dict(inst)
+        expected = {
+            'MEMORY_MB': 1024,
+            'VCPU': 2,
+        }
+        self.assertEqual(expected, result)
 
     @mock.patch('nova.scheduler.client.report.SchedulerReportClient.'
                 'put')
     @mock.patch('nova.scheduler.client.report.SchedulerReportClient.'
                 'get')
-    def test_update_instance_allocation_new(self, mock_get, mock_put):
+    @mock.patch('nova.scheduler.client.report.'
+                '_instance_to_allocations_dict')
+    def test_update_instance_allocation_new(self, mock_a, mock_get,
+                                            mock_put):
         cn = objects.ComputeNode(uuid=uuids.cn)
         inst = objects.Instance(uuid=uuids.inst)
         mock_get.return_value.json.return_value = {'allocations': {}}
-        with mock.patch.object(self.client, '_allocations') as mock_a:
-            expected = {
-                'allocations': [
-                    {'resource_provider': {'uuid': cn.uuid},
-                     'resources': mock_a.return_value}]
-            }
-            self.client.update_instance_allocation(cn, inst, 1)
-            mock_put.assert_called_once_with(
-                '/allocations/%s' % inst.uuid,
-                expected)
-            self.assertTrue(mock_get.called)
+        expected = {
+            'allocations': [
+                {'resource_provider': {'uuid': cn.uuid},
+                 'resources': mock_a.return_value}]
+        }
+        self.client.update_instance_allocation(cn, inst, 1)
+        mock_put.assert_called_once_with(
+            '/allocations/%s' % inst.uuid,
+            expected)
+        self.assertTrue(mock_get.called)
 
     @mock.patch('nova.scheduler.client.report.SchedulerReportClient.'
                 'put')
     @mock.patch('nova.scheduler.client.report.SchedulerReportClient.'
                 'get')
-    def test_update_instance_allocation_existing(self, mock_get, mock_put):
+    @mock.patch('nova.scheduler.client.report.'
+                '_instance_to_allocations_dict')
+    def test_update_instance_allocation_existing(self, mock_a, mock_get,
+                                                 mock_put):
         cn = objects.ComputeNode(uuid=uuids.cn)
         inst = objects.Instance(uuid=uuids.inst)
         mock_get.return_value.json.return_value = {'allocations': {
@@ -719,33 +1000,33 @@ class SchedulerReportClientTestCase(test.NoDBTestCase):
                 }
             }}
         }
-        with mock.patch.object(self.client, '_allocations') as mock_a:
-            mock_a.return_value = {
-                'DISK_GB': 123,
-                'MEMORY_MB': 456,
-            }
-            self.client.update_instance_allocation(cn, inst, 1)
-            self.assertFalse(mock_put.called)
-            mock_get.assert_called_once_with(
-                '/allocations/%s' % inst.uuid)
+        mock_a.return_value = {
+            'DISK_GB': 123,
+            'MEMORY_MB': 456,
+        }
+        self.client.update_instance_allocation(cn, inst, 1)
+        self.assertFalse(mock_put.called)
+        mock_get.assert_called_once_with(
+            '/allocations/%s' % inst.uuid)
 
     @mock.patch('nova.scheduler.client.report.SchedulerReportClient.'
                 'get')
     @mock.patch('nova.scheduler.client.report.SchedulerReportClient.'
                 'put')
+    @mock.patch('nova.scheduler.client.report.'
+                '_instance_to_allocations_dict')
     @mock.patch.object(report.LOG, 'warning')
-    def test_update_instance_allocation_new_failed(self, mock_warn, mock_put,
-                                                   mock_get):
+    def test_update_instance_allocation_new_failed(self, mock_warn, mock_a,
+                                                   mock_put, mock_get):
         cn = objects.ComputeNode(uuid=uuids.cn)
         inst = objects.Instance(uuid=uuids.inst)
-        with mock.patch.object(self.client, '_allocations'):
-            try:
-                mock_put.return_value.__nonzero__.return_value = False
-            except AttributeError:
-                # NOTE(danms): LOL @ py3
-                mock_put.return_value.__bool__.return_value = False
-            self.client.update_instance_allocation(cn, inst, 1)
-            self.assertTrue(mock_warn.called)
+        try:
+            mock_put.return_value.__nonzero__.return_value = False
+        except AttributeError:
+            # NOTE(danms): LOL @ py3
+            mock_put.return_value.__bool__.return_value = False
+        self.client.update_instance_allocation(cn, inst, 1)
+        self.assertTrue(mock_warn.called)
 
     @mock.patch('nova.scheduler.client.report.SchedulerReportClient.'
                 'delete')
@@ -775,8 +1056,10 @@ class SchedulerReportClientTestCase(test.NoDBTestCase):
                 'delete')
     @mock.patch('nova.scheduler.client.report.SchedulerReportClient.'
                 'get')
-    def test_remove_deleted_instances(
-            self, mock_get, mock_delete):
+    @mock.patch('nova.scheduler.client.report.'
+                '_instance_to_allocations_dict')
+    def test_remove_deleted_instances(self, mock_a, mock_get,
+                                      mock_delete):
         cn = objects.ComputeNode(uuid=uuids.cn)
         inst1 = objects.Instance(uuid=uuids.inst1)
         inst2 = objects.Instance(uuid=uuids.inst2)
@@ -796,11 +1079,10 @@ class SchedulerReportClientTestCase(test.NoDBTestCase):
         inst3 = {'uuid': 'foo'}
 
         mock_delete.return_value = True
-        with mock.patch.object(self.client, '_allocations'):
-            self.client.remove_deleted_instances(cn, [inst3])
-            mock_get.assert_called_once_with(
-                '/resource_providers/%s/allocations' % cn.uuid)
-            expected_calls = [
-                mock.call('/allocations/%s' % inst1.uuid),
-                mock.call('/allocations/%s' % inst2.uuid)]
-            mock_delete.assert_has_calls(expected_calls, any_order=True)
+        self.client.remove_deleted_instances(cn, [inst3])
+        mock_get.assert_called_once_with(
+            '/resource_providers/%s/allocations' % cn.uuid)
+        expected_calls = [
+            mock.call('/allocations/%s' % inst1.uuid),
+            mock.call('/allocations/%s' % inst2.uuid)]
+        mock_delete.assert_has_calls(expected_calls, any_order=True)
diff --git a/nova/tests/unit/test_exception.py b/nova/tests/unit/test_exception.py
index a9bada1..55478a6 100644
--- a/nova/tests/unit/test_exception.py
+++ b/nova/tests/unit/test_exception.py
@@ -61,6 +61,7 @@ class WrapExceptionTestCase(test.NoDBTestCase):
         self.assertEqual(3, notification.payload['args']['extra'])
         for key in ['exception', 'args']:
             self.assertIn(key, notification.payload.keys())
+        self.assertNotIn('context', notification.payload['args'].keys())
 
         self.assertEqual(1, len(fake_notifier.VERSIONED_NOTIFICATIONS))
         notification = fake_notifier.VERSIONED_NOTIFICATIONS[0]
diff --git a/nova/tests/unit/virt/libvirt/test_driver.py b/nova/tests/unit/virt/libvirt/test_driver.py
index 0c8d6c0..69dc8d8 100644
--- a/nova/tests/unit/virt/libvirt/test_driver.py
+++ b/nova/tests/unit/virt/libvirt/test_driver.py
@@ -3584,18 +3584,25 @@ class LibvirtConnTestCase(test.NoDBTestCase):
                               vconfig.LibvirtConfigMemoryBalloon)
 
         self.assertEqual(cfg.devices[4].target_name, "com.redhat.spice.0")
+        self.assertEqual(cfg.devices[4].type, 'spicevmc')
         self.assertEqual(cfg.devices[5].type, "spice")
         self.assertEqual(cfg.devices[6].type, "qxl")
 
+    @mock.patch.object(host.Host, 'get_guest')
+    @mock.patch.object(libvirt_driver.LibvirtDriver,
+                       '_get_serial_ports_from_guest')
     @mock.patch('nova.console.serial.acquire_port')
     @mock.patch('nova.virt.hardware.get_number_of_serial_ports',
                 return_value=1)
     @mock.patch.object(libvirt_driver.libvirt_utils, 'get_arch',)
     def test_create_serial_console_devices_based_on_arch(self, mock_get_arch,
-                                           mock_get_port_number,
-                                           mock_acquire_port):
+                                                         mock_get_port_number,
+                                                         mock_acquire_port,
+                                                         mock_ports,
+                                                         mock_guest):
         self.flags(enabled=True, group='serial_console')
         drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True)
+        instance = objects.Instance(**self.test_instance)
 
         expected = {arch.X86_64: vconfig.LibvirtConfigGuestSerial,
                     arch.S390: vconfig.LibvirtConfigGuestConsole,
@@ -3604,19 +3611,22 @@ class LibvirtConnTestCase(test.NoDBTestCase):
         for guest_arch, device_type in expected.items():
             mock_get_arch.return_value = guest_arch
             guest = vconfig.LibvirtConfigGuest()
-            drvr._create_serial_console_devices(guest, instance=None,
+            drvr._create_serial_console_devices(guest, instance=instance,
                                                 flavor={}, image_meta={})
             self.assertEqual(1, len(guest.devices))
             console_device = guest.devices[0]
             self.assertIsInstance(console_device, device_type)
             self.assertEqual("tcp", console_device.type)
 
+    @mock.patch.object(host.Host, 'get_guest')
+    @mock.patch.object(libvirt_driver.LibvirtDriver,
+                       '_get_serial_ports_from_guest')
     @mock.patch('nova.virt.hardware.get_number_of_serial_ports',
                 return_value=4)
     @mock.patch.object(libvirt_driver.libvirt_utils, 'get_arch',
                        side_effect=[arch.X86_64, arch.S390, arch.S390X])
     def test_create_serial_console_devices_with_limit_exceeded_based_on_arch(
-            self, mock_get_arch, mock_get_port_number):
+            self, mock_get_arch, mock_get_port_number, mock_ports, mock_guest):
         self.flags(enabled=True, group='serial_console')
         self.flags(virt_type="qemu", group='libvirt')
         flavor = 'fake_flavor'
@@ -4116,6 +4126,7 @@ class LibvirtConnTestCase(test.NoDBTestCase):
 
         self.assertEqual(cfg.devices[4].type, "tablet")
         self.assertEqual(cfg.devices[5].target_name, "com.redhat.spice.0")
+        self.assertEqual(cfg.devices[5].type, 'spicevmc')
         self.assertEqual(cfg.devices[6].type, "vnc")
         self.assertEqual(cfg.devices[7].type, "spice")
 
@@ -7839,24 +7850,27 @@ class LibvirtConnTestCase(test.NoDBTestCase):
                 drvr._get_volume_config)
             self.assertEqual(target_xml, config)
 
+    @mock.patch.object(libvirt_driver.LibvirtDriver,
+                       '_get_serial_ports_from_guest')
     @mock.patch.object(fakelibvirt.virDomain, "migrateToURI2")
     @mock.patch.object(fakelibvirt.virDomain, "XMLDesc")
     def test_live_migration_update_serial_console_xml(self, mock_xml,
-                                                      mock_migrate):
+                                                      mock_migrate, mock_get):
         self.compute = importutils.import_object(CONF.compute_manager)
         instance_ref = self.test_instance
 
         xml_tmpl = ("<domain type='kvm'>"
                     "<devices>"
                     "<console type='tcp'>"
-                    "<source mode='bind' host='{addr}' service='10000'/>"
+                    "<source mode='bind' host='{addr}' service='{port}'/>"
+                    "<target type='serial' port='0'/>"
                     "</console>"
                     "</devices>"
                     "</domain>")
 
-        initial_xml = xml_tmpl.format(addr='9.0.0.1')
+        initial_xml = xml_tmpl.format(addr='9.0.0.1', port='10100')
 
-        target_xml = xml_tmpl.format(addr='9.0.0.12')
+        target_xml = xml_tmpl.format(addr='9.0.0.12', port='10200')
         target_xml = etree.tostring(etree.fromstring(target_xml))
 
         # Preparing mocks
@@ -7871,7 +7885,8 @@ class LibvirtConnTestCase(test.NoDBTestCase):
             serial_listen_addr='9.0.0.12',
             target_connect_addr=None,
             bdms=[],
-            block_migration=False)
+            block_migration=False,
+            serial_listen_ports=[10200])
         dom = fakelibvirt.virDomain
         guest = libvirt_guest.Guest(dom)
         drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False)
@@ -14586,18 +14601,12 @@ class LibvirtConnTestCase(test.NoDBTestCase):
 
     @mock.patch('nova.virt.libvirt.driver.LibvirtDriver._disconnect_volume')
     @mock.patch('nova.virt.libvirt.driver.LibvirtDriver._swap_volume')
-    @mock.patch('nova.objects.block_device.BlockDeviceMapping.'
-                'get_by_volume_and_instance')
     @mock.patch('nova.virt.libvirt.driver.LibvirtDriver._get_volume_config')
     @mock.patch('nova.virt.libvirt.driver.LibvirtDriver._connect_volume')
     @mock.patch('nova.virt.libvirt.host.Host.get_guest')
-    def _test_swap_volume_driver_bdm_save(self, get_guest,
-                                         connect_volume, get_volume_config,
-                                         get_by_volume_and_instance,
-                                         swap_volume,
-                                         disconnect_volume,
-                                         volume_save,
-                                         source_type):
+    def _test_swap_volume_driver(self, get_guest, connect_volume,
+                                 get_volume_config, swap_volume,
+                                 disconnect_volume, source_type):
         conn = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI())
         instance = objects.Instance(**self.test_instance)
         old_connection_info = {'driver_volume_type': 'fake',
@@ -14626,16 +14635,6 @@ class LibvirtConnTestCase(test.NoDBTestCase):
         get_volume_config.return_value = mock.MagicMock(
             source_path='/fake-new-volume')
 
-        bdm = objects.BlockDeviceMapping(self.context,
-            **fake_block_device.FakeDbBlockDeviceDict(
-                {'id': 2, 'instance_uuid': uuids.instance,
-                 'device_name': '/dev/vdb',
-                 'source_type': source_type,
-                 'destination_type': 'volume',
-                 'volume_id': 'fake-volume-id-2',
-                 'boot_index': 0}))
-        get_by_volume_and_instance.return_value = bdm
-
         conn.swap_volume(old_connection_info, new_connection_info, instance,
                          '/dev/vdb', 1)
 
@@ -14645,22 +14644,15 @@ class LibvirtConnTestCase(test.NoDBTestCase):
         swap_volume.assert_called_once_with(guest, 'vdb',
                                             '/fake-new-volume', 1)
         disconnect_volume.assert_called_once_with(old_connection_info, 'vdb')
-        volume_save.assert_called_once_with()
-
-    @mock.patch('nova.virt.block_device.DriverVolumeBlockDevice.save')
-    def test_swap_volume_driver_bdm_save_source_is_volume(self, volume_save):
-        self._test_swap_volume_driver_bdm_save(volume_save=volume_save,
-                                          source_type='volume')
-
-    @mock.patch('nova.virt.block_device.DriverImageBlockDevice.save')
-    def test_swap_volume_driver_bdm_save_source_is_image(self, volume_save):
-        self._test_swap_volume_driver_bdm_save(volume_save=volume_save,
-                                          source_type='image')
-
-    @mock.patch('nova.virt.block_device.DriverSnapshotBlockDevice.save')
-    def test_swap_volume_driver_bdm_save_source_is_snapshot(self, volume_save):
-        self._test_swap_volume_driver_bdm_save(volume_save=volume_save,
-                                          source_type='snapshot')
+
+    def test_swap_volume_driver_source_is_volume(self):
+        self._test_swap_volume_driver(source_type='volume')
+
+    def test_swap_volume_driver_source_is_image(self):
+        self._test_swap_volume_driver(source_type='image')
+
+    def test_swap_volume_driver_source_is_snapshot(self):
+        self._test_swap_volume_driver(source_type='snapshot')
 
     @mock.patch('nova.virt.libvirt.guest.BlockDevice.is_job_complete')
     def _test_live_snapshot(self, mock_is_job_complete,
diff --git a/nova/tests/unit/virt/test_driver.py b/nova/tests/unit/virt/test_driver.py
index aa7478c..041ff3e 100644
--- a/nova/tests/unit/virt/test_driver.py
+++ b/nova/tests/unit/virt/test_driver.py
@@ -13,6 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import mock
+from os_brick.initiator import connector
 from oslo_config import fixture as fixture_config
 
 from nova import test
@@ -29,6 +31,13 @@ class FakeDriver2(FakeDriver):
     pass
 
 
+class FailDriver(object):
+    def __init__(self):
+        self.connector = connector.InitiatorConnector.factory(
+            'UNSUPPORTED', None
+        )
+
+
 class ToDriverRegistryTestCase(test.NoDBTestCase):
 
     def assertDriverInstance(self, inst, class_, *args, **kwargs):
@@ -59,6 +68,14 @@ class ToDriverRegistryTestCase(test.NoDBTestCase):
             FakeDriver2, 'arg1', 'arg2', param1='value1',
             param2='value2')
 
+    @mock.patch.object(connector.InitiatorConnector, "factory")
+    def test_driver_dict_from_config_exception(self, mocked_factory):
+        mocked_factory.side_effect = ValueError
+        registry = driver.driver_dict_from_config([
+            'fail=nova.tests.unit.virt.test_driver.FailDriver',
+        ])
+        self.assertEqual({}, registry)
+
 
 class DriverMethodTestCase(test.NoDBTestCase):
 
diff --git a/nova/virt/driver.py b/nova/virt/driver.py
index 1ca49a4..7bd4464 100644
--- a/nova/virt/driver.py
+++ b/nova/virt/driver.py
@@ -41,8 +41,15 @@ def driver_dict_from_config(named_driver_config, *args, **kwargs):
     for driver_str in named_driver_config:
         driver_type, _sep, driver = driver_str.partition('=')
         driver_class = importutils.import_class(driver)
-        driver_registry[driver_type] = driver_class(*args, **kwargs)
-
+        try:
+            driver_registry[driver_type] = driver_class(*args, **kwargs)
+        except ValueError:
+            # NOTE(arne_r):
+            # stable/newton can not enforce os_brick versions that include
+            # the InvalidConnectorProtocol exception. Since it inherits from
+            # ValueError, this fix is still compatible with it.
+            LOG.debug('Unable to load volume driver %s. It is not '
+                      'supported on this host.', driver_type)
     return driver_registry
 
 
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
index 7bd6d28..fe78d04 100644
--- a/nova/virt/libvirt/driver.py
+++ b/nova/virt/libvirt/driver.py
@@ -1239,20 +1239,19 @@ class LibvirtDriver(driver.ComputeDriver):
                 CONF.libvirt.virt_type, disk_dev),
             'type': 'disk',
             }
+        # NOTE (lyarwood): new_connection_info will be modified by the
+        # following _connect_volume call down into the volume drivers. The
+        # majority of the volume drivers will add a device_path that is in turn
+        # used by _get_volume_config to set the source_path of the
+        # LibvirtConfigGuestDisk object it returns. We do not explicitly save
+        # this to the BDM here as the upper compute swap_volume method will
+        # eventually do this for us.
         self._connect_volume(new_connection_info, disk_info)
         conf = self._get_volume_config(new_connection_info, disk_info)
         if not conf.source_path:
             self._disconnect_volume(new_connection_info, disk_dev)
             raise NotImplementedError(_("Swap only supports host devices"))
 
-        # Save updates made in connection_info when connect_volume was called
-        volume_id = new_connection_info.get('serial')
-        bdm = objects.BlockDeviceMapping.get_by_volume_and_instance(
-            nova_context.get_admin_context(), volume_id, instance.uuid)
-        driver_bdm = driver_block_device.convert_volume(bdm)
-        driver_bdm['connection_info'] = new_connection_info
-        driver_bdm.save()
-
         self._swap_volume(guest, disk_dev, conf.source_path, resize_to)
         self._disconnect_volume(old_connection_info, disk_dev)
 
@@ -4081,6 +4080,19 @@ class LibvirtDriver(driver.ComputeDriver):
         guest_arch = libvirt_utils.get_arch(image_meta)
 
         if CONF.serial_console.enabled:
+            try:
+                # TODO(sahid): the guest param of this method should
+                # be renamed as guest_cfg then guest_obj to guest.
+                guest_obj = self._host.get_guest(instance)
+                if list(self._get_serial_ports_from_guest(guest_obj)):
+                    # Serial port are already configured for instance that
+                    # means we are in a context of migration.
+                    return
+            except exception.InstanceNotFound:
+                LOG.debug(
+                    "Instance does not exist yet on libvirt, we can "
+                    "safely pass on looking for already defined serial "
+                    "ports in its domain XML", instance=instance)
             num_ports = hardware.get_number_of_serial_ports(
                 flavor, image_meta)
 
@@ -4520,6 +4532,7 @@ class LibvirtDriver(driver.ComputeDriver):
         if (CONF.spice.enabled and CONF.spice.agent_enabled and
                 virt_type not in ('lxc', 'uml', 'xen')):
             channel = vconfig.LibvirtConfigGuestChannel()
+            channel.type = 'spicevmc'
             channel.target_name = "com.redhat.spice.0"
             guest.add_device(channel)
 
@@ -5950,12 +5963,25 @@ class LibvirtDriver(driver.ComputeDriver):
                     libvirt.VIR_MIGRATE_TUNNELLED != 0):
                     params.pop('migrate_disks')
 
+            # TODO(sahid): This should be in
+            # post_live_migration_at_source but no way to retrieve
+            # ports acquired on the host for the guest at this
+            # step. Since the domain is going to be removed from
+            # libvird on source host after migration, we backup the
+            # serial ports to release them if all went well.
+            serial_ports = []
+            if CONF.serial_console.enabled:
+                serial_ports = list(self._get_serial_ports_from_guest(guest))
+
             guest.migrate(self._live_migration_uri(dest),
                           migrate_uri=migrate_uri,
                           flags=migration_flags,
                           params=params,
                           domain_xml=new_xml_str,
                           bandwidth=CONF.libvirt.live_migration_bandwidth)
+
+            for hostname, port in serial_ports:
+                serial_console.release_port(host=hostname, port=port)
         except Exception as e:
             with excutils.save_and_reraise_exception():
                 LOG.error(_LE("Live Migration failure: %s"), e,
@@ -6448,6 +6474,13 @@ class LibvirtDriver(driver.ComputeDriver):
             is_shared_instance_path = True
             if migrate_data:
                 is_shared_instance_path = migrate_data.is_shared_instance_path
+                if (migrate_data.obj_attr_is_set("serial_listen_ports")
+                    and migrate_data.serial_listen_ports):
+                    # Releases serial ports reserved.
+                    for port in migrate_data.serial_listen_ports:
+                        serial_console.release_port(
+                            host=migrate_data.serial_listen_addr, port=port)
+
             if not is_shared_instance_path:
                 instance_dir = libvirt_utils.get_instance_path_at_destination(
                     instance, migrate_data)
@@ -6579,6 +6612,15 @@ class LibvirtDriver(driver.ComputeDriver):
             CONF.libvirt.live_migration_inbound_addr
         migrate_data.supported_perf_events = self._supported_perf_events
 
+        migrate_data.serial_listen_ports = []
+        if CONF.serial_console.enabled:
+            num_ports = hardware.get_number_of_serial_ports(
+                instance.flavor, instance.image_meta)
+            for port in six.moves.range(num_ports):
+                migrate_data.serial_listen_ports.append(
+                    serial_console.acquire_port(
+                        migrate_data.serial_listen_addr))
+
         for vol in block_device_mapping:
             connection_info = vol['connection_info']
             if connection_info.get('serial'):
diff --git a/releasenotes/notes/bug-1673569-cve-2017-7214-2d7644b356015c93.yaml b/releasenotes/notes/bug-1673569-cve-2017-7214-2d7644b356015c93.yaml
new file mode 100644
index 0000000..30a7e29
--- /dev/null
+++ b/releasenotes/notes/bug-1673569-cve-2017-7214-2d7644b356015c93.yaml
@@ -0,0 +1,8 @@
+---
+prelude: >
+    This release includes fixes for security vulnerabilities.
+security:
+  - |
+    [CVE-2017-7214] Failed notification payload is dumped in logs with auth secrets
+
+    * `Bug 1673569 <https://bugs.launchpad.net/nova/+bug/1673569>`_
diff --git a/releasenotes/notes/live-migration-progress-known-issue-20176f49da4d3c91.yaml b/releasenotes/notes/live-migration-progress-known-issue-20176f49da4d3c91.yaml
new file mode 100644
index 0000000..62a51d8
--- /dev/null
+++ b/releasenotes/notes/live-migration-progress-known-issue-20176f49da4d3c91.yaml
@@ -0,0 +1,13 @@
+---
+issues:
+  - |
+    The live-migration progress timeout controlled by the configuration option
+    ``[libvirt]/live_migration_progress_timeout`` has been discovered to
+    frequently cause live-migrations to fail with a progress timeout error,
+    even though the live-migration is still making good progress.
+    To minimize problems caused by these checks we recommend setting the value
+    to 0, which means do not trigger a timeout.  (This has been made the
+    default in Ocata and Pike.)
+    To modify when a live-migration will fail with a timeout error, please now
+    look at ``[libvirt]/live_migration_completion_timeout`` and
+    ``[libvirt]/live_migration_downtime``.
diff --git a/requirements.txt b/requirements.txt
index 4dbe720..6c68b91 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -32,7 +32,7 @@ python-glanceclient!=2.4.0,>=2.3.0 # Apache-2.0
 requests>=2.10.0 # Apache-2.0
 six>=1.9.0 # MIT
 stevedore>=1.16.0 # Apache-2.0
-setuptools!=24.0.0,>=16.0 # PSF/ZPL
+setuptools!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,>=16.0 # PSF/ZPL
 websockify>=0.8.0 # LGPLv3
 oslo.cache>=1.5.0 # Apache-2.0
 oslo.concurrency>=3.8.0 # Apache-2.0