Fix: Removed some very demo related hotfixes.
authorpeusterm <manuel.peuster@uni-paderborn.de>
Wed, 12 Jul 2017 14:44:33 +0000 (16:44 +0200)
committerpeusterm <manuel.peuster@uni-paderborn.de>
Wed, 12 Jul 2017 14:44:33 +0000 (16:44 +0200)
src/emuvim/api/openstack/compute.py

index 88d9511..8c334fb 100755 (executable)
@@ -536,21 +536,21 @@ class OpenstackCompute(object):
         """
         # fix for NetSoft'17 demo
         # TODO remove this after the demo
         """
         # 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"
+        #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
         # 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.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))
         return name
             name = name[-char_limit:].strip("-_ .")
             LOG.info("Short server name: {}".format(name))
         return name