projects
/
osm
/
vim-emu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Return actually reachable IP as part of the Floating IP API
[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
ce6f636
..
405fa6f
100755
(executable)
--- a/
src/emuvim/api/openstack/compute.py
+++ b/
src/emuvim/api/openstack/compute.py
@@
-96,8
+96,6
@@
class OpenstackCompute(object):
for image in self.dcli.images.list():
if len(image.tags) > 0:
for t in image.tags:
for image in self.dcli.images.list():
if len(image.tags) > 0:
for t in image.tags:
- # only use short tag names for OSM compatibility
- t = t.replace(":latest", "")
if t not in self._images:
self._images[t] = Image(t)
return self._images
if t not in self._images:
self._images[t] = Image(t)
return self._images
@@
-490,6
+488,7
@@
class OpenstackCompute(object):
intf.setMAC(port.mac_address)
else:
port.mac_address = intf.MAC()
intf.setMAC(port.mac_address)
else:
port.mac_address = intf.MAC()
+ port.assigned_container = c
# Start the real emulator command now as specified in the dockerfile
# ENV SON_EMU_CMD
# Start the real emulator command now as specified in the dockerfile
# ENV SON_EMU_CMD