commit e121a7b55ba4e57909699c65d7acbe9b457eef80
author carlosmscabral <carlosmscabral@gmail.com> Mon Feb 18 18:14:53 2013 -0300
committer carlosmscabral <carlosmscabral@gmail.com> Mon Feb 18 18:14:53 2013 -0300
tree 51a2aaa5b51783e13714a40884beaa78fc1f1067
parent cd5073b5e504419fa782b10e7fd3201a92b45fbb

New functions

mininet/conf_parser.py

diff --git a/mininet/conf_parser.py b/mininet/conf_parser.py
index 642b4b1..c9fe119 100644
--- a/mininet/conf_parser.py
+++ b/mininet/conf_parser.py
@@ -2,14 +2,15 @@
 
 class confCCNHost():
     
-    def __init__(self, name, app='', uri_tuples='', cpu=None):
+    def __init__(self, name, app='', uri_tuples='', cpu=None, cores=None):
         self.name = name
         self.app = app
         self.uri_tuples = uri_tuples
         self.cpu = cpu
+        self.cores = cores
         
     def __repr__(self):
-        return 'Name: ' + self.name + ' App: ' + self.app + ' URIS: ' + str(self.uri_tuples) + ' CPU:' + str(self.cpu)
+        return 'Name: ' + self.name + ' App: ' + self.app + ' URIS: ' + str(self.uri_tuples) + ' CPU:' + str(self.cpu) + ' Cores:' +str(self.cores)
 
 class confCCNLink():
     
@@ -41,13 +42,17 @@
         uris = rest
         uri_list=[]
         cpu = None
+        cores = None
+        
         for uri in uris:
             if re.match("cpu",uri):
                 cpu = float(uri.split('=')[1])
+            elif re.match("cores",uri):
+                cores = uri.split('=')[1]
             else:
                 uri_list.append((uri.split(',')[0],uri.split(',')[1]))
         
-        hosts.append(confCCNHost(name , app, uri_list,cpu))
+        hosts.append(confCCNHost(name , app, uri_list,cpu,cores))
     
     return hosts
 
@@ -68,14 +73,17 @@
         uris = rest
         uri_list=[]
         cpu = None
+        cores = None
         
         for uri in uris:
             if re.match("cpu",uri):
                 cpu = float(uri.split('=')[1])
+            elif re.match("cores",uri):
+                cores = uri.split('=')[1]    
             else:
                 uri_list.append((uri.split(',')[0],uri.split(',')[1]))
         
-        routers.append(confCCNHost(name=name , uri_tuples=uri_list, cpu=cpu))
+        routers.append(confCCNHost(name=name , uri_tuples=uri_list, cpu=cpu, cores=cores))
     
     return routers
 
@@ -104,7 +112,7 @@
             arg_name, arg_value = arg.split('=')
             key = arg_name
             value = arg_value
-            if key in ['loss','bw','jitter']:
+            if key in ['loss','bw','jitter','max_queue_size']:
                 value = int(value)
             
             link_dict[key] = value