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

[Corey Bryant]

=== modified file 'debian/changelog'
--- debian/changelog	2014-09-30 14:41:00 +0000
+++ debian/changelog	2014-10-03 19:06:52 +0000
@@ -1,9 +1,67 @@
-nova (1:2014.1.2-0ubuntu1.1) UNRELEASED; urgency=medium
+nova (1:2014.1.3-0ubuntu1) UNRELEASED; urgency=medium
 
+  [ Liam Young ]
   * d/p/cells-json-store.patch: Fix issue with nova-cells failing when using
     JSON file to store cell information (LP: #1314677).
 
- -- Liam Young <[e-mail]>  Mon, 29 Sep 2014 12:59:24 +0000
+  [ Corey Bryant ]
+  * Resynchronize with stable/icehouse (a058646) (LP: #1377136):
+    - [1a95c95] Adds tests for Hyper-V VM Utils
+    - [bb47d55] Removes unnecessary instructions in test_hypervapi
+    - [4f41d37] Fixes a Hyper-V list_instances localization issue
+    - [9015410] Adds list_instance_uuids to the Hyper-V driver
+    - [3371ad8] Add _wrap_db_error() support to Session.commit()
+    - [dfb0e0f] Neutron: Atomic update of instance info cache
+    - [bce481c] Ensure info cache updates don't overwhelm cells
+    - [f58d95c] Sync process and str utils from oslo
+    - [4e6371b] remove test_multiprocess_api
+    - [7e09173] Fixes Hyper-V agent force_hyperv_utils_v1 flag issue
+    - [7523ab4] Fix attaching config drive issue on Hyper-V when migrate instances
+    - [74e0ba7] Fix live-migration failure in FC multipath case
+    - [b61aa4d] libvirt: Save device_path in connection_info when booting from volume
+    - [f93b8ee] Made unassigned networks visible in flat networking
+    - [82cc3be] Do not fail cell's instance deletion, if it's missing info_cache
+    - [d72c0a4] Fixes Hyper-V boot from volume root device issue
+    - [0d3dad7] Fixes Hyper-V resize down exception
+    - [5d5970a] db: Add @_retry_on_deadlock to service_update()
+    - [9596f52] Add Hyper-V driver in the "compute_driver" option description
+    - [4a8d6ca] Block sqlalchemy migrate 0.9.2 as it breaks all of nova
+    - [311ab57] Move the error check for "brctl addif"
+    - [df09c2a] Fix rootwrap for non openstack.org iqn's
+    - [1613cd99] Fix instance boot when Ceph is used for ephemeral storage
+    - [4bc680f] Make floatingip-ip-delete atomic with neutron
+    - [0d69163] Fix race condition with vif plugging in finish migrate
+    - [520aa4c] libvirt: Use VIR_DOMAIN_AFFECT_LIVE for paused instances
+    - [3c34e37] add repr for event objects
+    - [1b7ab22] make lifecycle event logs more clear
+    - [e1d6e18] Catch missing Glance image attrs with None
+    - [b591389] Update block_device_info to contain swap and ephemeral disks
+    - [2155188] Adds get_instance_disk_info to compute drivers
+    - [87f842d] Fixes Hyper-V vm state issue
+    - [1106ef2] Fix expected error details from jsonschema
+    - [e5e6bc7] Include next link when default limit is reached
+    - [526853e] Fix FloatingIP.save() passing FixedIP object to sqlalchemy
+    - [4e1e217] Read deleted instances during lifecycle events
+    - [d8b9ba5] Add a retry_on_deadlock to reservations_expire
+    - [b53adea] Add expire reservations in backport position.
+    - [e874ee2] Fixes Hyper-V SCSI slot selection
+    - [471e644] VMware: do not cache image when root_gb is 0
+    - [825cfe4] Fix _parse_datetime in simple tenant usage extension
+    - [073ee06] Avoid traceback logs from simple tenant usage extension
+    - [9447203] replace NovaException with VirtualInterfaceCreate when neutron fails
+    - [6b7cb1a] libvirt: convert cpu features attribute from list to a set
+    - [7ca83e8] Delete image when backup operation failed on snapshot step
+    - [82a13b3] VM in rescue state must have a restricted set of actions
+    - [e7d2087] shelve doesn't work on nova-cells environment
+    - [aeb71a8] libvirt: return the correct instance path while cleanup_resize
+    - [cce6d22] Fix nova image-show with queued image
+    - [aff80d5] _translate_from_glance() can cause an unnecessary HTTP request
+    - [a058646] Loosen import_exceptions to cover all of gettextutils
+  * d/p/libvirt-convert-cpu-features-attribute-from-list-to-.patch: Dropped.
+    Code has been fixed upstream.
+  * d/p/libvirt-Handle-unsupported-host-capabilities.patch: Rebased.
+
+ -- Corey Bryant <[e-mail]>  Fri, 03 Oct 2014 13:11:04 -0400
 
 nova (1:2014.1.2-0ubuntu1) trusty; urgency=medium
 

=== modified file 'debian/patches/libvirt-Handle-unsupported-host-capabilities.patch'
--- debian/patches/libvirt-Handle-unsupported-host-capabilities.patch	2014-06-24 15:47:40 +0000
+++ debian/patches/libvirt-Handle-unsupported-host-capabilities.patch	2014-10-03 19:06:52 +0000
@@ -1,10 +1,9 @@
 Description: Fix exception when starting LXC containers with libvirt-lxc.
 Author: Chuck Short <[e-mail]>
 Forwarded: Not Needed.
-diff -Naurp nova-2014.1.1.orig/nova/tests/virt/libvirt/fakelibvirt.py nova-2014.1.1/nova/tests/virt/libvirt/fakelibvirt.py
---- nova-2014.1.1.orig/nova/tests/virt/libvirt/fakelibvirt.py	2014-06-05 17:33:22.000000000 -0400
-+++ nova-2014.1.1/nova/tests/virt/libvirt/fakelibvirt.py	2014-06-09 12:00:11.032072000 -0400
-@@ -172,18 +172,76 @@ def _parse_disk_info(element):
+--- a/nova/tests/virt/libvirt/fakelibvirt.py
++++ b/nova/tests/virt/libvirt/fakelibvirt.py
+@@ -172,18 +172,76 @@
  
  
  class libvirtError(Exception):
@@ -89,7 +88,7 @@
  
  
  class NWFilter(object):
-@@ -219,8 +277,10 @@ class Domain(object):
+@@ -219,8 +277,10 @@
          try:
              tree = etree.fromstring(xml)
          except etree.ParseError:
@@ -102,7 +101,7 @@
  
          definition = {}
  
-@@ -369,7 +429,11 @@ class Domain(object):
+@@ -369,7 +429,11 @@
                  123456789L]
  
      def migrateToURI(self, desturi, flags, dname, bandwidth):
@@ -115,7 +114,7 @@
  
      def attachDevice(self, xml):
          disk_info = _parse_disk_info(etree.fromstring(xml))
-@@ -380,7 +444,11 @@ class Domain(object):
+@@ -380,7 +444,11 @@
      def attachDeviceFlags(self, xml, flags):
          if (flags & VIR_DOMAIN_AFFECT_LIVE and
                  self._state != VIR_DOMAIN_RUNNING):
@@ -128,7 +127,7 @@
          self.attachDevice(xml)
  
      def detachDevice(self, xml):
-@@ -533,9 +601,11 @@ class Connection(object):
+@@ -533,9 +601,11 @@
                           'test:///default']
  
          if uri not in uri_whitelist:
