still making both branches closer

[nepi.git] / src / nepi / resources / linux / ns3 / ccn / ns3ccnrdceapplication.py

diff --git a/src/nepi/resources/linux/ns3/ccn/ns3ccnrdceapplication.py b/src/nepi/resources/linux/ns3/ccn/ns3ccnrdceapplication.py
index a9a548d..248edbd 100644 (file)
--- a/src/nepi/resources/linux/ns3/ccn/ns3ccnrdceapplication.py
+++ b/src/nepi/resources/linux/ns3/ccn/ns3ccnrdceapplication.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
@@ -18,12 +17,12 @@
 # Author: Alina Quereilhac <alina.quereilhac@inria.fr>
 
 from nepi.execution.attribute import Attribute, Flags, Types
-from nepi.execution.resource import clsinit_copy, ResourceState, reschedule_delay
+from nepi.execution.resource import clsinit_copy, ResourceState 
 from nepi.resources.linux.ns3.ccn.ns3ccndceapplication import LinuxNS3CCNDceApplication
 
 @clsinit_copy
 class LinuxNS3DceCCNR(LinuxNS3CCNDceApplication):
-    _rtype = "ns3::LinuxDceCCNR"
+    _rtype = "linux::ns3::dce::CCNR"
 
     @classmethod
     def _register_attributes(cls):
@@ -222,8 +221,7 @@ class LinuxNS3DceCCNR(LinuxNS3CCNDceApplication):
             "ccnsSyncScope": "CCNS_SYNC_SCOPE",
             })
 
-        env = ";".join(map(lambda k: "%s=%s" % (envs.get(k), str(self.get(k))), 
-            [k for k in envs.keys() if self.get(k)]))
+        env = ";".join(["%s=%s" % (envs.get(k), str(self.get(k))) for k in [k for k in list(envs.keys()) if self.get(k)]])
 
         return env