10 files changed, 57 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/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/msb/tcp-service-access/__init__.robot b/test/csit/tests/msb/tcp-service-access/__init__.robot
new file mode 100644
index 000000000..efd2221f2
--- /dev/null
+++ b/test/csit/tests/msb/tcp-service-access/__init__.robot
@@ -0,0 +1,2 @@
+*** Settings ***
+Documentation    Microservices Service Bus - Messag Broker
diff --git a/test/csit/tests/msb/tcp-service-access/test1.robot b/test/csit/tests/msb/tcp-service-access/test1.robot
new file mode 100644
index 000000000..e84c7e1a3
--- /dev/null
+++ b/test/csit/tests/msb/tcp-service-access/test1.robot
@@ -0,0 +1,16 @@
+*** Settings ***
+Library  Collections
+Library  requests
+
+*** Test Cases ***
+Messag Broker Test1
+    [Documentation]            Check if ActiveMQ index page can be accessed
+    ${result} =  get           http://${MSB_DISCOVERY_IP}:10081/api/microservices/v1/services/ActiveMQ/version/null
+    Should Be Equal            ${result.status_code}       ${200}
+	${json} =                  Set Variable                ${result.json()}
+    ${activeMQ_ip} =           Set Variable                ${json["nodes"][0]["ip"]}
+    ${activeMQ_port} =         Set Variable                ${json["nodes"][0]["port"]}
+
+    ${result} =  get           http://${activeMQ_ip}:8161
+    Should Be Equal            ${result.status_code}       ${200}
+
diff --git a/test/csit/tests/msb/tcp-service-access/test2.robot b/test/csit/tests/msb/tcp-service-access/test2.robot
new file mode 100644
index 000000000..58e5471b7
--- /dev/null
+++ b/test/csit/tests/msb/tcp-service-access/test2.robot
@@ -0,0 +1,15 @@
+*** Settings ***
+Library  Collections
+Library  requests
+Library  Telnet 
+
+*** Test Cases ***
+Messag Broker Test2
+    [Documentation]            Check if ActiveMQ listening port can be accessed
+    ${result} =  get           http://${MSB_DISCOVERY_IP}:10081/api/microservices/v1/services/ActiveMQ/version/null
+    Should Be Equal            ${result.status_code}       ${200}
+	${json} =                  Set Variable                ${result.json()}
+    ${activeMQ_ip} =           Set Variable                ${json["nodes"][0]["ip"]}
+    ${activeMQ_port} =         Set Variable                ${json["nodes"][0]["port"]}
+    
+    Open Connection            ${activeMQ_ip}              port=${activeMQ_port}              
diff --git a/test/csit/tests/msb/tcp-service-discovery/__init__.robot b/test/csit/tests/msb/tcp-service-discovery/__init__.robot
new file mode 100644
index 000000000..efd2221f2
--- /dev/null
+++ b/test/csit/tests/msb/tcp-service-discovery/__init__.robot
@@ -0,0 +1,2 @@
+*** Settings ***
+Documentation    Microservices Service Bus - Messag Broker
diff --git a/test/csit/tests/msb/tcp-service-discovery/test1.robot b/test/csit/tests/msb/tcp-service-discovery/test1.robot
new file mode 100644
index 000000000..da6cb3efa
--- /dev/null
+++ b/test/csit/tests/msb/tcp-service-discovery/test1.robot
@@ -0,0 +1,14 @@
+*** Settings ***
+Library  Collections
+Library  requests
+
+*** Test Cases ***
+Messag Broker Test
+    [Documentation]            Check if the message broker enpoint can be get from MSB
+    ${result} =  get           http://${MSB_DISCOVERY_IP}:10081/api/microservices/v1/services/ActiveMQ/version/null
+    Should Be Equal            ${result.status_code}       ${200}
+	${json} =                  Set Variable                ${result.json()}
+    ${serviceName} =           Get From Dictionary         ${json}              serviceName
+    ${protocol} =              Get From Dictionary         ${json}              protocol
+    Should Be Equal            ${serviceName}              ActiveMQ
+    Should Be Equal            ${protocol}                 TCP  
+\ No newline at end of file