projects
/
osm
/
vim-emu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Crashbug that was caused by an import of an
[osm/vim-emu.git]
/
src
/
emuvim
/
dcemulator
/
node.py
diff --git
a/src/emuvim/dcemulator/node.py
b/src/emuvim/dcemulator/node.py
index
18febb4
..
77a71a0
100755
(executable)
--- a/
src/emuvim/dcemulator/node.py
+++ b/
src/emuvim/dcemulator/node.py
@@
-14,7
+14,7
@@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
See the License for the specific language governing permissions and
limitations under the License.
-Neither the name of the SONATA-NFV
[, ANY ADDITIONAL AFFILIATION]
+Neither the name of the SONATA-NFV
, Paderborn University
nor the names of its contributors may be used to endorse or promote
products derived from this software without specific prior written
permission.
nor the names of its contributors may be used to endorse or promote
products derived from this software without specific prior written
permission.
@@
-208,7
+208,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", **params):
+ def startCompute(self, name, image=None, command=None, network=None, flavor_name="tiny",
properties=dict(),
**params):
"""
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.
@@
-217,6
+217,7
@@
class Datacenter(object):
:param command: command (string)
:param network: networks list({"ip": "10.0.0.254/8"}, {"ip": "11.0.0.254/24"})
:param flavor_name: name of the flavor for this compute container
:param command: command (string)
:param network: networks list({"ip": "10.0.0.254/8"}, {"ip": "11.0.0.254/24"})
:param flavor_name: name of the flavor for this compute container
+ :param properties: dictionary of properties (key-value) that will be passed as environment variables
:return:
"""
assert name is not None
:return:
"""
assert name is not None
@@
-240,6
+241,8
@@
class Datacenter(object):
params['cpu_period'] = self.net.cpu_period
params['cpu_quota'] = self.net.cpu_period * float(cpu_percentage)
params['cpu_period'] = self.net.cpu_period
params['cpu_quota'] = self.net.cpu_period * float(cpu_percentage)
+ env = properties
+ properties['VNF_NAME'] = name
# create the container
d = self.net.addDocker(
"%s" % (name),
# create the container
d = self.net.addDocker(
"%s" % (name),
@@
-247,7
+250,7
@@
class Datacenter(object):
dcmd=command,
datacenter=self,
flavor_name=flavor_name,
dcmd=command,
datacenter=self,
flavor_name=flavor_name,
- environment =
{'VNF_NAME':name}
,
+ environment =
env
,
**params
)
**params
)