X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fnepi%2Fresources%2Flinux%2Fns3%2Fccn%2Fns3ccndceapplication.py;h=efb5f96722f1115735297a7d25b1e75f9b018799;hb=d50ba1a08e541ded7a8b322493ebb1d0cc59c6ff;hp=f7b10a48a31c5f36ccadd56f3435457b9d968471;hpb=2636d5f8aedcc2935e37efbdc2276ec358dec3b7;p=nepi.git diff --git a/src/nepi/resources/linux/ns3/ccn/ns3ccndceapplication.py b/src/nepi/resources/linux/ns3/ccn/ns3ccndceapplication.py index f7b10a48..efb5f967 100644 --- 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 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