X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Femuvim%2Fapi%2Fsonata%2Fdummygatekeeper.py;h=ff217f075bf283aaeb82cdae582676aa16785cbc;hb=0bb3d47c04f09934885a06f987ff4f520ed5daac;hp=4e98c6ac82f1ecfc263fa29d3184c41d0dd83667;hpb=1816508dbd9beb79e81fcc0bedb60ef7de2a151e;p=osm%2Fvim-emu.git diff --git a/src/emuvim/api/sonata/dummygatekeeper.py b/src/emuvim/api/sonata/dummygatekeeper.py index 4e98c6a..ff217f0 100755 --- a/src/emuvim/api/sonata/dummygatekeeper.py +++ b/src/emuvim/api/sonata/dummygatekeeper.py @@ -85,8 +85,8 @@ def generate_subnets(prefix, base, subnet_size=50, mask=24): return r # private subnet definitions for the generated interfaces # 10.10.xxx.0/24 -SAP_SUBNETS = generate_subnets('10.10', 0, subnet_size=50, mask=24) -# 10.20.xxx.0/24 +SAP_SUBNETS = generate_subnets('10.10', 0, subnet_size=50, mask=30) +# 10.20.xxx.0/30 ELAN_SUBNETS = generate_subnets('10.20', 0, subnet_size=50, mask=24) # 10.30.xxx.0/30 ELINE_SUBNETS = generate_subnets('10.30', 0, subnet_size=50, mask=30) @@ -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"]) @@ -513,7 +534,7 @@ class Service(object): elif sap["type"] == "external": target_dc = sap.get("dc") # add interface to dc switch - target_dc.attachExternalSAP(sap['name'], str(sap['net'])) + target_dc.attachExternalSAP(sap['name'], sap['net']) def _connect_elines(self, eline_fwd_links, instance_uuid): """ @@ -542,26 +563,28 @@ class Service(object): elif src_sap_id in self.saps_ext: src_id = src_sap_id - src_if_name = src_sap_id + # set intf name to None so the chaining function will choose the first one + src_if_name = None src_name = self.vnf_id2vnf_name[src_id] dst_name = self.vnf_id2vnf_name[dst_id] dst_vnfi = self._get_vnf_instance(instance_uuid, dst_name) if dst_vnfi is not None: # choose first ip address in sap subnet sap_net = self.saps[src_sap_id]['net'] - sap_ip = "{0}/{1}".format(str(sap_net[1]), sap_net.prefixlen) + sap_ip = "{0}/{1}".format(str(sap_net[2]), sap_net.prefixlen) self._vnf_reconfigure_network(dst_vnfi, dst_if_name, sap_ip) setChaining = True elif dst_sap_id in self.saps_ext: dst_id = dst_sap_id - dst_if_name = dst_sap_id + # set intf name to None so the chaining function will choose the first one + dst_if_name = None src_name = self.vnf_id2vnf_name[src_id] dst_name = self.vnf_id2vnf_name[dst_id] src_vnfi = self._get_vnf_instance(instance_uuid, src_name) if src_vnfi is not None: sap_net = self.saps[dst_sap_id]['net'] - sap_ip = "{0}/{1}".format(str(sap_net[1]), sap_net.prefixlen) + sap_ip = "{0}/{1}".format(str(sap_net[2]), sap_net.prefixlen) self._vnf_reconfigure_network(src_vnfi, src_if_name, sap_ip) setChaining = True @@ -938,7 +961,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") @@ -1012,10 +1035,6 @@ api.add_resource(Instantiations, '/instantiations', '/api/v2/instantiations', '/ api.add_resource(Exit, '/emulator/exit') -#def initialize_GK(): -# global GK -# GK = Gatekeeper() - def start_rest_api(host, port, datacenters=dict()): GK.dcs = datacenters