change JSON format / importer

diff --git a/linkpair/importer/JSON.py b/linkpair/importer/JSON.py
index be32213..cf1855c 100755 (executable)
--- a/linkpair/importer/JSON.py
+++ b/linkpair/importer/JSON.py
@@ -35,6 +35,9 @@ class JsonImporter(object):
         self._ssh_keyauth = False
         self._ssh_passauth = False
         self._formatter = formatter
+        self._linkpairs_hash = ""
+        self._exported_time = ""
+        self._snapid = ""
         self._u.debug_out("JsonImporter initialized: " + self._import_file)
 
     def run(self):
@@ -48,8 +51,12 @@ class JsonImporter(object):
         json_data = json.load(f_import)
         f_import.close()
 
+        self._linkpairs_hash = json_data["linkpairs_hash"]
+        self._exported_time = json_data["exported_time"]
+        self._snapid = json_data["snapid"]
+        self._u.debug_out("importing...\n  linkpairs_hash: " + self._linkpairs_hash + "\n  exported_time: " + self._exported_time + "\n  snapid: " + self._snapid)
         for linkpair in json_data["linkpairs"]:
-            self._u.debug_out(linkpair["linkid"])
+            self._u.debug_out("  " + linkpair["linkid"])
             device1 = Device(linkpair["linkpair"]["device1"]["label"],
                     int(linkpair["linkpair"]["device1"]["device_type"]),
                     linkpair["linkpair"]["device1"]["meta"])
@@ -73,3 +80,12 @@ class JsonImporter(object):
 
     def get_linkpairs(self):
         return self._linkpairs
+
+    def get_linkpairs_hash(self):
+        return self._linkpairs_hash
+
+    def get_exported_time(self):
+        return self._exported_time
+
+    def get_snapid(self):
+        return self._snapid