From 7569b03095ba68710e4ef1939c5c335d690058e8 Mon Sep 17 00:00:00 2001 From: peusterm Date: Tue, 27 Jun 2017 12:44:13 +0200 Subject: [PATCH] Fix: Workarround for too long interface names --- src/emuvim/api/openstack/compute.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/emuvim/api/openstack/compute.py b/src/emuvim/api/openstack/compute.py index 59d63bb..d632de3 100755 --- a/src/emuvim/api/openstack/compute.py +++ b/src/emuvim/api/openstack/compute.py @@ -414,7 +414,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) server.emulator_compute = c @@ -518,15 +520,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. -- 2.17.1