X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fvim-emu.git;a=blobdiff_plain;f=src%2Femuvim%2Fapi%2Fopenstack%2Fcompute.py;h=2f06491fa4553374452c6ca2738d809f6d8d5228;hp=9918c6d07f408ec9cb4908bb771fa74a4a09a56a;hb=2017339100851b360c815ff8b96666594815dbcb;hpb=00199782de7042b51927bbbac5540d6f671597bb diff --git a/src/emuvim/api/openstack/compute.py b/src/emuvim/api/openstack/compute.py old mode 100644 new mode 100755 index 9918c6d..2f06491 --- a/src/emuvim/api/openstack/compute.py +++ b/src/emuvim/api/openstack/compute.py @@ -8,6 +8,9 @@ import time import ip_handler as IP +LOG = logging.getLogger("api.openstack.compute") + + class HeatApiStackInvalidException(Exception): """ Exception thrown when a submitted stack is invalid. @@ -95,25 +98,25 @@ class OpenstackCompute(object): for server in stack.servers.values(): for port_name in server.port_names: if port_name not in stack.ports: - logging.warning("Server %s of stack %s has a port named %s that is not known." % + LOG.warning("Server %s of stack %s has a port named %s that is not known." % (server.name, stack.stack_name, port_name)) everything_ok = False if server.image is None: - logging.warning("Server %s holds no image." % (server.name)) + LOG.warning("Server %s holds no image." % (server.name)) everything_ok = False if server.command is None: - logging.warning("Server %s holds no command." % (server.name)) + LOG.warning("Server %s holds no command." % (server.name)) everything_ok = False for port in stack.ports.values(): if port.net_name not in stack.nets: - logging.warning("Port %s of stack %s has a network named %s that is not known." % + LOG.warning("Port %s of stack %s has a network named %s that is not known." % (port.name, stack.stack_name, port.net_name)) everything_ok = False if port.intf_name is None: - logging.warning("Port %s has no interface name." % (port.name)) + LOG.warning("Port %s has no interface name." % (port.name)) everything_ok = False if port.ip_address is None: - logging.warning("Port %s has no IP address." % (port.name)) + LOG.warning("Port %s has no IP address." % (port.name)) everything_ok = False for router in stack.routers.values(): for subnet_name in router.subnet_names: @@ -123,7 +126,7 @@ class OpenstackCompute(object): found = True break if not found: - logging.warning("Router %s of stack %s has a network named %s that is not known." % + LOG.warning("Router %s of stack %s has a network named %s that is not known." % (router.name, stack.stack_name, subnet_name)) everything_ok = False return everything_ok @@ -208,6 +211,7 @@ class OpenstackCompute(object): * *False*: else :rtype: ``bool`` """ + LOG.debug("updating stack {} with new_stack {}".format(old_stack_id, new_stack)) if old_stack_id not in self.stacks: return False old_stack = self.stacks[old_stack_id] @@ -399,8 +403,9 @@ class OpenstackCompute(object): :param server: Specifies the compute resource. :type server: :class:`heat.resources.server` """ - logging.debug("Starting new compute resources %s" % server.name) + LOG.debug("Starting new compute resources %s" % server.name) network = list() + network_dict = dict() for port_name in server.port_names: network_dict = dict() @@ -410,7 +415,14 @@ 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) + # default network dict + if len(network) < 1: + network_dict['id'] = server.name + "-eth0" + network_dict[network_dict['id']] = network_dict['id'] + network.append(network_dict) + self.compute_nets[server.name] = network + LOG.debug("Network dict: {}".format(network)) c = self.dc.startCompute(server.name, image=server.image, command=server.command, network=network, flavor_name=server.flavor) server.emulator_compute = c @@ -447,7 +459,7 @@ class OpenstackCompute(object): :param server: The server that should be removed :type server: ``heat.resources.server`` """ - logging.debug("Stopping container %s with full name %s" % (server.name, server.full_name)) + LOG.debug("Stopping container %s with full name %s" % (server.name, server.full_name)) link_names = list() for port_name in server.port_names: link_names.append(self.find_port_by_name_or_id(port_name).intf_name) @@ -476,9 +488,16 @@ class OpenstackCompute(object): if name_or_id in self.computeUnits: return self.computeUnits[name_or_id] + if self._shorten_server_name(name_or_id) in self.computeUnits: + return self.computeUnits[name_or_id] + for server in self.computeUnits.values(): if server.name == name_or_id or server.template_name == name_or_id or server.full_name == name_or_id: return server + if (server.name == self._shorten_server_name(name_or_id) + or server.template_name == self._shorten_server_name(name_or_id) + or server.full_name == self._shorten_server_name(name_or_id)): + return server return None def create_server(self, name, stack_operation=False): @@ -495,12 +514,40 @@ class OpenstackCompute(object): """ if self.find_server_by_name_or_id(name) is not None and not stack_operation: raise Exception("Server with name %s already exists." % name) - server = Server(name) + safe_name = self._shorten_server_name(name) + server = Server(safe_name) server.id = str(uuid.uuid4()) if not stack_operation: self.computeUnits[server.id] = server return server + def _shorten_server_name(self, name, char_limit=9): + """ + 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)) + return name + + def delete_server(self, server): """ Deletes the given server from the stack dictionary and the computeUnits dictionary. @@ -553,9 +600,9 @@ class OpenstackCompute(object): :type stack_operation: ``bool`` :return: :class:`heat.resources.net` """ - logging.debug("Creating network with name %s" % name) + LOG.debug("Creating network with name %s" % name) if self.find_network_by_name_or_id(name) is not None and not stack_operation: - logging.warning("Creating network with name %s failed, as it already exists" % name) + LOG.warning("Creating network with name %s failed, as it already exists" % name) raise Exception("Network with name %s already exists." % name) network = Net(name) network.id = str(uuid.uuid4()) @@ -593,9 +640,9 @@ class OpenstackCompute(object): """ port = self.find_port_by_name_or_id(name) if port is not None and not stack_operation: - logging.warning("Creating port with name %s failed, as it already exists" % name) + LOG.warning("Creating port with name %s failed, as it already exists" % name) raise Exception("Port with name %s already exists." % name) - logging.debug("Creating port with name %s" % name) + LOG.debug("Creating port with name %s" % name) port = Port(name) if not stack_operation: self.ports[port.id] = port @@ -677,8 +724,6 @@ class OpenstackCompute(object): del self.dc.switch.ports[link.intf2] del self.dc.switch.nameToIntf[link.intf2.name] self.dc.net.removeLink(link=link) - self.dc.net.DCNetwork_graph.remove_edge(server_name, self.dc.switch.name) - self.dc.net.DCNetwork_graph.remove_edge(self.dc.switch.name, server_name) for intf_key in self.dc.net[server_name].intfs.keys(): if self.dc.net[server_name].intfs[intf_key].link == link: self.dc.net[server_name].intfs[intf_key].delete()