summaryrefslogtreecommitdiffstats
path: root/ms/command-executor/src/main/python/utils.py
diff options
context:
space:
mode:
authorOleg Mitsura <oleg.mitsura@amdocs.com>2021-01-15 13:49:25 -0500
committerOleg Mitsura <oleg.mitsura@amdocs.com>2021-01-26 10:26:13 -0500
commitb62aabac76abe92f04e0991157292c276d3d9177 (patch)
tree41c7dc0b2a6881e15a1b6af2cbbe2fd5af461544 /ms/command-executor/src/main/python/utils.py
parent99856ebe10b933a11b683c58635c13a58e542abe (diff)
PV/PVC elimination
Issue-ID: CCSDK-3086 1. initial commit 2. fix accidental paste / rebased cleaned up unneeded validation call in cmd-exec upload Signed-off-by: Oleg Mitsura <oleg.mitsura@amdocs.com> Change-Id: Ife5460c5be59aa8d8592d82099b27c507b08c6c6
Diffstat (limited to 'ms/command-executor/src/main/python/utils.py')
-rw-r--r--ms/command-executor/src/main/python/utils.py74
1 files changed, 54 insertions, 20 deletions
diff --git a/ms/command-executor/src/main/python/utils.py b/ms/command-executor/src/main/python/utils.py
index c624a3d2e..e7924a936 100644
--- a/ms/command-executor/src/main/python/utils.py
+++ b/ms/command-executor/src/main/python/utils.py
@@ -23,16 +23,34 @@ CDS_IS_SUCCESSFUL_KEY = "cds_is_successful"
ERR_MSG_KEY = "err_msg"
RESULTS_KEY = "results"
RESULTS_LOG_KEY = "results_log"
-RESPONSE_MAX_SIZE = 4 * 1024 * 1024 # 4Mb
+REUPLOAD_CBA_KEY = "reupload_cba"
+RESPONSE_MAX_SIZE = 4 * 1024 * 1024 # 4Mb
-def get_blueprint_id(request):
+
+def blueprint_name_version_uuid(request):
blueprint_name = request.identifiers.blueprintName
blueprint_version = request.identifiers.blueprintVersion
- return blueprint_name + '/' + blueprint_version
+ blueprint_uuid = request.identifiers.blueprintUUID
+ return blueprint_name + '/' + blueprint_version + '/' + blueprint_uuid
+
+def get_blueprint_name(request):
+ return request.identifiers.blueprintName
+
+def get_blueprint_version(request):
+ return request.identifiers.blueprintVersion
+
+def get_blueprint_uuid(request):
+ return request.identifiers.blueprintUUID
def get_blueprint_timeout(request):
return request.timeOut
+def get_blueprint_requestid(request):
+ return request.requestId
+
+def get_blueprint_subRequestId(request):
+ return request.subRequestId
+
# Create a response for grpc. Fills in the timestamp as well as removes cds_is_successful element
def build_grpc_response(request_id, response):
if response[CDS_IS_SUCCESSFUL_KEY]:
@@ -50,36 +68,51 @@ def build_grpc_response(request_id, response):
timestamp.GetCurrentTime()
execution_output = CommandExecutor_pb2.ExecutionOutput(requestId=request_id,
- response=logs,
- status=status,
- payload=payload,
- timestamp=timestamp)
+ response=logs,
+ status=status,
+ payload=payload,
+ timestamp=timestamp)
return truncate_execution_output(execution_output)
+def build_grpc_blueprint_upload_response(request_id, subrequest_id, success=True, payload=[]):
+ timestamp = Timestamp()
+ timestamp.GetCurrentTime()
+ return CommandExecutor_pb2.UploadBlueprintOutput(requestId=request_id,
+ subRequestId=subrequest_id,
+ status=CommandExecutor_pb2.SUCCESS if success else CommandExecutor_pb2.FAILURE,
+ timestamp=timestamp,
+ payload=json.dumps(payload))
+
# build a ret data structure used to populate the ExecutionOutput
-def build_ret_data(cds_is_successful, results_log=[], error=None):
+def build_ret_data(cds_is_successful, results_log=[], error=None, reupload_cba = False):
ret_data = {
CDS_IS_SUCCESSFUL_KEY: cds_is_successful,
RESULTS_LOG_KEY: results_log
}
if error:
ret_data[ERR_MSG_KEY] = error
+ # CBA needs to be reuploaded case:
+ if reupload_cba:
+ ret_data[REUPLOAD_CBA_KEY] = True
return ret_data
+
# Truncate execution logs to make sure gRPC response doesn't exceed the gRPC buffer capacity
def truncate_execution_output(execution_output):
sum_truncated_chars = 0
if execution_output.ByteSize() > RESPONSE_MAX_SIZE:
while execution_output.ByteSize() > RESPONSE_MAX_SIZE:
- removed_item = execution_output.response.pop()
- sum_truncated_chars += len(removed_item)
- execution_output.response.append("[...] TRUNCATED CHARS : {}".format(sum_truncated_chars))
+ removed_item = execution_output.response.pop()
+ sum_truncated_chars += len(removed_item)
+ execution_output.response.append(
+ "[...] TRUNCATED CHARS : {}".format(sum_truncated_chars))
return execution_output
# Read temp file 'outputfile' into results_log and split out the returned payload into payload_result
-def parse_cmd_exec_output(outputfile, logger, payload_result, results_log, extra):
+def parse_cmd_exec_output(outputfile, logger, payload_result, results_log,
+ extra):
payload_section = []
is_payload_section = False
outputfile.seek(0)
@@ -103,12 +136,13 @@ def parse_cmd_exec_output(outputfile, logger, payload_result, results_log, extra
else:
payload_section.append(output.strip())
+
def getExtraLogData(request=None):
- extra = {'request_id' : '', 'subrequest_id' : '', 'originator_id': ''}
- if request is not None:
- extra = {
- 'request_id' : request.requestId,
- 'subrequest_id' : request.subRequestId,
- 'originator_id': request.originatorId
- }
- return extra \ No newline at end of file
+ extra = {'request_id': '', 'subrequest_id': '', 'originator_id': ''}
+ if request is not None:
+ extra = {
+ 'request_id': request.requestId,
+ 'subrequest_id': request.subRequestId,
+ 'originator_id': request.originatorId
+ }
+ return extra