projects
/
osm
/
vim-emu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: Removed depricated Docker build scripts and test scripts.
[osm/vim-emu.git]
/
src
/
emuvim
/
dcemulator
/
node.py
diff --git
a/src/emuvim/dcemulator/node.py
b/src/emuvim/dcemulator/node.py
index
8a7be0a
..
2702bf5
100755
(executable)
--- a/
src/emuvim/dcemulator/node.py
+++ b/
src/emuvim/dcemulator/node.py
@@
-113,7
+113,7
@@
class Datacenter(object):
self.name = "dc%d" % Datacenter.DC_COUNTER
Datacenter.DC_COUNTER += 1
# use this for user defined names that can be longer than self.name
self.name = "dc%d" % Datacenter.DC_COUNTER
Datacenter.DC_COUNTER += 1
# use this for user defined names that can be longer than self.name
- self.label = label
+ self.label = label
# dict to store arbitrary metadata (e.g. latitude and longitude)
self.metadata = metadata
# path to which resource information should be logged (e.g. for experiments). None = no logging
# dict to store arbitrary metadata (e.g. latitude and longitude)
self.metadata = metadata
# path to which resource information should be logged (e.g. for experiments). None = no logging
@@
-148,7
+148,7
@@
class Datacenter(object):
def start(self):
pass
def start(self):
pass
- def startCompute(self, name, image=None, command=None, network=None, flavor_name="tiny", **
kwarg
s):
+ def startCompute(self, name, image=None, command=None, network=None, flavor_name="tiny", **
param
s):
"""
Create a new container as compute resource and connect it to this
data center.
"""
Create a new container as compute resource and connect it to this
data center.
@@
-175,13
+175,10
@@
class Datacenter(object):
network.append({})
# apply hard-set resource limits=0
network.append({})
# apply hard-set resource limits=0
- cpu_percentage =
kwarg
s.get('cpu_percent')
+ cpu_percentage =
param
s.get('cpu_percent')
if cpu_percentage:
if cpu_percentage:
- cpu_period = self.net.cpu_period
- cpu_quota = self.net.cpu_period * float(cpu_percentage)
- else:
- cpu_quota = None
- cpu_period = None
+ params['cpu_period'] = self.net.cpu_period
+ params['cpu_quota'] = self.net.cpu_period * float(cpu_percentage)
# create the container
d = self.net.addDocker(
# create the container
d = self.net.addDocker(
@@
-190,9
+187,8
@@
class Datacenter(object):
dcmd=command,
datacenter=self,
flavor_name=flavor_name,
dcmd=command,
datacenter=self,
flavor_name=flavor_name,
- cpu_period = cpu_period,
- cpu_quota = cpu_quota,
- environment = {'VNF_NAME':name}
+ environment = {'VNF_NAME':name},
+ **params
)
)