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
---
 .../test/cli/cli-enrichment-test.sh                | 16 ---------
 cds-regression-test/test/cli/cli-upload-test.sh    | 20 ------------
 .../resources/elalto/expected-response.json        | 27 ---------------
 .../resources/elalto/request-payload.json          | 25 --------------
 .../resources/frankfurt/expected-response.json     | 34 -------------------
 .../resources/frankfurt/request-payload.json       | 26 ---------------
 cds-regression-test/test/cli/command-fail/test.sh  | 30 -----------------
 .../test/cli/dummy-request-payload.json            | 14 --------
 .../resources/elalto/expected-response.json        | 27 ---------------
 .../success/resources/elalto/request-payload.json  | 26 ---------------
 .../resources/frankfurt/expected-response.json     | 38 ----------------------
 .../resources/frankfurt/request-payload.json       | 27 ---------------
 cds-regression-test/test/cli/success/test.sh       | 25 --------------
 13 files changed, 335 deletions(-)
 delete mode 100755 cds-regression-test/test/cli/cli-enrichment-test.sh
 delete mode 100755 cds-regression-test/test/cli/cli-upload-test.sh
 delete mode 100644 cds-regression-test/test/cli/command-fail/resources/elalto/expected-response.json
 delete mode 100644 cds-regression-test/test/cli/command-fail/resources/elalto/request-payload.json
 delete mode 100644 cds-regression-test/test/cli/command-fail/resources/frankfurt/expected-response.json
 delete mode 100644 cds-regression-test/test/cli/command-fail/resources/frankfurt/request-payload.json
 delete mode 100755 cds-regression-test/test/cli/command-fail/test.sh
 delete mode 100644 cds-regression-test/test/cli/dummy-request-payload.json
 delete mode 100644 cds-regression-test/test/cli/success/resources/elalto/expected-response.json
 delete mode 100644 cds-regression-test/test/cli/success/resources/elalto/request-payload.json
 delete mode 100644 cds-regression-test/test/cli/success/resources/frankfurt/expected-response.json
 delete mode 100644 cds-regression-test/test/cli/success/resources/frankfurt/request-payload.json
 delete mode 100755 cds-regression-test/test/cli/success/test.sh

(limited to 'cds-regression-test/test/cli')

