Merge "Add more tests to CSIT"

4 files changed, 30 insertions, 17 deletions

diff --git a/test/csit/tests/clamp/APIs/01__Create_CL_Holmes.robot b/test/csit/tests/clamp/APIs/01__Create_CL_Holmes.robot
index f837bae53..f820ef632 100644
--- a/test/csit/tests/clamp/APIs/01__Create_CL_Holmes.robot
+++ b/test/csit/tests/clamp/APIs/01__Create_CL_Holmes.robot
@@ -4,6 +4,9 @@ Library     RequestsLibrary
 Library     OperatingSystem
 Library     json
 
+*** Variables ***
+${login}                     admin
+${passw}                     password
 
 *** Test Cases ***
 Get Requests health check ok
@@ -12,7 +15,7 @@ Get Requests health check ok
     Should Be Equal As Strings  ${resp.status_code}     200
 
 Get Requests verify test template found
-    ${auth}=    Create List     admin    password
+    ${auth}=    Create List     ${login}    ${passw}
     Create Session   clamp  http://localhost:8080   auth=${auth}
     ${resp}=    Get Request    clamp   /restservices/clds/v1/cldsTempate/template-names
     Should Be Equal As Strings  ${resp.status_code}     200
@@ -21,7 +24,7 @@ Get Requests verify test template found
     Should Not Contain Match     ${resp}      *templateHolmes99*
 
 Put Requests to add Close Loop ClHolmes1
-    ${auth}=    Create List     admin    password
+    ${auth}=    Create List     ${login}    ${passw}
     Create Session   clamp  http://localhost:8080   auth=${auth}
     ${data}=    Get Binary File     ${CURDIR}${/}data${/}createClHolmes1.json
     &{headers}=  Create Dictionary      Content-Type=application/json
@@ -29,7 +32,7 @@ Put Requests to add Close Loop ClHolmes1
     Should Be Equal As Strings      ${resp.status_code}     200
 
 Put Requests to add Close Loop ClHolmes2
-    ${auth}=    Create List     admin    password
+    ${auth}=    Create List     ${login}    ${passw}
     Create Session   clamp  http://localhost:8080   auth=${auth}
     ${data}=    Get Binary File     ${CURDIR}${/}data${/}createClHolmes2.json
     &{headers}=  Create Dictionary      Content-Type=application/json
@@ -37,7 +40,7 @@ Put Requests to add Close Loop ClHolmes2
     Should Be Equal As Strings      ${resp.status_code}     200
 
 Get Requests verify CL1 found
-    ${auth}=    Create List     admin    password
+    ${auth}=    Create List     ${login}    ${passw}
     Create Session   clamp  http://localhost:8080   auth=${auth}
     ${resp}=    Get Request    clamp   /restservices/clds/v1/clds/model-names
     Should Be Equal As Strings  ${resp.status_code}     200
diff --git a/test/csit/tests/clamp/APIs/02__Create_CL_TCA.robot b/test/csit/tests/clamp/APIs/02__Create_CL_TCA.robot
index c86b2a71c..5dfa87904 100644
--- a/test/csit/tests/clamp/APIs/02__Create_CL_TCA.robot
+++ b/test/csit/tests/clamp/APIs/02__Create_CL_TCA.robot
@@ -4,6 +4,9 @@ Library     RequestsLibrary
 Library     OperatingSystem
 Library     json
 
+*** Variables ***
+${login}                     admin
+${passw}                     password
 
 *** Test Cases ***
 Get Requests health check ok
@@ -12,7 +15,7 @@ Get Requests health check ok
     Should Be Equal As Strings  ${resp.status_code}     200
 
 Get Requests verify test template found
-    ${auth}=    Create List     admin    password
+    ${auth}=    Create List     ${login}    ${passw}
     Create Session   clamp  http://localhost:8080   auth=${auth}
     ${resp}=    Get Request    clamp   /restservices/clds/v1/cldsTempate/template-names
     Should Be Equal As Strings  ${resp.status_code}     200
@@ -21,7 +24,7 @@ Get Requests verify test template found
     Should Not Contain Match     ${resp}      *templateTCA99*
 
 Put Requests to add Close Loop ClHolmes1
-    ${auth}=    Create List     admin    password
+    ${auth}=    Create List     ${login}    ${passw}
     Create Session   clamp  http://localhost:8080   auth=${auth}
     ${data}=    Get Binary File     ${CURDIR}${/}data${/}createClTCA1.json
     &{headers}=  Create Dictionary      Content-Type=application/json
@@ -29,7 +32,7 @@ Put Requests to add Close Loop ClHolmes1
     Should Be Equal As Strings      ${resp.status_code}     200
 
 Put Requests to add Close Loop ClHolmes2
-    ${auth}=    Create List     admin    password
+    ${auth}=    Create List     ${login}    ${passw}
     Create Session   clamp  http://localhost:8080   auth=${auth}
     ${data}=    Get Binary File     ${CURDIR}${/}data${/}createClTCA2.json
     &{headers}=  Create Dictionary      Content-Type=application/json
@@ -37,7 +40,7 @@ Put Requests to add Close Loop ClHolmes2
     Should Be Equal As Strings      ${resp.status_code}     200
 
 Get Requests verify CL1 found
