projects
/
osm
/
vim-emu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Missing interfaces for son-monitor are forced to be created early in the code
[osm/vim-emu.git]
/
src
/
emuvim
/
api
/
openstack
/
compute.py
diff --git
a/src/emuvim/api/openstack/compute.py
b/src/emuvim/api/openstack/compute.py
index
d632de3
..
2f06491
100755
(executable)
--- a/
src/emuvim/api/openstack/compute.py
+++ b/
src/emuvim/api/openstack/compute.py
@@
-405,6
+405,7
@@
class OpenstackCompute(object):
"""
LOG.debug("Starting new compute resources %s" % server.name)
network = list()
"""
LOG.debug("Starting new compute resources %s" % server.name)
network = list()
+ network_dict = dict()
for port_name in server.port_names:
network_dict = dict()
for port_name in server.port_names:
network_dict = dict()
@@
-414,9
+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)
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
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)
server.emulator_compute = c
c = self.dc.startCompute(server.name, image=server.image, command=server.command,
network=network, flavor_name=server.flavor)
server.emulator_compute = c
@@
-520,10
+526,19
@@
class OpenstackCompute(object):
Docker does not like too long instance names.
This function provides a shorter name if needed
"""
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
# 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 = name.replace("_vnf", "")
p = name.split("_")
if len(p) > 0: