X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fnepi%2Fresources%2Flinux%2Fns3%2Fccn%2Fns3ccnddceapplication.py;h=445f774d8f3b2eba2f5f9e9a72eb5127306ca1e7;hb=58a2b493f8df1072a1faa653c8abb6a3f9ba21fa;hp=a42bb5d9d7b5a8c6e5b4b72d480b8ef65ac92fad;hpb=ac866efb762875550bdc0c05d693e5eb026f435e;p=nepi.git

diff --git a/src/nepi/resources/linux/ns3/ccn/ns3ccnddceapplication.py b/src/nepi/resources/linux/ns3/ccn/ns3ccnddceapplication.py
index a42bb5d9..445f774d 100644
--- 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