Merge "Extend DFC's HTTP[S] support with JWT support - CSIT tests"

7 files changed, 26 insertions, 5 deletions

diff --git a/plans/dcaegen2-collectors-datafile/Functional-suite/testplan.txt b/plans/dcaegen2-collectors-datafile/Functional-suite/testplan.txt
index cb9aecf3..25a7d8c2 100755
--- a/plans/dcaegen2-collectors-datafile/Functional-suite/testplan.txt
+++ b/plans/dcaegen2-collectors-datafile/Functional-suite/testplan.txt
@@ -3,4 +3,4 @@
 dcaegen2-collectors-datafile/testsuites/Functional-Single-File-Ftp-suite
 dcaegen2-collectors-datafile/testsuites/Functional-Single-File-Http-suite
 dcaegen2-collectors-datafile/testsuites/Strict-Host-Checking-suite
-dcaegen2-collectors-datafile/testsuites/HTTPS-Various-Connection-Types-suite
+dcaegen2-collectors-datafile/testsuites/HTTP-Various-Connection-Types-suite
diff --git a/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-Ftp-suite/FuncSingleFileFtp.robot b/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-Ftp-suite/FuncSingleFileFtp.robot
index cecb8d11..bb70b502 100755
--- a/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-Ftp-suite/FuncSingleFileFtp.robot
+++ b/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-Ftp-suite/FuncSingleFileFtp.robot
@@ -109,3 +109,5 @@ Set Default Environment Variables
     Set Environment Variable        HTTP_SIMS               http-https-server0:80
     Set Environment Variable        HTTPS_SIMS              http-https-server0:443
     Set Environment Variable        HTTPS_SIMS_NO_AUTH      http-https-server0:8080
+    Set Environment Variable        HTTP_JWT_SIMS           http-https-server0:32000
+    Set Environment Variable        HTTPS_JWT_SIMS          http-https-server0:32100
diff --git a/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-Http-suite/FuncSingleFileHttp.robot b/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-Http-suite/FuncSingleFileHttp.robot
index f279391c..f96c2f96 100755
--- a/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-Http-suite/FuncSingleFileHttp.robot
+++ b/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-Http-suite/FuncSingleFileHttp.robot
@@ -112,3 +112,5 @@ Set Default Environment Variables
     Set Environment Variable        HTTP_SIMS               http-https-server0:80
     Set Environment Variable        HTTPS_SIMS              http-https-server0:443
     Set Environment Variable        HTTPS_SIMS_NO_AUTH      http-https-server0:8080
+    Set Environment Variable        HTTP_JWT_SIMS           http-https-server0:32000
+    Set Environment Variable        HTTPS_JWT_SIMS          http-https-server0:32100
diff --git a/tests/dcaegen2-collectors-datafile/testsuites/HTTPS-Various-Connection-Types-suite/HttpsVariousConnectionTypes.robot b/tests/dcaegen2-collectors-datafile/testsuites/HTTP-Various-Connection-Types-suite/HttpVariousConnectionTypes.robot
index c8d09c2b..9e69e536 100755
--- a/tests/dcaegen2-collectors-datafile/testsuites/HTTPS-Various-Connection-Types-suite/HttpsVariousConnectionTypes.robot
+++ b/tests/dcaegen2-collectors-datafile/testsuites/HTTP-Various-Connection-Types-suite/HttpVariousConnectionTypes.robot
@@ -22,16 +22,29 @@ Verify single event with single 1MB file with HTTPS connection (basic authentica
 
 Verify single event with single 1MB file HTTPS connection (client certificate authentication). From event poll to published file
     [TAGS]                         DFC_FUNCTIONAL_41
-    [Documentation]                Verify single event with single HTTPS (basic authentication) 5MB file from event poll to published file.
+    [Documentation]                Verify single event with single 1MB file HTTPS connection (client certificate authentication). From event poll to published file
     Verify Single Event From Event Poll To Published File   1    --tc403    HTTPS
 
 
 Verify single event with single 1MB file HTTPS (no authentication). From event poll to published file
     [TAGS]                         DFC_FUNCTIONAL_42
-    [Documentation]                Verify single event with single HTTPS (basic authentication) 50MB file from event poll to published file.
+    [Documentation]                Verify single event with single 1MB file HTTPS (no authentication). From event poll to published file
     Verify Single Event From Event Poll To Published File   1   --tc404    HTTPS
 
 
+Verify single event with single 1MB file with HTTP JWT. From event poll to published file
+    [TAGS]                         DFC_FUNCTIONAL_43
+    [Documentation]                Verify single event with single 1MB file with HTTP JWT. From event poll to published file
+    ${cli_cmd_output}=              Run Process             ${DFC_ROOT}/../dfc-containers-clean.sh           stderr=STDOUT
+    Verify Single Event From Event Poll To Published File   1    --tc303    HTTP
+
+
+Verify single event with single 1MB file with HTTPS JWT. From event poll to published file
+    [TAGS]                         DFC_FUNCTIONAL_44
+    [Documentation]                Verify single event with single 1MB file with HTTPS JWT. From event poll to published file
+    ${cli_cmd_output}=              Run Process             ${DFC_ROOT}/../dfc-containers-clean.sh           stderr=STDOUT
+    Verify Single Event From Event Poll To Published File   1    --tc405    HTTPS
+
 
 *** Keywords ***
 Verify Single Event From Event Poll To Published File
@@ -93,3 +106,5 @@ Set Default Environment Variables
     Set Environment Variable        HTTP_SIMS               http-https-server0:80
     Set Environment Variable        HTTPS_SIMS              http-https-server0:443
     Set Environment Variable        HTTPS_SIMS_NO_AUTH      http-https-server0:8080
+    Set Environment Variable        HTTP_JWT_SIMS           http-https-server0:32000
+    Set Environment Variable        HTTPS_JWT_SIMS          http-https-server0:32100
diff --git a/tests/dcaegen2-collectors-datafile/testsuites/HTTP-Various-Connection-Types-suite/__init__.robot b/tests/dcaegen2-collectors-datafile/testsuites/HTTP-Various-Connection-Types-suite/__init__.robot
new file mode 100755
index 00000000..b4fa2714
--- /dev/null
+++ b/tests/dcaegen2-collectors-datafile/testsuites/HTTP-Various-Connection-Types-suite/__init__.robot
@@ -0,0 +1,2 @@
+*** Settings ***
+Documentation    DFC HTTP/HTTPS various connection types test suite. Single event with single file.
diff --git a/tests/dcaegen2-collectors-datafile/testsuites/HTTPS-Various-Connection-Types-suite/__init__.robot b/tests/dcaegen2-collectors-datafile/testsuites/HTTPS-Various-Connection-Types-suite/__init__.robot
deleted file mode 100755
index dac245f8..00000000
--- a/tests/dcaegen2-collectors-datafile/testsuites/HTTPS-Various-Connection-Types-suite/__init__.robot
+++ /dev/null
@@ -1,2 +0,0 @@
-*** Settings ***
-Documentation    DFC HTTPS various connection types test suite. Single event with single file.
diff --git a/tests/dcaegen2-collectors-datafile/testsuites/Strict-Host-Checking-suite/StrictHostChecking.robot b/tests/dcaegen2-collectors-datafile/testsuites/Strict-Host-Checking-suite/StrictHostChecking.robot
index 9baf11f6..61f689d1 100755
--- a/tests/dcaegen2-collectors-datafile/testsuites/Strict-Host-Checking-suite/StrictHostChecking.robot
+++ b/tests/dcaegen2-collectors-datafile/testsuites/Strict-Host-Checking-suite/StrictHostChecking.robot
@@ -93,6 +93,8 @@ Setup Strict Host Key Checking Test
     Set Environment Variable        HTTP_SIMS               http-https-server0:80
     Set Environment Variable        HTTPS_SIMS              http-https-server0:443
     Set Environment Variable        HTTPS_SIMS_NO_AUTH      http-https-server0:8080
+    Set Environment Variable        HTTP_JWT_SIMS           http-https-server0:32000
+    Set Environment Variable        HTTPS_JWT_SIMS          http-https-server0:32100
 
     ${cli_cmd_output}=              Run Process     ./simulators-start.sh    cwd=${SIMGROUP_ROOT}
     Log To Console                  Simulator-start: