Skip to content

Instantly share code, notes, and snippets.

View mriedem's full-sized avatar

Matt Riedemann mriedem

View GitHub Profile
nova.tests.unit.network.test_neutronv2.TestNeutronv2AutoAllocateNetwork.test__ports_needed_per_instance_auto_reqs_no_nets_not_ready
-----------------------------------------------------------------------------------------------------------------------------------
Captured traceback:
~~~~~~~~~~~~~~~~~~~
Traceback (most recent call last):
File "nova/tests/unit/network/test_neutronv2.py", line 4715, in test__ports_needed_per_instance_auto_reqs_no_nets_not_ready
self.context, mock.sentinel.neutron, requested_networks)
File "/home/user/git/nova/.tox/py27/local/lib/python2.7/site-packages/testtools/testcase.py", line 485, in assertRaises
self.assertThat(our_callable, matcher)
stack@glancev2:~$ nova hypervisor-show 1
+---------------------------+------------------------------------------+
| Property | Value |
+---------------------------+------------------------------------------+
| cpu_info_arch | x86_64 |
| cpu_info_features | ["pge", "avx", "clflush", "sep", |
| | "syscall", "vme", "msr", "xsave", |
| | "cmov", "pcid", "pat", "lm", "tsc", |
| | "nx", "fxsr", "sse4.1", "pae", "sse4.2", |
| | "pclmuldq", "tsc-deadline", "mmx", |
diff --git a/novaclient/v2/flavor_access.py b/novaclient/v2/flavor_access.py
index 73855ee..ecb0cc5 100644
--- a/novaclient/v2/flavor_access.py
+++ b/novaclient/v2/flavor_access.py
@@ -30,22 +30,15 @@ class FlavorAccessManager(base.ManagerWithFind):
resource_class = FlavorAccess
def list(self, **kwargs):
+ # NOTE(mriedem): This looks a bit weird, you would normally expect this
+ # method to just take a flavor arg, but it used to erroneously accept
>>> msg_fmt = "Not authorized."
>>> kwargs = {'code': 403, 'reason': ''}
>>>
>>> msg_fmt % kwargs
'Not authorized.'
>>> msg_fmt = "Not authorized: %(derp)s"
>>> msg_fmt % kwargs
Traceback (most recent call last):
File "<stdin>", line 1, in <module>
KeyError: 'derp'
stack@neutron:~/devstack$ nova list
+--------------------------------------+-------------+--------+------------+-------------+--------------------------------------------------------+
| ID | Name | Status | Task State | Power State | Networks |
+--------------------------------------+-------------+--------+------------+-------------+--------------------------------------------------------+
| 7109264f-afcc-4aa6-82f9-b1a334a606a5 | demo-test-2 | ACTIVE | - | Running | private=fd0b:b8d4:bcea:0:f816:3eff:fefe:66d7, 10.0.0.5 |
+--------------------------------------+-------------+--------+------------+-------------+--------------------------------------------------------+
stack@neutron:~/devstack$
stack@neutron:~/devstack$
stack@neutron:~/devstack$ nova list --deleted
+--------------------------------------+-------------+--------+------------+-------------+--------------------------------------------------------+
user@xubuntu:~/git/nova-specs$ diff specs/mitaka/approved/refresh-quotas-usage.rst specs/newton/approved/refresh-quotas-usage.rst
247c247
< Matt Riedemann <mriedem@us.ibm.com>
---
> Chuck Carmack <carmack@us.ibm.com>
diff --git a/nova/tests/functional/api/client.py b/nova/tests/functional/api/client.py
index fe88814..451302a 100644
--- a/nova/tests/functional/api/client.py
+++ b/nova/tests/functional/api/client.py
@@ -170,6 +170,9 @@ class TestOpenStackClient(object):
headers['X-Auth-Token'] = auth_result['x-auth-token']
if self.microversion:
headers['X-OpenStack-Nova-API-Version'] = self.microversion
+ elif 'X-OpenStack-Nova-API-Version' in headers:
+ raise Exception('X-OpenStack-Nova-API-Version should be set on '
diff --git a/nova/tests/functional/api/client.py b/nova/tests/functional/api/client.py
index db4d58c..fed8172 100644
--- a/nova/tests/functional/api/client.py
+++ b/nova/tests/functional/api/client.py
@@ -169,7 +169,16 @@ class TestOpenStackClient(object):
headers = kwargs.setdefault('headers', {})
headers['X-Auth-Token'] = auth_result['x-auth-token']
if self.microversion:
+ if ('X-OpenStack-Nova-API-Version' in headers and
+ headers['X-OpenStack-Nova-API-Version'] != \
diff --git a/nova/objects/fixed_ip.py b/nova/objects/fixed_ip.py
index 93dfe29..e04b327 100644
--- a/nova/objects/fixed_ip.py
+++ b/nova/objects/fixed_ip.py
@@ -46,7 +46,8 @@ class FixedIP(obj_base.NovaPersistentObject, obj_base.NovaObject,
# Version 1.12: Instance 1.22, FloatingIPList 1.9
# Version 1.13: Instance 1.23, FloatingIPList 1.10
# Version 1.14: Added vif_id kwarg to associate(_pool), FloatingIPList 1.11
- VERSION = '1.14'
+ # version 1.15: added bar
diff --git a/nova/objects/instance.py b/nova/objects/instance.py
index 4ee3ca9..a3974af 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'
+ # version 2.2: add foo