import api
import api_calls
import database
-import controller
+import controller
import logger
import sliver_vs
import string,re
'net_i2_min_rate': bwmin / 1000, # kbps
'net_i2_max_rate': bwmax / 1000, # kbps
'net_i2_share': 1, # proportional share
- 'net_max_kbyte' : 5662310, #Kbyte
- 'net_thresh_kbyte': 4529848, #Kbyte
- 'net_i2_max_kbyte': 17196646,
- 'net_i2_thresh_kbyte': 13757316,
+ 'net_max_kbyte' : 10546875, #Kbyte
+ 'net_thresh_kbyte': 9492187, #Kbyte
+ 'net_i2_max_kbyte': 31640625,
+ 'net_i2_thresh_kbyte': 28476562,
# disk space limit
'disk_max': 5000000, # bytes
# capabilities
## 'Type' isn't returned by GetSlivers() for whatever reason. We're overloading
## instantiation here, but i suppose its the ssame thing when you think about it. -FA
# Handle nm controller here
- if rec['instantiation'].lower() == 'nm-controller':
+ if rec['instantiation'].lower() == 'nm-controller':
rec.setdefault('type', attr_dict.get('type', 'controller.Controller'))
else:
rec.setdefault('type', attr_dict.get('type', 'sliver.VServer'))