From: peusterm Date: Tue, 6 Sep 2016 09:07:16 +0000 (+0200) Subject: Fix: Lets keep the SAP naming scheme and just change the NSDs used for the demo.... X-Git-Tag: v3.1~59^2 X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fvim-emu.git;a=commitdiff_plain;h=76eb865d051eace78cd55ff56e5ef4caf6f8d93e Fix: Lets keep the SAP naming scheme and just change the NSDs used for the demo. Also added flag for non-bidirectional chaining. --- diff --git a/src/emuvim/api/sonata/dummygatekeeper.py b/src/emuvim/api/sonata/dummygatekeeper.py index c3d8802..294ffed 100755 --- a/src/emuvim/api/sonata/dummygatekeeper.py +++ b/src/emuvim/api/sonata/dummygatekeeper.py @@ -67,6 +67,9 @@ FORCE_PULL = False # Attention: This is not a configuration switch but a global variable! Don't change its default value. DEPLOY_SAP = False +# flag to indicate if we use bidirectional forwarding rules in the automatic chaining process +BIDIRECTIONAL_CHAIN = False + class Gatekeeper(object): def __init__(self): @@ -212,7 +215,7 @@ class Service(object): ret = network.setChain( src_docker_name, dst_docker_name, vnf_src_interface=src_if_name, vnf_dst_interface=dst_if_name, - bidirectional=True, cmd="add-flow", cookie=cookie, priority=10) + bidirectional=BIDIRECTIONAL_CHAIN, cmd="add-flow", cookie=cookie, priority=10) # re-configure the VNFs IP assignment and ensure that a new subnet is used for each E-Link src_vnfi = self._get_vnf_instance(instance_uuid, src_name) @@ -392,12 +395,10 @@ class Service(object): for sap in SAPs: # endpoints needed in this service sap_vnf_id, sap_vnf_interface = sap.split(':') - # Fix: lets fix the name of the SAP interface to "sap0" - sap_vnf_interface = "sap0" # set of the connection_point ids found in the nsd (in the examples this is 'ns') self.sap_identifiers.add(sap_vnf_id) - sap_docker_name = sap.replace(':', '_') + sap_docker_name = "%s_%s" % (sap_vnf_id, sap_vnf_interface) # add SAP to self.vnfds sapfile = pkg_resources.resource_filename(__name__, "sap_vnfd.yml")