Fix: hackfest_1 deployment using OSM LB returned

[osm/vim-emu.git] / src / emuvim / api / openstack / compute.py

diff --git a/src/emuvim/api/openstack/compute.py b/src/emuvim/api/openstack/compute.py
index 175145d..b812953 100755 (executable)
--- a/src/emuvim/api/openstack/compute.py
+++ b/src/emuvim/api/openstack/compute.py
@@ -34,6 +34,7 @@ import threading
 import uuid
 import time
 import ip_handler as IP
+import hashlib
 
 
 LOG = logging.getLogger("api.openstack.compute")
@@ -561,25 +562,12 @@ class OpenstackCompute(object):
         Docker does not like too long instance names.
         This function provides a shorter name if needed
         """
-        # fix for NetSoft'17 demo
-        # TODO remove this after the demo
-        #if "http" in name or "apache" in name:
-        #    return "http"
-        #elif "l4fw" in name or "socat" in name:
-        #    return "l4fw"
-        #elif "proxy" in name or "squid" in name:
-        #    return "proxy"
-        # 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.strip("-_ .")
-         #   name = name.replace("_vnf", "")
-         #   p = name.split("_")
-         #   if len(p) > 0:
-         #       name = p[len(p)-1]
-            name = name[-char_limit:].strip("-_ .")
-            LOG.info("Short server name: {}".format(name))
+            h = hashlib.sha224(name).hexdigest()
+            h = h[0:char_limit]
+            LOG.info("Short server name: {}".format(h))
         return name
 
 
@@ -597,12 +585,10 @@ class OpenstackCompute(object):
         if server is None:
             return False
         name_parts = server.name.split('_')
-        if len(name_parts) < 3:
-            return False
-
-        for stack in self.stacks.values():
-            if stack.stack_name == name_parts[1]:
-                stack.servers.pop(server.id, None)
+        if len(name_parts) > 1:
+            for stack in self.stacks.values():
+                if stack.stack_name == name_parts[1]:
+                    stack.servers.pop(server.id, None)
         if self.computeUnits.pop(server.id, None) is None:
             return False
         return True
@@ -621,7 +607,10 @@ class OpenstackCompute(object):
         for net in self.nets.values():
             if net.name == name_or_id:
                 return net
-
+        LOG.warning("Could not find net '{}' in {} or {}"
+                    .format(name_or_id,
+                            self.nets.keys(),
+                            [n.name for n in self.nets.values()]))
         return None
 
     def create_network(self, name, stack_operation=False):