Commit bc7455dc authored by Sonia Zorba's avatar Sonia Zorba
Browse files

Renamed jobID -> jobId for compatibility with Java client

parent 2c9e1987

README.txt

+3 −3
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ The output should be something like this: 
     }

     Response:

     {

        "jobID": "3ff92acedc9611eabf140242ac1f0007",

        "jobId": "3ff92acedc9611eabf140242ac1f0007",

        "phase": "PENDING",

        "quote": null,

        "startTime": null,
@@ -74,11 +74,11 @@ The output should be something like this: 
     client@a89c0bb962f7:~$ python vos_rest_client.py poll_job_queue 3ff92acedc9611eabf140242ac1f0007

     Sending poll request:

     {

        "jobID": "3ff92acedc9611eabf140242ac1f0007"

        "jobId": "3ff92acedc9611eabf140242ac1f0007"

     }

     Response:

     {

        "jobID": "3ff92acedc9611eabf140242ac1f0007",

        "jobId": "3ff92acedc9611eabf140242ac1f0007",

        "phase": "EXECUTING",

        "quote": null,

        "startTime": null,

client/dataArchiverCli.py

+2 −2
Original line number Diff line number Diff line
@@ -80,8 +80,8 @@ DESCRIPTION 
                if "responseType" not in confirmResponse:

                    sys.exit("\nFATAL: Malformed response, store confirmation expected.\n")

                elif confirmResponse["responseType"] == "STORE_RUN":

                    jobID = confirmResponse["jobID"]

                    print(f"\nJobID: {jobID}")

                    jobId = confirmResponse["jobId"]

                    print(f"\nJobID: {jobId}")

                    print("Store process started successfully!\n")

                else:

                    sys.exit("FATAL: Unknown response type.\n")

client/vos_rest_client.py

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ if queue == 'start_job_queue': 
    print(json.dumps(response, indent = 3))

elif queue == 'poll_job_queue':

    testClient = AMQPClient(queue)

    pollRequest = { "jobID": jobid }

    pollRequest = { "jobId": jobid }

    print("Sending poll request:")

    print(json.dumps(pollRequest, indent = 3))

    response = testClient.call(pollRequest)

transfer_service/get_job_amqp_server.py

+2 −2
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ class GetJobAMQPServer(AMQPServer): 
        super(GetJobAMQPServer, self).__init__(host, queue)      



    def execute_callback(self, requestBody):

        if "jobID" in requestBody:

            redis_res = self.jobCache.get(requestBody["jobID"])

        if "jobId" in requestBody:

            redis_res = self.jobCache.get(requestBody["jobId"])

            print(f"Redis response: {redis_res}")

            return redis_res

        else:

transfer_service/job.py

+3 −3
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ import uuid 
class Job(object):



    def __init__(self):

        self.jobID = str(uuid.uuid1().hex)

        self.jobId = str(uuid.uuid1().hex)

        self.phase = None

        self.quote = None

        self.startTime = None
@@ -15,8 +15,8 @@ class Job(object): 
        self.results = None

        self.jobInfo = None

        

    def setID(self, jobID):

        self.jobID = jobID

    def setID(self, jobId):

        self.jobId = jobId



    def setPhase(self, phase):

        self.phase = phase