-    ${auth}=    Create List     admin    password
+    ${auth}=    Create List     ${login}    ${passw}
     Create Session   clamp  http://localhost:8080   auth=${auth}
     ${resp}=    Get Request    clamp   /restservices/clds/v1/clds/model-names
     Should Be Equal As Strings  ${resp.status_code}     200
diff --git a/test/csit/tests/clamp/APIs/03__VariousApis.robot b/test/csit/tests/clamp/APIs/03__VariousApis.robot
index df6e7e41f..fb671ca41 100644
--- a/test/csit/tests/clamp/APIs/03__VariousApis.robot
+++ b/test/csit/tests/clamp/APIs/03__VariousApis.robot
@@ -4,24 +4,27 @@ Library     RequestsLibrary
 Library     OperatingSystem
 Library     json
 
+*** Variables ***
+${login}                     admin
+${passw}                     password
 
 *** Test Cases ***
 Get Clamp properties
-    ${auth}=    Create List     admin    password
+    ${auth}=    Create List     ${login}    ${passw}
     Create Session   clamp  http://localhost:8080   auth=${auth}
     ${resp}=    Get Request    clamp   /restservices/clds/v1/clds/properties
     Dictionary Should Contain Key    ${resp.json()}   global
     Dictionary Should Contain Key    ${resp.json()['global']}   location
 
 Get Clamp Info
-    ${auth}=    Create List     admin    password
+    ${auth}=    Create List     ${login}    ${passw}
     Create Session   clamp  http://localhost:8080   auth=${auth}
     ${resp}=    Get Request    clamp   /restservices/clds/v1/clds/cldsInfo
     Dictionary Should Contain Key    ${resp.json()}   userName
     Dictionary Should Contain Key    ${resp.json()}   cldsVersion
 
 Get model bpmn by name
-    ${auth}=    Create List     admin    password
+    ${auth}=    Create List     ${login}    ${passw}
     Create Session   clamp  http://localhost:8080   auth=${auth}
     ${resp}=    Get Request    clamp   /restservices/clds/v1/clds/model/bpmn/ClHolmes1
     Should Contain Match    ${resp}   *StartEvent_*
@@ -31,7 +34,7 @@ Get model bpmn by name
     Should Contain Match    ${resp}   *EndEvent_*
 
 Get model names
-    ${auth}=    Create List     admin    password
+    ${auth}=    Create List     ${login}    ${passw}
     Create Session   clamp  http://localhost:8080   auth=${auth}
     ${resp}=    Get Request    clamp   /restservices/clds/v1/clds/model-names
     Should Contain Match    ${resp}   *ClHolmes1*
diff --git a/test/csit/tests/clamp/APIs/04__Verify_API_Models.robot b/test/csit/tests/clamp/APIs/04__Verify_API_Models.robot
index 1bca5949e..3ae6aeeb9 100644
--- a/test/csit/tests/clamp/APIs/04__Verify_API_Models.robot
+++ b/test/csit/tests/clamp/APIs/04__Verify_API_Models.robot
@@ -4,9 +4,13 @@ Library     RequestsLibrary
 Library     OperatingSystem
 Library     json
 
+*** Variables ***
+${login}                     admin
+${passw}                     password
+
 *** Test Cases ***
 Verify HolmesModel1
-    ${auth}=    Create List     admin    password
+    ${auth}=    Create List     ${login}    ${passw}
     Create Session   clamp  http://localhost:8080   auth=${auth}
     ${resp}=    Get Request    clamp   /restservices/clds/v1/clds/model/ClHolmes1
     Should Contain Match    ${resp}   *templateHolmes1*
@@ -19,7 +23,7 @@ Verify HolmesModel1
     Should Contain Match    ${resp}   *Config Policy name1*
 
 Verify HolmesModel2
-    ${auth}=    Create List     admin    password
+    ${auth}=    Create List     ${login}    ${passw}
     Create Session   clamp  http://localhost:8080   auth=${auth}
     ${resp}=    Get Request    clamp   /restservices/clds/v1/clds/model/ClHolmes2
     Should Contain Match    ${resp}   *templateHolmes2*
@@ -33,7 +37,7 @@ Verify HolmesModel2
     Should Contain Match    ${resp}   *Config Policy Name2*
 
 Verify TCAModel1
-    ${auth}=    Create List     admin    password
+    ${auth}=    Create List     ${login}    ${passw}
     Create Session   clamp  http://localhost:8080   auth=${auth}
     ${resp}=    Get Request    clamp   /restservices/clds/v1/clds/model/ClTCA1
     Should Contain Match    ${resp}   *templateTCA1*
@@ -46,7 +50,7 @@ Verify TCAModel1
     Should Contain Match    ${resp}   *ONSET*
 
 Verify TCAModel2
-    ${auth}=    Create List     admin    password
+    ${auth}=    Create List     ${login}    ${passw}
     Create Session   clamp  http://localhost:8080   auth=${auth}
     ${resp}=    Get Request    clamp   /restservices/clds/v1/clds/model/ClTCA2
     Should Contain Match    ${resp}   *templateTCA2*
@@ -61,7 +65,7 @@ Verify TCAModel2
     Should Contain Match    ${resp}   *VM*
 
 Get model names
-    ${auth}=    Create List     admin    password
+    ${auth}=    Create List     ${login}    ${passw}
     Create Session   clamp  http://localhost:8080   auth=${auth}
     ${resp}=    Get Request    clamp   /restservices/clds/v1/clds/model-names
     Should Contain Match    ${resp}   *ClHolmes1*