Merge pull request #76 from mpeuster/master
Monitoring should be optional, not default, to keep standard emulator footprint small.
diff --git a/src/emuvim/dcemulator/net.py b/src/emuvim/dcemulator/net.py
index f237cb5..110256e 100755
--- a/src/emuvim/dcemulator/net.py
+++ b/src/emuvim/dcemulator/net.py
@@ -26,7 +26,7 @@
This class is used by topology definition scripts.
"""
- def __init__(self, controller=RemoteController, monitor=True,
+ def __init__(self, controller=RemoteController, monitor=False,
dc_emulation_max_cpu=1.0, # fraction of overall CPU time for emulation
dc_emulation_max_mem=512, # emulation max mem in MB
**kwargs):
diff --git a/src/emuvim/dcemulator/node.py b/src/emuvim/dcemulator/node.py
index 7590973..2911445 100755
--- a/src/emuvim/dcemulator/node.py
+++ b/src/emuvim/dcemulator/node.py
@@ -178,8 +178,8 @@
flavor_name=flavor_name,
cpu_period=int(cpu_period) if cpu_limit > 0 else None, # set cpu limits if needed
cpu_quota=int(cpu_quota) if cpu_limit > 0 else None,
- mem_limit="%dm" % int(mem_limit) if mem_limit > 0 else None, # set mem limits if needed
- memswap_limit="%dm" % int(mem_limit) if mem_limit > 0 else None # lets set swap to mem limit for now
+ #mem_limit="%dm" % int(mem_limit) if mem_limit > 0 else None, # set mem limits if needed
+ #memswap_limit="%dm" % int(mem_limit) if mem_limit > 0 else None # lets set swap to mem limit for now
)
# connect all given networks
# if no --net option is given, network = [{}], so 1 empty dict in the list