MISP
/
PyMISP
mirror of https://github.com/MISP/PyMISP
2
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'objects' of github.com:MISP/PyMISP into objects

pull/111/head
Raphaël Vinot 2017-09-12 16:55:29 +02:00
parent da2b28a927 b337e77070
commit b3c15da967
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pymisp/mispevent.py
View File

@ -525,8 +525,8 @@ class MISPObjectReference(AbstractMISP):
def __init__(self): def __init__(self):
super(MISPObjectReference, self).__init__() super(MISPObjectReference, self).__init__()
def from_dict(self, source_uuid, referenced_uuid, relationship_type, comment=None, **kwargs): def from_dict(self, object_uuid, referenced_uuid, relationship_type, comment=None, **kwargs):
self.source_uuid = source_uuid self.object_uuid = object_uuid
self.referenced_uuid = referenced_uuid self.referenced_uuid = referenced_uuid
self.relationship_type = relationship_type self.relationship_type = relationship_type
self.comment = comment self.comment = comment
@ -647,14 +647,14 @@ class MISPObject(AbstractMISP):
def add_reference(self, referenced_uuid, relationship_type, comment=None, **kwargs): def add_reference(self, referenced_uuid, relationship_type, comment=None, **kwargs):
"""Add a link (uuid) to an other object""" """Add a link (uuid) to an other object"""
if kwargs.get('source_uuid'): if kwargs.get('object_uuid'):
# Load existing object # Load existing object
source_uuid = kwargs.get('source_uuid') object_uuid = kwargs.get('object_uuid')
else: else:
# New reference # New reference
source_uuid = self.uuid object_uuid = self.uuid
reference = MISPObjectReference() reference = MISPObjectReference()
reference.from_dict(source_uuid=source_uuid, referenced_uuid=referenced_uuid, reference.from_dict(object_uuid=object_uuid, referenced_uuid=referenced_uuid,
relationship_type=relationship_type, comment=comment, **kwargs) relationship_type=relationship_type, comment=comment, **kwargs)
self.ObjectReference.append(reference) self.ObjectReference.append(reference)