openstack/nova
Code Issues Proposed changes

Add SecurityGroup.identifier to prefer uuid over name

Browse Source 
This gives us a quick identifier property on SecurityGroup that
will prefer uuid if set, otherwise use the name field.

Change-Id: If7153f6470dc94d600731335f59260e31d1a0392
This commit is contained in:
Dan Smith
2016-12-02 08:24:36 -08:00
parent 979639b21c
commit 5ce65fa4bb
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nova/objects/security_group.py
View File

@@ -88,6 +88,10 @@ class SecurityGroup(base.NovaPersistentObject, base.NovaObject):
self._from_db_object(self._context, self, self._from_db_object(self._context, self,
db.security_group_get(self._context, self.id)) db.security_group_get(self._context, self.id))
@property
def identifier(self):
return self.uuid if 'uuid' in self else self.name
@base.NovaObjectRegistry.register @base.NovaObjectRegistry.register
class SecurityGroupList(base.ObjectListBase, base.NovaObject): class SecurityGroupList(base.ObjectListBase, base.NovaObject):

6
nova/tests/unit/objects/test_security_group.py
View File

@@ -123,6 +123,12 @@ class _TestSecurityGroupObject(object):
secgroup.save() secgroup.save()
self.assertFalse(mock_db_update.called) self.assertFalse(mock_db_update.called)
def test_identifier(self):
secgroup = security_group.SecurityGroup(name='foo')
self.assertEqual('foo', secgroup.identifier)
secgroup.uuid = uuids.secgroup
self.assertEqual(uuids.secgroup, secgroup.identifier)
class TestSecurityGroupObject(test_objects._LocalTest, class TestSecurityGroupObject(test_objects._LocalTest,
_TestSecurityGroupObject): _TestSecurityGroupObject):