Bug fix for the jira id TCFH-701

TCFH-701 - Passing invalid WorkloadID into Work order Submit API returns an error "Work Order is Computing"

Signed-off-by: Ramakrishna Srinivasamurthy <[email protected]>

Author: Ram-srini

common/cpp/error.h

@@ -123,6 +123,14 @@ namespace tcf {
                 ) : Error(TCF_ERR_SYSTEM_BUSY, msg) {}
         }; // class SystemBusyError
 
+        // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+        class WorkloadError : public Error {
+        public:
+            explicit WorkloadError(
+                const std::string& msg
+                ) : Error(TCF_ERR_INVALID_WORKLOAD, msg) {}
+        }; // class WorkloadError
+
         // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
         class UnknownError : public Error {
         public:

common/cpp/tcf_error.h

@@ -28,13 +28,14 @@ typedef enum {
     TCF_ERR_OVERFLOW = -7,
     TCF_ERR_VALUE = -8,
     TCF_ERR_SYSTEM = -9,
-    TCF_ERR_CRYPTO = -11,
-    TCF_ERR_SYSTEM_BUSY = -10   /*
+    TCF_ERR_SYSTEM_BUSY = -10,  /*
                                   Indicates that the system is busy and
                                   the operation may be retried again.  If
                                   retries fail this should be converted to
                                   a TCF_ERR_SYSTEM for reporting.
                                 */
+    TCF_ERR_CRYPTO = -11,
+    TCF_ERR_INVALID_WORKLOAD = -12  /* Invalid workload id */
 } tcf_err_t;
 
 typedef enum {

common/python/error_code/enclave_error.py

@@ -29,3 +29,4 @@ class EnclaveError(IntEnum):
     ENCLAVE_ERR_SYSTEM = -9,
     ENCLAVE_ERR_CRYPTO = -11,
     ENCLAVE_ERR_SYSTEM_BUSY = -10
+    ENCLAVE_ERR_INVALID_WORKLOAD = -12

common/python/error_code/error_status.py

@@ -32,7 +32,8 @@ class WorkOrderStatus(IntEnum):
     SCHEDULED = 6
     PROCESSING = 7
     BUSY = 8
-    UNKNOWN_ERROR = 9
+    INVALID_WORKLOAD = 9
+    UNKNOWN_ERROR = 10
 
 
 @unique

listener/avalon_listener/tcs_work_order_handler.py

@@ -136,6 +136,8 @@ def WorkOrderGetResult(self, **params):
                         WorkOrderStatus.INVALID_PARAMETER_FORMAT_OR_VALUE
                 elif err_code == EnclaveError.ENCLAVE_ERR_UNKNOWN:
                     err_code = WorkOrderStatus.UNKNOWN_ERROR
+                elif err_code == EnclaveError.ENCLAVE_ERR_INVALID_WORKLOAD:
+                    err_code = WorkOrderStatus.INVALID_WORKLOAD
                 else:
                     err_code = WorkOrderStatus.FAILED
                 raise JSONRPCDispatchException(err_code, err_msg)

tc/sgx/trusted_worker_manager/enclave/work_order_processor.cpp

@@ -260,7 +260,8 @@ namespace tcf {
             std::string workload_type(workload_bytes.begin(), workload_bytes.end());
             WorkloadProcessor *processor = 
                 WorkloadProcessor::CreateWorkloadProcessor(workload_type);
-            tcf::error::ThrowIfNull(processor, "CreateWorkloadProcessor function returned null");
+            tcf::error::ThrowIf<tcf::error::WorkloadError>(
+                processor == nullptr, "Invalid workload id");
             processor->ProcessWorkOrder(
                         workload_type,
                         StrToByteArray(requester_id),