Added method to OpenStackHeatStack to return OpenStackSecurityGroup objects.

Continuation of the story SNAPS-153 for adding creator/state machine
instances for OpenStack objects deployed via Heat.

JIRA: SNAPS-207

Change-Id: Id479b69c2b166ab38724c3886096d8483998f819
Signed-off-by: spisarski <s.pisarski@cablelabs.com>

2 files changed, 62 insertions, 5 deletions

diff --git a/snaps/domain/network.py b/snaps/domain/network.py
index 448ee89..1f1b67c 100644
--- a/snaps/domain/network.py
+++ b/snaps/domain/network.py
@@ -206,15 +206,29 @@ class SecurityGroup:
         Constructor
         :param name: the security group's name
         :param id: the security group's id
+        :param description: the security group's description
+        :param project_id: the security group's project_id
+        :param rules: list of SecurityGroupRule objects associated to this
         """
         self.name = kwargs.get('name')
         self.id = kwargs.get('id')
         self.description = kwargs.get('description')
         self.project_id = kwargs.get('project_id', kwargs.get('tenant_id'))
 
+        self.rules = list()
+        if kwargs.get('rules') and isinstance(kwargs.get('rules'), list):
+            for rule in kwargs.get('rules'):
+                if isinstance(rule, SecurityGroupRule):
+                    self.rules.append(rule)
+                else:
+                    self.rules.append(SecurityGroupRule(**rule))
+
     def __eq__(self, other):
-        return (self.name == other.name and self.id == other.id and
-                self.project_id == other.project_id)
+        return (self.name == other.name and
+                self.id == other.id and
+                self.description == other.description and
+                self.project_id == other.project_id and
+                self.rules == other.rules)
 
 
 class SecurityGroupRule:
@@ -226,7 +240,7 @@ class SecurityGroupRule:
         """
         Constructor
         :param id: the security group rule's id
-        :param sec_grp_id: the ID of the associated security group
+        :param security_group_id: the ID of the associated security group
         :param description: the security group rule's description
         :param direction: the security group rule's direction
         :param ethertype: the security group rule's ethertype
diff --git a/snaps/domain/test/network_tests.py b/snaps/domain/test/network_tests.py
index 3e449b4..04dc5a3 100644
--- a/snaps/domain/test/network_tests.py
+++ b/snaps/domain/test/network_tests.py
@@ -286,12 +286,33 @@ class SecurityGroupDomainObjectTests(unittest.TestCase):
     def test_construction_proj_id_kwargs(self):
         sec_grp = SecurityGroup(
             **{'name': 'name', 'id': 'id', 'project_id': 'foo',
-               'description': 'test desc'})
+               'description': 'test desc',
+               'rules': [
+                    {'id': 'id', 'security_group_id': 'grp_id',
+                     'description': 'desc', 'direction': 'dir',
+                     'ethertype': 'eType', 'port_range_min': '10.0.0.100',
+                     'port_range_max': '10.0.0.200', 'protocol': 'proto',
+                     'remote_group_id': 'group_id',
+                     'remote_ip_prefix': 'ip_prefix'}
+               ]})
         self.assertEqual('name', sec_grp.name)
         self.assertEqual('id', sec_grp.id)
         self.assertEqual('test desc', sec_grp.description)
         self.assertEqual('foo', sec_grp.project_id)
 
+        self.assertEqual(1, len(sec_grp.rules))
+        rule = sec_grp.rules[0]
+        self.assertEqual('id', rule.id)
+        self.assertEqual('grp_id', rule.security_group_id)
+        self.assertEqual('desc', rule.description)
+        self.assertEqual('dir', rule.direction)
+        self.assertEqual('eType', rule.ethertype)
+        self.assertEqual('10.0.0.100', rule.port_range_min)
+        self.assertEqual('10.0.0.200', rule.port_range_max)
+        self.assertEqual('proto', rule.protocol)
+        self.assertEqual('group_id', rule.remote_group_id)
+        self.assertEqual('ip_prefix', rule.remote_ip_prefix)
+
     def test_construction_tenant_id_kwargs(self):
         sec_grp = SecurityGroup(
             **{'name': 'name', 'id': 'id',
@@ -300,15 +321,37 @@ class SecurityGroupDomainObjectTests(unittest.TestCase):
         self.assertEqual('id', sec_grp.id)
         self.assertEqual('foo', sec_grp.project_id)
         self.assertIsNone(sec_grp.description)
+        self.assertEqual(0, len(sec_grp.rules))
 
     def test_construction_named(self):
+        rules = [SecurityGroupRule(
+            **{'id': 'id', 'security_group_id': 'grp_id',
+               'description': 'desc', 'direction': 'dir',
+               'ethertype': 'eType', 'port_range_min': '10.0.0.100',
+               'port_range_max': '10.0.0.200', 'protocol': 'proto',
+               'remote_group_id': 'group_id',
+               'remote_ip_prefix': 'ip_prefix'}
+        )]
         sec_grp = SecurityGroup(description='test desc', tenant_id='foo',
-                                id='id', name='name')
+                                id='id', name='name', rules=rules)
         self.assertEqual('name', sec_grp.name)
         self.assertEqual('id', sec_grp.id)
         self.assertEqual('test desc', sec_grp.description)
         self.assertEqual('foo', sec_grp.project_id)
 
+        self.assertEqual(1, len(sec_grp.rules))
+        rule = sec_grp.rules[0]
+        self.assertEqual('id', rule.id)
+        self.assertEqual('grp_id', rule.security_group_id)
+        self.assertEqual('desc', rule.description)
+        self.assertEqual('dir', rule.direction)
+        self.assertEqual('eType', rule.ethertype)
+        self.assertEqual('10.0.0.100', rule.port_range_min)
+        self.assertEqual('10.0.0.200', rule.port_range_max)
+        self.assertEqual('proto', rule.protocol)
+        self.assertEqual('group_id', rule.remote_group_id)
+        self.assertEqual('ip_prefix', rule.remote_ip_prefix)
+
 
 class SecurityGroupRuleDomainObjectTests(unittest.TestCase):
     """