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

mininet/node.py

diff --git a/mininet/node.py b/mininet/node.py
index 7f3c4c7..281839a 100644
--- a/mininet/node.py
+++ b/mininet/node.py
@@ -726,18 +726,23 @@
         if not CCNHost.inited:
             CCNHost.init()
 
-       # self.cmd("export CCND_DEBUG=6")
-       # self.cmd("export CCND_LOG=./log.{0}".format(self.name))
+        self.cmd("export CCND_DEBUG=6")
+        self.cmd("export CCND_LOG=./log.{0}".format(self.name))
+#	print self.params['cache']
+	if self.params['cache'] != None:
+		self.cmd("export CCND_CAP={0}".format(self.params['cache']))
+
         self.cmd("export CCN_LOCAL_SOCKNAME=/tmp/.sock.ccnx.{0}".format(self.name))
         self.cmd("ccndstart")
         self.peerList = {}
 
-    def config( self, fib=None, app=None, **params ):
+    def config( self, fib=None, app=None, cache=None, **params ):
 
         r = Node.config( self, **params )
 
         self.setParam( r, 'app', fib=fib )
         self.setParam( r, 'fib', app=app)
+	self.setParam( r, 'cache', cache=cache )
 
         return r
 
@@ -795,18 +800,22 @@
         if not CCNHost.inited:
             CCNHost.init()
 
-       # self.cmd("export CCND_DEBUG=6")
-       # self.cmd("export CCND_LOG=./log.{0}".format(self.name))
+        self.cmd("export CCND_DEBUG=6")
+        self.cmd("export CCND_LOG=./log.{0}".format(self.name))
+        if self.params['cache'] != None:
+                self.cmd("export CCND_CAP={0}".format(self.params['cache']))
+
 	self.cmd("export CCN_LOCAL_SOCKNAME=/tmp/.sock.ccnx.{0}".format(self.name))
         self.cmd("ccndstart")
         self.peerList = {}
 
-    def config( self, fib=None, app=None, cpu=None, cores=None, **params):
+    def config( self, fib=None, app=None, cpu=None, cores=None, cache=None, **params):
 
         r = CPULimitedHost.config(self,cpu,cores, **params)
 
         self.setParam( r, 'app', fib=fib )
         self.setParam( r, 'fib', app=app)
+	self.setParam( r, 'cache', cache=cache)
 
         return r