12 files changed, 103 insertions, 11 deletions
diff --git a/test/csit/tests/clamp/TCA/test1.robot b/test/csit/tests/clamp/TCA/01__TCA.robot
index b1fb0f440..45f20f248 100644
--- a/test/csit/tests/clamp/TCA/test1.robot
+++ b/test/csit/tests/clamp/TCA/01__TCA.robot
@@ -3,7 +3,6 @@ Library     Collections
 Library     RequestsLibrary
 Library     OperatingSystem
 Library     json
-Library     HttpLibrary.HTTP
 
 
 *** Test Cases ***
diff --git a/test/csit/tests/clamp/UIs/test1_create_template.robot b/test/csit/tests/clamp/UIs/01__Create_template.robot
index 008b13d2a..d740ac987 100644
--- a/test/csit/tests/clamp/UIs/test1_create_template.robot
+++ b/test/csit/tests/clamp/UIs/01__Create_template.robot
@@ -3,7 +3,6 @@ Library     Collections
 Library     RequestsLibrary
 Library     OperatingSystem
 Library     json
-Library     HttpLibrary.HTTP
 Library     Selenium2Library
 Library     XvfbRobot
 
@@ -42,15 +41,15 @@ Create Template from Menu
     Click Element    xpath=//*[@id="navbar"]/ul/li[1]/a
     Wait Until Element Is Visible       locator=Create Template       timeout=60
     Click Element    locator=Create Template
-    Input Text      locator=modelName       text=template1
+    Input Text      locator=modelName       text=template
     Click Button    locator=OK
 
 Drag and Drop Boxes for template
-    Wait Until Element Is Visible       xpath=//*[@id="js-canvas"]/div/div/div[4]/div[1]/div/div[2]       timeout=60
-    Drag And Drop By Offset     xpath=//*[@id="js-canvas"]/div/div/div[4]/div[1]/div/div[2]       280      280
-    Drag And Drop By Offset     xpath=//*[@id="js-canvas"]/div/div/div[4]/div[1]/div/div[4]       550      280
-    Drag And Drop By Offset     xpath=//*[@id="js-canvas"]/div/div/div[4]/div[1]/div/div[5]       800      280
-    Drag And Drop By Offset     xpath=//*[@id="js-canvas"]/div/div/div[4]/div[1]/div/div[6]       1000      280
+    Wait Until Element Is Visible       xpath=//*[@class="entry icon-collector-node"]       timeout=60
+    Drag And Drop By Offset     xpath=//*[@class="entry icon-collector-node"]       280      280
+    Drag And Drop By Offset     xpath=//*[@class="entry icon-tca-node"]       550      280
+    Drag And Drop By Offset     xpath=//*[@class="entry icon-policy-node"]       800      280
+    Drag And Drop By Offset     xpath=//*[@class="entry icon-end-event-none"]       1000      280
 
 Drag and Drop Connectors for template
     Click Element    xpath=//*[starts-with(@data-element-id, "StartEvent_")]
diff --git a/test/csit/tests/clamp/UIs/test2_create_Model.robot b/test/csit/tests/clamp/UIs/02__Create_model.robot
index e8de881bb..979a9802e 100644
--- a/test/csit/tests/clamp/UIs/test2_create_Model.robot
+++ b/test/csit/tests/clamp/UIs/02__Create_model.robot
@@ -3,7 +3,6 @@ Library     Collections
 Library     RequestsLibrary
 Library     OperatingSystem
 Library     json
-Library     HttpLibrary.HTTP
 Library     Selenium2Library
 Library     XvfbRobot
 
diff --git a/test/csit/tests/cli/startup/__init__.robot b/test/csit/tests/cli/startup/__init__.robot
new file mode 100644
index 000000000..9eca6917a
--- /dev/null
+++ b/test/csit/tests/cli/startup/__init__.robot
@@ -0,0 +1,2 @@
+*** Settings ***
+Documentation    cli - Startup
diff --git a/test/csit/tests/cli/startup/startup_check.robot b/test/csit/tests/cli/startup/startup_check.robot
new file mode 100644
index 000000000..c79da34ba
--- /dev/null
+++ b/test/csit/tests/cli/startup/startup_check.robot
@@ -0,0 +1,16 @@
+*** Settings ***
+Library       RequestsLibrary
+
+*** Test Cases ***
+Liveness Test
+    [Documentation]        Check cli liveness check
+    Create Session         cli              http://${CLI_IP}:8080
+    CheckUrl               cli              /
+
+*** Keywords ***
+CheckUrl
+    [Arguments]                   ${session}  ${path}
+    ${resp}=                      Get Request          ${session}  ${path}
+    Should Be Equal As Integers   ${resp.status_code}  200
+
+
diff --git a/test/csit/tests/holmes/testcase/EngineMgt/EngineAddr.robot b/test/csit/tests/holmes/testcase/EngineMgt/EngineAddr.robot
index 24c809c97..71354d33d 100644
--- a/test/csit/tests/holmes/testcase/EngineMgt/EngineAddr.robot
+++ b/test/csit/tests/holmes/testcase/EngineMgt/EngineAddr.robot
@@ -1,3 +1,3 @@
 *** Variables ***
 ${engineHost}     http://${MSB_IP}
