Merge lp:~yolanda.robla/ubuntu/precise/nova/essex-sru into lp:ubuntu/precise-updates/nova

[Yolanda Robla]

[James Page (james-page)]

Yolanda

The only problem I can see is with the changelog:

=== modified file 'debian/changelog'
--- debian/changelog 2012-12-17 10:39:28 +0000
+++ debian/changelog 2012-12-18 11:53:10 +0000
@@ -1,8 +1,7 @@
 nova (2012.1.4+stable-20121217-9f277e38-0ubuntu1) precise-proposed; urgency=low

   [ Chuck Short ]
- * debian/*.logrotate: compress logfiles when they are rotated. (LP:
- #1049915)
+ * debian/*.logrotate: compress logfiles when they are rotated. (LP: #1049915)

   [ Yolanda Robla Mota ]
   * Resynchronize with stable/essex (9f277e38):
@@ -43,7 +42,7 @@
     - [ae280ca] Deleted floating ips can cause instance delete to fail
       (LP: #1038266)

- -- Adam Gandelman <email address hidden> Mon, 27 Aug 2012 14:50:40 -0700
+ -- Adam Gandelman <email address hidden> Mon, 27 Aug 2012 14:50:40 -0700

 nova (2012.1.3+stable-20120824-86fb7362-0ubuntu1) precise-proposed; urgency=low

The bug reference needs to be in a single line and Adam's email address has been truncated.

Fix that up and this branch looks good to go.

review: Needs Fixing

[James Page (james-page)]

review: Approve

=== removed file '.gitignore'
--- .gitignore	2012-08-27 14:50:40 +0000
+++ .gitignore	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-*.pyc
-*.DS_Store
-local_settings.py
-CA/
-keeper
-instances
-keys
-build/*
-build-stamp
-nova.egg-info
-.nova-venv
-.venv
-.tox
-*.sqlite
-*.log
-*.mo
-tools/conf/nova.conf*
-cover/*
-dist/*
-.coverage

=== removed file '.gitreview'
--- .gitreview	2012-08-27 14:50:40 +0000
+++ .gitreview	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-[gerrit]
-host=review.openstack.org
-port=29418
-project=openstack/nova.git
-defaultbranch=stable/essex

=== removed file '.mailmap'
--- .mailmap	2012-08-24 02:09:33 +0000
+++ .mailmap	1970-01-01 00:00:00 +0000
@@ -1,82 +0,0 @@
-# Format is:
-# <preferred e-mail> <other e-mail 1>
-# <preferred e-mail> <other e-mail 2>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <jesse@dancelamb>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <jesse@ubuntu>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <chiradeep@chiradeep-lt2>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <danwent@dan-xs3-cs>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <emellor@silver>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <itoumsn@shayol>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <jpipes@serialcoder>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <justinsb@justinsb-desktop>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
-<[e-mail]> Masumoto<[e-mail]>
-<[e-mail]> <root@openstack2-api>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <mdietz@openstack>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <mordred@hudson>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <laner@controller>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <root@tonbuntu>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <todd@lapex>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <nova@u4>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <root@ubuntu>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>
-<[e-mail]> <[e-mail]>

=== modified file '.pc/fix-pep8-errors.patch/nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py'
--- .pc/fix-pep8-errors.patch/nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py	2012-06-05 09:50:59 +0000
+++ .pc/fix-pep8-errors.patch/nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py	2012-12-18 13:07:55 +0000
@@ -28,6 +28,7 @@
 from nova import context
 from nova import flags
 from nova import test
+from nova import utils
 from nova.tests.api.openstack import fakes
 
 
@@ -40,8 +41,9 @@
 EPHEMERAL_GB = 20
 MEMORY_MB = 1024
 VCPUS = 2
-STOP = datetime.datetime.utcnow()
-START = STOP - datetime.timedelta(hours=HOURS)
+NOW = utils.utcnow()
+START = NOW - datetime.timedelta(hours=HOURS)
+STOP = NOW
 
 
 def fake_instance_type_get(self, context, instance_type_id):
@@ -91,10 +93,10 @@
                                                       'faketenant_1',
                                                        is_admin=False)
 
-    def test_verify_index(self):
+    def _test_verify_index(self, start, stop):
         req = webob.Request.blank(
                     '/v2/faketenant_0/os-simple-tenant-usage?start=%s&end=%s' %
-                    (START.isoformat(), STOP.isoformat()))
+                    (start.isoformat(), stop.isoformat()))
         req.method = "GET"
         req.headers["content-type"] = "application/json"
 
@@ -115,6 +117,20 @@
                              SERVERS * VCPUS * HOURS)
             self.assertFalse(usages[i].get('server_usages'))
 
+    def test_verify_index(self):
+        self._test_verify_index(START, STOP)
+
+    def test_verify_index_future_end_time(self):
+        future = NOW + datetime.timedelta(hours=HOURS)
+        self._test_verify_index(START, future)
+
+    def test_verify_show(self):
+        self._test_verify_show(START, STOP)
+
+    def test_verify_show_future_end_time(self):
+        future = NOW + datetime.timedelta(hours=HOURS)
+        self._test_verify_show(START, future)
+
     def test_verify_detailed_index(self):
         req = webob.Request.blank(
                     '/v2/faketenant_0/os-simple-tenant-usage?'
@@ -133,11 +149,11 @@
             for j in xrange(SERVERS):
                 self.assertEqual(int(servers[j]['hours']), HOURS)
 
-    def test_verify_show(self):
+    def _test_verify_show(self, start, stop):
         req = webob.Request.blank(
                   '/v2/faketenant_0/os-simple-tenant-usage/'
                   'faketenant_0?start=%s&end=%s' %
-                  (START.isoformat(), STOP.isoformat()))
+                  (start.isoformat(), stop.isoformat()))
         req.method = "GET"
         req.headers["content-type"] = "application/json"
 

=== modified file '.pc/fix-pep8-errors.patch/nova/virt/libvirt/connection.py'
--- .pc/fix-pep8-errors.patch/nova/virt/libvirt/connection.py	2012-08-27 14:50:40 +0000
+++ .pc/fix-pep8-errors.patch/nova/virt/libvirt/connection.py	2012-12-18 13:07:55 +0000
@@ -549,6 +549,13 @@
                                                connection_info,
                                                mount_device)
 
+        # TODO(danms) once libvirt has support for LXC hotplug,
+        # replace this re-define with use of the
+        # VIR_DOMAIN_AFFECT_LIVE & VIR_DOMAIN_AFFECT_CONFIG flags with
+        # attachDevice()
+        domxml = virt_dom.XMLDesc(libvirt.VIR_DOMAIN_XML_SECURE)
+        self._conn.defineXML(domxml)
+
     @staticmethod
     def _get_disk_xml(xml, device):
         """Returns the xml for the disk mounted at device"""
@@ -583,6 +590,13 @@
                                       connection_info,
                                       mount_device)
 
+        # TODO(danms) once libvirt has support for LXC hotplug,
+        # replace this re-define with use of the
+        # VIR_DOMAIN_AFFECT_LIVE & VIR_DOMAIN_AFFECT_CONFIG flags with
+        # detachDevice()
+        domxml = virt_dom.XMLDesc(libvirt.VIR_DOMAIN_XML_SECURE)
+        self._conn.defineXML(domxml)
+
     @exception.wrap_exception()
     def _attach_lxc_volume(self, xml, virt_dom, instance_name):
         LOG.info(_('attaching LXC block device'))
@@ -681,8 +695,7 @@
         else:
             metadata['disk_format'] = image_format
 
-        if 'container_format' in base:
-            metadata['container_format'] = base['container_format']
+        metadata['container_format'] = base.get('container_format', 'bare')
 
         # Find the disk
         xml_desc = virt_dom.XMLDesc(0)
@@ -928,8 +941,8 @@
             LOG.info(_("Automatically confirming migration %d"), migration.id)
             self.compute_api.confirm_resize(ctxt, migration.instance_uuid)
 
-    def _enable_hairpin(self, instance):
-        interfaces = self.get_interfaces(instance['name'])
+    def _enable_hairpin(self, xml):
+        interfaces = self.get_interfaces(xml)
         for interface in interfaces:
             utils.execute('tee',
                           '/sys/class/net/%s/brport/hairpin_mode' % interface,
@@ -951,7 +964,6 @@
 
         self._create_new_domain(xml)
         LOG.debug(_("Instance is running"), instance=instance)
-        self._enable_hairpin(instance)
         self.firewall_driver.apply_instance_filter(instance, network_info)
 
         def _wait_for_boot():
@@ -1619,6 +1631,7 @@
         else:
             # createXML call creates a transient domain
             domain = self._conn.createXML(xml, launch_flags)
+        self._enable_hairpin(domain.XMLDesc(0))
 
         return domain
 
@@ -1675,14 +1688,12 @@
 
         return disks
 
-    def get_interfaces(self, instance_name):
+    def get_interfaces(self, xml):
         """
-        Note that this function takes an instance name.
+        Note that this function takes an instance domain xml.
 
         Returns a list of all network interfaces for this instance.
         """
-        domain = self._lookup_by_name(instance_name)
-        xml = domain.XMLDesc(0)
         doc = None
 
         try:
@@ -1765,6 +1776,8 @@
                 total += 1
             else:
                 total += len(vcpus[1])
+            # NOTE(gtt116): give change to do other task.
+            greenthread.sleep(0)
         return total
 
     def get_memory_mb_used(self):
@@ -2325,7 +2338,8 @@
             except exception.InstanceNotFound:
                 # Instance was deleted during the check so ignore it
                 pass
-
+            # NOTE(gtt116): give change to do other task.
+            greenthread.sleep(0)
         # Disk available least size
         available_least_size = dk_sz_gb * (1024 ** 3) - instances_sz
         return (available_least_size / 1024 / 1024 / 1024)

=== modified file 'Authors'
--- Authors	2012-08-27 14:50:40 +0000
+++ Authors	2012-12-18 13:07:55 +0000
@@ -1,3 +1,4 @@
+Aaron Rosen <[e-mail]>
 Aaron Lee <[e-mail]>
 Adam Gandelman <[e-mail]>
 Adam Johnson <[e-mail]>
@@ -22,6 +23,7 @@
 Ben McGraw <[e-mail]>
 Ben Swartzlander <[e-mail]>
 Bilal Akhtar <[e-mail]>
+Boris Filippov <[e-mail]>
 Brad Hall <[e-mail]>
 Brad McConnell <[e-mail]>
 Brendan Maguire <[e-mail]>
@@ -44,6 +46,7 @@
 Daniel P. Berrange <[e-mail]>
 Dave Lapsley <[e-mail]>
 Dave Walker <[e-mail]>
+David Besen <[e-mail]>
 David McNally <[e-mail]>
 David Pravec <[e-mail]>
 David Subiros <[e-mail]>
@@ -98,7 +101,7 @@
 John Garbutt <[e-mail]>
 John Griffith <[e-mail]>
 John Kennedy <[e-mail]>
-John Tran <[e-mail]>
+John Tran <[e-mail]>
 Jonathan Bryce <[e-mail]>
 Jordan Rinke <[e-mail]>
 Joseph Suh <[e-mail]>
@@ -171,6 +174,7 @@
 Rick Harris <[e-mail]>
 Rob Kost <[e-mail]>
 Robert Esker <[e-mail]>
+RongzeZhu <[e-mail]>
 Russell Bryant <[e-mail]>
 Russell Sim <[e-mail]>
 Ryan Lane <[e-mail]>
@@ -187,6 +191,7 @@
 Sumit Naiksatam <[e-mail]>
 Takaaki Suzuki <[e-mail]>
 Thierry Carrez <[e-mail]>
+TianTian Gao <[e-mail]>
 Tim Simpson <[e-mail]>
 Todd Willey <[e-mail]>
 Tomoe Sugihara <[e-mail]>

=== modified file 'ChangeLog'
--- ChangeLog	2012-08-27 14:50:40 +0000
+++ ChangeLog	2012-12-18 13:07:55 +0000
@@ -1,3 +1,353 @@
+commit 9f277e3832a554316007a60104c2f44c472b23dd
+Merge: bd10241 80fefe5
+Author: Jenkins <[e-mail]>
+Date:   Wed Dec 12 09:24:26 2012 +0000
+
+    Merge "Fix use_single_default_gateway" into stable/essex
+
+commit 80fefe5d2b030ff9a6429b84ef9761f85b5ddc99
+Author: Joseph W. Breu <[e-mail]>
+Date:   Thu Nov 15 14:25:50 2012 -0600
+
+    Fix use_single_default_gateway
+    
+    With FlatDHCP and use_single_default_gateway nova-network creates
+    an invalid entry in the dnsmasq .opts file for the network that
+    contains a blank router option.  New instances will not receive
+    a default gateway.
+    
+    Change-Id: I4c2da61def0681b7b253ae387bf83c069484e28b
+    Fixes: bug #1075859
+    (cherry picked from commit 1b455923446de6fcfee7166059db72b80ff51dfe)
+
+ nova/network/linux_net.py    |    1 +
+ nova/tests/test_linux_net.py |    2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+commit bd1024194a384bbc2f332e74587b577d7b79c539
+Author: Dan Smith <[e-mail]>
+Date:   Mon Jul 9 13:37:01 2012 -0700
+
+    When deleting an instance, avoid freakout if iscsi device is gone
+    
+    It's fairly easy to get into a state where an instance is not running,
+    the iscsi infrastructure has been torn down, and the instance cannot
+    be deleted because the iscsi device cannot be successfully removed.
+    This patch ignores the associated return value for that scenario and
+    marches forward in the teardown process.
+    
+    Fixes bug 1079745 (Cherry picked for Essex)
+    
+    Change-Id: Ib28790892eebe341ac10a92250cf872605fefe9b
+
+ nova/virt/libvirt/volume.py |    8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+commit 0edd3cb8df087924a70b63c5735e8c7711921a99
+Merge: 91fdcc8 86a5937
+Author: Jenkins <[e-mail]>
+Date:   Wed Oct 31 07:36:14 2012 +0000
+
+    Merge "Avoid RPC calls while holding iptables lock." into stable/essex
+
+commit 86a59376c6d4d2ec5a05c8b63a419d0374e9d9c9
+Author: Michael Still <[e-mail]>
+Date:   Thu Oct 11 15:46:11 2012 +1100
+
+    Avoid RPC calls while holding iptables lock.
+    
+    This exhibitied itself as very slow instance starts on a Canonical
+    test cluster. This was because do_referesh_security_group_rules()
+    was making rpc calls while holding the iptables lock. This refactor
+    avoids that while making no functional changes (I hope).
+    
+    Fixes bug: 1062314
+    Change-Id: I36f805bd72f7bd06082cfe96c58d637203bcffb7
+    Cherry-picked: ba585524e32965697c1a44c8fd743dea060bb1af
+    Conflicts:
+    	nova/virt/firewall.py
+
+ nova/tests/test_libvirt.py |   14 +++++++++++++-
+ nova/virt/firewall.py      |   20 ++++++++++++++------
+ 2 files changed, 27 insertions(+), 7 deletions(-)
+
+commit 91fdcc84a1f3ccdc99fc25e3e7b620c15ac5f15a
+Author: Mark McLoughlin <[e-mail]>
+Date:   Thu Oct 11 20:32:11 2012 +0100
+
+    Bump version to 2012.1.4
+    
+    Set version to 2012.1.4, but with final=False
+    
+    See http://wiki.openstack.org/StableBranchRelease
+    
+    Note - 2012.1.3 is expected to be the final official release of Essex.
+    
+    Change-Id: If6274ecbbb07f57e2af843c94e3397e2373c0cdd
+
+ nova/version.py |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit b00f759b80a66d5faba212232bde2bcd4cc3cd6c
+Author: Mark McLoughlin <[e-mail]>
+Date:   Thu Oct 11 20:29:45 2012 +0100
+
+    Final versioning for 2012.1.3
+    
+    Change-Id: I624420b50ba24240dcc5a3f7d0771a6d81588752
+
+ nova/version.py |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 815d4e0e3424af09cfc55212eb7376021713d942
+Merge: 17a6cd9 ae9c5f4
+Author: Jenkins <[e-mail]>
+Date:   Thu Oct 11 17:29:01 2012 +0000
+
+    Merge "deallocate_fixed_ip attempts to update deleted ip" into stable/essex
+
+commit 17a6cd91ef64ae00be108726eb6aee32f44aab4d
+Merge: d1d5d6d 20f98c5
+Author: Jenkins <[e-mail]>
+Date:   Thu Oct 11 17:28:04 2012 +0000
+
+    Merge "fixed_ip_get_by_address read_deleted from context" into stable/essex
+
+commit d1d5d6d19d7b3d8303f1bc80712871c9254631a6
+Merge: f28c7b2 75f6922
+Author: Jenkins <[e-mail]>
+Date:   Wed Sep 26 14:19:49 2012 +0000
+
+    Merge "Use bare container format by default" into stable/essex
+
+commit f28c7b21f6259f72ac87a924eb4e00c8d9b2cea7
+Merge: 80f2f26 1076699
+Author: Jenkins <[e-mail]>
+Date:   Wed Sep 26 14:19:25 2012 +0000
+
+    Merge "fix cleanup_file_locks with restricted permissions" into stable/essex
+
+commit 80f2f26134cd4c35902c4c009598b54e53e06994
+Merge: 4eebe76 40c5e94
+Author: Jenkins <[e-mail]>
+Date:   Wed Sep 26 14:16:50 2012 +0000
+
+    Merge "make ensure_default_security_group() call sgh" into stable/essex
+
+commit ae9c5f41b2a21183e80e6df19bdd7c56380c84a8
+Author: John H. Tran <[e-mail]>
+Date:   Fri Jun 22 19:14:06 2012 -0700
+
+    deallocate_fixed_ip attempts to update deleted ip
+    
+    Fixes bug 1017633. When deleting a vm, the nova
+    network manager looks to deallocate wrong fixed
+    ip when context has read_deleted set to 'yes',
+    in case when a network had been deleted and re-
+    created , it attempts to update already deleted
+    fixed_ips and therefore looks to teardown from
+    wrong network_id as well.
+    
+    Change-Id: I574a20273220ef81498403da80f489732ae81eb1
+    (cherry picked from commit 61ab72d15b3ac61b245e0bdd4a7bee5f3a673f75)
+
+ nova/network/manager.py            |    3 +--
+ nova/tests/network/test_manager.py |   35 +++++++++++++++++++++++++++++++++++
+ 2 files changed, 36 insertions(+), 2 deletions(-)
+
+commit 20f98c5785bfc074caaaa5542d19b7f361597e30
+Author: John Tran <[e-mail]>
+Date:   Tue May 15 10:00:36 2012 -0700
+
+    fixed_ip_get_by_address read_deleted from context
+    
+    Fixes bug 996482. by default fixed_ip_get_by_address
+    always sets read_deleted='yes'.  Changed it to accept
+    read_deleted value from context.
+    updated .mailmap to rewrite my old email to new email
+    
+    Change-Id: If94251972df7bbcfdeebc226613edac0a3f41186
+    (cherry picked from commit c1e54e1968faa23dfa26796fdb8f3f8d9ba79367)
+
+ .mailmap                  |    1 +
+ Authors                   |    2 +-
+ nova/db/sqlalchemy/api.py |    2 +-
+ nova/tests/test_db_api.py |    2 ++
+ 4 files changed, 5 insertions(+), 2 deletions(-)
+
+commit 4eebe76e9671afcdf8f468a91c9eb27ddba30715
+Author: Pádraig Brady <[e-mail]>
+Date:   Sat Sep 8 02:43:01 2012 +0100
+
+    fix unmounting of LXC containers in the presence of symlinks
+    
+    When looking up the mount dir in /proc/mounts we need
+    to canonicalize the path so that symlinks are resolved
+    
+    Fixes bug: 1046313
+    Change-Id: Ib2bb8253e9cdfeda3c6ba13e56a0f907518ff558
+    Cherry-picked: b35b34a65a6ddcfee524304cc548b4dfe1fc6cd5
+
+ nova/virt/disk/api.py |    1 +
+ 1 file changed, 1 insertion(+)
+
+commit 40c5e94d56bfdb3ec1e1ac8c0e501d66cd9691ec
+Author: Aaron Rosen <[e-mail]>
+Date:   Fri Sep 14 12:15:07 2012 -0400
+
+    make ensure_default_security_group() call sgh
+    
+    This change makes sure that sgh is called when default
+    security group is created. Fixes bug 1050982
+    
+    Change-Id: I483e33d8977b2bfbd7456a7c7c0d1fe7803708f8
+
+ Authors             |    1 +
+ nova/compute/api.py |    2 ++
+ 2 files changed, 3 insertions(+)
+
+commit 10766995ec5914247c21694062337c22e83e1dff
+Author: Pádraig Brady <[e-mail]>
+Date:   Mon Sep 17 13:19:18 2012 +0100
+
+    fix cleanup_file_locks with restricted permissions
+    
+    SELinux was seen to disallow kill(pid, 0).
+    Therefore ensure that the pid is determined
+    to be still running if we get EPERM.
+    
+    Fixes bug: 1051924
+    Change-Id: Ib84e2fc460066ee03070b9bda15732cce573ccf3
+
+ nova/utils.py |   20 +++++++++++---------
+ 1 file changed, 11 insertions(+), 9 deletions(-)
+
+commit 75f69225c5be5e5817a4008792e974ba4014c9e1
+Author: Boris Filippov <[e-mail]>
+Date:   Wed Sep 5 05:40:05 2012 +0400
+
+    Use bare container format by default
+    
+    Set container_format to bare during libvirt snapshot, when VM image in
+    glance was deleted. Currently, if VM image in glance was already deleted
+    before snapshot, nova will attempt to create snapshot image with
+    container_format: None. This cause glance to return error on attempt to
+    upload snapshot. According to glance docs container_format is not used
+    anywhere in glance or nova explicitly and it is safe to set it to bare,
+    when you are unsure which container_format you need to use.
+    Current snapshot logic sets snapshot disk_format to currently used
+    image_format in absence of base image in glance.
+    
+    This resolves bug 921774 without need for snapshot mechanism redesign.
+    
+    Change-Id: I7beea35120aaeac0837daecdf58f38f62e24454c
+
+ Authors                         |    1 +
+ nova/virt/libvirt/connection.py |    3 +--
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 47dabb30dc09282d56ad1e54c7652bf35394f7df
+Author: TianTian Gao <[e-mail]>
+Date:   Tue Sep 4 12:01:41 2012 +0800
+
+    Yield to another greenthread when some time-consuming task finished.
+    
+    Partially addresses bug #1045152
+    
+    On a heavily loaded compute node, it can be observed that periodic tasks
+    take so long to run that the report_state() looping call can be blocked from
+    running long enough that the scheduler thinks the host is dead.
+    
+    Reduce the chance of this happening by yielding to another greenthread
+    after each periodic task has completed and each loop in some methods
+    that has linear relationship with the number of instances.
+    
+    Change-Id: If2b125708da8298b20497e2e08e52280c102f1e1
+
+ Authors                         |    1 +
+ nova/manager.py                 |    5 +++++
+ nova/virt/libvirt/connection.py |    5 ++++-
+ 3 files changed, 10 insertions(+), 1 deletion(-)
+
+commit 2e75689c7cb3b20265dc5b2799d3367e513d6b5b
+Merge: 4ac2dcc b375b4f
+Author: Jenkins <[e-mail]>
+Date:   Thu Sep 13 17:54:37 2012 +0000
+
+    Merge "Redefine the domain's XML on volume attach/detach" into stable/essex
+
+commit b375b4f1131d54315bb9952fcf2eff363b3b29b1
+Author: Dan Smith <[e-mail]>
+Date:   Fri Jun 29 09:35:02 2012 -0700
+
+    Redefine the domain's XML on volume attach/detach
+    
+    This fixes bug 1004791 by adding new disk definitions to the defined
+    XML instead of just modifying the running instance.
+    
+    Cherry picked for stable/essex to fix bug 1012717.
+    
+    Change-Id: I6596dae7c54158c32bc7b399c55a1797b2d98242
+
+ nova/tests/fakelibvirt.py       |    2 ++
+ nova/virt/libvirt/connection.py |   14 ++++++++++++++
+ 2 files changed, 16 insertions(+)
+
+commit 4ac2dcc36bb4e737e486ef86930c023b403a3f3a
+Author: RongzeZhu <[e-mail]>
+Date:   Sun Sep 2 18:43:56 2012 +0800
+
+    Fix simple_tenant_usage's handing of future end times
+    
+    Fixes bug #1043999
+    
+    simple_tenant_usage returns the usage in the range between the supplied
+    start and end query parameters. The _hours_for() method calculates the
+    number of hours the instance was running in this range, even if the end time
+    is in the future.
+    
+    By default, python-novaclient requests usage between 4 weeks ago and tomorrow.
+    This means we a report which accounts for 24 hours of extra running time for
+    each currently running instance. Fix this by clamping the period of the
+    returned report at the current time.
+    
+    Change-Id: I61c211fd85b729aaeaac6ef24644ee19eb5bb6b0
+    (cherry picked from commit 869443f41c8826c9a4de1dcc65c5a5354b623a04)
+
+ Authors                                            |    1 +
+ .../compute/contrib/simple_tenant_usage.py         |    7 +++++
+ .../compute/contrib/test_simple_tenant_usage.py    |   28 +++++++++++++++-----
+ 3 files changed, 30 insertions(+), 6 deletions(-)
+
+commit b0da809850008901c876e2fe7bb09efc60534f2b
+Merge: 0d6787b 014fcbc
+Author: Jenkins <[e-mail]>
+Date:   Tue Sep 4 10:12:42 2012 +0000
+
+    Merge "Ensure hairpin_mode is set whenever vifs is added to bridge." into stable/essex
+
+commit 0d6787b190a255c97465c53e734196b2bbe82631
+Merge: 4d2a4af 2f35f8e
+Author: Jenkins <[e-mail]>
+Date:   Thu Aug 30 00:07:18 2012 +0000
+
+    Merge "Make flavorextradata ignore deleted flavors." into stable/essex
+
+commit 014fcbc06f55ea91a4e2c3a35df048cad3ae6684
+Author: Yaguang Tang <[e-mail]>
+Date:   Sun Aug 26 09:58:09 2012 +0800
+
+    Ensure hairpin_mode is set whenever vifs is added to bridge.
+    
+    Fix the bug that when create a snapshot of an instance, the
+    instance cann't ping it's floating ip.
+    fix bug lp:1040537
+    
+    Change-Id: I25aa1a323fa84e8c72f969cb56ada4dffa509150
+
+ nova/virt/libvirt/connection.py |   12 +++++-------
+ 1 file changed, 5 insertions(+), 7 deletions(-)
+
 commit 4d2a4afe3e3f67ed457651f0ea8ddd74ab75436d
 Merge: 66c7164 5d63601
 Author: Jenkins <[e-mail]>
@@ -171,6 +521,22 @@
  nova/version.py |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
+commit 2f35f8ec54d303dc48040c46cb950c7fbff9731e
+Author: David Besen <[e-mail]>
+Date:   Wed Aug 8 10:35:32 2012 -0600
+
+    Make flavorextradata ignore deleted flavors.
+    
+    In _get_flavor_refs, don't retrieve inactive flavors. Fixes bug 1026210.
+    
+    This change was made on trunk in https://review.openstack.org/#/c/9995/
+    
+    Change-Id: I967faa661cd4177a54079a966ca8912923c5f61b
+
+ Authors                                            |    1 +
+ .../openstack/compute/contrib/flavorextradata.py   |    2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
 commit d4c7f6fc5e6094b00a31717080d73feff100eb1b
 Merge: 3804144 e8ef050
 Author: Jenkins <[e-mail]>
@@ -47171,7 +47537,7 @@
 
 commit d327987cdd0eed43e5400b392086446b0c73b035
 Merge: 48e22da ca13037
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Thu Aug 18 21:57:52 2011 +0000
 
     Fixed bug in which DescribeInstances was returning deleted instances.  Added tests for pertinent api methods.
@@ -48249,7 +48615,7 @@
     This branch implements a nova api extension which allows you to manage and update tenant/project quotas.
 
 commit ca13037d2cd130f5b970d3af219566f3a70a9cb5
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Tue Aug 16 09:18:13 2011 -0700
 
     test improvements per peer review
@@ -48656,7 +49022,7 @@
  1 file changed, 14 insertions(+), 6 deletions(-)
 
 commit 3e561f148fcba627f8fbd4ab1089f426fbc2e61b
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Mon Aug 15 13:58:44 2011 -0700
 
     adding sqlalchemi api tests for test_instance_get_all_by_filter to ensure doesn't return deleted instances
@@ -48666,7 +49032,7 @@
  2 files changed, 15 insertions(+), 1 deletion(-)
 
 commit f06f80591a41f5d1b373677937bbbcddcfb0bb7c
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Mon Aug 15 13:48:09 2011 -0700
 
     added cloud unit test for describe_instances to ensure doesn't return deleted instances
@@ -48735,7 +49101,7 @@
     merge trunk, remove _validate_cidrs and replace functionality with a double for loop
 
 commit 066b675e3ce5c2bd67dde124cbe01b68bd1eded8
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Mon Aug 15 13:22:14 2011 -0700
 
     fix bug which DescribeInstances in EC2 api was returning deleted instances
@@ -48958,7 +49324,7 @@
 
 commit a538f400b5ced8357fa0e892fffd5a01b8e63cec
 Merge: 452b343 353fa48
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Sun Aug 14 04:10:26 2011 +0000
 
     added logic to make the creation of networks (IPv4 only) validation a bit smarter:
@@ -48971,7 +49337,7 @@
 
 commit 452b343811311acbe35ccb5a896569127647f613
 Merge: 89ddaa6 7b72972
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Sun Aug 14 03:47:48 2011 +0000
 
       fix InvalidPortRange exception shows up in euca2ools  instead of UnknownError when euca-authorize is specified w/ invalid port #.
@@ -49967,7 +50333,7 @@
  3 files changed, 27 insertions(+), 5 deletions(-)
 
 commit 7b72972cbc9fbd267160d8d3282e1d0ec888de98
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Wed Aug 10 16:19:21 2011 -0700
 
     removed typos, end of line chars
@@ -50185,7 +50551,7 @@
     merge trunk
 
 commit 6548ce754984f2eb5e72612392a8a3392c2a21a2
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Tue Aug 9 18:43:18 2011 -0700
 
     fix so that the exception shows up in euca2ools  instead of UnknownError
@@ -51315,7 +51681,7 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 353fa4871069cf0b926f09aa00496002f65584cb
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Fri Aug 5 11:48:06 2011 -0700
 
     fixed per peer review
@@ -51324,7 +51690,7 @@
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 commit 3812d22b7a6f5d74418a7a99dc69c68a5b9f9046
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Fri Aug 5 11:36:00 2011 -0700
 
     fixed per peer review
@@ -51383,7 +51749,7 @@
     Updates v1.1 servers/id/action requests to comply with the 1.1 spec
 
 commit 2935bebd718e770d0f2c9d1ab5dca76cc7d5f76a
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Fri Aug 5 09:50:11 2011 -0700
 
     fix typo
@@ -51688,7 +52054,7 @@
     tests and merge with trunk
 
 commit b7167b21d615f8617d588a1656aa341fd226ded9
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Thu Aug 4 20:13:23 2011 -0700
 
     removed redundant logic
@@ -51698,14 +52064,14 @@
 
 commit d4c5d5b18fc3b51fcb1ee5bc39ac866c4aa47d48
 Merge: b557b63 502801b
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Thu Aug 4 19:43:33 2011 -0700
 
     merged trunk
 
 commit 502801bfff0015ed3aa93b9d65a87cb6b80fd11d
 Merge: 0b275cd f942a7f
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Fri Aug 5 02:27:36 2011 +0000
 
     For nova-manage network create cmd, added warning when size of subnet(s) being created are larger than FLAG.network_size,  in attempt to alleviate confusion.  For example, currently when 'nova-manage network create foo 192.168.0.0/16', the result is that it creates a 192.168.0.0/24 instead without any indication to why
@@ -51740,7 +52106,7 @@
  1 file changed, 7 insertions(+), 5 deletions(-)
 
 commit b557b6366b21a0d3795369785037ee29c8cef377
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Thu Aug 4 18:52:15 2011 -0700
 
     fix pep8 issues
@@ -51750,7 +52116,7 @@
  2 files changed, 12 insertions(+), 7 deletions(-)
 
 commit 38eb72be5f15731ba34a7dc0f8a28aa0fb63ea90
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Thu Aug 4 18:37:36 2011 -0700
 
     fixed bug , when logic searched for next avail cidr it would return cidrs that were out of range of original requested cidr block.  added test for it
@@ -51783,7 +52149,7 @@
  1 file changed, 37 insertions(+)
 
 commit 89ec28c70d7795d427ecd4242cb1856eabdca104
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Thu Aug 4 18:01:07 2011 -0700
 
     fixed bug, wasn't detecting smaller subnet conflict properly added test for it
@@ -51811,7 +52177,7 @@
  1 file changed, 3 insertions(+)
 
 commit f58d441b55e143de35aefd039b80e0b27dad9ce2
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Thu Aug 4 16:27:55 2011 -0700
 
     removed unnecessary context from test I had left there from prior
@@ -51830,7 +52196,7 @@
  2 files changed, 90 insertions(+), 82 deletions(-)
 
 commit 8c7b71f65e54d67615e52927591e12a43b8b3991
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Thu Aug 4 16:05:08 2011 -0700
 
     re-integrated my changes after merging trunk.  fixed some pep8 issues.  sorting the list of cidrs to create, so that it will create x.x.0.0 with a lower 'id' than x.x.1.0 (as an example).  <- was causing libvirtd test to fail
@@ -52897,7 +53263,7 @@
     Yet another conflict resolved.
 
 commit f942a7f22acb6a6719a3de778ba55ca25ea0ee68
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Wed Aug 3 00:16:52 2011 -0700
 
     forgot to remove comment
@@ -52906,7 +53272,7 @@
  1 file changed, 1 deletion(-)
 
 commit bfb5a5e1204bf868b5db8d8d038b63d0899665ce
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Wed Aug 3 00:11:52 2011 -0700
 
     updated to work w/ changes after merged trunk fixing var renaming.  the logic which forces default to FLAGS.network_size if requested cidr was larger, was also applying to requested cidrs smaller than FLAGS.network_size.   Requested cidrs smaller than FLAGS.network_size should be ignored and not overriden.
@@ -52916,14 +53282,14 @@
 
 commit 6d7e5196db2e852476f7d14007cf155e15815071
 Merge: e239dc5 e2770a4
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Tue Aug 2 23:16:27 2011 -0700
 
     merged from trunk
 
 commit 8b06f143ec1d91b3c95a43746bfdacbe3aec3829
 Merge: 51f0cbf e2770a4
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Tue Aug 2 23:07:23 2011 -0700
 
     merged from trunk
@@ -53385,7 +53751,7 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 51f0cbf9221b461eb92beae2497e871bf2a7f45f
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Tue Aug 2 10:06:22 2011 -0700
 
     refactored tests
@@ -53499,7 +53865,7 @@
 
 commit 83066aa64ccba34e23063eee661375b11de2161f
 Merge: f05628d 094b984
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Tue Aug 2 11:28:43 2011 +0000
 
     code was checking for key in sqlalchemy instance and will ignore if value is None, but wasn't working if floating_ip was a non-sqlalchemy dict obj.  Therefore, updated the error checking to work in both caes.
@@ -53542,7 +53908,7 @@
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit bcfd8f5e1e0c3b53a2ad4a5bb533d94dcf5ef18c
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Mon Aug 1 21:34:43 2011 -0700
 
     added some tests for network create & moved the ipv6 logic back into the function
@@ -53623,7 +53989,7 @@
     Merged trunk
 
 commit ab4bfcf6c458ab6bf6ead126a91413b92aa543b8
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Mon Aug 1 16:27:17 2011 -0700
 
     pep8 fixes
@@ -53669,7 +54035,7 @@
     Merge from trunk.
 
 commit 951114be20065044e7f12e37188eb30e859ff2cb
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Mon Aug 1 12:47:41 2011 -0700
 
     removed redundant logic
@@ -53679,13 +54045,13 @@
 
 commit a73d1f200dc3e493ce7044bda9fe0a691dca1664
 Merge: e72fafb bdcfaa5
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Mon Aug 1 12:39:26 2011 -0700
 
     merged from trunk
 
 commit e72fafbf76ed456039426a96dd65d2c148dffa29
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Mon Aug 1 12:37:12 2011 -0700
 
     adding a function with logic to make the creation of networks validation a bit smarter:
@@ -55392,7 +55758,7 @@
  2 files changed, 34 insertions(+), 1 deletion(-)
 
 commit 094b9845500e28d315f70aa1fbc37b75c143d0c0
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Wed Jul 27 10:34:58 2011 -0700
 
     improved the code per peer review
@@ -55722,7 +56088,7 @@
  1 file changed, 18 insertions(+), 77 deletions(-)
 
 commit 6b33d0dfbfea7ee66a47947973133573070303cd
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Tue Jul 26 23:03:16 2011 -0700
 
     code was checking for key in sqlalchemy instance but if floating_ip is a non-sqlalchemy dict instance instead, value=None will cause NoneType exception.
@@ -56014,7 +56380,7 @@
  4 files changed, 172 insertions(+), 131 deletions(-)
 
 commit e239dc589982a0d90eb8a50967af05a10d5e4d5b
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Tue Jul 26 13:12:34 2011 -0700
 
     fixed per peer review
@@ -56134,7 +56500,7 @@
     Ideally we should probably consider adding a fixed_ip alias to the models.Instance query context so that the api code is consistent, but for now this should resolve the outstanding issues.
 
 commit 6fb2fe901bc4f4479e6a2bb087870927be7318a2
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Tue Jul 26 10:03:16 2011 -0700
 
     added warning when size of subnet(s) being created are larger than FLAG.network_size in attempt to alleviate confusion.  For example, currently when 'nova-manage network create foo 192.168.0.0/16', the result is that it creates a 192.168.0.0/24 instead without any indication to why.
@@ -56155,7 +56521,7 @@
 
 commit 05e7aedaa3124267450e2f74ca026680b15d6d27
 Merge: 6107daa 8e087df
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Tue Jul 26 09:49:51 2011 -0700
 
     merged from trunk
@@ -56563,7 +56929,7 @@
 
 commit e2d35269e7628cc0eedddaa3ac9b48a6bd95cdac
 Merge: b2920f1 ab42384
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Mon Jul 25 21:24:42 2011 +0000
 
      modified to conform to latest AWS EC2 API spec for authorize & revoke ingress params using the IpPermissions data structure, which nests lists of CIDR blocks (IpRanges) as well as lists of Group data
@@ -58776,7 +59142,7 @@
 
 commit f926ae2a0fcf115beae78b8edfbf4ddee1d646be
 Merge: b76d31c 1d4a789
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Wed Jul 20 16:41:10 2011 +0000
 
     network api release_floating_ip method will now check to see if an instance is associated to it, prior to releasing.
@@ -59054,7 +59420,7 @@
  8 files changed, 16 insertions(+), 17 deletions(-)
 
 commit 1d4a789ed370fe0cc00c292f89b96b0ffaf115ff
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Tue Jul 19 14:16:14 2011 -0700
 
     move import network to the top
@@ -59071,13 +59437,13 @@
 
 commit 12441aae27572a8966a42ff6c5b16cfc7195a634
 Merge: ecb68bf 77db06c
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Tue Jul 19 13:56:28 2011 -0700
 
     merged from trunk
 
 commit ecb68bf77565cb01ec0ea4d28c7f1315e10b21c4
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Tue Jul 19 13:49:05 2011 -0700
 
     network api release_floating_ip method checks if an instance associated to the floating prior to releasing.  added test
@@ -59517,7 +59883,7 @@
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit ab42384131077bae3986141279b605d8f994143c
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Mon Jul 18 03:45:16 2011 +0000
 
     resolved pep8 issues
@@ -59528,7 +59894,7 @@
 
 commit 3fd9b0dbfcb42422a88c9b21f5353fdb9eea1fc1
 Merge: b0a02fe cf25ab3
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Mon Jul 18 03:03:57 2011 +0000
 
     merged from trunk
@@ -59631,7 +59997,7 @@
  3 files changed, 25 insertions(+)
 
 commit b0a02feb7bd25380a75b83344e0ac3210a168387
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Sun Jul 17 22:07:07 2011 +0000
 
     changed to avoid localization test failure
@@ -59776,7 +60142,7 @@
     Added some unit and integration tests for updating the server name via the openstack api.
 
 commit 7498fa608def9613552cf0e26dcb03fddf7b298d
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Fri Jul 15 22:56:16 2011 +0000
 
     renamed priv method arg_to_dict since it's not just used for revoke.  modified to conform to latest AWS EC2 API spec for authorize & revoke ingress params using the IpPermissions data structure, which nests lists of CIDR blocks (IpRanges) as well as lists of Group data
@@ -61175,7 +61541,7 @@
 
 commit 0a2105dd88b400494d49fc7921deac4960b3515c
 Merge: fab5c5a 17fceb2
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Sat Jul 9 23:56:32 2011 +0000
 
     flaw in ec2 cloud api, _get_image method , if doing a search for aki-0000009, yet that image name doesn't exist, it strips off aki- and looks for any image_id 0000009 and if there was an image match that happens to be an ami instead of aki, it will go ahead and deregister the ami instead. That behavior is unintended, so added logic to ensure that the original request image_id matches the type of image being returned from database by matching against container_format attr
@@ -61271,7 +61637,7 @@
  2 files changed, 2 insertions(+), 3 deletions(-)
 
 commit 17fceb2368d63dd937dc5e9385158c01130557a7
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Fri Jul 8 14:19:35 2011 -0700
 
     peer review fix - per vish: 'This method automatically converts unknown formats to ami, which is the same logic used to display unknown images in the ec2 api.  This will allow you to properly deregister raw images, etc.'
@@ -61399,7 +61765,7 @@
  1 file changed, 6 insertions(+), 7 deletions(-)
 
 commit 2c3eeb5f9f5f78d9cb8fb3e37d5b5e1610d32499
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Thu Jul 7 20:43:50 2011 -0700
 
     ec2 api _get_image method logic flaw that strips the hex16 digit off of the image name, and does a search against the db for it and ignores that it may not be the correct image, such as if doing a search for aki-0000009, yet that image name doesn't exist, it strips off aki- and looks for any image_id 0000009 and if there was an image match that happens to be an ami instead of aki, it will go ahead and deregister that.  That behavior is unintended, so added logic to ensure that the original request image_id matches the type of image being returned from database by matching against container_format attr
@@ -62891,7 +63257,7 @@
 
 commit 6843421be9cdef1fc12d3480889bdcfd96821e1b
 Merge: 666b3c3 2d1d6b3
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Fri Jul 1 15:47:33 2011 +0000
 
     Added the GroupId param to any pertinent security_group methods that support it in the official AWS API.
@@ -63021,7 +63387,7 @@
     Ensure auto-delete is false on Topic Queues.
 
 commit 2d1d6b3e5c3957490c7cb49b38e72ca3baf9f8b0
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Thu Jun 30 17:52:33 2011 -0700
 
     refactored the security_group tests a bit and broke up a few of them into smaller tests
@@ -64226,7 +64592,7 @@
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 commit 73c49dd3497f46953d7fa9ac3f5caebcafa02023
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Mon Jun 27 15:30:56 2011 -0700
 
     breaking up into individual tests for security_groups
@@ -65346,7 +65712,7 @@
     trunk merge
 
 commit 129da3c5206443acc117b33b440a05b064fd711e
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Thu Jun 23 15:57:57 2011 -0700
 
     removing erroneous block, must've been a copy and paste fat finger
@@ -65355,7 +65721,7 @@
  1 file changed, 7 deletions(-)
 
 commit 5004736930c0c9619ba3efd48910a47fd58e0921
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Thu Jun 23 15:42:57 2011 -0700
 
     specify keyword, or direct_api proxy method blows up
@@ -65522,13 +65888,13 @@
 
 commit 85c8b60a67897ea2a37e305d901d1637bdae5e8d
 Merge: d5206c7 df8448f
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Thu Jun 23 11:32:27 2011 -0700
 
     merge from trunk
 
 commit d5206c7f41c435fd39c1bb9c0fd7ec53c9685f43
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Thu Jun 23 11:31:22 2011 -0700
 
     altho security_group authorize & revoke tests already exist in test_api, adding some direct ec2 api method tests.   added group_id param support to the pertinent security group methods
@@ -65625,7 +65991,7 @@
 
 commit df8448f9f63c9f610c23cf092c14f4eb8547fe46
 Merge: ca9384e dca372d
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Thu Jun 23 15:57:55 2011 +0000
 
     "nova-manage checks if user is member of proj, prior to adding role for that project"
@@ -66391,7 +66757,7 @@
     merge with trunk
 
 commit 3f2c0521f1c8462380c68d5245b5754867738fa1
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Tue Jun 21 18:14:31 2011 -0700
 
     ec2 api describe_security_groups allow group_id param , added tests for create/delete security group in test_cloud although also exists in test_api this tests directly the ec2 method.
@@ -66759,7 +67125,7 @@
  4 files changed, 81 insertions(+), 40 deletions(-)
 
 commit dca372d68ab99126f22c7467af12de30bb4488e4
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Mon Jun 20 15:28:34 2011 -0700
 
     nova-manage checks if user is member of proj, prior to adding role for that project
@@ -69381,7 +69747,7 @@
 
 commit 91e34d37d2907295e892e96ca2c3039c7fbe14bf
 Merge: 8e6fabd 05fecdf
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Sat Jun 11 01:31:10 2011 +0000
 
     ec2 api method allocate_address ; raises exception.NoFloatingIpsDefined instead of UnknownError when there aren't any floating ips available.
@@ -69533,7 +69899,7 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 05fecdf873a5c02dcb13c841304df872411d4183
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Fri Jun 10 11:10:58 2011 -0700
 
     added new exception more descriptive of not having available floating addresses avail for allocation
@@ -69544,7 +69910,7 @@
  3 files changed, 6 insertions(+), 2 deletions(-)
 
 commit 0e7a2042cc5922bb014a77080ec0bdb93bbf575c
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Fri Jun 10 10:28:03 2011 -0700
 
     raise instance instead of class
@@ -69562,7 +69928,7 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit e763a0ac8981bdbee44c054c6be08b9f1a5d634d
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Fri Jun 10 10:24:24 2011 -0700
 
     style change
@@ -69836,7 +70202,7 @@
  2 files changed, 18 insertions(+), 5 deletions(-)
 
 commit 463e0388308760dbf3bf2b3fa901d8076d002f91
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Thu Jun 9 00:01:42 2011 -0700
 
     matched the inner exception specifically, instead of catching all RemoteError exceptions
@@ -69872,7 +70238,7 @@
     Fix merge conflict
 
 commit b11cf9bc7b1b9792bdab77aa72dc6163f3e44ca1
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Wed Jun 8 17:17:40 2011 -0700
 
     removing custom exception, instead using NoFloatingIpsDefined
@@ -69881,7 +70247,7 @@
  1 file changed, 6 deletions(-)
 
 commit 3764be9d65483a9e431b69f37e3516fa20961362
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Wed Jun 8 17:15:35 2011 -0700
 
     raises exception.NoFloatingIpsDefined instead of UnknownError
@@ -69900,7 +70266,7 @@
  1 file changed, 12 insertions(+), 2 deletions(-)
 
 commit 70e4d73778d448cb7f122bc0a2a0c43a78fff46a
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Wed Jun 8 15:23:33 2011 -0700
 
     added a test for allocate_address & added error handling for api instead of returning 'UnknownError', will give information 'AllocateAddressError: NoMoreAddresses
@@ -70014,7 +70380,7 @@
 
 commit f83011a8046afc7f84dbfc08b3610bc942aefed2
 Merge: 8ff87c6 a909743
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Wed Jun 8 17:36:09 2011 +0000
 
     adding Authorizer key for ImportPublicKey
@@ -70111,7 +70477,7 @@
  1 file changed, 5 insertions(+)
 
 commit a90974347dd396990d8e6fadeac15abd07cb19ea
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Tue Jun 7 14:36:40 2011 -0700
 
     adding Authorizer key for ImportPublicKey
@@ -70361,7 +70727,7 @@
 
 commit a94992f199edd37ae3efd68c618b19c2ebab1a88
 Merge: 90d6bf7 81099d6
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Tue Jun 7 01:30:59 2011 +0000
 
     run_instances will check image for 'available' status before attempting to create a new instance
@@ -70386,7 +70752,7 @@
 
 commit 81099d63d6ff30b21116f7f0e5c782abadf0ab90
 Merge: 5d89721 4d50e84
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Mon Jun 6 14:37:30 2011 -0700
 
     merged from trunk
@@ -71357,7 +71723,7 @@
     Merge trunk.
 
 commit 5d89721f5fa3212146749236c666f0e584c8590f
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Wed Jun 1 16:27:51 2011 -0700
 
     merged, with trunk, fixed the test failure, and split the test into 3 as per peer review.
@@ -71367,7 +71733,7 @@
 
 commit 78093e8101d1981fc1fbafc963023bc70ad6b3b6
 Merge: 1f61272 ced7900
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Wed Jun 1 23:26:18 2011 +0000
 
     Fixes nova-manage bug.  When a nova-network host has allocated floating ips *AND* some associated, the nova-manage floating list <host> would throw exception because was expecting hash with 'ec2_id' key , however, the obj returned is a sqlalchemy obj and the attr we need is 'hostname'.
@@ -71392,7 +71758,7 @@
  2 files changed, 78 insertions(+), 20 deletions(-)
 
 commit ced79009e6555eb75f3862184834a883d37b2062
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Wed Jun 1 16:01:41 2011 -0700
 
     fixed as per peer review to make more consistent
@@ -71402,7 +71768,7 @@
 
 commit 5e800a901f0ec051715dbd0f917975f898406860
 Merge: a0cffc4 1f61272
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Wed Jun 1 15:54:45 2011 -0700
 
     merged from trunk
@@ -73409,7 +73775,7 @@
  1 file changed, 11 insertions(+)
 
 commit 7c0564baf72cbb5c3693ab72c72684a5c6b333c5
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Thu May 26 10:22:45 2011 -0700
 
     instance obj returned is not a hash, instead is sqlalchemy obj and hostname attr is what the logic is looking for
@@ -74714,7 +75080,7 @@
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit a0cffc4de8ba4b15958e320308477d42287858e7
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Tue May 24 09:43:52 2011 -0700
 
     specified image_id keyword in exception arg
@@ -74731,7 +75097,7 @@
     When adding a keypair with ec2 API that already exists, give a friendly error and no traceback in nova-api
 
 commit 8e7c3121fab4b5a87c2efe865f3c06b1bd267cbc
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Tue May 24 08:59:02 2011 -0700
 
     added imageid string to exception, per peer review
@@ -74927,7 +75293,7 @@
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 7a521f49f6daf0a0a37a9ef98ff1ea8813f04a6f
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Mon May 23 14:54:11 2011 -0700
 
     merged from trunk
@@ -74958,7 +75324,7 @@
 
 commit 1816b3e6a99da512aeb51822e90d40f30b443014
 Merge: 0a3da15 e1795bd
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Mon May 23 14:27:56 2011 -0700
 
     merged from trunk
@@ -75563,7 +75929,7 @@
 
 commit ff35d64de0228ed0ce7f0e617289d4423935fa3d
 Merge: b6d45a7 cbe89f1
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Fri May 20 06:51:29 2011 +0000
 
     Added an EC2 API endpoint that'll allow import of public key. Prior, api only allowed generation of new keys.
@@ -77142,7 +77508,7 @@
 
 commit 8d8076ff87e988f40c9ee3a24b7c3963064921bd
 Merge: ea5187e 0cf0b89
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Fri May 13 18:15:36 2011 +0000
 
     Adds proper error handling for images that can't be found and a test for deregister image.
@@ -77489,7 +77855,7 @@
 
 commit cbe89f150f6c1e209405da6cbba4c3cf9163fd2e
 Merge: 7cd6e9f 0576766
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Thu May 12 14:29:41 2011 -0700
 
     merged from trunk
@@ -77534,7 +77900,7 @@
  2 files changed, 32 insertions(+)
 
 commit 0cf0b89f57392688c0a443b29408813ccb028c38
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Thu May 12 12:51:03 2011 -0700
 
     incorporated ImageNotFound instead of NotFound
@@ -77545,7 +77911,7 @@
 
 commit 71b1ddba52e4901124c47202598433abfe03bedf
 Merge: 6dbec94 0576766
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Thu May 12 12:23:31 2011 -0700
 
     merged from trunk
@@ -77564,7 +77930,7 @@
  5 files changed, 371 insertions(+), 386 deletions(-)
 
 commit 0a3da155228228d3f0eeac1efdea1e29eef2f3a0
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Thu May 12 12:04:39 2011 -0700
 
     changed NotFound exception to ImageNotFound
@@ -77639,7 +78005,7 @@
 
 commit 86952493efb67b64b23766af094aa22deb21307f
 Merge: 377b120 0576766
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Thu May 12 11:25:12 2011 -0700
 
     merged from trunk
@@ -79205,13 +79571,13 @@
 
 commit 377b120f689edcdad07eaf479dfac1ac7becabd0
 Merge: 10db492 65f05c4
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Mon May 2 14:25:38 2011 -0700
 
     merged from trunk
 
 commit 10db492376a8bb8409e3fb3c33707865ac0f3ee7
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Mon May 2 14:25:21 2011 -0700
 
     implemented review suggestion EAFP style, and fixed test stub fake_show needs to have image_state = available or other tests will fail
@@ -79320,7 +79686,7 @@
 
 commit 42c8e73994c7d787aef0e2d97ea162ee5a2e1304
 Merge: 585a181 c3ab4f0
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Mon May 2 18:04:29 2011 +0000
 
     ApiError 'code' arg set to None, and will only display a 'code' as part of the str if specified.
@@ -79698,7 +80064,7 @@
     Rebased to trunk rev 1030.
 
 commit c3ab4f023e2636e254f940e08da0aded42c0e96b
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Mon Apr 25 12:55:59 2011 -0400
 
     removed extra newline
@@ -79708,7 +80074,7 @@
 
 commit 6dbec949738443dfcb48679549f5082d728abdff
 Merge: 8482d87 08cf0db
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Mon Apr 25 12:36:00 2011 -0400
 
     merged from trunk
@@ -82156,7 +82522,7 @@
 
 commit 8b54c186a7475cb800ac0de81be3478bc795d095
 Merge: 0f7ea0f b54b6c2
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Tue Apr 12 07:48:21 2011 +0000
 
     Add a unit test for terminate_instances.
@@ -82654,7 +83020,7 @@
 
 commit 2a14bc00c0abd1e2d0349ace99db7aa922b5f574
 Merge: 9b449fc d137ffd
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Fri Apr 8 18:02:55 2011 +0000
 
     Added a patch for python eventlet, when using install_venv.py (see FAQ # 1485)
@@ -83245,7 +83611,7 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 4c1c0b8357e2cffd5f9a2a1240439e1871f845f2
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Wed Apr 6 19:43:58 2011 -0700
 
     add the tests
@@ -83264,7 +83630,7 @@
  2 files changed, 7 insertions(+), 6 deletions(-)
 
 commit 430975c2f7e354838a26cd81e59b5c0423a2c8fe
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Wed Apr 6 19:13:18 2011 -0700
 
     ApiError code should default to None, and will only display a code if one exists.  Prior was output an 'ApiError: ApiError: error message' string, which is confusing
@@ -83273,7 +83639,7 @@
  1 file changed, 6 insertions(+), 2 deletions(-)
 
 commit 655eb8fbd21376e694f8134e42f10ddbc1aafb0e
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Wed Apr 6 18:22:03 2011 -0700
 
     ec2 api run_instances checks for image status must be 'available'.  Overhauled test_run_instances for working set of test assertions
@@ -83612,7 +83978,7 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit d137ffdc2fb4e0298a6fb177df9e6a8299320301
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Tue Apr 5 18:35:15 2011 -0700
 
     Add a patch for python eventlet, when using install_venv.py (see FAQ # 1485)
@@ -84050,7 +84416,7 @@
 
 commit c0a8904508edb0687b588d40a7bd181d0393884f
 Merge: 08417c4 d923224
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Tue Apr 5 02:31:02 2011 +0000
 
     fix bug lp:682888 - DescribeImages has no unit tests.
@@ -84918,7 +85284,7 @@
  1 file changed, 75 insertions(+), 4 deletions(-)
 
 commit b54b6c200092054e38af1fa1e5885fe915e53149
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Wed Mar 30 13:10:11 2011 -0700
 
     submitting a unit test for terminate_instance
@@ -84948,7 +85314,7 @@
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit 8482d87e3fe380704fac121240ebd29b9057283c
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Wed Mar 30 12:44:22 2011 -0700
 
     removed trailing whitespace
@@ -84957,7 +85323,7 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 655906ee7be1d906033bde7887293e6d61bae3d6
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Wed Mar 30 12:37:56 2011 -0700
 
     updated per code review, replaced NotFound with exception.NotFound
@@ -85481,7 +85847,7 @@
  1 file changed, 2 insertions(+), 10 deletions(-)
 
 commit d92322400c31f1cad933da5117b24376d60a5798
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Tue Mar 29 17:07:59 2011 -0700
 
     adding unit tests for describe_images
@@ -85659,7 +86025,7 @@
  4 files changed, 38 insertions(+), 11 deletions(-)
 
 commit 3987547248e07719dbc63752100b695ef0be1a9c
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Tue Mar 29 13:44:38 2011 -0700
 
     initial unit test for describe images
@@ -85677,7 +86043,7 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit ee00cb8057eac328c98dd9c040ffa324f11a87be
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Tue Mar 29 13:43:00 2011 -0700
 
     added blank lines in between functions & removed the test_describe_images (was meant for a diff bug lp682888)
@@ -85994,7 +86360,7 @@
  2 files changed, 11 insertions(+), 7 deletions(-)
 
 commit 1b67237d05e7103dc6b2beadd5782466682a136b
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Mon Mar 28 18:19:56 2011 -0700
 
     cleaned up var name
@@ -86003,7 +86369,7 @@
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 00afedaec5c6544bf9ff982d5f9d8e7b6b2a4b19
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Mon Mar 28 18:16:55 2011 -0700
 
     made changes per code review: 1) removed import of image from objectstore 2) changed to comments instaed of triple quotes.
@@ -86299,7 +86665,7 @@
 
 commit c6a9bade80d44c0576f30608d33a1e5cbcd577e0
 Merge: 9ce24af ddbb00f
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Mon Mar 28 12:24:36 2011 -0700
 
     merged from trunk
@@ -86384,7 +86750,7 @@
  3 files changed, 26 insertions(+), 12 deletions(-)
 
 commit 9ce24afab007a9b5144c8c8a8f2fcc4157ba34d7
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Mon Mar 28 11:29:23 2011 -0700
 
     when image_id provided cannot be found, returns more informative error message.
@@ -86991,7 +87357,7 @@
  1 file changed, 1 deletion(-)
 
 commit c400024de45073ccc23a6738c78518365a511562
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Fri Mar 25 13:17:51 2011 -0700
 
     added a simple test for describe_images with mock for detail funciton
@@ -89063,7 +89429,7 @@
     trunk merged
 
 commit 7cd6e9f1cf62ff5628ae4680aa66ada676c8c288
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Wed Mar 23 11:16:22 2011 -0700
 
     added myself to authors file
@@ -90218,7 +90584,7 @@
     Wrap update_dhcp in utils.synchronized.
 
 commit a105fd449a0b91cde3ab86cc552705dfe50e3f6d
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Mon Mar 21 14:35:19 2011 -0700
 
     if fingerprint data not provided, added logic to calculate it using the pub key.
@@ -90756,7 +91122,7 @@
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 commit 15a40f842cb8a4362fbd82e36e3df4af7ab46a84
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Fri Mar 18 12:17:40 2011 -0700
 
     cleaned up tests stubs that were accidentally checked in
@@ -90774,7 +91140,7 @@
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 commit 5a9d2eb44ced0affe143e6274c9c9326f1c2d7da
-Author: John Tran <[e-mail]>
+Author: John Tran <[e-mail]>
 Date:   Fri Mar 18 11:49:11 2011 -0700
 
     created api endpoint to allow uploading of public key

=== modified file 'PKG-INFO'
--- PKG-INFO	2012-08-27 14:50:40 +0000
+++ PKG-INFO	2012-12-18 13:07:55 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: nova
-Version: 2012.1.3
+Version: 2012.1.4
 Summary: cloud computing fabric controller
 Home-page: http://www.openstack.org/
 Author: OpenStack

=== modified file 'debian/changelog'
--- debian/changelog	2012-08-27 14:50:40 +0000
+++ debian/changelog	2012-12-18 13:07:55 +0000
@@ -1,3 +1,38 @@
+nova (2012.1.4+stable-20121217-9f277e38-0ubuntu1) precise-proposed; urgency=low
+
+  [ Chuck Short ]
+  * debian/*.logrotate: compress logfiles when they are rotated. (LP: #1049915)
+
+  [ Yolanda Robla Mota ]
+  * Resynchronize with stable/essex (9f277e38):
+    - [80fefe5] use_single_default_gateway does not function correctly
+      (LP: #1075859)
+    - [bd10241] Essex 2012.1.3 : Error deleting instance with 2 Nova Volumes
+      attached (LP: #1079745)
+    - [86a5937] do_refresh_security_group_rules in nova.virt.firewall is very
+      slow (LP: #1062314)
+    - [ae9c5f4] deallocate_fixed_ip attempts to update an already deleted
+      fixed_ip (LP: #1017633)
+    - [20f98c5] failed to allocate fixed ip because old deleted one exists
+      (LP: #996482)
+    - [75f6922] snapshot stays in saving state if the vm base image is deleted
+      (LP: #921774)
+    - [1076699] lock files may be removed in error dues to permissions issues
+      (LP: #1051924)
+    - [40c5e94] ensure_default_security_group() does not call sgh (LP: #1050982)
+    - [4eebe76] At termination, LXC rootfs is not always unmounted before
+      rmtree() is called (LP: #1046313)
+    - [47dabb3] Heavily loaded nova-compute instances don't sent reports
+      frequently enough (LP: #1045152)
+    - [b375b4f] When attach volume lost attach when node restart (LP: #1004791)
+    - [4ac2dcc] nova usage-list returns  wrong usage (LP: #1043999)
+    - [014fcbc] Bridge port's hairpin mode not set after resuming a machine
+      (LP: #1040537)
+    - [2f35f8e] Nova flavor ephemeral space size reported incorrectly
+      (LP: #1026210)
+
+ -- Yolanda Robla Mota <[e-mail]>  Mon, 17 Dec 2012 10:39:28 +0000
+
 nova (2012.1.3+stable-20120827-4d2a4afe-0ubuntu1) precise-proposed; urgency=low
 
   * New upstream snapshot, fixes FTBFS in -proposed. (LP: #1041120)

=== modified file 'debian/nova-api-ec2.logrotate'
--- debian/nova-api-ec2.logrotate	2012-02-24 10:08:10 +0000
+++ debian/nova-api-ec2.logrotate	2012-12-18 13:07:55 +0000
@@ -1,4 +1,7 @@
 /var/log/nova/nova-api-ec2.log {
     daily
     missingok
+    compress
+    delaycompress
+    notifempty
 }

=== modified file 'debian/nova-api-metadata.logrotate'
--- debian/nova-api-metadata.logrotate	2012-02-24 10:08:10 +0000
+++ debian/nova-api-metadata.logrotate	2012-12-18 13:07:55 +0000
@@ -1,4 +1,7 @@
 /var/log/nova/nova-api-metadata.log {
     daily
     missingok
+    compress
+    delaycompress
+    notifempty
 }

=== modified file 'debian/nova-api-os-compute.logrotate'
--- debian/nova-api-os-compute.logrotate	2012-02-24 10:08:10 +0000
+++ debian/nova-api-os-compute.logrotate	2012-12-18 13:07:55 +0000
@@ -1,4 +1,7 @@
 /var/log/nova/nova-api-os-compute.log {
     daily
     missingok
+    compress
+    delaycompress
+    notifempty
 }

=== modified file 'debian/nova-api.logrotate'
--- debian/nova-api.logrotate	2011-02-18 09:36:22 +0000
+++ debian/nova-api.logrotate	2012-12-18 13:07:55 +0000
@@ -1,4 +1,7 @@
 /var/log/nova/nova-api.log {
     daily
     missingok
+    compress
+    delaycompress
+    notifempty
 }

=== modified file 'debian/nova-cert.logrotate'
--- debian/nova-cert.logrotate	2012-01-26 10:29:13 +0000
+++ debian/nova-cert.logrotate	2012-12-18 13:07:55 +0000
@@ -1,4 +1,7 @@
 /var/log/nova/nova-cert.log {
     daily
     missingok
+    compress
+    delaycompress
+    notifempty
 }

=== modified file 'debian/nova-common.nova-manage.logrotate'
--- debian/nova-common.nova-manage.logrotate	2012-04-02 11:17:33 +0000
+++ debian/nova-common.nova-manage.logrotate	2012-12-18 13:07:55 +0000
@@ -1,4 +1,7 @@
 /var/log/nova/nova-manage.log {
     daily
     missingok
+    compress
+    delaycompress
+    notifempty
 }

=== modified file 'debian/nova-compute.logrotate'
--- debian/nova-compute.logrotate	2011-02-18 09:36:22 +0000
+++ debian/nova-compute.logrotate	2012-12-18 13:07:55 +0000
@@ -1,4 +1,7 @@
 /var/log/nova/nova-compute.log {
     daily
     missingok
+    compress
+    delaycompress
+    notifempty
 }

=== modified file 'debian/nova-console.logrotate'
--- debian/nova-console.logrotate	2012-02-17 10:59:59 +0000
+++ debian/nova-console.logrotate	2012-12-18 13:07:55 +0000
@@ -2,4 +2,7 @@
     daily
     copytruncate
     missingok
+    compress
+    delaycompress
+    notifempty
 }

=== modified file 'debian/nova-consoleauth.logrotate'
--- debian/nova-consoleauth.logrotate	2012-03-20 11:06:11 +0000
+++ debian/nova-consoleauth.logrotate	2012-12-18 13:07:55 +0000
@@ -2,4 +2,7 @@
     daily
     copytruncate
     missingok
+    compress
+    delaycompress
+    notifempty
 }

=== modified file 'debian/nova-network.logrotate'
--- debian/nova-network.logrotate	2011-02-18 09:36:22 +0000
+++ debian/nova-network.logrotate	2012-12-18 13:07:55 +0000
@@ -1,4 +1,7 @@
 /var/log/nova/nova-network.log {
     daily
     missingok
+    compress
+    delaycompress
+    notifempty
 }

=== modified file 'debian/nova-network.nova-dhcpbridge.logrotate'
--- debian/nova-network.nova-dhcpbridge.logrotate	2012-04-02 11:17:33 +0000
+++ debian/nova-network.nova-dhcpbridge.logrotate	2012-12-18 13:07:55 +0000
@@ -1,4 +1,7 @@
 /var/log/nova/nova-dhcpbridge.log {
     daily
     missingok
+    compress
+    delaycompress
+    notifempty
 }

=== modified file 'debian/nova-objectstore.logrotate'
--- debian/nova-objectstore.logrotate	2012-01-13 09:51:10 +0000
+++ debian/nova-objectstore.logrotate	2012-12-18 13:07:55 +0000
@@ -4,4 +4,7 @@
     postrotate
     restart nova-objectstore
     endscript
+    compress
+    delaycompress
+    notifempty 
 }

=== modified file 'debian/nova-scheduler.logrotate'
--- debian/nova-scheduler.logrotate	2011-02-18 09:36:22 +0000
+++ debian/nova-scheduler.logrotate	2012-12-18 13:07:55 +0000
@@ -1,4 +1,7 @@
 /var/log/nova/nova-scheduler.log {
     daily
     missingok
+    compress
+    delaycompress
+    notifempty
 }

=== modified file 'debian/nova-vncproxy.logrotate'
--- debian/nova-vncproxy.logrotate	2011-05-25 15:57:03 +0000
+++ debian/nova-vncproxy.logrotate	2012-12-18 13:07:55 +0000
@@ -1,4 +1,7 @@
 /var/log/nova/nova-vncproxy.log {
     daily
     missingok
+    compress
+    delaycompress
+    notifempty
 }

=== modified file 'debian/nova-volume.logrotate'
--- debian/nova-volume.logrotate	2011-02-18 09:36:22 +0000
+++ debian/nova-volume.logrotate	2012-12-18 13:07:55 +0000
@@ -1,4 +1,7 @@
 /var/log/nova/nova-volume.log {
     daily
     missingok
+    compress
+    delaycompress
+    notifempty
 }

=== modified file 'debian/nova-xvpvncproxy.logrotate'
--- debian/nova-xvpvncproxy.logrotate	2012-03-02 11:04:04 +0000
+++ debian/nova-xvpvncproxy.logrotate	2012-12-18 13:07:55 +0000
@@ -1,4 +1,7 @@
 /var/log/nova/nova-vncproxy.log {
     daily
     missingok
-}
\ No newline at end of file
+    compress
+    delaycompress
+    notifempty
+}

=== modified file 'nova.egg-info/PKG-INFO'
--- nova.egg-info/PKG-INFO	2012-08-27 14:50:40 +0000
+++ nova.egg-info/PKG-INFO	2012-12-18 13:07:55 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: nova
-Version: 2012.1.3
+Version: 2012.1.4
 Summary: cloud computing fabric controller
 Home-page: http://www.openstack.org/
 Author: OpenStack

=== modified file 'nova.egg-info/SOURCES.txt'
--- nova.egg-info/SOURCES.txt	2012-08-27 14:50:40 +0000
+++ nova.egg-info/SOURCES.txt	2012-12-18 13:07:55 +0000
@@ -1,6 +1,3 @@
-.gitignore
-.gitreview
-.mailmap
 Authors
 ChangeLog
 HACKING.rst

=== modified file 'nova/api/openstack/compute/contrib/flavorextradata.py'
--- nova/api/openstack/compute/contrib/flavorextradata.py	2012-03-12 12:09:45 +0000
+++ nova/api/openstack/compute/contrib/flavorextradata.py	2012-12-18 13:07:55 +0000
@@ -37,7 +37,7 @@
 class FlavorextradataController(wsgi.Controller):
     def _get_flavor_refs(self):
         """Return a dictionary mapping flavorid to flavor_ref."""
-        flavor_refs = instance_types.get_all_types(True)
+        flavor_refs = instance_types.get_all_types()
         rval = {}
         for name, obj in flavor_refs.iteritems():
             rval[obj['flavorid']] = obj

=== modified file 'nova/api/openstack/compute/contrib/simple_tenant_usage.py'
--- nova/api/openstack/compute/contrib/simple_tenant_usage.py	2012-03-09 13:07:19 +0000
+++ nova/api/openstack/compute/contrib/simple_tenant_usage.py	2012-12-18 13:07:55 +0000
@@ -24,6 +24,7 @@
 from nova.compute import api
 from nova import exception
 from nova import flags
+from nova import utils
 
 
 FLAGS = flags.FLAGS
@@ -217,6 +218,9 @@
         authorize_list(context)
 
         (period_start, period_stop, detailed) = self._get_datetime_range(req)
+        now = utils.utcnow()
+        if period_stop > now:
+            period_stop = now
         usages = self._tenant_usages_for_period(context,
                                                 period_start,
                                                 period_stop,
@@ -232,6 +236,9 @@
         authorize_show(context, {'project_id': tenant_id})
 
         (period_start, period_stop, ignore) = self._get_datetime_range(req)
+        now = utils.utcnow()
+        if period_stop > now:
+            period_stop = now
         usage = self._tenant_usages_for_period(context,
                                                period_start,
                                                period_stop,

=== modified file 'nova/compute/api.py'
--- nova/compute/api.py	2012-08-24 02:09:33 +0000
+++ nova/compute/api.py	2012-12-18 13:07:55 +0000
@@ -166,6 +166,7 @@
 
         self.network_api = network_api or network.API()
         self.volume_api = volume_api or volume.API()
+        self.sgh = utils.import_object(FLAGS.security_group_handler)
         super(API, self).__init__(**kwargs)
 
     def _check_injected_file_quota(self, context, injected_files):
@@ -708,6 +709,7 @@
                       'user_id': context.user_id,
                       'project_id': context.project_id}
             self.db.security_group_create(context, values)
+            self.sgh.trigger_security_group_create_refresh(context, values)
 
     def trigger_security_group_rules_refresh(self, context, security_group_id):
         """Called when a rule is added to or removed from a security_group."""

=== modified file 'nova/db/sqlalchemy/api.py'
--- nova/db/sqlalchemy/api.py	2012-08-27 14:50:40 +0000
+++ nova/db/sqlalchemy/api.py	2012-12-18 13:07:55 +0000
@@ -1047,7 +1047,7 @@
 @require_context
 def fixed_ip_get_by_address(context, address, session=None):
     result = model_query(context, models.FixedIp, session=session,
-                         read_deleted="yes").\
+                         read_deleted=context.read_deleted).\
                      filter_by(address=address).\
                      first()
     if not result:

=== modified file 'nova/manager.py'
--- nova/manager.py	2012-02-17 10:59:59 +0000
+++ nova/manager.py	2012-12-18 13:07:55 +0000
@@ -53,6 +53,8 @@
 
 """
 
+import eventlet
+
 from nova.db import base
 from nova import flags
 from nova import log as logging
@@ -153,6 +155,9 @@
 
             try:
                 task(self, context)
+                # NOTE(tiantian): After finished a task, allow manager to
+                # do other work (report_state, processing AMPQ request etc.)
+                eventlet.sleep(0)
             except Exception as e:
                 if raise_on_error:
                     raise

=== modified file 'nova/network/linux_net.py'
--- nova/network/linux_net.py	2012-08-24 02:09:33 +0000
+++ nova/network/linux_net.py	2012-12-18 13:07:55 +0000
@@ -627,6 +627,7 @@
                 default_gw_vif[instance_id] = vifs[0]['id']
 
         for datum in data:
+            instance_id = datum['instance_id']
             if instance_id in default_gw_vif:
                 # we don't want default gateway for this fixed ip
                 if default_gw_vif[instance_id] != datum['vif_id']:

=== modified file 'nova/network/manager.py'
--- nova/network/manager.py	2012-08-27 14:50:40 +0000
+++ nova/network/manager.py	2012-12-18 13:07:55 +0000
@@ -923,8 +923,7 @@
                                                   context=read_deleted_context)
         # deallocate fixed ips
         for fixed_ip in fixed_ips:
-            self.deallocate_fixed_ip(read_deleted_context, fixed_ip['address'],
-                                     **kwargs)
+            self.deallocate_fixed_ip(context, fixed_ip['address'], **kwargs)
 
         # deallocate vifs (mac addresses)
         self.db.virtual_interface_delete_by_instance(read_deleted_context,

=== modified file 'nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py'
--- nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py	2012-06-05 09:50:59 +0000
+++ nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py	2012-12-18 13:07:55 +0000
@@ -28,6 +28,7 @@
 from nova import context
 from nova import flags
 from nova import test
+from nova import utils
 from nova.tests.api.openstack import fakes
 
 
@@ -40,8 +41,9 @@
 EPHEMERAL_GB = 20
 MEMORY_MB = 1024
 VCPUS = 2
-STOP = datetime.datetime.utcnow()
-START = STOP - datetime.timedelta(hours=HOURS)
+NOW = utils.utcnow()
+START = NOW - datetime.timedelta(hours=HOURS)
+STOP = NOW
 
 
 def fake_instance_type_get(self, context, instance_type_id):
@@ -91,10 +93,10 @@
                                                       'faketenant_1',
                                                        is_admin=False)
 
-    def test_verify_index(self):
+    def _test_verify_index(self, start, stop):
         req = webob.Request.blank(
                     '/v2/faketenant_0/os-simple-tenant-usage?start=%s&end=%s' %
-                    (START.isoformat(), STOP.isoformat()))
+                    (start.isoformat(), stop.isoformat()))
         req.method = "GET"
         req.headers["content-type"] = "application/json"
 
@@ -115,6 +117,20 @@
                              SERVERS * VCPUS * HOURS)
             self.assertFalse(usages[i].get('server_usages'))
 
+    def test_verify_index(self):
+        self._test_verify_index(START, STOP)
+
+    def test_verify_index_future_end_time(self):
+        future = NOW + datetime.timedelta(hours=HOURS)
+        self._test_verify_index(START, future)
+
+    def test_verify_show(self):
+        self._test_verify_show(START, STOP)
+
+    def test_verify_show_future_end_time(self):
+        future = NOW + datetime.timedelta(hours=HOURS)
+        self._test_verify_show(START, future)
+
     def test_verify_detailed_index(self):
         req = webob.Request.blank(
                     '/v2/faketenant_0/os-simple-tenant-usage?'
@@ -133,11 +149,11 @@
             for j in xrange(SERVERS):
                 self.assertEqual(int(servers[j]['hours']), HOURS)
 
-    def test_verify_show(self):
+    def _test_verify_show(self, start, stop):
         req = webob.Request.blank(
                   '/v2/faketenant_0/os-simple-tenant-usage/'
                   'faketenant_0?start=%s&end=%s' %
-                  (START.isoformat(), STOP.isoformat()))
+                  (start.isoformat(), stop.isoformat()))
         req.method = "GET"
         req.headers["content-type"] = "application/json"
 

=== modified file 'nova/tests/fakelibvirt.py'
--- nova/tests/fakelibvirt.py	2012-03-12 12:09:45 +0000
+++ nova/tests/fakelibvirt.py	2012-12-18 13:07:55 +0000
@@ -73,6 +73,8 @@
 VIR_DOMAIN_SHUTOFF = 5
 VIR_DOMAIN_CRASHED = 6
 
+VIR_DOMAIN_XML_SECURE = 1
+
 VIR_CPU_COMPARE_ERROR = -1
 VIR_CPU_COMPARE_INCOMPATIBLE = 0
 VIR_CPU_COMPARE_IDENTICAL = 1

=== modified file 'nova/tests/network/test_manager.py'
--- nova/tests/network/test_manager.py	2012-08-27 14:50:40 +0000
+++ nova/tests/network/test_manager.py	2012-12-18 13:07:55 +0000
@@ -909,6 +909,41 @@
         fixed = db.fixed_ip_get_by_address(elevated, fix_addr)
         self.assertFalse(fixed['allocated'])
 
+    def test_deallocate_fixed_deleted(self):
+        """Verify doesn't deallocate deleted fixed_ip from deleted network"""
+
+        def network_get(_context, network_id):
+            return networks[network_id]
+
+        def teardown_network_on_host(_context, network):
+            if network['id'] == 0:
+                raise Exception('Correct network/fixed_ip assertion')
+
+        self.stubs.Set(db, 'network_get', network_get)
+        self.stubs.Set(self.network, '_teardown_network_on_host',
+                       teardown_network_on_host)
+
+        context1 = context.RequestContext('user', 'project1')
+
+        instance = db.instance_create(context1,
+                {'project_id': 'project1'})
+
+        elevated = context1.elevated()
+        fix_addr = db.fixed_ip_associate_pool(elevated, 1, instance['id'])
+        db.fixed_ip_update(elevated, fix_addr, {'deleted': 1})
+        elevated.read_deleted = 'yes'
+        delfixed = db.fixed_ip_get_by_address(elevated, fix_addr)
+        values = {'address': fix_addr,
+                  'network_id': 0,
+                  'instance_id': delfixed['instance_id']}
+        db.fixed_ip_create(elevated, values)
+        elevated.read_deleted = 'no'
+        newfixed = db.fixed_ip_get_by_address(elevated, fix_addr)
+        elevated.read_deleted = 'yes'
+
+        deallocate = self.network.deallocate_fixed_ip
+        self.assertRaises(Exception, deallocate, context1, fix_addr, 'fake')
+
     def test_deallocate_fixed_no_vif(self):
         """Verify that deallocate doesn't raise when no vif is returned.
 

=== modified file 'nova/tests/test_db_api.py'
--- nova/tests/test_db_api.py	2012-06-05 09:50:59 +0000
+++ nova/tests/test_db_api.py	2012-12-18 13:07:55 +0000
@@ -151,6 +151,8 @@
                           db.network_delete_safe, ctxt, network['id'])
         db.fixed_ip_update(ctxt, address2, {'allocated': False})
         network = db.network_delete_safe(ctxt, network['id'])
+        self.assertRaises(exception.FixedIpNotFoundForAddress,
+                          db.fixed_ip_get_by_address, ctxt, address1)
         ctxt = ctxt.elevated(read_deleted='yes')
         fixed_ip = db.fixed_ip_get_by_address(ctxt, address1)
         self.assertTrue(fixed_ip['deleted'])

=== modified file 'nova/tests/test_libvirt.py'
--- nova/tests/test_libvirt.py	2012-08-27 14:50:40 +0000
+++ nova/tests/test_libvirt.py	2012-12-18 13:07:55 +0000
@@ -1856,11 +1856,23 @@
     def test_do_refresh_security_group_rules(self):
         instance_ref = self._create_instance_ref()
         self.mox.StubOutWithMock(self.fw,
+                                 'instance_rules')
+        self.mox.StubOutWithMock(self.fw,
                                  'add_filters_for_instance',
                                  use_mock_anything=True)
+
+        self.fw.instance_rules(instance_ref,
+                               mox.IgnoreArg()).AndReturn((None, None))
+        self.fw.add_filters_for_instance(instance_ref, mox.IgnoreArg(),
+                                         mox.IgnoreArg())
+        self.fw.instance_rules(instance_ref,
+                               mox.IgnoreArg()).AndReturn((None, None))
+        self.fw.add_filters_for_instance(instance_ref, mox.IgnoreArg(),
+                                         mox.IgnoreArg())
+        self.mox.ReplayAll()
+
         self.fw.prepare_instance_filter(instance_ref, mox.IgnoreArg())
         self.fw.instances[instance_ref['id']] = instance_ref
-        self.mox.ReplayAll()
         self.fw.do_refresh_security_group_rules("fake")
 
     @test.skip_if(missing_libvirt(), "Test requires libvirt")

=== modified file 'nova/tests/test_linux_net.py'
--- nova/tests/test_linux_net.py	2012-03-20 11:06:11 +0000
+++ nova/tests/test_linux_net.py	2012-12-18 13:07:55 +0000
@@ -302,7 +302,7 @@
         self.assertEquals(actual_hosts, expected)
 
     def test_get_dhcp_opts_for_nw00(self):
-        expected_opts = 'NW-0,3\nNW-3,3\nNW-4,3'
+        expected_opts = 'NW-3,3\nNW-4,3'
         actual_opts = self.driver.get_dhcp_opts(self.context, networks[0])
 
         self.assertEquals(actual_opts, expected_opts)

=== modified file 'nova/utils.py'
--- nova/utils.py	2012-08-24 02:09:33 +0000
+++ nova/utils.py	2012-12-18 13:07:55 +0000
@@ -21,6 +21,7 @@
 
 import contextlib
 import datetime
+import errno
 import functools
 import hashlib
 import inspect
@@ -1000,11 +1001,12 @@
                   {'filename': filename, 'pid': pid})
         try:
             os.kill(int(pid), 0)
-        except OSError, e:
-            # PID wasn't found
-            delete_if_exists(os.path.join(FLAGS.lock_path, filename))
-            LOG.debug(_('Cleaned sentinel %(filename)s for pid %(pid)s') %
-                      {'filename': filename, 'pid': pid})
+        except OSError as e:
+            if e.errno == errno.ESRCH:
+                # PID wasn't found
+                delete_if_exists(os.path.join(FLAGS.lock_path, filename))
+                LOG.debug(_('Cleaned sentinel %(filename)s for pid %(pid)s') %
+                          {'filename': filename, 'pid': pid})
 
     # cleanup lock files
     for filename in files:
@@ -1013,8 +1015,8 @@
             continue
         try:
             stat_info = os.stat(os.path.join(FLAGS.lock_path, filename))
-        except OSError as (errno, strerror):
-            if errno == 2:  # doesn't exist
+        except OSError as e:
+            if e.errno == errno.ENOENT:
                 continue
             else:
                 raise
@@ -1033,8 +1035,8 @@
 
     try:
         os.unlink(pathname)
-    except OSError as (errno, strerror):
-        if errno == 2:  # doesn't exist
+    except OSError as e:
+        if e.errno == errno.ENOENT:
             return
         else:
             raise

=== modified file 'nova/version.py'
--- nova/version.py	2012-08-24 02:09:33 +0000
+++ nova/version.py	2012-12-18 13:07:55 +0000
@@ -14,7 +14,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-NOVA_VERSION = ['2012', '1', '3']
+NOVA_VERSION = ['2012', '1', '4']
 YEAR, COUNT, REVISION = NOVA_VERSION
 FINAL = False   # This becomes true at Release Candidate time
 

=== modified file 'nova/virt/disk/api.py'
--- nova/virt/disk/api.py	2012-08-24 02:09:33 +0000
+++ nova/virt/disk/api.py	2012-12-18 13:07:55 +0000
@@ -176,6 +176,7 @@
     @staticmethod
     def _device_for_path(path):
         device = None
+        path = os.path.realpath(path)
         with open("/proc/mounts", 'r') as ifp:
             for line in ifp:
                 fields = line.split()

=== modified file 'nova/virt/firewall.py'
--- nova/virt/firewall.py	2012-07-02 19:54:17 +0000
+++ nova/virt/firewall.py	2012-12-18 13:07:55 +0000
@@ -133,7 +133,8 @@
     def prepare_instance_filter(self, instance, network_info):
         self.instances[instance['id']] = instance
         self.network_infos[instance['id']] = network_info
-        self.add_filters_for_instance(instance)
+        ipv4_rules, ipv6_rules = self.instance_rules(instance, network_info)
+        self.add_filters_for_instance(instance, ipv4_rules, ipv6_rules)
         LOG.debug(_('Filters added to instance %s'), instance['uuid'])
         self.refresh_provider_fw_rules()
         LOG.debug(_('Provider Firewall Rules refreshed'))
@@ -166,7 +167,8 @@
             for rule in ipv6_rules:
                 self.iptables.ipv6['filter'].add_rule(chain_name, rule)
 
-    def add_filters_for_instance(self, instance):
+    def add_filters_for_instance(self, instance, inst_ipv4_rules,
+                                 inst_ipv6_rules):
         network_info = self.network_infos[instance['id']]
         chain_name = self._instance_chain_name(instance)
         if FLAGS.use_ipv6:
@@ -175,8 +177,7 @@
         ipv4_rules, ipv6_rules = self._filters_for_instance(chain_name,
                                                             network_info)
         self._add_filters('local', ipv4_rules, ipv6_rules)
-        ipv4_rules, ipv6_rules = self.instance_rules(instance, network_info)
-        self._add_filters(chain_name, ipv4_rules, ipv6_rules)
+        self._add_filters(chain_name, inst_ipv4_rules, inst_ipv6_rules)
 
     def remove_filters_for_instance(self, instance):
         chain_name = self._instance_chain_name(instance)
@@ -361,10 +362,17 @@
         self.iptables.apply()
 
     @utils.synchronized('iptables', external=True)
+    def _inner_do_refresh_rules(self, instance, ipv4_rules,
+                                               ipv6_rules):
+        self.remove_filters_for_instance(instance)
+        self.add_filters_for_instance(instance, ipv4_rules, ipv6_rules)
+
     def do_refresh_security_group_rules(self, security_group):
         for instance in self.instances.values():
-            self.remove_filters_for_instance(instance)
-            self.add_filters_for_instance(instance)
+            network_info = self.network_infos[instance['id']]
+            ipv4_rules, ipv6_rules = self.instance_rules(instance,
+                                                         network_info)
+            self._inner_do_refresh_rules(instance, ipv4_rules, ipv6_rules)
 
     def refresh_provider_fw_rules(self):
         """See :class:`FirewallDriver` docs."""

=== modified file 'nova/virt/libvirt/connection.py'
--- nova/virt/libvirt/connection.py	2012-08-27 14:50:40 +0000
+++ nova/virt/libvirt/connection.py	2012-12-18 13:07:55 +0000
@@ -549,6 +549,13 @@
                                                connection_info,
                                                mount_device)
 
+        # TODO(danms) once libvirt has support for LXC hotplug,
+        # replace this re-define with use of the
+        # VIR_DOMAIN_AFFECT_LIVE & VIR_DOMAIN_AFFECT_CONFIG flags with
+        # attachDevice()
+        domxml = virt_dom.XMLDesc(libvirt.VIR_DOMAIN_XML_SECURE)
+        self._conn.defineXML(domxml)
+
     @staticmethod
     def _get_disk_xml(xml, device):
         """Returns the xml for the disk mounted at device"""
@@ -583,6 +590,13 @@
                                       connection_info,
                                       mount_device)
 
+        # TODO(danms) once libvirt has support for LXC hotplug,
+        # replace this re-define with use of the
+        # VIR_DOMAIN_AFFECT_LIVE & VIR_DOMAIN_AFFECT_CONFIG flags with
+        # detachDevice()
+        domxml = virt_dom.XMLDesc(libvirt.VIR_DOMAIN_XML_SECURE)
+        self._conn.defineXML(domxml)
+
     @exception.wrap_exception()
     def _attach_lxc_volume(self, xml, virt_dom, instance_name):
         LOG.info(_('attaching LXC block device'))
@@ -681,8 +695,7 @@
         else:
             metadata['disk_format'] = image_format
 
-        if 'container_format' in base:
-            metadata['container_format'] = base['container_format']
+        metadata['container_format'] = base.get('container_format', 'bare')
 
         # Find the disk
         xml_desc = virt_dom.XMLDesc(0)
@@ -928,8 +941,8 @@
             LOG.info(_("Automatically confirming migration %d"), migration.id)
             self.compute_api.confirm_resize(ctxt, migration.instance_uuid)
 
-    def _enable_hairpin(self, instance):
-        interfaces = self.get_interfaces(instance['name'])
+    def _enable_hairpin(self, xml):
+        interfaces = self.get_interfaces(xml)
         for interface in interfaces:
             utils.execute('tee',
                           '/sys/class/net/%s/brport/hairpin_mode' % interface,
@@ -951,7 +964,6 @@
 
         self._create_new_domain(xml)
         LOG.debug(_("Instance is running"), instance=instance)
-        self._enable_hairpin(instance)
         self.firewall_driver.apply_instance_filter(instance, network_info)
 
         def _wait_for_boot():
@@ -1619,6 +1631,7 @@
         else:
             # createXML call creates a transient domain
             domain = self._conn.createXML(xml, launch_flags)
+        self._enable_hairpin(domain.XMLDesc(0))
 
         return domain
 
@@ -1675,14 +1688,12 @@
 
         return disks
 
-    def get_interfaces(self, instance_name):
+    def get_interfaces(self, xml):
         """
-        Note that this function takes an instance name.
+        Note that this function takes an instance domain xml.
 
         Returns a list of all network interfaces for this instance.
         """
-        domain = self._lookup_by_name(instance_name)
-        xml = domain.XMLDesc(0)
         doc = None
 
         try:
@@ -1765,6 +1776,8 @@
                 total += 1
             else:
                 total += len(vcpus[1])
+            # NOTE(gtt116): give change to do other task.
+            greenthread.sleep(0)
         return total
 
     def get_memory_mb_used(self):
@@ -2325,7 +2338,8 @@
             except exception.InstanceNotFound:
                 # Instance was deleted during the check so ignore it
                 pass
-
+            # NOTE(gtt116): give change to do other task.
+            greenthread.sleep(0)
         # Disk available least size
         available_least_size = dk_sz_gb * (1024 ** 3) - instances_sz
         return (available_least_size / 1024 / 1024 / 1024)

=== modified file 'nova/virt/libvirt/volume.py'
--- nova/virt/libvirt/volume.py	2012-06-05 09:50:59 +0000
+++ nova/virt/libvirt/volume.py	2012-12-18 13:07:55 +0000
@@ -112,10 +112,11 @@
                   (iscsi_command, out, err))
         return (out, err)
 
-    def _iscsiadm_update(self, iscsi_properties, property_key, property_value):
+    def _iscsiadm_update(self, iscsi_properties, property_key, property_value,
+                         **kwargs):
         iscsi_command = ('--op', 'update', '-n', property_key,
                          '-v', property_value)
-        return self._run_iscsiadm(iscsi_properties, iscsi_command)
+        return self._run_iscsiadm(iscsi_properties, iscsi_command, **kwargs)
 
     @utils.synchronized('connect_volume')
     def connect_volume(self, connection_info, mount_device):
@@ -201,7 +202,8 @@
         devices = self.connection.get_all_block_devices()
         devices = [dev for dev in devices if dev.startswith(device_prefix)]
         if not devices:
-            self._iscsiadm_update(iscsi_properties, "node.startup", "manual")
+            self._iscsiadm_update(iscsi_properties, "node.startup", "manual",
+                                  check_exit_code=[0, 255])
             self._run_iscsiadm(iscsi_properties, ("--logout",),
                                check_exit_code=[0, 255])
             self._run_iscsiadm(iscsi_properties, ('--op', 'delete'),