diff --git a/cds-regression-test/test/cli/cli-enrichment-test.sh b/cds-regression-test/test/cli/cli-enrichment-test.sh
deleted file mode 100755
index a41a1ea..0000000
--- a/cds-regression-test/test/cli/cli-enrichment-test.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-CBA_NAME="cli"
-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_versioned $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/cli/cli-upload-test.sh b/cds-regression-test/test/cli/cli-upload-test.sh
deleted file mode 100755
index 7285cd4..0000000
--- a/cds-regression-test/test/cli/cli-upload-test.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-CBA_NAME="cli"
-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/cli/command-fail/resources/elalto/expected-response.json b/cds-regression-test/test/cli/command-fail/resources/elalto/expected-response.json
deleted file mode 100644
index b7b29e2..0000000
--- a/cds-regression-test/test/cli/command-fail/resources/elalto/expected-response.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "commonHeader": {
-    "timestamp": "2020-02-11T21:24:35.215Z",
-    "originatorId": "System",
-    "requestId": "regression-test-cli-command-fail",
-    "subRequestId": "1",
-    "flags": null
-  },
-  "actionIdentifiers": {
-    "blueprintName": "RT-cli",
-    "blueprintVersion": "1.0.0",
-    "actionName": "cli",
-    "mode": "sync"
-  },
-  "status": {
-    "code": 500,
-    "eventType": "EVENT_COMPONENT_FAILURE",
-    "timestamp": "2020-02-11T21:24:36.824Z",
-    "errorMessage": "Failed to execute commands, below the output : \nCommand : nonExistCommand",
-    "message": "failure"
-  },
-  "payload": {
-    "cli-response": {
-      "response-data": "Error"
-    }
-  }
-}
diff --git a/cds-regression-test/test/cli/command-fail/resources/elalto/request-payload.json b/cds-regression-test/test/cli/command-fail/resources/elalto/request-payload.json
deleted file mode 100644
index db861c9..0000000
--- a/cds-regression-test/test/cli/command-fail/resources/elalto/request-payload.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "actionIdentifiers": {
-    "mode": "sync",
-    "blueprintName": "RT-cli",
-    "blueprintVersion": "1.0.0",
-    "actionName": "cli"
-  },
-  "payload": {
-    "cli-request": {
-      "host": "cds-regression-sshmock",
-      "username": "cdstest",
-      "password": "testcds",
-      "port": "22",
-      "connectionTimeOut": "5000",
-      "commands": [
-        "nonExistCommand"
-      ]
-    }
-  },
-  "commonHeader": {
-    "subRequestId": "1",
-    "requestId": "regression-test-cli-command-fail",
-    "originatorId": "System"
-  }
-}
diff --git a/cds-regression-test/test/cli/command-fail/resources/frankfurt/expected-response.json b/cds-regression-test/test/cli/command-fail/resources/frankfurt/expected-response.json
deleted file mode 100644
index 6b71773..0000000
--- a/cds-regression-test/test/cli/command-fail/resources/frankfurt/expected-response.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "correlationUUID": null,
-  "commonHeader": {
-    "timestamp": "2020-06-04T15:05:20.003Z",
-    "originatorId": "System",
-    "requestId": "regression-test-cli-command-fail",
-    "subRequestId": "1",
-    "flags": null
-  },
-  "actionIdentifiers": {
-    "blueprintName": "RT-cli",
-    "blueprintVersion": "1.0.0",
-    "actionName": "cli",
-    "mode": "sync"
-  },
-  "status": {
-    "code": 200,
-    "eventType": "EVENT_COMPONENT_EXECUTED",
-    "timestamp": "2020-06-04T15:05:41.528Z",
-    "errorMessage": null,
-    "message": "success"
-  },
-  "payload": {
-    "cli-response": {
-      "response-data": [
-        {
-          "command": "nonExistCommand",
-          "deviceOutput": "nonExistCommand\r\n/ $ nonExistCommand\r\n-ash: nonExistCommand: not found\r\n/ $ \u001b[6n",
-          "successful": true
-        }
-      ]
-    }
-  }
-}
diff --git a/cds-regression-test/test/cli/command-fail/resources/frankfurt/request-payload.json b/cds-regression-test/test/cli/command-fail/resources/frankfurt/request-payload.json
deleted file mode 100644
index 700271e..0000000
--- a/cds-regression-test/test/cli/command-fail/resources/frankfurt/request-payload.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "actionIdentifiers": {
-    "mode": "sync",
-    "blueprintName": "RT-cli",
-    "blueprintVersion": "1.0.0",
-    "actionName": "cli"
-  },
-  "payload": {
-    "cli-request": {
-      "host": "cds-regression-sshmock",
-      "username": "cdstest",
-      "password": "testcds",
-      "port": "22",
-      "connectionTimeOut": "5000",
-      "logging": true,
-      "commands": [
-        "nonExistCommand"
-      ]
-    }
-  },
-  "commonHeader": {
-    "subRequestId": "1",
-    "requestId": "regression-test-cli-command-fail",
-    "originatorId": "System"
-  }
-}
diff --git a/cds-regression-test/test/cli/command-fail/test.sh b/cds-regression-test/test/cli/command-fail/test.sh
deleted file mode 100755
index a150680..0000000
--- a/cds-regression-test/test/cli/command-fail/test.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-CBA_NAME="cli"
-TEST_NAME="command-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"
-
-RESOURCES_DIR="$TEST_DIRECTORY/$CBA_NAME/$TEST_NAME/resources/$CDS_VERSION"
-REQUEST_PAYLOAD_FILE="$RESOURCES_DIR/request-payload.json"
-EXPECTED_PAYLOAD_FILE="$RESOURCES_DIR/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
-
-if [ "${CDS_VERSION} " == "elalto " ]; then
-  echo 'Assert statuscode 500'
-  assert_status_code 500 $RESPONSE_HEADERS_FILE
-else
-  echo 'Assert statuscode 200'
-  assert_status_code 200 $RESPONSE_HEADERS_FILE
-fi
-
-echo 'Assert payload'
-assert_cds_response_equals $EXPECTED_PAYLOAD_FILE $RESPONSE_PAYLOAD_FILE
diff --git a/cds-regression-test/test/cli/dummy-request-payload.json b/cds-regression-test/test/cli/dummy-request-payload.json
deleted file mode 100644
index 62d2f92..0000000
--- a/cds-regression-test/test/cli/dummy-request-payload.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "commonHeader": {
-    "originatorId": "System",
-    "requestId": "dummy-request-should-fail",
-    "subRequestId": "1"
-  },
-  "actionIdentifiers": {
-    "blueprintName": "RT-cli",
-    "blueprintVersion": "1.0.0",
-    "actionName": "dummy",
-    "mode": "sync"
-  },
-  "payload": {}
-}
diff --git a/cds-regression-test/test/cli/success/resources/elalto/expected-response.json b/cds-regression-test/test/cli/success/resources/elalto/expected-response.json
deleted file mode 100644
index a813478..0000000
--- a/cds-regression-test/test/cli/success/resources/elalto/expected-response.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "commonHeader": {
-    "timestamp": "2020-02-11T21:19:57.762Z",
-    "originatorId": "System",
-    "requestId": "regression-test-cli",
-    "subRequestId": "1",
-    "flags": null
-  },
-  "actionIdentifiers": {
-    "blueprintName": "RT-cli",
-    "blueprintVersion": "1.0.0",
-    "actionName": "cli",
-    "mode": "sync"
-  },
-  "status": {
-    "code": 200,
-    "eventType": "EVENT_COMPONENT_EXECUTED",
-    "timestamp": "2020-02-11T21:20:00.446Z",
-    "errorMessage": null,
-    "message": "success"
-  },
-  "payload": {
-    "cli-response": {
-      "response-data": "\nCommand : pwd\n/\n\nCommand : ls\nbin\ndev\netc\nlib\n"
-    }
-  }
-}
diff --git a/cds-regression-test/test/cli/success/resources/elalto/request-payload.json b/cds-regression-test/test/cli/success/resources/elalto/request-payload.json
deleted file mode 100644
index 8019144..0000000
--- a/cds-regression-test/test/cli/success/resources/elalto/request-payload.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "actionIdentifiers": {
-    "mode": "sync",
-    "blueprintName": "RT-cli",
-    "blueprintVersion": "1.0.0",
-    "actionName": "cli"
-  },
-  "payload": {
-    "cli-request": {
-      "host": "cds-regression-sshmock",
-      "username": "cdstest",
-      "password": "testcds",
-      "port": "22",
-      "connectionTimeOut": "5000",
-      "commands": [
-        "pwd",
-        "ls"
-      ]
-    }
-  },
-  "commonHeader": {
-    "subRequestId": "1",
-    "requestId": "regression-test-cli",
-    "originatorId": "System"
-  }
-}
diff --git a/cds-regression-test/test/cli/success/resources/frankfurt/expected-response.json b/cds-regression-test/test/cli/success/resources/frankfurt/expected-response.json
deleted file mode 100644
index 55248cb..0000000
--- a/cds-regression-test/test/cli/success/resources/frankfurt/expected-response.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "commonHeader": {
-    "timestamp": "2020-05-25T20:54:11.024Z",
-    "originatorId": "System",
-    "requestId": "regression-test-cli",
-    "subRequestId": "1",
-    "flags": null
-  },
-  "actionIdentifiers": {
-    "blueprintName": "RT-cli",
-    "blueprintVersion": "1.0.0",
-    "actionName": "cli",
-    "mode": "sync"
-  },
-  "status": {
-    "code": 200,
-    "eventType": "EVENT_COMPONENT_EXECUTED",
-    "timestamp": "2020-05-25T20:54:21.453Z",
-    "errorMessage": null,
-    "message": "success"
-  },
-  "payload": {
-    "cli-response": {
-      "response-data": [
-        {
-          "command": "pwd",
-          "deviceOutput": "pwd\r\n/ $ pwd\r\n/\r\n/ $ \u001b[6n",
-          "successful": true
-        },
-        {
-          "command": "ls",
-          "deviceOutput": "pwd\r\n/ $ pwd\r\n/\r\n/ $ \u001b[6nls\r\n\u001b[1;34mbin\u001b[m  \u001b[1;34mdev\u001b[m  \u001b[1;34metc\u001b[m  \u001b[1;34mlib\u001b[m\r\n/ $ \u001b[6n",
-          "successful": true
-        }
-      ]
-    }
-  }
-}
diff --git a/cds-regression-test/test/cli/success/resources/frankfurt/request-payload.json b/cds-regression-test/test/cli/success/resources/frankfurt/request-payload.json
deleted file mode 100644
index 0438a7c..0000000
--- a/cds-regression-test/test/cli/success/resources/frankfurt/request-payload.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "actionIdentifiers": {
-    "mode": "sync",
-    "blueprintName": "RT-cli",
-    "blueprintVersion": "1.0.0",
-    "actionName": "cli"
-  },
-  "payload": {
-    "cli-request": {
-      "host": "cds-regression-sshmock",
-      "username": "cdstest",
-      "password": "testcds",
-      "port": "22",
-      "connectionTimeOut": "5000",
-      "logging": true,
-      "commands": [
-        "pwd",
-        "ls"
-      ]
-    }
-  },
-  "commonHeader": {
-    "subRequestId": "1",
-    "requestId": "regression-test-cli",
-    "originatorId": "System"
-  }
-}
diff --git a/cds-regression-test/test/cli/success/test.sh b/cds-regression-test/test/cli/success/test.sh
deleted file mode 100755
index 6a589d5..0000000
--- a/cds-regression-test/test/cli/success/test.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-CBA_NAME="cli"
-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"
-
-RESOURCES_DIR="$TEST_DIRECTORY/$CBA_NAME/$TEST_NAME/resources/$CDS_VERSION"
-REQUEST_PAYLOAD_FILE="$RESOURCES_DIR/request-payload.json"
-EXPECTED_PAYLOAD_FILE="$RESOURCES_DIR/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 200'
-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