[DMAAP] fix the references to the dmaap interface files

Issue-ID: TEST-390

Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
Change-Id: I5bad4685fd1a2377613298d46e1f87b264185ac7

diff --git a/docker/Dockerfile b/docker/Dockerfile
index d52b4c2..8265772 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -47,7 +47,7 @@ RUN apt-get update \
             xxd  \
             wget vim  \
             python3.8 python3.8-dev python3-pip && \
-    ln -s /usr/bin/python3 /usr/bin/python && \
+    ln -s /usr/bin/python3 /usr/bin/python &&  \
     mkdir -p /var/opt/ONAP && \
     pip3 install --no-cache-dir -r requirements.txt && \
     pip3 install --no-cache-dir \

diff --git a/robot/resources/dcae/hvves.robot b/robot/resources/dcae/hvves.robot
index cb88b83..60b61d9 100644 (file)
--- a/robot/resources/dcae/hvves.robot
+++ b/robot/resources/dcae/hvves.robot
@@ -7,7 +7,7 @@ Library    Collections
 Library    ONAPLibrary.Utilities
 Library    String
 Library    ONAPLibrary.Kafka
-Resource    ../mr_interface.robot
+Resource    ../dmaap/mr_interface.robot
 
 *** Variables ***
 ${HVVES_MESSAGE}    \xaa\x01\x00\x00\x00\x00\x00\x01\x00\x00\x01'\n\x94\x02\n\x0esample-version\x12\x08perf3gpp\x18\x01 \x01*\nperf3GPP222\x11sample-event-name:\x11sample-event-type@\xf1\x9a\xfd\xdd\x05H\xf1\x9a\xfd\xdd\x05R\x15sample-nf-naming-codeZ\x16sample-nfc-naming-codeb\x15sample-nf-vendor-namej\x1asample-reporting-entity-idr\x1csample-reporting-entity-namez\x10sample-source-id\x82\x01\x0fsample-xnf-name\x8a\x01\tUTC+02:00\x92\x01\x057.0.2\x12\x0etest test test

diff --git a/robot/resources/dmaap/bc_interface.robot b/robot/resources/dmaap/bc_interface.robot
index b57c67d..11b2c37 100644 (file)
--- a/robot/resources/dmaap/bc_interface.robot
+++ b/robot/resources/dmaap/bc_interface.robot
@@ -2,7 +2,7 @@
 Documentation     The main interface for interacting with Bus Controller.
 Library           RequestsLibrary
 
-Resource          global_properties.robot
+Resource          ../global_properties.robot
 
 *** Variables ***
 ${BC_HEALTH_CHECK_PATH}        /webapi/dmaap

diff --git a/robot/resources/dmaap/dr_interface.robot b/robot/resources/dmaap/dr_interface.robot
index b368ce9..510bc6f 100755 (executable)
--- a/robot/resources/dmaap/dr_interface.robot
+++ b/robot/resources/dmaap/dr_interface.robot
@@ -2,7 +2,7 @@
 Documentation     The main interface for interacting with Data-Router.
 Library           RequestsLibrary
 
-Resource          global_properties.robot
+Resource          ../global_properties.robot
 
 *** Variables ***
 ${DR_HEALTH_CHECK_PATH}    /internal/fetchProv

diff --git a/robot/resources/dmaap/mr_interface.robot b/robot/resources/dmaap/mr_interface.robot
index f4c57cd..5983089 100644 (file)
--- a/robot/resources/dmaap/mr_interface.robot
+++ b/robot/resources/dmaap/mr_interface.robot
@@ -7,7 +7,7 @@ Library           ONAPLibrary.JSON
 Library                  ONAPLibrary.Utilities
 Library                  ONAPLibrary.Templating    WITH NAME    Templating
 
-Resource          global_properties.robot
+Resource          ../global_properties.robot
 
 *** Variables ***
 ${MR_HEALTH_CHECK_PATH}        /topics

diff --git a/robot/resources/test_templates/pnf_registration_without_SO_template.robot b/robot/resources/test_templates/pnf_registration_without_SO_template.robot
index 087d694..844718e 100644 (file)
--- a/robot/resources/test_templates/pnf_registration_without_SO_template.robot
+++ b/robot/resources/test_templates/pnf_registration_without_SO_template.robot
@@ -3,7 +3,7 @@ Documentation     PNF Registration Handler (PRH) test cases
 Resource        ../aai/aai_interface.robot
 Resource        ../aai/create_customer.robot
 Resource        ../sdc_interface.robot
-Resource        ../mr_interface.robot
+Resource        ../dmaap/mr_interface.robot
 Resource        ../so/add_service_recipe.robot
 Resource        ../test_templates/pnf_orchestration_test_template.robot
 Resource        ../demo_preload.robot

diff --git a/robot/resources/usecases/5gbulkpm_helm_interface.robot b/robot/resources/usecases/5gbulkpm_helm_interface.robot
index dd4fd17..12e876c 100644 (file)
--- a/robot/resources/usecases/5gbulkpm_helm_interface.robot
+++ b/robot/resources/usecases/5gbulkpm_helm_interface.robot
@@ -4,9 +4,9 @@ Library               RequestsLibrary
 Library           OperatingSystem
 Library           String
 Library           JSONLibrary
-Resource          ../mr_interface.robot
-Resource          ../dr_interface.robot
-Resource          ../bc_interface.robot
+Resource          ../dmaap/mr_interface.robot
+Resource          ../dmaap/dr_interface.robot
+Resource          ../dmaap/bc_interface.robot
 Resource          ../consul_interface.robot
 Resource          ../chart_museum.robot
 

diff --git a/robot/testsuites/health-check.robot b/robot/testsuites/health-check.robot
index bf0aa3f..595e790 100644 (file)
--- a/robot/testsuites/health-check.robot
+++ b/robot/testsuites/health-check.robot
@@ -10,8 +10,8 @@ Resource          ../resources/aai/aai_interface.robot
 Resource          ../resources/policy_interface.robot
 Resource          ../resources/sdc_interface.robot
 Resource          ../resources/portal_interface.robot
-Resource          ../resources/mr_interface.robot
-Resource          ../resources/bc_interface.robot
+Resource          ../resources/dmaao/mr_interface.robot
+Resource          ../resources/dmaap/bc_interface.robot
 Resource          ../resources/aaf_interface.robot
 Resource          ../resources/msb_interface.robot
 Resource          ../resources/clamp_interface.robot
@@ -22,7 +22,7 @@ Resource          ../resources/vnfsdk_interface.robot
 Resource          ../resources/log_interface.robot
 Resource          ../resources/oof_interface.robot
 Resource          ../resources/sms_interface.robot
-Resource          ../resources/dr_interface.robot
+Resource          ../resources/dmaap/dr_interface.robot
 Resource          ../resources/pomba_interface.robot
 Resource          ../resources/holmes_interface.robot
 Resource          ../resources/cds_interface.robot

diff --git a/robot/testsuites/usecases/5gson.robot b/robot/testsuites/usecases/5gson.robot
index e838288..9c58818 100644 (file)
--- a/robot/testsuites/usecases/5gson.robot
+++ b/robot/testsuites/usecases/5gson.robot
@@ -12,7 +12,7 @@ Library           Process
 Library           ONAPLibrary.JSON
 Library           ONAPLibrary.Utilities
 Resource          ../../resources/policy_interface.robot
-Resource          ../../resources/mr_interface.robot
+Resource          ../../resources/dmaap/mr_interface.robot
 Resource          ../../resources/dcae/ves_interface.robot
 Resource          ../../resources/usecases/5gbulkpm_interface.robot
 Suite Teardown    SON Usecase Teardown

diff --git a/robot/testsuites/ves.robot b/robot/testsuites/ves.robot
index 957b11e..8e98f86 100644 (file)
--- a/robot/testsuites/ves.robot
+++ b/robot/testsuites/ves.robot
@@ -12,8 +12,8 @@ Library           Process
 Library           ONAPLibrary.JSON
 Library           ONAPLibrary.Utilities
 Resource          ../resources/dcae/ves_interface.robot
-Resource          ../resources/mr_interface.robot
-Resource          ../resources/dr_interface.robot
+Resource          ../resources/dmaap/mr_interface.robot
+Resource          ../resources/dmaap/dr_interface.robot
 Suite Setup       Activate DMAAP Topics
 
 *** Variables ***