projects
/
osm
/
vim-emu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #131 from stevenvanrossem/master
[osm/vim-emu.git]
/
src
/
emuvim
/
dcemulator
/
node.py
diff --git
a/src/emuvim/dcemulator/node.py
b/src/emuvim/dcemulator/node.py
index
09dca9c
..
f9328e3
100755
(executable)
--- a/
src/emuvim/dcemulator/node.py
+++ b/
src/emuvim/dcemulator/node.py
@@
-19,7
+19,7
@@
DCDPID_BASE = 1000 # start of switch dpid's used for data center switches
class EmulatorCompute(Docker):
"""
Emulator specific compute node class.
class EmulatorCompute(Docker):
"""
Emulator specific compute node class.
- Inherits from
Dock
ernet's Docker host class.
+ Inherits from
Contain
ernet's Docker host class.
Represents a single container connected to a (logical)
data center.
We can add emulator specific helper functions to it.
Represents a single container connected to a (logical)
data center.
We can add emulator specific helper functions to it.
@@
-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):
@@
-168,8
+168,7
@@
class Datacenter(object):
# if no --net option is given, network = [{}], so 1 empty dict in the list
# this results in 1 default interface with a default ip address
for nw in network:
# if no --net option is given, network = [{}], so 1 empty dict in the list
# 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)
- logging.info('nw: {0}'.format(nw))
+ # TODO we cannot use TCLink here (see: https://github.com/mpeuster/containernet/issues/3)
self.net.addLink(d, self.switch, params1=nw, cls=Link, intfName1=nw.get('id'))
# do bookkeeping
self.containers[name] = d
self.net.addLink(d, self.switch, params1=nw, cls=Link, intfName1=nw.get('id'))
# do bookkeeping
self.containers[name] = d
@@
-184,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])