Merge lp:~gandelman-a/nova/patch_fixups into lp:~ubuntu-server-dev/nova/essex

[Adam Gandelman]

Refreshes the ec2 + libvirt console patches. This is the version of the patch that we carried in Ubuntu on our last upload, rebased against master, with extra stuff added.

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-05 16:28:43 +0000
+++ debian/changelog	2012-03-06 03:57:20 +0000
@@ -7,6 +7,8 @@
   [ Adam Gandleman ]
   * debian/patches/service_account_placeholder.patch: Add examples
     to highlight new keystone service auth interface.
+  * debian/patches/{ec2-fixes.patch, libvirt-console-pipe.patch}: Fix and
+    refresh. Add dep3 headers from original git commits.
 
  -- Chuck Short <[e-mail]>  Mon, 05 Mar 2012 11:06:13 -0500
 

=== modified file 'debian/patches/ec2-fixes.patch'
--- debian/patches/ec2-fixes.patch	2012-03-02 16:04:08 +0000
+++ debian/patches/ec2-fixes.patch	2012-03-06 03:57:20 +0000
@@ -1,17 +1,34 @@
-diff -Naurp nova-2012.1.orig/nova/api/ec2/cloud.py nova-2012.1/nova/api/ec2/cloud.py
---- nova-2012.1.orig/nova/api/ec2/cloud.py	2012-03-01 12:45:52.000000000 -0500
-+++ nova-2012.1/nova/api/ec2/cloud.py	2012-03-02 10:57:47.414758539 -0500
-@@ -1424,6 +1424,9 @@ class CloudController(object):
+From: Vishvananda Ishaya <[e-mail]>
+Date: Thu, 1 Mar 2012 16:52:07 -0800
+Subject: [PATCH] Fixes for ec2 images
+
+ * Fixes s3 image service to convert back to uuids on update
+ * Adds exception for attempt to update an unowned image
+ * Adds error messages to ec2 for failure cases
+ * Adds tests to verify changes
+ * Fixes bug 942865
+
+Change-Id: I35331c635756f10c02b30dd43ab3fe0ad98bc28c
+
+Origin: https://review.openstack.org/#change,4788
+Bug: https://code.launchpad.net/bugs/942865
+Last-Updated: 2012-03-05
+
+Index: nova/nova/api/ec2/cloud.py
+===================================================================
+--- nova.orig/nova/api/ec2/cloud.py	2012-03-05 14:27:39.000000000 -0800
++++ nova/nova/api/ec2/cloud.py	2012-03-05 14:28:45.223610255 -0800
+@@ -1434,6 +1434,9 @@
      def register_image(self, context, image_location=None, **kwargs):
-         if image_location is None and 'name' in kwargs:
+         if image_location is None and kwargs.get('name'):
              image_location = kwargs['name']
 +        if image_location is None:
 +            raise exception.EC2APIError(_('imageLocation is required'))
 +
          metadata = {'properties': {'image_location': image_location}}
  
-         if 'root_device_name' in kwargs:
-@@ -1498,7 +1501,11 @@ class CloudController(object):
+         if kwargs.get('name'):
+@@ -1513,7 +1516,11 @@
          del(image['id'])
  
          image['is_public'] = (operation_type == 'add')
@@ -24,10 +41,11 @@
  
      def update_image(self, context, image_id, **kwargs):
          internal_id = ec2utils.ec2_id_to_id(image_id)
