commit 3d060fc8240c78648343c20b40c5f1c147ce73c9
author carlosmscabral <carlosmscabral@gmail.com> Thu Jul 18 13:18:09 2013 -0300
committer carlosmscabral <carlosmscabral@gmail.com> Thu Jul 18 13:18:09 2013 -0300
tree 0ee8b7beed49c4a62207ff257abc946c14f8352a
parent ceef99c108dd80a2a3a01013436b2774cd1509f7

3

bin/miniccnx

diff --git a/bin/miniccnx b/bin/miniccnx
index 1daaa72..256383d 100644
--- a/bin/miniccnx
+++ b/bin/miniccnx
@@ -51,7 +51,7 @@
         self.isLimited = False
 
         for host in hosts_conf:
-	    print host
+#	    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,cache=host.cache)

mininet/conf_parser.py

diff --git a/mininet/conf_parser.py b/mininet/conf_parser.py
index f241e88..d201a10 100644
--- a/mininet/conf_parser.py
+++ b/mininet/conf_parser.py
@@ -53,6 +53,8 @@
                 cores = uri.split('=')[1]
 	    elif re.match("cache",uri):
 		cache = uri.split('=')[1]
+	    elif re.match("mem",uri):
+		continue
             else:
                 uri_list.append((uri.split(',')[0],uri.split(',')[1]))