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

[nepi.git] / src / nepi / resources / netns / netnsbase.py

diff --git a/src/nepi/resources/netns/netnsbase.py b/src/nepi/resources/netns/netnsbase.py
index 8dddc75..3fee62e 100644 (file)
--- a/src/nepi/resources/netns/netnsbase.py
+++ b/src/nepi/resources/netns/netnsbase.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
@@ -58,7 +57,7 @@ class NetNSBase(ResourceManager):
         objects to be deployed before proceeding with the deployment
 
         """
-        raise RuntimeError, "No dependencies defined!"
+        raise RuntimeError("No dependencies defined!")
 
     def _instantiate_object(self):
         pass
@@ -94,17 +93,17 @@ class NetNSBase(ResourceManager):
 
     def do_start(self):
         if self.state == ResourceState.READY:
-            # No need to do anything, simulation.Run() will start every object
+            # No need to do anything, emulation.Run() will start every object
             self.info("Starting")
             self.set_started()
         else:
             msg = " Failed "
             self.error(msg, out, err)
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
 
     def do_stop(self):
         if self.state == ResourceState.STARTED:
-            # No need to do anything, simulation.Destroy() will stop every object
+            # No need to do anything, emulation.Destroy() will stop every object
             self.set_stopped()
     
     @property
@@ -114,30 +113,27 @@ class NetNSBase(ResourceManager):
     def get(self, name):
         #flags = Flags.NoWrite | Flags.NoRead | Flags.Design
         flags = Flags.Design
-        if self.state in [ResourceState.READY, ResourceState.STARTED] \
+        if self._state in [ResourceState.READY, ResourceState.STARTED] \
                 and not self.has_flag(name, flags):
             return self.emulation.emu_get(self.uuid, name)
         
         value = super(NetNSBase, self).get(name)
-        if name != "critical":
-            print name, value, "lalal"
         return value
 
     def set(self, name, value):
-        #flags = Flags.NoWrite | Flags.NoRead | Flags.Design
         flags = Flags.Design
-        if self.has_flag(name, flags):
+        if (self._state > ResourceState.NEW and \
+                self.has_flag(name, Flags.Design)) or \
+                self.has_flag(name, Flags.NoWrite):
             out = err = ""
             msg = " Cannot change Design only attribue %s" % name
             self.error(msg, out, err)
             return 
 
-        if self.state in [ResourceState.READY, ResourceState.STARTED]:
+        if self._state in [ResourceState.READY, ResourceState.STARTED]:
             self.emulation.emu_set(self.uuid, name, value)
         
         value = super(NetNSBase, self).set(name, value)
-        if name != "critical":
-            print name, value, "IEEEEEEEE:"
 
         return value