X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fnepi%2Fresources%2Fns3%2Fns3wifiremotestationmanager.py;h=94cfd2a2ccad033e8300644b543936150c2483da;hb=6285ca51026efb69642eea9dfc7c480e722d84a9;hp=a5f4548e0e7c0e8b3821cf6d018b64538ce42260;hpb=cdc84ca63a26fa2b56ee6f71d051decde6afc217;p=nepi.git

diff --git a/src/nepi/resources/ns3/ns3wifiremotestationmanager.py b/src/nepi/resources/ns3/ns3wifiremotestationmanager.py
index a5f4548e..94cfd2a2 100644
--- a/src/nepi/resources/ns3/ns3wifiremotestationmanager.py
+++ b/src/nepi/resources/ns3/ns3wifiremotestationmanager.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
@@ -31,13 +30,13 @@ class NS3BaseWifiRemoteStationManager(NS3Base):
 
     @property
     def device(self):
-        from nepi.resources.ns3.ns3device import NS3BaseNetDevice
-        devices = self.get_connected(NS3BaseNetDevice.get_rtype())
+        from nepi.resources.ns3.ns3wifinetdevice import NS3BaseWifiNetDevice
+        devices = self.get_connected(NS3BaseWifiNetDevice.get_rtype())
 
         if not devices: 
             msg = "WifiRemoteStationManager not connected to device"
             self.error(msg)
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
 
         return devices[0]
 
@@ -50,6 +49,6 @@ class NS3BaseWifiRemoteStationManager(NS3Base):
     def _connect_object(self):
         device = self.device
         if device.uuid not in self.connected:
-            self.simulator.invoke(device.uuid, "SetRemoteStationManager", self.uuid)
+            self.simulation.invoke(device.uuid, "SetRemoteStationManager", self.uuid)
             self._connected.add(device.uuid)