Adding instance id to the security group extension API

- Secgroup list now show their corresponding instances
- Secgroup get also show its corresponding instance

Fixes bug 1190410

Change-Id: Ifb7b1c9be741fca221267243b86ce0d91b994015

trove/extensions/security_group/models.py

@@ -46,6 +46,11 @@ class SecurityGroup(DatabaseModelBase):
     _data_fields = ['id', 'name', 'description', 'user', 'tenant_id',
                     'created', 'updated', 'deleted', 'deleted_at']
 
+    @property
+    def instance_id(self):
+        return SecurityGroupInstanceAssociation\
+            .get_instance_id_by_security_group_id(self.id)
+
     @classmethod
     def create_sec_group(cls, name, description, context):
         try:
@@ -190,6 +195,13 @@ def get_security_group_by_instance_id(cls, id):
             deleted=False)
         return association.get_security_group()
 
+    @classmethod
+    def get_instance_id_by_security_group_id(cls, secgroup_id):
+        association = SecurityGroupInstanceAssociation.find_by(
+            security_group_id=secgroup_id,
+            deleted=False)
+        return association.instance_id
+
 
 class RemoteSecurityGroup(NovaRemoteModelBase):
 

trove/extensions/security_group/views.py

@@ -66,6 +66,7 @@ def data(self):
         return {"id": self.secgroup['id'],
                 "name": self.secgroup['name'],
                 "description": self.secgroup['description'],
+                "instance_id": self.secgroup['instance_id'],
                 "rules": self._build_rules(),
                 "links": self._build_links(),
                 "created": self.secgroup['created'],

trove/tests/api/instances.py

@@ -539,6 +539,7 @@ def test_get_security_group(self):
         assert_is_not_none(securityGroup)
         assert_equal(securityGroup.name, self.secGroupName)
         assert_equal(securityGroup.description, self.secGroupDescription)
+        assert_equal(securityGroup.instance_id, instance_info.id)
 
 
 @test(depends_on_classes=[SecurityGroupsTest],