X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fvim-emu.git;a=blobdiff_plain;f=src%2Femuvim%2Fapi%2Fopenstack%2Fcompute.py;h=88d951161c0a0c51a9c01a061f572844b228edf6;hp=39ce04df45ce8d17f1127e0f77f81bc035f6c42b;hb=832a0b8d97acd10b5a259d42db9e1bf56f1b4afd;hpb=22ca76fed5440b326786c4b1f708599f4f5b084f diff --git a/src/emuvim/api/openstack/compute.py b/src/emuvim/api/openstack/compute.py index 39ce04d..88d9511 100755 --- a/src/emuvim/api/openstack/compute.py +++ b/src/emuvim/api/openstack/compute.py @@ -410,6 +410,7 @@ class OpenstackCompute(object): """ LOG.debug("Starting new compute resources %s" % server.name) network = list() + network_dict = dict() for port_name in server.port_names: network_dict = dict() @@ -419,9 +420,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) + LOG.debug("Network dict: {}".format(network)) c = self.dc.startCompute(server.name, image=server.image, command=server.command, network=network, flavor_name=server.flavor, properties=server.properties) @@ -462,7 +468,9 @@ class OpenstackCompute(object): 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) + prt = self.find_port_by_name_or_id(port_name) + if prt is not None: + link_names.append(prt.intf_name) my_links = self.dc.net.links for link in my_links: if str(link.intf1) in link_names: @@ -675,7 +683,8 @@ class OpenstackCompute(object): """ port = self.find_port_by_name_or_id(name_or_id) if port is None: - raise Exception("Port with name or id %s does not exists." % name_or_id) + LOG.warning("Port with name or id %s does not exist. Can't delete it." % name_or_id) + return my_links = self.dc.net.links for link in my_links: