projects
/
osm
/
vim-emu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
set chaining via VLANs
[osm/vim-emu.git]
/
src
/
emuvim
/
dcemulator
/
node.py
diff --git
a/src/emuvim/dcemulator/node.py
b/src/emuvim/dcemulator/node.py
index
41da627
..
3258a9f
100755
(executable)
--- a/
src/emuvim/dcemulator/node.py
+++ b/
src/emuvim/dcemulator/node.py
@@
-39,7
+39,7
@@
class EmulatorCompute(Docker):
this compute instance is connected to.
"""
# format list of tuples (name, Ip, MAC, isUp, status)
this compute instance is connected to.
"""
# format list of tuples (name, Ip, MAC, isUp, status)
- return [
(str(i), i.IP(), i.MAC(), i.isUp(), i.status())
+ return [
{'intf_name':str(i), 'ip':i.IP(), 'mac':i.MAC(), 'up':i.isUp(), 'status':i.status()}
for i in self.intfList()]
def getStatus(self):
for i in self.intfList()]
def getStatus(self):
@@
-169,7
+169,7
@@
class Datacenter(object):
# this results in 1 default interface with a default ip address
for nw in network:
# TODO we cannot use TCLink here (see: https://github.com/mpeuster/dockernet/issues/3)
# this results in 1 default interface with a default ip address
for nw in network:
# TODO we cannot use TCLink here (see: https://github.com/mpeuster/dockernet/issues/3)
- self.net.addLink(d, self.switch, params1=nw, cls=Link)
+ self.net.addLink(d, self.switch, params1=nw, cls=Link
, intfName1=nw.get('id')
)
# do bookkeeping
self.containers[name] = d
return d # we might use UUIDs for naming later on
# do bookkeeping
self.containers[name] = d
return d # we might use UUIDs for naming later on
@@
-183,6
+183,10
@@
class Datacenter(object):
raise Exception("Container with name %s not found." % name)
LOG.debug("Stopping compute instance %r in data center %r" % (name, str(self)))
raise Exception("Container with name %s not found." % name)
LOG.debug("Stopping compute instance %r in data center %r" % (name, str(self)))
+ # stop the monitored metrics
+ if self.net.monitor_agent is not None:
+ self.net.monitor_agent.stop_metric(name)
+
# call resource model and free resources
if self._resource_model is not None:
self._resource_model.free(self.containers[name])
# call resource model and free resources
if self._resource_model is not None:
self._resource_model.free(self.containers[name])