From: efiacor <fiachra.corcoran@est.tech>
Date: Wed, 21 Dec 2022 08:56:10 +0000 (+0000)
Subject: [DMAAP] Fix dmaap interface endpoints
X-Git-Tag: 1.12.0~2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F17%2F132817%2F2;p=testsuite.git

[DMAAP] Fix dmaap interface endpoints

Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: I6ed81e4eebdeb4825926a3552b5dec2cd50129f2
Issue-ID: DMAAP-1573
---

diff --git a/robot/resources/bc_interface.robot b/robot/resources/dmaap/bc_interface.robot
similarity index 81%
rename from robot/resources/bc_interface.robot
rename to robot/resources/dmaap/bc_interface.robot
index 7d4c1fb1..b57c67d5 100644
--- a/robot/resources/bc_interface.robot
+++ b/robot/resources/dmaap/bc_interface.robot
@@ -6,7 +6,7 @@ Resource          global_properties.robot
 
 *** Variables ***
 ${BC_HEALTH_CHECK_PATH}        /webapi/dmaap
-${BC_HTTPS_ENDPOINT}     https://${GLOBAL_INJECTED_BC_IP_ADDR}:${GLOBAL_BC_HTTPS_SERVER_PORT}
+${DMAAP_BC_ENDPOINT}     ${GLOBAL_BC_SERVER_PROTOCOL}://${GLOBAL_INJECTED_BC_IP_ADDR}:${GLOBAL_BC_HTTPS_SERVER_PORT}
 
 
 *** Keywords ***
@@ -20,7 +20,7 @@ Return dmaap details with basic auth
      [Documentation]    Runs Bus Controller get details request with basic authentication
      [Arguments]    ${data_path}
      ${auth}=  Create List     ${GLOBAL_BC_USERNAME}   ${GLOBAL_BC_PASSWORD}
-     ${session}=    Create Session      bs      ${BC_HTTPS_ENDPOINT}    auth=${auth}
+     ${session}=    Create Session      bs      ${DMAAP_BC_ENDPOINT}    auth=${auth}
      ${resp}=   Get Request     bs      ${data_path}
      Log    Received response from bus controller ${resp.text}
      [Return]    ${resp}
@@ -29,7 +29,7 @@ Delete MR topic
     [Documentation]    Runs Bus Controller to remove topic
     [Arguments]    ${data_path}
     ${auth}=  Create List     ${GLOBAL_BC_USERNAME}   ${GLOBAL_BC_PASSWORD}
-    ${session}=    Create Session      bs      ${BC_HTTPS_ENDPOINT}    auth=${auth}
+    ${session}=    Create Session      bs      ${DMAAP_BC_ENDPOINT}    auth=${auth}
     ${resp}=   Delete Request     bs      ${data_path}
     Log    Received response from bus controller ${resp.status_code}
     [Return]    ${resp}
\ No newline at end of file
diff --git a/robot/resources/dr_interface.robot b/robot/resources/dmaap/dr_interface.robot
similarity index 100%
rename from robot/resources/dr_interface.robot
rename to robot/resources/dmaap/dr_interface.robot
diff --git a/robot/resources/mr_interface.robot b/robot/resources/dmaap/mr_interface.robot
similarity index 100%
rename from robot/resources/mr_interface.robot
rename to robot/resources/dmaap/mr_interface.robot