From: stevenvanrossem <steven.vanrossem@intec.ugent.be>
Date: Wed, 3 May 2017 10:54:23 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: v3.1~30^2~13
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=3022636ba875aaf57b9404d0299f753e4b7b6f80;p=osm%2Fvim-emu.git

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/emuvim/api/sonata/dummygatekeeper.py
---

3022636ba875aaf57b9404d0299f753e4b7b6f80
diff --cc src/emuvim/api/sonata/dummygatekeeper.py
index 136ccc8,85aa5e8..5f6bd2c
--- a/src/emuvim/api/sonata/dummygatekeeper.py
+++ b/src/emuvim/api/sonata/dummygatekeeper.py
@@@ -149,7 -149,7 +149,6 @@@ class Service(object)
          self.local_docker_files = dict()
          self.remote_docker_image_urls = dict()
          self.instances = dict()
--        #self.vnf_name2docker_name = dict()
          # dict to find the vnf_name for any vnf id
          self.vnf_id2vnf_name = dict()
  
@@@ -400,8 -382,8 +381,6 @@@
          :return:
          """
          dn = vnf_id
--        #if vnf_id in self.vnf_name2docker_name:
--        #    dn = self.vnf_name2docker_name[name]
          for vnfi in self.instances[instance_uuid]["vnf_instances"]:
              if vnfi.name == dn:
                  return vnfi
@@@ -595,8 -584,8 +581,6 @@@
                  src_id = 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_id)
                  if dst_vnfi is not None:
                      # choose first ip address in sap subnet
@@@ -609,8 -598,8 +593,6 @@@
                  dst_id = 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_id)
                  if src_vnfi is not None:
                      sap_net = self.saps[dst_sap_id]['net']
@@@ -625,8 -614,8 +607,6 @@@
                      src_id = src_sap_id
                  if dst_sap_id in self.saps_int:
                      dst_id = dst_sap_id
--                #src_name = self.vnf_id2vnf_name[src_id]
--                #dst_name = self.vnf_id2vnf_name[dst_id]
                  # 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_id)
                  dst_vnfi = self._get_vnf_instance(instance_uuid, dst_id)
@@@ -692,7 -681,7 +672,6 @@@
                      src_docker_name = vnf_sap_id
                      vnf_id = vnf_sap_id
  
--                #vnf_name = self.vnf_id2vnf_name[vnf_id]
                  LOG.debug(
                      "Setting up E-LAN interface. %s(%s:%s) -> %s" % (
                          vnf_id, intf_name, ip_address))
@@@ -902,13 -886,13 +876,11 @@@ class RoundRobinDcPlacementWithSAPs(obj
  
              # check if there is a SAP in the link
              if src_sap_id in saps:
--                #dst_vnf_name = vnf_id2vnf_name[dst_id]
                  # get dc where connected vnf is mapped to
                  dc = vnfds[dst_id]['dc']
                  saps[src_sap_id]['dc'] = dc
  
              if dst_sap_id in saps:
--                #src_vnf_name = vnf_id2vnf_name[src_id]
                  # get dc where connected vnf is mapped to
                  dc = vnfds[src_id]['dc']
                  saps[dst_sap_id]['dc'] = dc