X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fvim-emu.git;a=blobdiff_plain;f=src%2Femuvim%2Fapi%2Fopenstack%2Fcompute.py;h=42f006408a2d6edb0c22afa9ba5e0cfbe64493f5;hp=175145dbadc9bcbda6ab8550a300b3b022bdfdfc;hb=9219060385043e533bf719725f9e6671e98052ce;hpb=2aecf1dc375ebd54a611ecef32790a0083053fbe diff --git a/src/emuvim/api/openstack/compute.py b/src/emuvim/api/openstack/compute.py index 175145d..42f0064 100755 --- 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