From 290fe9848e7d8bdbbab5a93fb69f0a3b674c2e5d Mon Sep 17 00:00:00 2001
From: Gary Wu <gary.i.wu@huawei.com>
Date: Thu, 14 Sep 2017 15:18:09 -0700
Subject: Add testsuite python utils to CSIT

Change-Id: Id80ac4b33710d0c1cdd9249d9f0c3f4d78a81d27
Issue-ID: INT-200
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---
 .gitignore                                   |  1 +
 test/csit/run-csit.sh                        |  6 ++++++
 test/csit/tests/integration/vCPE/test1.robot | 27 ++++++++++++++++++++++-----
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index f3b07b8d9..ed95eabcc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ env.properties
 .vagrant
 *~
 .checkstyle
+test/testsuite/
diff --git a/test/csit/run-csit.sh b/test/csit/run-csit.sh
index 8033f308a..c1f38e3ab 100755
--- a/test/csit/run-csit.sh
+++ b/test/csit/run-csit.sh
@@ -93,6 +93,12 @@ if ! type pybot > /dev/null; then
     source ${ROBOT_VENV}/bin/activate
 fi
 
+# install eteutils
+rm -rf ${WORKSPACE}/test/testsuite
+git clone https://gerrit.onap.org/r/testsuite/python-testing-utils.git ${WORKSPACE}/test/testsuite/python-testing-utils
+
+
+
 
 WORKDIR=`mktemp -d --suffix=-robot-workdir`
 cd ${WORKDIR}
diff --git a/test/csit/tests/integration/vCPE/test1.robot b/test/csit/tests/integration/vCPE/test1.robot
index 01a14e62f..3bcd1dde9 100644
--- a/test/csit/tests/integration/vCPE/test1.robot
+++ b/test/csit/tests/integration/vCPE/test1.robot
@@ -1,17 +1,26 @@
 *** Settings ***
+Suite Setup       Suite Setup
+Suite Teardown    Suite Teardown
 Library           OperatingSystem
 Library           RequestsLibrary
 Library           Process
+Library           ../../../../testsuite/python-testing-utils/eteutils/UUID.py
+
+*** Variables ***
+${GLOBAL_APPLICATION_ID}    csit-vCPE
+${GLOBAL_MSO_USERNAME}    InfraPortalClient
+${GLOBAL_MSO_PASSWORD}    password1$
 
 *** Test Cases ***
 SO ServiceInstance health check
-    ${SO_IP}=    Run Docker    nexus3.onap.org:10001/openecomp/mso    i-so
-    Wait Until Keyword Succeeds    1 min    5 sec    CheckUrl    http://${SO_IP}:8080
-    Create Session    refrepo    http://${SO_IP}:8080
+    ${auth}=    Create List    ${GLOBAL_MSO_USERNAME}    ${GLOBAL_MSO_PASSWORD}
+    ${session}=    Create Session    so    http://${SO_IP}:8080
+    ${uuid}=    Generate UUID
+    ${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}
     &{headers}=    Create Dictionary    Authorization=Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==    Content-Type=application/json    Accept=application/json
-    ${resp}=    Get Request    refrepo    /ecomp/mso/infra/orchestrationRequests/v2    headers=${headers}
+    ${resp}=    Get Request    so    /ecomp/mso/infra/orchestrationRequests/v2    headers=${headers}
     Should Not Contain    ${resp.content}    null
-    Kill Docker    i-so
 
 *** Keywords ***
 Run Docker
@@ -41,3 +50,11 @@ CheckUrl
     Create Session    session    ${url}    disable_warnings=True
     ${resp}=    Get Request    session    /
     Should Be Equal As Integers    ${resp.status_code}    200
+
+Suite Setup
+    ${SO_IP}=    Run Docker    nexus3.onap.org:10001/openecomp/mso    i-so
+    Wait Until Keyword Succeeds    1 min    5 sec    CheckUrl    http://${SO_IP}:8080
+    Set Suite Variable    ${SO_IP}
+
+Suite Teardown
+    Kill Docker    i-so
-- 
cgit 1.2.3-korg