Changing ResourceManager naming for platform::ResourceName

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

diff --git a/src/nepi/resources/linux/ns3/ccn/ns3ccndceapplication.py b/src/nepi/resources/linux/ns3/ccn/ns3ccndceapplication.py
index f7b10a4..efb5f96 100644 (file)
--- a/src/nepi/resources/linux/ns3/ccn/ns3ccndceapplication.py
+++ b/src/nepi/resources/linux/ns3/ccn/ns3ccndceapplication.py
@@ -18,12 +18,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.ns3.ns3ccndceapplication import NS3BaseCCNDceApplication
 
 @clsinit_copy
 class LinuxNS3CCNDceApplication(NS3BaseCCNDceApplication):
-    _rtype = "ns3::LinuxCCNDceApplication"
+    _rtype = "linux::ns3::dce::CCNApplication"
 
     @classmethod
     def _register_attributes(cls):
@@ -101,15 +101,6 @@ class LinuxNS3CCNDceApplication(NS3BaseCCNDceApplication):
             if fcmd:
                 command.append(fcmd)
 
-        # Upload CCN files (e.g. repo)
-        stdin_file = self.get("stdinFile")
-        if stdin_file:
-            stdincmd = self.simulation.upload_extra_sources(sources = stdin_file, 
-                    src_dir = self.simulation.app_home)
-
-            if stdincmd:
-                command.append(stdincmd)
-
         if command:
             deploy_command = ";".join(command)
             prefix = "%d_deploy" % self.guid