X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Femuvim%2Fdcemulator%2Fnode.py;h=3258a9f2143b606a97424d23dba93837f4b1ed2c;hb=461941c38b3981b78fa9238bc5b4282b08c7bac3;hp=d533f9746c1ff3898de4e7b14845e2a2a3ea3976;hpb=edcbeeba7236e852e1ff5b02c3704e0749dd3be3;p=osm%2Fvim-emu.git diff --git a/src/emuvim/dcemulator/node.py b/src/emuvim/dcemulator/node.py index d533f97..3258a9f 100755 --- 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) - 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): @@ -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))) + # 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])