X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fnepi%2Fresources%2Flinux%2Fns3%2Fns3dceapplication.py;h=8d197b9a1f33154cbe3e275f29430048b9c92e60;hb=a7e76f2c5b9646f44e5cbf6c558ed08b5b73ce28;hp=ca32b6f97a68c89efec233cb71313a27c04d2087;hpb=998aa11be6a89197a3b30c0645771c467cad8c13;p=nepi.git diff --git a/src/nepi/resources/linux/ns3/ns3dceapplication.py b/src/nepi/resources/linux/ns3/ns3dceapplication.py index ca32b6f9..8d197b9a 100644 --- a/src/nepi/resources/linux/ns3/ns3dceapplication.py +++ b/src/nepi/resources/linux/ns3/ns3dceapplication.py @@ -45,34 +45,9 @@ class NS3LinuxDceApplication(NS3BaseDceApplication): "Space-separated list of packages required to run the application", flags = Flags.Design) - files = Attribute("files", - "Semi-colon separated list of 'key=value' pairs to set as " - "DCE files (AddFile). The key should be a path to a local file " - "and the key is the path to be set in DCE for that file" , - flags = Flags.Design) - - stdinfile = Attribute("stdinFile", - "File to set as StdinFile. The value shoudl be either an empty " - "or a path to a local file ", - flags = Flags.Design) - - starttime = Attribute("StartTime", - "Time at which the application will start", - default = "+0.0ns", - flags = Flags.Reserved | Flags.Construct) - - stoptime = Attribute("StopTime", - "Time at which the application will stop", - default = "+0.0ns", - flags = Flags.Reserved | Flags.Construct) - cls._register_attribute(sources) cls._register_attribute(build) cls._register_attribute(depends) - cls._register_attribute(files) - cls._register_attribute(stoptime) - cls._register_attribute(starttime) - cls._register_attribute(stdinfile) def _instantiate_object(self): command = [] @@ -91,29 +66,6 @@ class NS3LinuxDceApplication(NS3BaseDceApplication): if scmd: command.append(scmd) - # Upload files to the remote machine. These files will - # be added to the DceApplication by invoking dce.AddFile() - files = self.get("files") or "" - if files: - upfiles = [] - for files in map(str.strip, files.split(";")): - localpath, dcepath = env.split("=") - upfiles.append(localpath) - - if upfiles: - fcmd = self.siumlation.upload_files(files = upfiles) - if fcmd: - command.append(fcmd) - - # Upload files to the remote machine. These files will - # be added to the DceApplication by invoking dce.AddFile() - stdinfile = self.get("stdinFile") - if stdinfile and stdinfile != "": - stdincmd = self.siumlation.upload_files(files = stdinfile) - if stdincmd: - command.append(stdincmd) - - # Upload instructions to build the binary build = self.get("build") if build: