applied the except and raise fixers to the master branch to close the gap with py3

[nepi.git] / src / nepi / resources / ns3 / ns3wifimac.py

diff --git a/src/nepi/resources/ns3/ns3wifimac.py b/src/nepi/resources/ns3/ns3wifimac.py
index 6cc4c16..7b48830 100644 (file)
--- a/src/nepi/resources/ns3/ns3wifimac.py
+++ b/src/nepi/resources/ns3/ns3wifimac.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
@@ -17,30 +16,64 @@
 #
 # Author: Alina Quereilhac <alina.quereilhac@inria.fr>
 
+from nepi.execution.attribute import Attribute, Flags, Types
 from nepi.execution.resource import clsinit_copy
 from nepi.resources.ns3.ns3base import NS3Base
+from nepi.resources.ns3.ns3wifinetdevice import WIFI_STANDARDS
 
 @clsinit_copy
 class NS3BaseWifiMac(NS3Base):
     _rtype = "abstract::ns3::WifiMac"
 
+    @classmethod
+    def _register_attributes(cls):
+        standard = Attribute("Standard", "Wireless standard",
+                default = "WIFI_PHY_STANDARD_80211a",
+                allowed = WIFI_STANDARDS.keys(),
+                type = Types.Enumerate,
+                flags = Flags.Design)
+
+        cls._register_attribute(standard)
+
+    @property
+    def node(self):
+        return self.device.node
+
     @property
     def device(self):
-        from nepi.resources.ns3.ns3device import NS3BaseNetDevice
-        devices = self.get_connected(NS3BaseNetDevice.get_rtype())
-        if devices: return devices[0]
-        return None
+        from nepi.resources.ns3.ns3wifinetdevice import NS3BaseWifiNetDevice
+        devices = self.get_connected(NS3BaseWifiNetDevice.get_rtype())
+
+        if not devices: 
+            msg = "WifiMac not connected to device"
+            self.error(msg)
+            raise RuntimeError(msg)
+
+        return devices[0]
 
     @property
-    def others_to_wait(self):
-        others = set()
-        device = self.device
-        if device: others.add(device)
-        return others
+    def _rms_to_wait(self):
+        rms = set()
+        rms.add(self.device)
+        return rms
 
     def _connect_object(self):
         device = self.device
-        if device and device.uuid not in self.connected:
-            self.simulator.invoke(device.uuid, "SetMac", self.uuid)
+        if device.uuid not in self.connected:
             self._connected.add(device.uuid)
 
+            self.simulation.invoke(device.uuid, "SetMac", self.uuid)
+
+            standard = self.get("Standard")
+            self.simulation.invoke(self.uuid, "ConfigureStandard", WIFI_STANDARDS[standard])
+
+            # Delayed configuration of MAC address
+            mac = device.get("mac")
+            if mac:
+                mac_uuid = self.simulation.create("Mac48Address", mac)
+            else:
+                mac_uuid = self.simulation.invoke("singleton::Mac48Address", "Allocate")
+
+            self.simulation.invoke(self.uuid, "SetAddress", mac_uuid)
+
+