Skip to content
Snippets Groups Projects
Commit 649c84ce authored by Chris Hines's avatar Chris Hines
Browse files

add jobid as an parmeter to appinstance so we can differentiate two jobs on the same node

parent f83420e7
No related branches found
No related tags found
2 merge requests!11Dev,!9Dev
Pipeline #7402 passed
...@@ -389,10 +389,10 @@ class AppUrl(Resource): ...@@ -389,10 +389,10 @@ class AppUrl(Resource):
return url return url
class AppInstance(Resource): class AppInstance(Resource):
def get(self, username, loginhost, batchhost): def get(self, username, loginhost, batchhost, jobid):
"""Run a command to get things like password and port number """Run a command to get things like password and port number
command is passed as a query string""" command is passed as a query string"""
sshsess = SSHSession.get_sshsession() sshsess = SSHSession.get_sshsession().format(jobid=jobid)
paramscmd = request.args.get('cmd') paramscmd = request.args.get('cmd')
import logging import logging
logger = logging.getLogger() logger = logging.getLogger()
...@@ -484,7 +484,7 @@ api.add_resource(JobStat, '/stat') ...@@ -484,7 +484,7 @@ api.add_resource(JobStat, '/stat')
api.add_resource(JobCancel, '/cancel/<int:jobid>') api.add_resource(JobCancel, '/cancel/<int:jobid>')
api.add_resource(JobSubmit, '/submit') api.add_resource(JobSubmit, '/submit')
api.add_resource(CreateTunnel, '/createtunnel/<string:username>/<string:loginhost>/<string:batchhost>') api.add_resource(CreateTunnel, '/createtunnel/<string:username>/<string:loginhost>/<string:batchhost>')
api.add_resource(AppInstance, '/appinstance/<string:username>/<string:loginhost>/<string:batchhost>') api.add_resource(AppInstance, '/appinstance/<string:username>/<string:loginhost>/<string:batchhost>/<int:jobid>')
api.add_resource(AppUrl, '/appurl') api.add_resource(AppUrl, '/appurl')
api.add_resource(SSHAgent,'/sshagent') api.add_resource(SSHAgent,'/sshagent')
api.add_resource(DirList,'/ls') api.add_resource(DirList,'/ls')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment