Merge pull request #293 from joewaltonPurple/organisation_info

CIQ Identity 3.0 - update to_dict and from_dict to include organisation_info
STIXProject · Jul 6, 2016 · 8ba60c4 · 8ba60c4
2 parents e349d5f + feff79c
commit 8ba60c4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/stix/extensions/identity/ciq_identity_3_0.py b/stix/extensions/identity/ciq_identity_3_0.py
@@ -406,6 +406,7 @@ def from_dict(cls, dict_repr, return_obj=None):
             return_obj = cls()
 
         return_obj.party_name = PartyName.from_dict(dict_repr.get('party_name'))
+        return_obj.organisation_info = OrganisationInfo.from_dict(dict_repr.get('organisation_info'))
         return_obj.languages = [Language.from_dict(x) for x in dict_repr.get('languages', [])]
         return_obj.addresses = [Address.from_dict(x) for x in dict_repr.get('addresses', [])]
         return_obj.electronic_address_identifiers = [ElectronicAddressIdentifier.from_dict(x) for x in dict_repr.get('electronic_address_identifiers', [])]
@@ -420,6 +421,8 @@ def to_dict(self):
 
         if self.party_name:
             d['party_name'] = self.party_name.to_dict()
+        if self.organisation_info:
+            d['organisation_info'] = self.organisation_info.to_dict()
         if self.languages:
             d['languages'] = [x.to_dict() for x in self.languages]
         if self.addresses:

diff --git a/stix/test/extensions/identity/ciq_identity_3_0_test.py b/stix/test/extensions/identity/ciq_identity_3_0_test.py
@@ -47,6 +47,9 @@ class CIQIdentity3_0InstanceTests(EntityTestCase, unittest.TestCase):
                     }
                 ]
             },
+            'organisation_info': {
+               'industry_type': 'test industry'
+            },
             'languages': [
                 {'value': 'test language'}
             ],