-diff -Naurp nova-2012.1.orig/nova/exception.py nova-2012.1/nova/exception.py
---- nova-2012.1.orig/nova/exception.py	2012-03-01 12:45:52.000000000 -0500
-+++ nova-2012.1/nova/exception.py	2012-03-02 10:57:47.414758539 -0500
-@@ -199,7 +199,7 @@ class MelangeConnectionFailed(NovaExcept
+Index: nova/nova/exception.py
+===================================================================
+--- nova.orig/nova/exception.py	2012-03-05 14:27:39.000000000 -0800
++++ nova/nova/exception.py	2012-03-05 14:28:45.223610255 -0800
+@@ -201,7 +201,7 @@
  
  class NotAuthorized(NovaException):
      message = _("Not authorized.")
@@ -36,7 +54,7 @@
  
  
  class AdminRequired(NotAuthorized):
-@@ -210,6 +210,10 @@ class PolicyNotAuthorized(NotAuthorized)
+@@ -212,6 +212,10 @@
      message = _("Policy doesn't allow %(action)s to be performed.")
  
  
@@ -47,10 +65,11 @@
  class Invalid(NovaException):
      message = _("Unacceptable parameters.")
      code = 400
-diff -Naurp nova-2012.1.orig/nova/image/glance.py nova-2012.1/nova/image/glance.py
---- nova-2012.1.orig/nova/image/glance.py	2012-03-01 12:45:52.000000000 -0500
-+++ nova-2012.1/nova/image/glance.py	2012-03-02 10:57:47.414758539 -0500
-@@ -301,6 +301,9 @@ class GlanceImageService(object):
+Index: nova/nova/image/glance.py
+===================================================================
+--- nova.orig/nova/image/glance.py	2012-03-05 14:27:39.000000000 -0800
++++ nova/nova/image/glance.py	2012-03-05 14:28:45.223610255 -0800
+@@ -301,6 +301,9 @@
              image_meta = client.update_image(image_id, image_meta, data)
          except glance_exception.NotFound:
              raise exception.ImageNotFound(image_id=image_id)
@@ -60,10 +79,11 @@
  
          base_image_meta = self._translate_from_glance(image_meta)
          return base_image_meta
-diff -Naurp nova-2012.1.orig/nova/image/s3.py nova-2012.1/nova/image/s3.py
---- nova-2012.1.orig/nova/image/s3.py	2012-03-01 12:45:52.000000000 -0500
-+++ nova-2012.1/nova/image/s3.py	2012-03-02 10:57:47.414758539 -0500
-@@ -105,6 +105,27 @@ class S3ImageService(object):
+Index: nova/nova/image/s3.py
+===================================================================
+--- nova.orig/nova/image/s3.py	2012-03-05 14:27:39.000000000 -0800
++++ nova/nova/image/s3.py	2012-03-05 14:28:45.223610255 -0800
+@@ -105,6 +105,27 @@
  
          return image_copy
  
@@ -91,7 +111,7 @@
      def create(self, context, metadata, data=None):
          """Create an image.
  
-@@ -120,6 +141,7 @@ class S3ImageService(object):
+@@ -120,6 +141,7 @@
  
      def update(self, context, image_id, metadata, data=None):
          image_uuid = self.get_image_uuid(context, image_id)
@@ -99,7 +119,7 @@
          image = self.service.update(context, image_uuid, metadata, data)
          return self._translate_uuid_to_id(context, image)
  
-@@ -171,6 +193,11 @@ class S3ImageService(object):
+@@ -171,6 +193,11 @@
          image_type = 'machine'
  
          try:
@@ -111,7 +131,7 @@
              kernel_id = manifest.find('machine_configuration/kernel_id').text
              if kernel_id == 'true':
                  image_format = 'aki'
-@@ -235,6 +262,7 @@ class S3ImageService(object):
+@@ -235,6 +262,7 @@
  
          metadata.update({'disk_format': image_format,
                           'container_format': image_format,
@@ -119,18 +139,11 @@
                           'status': 'queued',
                           'is_public': False,
                           'properties': properties})
-diff -Naurp nova-2012.1.orig/nova/tests/api/ec2/test_cloud.py nova-2012.1/nova/tests/api/ec2/test_cloud.py
---- nova-2012.1.orig/nova/tests/api/ec2/test_cloud.py	2012-03-01 12:45:52.000000000 -0500
-+++ nova-2012.1/nova/tests/api/ec2/test_cloud.py	2012-03-02 10:57:47.418758240 -0500
-@@ -33,6 +33,7 @@ from nova import db
- from nova import exception
- from nova import flags
- from nova.image import fake
-+from nova.image import s3
- from nova import log as logging
- from nova import rpc
- from nova import test
-@@ -1154,7 +1155,7 @@ class CloudTestCase(test.TestCase):
+Index: nova/nova/tests/api/ec2/test_cloud.py
+===================================================================
+--- nova.orig/nova/tests/api/ec2/test_cloud.py	2012-03-05 14:27:39.287612677 -0800
++++ nova/nova/tests/api/ec2/test_cloud.py	2012-03-05 14:28:45.223610255 -0800
+@@ -1156,7 +1156,7 @@
          modify_image_attribute = self.cloud.modify_image_attribute
  
          fake_metadata = {
@@ -139,7 +152,7 @@
              'container_format': 'ami',
              'properties': {
                  'kernel_id': 'cedef40a-ed67-4d10-800e-17455edce175',
-@@ -1163,11 +1164,17 @@ class CloudTestCase(test.TestCase):
+@@ -1165,11 +1165,17 @@
              'is_public': False}
  
          def fake_show(meh, context, id):
@@ -160,7 +173,7 @@
  
          self.stubs.Set(fake._FakeImageService, 'show', fake_show)
          self.stubs.Set(fake._FakeImageService, 'show_by_name', fake_show)
-@@ -1175,7 +1182,31 @@ class CloudTestCase(test.TestCase):
+@@ -1177,7 +1183,31 @@
          result = modify_image_attribute(self.context, 'ami-00000001',
                                            'launchPermission', 'add',
                                             user_group=['all'])
@@ -191,5 +204,5 @@
 +        self.assertRaises(exception.EC2APIError, register_image, self.context,
 +                          image_location=None)
  
-     def test_deregister_image(self):
-         deregister_image = self.cloud.deregister_image
+     def test_register_image_name(self):
+         register_image = self.cloud.register_image

=== modified file 'debian/patches/libvirt-use-console-pipe.patch'
--- debian/patches/libvirt-use-console-pipe.patch	2012-03-05 16:28:43 +0000
+++ debian/patches/libvirt-use-console-pipe.patch	2012-03-06 03:57:20 +0000
@@ -1,23 +1,20 @@
-From 951737bf24236dd81e635744687852f7b5fa3825 Mon Sep 17 00:00:00 2001
-From: Chuck Short <[e-mail]>
-Date: Mon, 5 Mar 2012 11:23:23 -0500
-Subject: [PATCH] Updated ringbuffer patch
-
-Signed-off-by: Chuck Short <[e-mail]>
----
- Authors                         |    1 +
- nova/tests/test_libvirt.py      |   52 +++++++++++++++-
- nova/tests/test_utils.py        |   53 ++++++++++++++++
- nova/utils.py                   |  131 +++++++++++++++++++++++++++++++++++++++
- nova/virt/libvirt.xml.template  |    4 +-
- nova/virt/libvirt/connection.py |  112 ++++++++++++++++++++++++++++++---
- 6 files changed, 340 insertions(+), 13 deletions(-)
-
-diff --git a/Authors b/Authors
-index dc83d82..bcaf2b6 100644
---- a/Authors
-+++ b/Authors
-@@ -151,6 +151,7 @@ Rick Clark <[e-mail]>
+From: Robie Basak <[e-mail]>
+Date: Wed, 28 Sep 2011 14:45:30 +0100
+Subject: [PATCH] Move console.log to a ringbuffer
+
+Prevent a DoS by storing console output in a ringbuffer on the host,
+instead of allowing it to grow indefinitely. Fixes bug 832507.
+
+
+Origin: https://review.openstack.org/#change,706
+Bug: https://code.launchpad.net/bugs/832507
+Last-Update: 2012-03-05
+
+Index: nova/Authors
+===================================================================
+--- nova.orig/Authors	2012-03-05 14:27:39.000000000 -0800
++++ nova/Authors	2012-03-05 14:27:46.683612405 -0800
+@@ -151,6 +151,7 @@
  Rick Harris <[e-mail]>
  Rob Kost <[e-mail]>
  Robert Esker <[e-mail]>
@@ -25,11 +22,11 @@
  Russell Bryant <[e-mail]>
  Russell Sim <[e-mail]>
  Ryan Lane <[e-mail]>
-diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py
-index a48b02f..052fa66 100644
---- a/nova/tests/test_libvirt.py
-+++ b/nova/tests/test_libvirt.py
-@@ -870,7 +870,7 @@ class LibvirtConnTestCase(test.TestCase):
+Index: nova/nova/tests/test_libvirt.py
+===================================================================
+--- nova.orig/nova/tests/test_libvirt.py	2012-03-05 14:27:39.000000000 -0800
++++ nova/nova/tests/test_libvirt.py	2012-03-05 14:27:46.683612405 -0800
+@@ -870,7 +870,7 @@
              (lambda t: _ipv4_like(t.findall(parameter)[1].get('value'),
                                    '192.168.*.1'), True),
              (lambda t: t.find('./devices/serial/source').get(
@@ -38,7 +35,7 @@
              (lambda t: t.find('./memory').text, '2097152')]
          if rescue:
              common_checks += [
-@@ -2304,3 +2304,53 @@ class LibvirtConnectionTestCase(test.TestCase):
+@@ -2302,3 +2302,53 @@
  
          ref = self.libvirtconnection.finish_revert_migration(ins_ref, None)
          self.assertTrue(isinstance(ref, eventlet.event.Event))
@@ -92,10 +89,10 @@
 +        os.unlink(self.ringbuffer_path)
 +        os.unlink(self.fifo_path)
 +        os.rmdir(self.directory_path)
-diff --git a/nova/tests/test_utils.py b/nova/tests/test_utils.py
-index e3457dd..e357ac7 100644
---- a/nova/tests/test_utils.py
-+++ b/nova/tests/test_utils.py
+Index: nova/nova/tests/test_utils.py
+===================================================================
+--- nova.orig/nova/tests/test_utils.py	2012-03-05 14:27:39.000000000 -0800
++++ nova/nova/tests/test_utils.py	2012-03-05 14:27:46.683612405 -0800
 @@ -17,6 +17,7 @@
  import __builtin__
  import datetime
@@ -104,7 +101,7 @@
  import os
  import os.path
  import socket
-@@ -25,6 +26,7 @@ import tempfile
+@@ -25,6 +26,7 @@
  
  import iso8601
  import mox
@@ -112,7 +109,7 @@
  
  import nova
  from nova import exception
-@@ -818,6 +820,57 @@ class Iso8601TimeTest(test.TestCase):
+@@ -818,6 +820,57 @@
          west = utils.parse_isotime(str)
          normed = utils.normalize_time(west)
          self._instaneous(normed, 2012, 2, 13, 23, 53, 07, 0)
@@ -170,11 +167,11 @@
  
  
  class TestLockCleanup(test.TestCase):
-diff --git a/nova/utils.py b/nova/utils.py
-index 0ea6ee9..d19bf7e 100644
---- a/nova/utils.py
-+++ b/nova/utils.py
-@@ -33,6 +33,7 @@ import re
+Index: nova/nova/utils.py
+===================================================================
+--- nova.orig/nova/utils.py	2012-03-05 14:27:39.000000000 -0800
++++ nova/nova/utils.py	2012-03-05 14:27:46.687612406 -0800
+@@ -33,6 +33,7 @@
  import shlex
  import shutil
  import socket
@@ -182,7 +179,7 @@
  import struct
  import sys
  import tempfile
-@@ -56,6 +57,7 @@ from nova import log as logging
+@@ -56,6 +57,7 @@
  from nova.openstack.common import cfg
  
  
@@ -190,7 +187,7 @@
  LOG = logging.getLogger(__name__)
  ISO_TIME_FORMAT = "%Y-%m-%dT%H:%M:%S"
  PERFECT_TIME_FORMAT = "%Y-%m-%dT%H:%M:%S.%f"
-@@ -1530,6 +1532,135 @@ def read_file_as_root(file_path):
+@@ -1530,6 +1532,135 @@
          return out
      except exception.ProcessExecutionError:
          raise exception.FileNotFound(file_path=file_path)
@@ -326,26 +323,11 @@
  
  
  @contextlib.contextmanager
-diff --git a/nova/virt/libvirt.xml.template b/nova/virt/libvirt.xml.template
-index 9a216e1..df28081 100644
---- a/nova/virt/libvirt.xml.template
-+++ b/nova/virt/libvirt.xml.template
-@@ -160,8 +160,8 @@
- 
- #end for
-         <!-- The order is significant here.  File must be defined first -->
--        <serial type="file">
--            <source path='${basepath}/console.log'/>
-+        <serial type="pipe">
-+            <source path='${basepath}/console.fifo'/>
-             <target port='1'/>
-         </serial>
- 
-diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
-index c9f4251..2074ece 100644
---- a/nova/virt/libvirt/connection.py
-+++ b/nova/virt/libvirt/connection.py
-@@ -39,15 +39,19 @@ Supports KVM, LXC, QEMU, UML, and XEN.
+Index: nova/nova/virt/libvirt/connection.py
+===================================================================
+--- nova.orig/nova/virt/libvirt/connection.py	2012-03-05 14:27:39.000000000 -0800
++++ nova/nova/virt/libvirt/connection.py	2012-03-05 14:28:12.167611470 -0800
+@@ -39,15 +39,19 @@
  
  """
  
@@ -365,20 +347,17 @@
  from eventlet import greenthread
  from xml.dom import minidom
  from xml.etree import ElementTree
-@@ -156,6 +160,12 @@ libvirt_opts = [
-                help='Number of seconds to wait for instance to shut down after'
-                     ' soft reboot request is made. We fall back to hard reboot'
-                     ' if instance does not shutdown within this window.'),
-+    cfg.BoolOpt('libvirt_console_buffer',
-+                default=False,
-+                help='Enable libvirt console ringbuffer')
+@@ -151,6 +155,9 @@
+                help='Override the default disk prefix for the devices attached'
+                     ' to a server, which is dependent on libvirt_type. '
+                     '(valid options are: sd, xvd, uvd, vd)'),
 +    cfg.IntOpt('libvirt_console_log_size',
 +               default=65536,
-+               help='libvirt console log ringbuffer size')
-     ]
- 
- FLAGS = flags.FLAGS
-@@ -189,6 +199,57 @@ def _get_eph_disk(ephemeral):
++               help='libvirt console log ringbugger size'),
+     cfg.IntOpt('libvirt_wait_soft_reboot_seconds',
+                default=120,
+                help='Number of seconds to wait for instance to shut down after'
+@@ -189,6 +196,57 @@
      return 'disk.eph' + str(ephemeral['num'])
  
  
@@ -436,7 +415,7 @@
  class LibvirtConnection(driver.ComputeDriver):
  
      def __init__(self, read_only):
-@@ -222,6 +283,8 @@ class LibvirtConnection(driver.ComputeDriver):
+@@ -222,6 +280,8 @@
  
          self.image_cache_manager = imagecache.ImageCacheManager()
  
@@ -445,7 +424,7 @@
      @property
      def host_state(self):
          if not self._host_state:
-@@ -230,7 +293,11 @@ class LibvirtConnection(driver.ComputeDriver):
+@@ -230,7 +290,11 @@
  
      def init_host(self, host):
          # NOTE(nsokolov): moved instance restarting to ComputeManager
@@ -458,7 +437,7 @@
  
      @property
      def libvirt_xml(self):
-@@ -307,6 +374,15 @@ class LibvirtConnection(driver.ComputeDriver):
+@@ -307,6 +371,15 @@
          return [self._conn.lookupByID(x).name()
                  for x in self._conn.listDomainsID()
                  if x != 0]  # We skip domains with ID 0 (hypervisors).
@@ -474,7 +453,7 @@
  
      @staticmethod
      def _map_to_instance_info(domain):
-@@ -432,6 +508,7 @@ class LibvirtConnection(driver.ComputeDriver):
+@@ -432,6 +505,7 @@
      def _cleanup(self, instance):
          target = os.path.join(FLAGS.instances_path, instance['name'])
          instance_name = instance['name']
@@ -482,7 +461,7 @@
          LOG.info(_('Deleting instance files %(target)s') % locals(),
                   instance=instance)
          if FLAGS.libvirt_type == 'lxc':
-@@ -909,10 +986,10 @@ class LibvirtConnection(driver.ComputeDriver):
+@@ -909,10 +983,10 @@
  
      @exception.wrap_exception()
      def get_console_output(self, instance):
@@ -496,7 +475,7 @@
  
          if FLAGS.libvirt_type == 'xen':
              # Xen is special
-@@ -920,14 +997,12 @@ class LibvirtConnection(driver.ComputeDriver):
+@@ -920,14 +994,12 @@
                                           'ttyconsole',
                                           instance['name'])
              data = self._flush_xen_console(virsh_output)
@@ -513,7 +492,7 @@
  
      @staticmethod
      def get_host_ip_addr():
-@@ -1053,8 +1128,25 @@ class LibvirtConnection(driver.ComputeDriver):
+@@ -1053,8 +1125,25 @@
              container_dir = '%s/rootfs' % basepath(suffix='')
              libvirt_utils.ensure_tree(container_dir)
  
@@ -541,6 +520,18 @@
  
          if not disk_images:
              disk_images = {'image_id': instance['image_ref'],
--- 
-1.7.9
-
+Index: nova/nova/virt/libvirt.xml.template
+===================================================================
+--- nova.orig/nova/virt/libvirt.xml.template	2012-03-05 14:27:39.000000000 -0800
++++ nova/nova/virt/libvirt.xml.template	2012-03-05 14:27:46.687612406 -0800
+@@ -160,8 +160,8 @@
+ 
+ #end for
+         <!-- The order is significant here.  File must be defined first -->
+-        <serial type="file">
+-            <source path='${basepath}/console.log'/>
++        <serial type="pipe">
++            <source path='${basepath}/console.fifo'/>
+             <target port='1'/>
+         </serial>
+