From: peusterm <manuel.peuster@uni-paderborn.de>
Date: Tue, 27 Jun 2017 10:44:13 +0000 (+0200)
Subject: Fix: Workarround for too long interface names
X-Git-Tag: v3.1~17^2~10
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=6e354f1000b822884944ae474df28e0def77d8eb;p=osm%2Fvim-emu.git

Fix: Workarround for too long interface names
---

diff --git a/src/emuvim/api/openstack/compute.py b/src/emuvim/api/openstack/compute.py
index 089293d..6ec1d9f 100755
--- a/src/emuvim/api/openstack/compute.py
+++ b/src/emuvim/api/openstack/compute.py
@@ -419,7 +419,9 @@ class OpenstackCompute(object):
                 network_dict['ip'] = port.ip_address
                 network_dict[network_dict['id']] = self.find_network_by_name_or_id(port.net_name).name
                 network.append(network_dict)
+
         self.compute_nets[server.name] = network
+        LOG.debug(network)
         c = self.dc.startCompute(server.name, image=server.image, command=server.command,
                                  network=network, flavor_name=server.flavor,
                                  properties=server.properties)
@@ -524,15 +526,19 @@ class OpenstackCompute(object):
         Docker does not like too long instance names.
         This function provides a shorter name if needed
         """
-        # TODO this is a ugly hack and needs to be fixed
-        LOG.debug("Long server name: {}".format(name))
+        # this is a ugly fix, but we cannot do better for now (interface names are to long)
         if len(name) > char_limit:
+            LOG.info("Long server name: {}".format(name))
             # construct a short name
             name = name.replace("_vnf", "")
+            p = name.split("_")
+            if len(p) > 0:
+                name = p[len(p)-1]
             name = name[-char_limit:].strip("-_ .")
-        LOG.debug("Short server name: {}".format(name))
+            LOG.info("Short server name: {}".format(name))
         return name
 
+
     def delete_server(self, server):
         """
         Deletes the given server from the stack dictionary and the computeUnits dictionary.