Still BROKEN :/

bmx0r · bmx0r · commit feff0a210bfb · 2013-05-06T08:37:31.000+02:00
modified:   ../.travis.yml
	modified:   plugins/mongodb.py
	modified:   report.py
	modified:   reportjson.py
	modified:   test/test_backend_plugin_factory.py
diff --git a/.travis.yml b/.travis.yml
@@ -21,3 +21,4 @@ script:
   - python test/report_test.py
   - python test/report_diff_test.py
   - python test/service_test.py
+  - python test/test_backend_plugin_factory.py
diff --git a/libnmap/plugins/mongodb.py b/libnmap/plugins/mongodb.py
@@ -1,8 +1,11 @@
 #!/usr/bin/env python
-from libnmap.plugins.backendplugin import NmapBackendPlugin
+import json
 from pymongo import MongoClient
 from bson.objectid import ObjectId
 
+from libnmap import ReportDecoder, ReportEncoder
+from libnmap.plugins.backendplugin import NmapBackendPlugin
+
 
 class NmapMongoPlugin(NmapBackendPlugin):
     def __init__(self, dbname=None, store=None, **kwargs):
@@ -14,8 +17,15 @@ def __init__(self, dbname=None, store=None, **kwargs):
         self.dbclient = MongoClient(**kwargs)
         self.collection = self.dbclient[self.dbname][self.store]
 
-    def insert(self, dict_data):
-        self.collection.insert(dict_data)
+    def insert(self, report):
+        # create a json object from an NmapReport instance
+        j = json.dumps(report, cls=ReportEncoder)
+        try:
+            id = self.collection.insert(json.loads(j))
+        except:
+            print "MONGODB cannot insert"
+            raise
+        return id
 
     def get(self, report_id=None):
         rid = report_id
@@ -24,6 +34,7 @@ def get(self, report_id=None):
 
         if isinstance(rid, ObjectId):
             r = self.collection.find({'_id': rid})
+            nmapreport = json.loads(r, cls=ReportDecoder)
         else:
             r = self.collection.find()
         return r
diff --git a/libnmap/report.py b/libnmap/report.py
@@ -2,9 +2,9 @@
 import sys
 import inspect
 from libnmap import NmapParser
-from libnmap import NmapDiff, NmapHost, NmapService
-#from plugins import backendpluginFactory
-from plugins import backendplugin
+from libnmap import NmapDiff
+from libnmap.plugins.backendplugin import NmapBackendPlugin
+#from libnmap.plugins.backendpluginFactory import BackendPluginFactory
 
 
 class NmapReport(object):
@@ -50,9 +50,10 @@ def save(self, backend):
         """
         if backend is not None:
             #do stuff
-            backend.insert(self._hosts)
+            id = backend.insert(self)
         else:
             raise RuntimeError
+        return id
 
     def diff(self, other):
         if self._is_consistent() and other._is_consistent():
diff --git a/libnmap/reportjson.py b/libnmap/reportjson.py
@@ -1,9 +1,6 @@
 #!/usr/bin/env python
 import json
-import sys
-import inspect
-from libnmap import NmapParser
-from libnmap import NmapDiff, NmapHost, NmapService
+from libnmap import NmapHost, NmapService, NmapReport, NmapParser
 
 
 class ReportEncoder(json.JSONEncoder):
diff --git a/libnmap/test/test_backend_plugin_factory.py b/libnmap/test/test_backend_plugin_factory.py
@@ -78,7 +78,7 @@ def mongo_test_factory(self):
         self.assertEqual(isinstance(mongodb, NmapSqlitePlugin), False)
 
     def mongo_test_insert(self):
-        """best way to insert is to call save() of nmapreport"""
+        """"best way to insert is to call save() of nmapreport"""
         for testfile in self.flist:
             fd = open(testfile['file'], 'r')
             s = fd.read()
@@ -88,9 +88,7 @@ def mongo_test_insert(self):
             #create the backend factory object
             factory = BackendPluginFactory()
             mongodb = factory.create(plugin_name="mongodb")
-            nr.save(mongodb)
-            print mongodb.dbclient
-            print mongodb.collection
+            self.assertNotEqual(nr.save(mongodb),None)
 
     def mongo_test_update(self):
         pass
