X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fvim-emu.git;a=blobdiff_plain;f=src%2Femuvim%2Fapi%2Fsonata%2Fdummygatekeeper.py;h=59960a98f56a6ad76ae5f6c80697a8dea5466ba3;hp=76ed3c20ef9f63f50a943a32ca55a6661c45c179;hb=c911ca6a6560d062fed5d294bc5a80c26da69672;hpb=5b876700bdef500e17c212f5b0bcea5383e44528 diff --git a/src/emuvim/api/sonata/dummygatekeeper.py b/src/emuvim/api/sonata/dummygatekeeper.py index 76ed3c2..59960a9 100755 --- a/src/emuvim/api/sonata/dummygatekeeper.py +++ b/src/emuvim/api/sonata/dummygatekeeper.py @@ -315,7 +315,19 @@ class Service(object): intfs.remove(found_interfaces[0]) mgmt_intf_names.append(vnf_interface) - # 4. do the dc.startCompute(name="foobar") call to run the container + # 4. generate the volume paths for the docker container + volumes=list() + # a volume to extract log files + docker_log_path = "/tmp/results/%s/%s"%(self.uuid,vnf_name) + LOG.debug("LOG path for vnf %s is %s."%(vnf_name,docker_log_path)) + if not os.path.exists(docker_log_path): + LOG.debug("Creating folder %s"%docker_log_path) + os.makedirs(docker_log_path) + + volumes.append(docker_log_path+":/mnt/share/") + + + # 5. do the dc.startCompute(name="foobar") call to run the container # TODO consider flavors, and other annotations # TODO: get all vnf id's from the nsd for this vnfd and use those as dockername # use the vnf_id in the nsd as docker name @@ -325,8 +337,16 @@ class Service(object): LOG.info("Starting %r as %r in DC %r" % (vnf_name, self.vnf_name2docker_name[vnf_name], vnfd.get("dc"))) LOG.debug("Interfaces for %r: %r" % (vnf_name, intfs)) - vnfi = target_dc.startCompute(self.vnf_name2docker_name[vnf_name], network=intfs, image=docker_name, flavor_name="small", - cpu_quota=cpu_quota, cpu_period=cpu_period, cpuset=cpu_list, mem_limit=mem_lim) + vnfi = target_dc.startCompute( + self.vnf_name2docker_name[vnf_name], + network=intfs, + image=docker_name, + flavor_name="small", + cpu_quota=cpu_quota, + cpu_period=cpu_period, + cpuset=cpu_list, + mem_limit=mem_lim, + volumes=volumes) # rename the docker0 interfaces (eth0) to the management port name defined in the VNFD if USE_DOCKER_MGMT: @@ -344,6 +364,7 @@ class Service(object): # Find the correct datacenter status = vnfi.getStatus() dc = vnfi.datacenter + # stop the vnfi LOG.info("Stopping the vnf instance contained in %r in DC %r" % (status["name"], dc)) dc.stopCompute(status["name"]) @@ -938,7 +959,7 @@ class Instantiations(fr.Resource): Will return a new UUID to identify the running service instance. :return: UUID """ - LOG.info("POST /instantiations (or /reqeusts) called") + LOG.info("POST /instantiations (or /requests) called") # try to extract the service uuid from the request json_data = request.get_json(force=True) service_uuid = json_data.get("service_uuid")