openstack/deb-nova
Code Issues Proposed changes

Instance groups: add method get_by_hint

Browse Source 
In order to support backward compatibility a new method
'get_by_hint' has been added. This method will check if the
hint is a uuid and if no it will return get_by_uuid else it
will return get_by_name.

Change-Id: I728bf3454dc5a5367e21f242281719c1a967269a
Partial-bug: #1303360
This commit is contained in:
Gary Kotton
2014-04-13 01:49:07 -07:00
parent 4e55546cfc
commit bff8604fd2
2 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nova/objects/instance_group.py
View File

@@ -17,6 +17,7 @@ from nova import exception
from nova.objects import base
from nova.objects import fields
from nova.objects import instance as instance_obj
from nova.openstack.common import uuidutils
class InstanceGroup(base.NovaPersistentObject, base.NovaObject):
@@ -79,6 +80,13 @@ class InstanceGroup(base.NovaPersistentObject, base.NovaObject):
raise exception.InstanceGroupNotFound(group_uuid=name)
@classmethod
def get_by_hint(cls, context, hint):
if uuidutils.is_uuid_like(hint):
return cls.get_by_uuid(context, hint)
else:
return cls.get_by_name(context, hint)
@base.remotable
def save(self, context):
"""Save updates to this instance group."""

22
nova/tests/objects/test_instance_group.py
View File

@@ -12,6 +12,8 @@
# License for the specific language governing permissions and limitations
# under the License.
import uuid
from nova.compute import flavors
from nova import context
from nova import db
@@ -177,14 +179,17 @@ class _TestInstanceGroupObjects(test.TestCase):
db.instance_group_get, self.context, result['uuid'])
def _populate_instances(self):
instances = [('f1', 'p1'), ('f2', 'p1'),
('f3', 'p2'), ('f4', 'p2')]
instances = [(str(uuid.uuid4()), 'f1', 'p1'),
(str(uuid.uuid4()), 'f2', 'p1'),
(str(uuid.uuid4()), 'f3', 'p2'),
(str(uuid.uuid4()), 'f4', 'p2')]
for instance in instances:
values = self._get_default_values()
values['uuid'] = instance[0]
values['name'] = instance[0]
values['project_id'] = instance[1]
values['name'] = instance[1]
values['project_id'] = instance[2]
self._create_instance_group(self.context, values)
return instances
def test_list_all(self):
self._populate_instances()
@@ -219,6 +224,15 @@ class _TestInstanceGroupObjects(test.TestCase):
ig = instance_group.InstanceGroup.get_by_name(ctxt, 'f1')
self.assertEqual('f1', ig.name)
def test_get_by_hint(self):
instances = self._populate_instances()
for instance in instances:
ctxt = context.RequestContext('fake_user', instance[2])
ig = instance_group.InstanceGroup.get_by_hint(ctxt, instance[1])
self.assertEqual(instance[1], ig.name)
ig = instance_group.InstanceGroup.get_by_hint(ctxt, instance[0])
self.assertEqual(instance[0], ig.uuid)
def test_add_members(self):
instance_ids = ['fakeid1', 'fakeid2']
values = self._get_default_values()