commit ab087daa66a15032391e47fb62541f0ea8219a78
author Ashlesh Gawande <agawande@memphis.edu> Thu Jul 09 15:10:02 2015 -0500
committer Vince Lehman <vslehman@memphis.edu> Tue Jul 14 09:53:44 2015 -0500
tree 59947c675597b54e969e0c43f8df672851074e90
parent 557cb8466add6815bbd02f6ac78afa2b4d149049

Load topology from saved files

refs: #2911

Change-Id: Ic5b0c0713333579fd6e92c738784b3de1dda6a1d

bin/minindnedit

diff --git a/bin/minindnedit b/bin/minindnedit
index bb6e030..8e945a4 100755
--- a/bin/minindnedit
+++ b/bin/minindnedit
@@ -151,8 +151,8 @@
             self.fibFrame = Frame(n)
 
             # NDN
-            self.nfdFrame = NfdFrame(n)
-            self.nlsrFrame = NlsrFrame(n)
+            self.nfdFrame = NfdFrame(n, self.prefValues)
+            self.nlsrFrame = NlsrFrame(n,self.prefValues)
 
             n.add(self.propFrame, text='Properties')
             n.add(self.fibFrame, text='FIB Entries')
@@ -849,7 +849,7 @@
         loadedTopology = self.convertJsonUnicode(json.load(f))
 
         # Load hosts
-        hosts = loadedTopology['nodes']
+        hosts = loadedTopology['hosts']
         for host in hosts:
             nodeNum = host['number']
             hostname = 'h'+nodeNum
@@ -859,6 +859,7 @@
                 host['opts']['hostname'] = hostname
             if 'nodeNum' not in host['opts']:
                 host['opts']['nodeNum'] = int(nodeNum)
+
             x = host['x']
             y = host['y']