From e92fce768cb792f11920f45fdbb38b3af69e212f Mon Sep 17 00:00:00 2001
From: Jozsef Csongvai <jozsef.csongvai@bell.ca>
Date: Tue, 19 Jan 2021 12:32:04 -0500
Subject: Update to latest version

Issue-ID: TEST-295
Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca>
Change-Id: Ie14e2061c1e0931bf3d555e54c79bb736d140d5c
---
 .../connection-fail/expected-response.json         | 25 -----------------
 .../connection-fail/request-payload.json           | 16 -----------
 .../test/py-executor/connection-fail/test.sh       | 25 -----------------
 .../test/py-executor/dummy-request-payload.json    | 14 ----------
 .../failing-script/expected-response.json          | 25 -----------------
 .../failing-script/request-payload.json            | 16 -----------
 .../test/py-executor/failing-script/test.sh        | 25 -----------------
 .../py-executor/py-executor-enrichment-test.sh     | 23 ----------------
 .../test/py-executor/py-executor-upload-test.sh    | 27 ------------------
 .../py-executor/success/expected-response.json     | 32 ----------------------
 .../test/py-executor/success/request-payload.json  | 16 -----------
 .../test/py-executor/success/test.sh               | 25 -----------------
 12 files changed, 269 deletions(-)
 delete mode 100644 cds-regression-test/test/py-executor/connection-fail/expected-response.json
 delete mode 100644 cds-regression-test/test/py-executor/connection-fail/request-payload.json
 delete mode 100644 cds-regression-test/test/py-executor/connection-fail/test.sh
 delete mode 100644 cds-regression-test/test/py-executor/dummy-request-payload.json
 delete mode 100644 cds-regression-test/test/py-executor/failing-script/expected-response.json
 delete mode 100644 cds-regression-test/test/py-executor/failing-script/request-payload.json
 delete mode 100644 cds-regression-test/test/py-executor/failing-script/test.sh
 delete mode 100644 cds-regression-test/test/py-executor/py-executor-enrichment-test.sh
 delete mode 100644 cds-regression-test/test/py-executor/py-executor-upload-test.sh
 delete mode 100644 cds-regression-test/test/py-executor/success/expected-response.json
 delete mode 100644 cds-regression-test/test/py-executor/success/request-payload.json
 delete mode 100644 cds-regression-test/test/py-executor/success/test.sh

(limited to 'cds-regression-test/test/py-executor')

