X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Femuvim%2Fdcemulator%2Fnode.py;h=2a211d7f7a532b102496a790b9cd1cfd798c984e;hb=refs%2Fheads%2Fv6.0;hp=5a9c048bdc3fe8d465912b02af68fa76c3cd9403;hpb=72f09885db3935e77901c3dee132cb176b927c7b;p=osm%2Fvim-emu.git diff --git a/src/emuvim/dcemulator/node.py b/src/emuvim/dcemulator/node.py index 5a9c048..2a211d7 100755 --- a/src/emuvim/dcemulator/node.py +++ b/src/emuvim/dcemulator/node.py @@ -231,6 +231,7 @@ class Datacenter(object): :return: """ assert name is not None + default_net = {"id": "emu0"} # no duplications if name in [c.name for c in self.net.getAllContainers()]: raise Exception("Container with name %s already exists." % name) @@ -238,13 +239,17 @@ class Datacenter(object): if image is None: image = "ubuntu:trusty" if network is None: - network = {} # {"ip": "10.0.0.254/8"} + network = {} if isinstance(network, dict): + if len(network) < 1: + # create at least one default interface + network = default_net # if we have only one network, put it in a list network = [network] if isinstance(network, list): if len(network) < 1: - network.append({}) + # create at least one default interface + network.append(default_net) # apply hard-set resource limits=0 cpu_percentage = params.get('cpu_percent') @@ -256,7 +261,7 @@ class Datacenter(object): properties['VNF_NAME'] = name # create the container d = self.net.addDocker( - "%s" % (name), + str(name), dimage=image, dcmd=command, datacenter=self, @@ -293,7 +298,6 @@ class Datacenter(object): cls=Link, intfName1=nw.get('id')) # do bookkeeping self.containers[name] = d - return d # we might use UUIDs for naming later on def stopCompute(self, name):