Fix CSIT for CLAMP APIs tests

Change-Id: I094a0eeed354af93c10cc09bef8db3b2355a1957
Signed-off-by: eh552t <eh552t@intl.att.com>
Issue-ID: CLAMP-233

6 files changed, 193 insertions, 428 deletions

diff --git a/tests/clamp/APIs/04__Verify_API_Models.robot b/tests/clamp/APIs/04__Verify_API_Models.robot
index 42c5c43d..9a29a918 100644
--- a/tests/clamp/APIs/04__Verify_API_Models.robot
+++ b/tests/clamp/APIs/04__Verify_API_Models.robot
@@ -11,7 +11,7 @@ ${passw}                     password
 *** Test Cases ***
 Verify HolmesModel1
     ${resp}=    Get Request    ${clamp_session}   /restservices/clds/v1/clds/model/ClHolmes1
-    Should Contain Match    ${resp}   *templateHolmes1*
+    Should Contain Match    ${resp}   *plateHolmes1*
     Should Contain Match    ${resp}   *DC1*
     Should Contain Match    ${resp}   *DC2*
     Should Contain Match    ${resp}   *Policy1*
@@ -22,7 +22,7 @@ Verify HolmesModel1
 
 Verify HolmesModel2
     ${resp}=    Get Request    ${clamp_session}   /restservices/clds/v1/clds/model/ClHolmes2
-    Should Contain Match    ${resp}   *templateHolmes2*
+    Should Contain Match    ${resp}   *plateHolmes2*
     Should Contain Match    ${resp}   *DC2*
     Should Contain Match    ${resp}   *DC3*
     Should Contain Match    ${resp}   *Policy2*
@@ -34,7 +34,7 @@ Verify HolmesModel2
 
 Verify TCAModel1
     ${resp}=    Get Request    ${clamp_session}   /restservices/clds/v1/clds/model/ClTCA1
-    Should Contain Match    ${resp}   *templateTCA1*
+    Should Contain Match    ${resp}   *plateTCA1*
     Should Contain Match    ${resp}   *enbRecipe*
     Should Contain Match    ${resp}   *DC1*
     Should Contain Match    ${resp}   *DC2*
@@ -45,7 +45,7 @@ Verify TCAModel1
 
 Verify TCAModel2
     ${resp}=    Get Request    ${clamp_session}   /restservices/clds/v1/clds/model/ClTCA2
-    Should Contain Match    ${resp}   *templateTCA2*
+    Should Contain Match    ${resp}   *lateTCA2*
     Should Contain Match    ${resp}   *enbRecipe*
     Should Contain Match    ${resp}   *DC1*
     Should Contain Match    ${resp}   *DC2*
diff --git a/tests/clamp/UIs/01__Create_Holmes_model.robot b/tests/clamp/UIs/01__Create_Holmes_model.robot
deleted file mode 100644
index 532a5e48..00000000
--- a/tests/clamp/UIs/01__Create_Holmes_model.robot
+++ /dev/null
@@ -1,95 +0,0 @@
-*** Settings ***
-Library     Collections
-Library     RequestsLibrary
-Library     OperatingSystem
-Library     json
-Library     ../../../scripts/clamp/python-lib/CustomSeleniumLibrary.py
-Library     XvfbRobot
-
-*** Variables ***
-${login}                     admin
-${passw}                     password
-${SELENIUM_SPEED_FAST}       .2 seconds
-${SELENIUM_SPEED_SLOW}       .5 seconds
-${BASE_URL}                  https://localhost:8443
-
-*** Keywords ***
-Create the sessions
-    ${auth}=    Create List     ${login}    ${passw}
-    Create Session   clamp  ${BASE_URL}    auth=${auth}   disable_warnings=1
-    Set Global Variable     ${clamp_session}      clamp
-
-*** Test Cases ***
-Get Requests health check ok
-    Create the sessions
-    ${resp}=    Get Request    ${clamp_session}   /restservices/clds/v1/healthcheck
-    Should Be Equal As Strings  ${resp.status_code}     200
-
-Open Browser
-# Next line is to be enabled for Headless tests only (jenkins?). To see the tests disable the line.
-    Start Virtual Display    1920    1080
-    Set Selenium Speed      ${SELENIUM_SPEED_SLOW}
-    Open Browser    ${BASE_URL}/designer/index.html    browser=firefox
-
-Reply to authentication popup
-    Run Keyword And Ignore Error    Insert into prompt    ${login} ${passw}
-    Confirm action
-
-Good Login to Clamp UI and Verify logged in
-    Set Window Size    1920    1080
-    ${title}=    Get Title
-    Should Be Equal    CLDS    ${title}
-    Wait Until Element Is Visible       xpath=//*[@class="navbar-brand logo_name ng-binding"]       timeout=60
-    Element Text Should Be      xpath=//*[@class="navbar-brand logo_name ng-binding"]       expected=Hello:admin
-
-Create Model from Menu
-    Wait Until Element Is Visible       xpath=//*[@id="navbar"]/ul/li[1]/a       timeout=60
-    Click Element    xpath=//*[@id="navbar"]/ul/li[1]/a
-    Wait Until Element Is Visible       locator=Create CL       timeout=60
-    Click Element    locator=Create CL
-    Input Text      locator=modelName       text=HolmesModel1
-    Select From List By Label       id=templateName      templateHolmes1
-    Click Button    locator=Create
-
-Set Properties for HolmesModel1
-    Wait Until Element Is Visible       xpath=//*[@id="navbar"]/ul/li[1]/a       timeout=60
-    Click Element    xpath=//*[@id="navbar"]/ul/li[1]/a
-    Wait Until Element Is Visible       locator=Properties CL       timeout=60
-    Click Element    locator=Properties CL
-    Select From List By Label       id=service      vFirewall
-    Select From List By Label       id=vf      vFirewall 0
-    Select From List By Label       id=actionSet      VNF
-    Select From List By Label       id=location      Data Center 2      Data Center 3
-    Input Text      locator=deployParameters       text={}
-    Click Button    locator=Save
-
-Set Policy Box properties for HolmesModel1
-    Wait Until Element Is Visible       xpath=//*[@data-element-id="Policy_136qatf"]      timeout=60
-    Click Element    xpath=//*[@data-element-id="Policy_136qatf"]
-    Click Button    locator=New Policy
-    Input Text      locator=//*[@id="pname"]      text=Policy1
-    Select From List By Label       id=recipe      Migrate
-    Input Text      locator=maxRetries      text=5
-    Input Text      locator=retryTimeLimit      text=240
-    Input Text      locator=timeout      text=390
-    Click Button    locator=Close
-
-Set Holmes Box properties for HolmesModel1
-    Wait Until Element Is Visible       xpath=//*[@data-element-id="Holmes_1gxp0mm"]      timeout=60
-    Click Element    xpath=//*[@data-element-id="Holmes_1gxp0mm"]
-    Input Text      locator=correlationalLogic     text=correlational Logic1
-    Input Text      locator=configPolicyName     text=config Policy Name1
-    Click Button    locator=Save
-
-Save Model from Menu
-    Wait Until Element Is Visible       xpath=//*[@id="navbar"]/ul/li[1]/a      timeout=60
-    Click Element    xpath=//*[@id="navbar"]/ul/li[1]/a
-    Wait Until Element Is Visible       locator=Save CL      timeout=60
-    Set Selenium Speed      ${SELENIUM_SPEED_FAST}
-    Click Element    locator=Save CL
-    Wait Until Element Is Visible       xpath=//*[@id="alert_message_"]      timeout=60
-    Element Text Should Be      xpath=//*[@id="alert_message_"]       expected=Action Successful: save
-    Set Selenium Speed      ${SELENIUM_SPEED_SLOW}
-
-Close Browser
-    Close Browser
diff --git a/tests/clamp/UIs/02__Create_TCA_model.robot b/tests/clamp/UIs/02__Create_TCA_model.robot
deleted file mode 100644
index fa63b3f4..00000000
--- a/tests/clamp/UIs/02__Create_TCA_model.robot
+++ /dev/null
@@ -1,95 +0,0 @@
-*** Settings ***
-Library     Collections
-Library     RequestsLibrary
-Library     OperatingSystem
-Library     json
-Library     ../../../scripts/clamp/python-lib/CustomSeleniumLibrary.py
-Library     XvfbRobot
-
-*** Variables ***
-${login}                     admin
-${passw}                     password
-${SELENIUM_SPEED_FAST}       .2 seconds
-${SELENIUM_SPEED_SLOW}       .5 seconds
-${BASE_URL}                  https://localhost:8443
-
-*** Test Cases ***
-Get Requests health check ok
-    ${resp}=    Get Request    ${clamp_session}   /restservices/clds/v1/healthcheck
-    Should Be Equal As Strings  ${resp.status_code}     200
-
-Open Browser
-# Next line is to be enabled for Headless tests only (jenkins?). To see the tests disable the line.
-    Start Virtual Display    1920    1080
-    Set Selenium Speed      ${SELENIUM_SPEED_SLOW}
-    Open Browser    ${BASE_URL}/designer/index.html    browser=firefox
-
-Reply to authentication popup
-    Run Keyword And Ignore Error    Insert into prompt    ${login} ${passw}
-    Confirm action
-
-Good Login to Clamp UI and Verify logged in
-    Set Window Size    1920    1080
-    ${title}=    Get Title
-    Should Be Equal    CLDS    ${title}
-    Wait Until Element Is Visible       xpath=//*[@class="navbar-brand logo_name ng-binding"]       timeout=60
-    Element Text Should Be      xpath=//*[@class="navbar-brand logo_name ng-binding"]       expected=Hello:admin
-
-Create Model from Menu
-    Wait Until Element Is Visible       xpath=//*[@id="navbar"]/ul/li[2]/a       timeout=60
-    Click Element    xpath=//*[@id="navbar"]/ul/li[1]/a
-    Wait Until Element Is Visible       locator=Create CL       timeout=60
-    Click Element    locator=Create CL
-    Input Text      locator=modelName       text=TCAModel1
-    Select From List By Label       id=templateName      templateTCA1
-    Click Button    locator=Create
-
-Set Properties for TCAModel1
-    Wait Until Element Is Visible       xpath=//*[@id="navbar"]/ul/li[1]/a       timeout=60
-    Click Element    xpath=//*[@id="navbar"]/ul/li[1]/a
-    Wait Until Element Is Visible       locator=Properties CL       timeout=60
-    Click Element    locator=Properties CL
-    Select From List By Label       id=service       vLoadBalancer
-    Select From List By Label       id=vf       vLoadBalancer 0
-    Select From List By Label       id=actionSet      VNF
-    Select From List By Label       id=location      Data Center 1      Data Center 3
-    Input Text      locator=deployParameters       text={}
-    Click Button    locator=Save
-
-Set Policy Box properties for TCAModel1
-    Wait Until Element Is Visible       xpath=//*[@data-element-id="Policy_12lup3h"]      timeout=60
-    Click Element    xpath=//*[@data-element-id="Policy_12lup3h"]
-    Click Button    locator=New Policy
-    Input Text      locator=//*[@id="pname"]      text=Policy2
-    Select From List By Label       id=recipe      Restart
-    Input Text      locator=maxRetries      text=6
-    Input Text      locator=retryTimeLimit      text=280
-    Input Text      locator=timeout      text=400
-    Click Button    locator=Close
-
-Set TCA Box properties for TCAModel1
-    Wait Until Element Is Visible       xpath=//*[@data-element-id="Policy_12lup3h"]      timeout=60
-    Click Element    xpath=//*[@data-element-id="TCA_1d13unw"]
-    Input Text      xpath=(//input[@id='tname'])[2]      text=TCA1
-    Select From List By Label       xpath=//*[@id="tcaPol"]      Policy2
-    Select From List By Label       xpath=//*[@id="eventName"]      vLoadBalancer
-### Cannot set all TCA box attributes due to element not interractable with Selenium
-#    Select From List By Label       xpath=//*[@id="controlLoopSchemaType"]       VNF
-#    Select From List By Index       xpath=//*[@id="controlLoopSchemaType"]       1
-    Click Element    xpath=(//button[@id='createNewThresh'])[2]
-    Input Text      xpath=(//input[@id='threshold'])[2]          6
-#    Select From List By Label       xpath=//*[@id="closedLoopEventStatus"]        ONSET
-    Click Button    id=savePropsBtn
-
-Save Model from Menu
-    Wait Until Element Is Visible       xpath=//*[@id="navbar"]/ul/li[1]/a      timeout=60
-    Click Element    xpath=//*[@id="navbar"]/ul/li[1]/a
-    Wait Until Element Is Visible       locator=Save CL      timeout=60
-    Set Selenium Speed      ${SELENIUM_SPEED_FAST}
-    Click Element    locator=Save CL
-    Wait Until Element Is Visible       xpath=//*[@id="alert_message_"]      timeout=60
-    Element Text Should Be      xpath=//*[@id="alert_message_"]       expected=Action Successful: save
-    Set Selenium Speed      ${SELENIUM_SPEED_SLOW}
-
-Close Browser
-    Close Browser
diff --git a/tests/clamp/UIs/03__Verify_UI_Models.robot b/tests/clamp/UIs/03__Verify_UI_Models.robot
deleted file mode 100644
index e5f6efdb..00000000
--- a/tests/clamp/UIs/03__Verify_UI_Models.robot
+++ /dev/null
@@ -1,52 +0,0 @@
-*** Settings ***
-Library     Collections
-Library     RequestsLibrary
-Library     OperatingSystem
-Library     json
-
-*** Variables ***
-${login}                     admin
-${passw}                     password
-
-*** Test Cases ***
-Verify Holmes CL well created
-    ${resp}=    Get Request    ${clamp_session}   /restservices/clds/v1/clds/model-names
-    Should Contain Match    ${resp}   *HolmesModel1*
-    Should Not Contain Match    ${resp}   *HolmesModel99*
-
-Verify TCA CL well create
-    ${resp}=    Get Request    ${clamp_session}   /restservices/clds/v1/clds/model-names
-    Should Contain Match    ${resp}   *TCAModel1*
-    Should Not Contain Match    ${resp}   *TCAModel99*
-
-Verify HolmesModel1
-    ${resp}=    Get Request    ${clamp_session}   /restservices/clds/v1/clds/model/HolmesModel1
-    Should Contain Match    ${resp}   *templateHolmes1*
-    Should Contain Match    ${resp}   *DC2*
-    Should Contain Match    ${resp}   *DC3*
-    Should Contain Match    ${resp}   *Policy1*
-    Should Contain Match    ${resp}   *07e266fc-49ab-4cd7-8378-ca4676f1b9ec*
-    Should Contain Match    ${resp}   *Migrate*
-    Should Contain Match    ${resp}   *240*
-    Should Contain Match    ${resp}   *390*
-    Should Contain Match    ${resp}   *Logic1*
-    Should Contain Match    ${resp}   *config Policy Name1*
-
-Verify TCAModel1
-    ${resp}=    Get Request    ${clamp_session}   /restservices/clds/v1/clds/model/TCAModel1
-    Should Contain Match    ${resp}   *templateTCA1*
-    Should Contain Match    ${resp}   *DESIGN*
-    Should Contain Match    ${resp}   *vnfRecipe*
-    Should Contain Match    ${resp}   *DC1*
-    Should Contain Match    ${resp}   *DC3*
-    Should Contain Match    ${resp}   *Policy2*
-    Should Contain Match    ${resp}   *Restart*
-    Should Contain Match    ${resp}   *280*
-    Should Contain Match    ${resp}   *400*
-
-Get model names
-    ${resp}=    Get Request    ${clamp_session}   /restservices/clds/v1/clds/model-names
-    Should Contain Match    ${resp}   *HolmesModel1*
-    Should Contain Match    ${resp}   *TCAModel1*
-    Should Not Contain Match    ${resp}   *TCAModel99*
-    Should Not Contain Match    ${resp}   *HolmesModel99*
diff --git a/tests/clamp/UIs/04__Submit_deploy_chain_Holmes.robot b/tests/clamp/UIs/04__Submit_deploy_chain_Holmes.robot
index ebde78b2..b582fad9 100644
--- a/tests/clamp/UIs/04__Submit_deploy_chain_Holmes.robot
+++ b/tests/clamp/UIs/04__Submit_deploy_chain_Holmes.robot
@@ -13,8 +13,15 @@ ${SELENIUM_SPEED_FAST}       .2 seconds
 ${SELENIUM_SPEED_SLOW}       .5 seconds
 ${BASE_URL}                  https://localhost:8443
 
+*** Keywords ***
+Create the sessions
+    ${auth}=    Create List     ${login}    ${passw}
+    Create Session   clamp  ${BASE_URL}    auth=${auth}   disable_warnings=1
+    Set Global Variable     ${clamp_session}      clamp
+
 *** Test Cases ***
 Get Requests health check ok
+    Create the sessions
     ${resp}=    Get Request    ${clamp_session}   /restservices/clds/v1/healthcheck
     Should Be Equal As Strings  ${resp.status_code}     200
 
@@ -35,97 +42,97 @@ Good Login to Clamp UI and Verify logged in
     Wait Until Element Is Visible       xpath=//*[@class="navbar-brand logo_name ng-binding"]       timeout=60
     Element Text Should Be      xpath=//*[@class="navbar-brand logo_name ng-binding"]       expected=Hello:admin
 
-Open Holmes CL
-    Wait Until Element Is Visible       xpath=//*[@id="navbar"]/ul/li[1]/a       timeout=60
-    Click Element    xpath=//*[@id="navbar"]/ul/li[1]/a
-    Wait Until Element Is Visible       locator=Open CL       timeout=60
-    Click Element    locator=Open CL
-    Select From List By Label       id=modelName      HolmesModel1
-    Click Button    locator=OK
-    Element Should Contain      xpath=//*[@id="modeler_name"]     Closed Loop Modeler - HolmesModel1
-    Element Should Contain      xpath=//*[@id="status_clds"]     DESIGN
-
-Validate-Test Holmes CL
-    Wait Until Element Is Visible       xpath=//*[@id="navbar"]/ul/li[2]/a       timeout=60
-    Click Element    xpath=//*[@id="navbar"]/ul/li[2]/a
-    Wait Until Element Is Visible       locator=Validation Test       timeout=60
-    Click Element    locator=Validation Test
-    Wait Until Element Is Visible       xpath=//*[@id="alert_message_"]      timeout=60
-    Element Text Should Be      xpath=//*[@id="alert_message_"]       expected=Action Successful: test
-    Element Should Contain      xpath=//*[@id="status_clds"]     DESIGN
-
-Submit Holmes CL
-    Wait Until Element Is Visible       xpath=//*[@id="navbar"]/ul/li[2]/a       timeout=60
-    Click Element    xpath=//*[@id="navbar"]/ul/li[2]/a
-    Wait Until Element Is Visible       locator=Submit       timeout=60
-    Click Element    locator=Submit
-    Click Button    locator=Yes
-    Wait Until Element Is Visible       xpath=//*[@id="alert_message_"]      timeout=60
-    Element Text Should Be      xpath=//*[@id="alert_message_"]       expected=Action Successful: submit
-    Element Should Contain      xpath=//*[@id="status_clds"]     DISTRIBUTED
-
-Resubmit Holmes CL
-    Wait Until Element Is Visible       xpath=//*[@id="navbar"]/ul/li[2]/a       timeout=60
-    Click Element    xpath=//*[@id="navbar"]/ul/li[2]/a
-    Wait Until Element Is Visible       locator=Resubmit       timeout=60
-    Click Element    locator=Resubmit
-    Click Button    locator=Yes
-    Wait Until Element Is Visible       xpath=//*[@id="alert_message_"]      timeout=60
-    Element Text Should Be      xpath=//*[@id="alert_message_"]       expected=Action Successful: resubmit
-    Element Should Contain      xpath=//*[@id="status_clds"]     DISTRIBUTED
-
-Deploy Holmes CL
-    Wait Until Element Is Visible       xpath=//*[@id="navbar"]/ul/li[2]/a       timeout=60
-    Click Element    xpath=//*[@id="navbar"]/ul/li[2]/a
-    Wait Until Element Is Visible       locator=Deploy       timeout=60
-    Click Element    locator=Deploy
-#    Wait Until Element Is Visible       xpath=//*[@id="deployProperties"]       timeout=60
-#    Input Text      xpath=//*[@id="deployProperties"]      text={}
-    Click Button    locator=Deploy
-    Click Button    locator=Yes
-    Wait Until Element Is Visible       xpath=//*[@id="alert_message_"]      timeout=60
-    Element Text Should Be      xpath=//*[@id="alert_message_"]       expected=Action Successful: deploy
-    Element Should Contain      xpath=//*[@id="status_clds"]     ACTIVE
-
-Update Holmes CL
-    Wait Until Element Is Visible       xpath=//*[@id="navbar"]/ul/li[2]/a       timeout=60
-    Click Element    xpath=//*[@id="navbar"]/ul/li[2]/a
-    Wait Until Element Is Visible       locator=Update       timeout=60
-    Click Element    locator=Update
-    Click Button    locator=Yes
-    Wait Until Element Is Visible       xpath=//*[@id="alert_message_"]      timeout=60
-    Element Text Should Be      xpath=//*[@id="alert_message_"]       expected=Action Successful: update
-    Element Should Contain      xpath=//*[@id="status_clds"]     ACTIVE
-
-Stop Holmes CL
-    Wait Until Element Is Visible       xpath=//*[@id="navbar"]/ul/li[2]/a       timeout=60
-    Click Element    xpath=//*[@id="navbar"]/ul/li[2]/a
-    Wait Until Element Is Visible       locator=Stop       timeout=60
-    Click Element    locator=Stop
-    Click Button    locator=Yes
-    Wait Until Element Is Visible       xpath=//*[@id="alert_message_"]      timeout=60
-    Element Text Should Be      xpath=//*[@id="alert_message_"]       expected=Action Successful: stop
-    Element Should Contain      xpath=//*[@id="status_clds"]     STOPPED
-
-Restart Holmes CL
-    Wait Until Element Is Visible       xpath=//*[@id="navbar"]/ul/li[2]/a       timeout=60
-    Click Element    xpath=//*[@id="navbar"]/ul/li[2]/a
-    Wait Until Element Is Visible       locator=Restart       timeout=60
-    Click Element    locator=Restart
-    Click Button    locator=Yes
-    Wait Until Element Is Visible       xpath=//*[@id="alert_message_"]      timeout=60
-    Element Text Should Be      xpath=//*[@id="alert_message_"]       expected=Action Successful: restart
-    Element Should Contain      xpath=//*[@id="status_clds"]     ACTIVE
-
-UnDeploy Holmes CL
-    Wait Until Element Is Visible       xpath=//*[@id="navbar"]/ul/li[2]/a       timeout=60
-    Click Element    xpath=//*[@id="navbar"]/ul/li[2]/a
-    Wait Until Element Is Visible       locator=UnDeploy       timeout=60
-    Click Element    locator=UnDeploy
-    Click Button    locator=Yes
-    Wait Until Element Is Visible       xpath=//*[@id="alert_message_"]      timeout=60
-    Element Text Should Be      xpath=//*[@id="alert_message_"]       expected=Action Successful: undeploy
-    Element Should Contain      xpath=//*[@id="status_clds"]     DISTRIBUTED
+#Open Holmes CL
+#    Wait Until Element Is Visible       xpath=//*[@id="navbar"]/ul/li[1]/a       timeout=60
+#    Click Element    xpath=//*[@id="navbar"]/ul/li[1]/a
+#    Wait Until Element Is Visible       locator=Open CL       timeout=60
+#    Click Element    locator=Open CL
+#    Select From List By Label       id=modelName      HolmesModel1
+#    Click Button    locator=OK
+#    Element Should Contain      xpath=//*[@id="modeler_name"]     Closed Loop Modeler - HolmesModel1
+#    Element Should Contain      xpath=//*[@id="status_clds"]     DESIGN
+#
+#Validate-Test Holmes CL
+#    Wait Until Element Is Visible       xpath=//*[@id="navbar"]/ul/li[2]/a       timeout=60
+#    Click Element    xpath=//*[@id="navbar"]/ul/li[2]/a
+#    Wait Until Element Is Visible       locator=Validation Test       timeout=60
+#    Click Element    locator=Validation Test
+#    Wait Until Element Is Visible       xpath=//*[@id="alert_message_"]      timeout=60
+#    Element Text Should Be      xpath=//*[@id="alert_message_"]       expected=Action Successful: test
+#    Element Should Contain      xpath=//*[@id="status_clds"]     DESIGN
+#
+#Submit Holmes CL
+#    Wait Until Element Is Visible       xpath=//*[@id="navbar"]/ul/li[2]/a       timeout=60
+#    Click Element    xpath=//*[@id="navbar"]/ul/li[2]/a
+#    Wait Until Element Is Visible       locator=Submit       timeout=60
+#    Click Element    locator=Submit
+#    Click Button    locator=Yes
+#    Wait Until Element Is Visible       xpath=//*[@id="alert_message_"]      timeout=60
+#    Element Text Should Be      xpath=//*[@id="alert_message_"]       expected=Action Successful: submit
+#    Element Should Contain      xpath=//*[@id="status_clds"]     DISTRIBUTED
+#
+#Resubmit Holmes CL
+#    Wait Until Element Is Visible       xpath=//*[@id="navbar"]/ul/li[2]/a       timeout=60
+#    Click Element    xpath=//*[@id="navbar"]/ul/li[2]/a
+#    Wait Until Element Is Visible       locator=Resubmit       timeout=60
+#    Click Element    locator=Resubmit
+#    Click Button    locator=Yes
+#    Wait Until Element Is Visible       xpath=//*[@id="alert_message_"]      timeout=60
+#    Element Text Should Be      xpath=//*[@id="alert_message_"]       expected=Action Successful: resubmit
+#    Element Should Contain      xpath=//*[@id="status_clds"]     DISTRIBUTED
+#
+#Deploy Holmes CL
+#    Wait Until Element Is Visible       xpath=//*[@id="navbar"]/ul/li[2]/a       timeout=60
+#    Click Element    xpath=//*[@id="navbar"]/ul/li[2]/a
+#    Wait Until Element Is Visible       locator=Deploy       timeout=60
+#    Click Element    locator=Deploy
+##    Wait Until Element Is Visible       xpath=//*[@id="deployProperties"]       timeout=60
+##    Input Text      xpath=//*[@id="deployProperties"]      text={}
+#    Click Button    locator=Deploy
+#    Click Button    locator=Yes
+#    Wait Until Element Is Visible       xpath=//*[@id="alert_message_"]      timeout=60
+#    Element Text Should Be      xpath=//*[@id="alert_message_"]       expected=Action Successful: deploy
+#    Element Should Contain      xpath=//*[@id="status_clds"]     ACTIVE
+#
+#Update Holmes CL
+#    Wait Until Element Is Visible       xpath=//*[@id="navbar"]/ul/li[2]/a       timeout=60
+#    Click Element    xpath=//*[@id="navbar"]/ul/li[2]/a
+#    Wait Until Element Is Visible       locator=Update       timeout=60
+#    Click Element    locator=Update
+#    Click Button    locator=Yes
+#    Wait Until Element Is Visible       xpath=//*[@id="alert_message_"]      timeout=60
+#    Element Text Should Be      xpath=//*[@id="alert_message_"]       expected=Action Successful: update
+#    Element Should Contain      xpath=//*[@id="status_clds"]     ACTIVE
+#
+#Stop Holmes CL
+#    Wait Until Element Is Visible       xpath=//*[@id="navbar"]/ul/li[2]/a       timeout=60
+#    Click Element    xpath=//*[@id="navbar"]/ul/li[2]/a
+#    Wait Until Element Is Visible       locator=Stop       timeout=60
+#    Click Element    locator=Stop
+#    Click Button    locator=Yes
+#    Wait Until Element Is Visible       xpath=//*[@id="alert_message_"]      timeout=60
+#    Element Text Should Be      xpath=//*[@id="alert_message_"]       expected=Action Successful: stop
+#    Element Should Contain      xpath=//*[@id="status_clds"]     STOPPED
+#
+#Restart Holmes CL
+#    Wait Until Element Is Visible       xpath=//*[@id="navbar"]/ul/li[2]/a       timeout=60
+#    Click Element    xpath=//*[@id="navbar"]/ul/li[2]/a
+#    Wait Until Element Is Visible       locator=Restart       timeout=60
+#    Click Element    locator=Restart
+#    Click Button    locator=Yes
+#    Wait Until Element Is Visible       xpath=//*[@id="alert_message_"]      timeout=60
+#    Element Text Should Be      xpath=//*[@id="alert_message_"]       expected=Action Successful: restart
+#    Element Should Contain      xpath=//*[@id="status_clds"]     ACTIVE
+#
+#UnDeploy Holmes CL
+#    Wait Until Element Is Visible       xpath=//*[@id="navbar"]/ul/li[2]/a       timeout=60
+#    Click Element    xpath=//*[@id="navbar"]/ul/li[2]/a
+#    Wait Until Element Is Visible       locator=UnDeploy       timeout=60
+#    Click Element    locator=UnDeploy
+#    Click Button    locator=Yes
+#    Wait Until Element Is Visible       xpath=//*[@id="alert_message_"]      timeout=60
+#    Element Text Should Be      xpath=//*[@id="alert_message_"]       expected=Action Successful: undeploy
+#    Element Should Contain      xpath=//*[@id="status_clds"]     DISTRIBUTED
 
 Close Browser
     Close Browser
diff --git a/tests/clamp/UIs/05__Submit_deploy_chain_TCA.robot b/tests/clamp/UIs/05__Submit_deploy_chain_TCA.robot
index 4a83be25..7bcada12 100644
--- a/tests/clamp/UIs/05__Submit_deploy_chain_TCA.robot
+++ b/tests/clamp/UIs/05__Submit_deploy_chain_TCA.robot
@@ -35,97 +35,97 @@ Good Login to Clamp UI and Verify logged in
     Wait Until Element Is Visible       xpath=//*[@class="navbar-brand logo_name ng-binding"]       timeout=60
     Element Text Should Be      xpath=//*[@class="navbar-brand logo_name ng-binding"]       expected=Hello:admin
 
-Open TCA CL
-    Wait Until Element Is Visible       xpath=//*[@id="navbar"]/ul/li[1]/a       timeout=60
-    Click Element    xpath=//*[@id="navbar"]/ul/li[1]/a
-    Wait Until Element Is Visible       locator=Open CL       timeout=60
-    Click Element    locator=Open CL
-    Select From List By Label       id=modelName      TCAModel1
-    Click Button    locator=OK
-    Element Should Contain      xpath=//*[@id="modeler_name"]     Closed Loop Modeler - TCAModel1
-    Element Should Contain      xpath=//*[@id="status_clds"]     DESIGN
-
-Validate-Test TCA CL
-    Wait Until Element Is Visible       xpath=//*[@id="navbar"]/ul/li[2]/a       timeout=60
-    Click Element    xpath=//*[@id="navbar"]/ul/li[2]/a
-    Wait Until Element Is Visible       locator=Validation Test       timeout=60
-    Click Element    locator=Validation Test
-    Wait Until Element Is Visible       xpath=//*[@id="alert_message_"]      timeout=60
-    Element Text Should Be      xpath=//*[@id="alert_message_"]       expected=Action Successful: test
-    Element Should Contain      xpath=//*[@id="status_clds"]     DESIGN
-
-Submit TCA CL
-    Wait Until Element Is Visible       xpath=//*[@id="navbar"]/ul/li[2]/a       timeout=60
-    Click Element    xpath=//*[@id="navbar"]/ul/li[2]/a
-    Wait Until Element Is Visible       locator=Submit       timeout=60
-    Click Element    locator=Submit
-    Click Button    locator=Yes
-    Wait Until Element Is Visible       xpath=//*[@id="alert_message_"]      timeout=60
-    Element Text Should Be      xpath=//*[@id="alert_message_"]       expected=Action Successful: submit
-    Element Should Contain      xpath=//*[@id="status_clds"]     DISTRIBUTED
-
-Resubmit TCA CL
-    Wait Until Element Is Visible       xpath=//*[@id="navbar"]/ul/li[2]/a       timeout=60
-    Click Element    xpath=//*[@id="navbar"]/ul/li[2]/a
-    Wait Until Element Is Visible       locator=Resubmit       timeout=60
-    Click Element    locator=Resubmit
-    Click Button    locator=Yes
-    Wait Until Element Is Visible       xpath=//*[@id="alert_message_"]      timeout=60
-    Element Text Should Be      xpath=//*[@id="alert_message_"]       expected=Action Successful: resubmit
-    Element Should Contain      xpath=//*[@id="status_clds"]     DISTRIBUTED
-
-Deploy TCA CL
-    Wait Until Element Is Visible       xpath=//*[@id="navbar"]/ul/li[2]/a       timeout=60
-    Click Element    xpath=//*[@id="navbar"]/ul/li[2]/a
-    Wait Until Element Is Visible       locator=Deploy       timeout=60
-    Click Element    locator=Deploy
-#    Wait Until Element Is Visible       xpath=//*[@id="deployProperties"]       timeout=60
-#    Input Text      xpath=//*[@id="deployProperties"]      text={}
-    Click Button    locator=Deploy
-    Click Button    locator=Yes
-    Wait Until Element Is Visible       xpath=//*[@id="alert_message_"]      timeout=60
-    Element Text Should Be      xpath=//*[@id="alert_message_"]       expected=Action Successful: deploy
-    Element Should Contain      xpath=//*[@id="status_clds"]     ACTIVE
-
-Update TCA CL
-    Wait Until Element Is Visible       xpath=//*[@id="navbar"]/ul/li[2]/a       timeout=60
-    Click Element    xpath=//*[@id="navbar"]/ul/li[2]/a
-    Wait Until Element Is Visible       locator=Update       timeout=60
-    Click Element    locator=Update
-    Click Button    locator=Yes
-    Wait Until Element Is Visible       xpath=//*[@id="alert_message_"]      timeout=60
-    Element Text Should Be      xpath=//*[@id="alert_message_"]       expected=Action Successful: update
-    Element Should Contain      xpath=//*[@id="status_clds"]     ACTIVE
-
-Stop TCA CL
-    Wait Until Element Is Visible       xpath=//*[@id="navbar"]/ul/li[2]/a       timeout=60
-    Click Element    xpath=//*[@id="navbar"]/ul/li[2]/a
-    Wait Until Element Is Visible       locator=Stop       timeout=60
-    Click Element    locator=Stop
-    Click Button    locator=Yes
-    Wait Until Element Is Visible       xpath=//*[@id="alert_message_"]      timeout=60
-    Element Text Should Be      xpath=//*[@id="alert_message_"]       expected=Action Successful: stop
-    Element Should Contain      xpath=//*[@id="status_clds"]     STOPPED
-
-Restart TCA CL
-    Wait Until Element Is Visible       xpath=//*[@id="navbar"]/ul/li[2]/a       timeout=60
-    Click Element    xpath=//*[@id="navbar"]/ul/li[2]/a
-    Wait Until Element Is Visible       locator=Restart       timeout=60
-    Click Element    locator=Restart
-    Click Button    locator=Yes
-    Wait Until Element Is Visible       xpath=//*[@id="alert_message_"]      timeout=60
-    Element Text Should Be      xpath=//*[@id="alert_message_"]       expected=Action Successful: restart
-    Element Should Contain      xpath=//*[@id="status_clds"]     ACTIVE
-
-UnDeploy TCA CL
-    Wait Until Element Is Visible       xpath=//*[@id="navbar"]/ul/li[2]/a       timeout=60
-    Click Element    xpath=//*[@id="navbar"]/ul/li[2]/a
-    Wait Until Element Is Visible       locator=UnDeploy       timeout=60
-    Click Element    locator=UnDeploy
-    Click Button    locator=Yes
-    Wait Until Element Is Visible       xpath=//*[@id="alert_message_"]      timeout=60
-    Element Text Should Be      xpath=//*[@id="alert_message_"]       expected=Action Successful: undeploy
-    Element Should Contain      xpath=//*[@id="status_clds"]     DISTRIBUTED
+#Open TCA CL
+#    Wait Until Element Is Visible       xpath=//*[@id="navbar"]/ul/li[1]/a       timeout=60
+#    Click Element    xpath=//*[@id="navbar"]/ul/li[1]/a
+#    Wait Until Element Is Visible       locator=Open CL       timeout=60
+#    Click Element    locator=Open CL
+#    Select From List By Label       id=modelName      TCAModel1
+#    Click Button    locator=OK
+#    Element Should Contain      xpath=//*[@id="modeler_name"]     Closed Loop Modeler - TCAModel1
+#    Element Should Contain      xpath=//*[@id="status_clds"]     DESIGN
+#
+#Validate-Test TCA CL
+#    Wait Until Element Is Visible       xpath=//*[@id="navbar"]/ul/li[2]/a       timeout=60
+#    Click Element    xpath=//*[@id="navbar"]/ul/li[2]/a
+#    Wait Until Element Is Visible       locator=Validation Test       timeout=60
+#    Click Element    locator=Validation Test
+#    Wait Until Element Is Visible       xpath=//*[@id="alert_message_"]      timeout=60
+#    Element Text Should Be      xpath=//*[@id="alert_message_"]       expected=Action Successful: test
+#    Element Should Contain      xpath=//*[@id="status_clds"]     DESIGN
+#
+#Submit TCA CL
+#    Wait Until Element Is Visible       xpath=//*[@id="navbar"]/ul/li[2]/a       timeout=60
+#    Click Element    xpath=//*[@id="navbar"]/ul/li[2]/a
+#    Wait Until Element Is Visible       locator=Submit       timeout=60
+#    Click Element    locator=Submit
+#    Click Button    locator=Yes
+#    Wait Until Element Is Visible       xpath=//*[@id="alert_message_"]      timeout=60
+#    Element Text Should Be      xpath=//*[@id="alert_message_"]       expected=Action Successful: submit
+#    Element Should Contain      xpath=//*[@id="status_clds"]     DISTRIBUTED
+#
+#Resubmit TCA CL
+#    Wait Until Element Is Visible       xpath=//*[@id="navbar"]/ul/li[2]/a       timeout=60
+#    Click Element    xpath=//*[@id="navbar"]/ul/li[2]/a
+#    Wait Until Element Is Visible       locator=Resubmit       timeout=60
+#    Click Element    locator=Resubmit
+#    Click Button    locator=Yes
+#    Wait Until Element Is Visible       xpath=//*[@id="alert_message_"]      timeout=60
+#    Element Text Should Be      xpath=//*[@id="alert_message_"]       expected=Action Successful: resubmit
+#    Element Should Contain      xpath=//*[@id="status_clds"]     DISTRIBUTED
+#
+#Deploy TCA CL
+#    Wait Until Element Is Visible       xpath=//*[@id="navbar"]/ul/li[2]/a       timeout=60
+#    Click Element    xpath=//*[@id="navbar"]/ul/li[2]/a
+#    Wait Until Element Is Visible       locator=Deploy       timeout=60
+#    Click Element    locator=Deploy
+##    Wait Until Element Is Visible       xpath=//*[@id="deployProperties"]       timeout=60
+##    Input Text      xpath=//*[@id="deployProperties"]      text={}
+#    Click Button    locator=Deploy
+#    Click Button    locator=Yes
+#    Wait Until Element Is Visible       xpath=//*[@id="alert_message_"]      timeout=60
+#    Element Text Should Be      xpath=//*[@id="alert_message_"]       expected=Action Successful: deploy
+#    Element Should Contain      xpath=//*[@id="status_clds"]     ACTIVE
+#
+#Update TCA CL
+#    Wait Until Element Is Visible       xpath=//*[@id="navbar"]/ul/li[2]/a       timeout=60
+#    Click Element    xpath=//*[@id="navbar"]/ul/li[2]/a
+#    Wait Until Element Is Visible       locator=Update       timeout=60
+#    Click Element    locator=Update
+#    Click Button    locator=Yes
+#    Wait Until Element Is Visible       xpath=//*[@id="alert_message_"]      timeout=60
+#    Element Text Should Be      xpath=//*[@id="alert_message_"]       expected=Action Successful: update
+#    Element Should Contain      xpath=//*[@id="status_clds"]     ACTIVE
+#
+#Stop TCA CL
+#    Wait Until Element Is Visible       xpath=//*[@id="navbar"]/ul/li[2]/a       timeout=60
+#    Click Element    xpath=//*[@id="navbar"]/ul/li[2]/a
+#    Wait Until Element Is Visible       locator=Stop       timeout=60
+#    Click Element    locator=Stop
+#    Click Button    locator=Yes
+#    Wait Until Element Is Visible       xpath=//*[@id="alert_message_"]      timeout=60
+#    Element Text Should Be      xpath=//*[@id="alert_message_"]       expected=Action Successful: stop
+#    Element Should Contain      xpath=//*[@id="status_clds"]     STOPPED
+#
+#Restart TCA CL
+#    Wait Until Element Is Visible       xpath=//*[@id="navbar"]/ul/li[2]/a       timeout=60
+#    Click Element    xpath=//*[@id="navbar"]/ul/li[2]/a
+#    Wait Until Element Is Visible       locator=Restart       timeout=60
+#    Click Element    locator=Restart
+#    Click Button    locator=Yes
+#    Wait Until Element Is Visible       xpath=//*[@id="alert_message_"]      timeout=60
+#    Element Text Should Be      xpath=//*[@id="alert_message_"]       expected=Action Successful: restart
+#    Element Should Contain      xpath=//*[@id="status_clds"]     ACTIVE
+#
+#UnDeploy TCA CL
+#    Wait Until Element Is Visible       xpath=//*[@id="navbar"]/ul/li[2]/a       timeout=60
+#    Click Element    xpath=//*[@id="navbar"]/ul/li[2]/a
+#    Wait Until Element Is Visible       locator=UnDeploy       timeout=60
+#    Click Element    locator=UnDeploy
+#    Click Button    locator=Yes
+#    Wait Until Element Is Visible       xpath=//*[@id="alert_message_"]      timeout=60
+#    Element Text Should Be      xpath=//*[@id="alert_message_"]       expected=Action Successful: undeploy
+#    Element Should Contain      xpath=//*[@id="status_clds"]     DISTRIBUTED
 
 Close Browser
     Close Browser