commit b9d85b724e9a2776b050d7bc8e9d96e3c5679cf7
author carlosmscabral <carlosmscabral@gmail.com> Mon Jul 15 15:24:33 2013 -0300
committer carlosmscabral <carlosmscabral@gmail.com> Mon Jul 15 15:24:33 2013 -0300
tree c9830877954b97d7966aee1e298d54e7c50f9b4b
parent b4430fb7b626fcad404d96eb7c2262045c26bc78

adaptions

bin/miniccnx

diff --git a/bin/miniccnx b/bin/miniccnx
index c40bfc9..1daaa72 100644
--- a/bin/miniccnx
+++ b/bin/miniccnx
@@ -43,7 +43,7 @@
         Topo.__init__(self, **opts)
 
         hosts_conf = parse_hosts(conf_arq)
-        routers_conf = parse_routers(conf_arq)
+#       routers_conf = parse_routers(conf_arq)
         links_conf = parse_links(conf_arq)
 
 
@@ -51,14 +51,15 @@
         self.isLimited = False
 
         for host in hosts_conf:
+	    print host
             if host.cpu != None and self.isLimited != True:
                 self.isLimited = True
-            self.addHost(host.name, app=host.app, fib=host.uri_tuples,cpu=host.cpu,cores=host.cores)
+            self.addHost(host.name, app=host.app, fib=host.uri_tuples,cpu=host.cpu,cores=host.cores,cache=host.cache)
 
-        for router in routers_conf:
-            if router.cpu != None and self.isLimited != True:
-                self.isLimited = True
-            self.addHost(router.name,fib=router.uri_tuples,cpu=router.cpu,cores=router.cores)
+#        for router in routers_conf:
+#            if router.cpu != None and self.isLimited != True:
+#                self.isLimited = True
+#            self.addHost(router.name,fib=router.uri_tuples,cpu=router.cpu,cores=router.cores)
 
         for link in links_conf:
             if len(link.linkDict) == 0: