From e92fce768cb792f11920f45fdbb38b3af69e212f Mon Sep 17 00:00:00 2001 From: Jozsef Csongvai Date: Tue, 19 Jan 2021 12:32:04 -0500 Subject: Update to latest version Issue-ID: TEST-295 Signed-off-by: Jozsef Csongvai Change-Id: Ie14e2061c1e0931bf3d555e54c79bb736d140d5c --- .../test/netconf/dummy-request-payload.json | 14 ----------- .../jython/connect-fail/expected-response.json | 29 ---------------------- .../jython/connect-fail/request-payload.json | 19 -------------- .../test/netconf/jython/connect-fail/test.sh | 26 ------------------- .../netconf/jython/success/expected-response.json | 29 ---------------------- .../netconf/jython/success/request-payload.json | 19 -------------- .../test/netconf/jython/success/test.sh | 26 ------------------- .../kotlin/connect-fail/expected-response.json | 29 ---------------------- .../kotlin/connect-fail/request-payload.json | 19 -------------- .../test/netconf/kotlin/connect-fail/test.sh | 26 ------------------- .../netconf/kotlin/success/expected-response.json | 29 ---------------------- .../netconf/kotlin/success/request-payload.json | 19 -------------- .../test/netconf/kotlin/success/test.sh | 26 ------------------- .../test/netconf/netconf-enrichment-test.sh | 17 ------------- .../test/netconf/netconf-upload-test.sh | 20 --------------- 15 files changed, 347 deletions(-) delete mode 100644 cds-regression-test/test/netconf/dummy-request-payload.json delete mode 100644 cds-regression-test/test/netconf/jython/connect-fail/expected-response.json delete mode 100644 cds-regression-test/test/netconf/jython/connect-fail/request-payload.json delete mode 100755 cds-regression-test/test/netconf/jython/connect-fail/test.sh delete mode 100644 cds-regression-test/test/netconf/jython/success/expected-response.json delete mode 100644 cds-regression-test/test/netconf/jython/success/request-payload.json delete mode 100755 cds-regression-test/test/netconf/jython/success/test.sh delete mode 100644 cds-regression-test/test/netconf/kotlin/connect-fail/expected-response.json delete mode 100644 cds-regression-test/test/netconf/kotlin/connect-fail/request-payload.json delete mode 100755 cds-regression-test/test/netconf/kotlin/connect-fail/test.sh delete mode 100644 cds-regression-test/test/netconf/kotlin/success/expected-response.json delete mode 100644 cds-regression-test/test/netconf/kotlin/success/request-payload.json delete mode 100755 cds-regression-test/test/netconf/kotlin/success/test.sh delete mode 100755 cds-regression-test/test/netconf/netconf-enrichment-test.sh delete mode 100755 cds-regression-test/test/netconf/netconf-upload-test.sh (limited to 'cds-regression-test/test/netconf') diff --git a/cds-regression-test/test/netconf/dummy-request-payload.json b/cds-regression-test/test/netconf/dummy-request-payload.json deleted file mode 100644 index acc4f92..0000000 --- a/cds-regression-test/test/netconf/dummy-request-payload.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "commonHeader": { - "originatorId": "System", - "requestId": "dummy-request-should-fail", - "subRequestId": "1" - }, - "actionIdentifiers": { - "blueprintName": "RT-netconf", - "blueprintVersion": "1.0.0", - "actionName": "dummy", - "mode": "sync" - }, - "payload": {} -} diff --git a/cds-regression-test/test/netconf/jython/connect-fail/expected-response.json b/cds-regression-test/test/netconf/jython/connect-fail/expected-response.json deleted file mode 100644 index ff0cceb..0000000 --- a/cds-regression-test/test/netconf/jython/connect-fail/expected-response.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "commonHeader": { - "timestamp": "2020-02-04T14:16:32.798Z", - "originatorId": "System", - "requestId": "regression-test-netconf-jython-connect-fail", - "subRequestId": "1", - "flags": null - }, - "actionIdentifiers": { - "blueprintName": "RT-netconf", - "blueprintVersion": "1.0.0", - "actionName": "netconf-jython", - "mode": "sync" - }, - "status": { - "code": 500, - "eventType": "EVENT_COMPONENT_FAILURE", - "timestamp": "2020-02-04T14:16:32.824Z", - "errorMessage": "org.onap.ccsdk.cds.blueprintsprocessor.functions.netconf.executor.api.NetconfException: 127.0.0.1:17830: Failed to establish SSH session", - "message": "failure" - }, - "payload": { - "netconf-jython-response": { - "response-data": { - "deploySuccess": false - } - } - } -} diff --git a/cds-regression-test/test/netconf/jython/connect-fail/request-payload.json b/cds-regression-test/test/netconf/jython/connect-fail/request-payload.json deleted file mode 100644 index 9a9f240..0000000 --- a/cds-regression-test/test/netconf/jython/connect-fail/request-payload.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "actionIdentifiers": { - "mode": "sync", - "blueprintName": "RT-netconf", - "blueprintVersion": "1.0.0", - "actionName": "netconf-jython" - }, - "payload": { - "netconf-jython-request": { - "netconf-host": "127.0.0.1", - "netconf-timeout": 5 - } - }, - "commonHeader": { - "subRequestId": "1", - "requestId": "regression-test-netconf-jython-connect-fail", - "originatorId": "System" - } -} diff --git a/cds-regression-test/test/netconf/jython/connect-fail/test.sh b/cds-regression-test/test/netconf/jython/connect-fail/test.sh deleted file mode 100755 index 670fa49..0000000 --- a/cds-regression-test/test/netconf/jython/connect-fail/test.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -CBA_NAME="netconf" -LANG="jython" -TEST_NAME="connect-fail" -TEST_NUMBER=$RANDOM - -mkdir -p "$RESPONSES_DIRECTORY/$CBA_NAME/$LANG/$TEST_NAME/$TEST_NUMBER/" -RESPONSE_HEADERS_FILE="$RESPONSES_DIRECTORY/$CBA_NAME/$LANG/$TEST_NAME/$TEST_NUMBER/response-headers" -RESPONSE_PAYLOAD_FILE="$RESPONSES_DIRECTORY/$CBA_NAME/$LANG/$TEST_NAME/$TEST_NUMBER/response-payload" - -REQUEST_PAYLOAD_FILE="$TEST_DIRECTORY/$CBA_NAME/$LANG/$TEST_NAME/request-payload.json" -EXPECTED_PAYLOAD_FILE="$TEST_DIRECTORY/$CBA_NAME/$LANG/$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 500' -assert_status_code 500 $RESPONSE_HEADERS_FILE - -echo 'Assert connect fail payload' -assert_cds_response_equals $EXPECTED_PAYLOAD_FILE $RESPONSE_PAYLOAD_FILE diff --git a/cds-regression-test/test/netconf/jython/success/expected-response.json b/cds-regression-test/test/netconf/jython/success/expected-response.json deleted file mode 100644 index 6408577..0000000 --- a/cds-regression-test/test/netconf/jython/success/expected-response.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "commonHeader": { - "timestamp": "2020-02-03T13:40:43.697Z", - "originatorId": "System", - "requestId": "regression-test-netconf-jython", - "subRequestId": "1", - "flags": null - }, - "actionIdentifiers": { - "blueprintName": "RT-netconf", - "blueprintVersion": "1.0.0", - "actionName": "netconf-jython", - "mode": "sync" - }, - "status": { - "code": 200, - "eventType": "EVENT_COMPONENT_EXECUTED", - "timestamp": "2020-02-03T13:40:51.835Z", - "errorMessage": null, - "message": "success" - }, - "payload": { - "netconf-jython-response": { - "response-data": { - "deploySuccess": true - } - } - } -} diff --git a/cds-regression-test/test/netconf/jython/success/request-payload.json b/cds-regression-test/test/netconf/jython/success/request-payload.json deleted file mode 100644 index dcaaeb1..0000000 --- a/cds-regression-test/test/netconf/jython/success/request-payload.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "actionIdentifiers": { - "mode": "sync", - "blueprintName": "RT-netconf", - "blueprintVersion": "1.0.0", - "actionName": "netconf-jython" - }, - "payload": { - "netconf-jython-request": { - "netconf-host": "odl-netconf-testtool", - "netconf-timeout": 30 - } - }, - "commonHeader": { - "subRequestId": "1", - "requestId": "regression-test-netconf-jython", - "originatorId": "System" - } -} diff --git a/cds-regression-test/test/netconf/jython/success/test.sh b/cds-regression-test/test/netconf/jython/success/test.sh deleted file mode 100755 index 4b3e2c0..0000000 --- a/cds-regression-test/test/netconf/jython/success/test.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -CBA_NAME="netconf" -LANG="jython" -TEST_NAME="success" -TEST_NUMBER=$RANDOM - -mkdir -p "$RESPONSES_DIRECTORY/$CBA_NAME/$LANG/$TEST_NAME/$TEST_NUMBER/" -RESPONSE_HEADERS_FILE="$RESPONSES_DIRECTORY/$CBA_NAME/$LANG/$TEST_NAME/$TEST_NUMBER/response-headers" -RESPONSE_PAYLOAD_FILE="$RESPONSES_DIRECTORY/$CBA_NAME/$LANG/$TEST_NAME/$TEST_NUMBER/response-payload" - -REQUEST_PAYLOAD_FILE="$TEST_DIRECTORY/$CBA_NAME/$LANG/$TEST_NAME/request-payload.json" -EXPECTED_PAYLOAD_FILE="$TEST_DIRECTORY/$CBA_NAME/$LANG/$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 200' -assert_status_code 200 $RESPONSE_HEADERS_FILE - -echo 'Assert payload' -assert_cds_response_equals $EXPECTED_PAYLOAD_FILE $RESPONSE_PAYLOAD_FILE diff --git a/cds-regression-test/test/netconf/kotlin/connect-fail/expected-response.json b/cds-regression-test/test/netconf/kotlin/connect-fail/expected-response.json deleted file mode 100644 index 9334b50..0000000 --- a/cds-regression-test/test/netconf/kotlin/connect-fail/expected-response.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "commonHeader": { - "timestamp": "2020-02-04T14:16:32.798Z", - "originatorId": "System", - "requestId": "regression-test-netconf-kotlin-connect-fail", - "subRequestId": "1", - "flags": null - }, - "actionIdentifiers": { - "blueprintName": "RT-netconf", - "blueprintVersion": "1.0.0", - "actionName": "netconf-kotlin", - "mode": "sync" - }, - "status": { - "code": 500, - "eventType": "EVENT_COMPONENT_FAILURE", - "timestamp": "2020-02-04T14:16:32.824Z", - "errorMessage": "org.onap.ccsdk.cds.blueprintsprocessor.functions.netconf.executor.api.NetconfException: 127.0.0.1:17830: Failed to establish SSH session", - "message": "failure" - }, - "payload": { - "netconf-kotlin-response": { - "response-data": { - "deploySuccess": false - } - } - } -} diff --git a/cds-regression-test/test/netconf/kotlin/connect-fail/request-payload.json b/cds-regression-test/test/netconf/kotlin/connect-fail/request-payload.json deleted file mode 100644 index 8cac64a..0000000 --- a/cds-regression-test/test/netconf/kotlin/connect-fail/request-payload.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "actionIdentifiers": { - "mode": "sync", - "blueprintName": "RT-netconf", - "blueprintVersion": "1.0.0", - "actionName": "netconf-kotlin" - }, - "payload": { - "netconf-kotlin-request": { - "netconf-host": "127.0.0.1", - "netconf-timeout": 5 - } - }, - "commonHeader": { - "subRequestId": "1", - "requestId": "regression-test-netconf-kotlin-connect-fail", - "originatorId": "System" - } -} diff --git a/cds-regression-test/test/netconf/kotlin/connect-fail/test.sh b/cds-regression-test/test/netconf/kotlin/connect-fail/test.sh deleted file mode 100755 index d30e5ab..0000000 --- a/cds-regression-test/test/netconf/kotlin/connect-fail/test.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -CBA_NAME="netconf" -LANG="kotlin" -TEST_NAME="connect-fail" -TEST_NUMBER=$RANDOM - -mkdir -p "$RESPONSES_DIRECTORY/$CBA_NAME/$LANG/$TEST_NAME/$TEST_NUMBER/" -RESPONSE_HEADERS_FILE="$RESPONSES_DIRECTORY/$CBA_NAME/$LANG/$TEST_NAME/$TEST_NUMBER/response-headers" -RESPONSE_PAYLOAD_FILE="$RESPONSES_DIRECTORY/$CBA_NAME/$LANG/$TEST_NAME/$TEST_NUMBER/response-payload" - -REQUEST_PAYLOAD_FILE="$TEST_DIRECTORY/$CBA_NAME/$LANG/$TEST_NAME/request-payload.json" -EXPECTED_PAYLOAD_FILE="$TEST_DIRECTORY/$CBA_NAME/$LANG/$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 500' -assert_status_code 500 $RESPONSE_HEADERS_FILE - -echo 'Assert connect fail payload' -assert_cds_response_equals $EXPECTED_PAYLOAD_FILE $RESPONSE_PAYLOAD_FILE diff --git a/cds-regression-test/test/netconf/kotlin/success/expected-response.json b/cds-regression-test/test/netconf/kotlin/success/expected-response.json deleted file mode 100644 index dfb81d7..0000000 --- a/cds-regression-test/test/netconf/kotlin/success/expected-response.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "commonHeader": { - "timestamp": "2020-02-03T13:40:43.697Z", - "originatorId": "System", - "requestId": "regression-test-netconf-kotlin", - "subRequestId": "1", - "flags": null - }, - "actionIdentifiers": { - "blueprintName": "RT-netconf", - "blueprintVersion": "1.0.0", - "actionName": "netconf-kotlin", - "mode": "sync" - }, - "status": { - "code": 200, - "eventType": "EVENT_COMPONENT_EXECUTED", - "timestamp": "2020-02-03T13:40:51.835Z", - "errorMessage": null, - "message": "success" - }, - "payload": { - "netconf-kotlin-response": { - "response-data": { - "deploySuccess": true - } - } - } -} diff --git a/cds-regression-test/test/netconf/kotlin/success/request-payload.json b/cds-regression-test/test/netconf/kotlin/success/request-payload.json deleted file mode 100644 index 412614f..0000000 --- a/cds-regression-test/test/netconf/kotlin/success/request-payload.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "actionIdentifiers": { - "mode": "sync", - "blueprintName": "RT-netconf", - "blueprintVersion": "1.0.0", - "actionName": "netconf-kotlin" - }, - "payload": { - "netconf-kotlin-request": { - "netconf-host": "odl-netconf-testtool", - "netconf-timeout": 30 - } - }, - "commonHeader": { - "subRequestId": "1", - "requestId": "regression-test-netconf-kotlin", - "originatorId": "System" - } -} diff --git a/cds-regression-test/test/netconf/kotlin/success/test.sh b/cds-regression-test/test/netconf/kotlin/success/test.sh deleted file mode 100755 index 8de0e6f..0000000 --- a/cds-regression-test/test/netconf/kotlin/success/test.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -CBA_NAME="netconf" -LANG="kotlin" -TEST_NAME="success" -TEST_NUMBER=$RANDOM - -mkdir -p "$RESPONSES_DIRECTORY/$CBA_NAME/$LANG/$TEST_NAME/$TEST_NUMBER/" -RESPONSE_HEADERS_FILE="$RESPONSES_DIRECTORY/$CBA_NAME/$LANG/$TEST_NAME/$TEST_NUMBER/response-headers" -RESPONSE_PAYLOAD_FILE="$RESPONSES_DIRECTORY/$CBA_NAME/$LANG/$TEST_NAME/$TEST_NUMBER/response-payload" - -REQUEST_PAYLOAD_FILE="$TEST_DIRECTORY/$CBA_NAME/$LANG/$TEST_NAME/request-payload.json" -EXPECTED_PAYLOAD_FILE="$TEST_DIRECTORY/$CBA_NAME/$LANG/$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 200' -assert_status_code 200 $RESPONSE_HEADERS_FILE - -echo 'Assert payload' -assert_cds_response_equals $EXPECTED_PAYLOAD_FILE $RESPONSE_PAYLOAD_FILE diff --git a/cds-regression-test/test/netconf/netconf-enrichment-test.sh b/cds-regression-test/test/netconf/netconf-enrichment-test.sh deleted file mode 100755 index 3c76ce4..0000000 --- a/cds-regression-test/test/netconf/netconf-enrichment-test.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -CBA_NAME="netconf" -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/netconf/netconf-upload-test.sh b/cds-regression-test/test/netconf/netconf-upload-test.sh deleted file mode 100755 index 933a7b2..0000000 --- a/cds-regression-test/test/netconf/netconf-upload-test.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -CBA_NAME="netconf" -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' -- cgit 1.2.3-korg