From 581d36dfcf288a316926113575511361ce6edc0f Mon Sep 17 00:00:00 2001 From: Ashmita89 Date: Thu, 8 Oct 2015 12:27:56 -0400 Subject: [PATCH 1/3] Update seash_helper.py #fix for solving issue Remove duplicate StartVessel code from seash_helper. #94 in seash repository in Seattle Testbed. --- seash_helper.py | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/seash_helper.py b/seash_helper.py index 00d7f4b..602d719 100644 --- a/seash_helper.py +++ b/seash_helper.py @@ -615,22 +615,14 @@ def run_target(longname, filename, filedata, argstring, prog_platform): try: nmclient.nmclient_signedsay(seash_global_variables.vesselinfo[longname]['handle'], "AddFileToVessel", vesselname, filename, filedata) - # Backwards compatibility with old nodemanagers that don't support - # StartVesselEX - if prog_platform == "repyV1": - nmclient.nmclient_signedsay( - seash_global_variables.vesselinfo[longname]['handle'], - "StartVessel", vesselname, argstring) - else: - nmclient.nmclient_signedsay( - seash_global_variables.vesselinfo[longname]['handle'], - "StartVesselEx", vesselname, prog_platform, argstring) - - except nmclient.NMClientException, e: - return (False, str(e)) + (str_out,str_e)=seash_helper.start_target(longname, argstring, prog_platform) + if str(str_out)== "False" : + return(False,str(str_e)) + except nmclient.NMClientException,e: + return (False, str(e)) else: - return (True,) + return (True,) From 072d21678b2a651ea31ed5a59a45eaa07b8cc3c7 Mon Sep 17 00:00:00 2001 From: Ashmita89 Date: Mon, 12 Oct 2015 14:27:56 -0400 Subject: [PATCH 2/3] Update seash_helper.py Changes done based on comments from @aaaaalbert to match Seattle Code style guidelines --- seash_helper.py | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/seash_helper.py b/seash_helper.py index 602d719..c008f50 100644 --- a/seash_helper.py +++ b/seash_helper.py @@ -608,23 +608,20 @@ def reset_target(longname): - def run_target(longname, filename, filedata, argstring, prog_platform): - + vesselname = seash_global_variables.vesselinfo[longname]['vesselname'] - try: nmclient.nmclient_signedsay(seash_global_variables.vesselinfo[longname]['handle'], "AddFileToVessel", vesselname, filename, filedata) - (str_out,str_e)=seash_helper.start_target(longname, argstring, prog_platform) - if str(str_out)== "False" : - return(False,str(str_e)) + (status,str_e)=start_target(longname, argstring, prog_platform) + if status is False : + return(False,str(str_e)) + except nmclient.NMClientException,e: - return (False, str(e)) - + return (False, str(e)) + else: - return (True,) - - + return (True,) # didn't test... def split_target(longname, resourcedata): From c2fc2420371b888297cbd09e706618bd324ee9b3 Mon Sep 17 00:00:00 2001 From: Ashmita89 Date: Sun, 1 Nov 2015 23:30:39 -0500 Subject: [PATCH 3/3] Update seash_helper.py Code formatting --- seash_helper.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/seash_helper.py b/seash_helper.py index c008f50..19e47da 100644 --- a/seash_helper.py +++ b/seash_helper.py @@ -611,11 +611,12 @@ def reset_target(longname): def run_target(longname, filename, filedata, argstring, prog_platform): vesselname = seash_global_variables.vesselinfo[longname]['vesselname'] + try: nmclient.nmclient_signedsay(seash_global_variables.vesselinfo[longname]['handle'], "AddFileToVessel", vesselname, filename, filedata) - (status,str_e)=start_target(longname, argstring, prog_platform) - if status is False : - return(False,str(str_e)) + (status,str_e) = start_target(longname, argstring, prog_platform) + if status is False: + return(False, str(str_e)) except nmclient.NMClientException,e: return (False, str(e))