@@ -143,7 +142,7 @@
  
          self.readonly = readonly
          self._uri = uri
-@@ -594,16 +664,20 @@ class Connection(object):
+@@ -594,16 +664,20 @@
      def lookupByID(self, id):
          if id in self._running_vms:
              return self._running_vms[id]
@@ -170,7 +169,7 @@
  
      def _emit_lifecycle(self, dom, event, detail):
          if VIR_DOMAIN_EVENT_ID_LIFECYCLE not in self._event_callbacks:
-@@ -904,14 +978,21 @@ class Connection(object):
+@@ -904,14 +978,21 @@
                      'user': 26728850000000L,
                      'iowait': 6121490000000L}
          else:
@@ -195,7 +194,7 @@
  
      def nwfilterDefineXML(self, xml):
          nwfilter = NWFilter(self, xml)
-@@ -964,6 +1045,24 @@ def registerErrorHandler(handler, ctxt):
+@@ -964,6 +1045,24 @@
      pass
  
  
@@ -220,18 +219,37 @@
  virDomain = Domain
  
  
-diff -Naurp nova-2014.1.1.orig/nova/tests/virt/libvirt/test_libvirt.py nova-2014.1.1/nova/tests/virt/libvirt/test_libvirt.py
---- nova-2014.1.1.orig/nova/tests/virt/libvirt/test_libvirt.py	2014-06-05 17:33:22.000000000 -0400
-+++ nova-2014.1.1/nova/tests/virt/libvirt/test_libvirt.py	2014-06-09 12:00:11.040072000 -0400
-@@ -60,6 +60,7 @@ import nova.tests.image.fake
- from nova.tests import matchers
- from nova.tests.objects import test_pci_device
- from nova.tests.virt.libvirt import fake_libvirt_utils
-+from nova.tests.virt.libvirt import fakelibvirt
- from nova import utils
- from nova import version
- from nova.virt import configdrive
-@@ -80,7 +81,7 @@ from nova.virt import netutils
+--- a/nova/virt/libvirt/driver.py
++++ b/nova/virt/libvirt/driver.py
+@@ -77,6 +77,7 @@
+ from nova.openstack.common import excutils
+ from nova.openstack.common import fileutils
+ from nova.openstack.common.gettextutils import _
++from nova.openstack.common.gettextutils import _LW
+ from nova.openstack.common import importutils
+ from nova.openstack.common import jsonutils
+ from nova.openstack.common import log as logging
+@@ -2888,9 +2889,14 @@
+                     #                 this -1 checking should be removed later.
+                     if features and features != -1:
+                         self._caps.host.cpu.parse_str(features)
+-                except libvirt.VIR_ERR_NO_SUPPORT:
+-                    # Note(yjiang5): ignore if libvirt has no support
+-                    pass
++                except libvirt.libvirtError as ex:
++                    error_code = ex.get_error_code()
++                    if error_code == libvirt.VIR_ERR_NO_SUPPORT:
++                        LOG.warn(_LW("URI %(uri)s does not support full set"
++                                     " of host capabilities: " "%(error)s"),
++                                     {'uri': self.uri(), 'error': ex})
++                    else:
++                        raise
+         return self._caps
+ 
+     def get_host_uuid(self):
+--- a/nova/tests/virt/libvirt/test_libvirt.py
++++ b/nova/tests/virt/libvirt/test_libvirt.py
+@@ -83,7 +83,7 @@
  try:
      import libvirt
  except ImportError:
