From bc7455dcf110da63921a8c4016c741a8bad82311 Mon Sep 17 00:00:00 2001
From: Sonia Zorba <sonia.zorba@inaf.it>
Date: Wed, 4 Nov 2020 16:09:16 +0100
Subject: [PATCH] Renamed jobID -> jobId for compatibility with Java client
---
README.txt | 6 +++---
client/dataArchiverCli.py | 4 ++--
client/vos_rest_client.py | 2 +-
transfer_service/get_job_amqp_server.py | 4 ++--
transfer_service/job.py | 6 +++---
transfer_service/job_cache.py | 10 +++++-----
transfer_service/start_job_amqp_server.py | 2 +-
transfer_service/store_amqp_server.py | 4 ++--
8 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/README.txt b/README.txt
index c9aa0ea..50deaf2 100644
--- a/README.txt
+++ b/README.txt
@@ -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,
diff --git a/client/dataArchiverCli.py b/client/dataArchiverCli.py
index 7bdea7b..b7ddcd4 100755
--- a/client/dataArchiverCli.py
+++ b/client/dataArchiverCli.py
@@ -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")
diff --git a/client/vos_rest_client.py b/client/vos_rest_client.py
index dcb7974..a25b754 100644
--- a/client/vos_rest_client.py
+++ b/client/vos_rest_client.py
@@ -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)
diff --git a/transfer_service/get_job_amqp_server.py b/transfer_service/get_job_amqp_server.py
index aa3b7ea..64540eb 100644
--- a/transfer_service/get_job_amqp_server.py
+++ b/transfer_service/get_job_amqp_server.py
@@ -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:
diff --git a/transfer_service/job.py b/transfer_service/job.py
index 046fdec..a1e309e 100644
--- a/transfer_service/job.py
+++ b/transfer_service/job.py
@@ -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
diff --git a/transfer_service/job_cache.py b/transfer_service/job_cache.py
index f70dc6f..f3f8480 100644
--- a/transfer_service/job_cache.py
+++ b/transfer_service/job_cache.py
@@ -15,7 +15,7 @@ class JobCache(object):
db = self.db)
def set(self, jobObj):
- data = { "jobID": jobObj.jobID,
+ data = { "jobId": jobObj.jobId,
"phase": jobObj.phase,
"quote": jobObj.quote,
"startTime": jobObj.startTime,
@@ -24,11 +24,11 @@ class JobCache(object):
"destruction": jobObj.destruction,
"parameters": jobObj.parameters,
"jobInfo": jobObj.jobInfo }
- self.redisCli.set(jobObj.jobID, json.dumps(data))
+ self.redisCli.set(jobObj.jobId, json.dumps(data))
- def get(self, jobID):
- if self.redisCli.exists(jobID):
- jobObj = self.redisCli.get(jobID).decode("utf-8")
+ def get(self, jobId):
+ if self.redisCli.exists(jobId):
+ jobObj = self.redisCli.get(jobId).decode("utf-8")
return json.loads(jobObj)
else:
return json.loads('{ "error": "JOB_NOT_FOUND" }')
\ No newline at end of file
diff --git a/transfer_service/start_job_amqp_server.py b/transfer_service/start_job_amqp_server.py
index 0b21914..4d0b050 100644
--- a/transfer_service/start_job_amqp_server.py
+++ b/transfer_service/start_job_amqp_server.py
@@ -18,7 +18,7 @@ class StartJobAMQPServer(AMQPServer):
self.job.setInfo(requestBody)
self.job.setPhase("PENDING")
self.jobCache.set(self.job)
- redis_res = self.jobCache.get(self.job.jobID)
+ redis_res = self.jobCache.get(self.job.jobId)
print(f"Redis response: {redis_res}")
t = threading.Thread(target = self.fake_job) # only for testing purposes
t.start() # only for testing purposes
diff --git a/transfer_service/store_amqp_server.py b/transfer_service/store_amqp_server.py
index 0e2ef1d..c17e476 100644
--- a/transfer_service/store_amqp_server.py
+++ b/transfer_service/store_amqp_server.py
@@ -67,14 +67,14 @@ class StoreAMQPServer(AMQPServer):
user = requestBody["userName"]
self.prepare(user)
self.jobCache.set(self.job)
- redisResponse = self.jobCache.get(self.job.jobID)
+ redisResponse = self.jobCache.get(self.job.jobId)
if "error" in redisResponse:
response = { "responseType": "ERROR",
"errorCode": 5,
"errorMsg": "Job creation failed." }
else:
response = { "responseType": "STORE_RUN",
- "jobID": self.job.jobID }
+ "jobId": self.job.jobId }
else:
response = { "responseType": "ERROR",
"errorCode": 6,
--
GitLab