Skip to content

Instantly share code, notes, and snippets.

View mriedem's full-sized avatar

Matt Riedemann mriedem

View GitHub Profile
diff --git a/nova/objects/instance.py b/nova/objects/instance.py
index 4ee3ca9..2768fb9 100644
--- a/nova/objects/instance.py
+++ b/nova/objects/instance.py
@@ -88,7 +88,8 @@ class Instance(base.NovaPersistentObject, base.NovaObject,
base.NovaObjectDictCompat):
# Version 2.0: Initial version
# Version 2.1: Added services
- VERSION = '2.1'
+ # 2.2: drop tags
diff --git a/nova/openstack/common/rpc/impl_fake.py b/nova/openstack/common/rpc/impl_fake.py
index 8210671..a8e2e9f 100644
--- a/nova/openstack/common/rpc/impl_fake.py
+++ b/nova/openstack/common/rpc/impl_fake.py
@@ -1,5 +1,6 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
+# Copyright 2013 IBM Corp.
# Copyright 2011 OpenStack Foundation
#
mriedem@ubuntu:~/git/nova$ git diff
diff --git a/nova/api/openstack/compute/instance_actions.py b/nova/api/openstack/compute/instance_actions.py
index b915ea8..3486789 100644
--- a/nova/api/openstack/compute/instance_actions.py
+++ b/nova/api/openstack/compute/instance_actions.py
@@ -20,6 +20,7 @@ from nova.api.openstack import extensions
from nova.api.openstack import wsgi
from nova import compute
from nova.i18n import _
+from nova import utils
mriedem@ubuntu:~/git/nova$ git diff
diff --git a/nova/api/openstack/compute/instance_actions.py b/nova/api/openstack/compute/instance_actions.py
index b915ea8..2936ba2 100644
--- a/nova/api/openstack/compute/instance_actions.py
+++ b/nova/api/openstack/compute/instance_actions.py
@@ -20,6 +20,7 @@ from nova.api.openstack import extensions
from nova.api.openstack import wsgi
from nova import compute
from nova.i18n import _
+from nova import utils
2015-11-20 17:00:47.722 ERROR nova.api.openstack.extensions [req-645d3dcb-024b-4ce7-83ce-feed79f00f69 admin demo] Unexpected exception in API method
2015-11-20 17:00:47.722 TRACE nova.api.openstack.extensions Traceback (most recent call last):
2015-11-20 17:00:47.722 TRACE nova.api.openstack.extensions File "/opt/stack/nova/nova/api/openstack/extensions.py", line 478, in wrapped
2015-11-20 17:00:47.722 TRACE nova.api.openstack.extensions return f(*args, **kwargs)
2015-11-20 17:00:47.722 TRACE nova.api.openstack.extensions File "/opt/stack/nova/nova/api/openstack/compute/servers.py", line 280, in detail
2015-11-20 17:00:47.722 TRACE nova.api.openstack.extensions servers = self._get_servers(req, is_detail=True)
2015-11-20 17:00:47.722 TRACE nova.api.openstack.extensions File "/opt/stack/nova/nova/api/openstack/compute/servers.py", line 406, in _get_servers
2015-11-20 17:00:47.722 TRACE nova.api.openstack.extensions response = self._view_builder.detail(req, instance_list)
2015-11-20 17:00:47.72
mriedem@ubuntu:~/git/nova$ git diff
diff --git a/nova/objects/instance.py b/nova/objects/instance.py
index b010b7f..1b54446 100644
--- a/nova/objects/instance.py
+++ b/nova/objects/instance.py
@@ -739,9 +739,12 @@ class Instance(base.NovaPersistentObject, base.NovaObject,
self._context, self.uuid)
def _load_flavor(self):
- instance = self.__class__.get_by_uuid(
mriedem@ubuntu:~/git/oslo.versionedobjects$ git log --oneline --no-merges 0.12.0..0.13.0
d7520a2 Updated from global requirements
f5e792a Ensure__repr__ return value is encoded
d0b2b55 Cleanup docstring for obj_tree_get_versions
0189824 Updated from global requirements
5010aa4 Imported Translations from Zanata
7ca1019 Add warnings for deprecated IndirectionAPI methods
c85f3bb Make tests properly use object_class_action_versions()
fa7b1af Make class action calls use version manifest
f320e67 Updated from global requirements
nova.tests.unit.objects.test_objects.TestObjectVersions.test_versions
---------------------------------------------------------------------
Captured traceback:
~~~~~~~~~~~~~~~~~~~
Traceback (most recent call last):
File "nova/tests/unit/objects/test_objects.py", line 1307, in test_versions
'Some objects have changed; please make sure the '
File "/home/mriedem/git/nova/.tox/py27/local/lib/python2.7/site-packages/testtools/testcase.py", line 350, in assertEqual
self.assertThat(observed, matcher, message)
[BlockDeviceMapping(boot_index=0,connection_info=None,created_at=<?>,delete_on_termination=True,deleted=<?>,deleted_at=<?>,destination_type='volume',device_name='/dev/vda',device_type='disk',disk_bus='virtio',guest_format=None,id=<?>,image_id=None,instance=<?>,instance_uuid=<?>,no_device=False,snapshot_id='19b09a5f-6486-4766-bb4f-c32ae5fc3e67',source_type='snapshot',updated_at=<?>,volume_id=None,volume_size=1), BlockDeviceMapping(boot_index=0,connection_info=None,created_at=<?>,delete_on_termination=True,deleted=<?>,deleted_at=<?>,destination_type='volume',device_name='/dev/vda',device_type=None,disk_bus=None,guest_format=None,id=<?>,image_id=None,instance=<?>,instance_uuid=<?>,no_device=False,snapshot_id='5b8dd585-d8c7-4296-a38d-75bbe945585e',source_type='snapshot',updated_at=<?>,volume_id=None,volume_size=1)]
Slowest Tests
Test id Runtime (s)
-------------------------------------------------------------------------------------------- -----------
nova.tests.unit.api.ec2.test_api.ApiEc2TestCase.test_authorize_revoke_security_group_cidr 50.738
nova.tests.unit.api.ec2.test_api.ApiEc2TestCase.test_authorize_revoke_security_group_cidr_v6 48.731
nova.tests.unit.api.ec2.test_cloud.CloudTestCase.test_instance_initiated_shutdown_behavior 17.699
nova.tests.unit.db.test_migrations.TestNovaMigrationsSQLite.test_walk_versions 9.423