-${engineUrl}      /onapapi/holmes-engine-mgmt/v1/rule
+${engineUrl}      /api/holmes-engine-mgmt/v1/rule
diff --git a/test/csit/tests/holmes/testcase/RuleMgt/RuleAddr.robot b/test/csit/tests/holmes/testcase/RuleMgt/RuleAddr.robot
index ec565e9ab..be7384206 100644
--- a/test/csit/tests/holmes/testcase/RuleMgt/RuleAddr.robot
+++ b/test/csit/tests/holmes/testcase/RuleMgt/RuleAddr.robot
@@ -1,3 +1,3 @@
 *** Variables ***
 ${ruleMgtHost}    http://${MSB_IP}
-${ruleMgtUrl}     /onapapi/holmes-rule-mgmt/v1/rule
+${ruleMgtUrl}     /api/holmes-rule-mgmt/v1/rule
diff --git a/test/csit/tests/vfc/gvnfm-vnflcm/test.robot b/test/csit/tests/vfc/gvnfm-vnflcm/test.robot
new file mode 100644
index 000000000..817be51bd
--- /dev/null
+++ b/test/csit/tests/vfc/gvnfm-vnflcm/test.robot
@@ -0,0 +1,14 @@
+*** settings ***
+Library     Collections
+Library     RequestsLibrary
+Library     OperatingSystem
+Library     json
+
+*** Variables ***
+@{return_ok_list}=   200  201  202
+${queryswagger_url}    /api/vnflcm/v1/swagger.json
+
+*** Test Cases ***
+NslcmSwaggerTest
+    [Documentation]    query nslcm swagger info rest test
+    Should Be Equal    2.0    2.0
diff --git a/test/csit/tests/vfc/gvnfm-vnfmgr/test.robot b/test/csit/tests/vfc/gvnfm-vnfmgr/test.robot
new file mode 100644
index 000000000..90392c982
--- /dev/null
+++ b/test/csit/tests/vfc/gvnfm-vnfmgr/test.robot
@@ -0,0 +1,14 @@
+*** settings ***
+Library     Collections
+Library     RequestsLibrary
+Library     OperatingSystem
+Library     json
+
+*** Variables ***
+@{return_ok_list}=   200  201  202
+${queryswagger_url}    /api/vnfmgr/v1/swagger.json
+
+*** Test Cases ***
+NslcmSwaggerTest
+    [Documentation]    query vnfmgr swagger info rest test
+    Should Be Equal    2.0    2.0
diff --git a/test/csit/tests/vfc/gvnfm-vnfres/test.robot b/test/csit/tests/vfc/gvnfm-vnfres/test.robot
new file mode 100644
index 000000000..21ae45996
--- /dev/null
+++ b/test/csit/tests/vfc/gvnfm-vnfres/test.robot
@@ -0,0 +1,14 @@
+*** settings ***
+Library     Collections
+Library     RequestsLibrary
+Library     OperatingSystem
+Library     json
+
+*** Variables ***
+@{return_ok_list}=   200  201  202
+${queryswagger_url}    /api/vnfres/v1/swagger.json
+
+*** Test Cases ***
+NslcmSwaggerTest
+    [Documentation]    query vnfres swagger info rest test
+    Should Be Equal    2.0    2.0
diff --git a/test/csit/tests/vfc/nfvo-catalog/test.robot b/test/csit/tests/vfc/nfvo-catalog/test.robot
new file mode 100644
index 000000000..a23128c90
--- /dev/null
+++ b/test/csit/tests/vfc/nfvo-catalog/test.robot
@@ -0,0 +1,19 @@
+*** settings ***
+Library     Collections
+Library     RequestsLibrary
+Library     OperatingSystem
+Library     json
+
+*** Variables ***
+@{return_ok_list}=         200  201  202
+${queryswagger_url}        /api/catalog/v1/swagger.json
+${queryVNFPackage_url}     /api/catalog/v1/vnfpackages
+${queryNSPackages_url}     /api/catalog/v1/nspackages
+
+*** Test Cases ***
+GetVNFPackages
+    ${headers}            Create Dictionary    Content-Type=application/json    Accept=application/json
+    Create Session        web_session          http://${CATALOG_IP}             headers=${headers}
+    ${resp}=              Get Request          web_session                      ${queryVNFPackage_url}
+    ${responese_code}=    Convert To String    ${resp.status_code}
+    List Should Contain Value    ${return_ok_list}   ${responese_code}
diff --git a/test/csit/tests/vfc/nfvo-resmanagement/test.robot b/test/csit/tests/vfc/nfvo-resmanagement/test.robot
new file mode 100644
index 000000000..996cf5845
--- /dev/null
+++ b/test/csit/tests/vfc/nfvo-resmanagement/test.robot
@@ -0,0 +1,16 @@
+*** settings ***
+Library     Collections
+Library     RequestsLibrary
+Library     simplejson
+Library     OperatingSystem
+Library     json
+Library     HttpLibrary.HTTP
+
+*** Variables ***
+@{return_ok_list}=   200  201  202
+${queryswagger_url}    /api/resmgr/v1/swagger.json
+
+*** Test Cases ***
+SwaggerFuncTest
+    [Documentation]    query swagger info rest test
+    Should Be Equal    2.0    2.0