Fixing vCPE testsuite

Change-Id: I8341c44c0d2dc38c7edafd27a6051b6cc5c19bac
Issue-ID: INT-2200
Signed-off-by: waqas.ikram <waqas.ikram@est.tech>

diff --git a/prepare-csit.sh b/prepare-csit.sh
index d580f91..60b1610 100755 (executable)
--- a/prepare-csit.sh
+++ b/prepare-csit.sh
@@ -37,7 +37,7 @@ else
     rm -f ${WORKSPACE}/env.properties
     cd /tmp
     git clone "https://gerrit.onap.org/r/ci-management"
-    source /tmp/ci-management/jjb/integration/include-raw-integration-install-robotframework.sh
+    source /tmp/ci-management/jjb/integration/include-raw-integration-install-robotframework-py3.sh
 fi
 
 # install required Robot libraries

diff --git a/tests/integration/vCPE/test1.robot b/tests/integration/vCPE/test1.robot
index d07bf6e..5f0c082 100644 (file)
--- a/tests/integration/vCPE/test1.robot
+++ b/tests/integration/vCPE/test1.robot
@@ -17,10 +17,10 @@ SO ServiceInstance health check
     ${session}=    Create Session    so    http://${SO_IP}:8080
     ${uuid}=    Generate UUID4
     ${headers}=    Create Dictionary    Accept=text/html    Content-Type=text/html    X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid}    X-FromAppId=${GLOBAL_APPLICATION_ID}
-    ${resp}=    Get Request    so    /ecomp/mso/infra/globalhealthcheck    headers=${headers}
+    ${resp}=     Get On Session    so    /ecomp/mso/infra/globalhealthcheck    headers=${headers}    expected_status=any
     &{headers}=    Create Dictionary    Authorization=Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==    Content-Type=application/json    Accept=application/json
-    ${resp}=    Get Request    so    /ecomp/mso/infra/orchestrationRequests/v2    headers=${headers}
-    Should Not Contain    ${resp.content}    null
+    ${resp}=     Get On Session    so    /ecomp/mso/infra/orchestrationRequests/v2    headers=${headers}    expected_status=any
+    Should Not Contain    ${resp.text}    null
 
 *** Keywords ***
 Run Docker
@@ -48,7 +48,7 @@ Kill Docker
 CheckUrl
     [Arguments]    ${url}
     Create Session    session    ${url}    disable_warnings=True
-    ${resp}=    Get Request    session    /
+    ${resp}=    Get On Session   session    /
     Should Be Equal As Integers    ${resp.status_code}    200
 
 Suite Setup