From 2907fd18d775bfd23070eb1db1bb99fd700652ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= Date: Thu, 27 Oct 2016 15:58:08 -0400 Subject: [PATCH] Cleanup neo4j support --- examples/make_neo4j.py | 4 +++- pymisp/tools/neo4j.py | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/examples/make_neo4j.py b/examples/make_neo4j.py index 247a866..26b568e 100755 --- a/examples/make_neo4j.py +++ b/examples/make_neo4j.py @@ -13,10 +13,12 @@ if __name__ == '__main__': parser.add_argument("--host", default='localhost:7474', help="Host where neo4j is running.") parser.add_argument("-u", "--user", default='neo4j', help="User on neo4j.") parser.add_argument("-p", "--password", default='neo4j', help="Password on neo4j.") + parser.add_argument("-d", "--deleteall", action="store_true", default=False, help="Delete all nodes from the database") args = parser.parse_args() neo4j = Neo4j(args.host, args.user, args.password) - neo4j.del_all() + if args.deleteall: + neo4j.del_all() misp = PyMISP(misp_url, misp_key) result = misp.search_all(args.search) for json_event in result['response']: diff --git a/pymisp/tools/neo4j.py b/pymisp/tools/neo4j.py index cb49df1..af5ba2c 100644 --- a/pymisp/tools/neo4j.py +++ b/pymisp/tools/neo4j.py @@ -32,8 +32,7 @@ class Neo4j(): def import_event(self, event): tx = self.graph.begin() - event_node = Node('Event', uuid=event.uuid) - event_node['name'] = event.info + event_node = Node('Event', uuid=event.uuid, name=event.info) # event_node['distribution'] = event.distribution # event_node['threat_level_id'] = event.threat_level_id # event_node['analysis'] = event.analysis