@@ -240,7 +258,7 @@
  libvirt_driver.libvirt = libvirt
  
  
-@@ -849,6 +850,42 @@ class LibvirtConnTestCase(test.TestCase)
+@@ -887,6 +887,42 @@
              caps = conn.get_host_capabilities()
              self.assertIn('aes', [x.name for x in caps.host.cpu.features])
  
@@ -283,32 +301,3 @@
      def test_lxc_get_host_capabilities_failed(self):
          conn = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True)
  
-diff -Naurp nova-2014.1.1.orig/nova/virt/libvirt/driver.py nova-2014.1.1/nova/virt/libvirt/driver.py
---- nova-2014.1.1.orig/nova/virt/libvirt/driver.py	2014-06-05 17:33:22.000000000 -0400
-+++ nova-2014.1.1/nova/virt/libvirt/driver.py	2014-06-09 11:59:55.232072000 -0400
-@@ -76,6 +76,7 @@ from nova.objects import service as serv
- from nova.openstack.common import excutils
- from nova.openstack.common import fileutils
- from nova.openstack.common.gettextutils import _
-+from nova.openstack.common.gettextutils import _LW
- from nova.openstack.common import importutils
- from nova.openstack.common import jsonutils
- from nova.openstack.common import log as logging
-@@ -2859,9 +2860,14 @@ class LibvirtDriver(driver.ComputeDriver
-                     #                 this -1 checking should be removed later.
-                     if features and features != -1:
-                         self._caps.host.cpu.parse_str(features)
--                except libvirt.VIR_ERR_NO_SUPPORT:
--                    # Note(yjiang5): ignore if libvirt has no support
--                    pass
-+                except libvirt.libvirtError as ex:
-+                    error_code = ex.get_error_code()
-+                    if error_code == libvirt.VIR_ERR_NO_SUPPORT:
-+                        LOG.warn(_LW("URI %(uri)s does not support full set"
-+                                     " of host capabilities: " "%(error)s"),
-+                                     {'uri': self.uri(), 'error': ex})
-+                    else:
-+                        raise
-         return self._caps
- 
-     def get_host_uuid(self):

=== removed file 'debian/patches/libvirt-convert-cpu-features-attribute-from-list-to-.patch'
--- debian/patches/libvirt-convert-cpu-features-attribute-from-list-to-.patch	2014-08-08 17:43:35 +0000
+++ debian/patches/libvirt-convert-cpu-features-attribute-from-list-to-.patch	1970-01-01 00:00:00 +0000
@@ -1,160 +0,0 @@
-Description: libvirt: convert cpu features attribute from list to a set
-
-Currently, the cpu features list which is being sent to libvirt,
-when creating a domain or calling compareCPU, must contain only
-unique entries. Multiple issues arise when we are updating the
-features attribute in LibvirtConfigCPU class (for example during
-migration).
-
-This change will change the features attribute from being a list
-to a set. This make the LibvirtConfigCPU class keep only unique
-features.
-Adjusting the LibvirtConfigCPUFeature class to support set
-operations by overriding the __eq__, __ne__ and __hash__
-methods.
-
-Author: Vladik Romanovsky <[e-mail]>
-Origin: upstream, Change-Id: I6350fe0e827c860aea77cc4fe56f18f5c1483580
-Bug-Ubuntu: #1303536
-Last-Update: 2014-06-25
-
----
- nova/tests/virt/libvirt/test_libvirt.py        |  8 ++++----
- nova/tests/virt/libvirt/test_libvirt_config.py | 24 +++++++++++++++++++++++-
- nova/virt/libvirt/config.py                    | 16 +++++++++++++---
- nova/virt/libvirt/driver.py                    |  2 +-
- 4 files changed, 41 insertions(+), 9 deletions(-)
-
-diff --git a/nova/tests/virt/libvirt/test_libvirt.py b/nova/tests/virt/libvirt/test_libvirt.py
-index 1f744b7..9139ab9 100644
---- a/nova/tests/virt/libvirt/test_libvirt.py
-+++ b/nova/tests/virt/libvirt/test_libvirt.py
-@@ -2206,8 +2206,8 @@ class LibvirtConnTestCase(test.TestCase):
-             cpu.model = "Opteron_G4"
-             cpu.vendor = "AMD"
- 
--            cpu.features.append(vconfig.LibvirtConfigGuestCPUFeature("tm2"))
--            cpu.features.append(vconfig.LibvirtConfigGuestCPUFeature("ht"))
-+            cpu.add_feature(vconfig.LibvirtConfigGuestCPUFeature("tm2"))
-+            cpu.add_feature(vconfig.LibvirtConfigGuestCPUFeature("ht"))
- 
-             caps = vconfig.LibvirtConfigCaps()
-             caps.host = vconfig.LibvirtConfigCapsHost()
-@@ -2235,8 +2235,8 @@ class LibvirtConnTestCase(test.TestCase):
-         self.assertEqual(conf.cpu.model, "Opteron_G4")
-         self.assertEqual(conf.cpu.vendor, "AMD")
-         self.assertEqual(len(conf.cpu.features), 2)
--        self.assertEqual(conf.cpu.features[0].name, "tm2")
--        self.assertEqual(conf.cpu.features[1].name, "ht")
-+        self.assertEqual(conf.cpu.features.pop().name, "tm2")
-+        self.assertEqual(conf.cpu.features.pop().name, "ht")
- 
-     def test_get_guest_cpu_config_custom_old(self):
-         def get_lib_version_stub():
-diff --git a/nova/tests/virt/libvirt/test_libvirt_config.py b/nova/tests/virt/libvirt/test_libvirt_config.py
-index 2251bf8..fa65ebc 100644
---- a/nova/tests/virt/libvirt/test_libvirt_config.py
-+++ b/nova/tests/virt/libvirt/test_libvirt_config.py
-@@ -235,8 +235,30 @@ class LibvirtConfigCPUTest(LibvirtConfigBaseTest):
-               <arch>x86_64</arch>
-               <model>Penryn</model>
-               <vendor>Intel</vendor>
-+              <feature name="apic"/>
-               <feature name="mtrr"/>
-+            </cpu>
-+        """)
-+
-+    def test_only_uniq_cpu_featues(self):
-+        obj = config.LibvirtConfigCPU()
-+        obj.model = "Penryn"
-+        obj.vendor = "Intel"
-+        obj.arch = "x86_64"
-+
-+        obj.add_feature(config.LibvirtConfigCPUFeature("mtrr"))
-+        obj.add_feature(config.LibvirtConfigCPUFeature("apic"))
-+        obj.add_feature(config.LibvirtConfigCPUFeature("apic"))
-+        obj.add_feature(config.LibvirtConfigCPUFeature("mtrr"))
-+
-+        xml = obj.to_xml()
-+        self.assertXmlEqual(xml, """
-+            <cpu>
-+              <arch>x86_64</arch>
-+              <model>Penryn</model>
-+              <vendor>Intel</vendor>
-               <feature name="apic"/>
-+              <feature name="mtrr"/>
-             </cpu>
-         """)
- 
-@@ -285,8 +307,8 @@ class LibvirtConfigGuestCPUTest(LibvirtConfigBaseTest):
-               <arch>x86_64</arch>
-               <model>Penryn</model>
-               <vendor>Intel</vendor>
--              <feature name="mtrr" policy="require"/>
-               <feature name="apic" policy="require"/>
-+              <feature name="mtrr" policy="require"/>
-             </cpu>
-         """)
- 
-diff --git a/nova/virt/libvirt/config.py b/nova/virt/libvirt/config.py
-index a931b57..f32e178 100644
---- a/nova/virt/libvirt/config.py
-+++ b/nova/virt/libvirt/config.py
-@@ -250,6 +250,15 @@ class LibvirtConfigCPUFeature(LibvirtConfigObject):
- 
-         return ft
- 
-+    def __eq__(self, obj):
-+        return obj.name == self.name
-+
-+    def __ne__(self, obj):
-+        return obj.name != self.name
-+
-+    def __hash__(self):
-+        return hash(self.name)
-+
- 
- class LibvirtConfigCPU(LibvirtConfigObject):
- 
-@@ -265,7 +274,7 @@ class LibvirtConfigCPU(LibvirtConfigObject):
-         self.cores = None
-         self.threads = None
- 
--        self.features = []
-+        self.features = set()
- 
-     def parse_dom(self, xmldoc):
-         super(LibvirtConfigCPU, self).parse_dom(xmldoc)
-@@ -305,13 +314,14 @@ class LibvirtConfigCPU(LibvirtConfigObject):
-             top.set("threads", str(self.threads))
-             cpu.append(top)
- 
--        for f in self.features:
-+        # sorting the features to allow more predictable tests
-+        for f in sorted(self.features, key=lambda x: x.name):
-             cpu.append(f.format_dom())
- 
-         return cpu
- 
-     def add_feature(self, feat):
--        self.features.append(feat)
-+        self.features.add(feat)
- 
- 
- class LibvirtConfigGuestCPUFeature(LibvirtConfigCPUFeature):
-diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
-index df367dd..7402363 100644
---- a/nova/virt/libvirt/driver.py
-+++ b/nova/virt/libvirt/driver.py
-@@ -2888,7 +2888,7 @@ class LibvirtDriver(driver.ComputeDriver):
-         for hostfeat in hostcpu.features:
-             guestfeat = vconfig.LibvirtConfigGuestCPUFeature(hostfeat.name)
-             guestfeat.policy = "require"
--            guestcpu.features.append(guestfeat)
-+            guestcpu.add_feature(guestfeat)
- 
-         return guestcpu
- 
--- 
-1.9.1
-

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-09-30 14:41:00 +0000
+++ debian/patches/series	2014-10-03 19:06:52 +0000
@@ -1,5 +1,4 @@
 # Ubuntu specific patches below here. Note these can be dropped eventually.
-libvirt-convert-cpu-features-attribute-from-list-to-.patch
 fix-requirements.patch
 skip_ipv6_test.patch
 arm-console-patch.patch