Update Robot Framework format - step 18

[integration/test.git] / tools / deployment / openstack_ha / deploy / deploy_odl_with_netvirt.robot

diff --git a/tools/deployment/openstack_ha/deploy/deploy_odl_with_netvirt.robot b/tools/deployment/openstack_ha/deploy/deploy_odl_with_netvirt.robot
index 7d41b1043b4c491def3c0172bd073a7e9bde37f5..7c2f1bb68bc6a77af2433174db3d7324bce27c4f 100644 (file)
--- a/tools/deployment/openstack_ha/deploy/deploy_odl_with_netvirt.robot
+++ b/tools/deployment/openstack_ha/deploy/deploy_odl_with_netvirt.robot
@@ -1,28 +1,35 @@
 *** Settings ***
-Documentation     Test suite to install ODL with netvirt feature and ensure of services are up.
-...               To Be used with the Deployer
-Suite Setup       OpenStackInstallUtils.Get All Ssh Connections
-Suite Teardown    Close All Connections
-Library           OperatingSystem
-Library           RequestsLibrary
-Library           Xml
-Resource          ../libraries/Utils.robot
-Resource          ../libraries/OpenStackInstallUtils.robot
-Resource          ../libraries/OpendaylightInstallUtils.robot
-Resource          ../libraries/SystemUtils.robot
+Documentation       Test suite to install ODL with netvirt feature and ensure of services are up.
+...                 To Be used with the Deployer
+
+Library             OperatingSystem
+Library             RequestsLibrary
+Library             Xml
+Resource            ../libraries/Utils.robot
+Resource            ../libraries/OpenStackInstallUtils.robot
+Resource            ../libraries/OpendaylightInstallUtils.robot
+Resource            ../libraries/SystemUtils.robot
+
+Suite Setup         OpenStackInstallUtils.Get All Ssh Connections
+Suite Teardown      Close All Connections
+
 
 *** Test Cases ***
 Get ODL
     [Documentation]    Get ODL from Nexus or Install from rpm
-    Run Keyword If    '${ODL_INSTALL_MODE}' == 'RPM'    Install ODL From RPM In All ODL Nodes    ${ODL_RPM}
-    Run Keyword If    '${ODL_INSTALL_MODE}' == 'ZIP'    Install ODL From ZIP In All ODL Nodes    ${ACTUAL_BUNDLE_URL}    ${BUNDLEFOLDER}
+    IF    '${ODL_INSTALL_MODE}' == 'RPM'
+        Install ODL From RPM In All ODL Nodes    ${ODL_RPM}
+    END
+    IF    '${ODL_INSTALL_MODE}' == 'ZIP'
+        Install ODL From ZIP In All ODL Nodes    ${ACTUAL_BUNDLE_URL}    ${BUNDLEFOLDER}
+    END
 
 Configure Netvirt Feature as Boot
     [Documentation]    Install Netvirt feature
     Install ODL Feature In All ODL Nodes    odl-netvirt-openstack
 
 Configure Clustering
-    Run Keyword If    2 < ${NUM_ODL_NODES}    Configure ODL Clustering
+    IF    2 < ${NUM_ODL_NODES}    Configure ODL Clustering
 
 Configure SNAT Mode
     [Documentation]    Configure SNAT Mode as Required
@@ -37,10 +44,11 @@ Check If Netvirt Is Up And Running
     Check If ODL Is Running In All Nodes    operational/network-topology:network-topology/topology/netvirt:1
     Print All Active Ports
 
+
 *** Keywords ***
 Set SNAT Mode
-    [Arguments]    ${os_node_cxn}
     [Documentation]    Configure SNAT Mode for Netvirt
+    [Arguments]    ${os_node_cxn}
     Add Element    ${XML}    <natservice-config></natservice-config>
     Set Element Attribute    ${XML}    xmlns    urn:opendaylight:netvirt:natservice:config    xpath=natservice-config
     Add Element    ${XML}    <nat-mode></nat-mode>    xpath=natservice-config
@@ -50,7 +58,7 @@ Set SNAT Mode
 Configure SNAT Mode In All ODL Nodes
     [Documentation]    Configure SNAT Mode for Netvirt In All ODL Nodes
     Set SNAT Mode    ${ODL_1_IP}
-    Run Keyword If    1 < ${NUM_ODL_NODES}    Set SNAT Mode    ${ODL_2_IP}
-    Run Keyword If    2 < ${NUM_ODL_NODES}    Set SNAT Mode    ${ODL_3_IP}
-    Run Keyword If    3 < ${NUM_ODL_NODES}    Set SNAT Mode    ${ODL_4_IP}
-    Run Keyword If    4 < ${NUM_ODL_NODES}    Set SNAT Mode    ${ODL_5_IP}
+    IF    1 < ${NUM_ODL_NODES}    Set SNAT Mode    ${ODL_2_IP}
+    IF    2 < ${NUM_ODL_NODES}    Set SNAT Mode    ${ODL_3_IP}
+    IF    3 < ${NUM_ODL_NODES}    Set SNAT Mode    ${ODL_4_IP}
+    IF    4 < ${NUM_ODL_NODES}    Set SNAT Mode    ${ODL_5_IP}