still making both branches closer

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

diff --git a/src/nepi/resources/linux/ns3/ccn/ns3ccnddceapplication.py b/src/nepi/resources/linux/ns3/ccn/ns3ccnddceapplication.py
index a42bb5d..445f774 100644 (file)
--- a/src/nepi/resources/linux/ns3/ccn/ns3ccnddceapplication.py
+++ b/src/nepi/resources/linux/ns3/ccn/ns3ccnddceapplication.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
@@ -25,7 +24,7 @@ import os
 
 @clsinit_copy
 class LinuxNS3DceCCND(LinuxNS3CCNDceApplication):
-    _rtype = "ns3::LinuxDceCCND"
+    _rtype = "linux::ns3::dce::CCND"
 
     @classmethod
     def _register_attributes(cls):
@@ -198,8 +197,7 @@ class LinuxNS3DceCCND(LinuxNS3CCNDceApplication):
             "prefix" : "CCND_PREFIX",
             })
 
-        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