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/compute/api.py b/nova/compute/api.py
index a357df4..9bf19ea 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -4510,16 +4510,25 @@ class HostAPI(base.Base):
state=state)
def compute_node_get(self, context, compute_id):
- """Return compute node entry for particular integer ID."""
+ """Return compute node entry for particular integer ID or UUID."""
2017-03-13 17:39:20,951 ERROR [nova.api.openstack.compute.servers] Instance could not be found
Traceback (most recent call last):
File "nova/api/openstack/compute/servers.py", line 932, in delete
self._delete(req.environ['nova.context'], req, id)
File "nova/api/openstack/compute/servers.py", line 786, in _delete
self.compute_api.delete(context, instance)
File "nova/compute/api.py", line 170, in inner
return function(self, context, instance, *args, **kwargs)
File "nova/compute/api.py", line 178, in _wrapped
return fn(self, context, instance, *args, **kwargs)
user@xubuntu:~/git/nova$ git diff
diff --git a/nova/conf/notifications.py b/nova/conf/notifications.py
index f2025ef..d669350 100644
--- a/nova/conf/notifications.py
+++ b/nova/conf/notifications.py
@@ -30,7 +30,7 @@ ALL_OPTS = [
cfg.StrOpt(
'notify_on_state_change',
choices=(None, 'vm_state', 'vm_and_task_state'),
- deprecated_group='default',
user@xubuntu:~/git/nova$ git diff
diff --git a/nova/tests/functional/api/openstack/placement/test_report_client.py b/nova/tests/functional/api/openstack/placement/test_report_client.py
index 3700366..41c0229 100644
--- a/nova/tests/functional/api/openstack/placement/test_report_client.py
+++ b/nova/tests/functional/api/openstack/placement/test_report_client.py
@@ -18,6 +18,7 @@ from wsgi_intercept import interceptor
from nova.api.openstack.placement import deploy
from nova import conf
+from nova import exception
jumpgate.tests.compute.test_images.TestComputeImageShow.test_on_get_response
----------------------------------------------------------------------------
Captured traceback:
~~~~~~~~~~~~~~~~~~~
Traceback (most recent call last):
File "jumpgate/tests/compute/test_images.py", line 32, in test_on_get_response
show_controller = compute_images.ComputeImageShow(app)
AttributeError: 'module' object has no attribute 'ComputeImageShow'
stack@dev:~$ curl --get http://9.5.125.193:8774 | json_pp
% Total % Received % Xferd Average Speed Time Time Time Current
Dload Upload Total Spent Left Speed
100 371 100 371 0 0 79888 0 --:--:-- --:--:-- --:--:-- 92750
{
"versions" : [
{
"status" : "SUPPORTED",
"id" : "v2.0",
"version" : "",
root@uat-dal09-compute-313:~# openstack image show dd501180-9e5b-48a7-b57c-4ad7f43b941f
+------------------+----------------------------------------------------------------------------------------------------------------+
| Field | Value |
+------------------+----------------------------------------------------------------------------------------------------------------+
| checksum | ee1eca47dc88f4879d8a229cc70a07c6 |
| container_format | bare |
| created_at | 2016-07-13T14:58:11Z |
| disk_format | qcow2
diff --git a/nova/tests/unit/virt/hyperv/test_vmops.py b/nova/tests/unit/virt/hyperv/test_vmops.py
index 0284be3..1c6c1d2 100644
--- a/nova/tests/unit/virt/hyperv/test_vmops.py
+++ b/nova/tests/unit/virt/hyperv/test_vmops.py
@@ -461,7 +461,7 @@ class VMOpsTestCase(test_base.HyperVBaseTestCase):
ctrl_type, constants.DISK))
mock_attach_drive.has_calls(expected)
self._vmops._vmutils.create_scsi_controller.assert_called_once_with(
- mock_instance.name)
+ mock_instance.name, test=False)
user@xubuntu:~/git/requirements$ ./tools/what-broke.py
Looking for requirements releases since 2016-06-24 13:39:48.402123
l<Released pylint 1.6.1 2016-07-07 21:07:34>
<Released pylint 1.6.0 2016-07-07 17:40:42>
<Released astroid 1.4.7 2016-07-07 17:13:35>
<Released oslo.utils 3.15.0 2016-07-07 16:28:20>
<Released gabbi 1.24.0 2016-07-07 15:17:52>
<Released psycopg2 2.6.2 2016-07-07 02:23:58>
<Released SQLAlchemy 1.0.14 2016-07-06 21:29:00>
<Released kafka-python 1.2.3 2016-07-06 06:08:49>
nova.tests.unit.test_metadata.MetadataTestCase.test_metadata_as_json_deleted_keypair
------------------------------------------------------------------------------------
Captured traceback:
~~~~~~~~~~~~~~~~~~~
Traceback (most recent call last):
File "nova/tests/unit/test_metadata.py", line 471, in test_metadata_as_json_deleted_keypair
meta = md._metadata_as_json(base.OPENSTACK_VERSIONS[-1], path=None)
File "nova/api/metadata/base.py", line 309, in _metadata_as_json
keypairs = self.instance.keypairs