openstack
/
nova
Code Issues Proposed changes

Fix invalid uuid warnings in server-group unit tests 

Currently, testcases of server-group api emit FutureWarnings
from oslo.versionedobjects about invalid uuids as documented here[1].

This commit changes these tests to use valid uuids so
that when they are run these warnings are no longer emitted.

Fake constants are defined for project_id and user_id as they
are used without '-' at keystone side.

[1] http://docs.openstack.org/developer/oslo.versionedobjects/api/fields.html#oslo_versionedobjects.fields.UUIDField

Partial-Bug: #1557378
Change-Id: If2b2976ee339431cf5c32df88ad713ab2b6cd880
This commit is contained in:
srushti 2016-04-12 10:50:16 +00:00
parent 0de94ec3c6
commit 50354963ce
3 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nova/tests/unit/api/openstack/compute/test_server_group_quotas.py
View File

@ -24,6 +24,7 @@ from nova import context
from nova import quota
from nova import test
from nova.tests.unit.api.openstack import fakes
from nova.tests import uuidsentinel as uuids
CONF = cfg.CONF
@ -62,9 +63,9 @@ def server_group_db(sg):
attrs['created_at'] = None
attrs['updated_at'] = None
if 'user_id' not in attrs:
attrs['user_id'] = 'user_id'
attrs['user_id'] = fakes.FAKE_USER_ID
if 'project_id' not in attrs:
attrs['project_id'] = 'project_id'
attrs['project_id'] = fakes.FAKE_PROJECT_ID
attrs['id'] = 7
return AttrDict(attrs)
@ -135,7 +136,7 @@ class ServerGroupQuotasTestV21(test.TestCase):
def test_delete_server_group_by_id(self):
self._setup_quotas()
sg = server_group_template(id='123')
sg = server_group_template(id=uuids.sg1_id)
self.called = False
def server_group_delete(context, id):
@ -150,7 +151,7 @@ class ServerGroupQuotasTestV21(test.TestCase):
self.stub_out('nova.db.instance_group_get',
return_server_group)
resp = self.controller.delete(self.req, '123')
resp = self.controller.delete(self.req, uuids.sg1_id)
self.assertTrue(self.called)
# NOTE: on v2.1, http status code is set as wsgi_code of API

41
nova/tests/unit/api/openstack/compute/test_server_groups.py
View File

@ -72,9 +72,9 @@ def server_group_db(sg):
attrs['created_at'] = None
attrs['updated_at'] = None
if 'user_id' not in attrs:
attrs['user_id'] = 'user_id'
attrs['user_id'] = fakes.FAKE_USER_ID
if 'project_id' not in attrs:
attrs['project_id'] = 'project_id'
attrs['project_id'] = fakes.FAKE_PROJECT_ID
attrs['id'] = 7
return AttrDict(attrs)
@ -111,9 +111,12 @@ class ServerGroupTestV21(test.TestCase):
self._create_server_group_normal([policy])
def _create_instance(self, context):
instance = objects.Instance(context=context, image_ref=1, node='node1',
reservation_id='a', host='host1', project_id='fake',
vm_state='fake', system_metadata={'key': 'value'})
instance = objects.Instance(context=context,
image_ref=uuidsentinel.fake_image_ref,
node='node1', reservation_id='a',
host='host1', project_id='fake',
vm_state='fake',
system_metadata={'key': 'value'})
instance.create()
return instance
@ -140,17 +143,17 @@ class ServerGroupTestV21(test.TestCase):
members = []
metadata = {} # always empty
names = ['default-x', 'test']
p_id = 'project_id'
u_id = 'user_id'
p_id = fakes.FAKE_PROJECT_ID
u_id = fakes.FAKE_USER_ID
if api_version >= '2.13':
sg1 = server_group_resp_template(id=str(1345),
sg1 = server_group_resp_template(id=uuidsentinel.sg1_id,
name=names[0],
policies=policies,
members=members,
metadata=metadata,
project_id=p_id,
user_id=u_id)
sg2 = server_group_resp_template(id=str(891),
sg2 = server_group_resp_template(id=uuidsentinel.sg2_id,
name=names[1],
policies=policies,
members=members,
@ -158,12 +161,12 @@ class ServerGroupTestV21(test.TestCase):
project_id=p_id,
user_id=u_id)
else:
sg1 = server_group_resp_template(id=str(1345),
sg1 = server_group_resp_template(id=uuidsentinel.sg1_id,
name=names[0],
policies=policies,
members=members,
metadata=metadata)
sg2 = server_group_resp_template(id=str(891),
sg2 = server_group_resp_template(id=uuidsentinel.sg2_id,
name=names[1],
policies=policies,
members=members,
@ -202,17 +205,17 @@ class ServerGroupTestV21(test.TestCase):
members = []
metadata = {} # always empty
names = ['default-x', 'test']
p_id = 'project_id'
u_id = 'user_id'
p_id = fakes.FAKE_PROJECT_ID
u_id = fakes.FAKE_USER_ID
if api_version >= '2.13':
sg1 = server_group_resp_template(id=str(1345),
sg1 = server_group_resp_template(id=uuidsentinel.sg1_id,
name=names[0],
policies=policies,
members=members,
metadata=metadata,
project_id=p_id,
user_id=u_id)
sg2 = server_group_resp_template(id=str(891),
sg2 = server_group_resp_template(id=uuidsentinel.sg2_id,
name=names[1],
policies=policies,
members=members,
@ -220,12 +223,12 @@ class ServerGroupTestV21(test.TestCase):
project_id=p_id,
user_id=u_id)
else:
sg1 = server_group_resp_template(id=str(1345),
sg1 = server_group_resp_template(id=uuidsentinel.sg1_id,
name=names[0],
policies=policies,
members=members,
metadata=metadata)
sg2 = server_group_resp_template(id=str(891),
sg2 = server_group_resp_template(id=uuidsentinel.sg2_id,
name=names[1],
policies=policies,
members=members,
@ -389,7 +392,7 @@ class ServerGroupTestV21(test.TestCase):
self._test_list_server_group_all(api_version='2.1')
def test_delete_server_group_by_id(self):
sg = server_group_template(id='123')
sg = server_group_template(id=uuidsentinel.sg1_id)
self.called = False
@ -405,7 +408,7 @@ class ServerGroupTestV21(test.TestCase):
self.stub_out('nova.db.instance_group_get',
return_server_group)
resp = self.controller.delete(self.req, '123')
resp = self.controller.delete(self.req, uuidsentinel.sg1_id)
self.assertTrue(self.called)
# NOTE: on v2.1, http status code is set as wsgi_code of API

1
nova/tests/unit/api/openstack/fakes.py
View File

@ -56,6 +56,7 @@ QUOTAS = quota.QUOTAS
FAKE_UUID = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'
FAKE_PROJECT_ID = '6a6a9c9eee154e9cb8cec487b98d36ab'
FAKE_USER_ID = '5fae60f5cf4642609ddd31f71748beac'
FAKE_UUIDS = {}