diff --git a/cds-regression-test/test/py-executor/connection-fail/expected-response.json b/cds-regression-test/test/py-executor/connection-fail/expected-response.json
deleted file mode 100644
index 93b2598..0000000
--- a/cds-regression-test/test/py-executor/connection-fail/expected-response.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "commonHeader": {
-    "timestamp": "2020-05-19T17:26:02.923Z",
-    "originatorId": "System",
-    "requestId": "123456",
-    "subRequestId": "1234-12234",
-    "flags": null
-  },
-  "actionIdentifiers": {
-    "blueprintName": "RT-py-executor",
-    "blueprintVersion": "1.0.0",
-    "actionName": "connection-fail",
-    "mode": "sync"
-  },
-  "status": {
-    "code": 500,
-    "eventType": "EVENT_COMPONENT_FAILURE",
-    "timestamp": "2020-05-19T17:26:02.926Z",
-    "errorMessage": "Failed in ComponentRemoteScriptExecutor : UNAVAILABLE: io exception, failed to get execution property(node_templates/execute-connection-fail/attributes/status)",
-    "message": "failure"
-  },
-  "payload": {
-    "connection-fail-response": {}
-  }
-}
diff --git a/cds-regression-test/test/py-executor/connection-fail/request-payload.json b/cds-regression-test/test/py-executor/connection-fail/request-payload.json
deleted file mode 100644
index 7273340..0000000
--- a/cds-regression-test/test/py-executor/connection-fail/request-payload.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "commonHeader": {
-    "originatorId": "System",
-    "requestId": "123456",
-    "subRequestId": "1234-12234"
-  },
-  "actionIdentifiers": {
-    "blueprintName": "RT-py-executor",
-    "blueprintVersion": "1.0.0",
-    "actionName": "connection-fail",
-    "mode": "sync"
-  },
-  "payload": {
-    "connection-fail-request": {}
-  }
-}
diff --git a/cds-regression-test/test/py-executor/connection-fail/test.sh b/cds-regression-test/test/py-executor/connection-fail/test.sh
deleted file mode 100644
index b4b77e6..0000000
--- a/cds-regression-test/test/py-executor/connection-fail/test.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-CBA_NAME="py-executor"
-TEST_NAME="connection-fail"
-TEST_NUMBER=$RANDOM
-
-mkdir -p "$RESPONSES_DIRECTORY/$CBA_NAME/$TEST_NAME/$TEST_NUMBER/"
-RESPONSE_HEADERS_FILE="$RESPONSES_DIRECTORY/$CBA_NAME/$TEST_NAME/$TEST_NUMBER/response-headers"
-RESPONSE_PAYLOAD_FILE="$RESPONSES_DIRECTORY/$CBA_NAME/$TEST_NAME/$TEST_NUMBER/response-payload"
-
-REQUEST_PAYLOAD_FILE="$TEST_DIRECTORY/$CBA_NAME/$TEST_NAME/request-payload.json"
-EXPECTED_PAYLOAD_FILE="$TEST_DIRECTORY/$CBA_NAME/$TEST_NAME/expected-response.json"
-
-. ./$TEST_DIRECTORY/utils.sh
-
-echo "Running test: $CBA_NAME:$TEST_NUMBER:$TEST_NAME"
-
-echo 'Calling CDS process'
-process_cba $REQUEST_PAYLOAD_FILE $RESPONSE_PAYLOAD_FILE $RESPONSE_HEADERS_FILE
-
-echo 'Assert statuscode'
-assert_status_code 500 $RESPONSE_HEADERS_FILE
-
-echo 'Assert payload'
-assert_cds_response_equals $EXPECTED_PAYLOAD_FILE $RESPONSE_PAYLOAD_FILE
diff --git a/cds-regression-test/test/py-executor/dummy-request-payload.json b/cds-regression-test/test/py-executor/dummy-request-payload.json
deleted file mode 100644
index 688e5e9..0000000
--- a/cds-regression-test/test/py-executor/dummy-request-payload.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "commonHeader": {
-    "originatorId": "System",
-    "requestId": "dummy-request-should-fail",
-    "subRequestId": "1"
-  },
-  "actionIdentifiers": {
-    "blueprintName": "RT-remote-python",
-    "blueprintVersion": "1.0.0",
-    "actionName": "dummy",
-    "mode": "sync"
-  },
-  "payload": {}
-}
diff --git a/cds-regression-test/test/py-executor/failing-script/expected-response.json b/cds-regression-test/test/py-executor/failing-script/expected-response.json
deleted file mode 100644
index 17148b0..0000000
--- a/cds-regression-test/test/py-executor/failing-script/expected-response.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "commonHeader": {
-    "timestamp": "2020-05-19T17:24:33.353Z",
-    "originatorId": "System",
-    "requestId": "123456",
-    "subRequestId": "1234-12234",
-    "flags": null
-  },
-  "actionIdentifiers": {
-    "blueprintName": "RT-py-executor",
-    "blueprintVersion": "1.0.0",
-    "actionName": "failing-remote-python",
-    "mode": "sync"
-  },
-  "status": {
-    "code": 500,
-    "eventType": "EVENT_COMPONENT_FAILURE",
-    "timestamp": "2020-05-19T17:24:33.370Z",
-    "errorMessage": "Failed in ComponentRemoteScriptExecutor : UNKNOWN: Exception iterating responses: Script raised an exception, failed to get execution property(node_templates/execute-failing-remote-python/attributes/status)",
-    "message": "failure"
-  },
-  "payload": {
-    "failing-remote-python-response": {}
-  }
-}
diff --git a/cds-regression-test/test/py-executor/failing-script/request-payload.json b/cds-regression-test/test/py-executor/failing-script/request-payload.json
deleted file mode 100644
index bacd876..0000000
--- a/cds-regression-test/test/py-executor/failing-script/request-payload.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "commonHeader": {
-    "originatorId": "System",
-    "requestId": "123456",
-    "subRequestId": "1234-12234"
-  },
-  "actionIdentifiers": {
-    "blueprintName": "RT-py-executor",
-    "blueprintVersion": "1.0.0",
-    "actionName": "failing-remote-python",
-    "mode": "sync"
-  },
-  "payload": {
-    "failing-remote-python-request": {}
-  }
-}
diff --git a/cds-regression-test/test/py-executor/failing-script/test.sh b/cds-regression-test/test/py-executor/failing-script/test.sh
deleted file mode 100644
index 4386e09..0000000
--- a/cds-regression-test/test/py-executor/failing-script/test.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-CBA_NAME="py-executor"
-TEST_NAME="failing-script"
-TEST_NUMBER=$RANDOM
-
-mkdir -p "$RESPONSES_DIRECTORY/$CBA_NAME/$TEST_NAME/$TEST_NUMBER/"
-RESPONSE_HEADERS_FILE="$RESPONSES_DIRECTORY/$CBA_NAME/$TEST_NAME/$TEST_NUMBER/response-headers"
-RESPONSE_PAYLOAD_FILE="$RESPONSES_DIRECTORY/$CBA_NAME/$TEST_NAME/$TEST_NUMBER/response-payload"
-
-REQUEST_PAYLOAD_FILE="$TEST_DIRECTORY/$CBA_NAME/$TEST_NAME/request-payload.json"
-EXPECTED_PAYLOAD_FILE="$TEST_DIRECTORY/$CBA_NAME/$TEST_NAME/expected-response.json"
-
-. ./$TEST_DIRECTORY/utils.sh
-
-echo "Running test: $CBA_NAME:$TEST_NUMBER:$TEST_NAME"
-
-echo 'Calling CDS process'
-process_cba $REQUEST_PAYLOAD_FILE $RESPONSE_PAYLOAD_FILE $RESPONSE_HEADERS_FILE
-
-echo 'Assert statuscode'
-assert_status_code 500 $RESPONSE_HEADERS_FILE
-
-echo 'Assert payload'
-assert_cds_response_equals $EXPECTED_PAYLOAD_FILE $RESPONSE_PAYLOAD_FILE
diff --git a/cds-regression-test/test/py-executor/py-executor-enrichment-test.sh b/cds-regression-test/test/py-executor/py-executor-enrichment-test.sh
deleted file mode 100644
index e671787..0000000
--- a/cds-regression-test/test/py-executor/py-executor-enrichment-test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-## Not tested on El Alto
-if [ "${CDS_VERSION} " == "elalto " ]; then
-  echo "Skipping, not available in elalto"
-  return 0
-fi
-
-CBA_NAME="py-executor"
-TEST_NAME="$CBA_NAME-enrichment"
-TEST_NUMBER=$RANDOM
-RESPONSE_HEADERS_FILE="$RESPONSES_DIRECTORY/$TEST_NAME-$TEST_NUMBER-response-headers"
-
-. ./$TEST_DIRECTORY/utils.sh
-
-echo "Compressing CBA: $CBA_NAME"
-compress_cba $CBA_NAME
-
-echo "Enriching CBA: $CBA_NAME"
-enrich_cba $CBA_NAME $RESPONSE_HEADERS_FILE
-
-echo 'Assert status 200'
-assert_status_code 200 $RESPONSE_HEADERS_FILE
diff --git a/cds-regression-test/test/py-executor/py-executor-upload-test.sh b/cds-regression-test/test/py-executor/py-executor-upload-test.sh
deleted file mode 100644
index 46402e3..0000000
--- a/cds-regression-test/test/py-executor/py-executor-upload-test.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-## Not tested on El Alto
-if [ "${CDS_VERSION} " == "elalto " ]; then
-  echo "Skipping, not available in elalto"
-  return 0
-fi
-
-CBA_NAME="py-executor"
-TEST_NAME="$CBA_NAME-upload"
-TEST_NUMBER=$RANDOM
-RESPONSE_HEADERS_FILE="$RESPONSES_DIRECTORY/$TEST_NAME-$TEST_NUMBER-response-headers"
-RESPONSE_PAYLOAD_FILE="$RESPONSES_DIRECTORY/$TEST_NAME-$TEST_NUMBER-response-payload"
-REQUEST_PAYLOAD_FILE="$TEST_DIRECTORY/$CBA_NAME/dummy-request-payload.json"
-
-. ./$TEST_DIRECTORY/utils.sh
-
-echo "Uploading CBA: $CBA_NAME"
-upload_cba $CBA_NAME $RESPONSE_PAYLOAD_FILE $RESPONSE_HEADERS_FILE
-
-echo 'Assert status 200'
-assert_status_code 200 $RESPONSE_HEADERS_FILE
-
-# This step prevents a race-condition for parallel process requests
-# when cba has not yet been written to filesystem
-echo 'Send process request to force CDS to load CBA to filesystem'
-process_cba $REQUEST_PAYLOAD_FILE '/dev/null' '/dev/null'
diff --git a/cds-regression-test/test/py-executor/success/expected-response.json b/cds-regression-test/test/py-executor/success/expected-response.json
deleted file mode 100644
index 1318508..0000000
--- a/cds-regression-test/test/py-executor/success/expected-response.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "commonHeader": {
-    "timestamp": "2020-05-26T13:47:27.143Z",
-    "originatorId": "System",
-    "requestId": "123456",
-    "subRequestId": "1234-12234",
-    "flags": null
-  },
-  "actionIdentifiers": {
-    "blueprintName": "RT-py-executor",
-    "blueprintVersion": "1.0.0",
-    "actionName": "remote-python",
-    "mode": "sync"
-  },
-  "status": {
-    "code": 200,
-    "eventType": "EVENT_COMPONENT_EXECUTED",
-    "timestamp": "2020-05-26T13:47:27.193Z",
-    "errorMessage": null,
-    "message": "success"
-  },
-  "payload": {
-    "remote-python-response": {
-      "status": "success",
-      "response-data": {
-        "HelloWorld-request": {
-          "hello": "world"
-        }
-      }
-    }
-  }
-}
diff --git a/cds-regression-test/test/py-executor/success/request-payload.json b/cds-regression-test/test/py-executor/success/request-payload.json
deleted file mode 100644
index f23b0de..0000000
--- a/cds-regression-test/test/py-executor/success/request-payload.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "commonHeader": {
-    "originatorId": "System",
-    "requestId": "123456",
-    "subRequestId": "1234-12234"
-  },
-  "actionIdentifiers": {
-    "blueprintName": "RT-py-executor",
-    "blueprintVersion": "1.0.0",
-    "actionName": "remote-python",
-    "mode": "sync"
-  },
-  "payload": {
-    "remote-python-request": {}
-  }
-}
diff --git a/cds-regression-test/test/py-executor/success/test.sh b/cds-regression-test/test/py-executor/success/test.sh
deleted file mode 100644
index d2d064a..0000000
--- a/cds-regression-test/test/py-executor/success/test.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-CBA_NAME="py-executor"
-TEST_NAME="success"
-TEST_NUMBER=$RANDOM
-
-mkdir -p "$RESPONSES_DIRECTORY/$CBA_NAME/$TEST_NAME/$TEST_NUMBER/"
-RESPONSE_HEADERS_FILE="$RESPONSES_DIRECTORY/$CBA_NAME/$TEST_NAME/$TEST_NUMBER/response-headers"
-RESPONSE_PAYLOAD_FILE="$RESPONSES_DIRECTORY/$CBA_NAME/$TEST_NAME/$TEST_NUMBER/response-payload"
-
-REQUEST_PAYLOAD_FILE="$TEST_DIRECTORY/$CBA_NAME/$TEST_NAME/request-payload.json"
-EXPECTED_PAYLOAD_FILE="$TEST_DIRECTORY/$CBA_NAME/$TEST_NAME/expected-response.json"
-
-. ./$TEST_DIRECTORY/utils.sh
-
-echo "Running test: $CBA_NAME:$TEST_NUMBER:$TEST_NAME"
-
-echo 'Calling CDS process'
-process_cba $REQUEST_PAYLOAD_FILE $RESPONSE_PAYLOAD_FILE $RESPONSE_HEADERS_FILE
-
-echo 'Assert statuscode'
-assert_status_code 200 $RESPONSE_HEADERS_FILE
-
-echo 'Assert payload'
-assert_cds_response_equals $EXPECTED_PAYLOAD_FILE $RESPONSE_PAYLOAD_FILE
-- 
cgit 1.2.3-korg