X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fnepi%2Fresources%2Fns3%2Fns3queue.py;h=1341e965d04b5a492d8754191cedb9cc8c6f22d1;hb=6285ca51026efb69642eea9dfc7c480e722d84a9;hp=d7ec2b7c01f0df8fb564fc052e50a03aab73388f;hpb=1e2eb157cb569e9c28a5b7888ed97076d27414cb;p=nepi.git diff --git a/src/nepi/resources/ns3/ns3queue.py b/src/nepi/resources/ns3/ns3queue.py index d7ec2b7c..1341e965 100644 --- a/src/nepi/resources/ns3/ns3queue.py +++ b/src/nepi/resources/ns3/ns3queue.py @@ -3,9 +3,8 @@ # Copyright (C) 2014 INRIA # # This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation; # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -32,7 +31,7 @@ class NS3BaseQueue(NS3Base): if not devices: msg = "Queue not connected to device" self.error(msg, out, err) - raise RuntimeError, msg + raise RuntimeError(msg) return devices[0] @@ -51,4 +50,5 @@ class NS3BaseQueue(NS3Base): if device.uuid not in self.connected: self.simulation.invoke(device.uuid, "SetQueue", self.uuid) self._connected.add(device.uuid) + device._connected.add(self.uuid)