X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Femuvim%2Fapi%2Fopenstack%2Fcompute.py;h=9d77a441f4d664db396dc4c8001e5d5cf763290f;hb=f0120d71d73c4dc80084a3282074490e7ed4f934;hp=4d6517ec8dd62c679c8e0f4b054e41ce3c84a725;hpb=0e10819e9f46c6d00c2e54e544c8df4a2f1ce9a2;p=osm%2Fvim-emu.git

diff --git a/src/emuvim/api/openstack/compute.py b/src/emuvim/api/openstack/compute.py
index 4d6517e..9d77a44 100755
--- a/src/emuvim/api/openstack/compute.py
+++ b/src/emuvim/api/openstack/compute.py
@@ -491,18 +491,23 @@ class OpenstackCompute(object):
                         port.assigned_container = c
 
         # Start the real emulator command now as specified in the dockerfile
-        # ENV SON_EMU_CMD
         config = c.dcinfo.get("Config", dict())
         env = config.get("Env", list())
+        legacy_command_execution = False
         for env_var in env:
-            if "SON_EMU_CMD=" in env_var:
-                cmd = str(env_var.split("=")[1])
-                server.son_emu_command = cmd
+            var, cmd = map(str.strip, map(str, env_var.split('=', 1)))
+            if var == "SON_EMU_CMD" or var == "VIM_EMU_CMD":
+                LOG.info("Executing script in '{}': {}={}"
+                         .format(server.name, var, cmd))
                 # execute command in new thread to ensure that GK is not
                 # blocked by VNF
                 t = threading.Thread(target=c.cmdPrint, args=(cmd,))
                 t.daemon = True
                 t.start()
+                legacy_command_execution = True
+                break  # only execute one command
+        if not legacy_command_execution:
+            c.start()
 
     def stop_compute(self, server):
         """
@@ -586,11 +591,10 @@ class OpenstackCompute(object):
         This function provides a shorter name if needed
         """
         if len(name) > char_limit:
-            LOG.info("Long server name: {}".format(name))
             # construct a short name
             h = hashlib.sha224(name).hexdigest()
             h = h[0:char_limit]
-            LOG.info("Short server name: {}".format(h))
+            LOG.debug("Shortened server name '%s' to '%s'" % (name, h))
         return name
 
     def delete_server(self, server):