Fix Robot file formatting in recent merges

Change-Id: I8c46806517b674864c698ee31bee386545826b10
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/csit/libraries/OcpAgentKeywords.robot b/csit/libraries/OcpAgentKeywords.robot
index 270dd0dfee574b87e14d0cbbfebfbf0fb59737dd..001c4bd15277086862ac5a61f766675630cf3d02 100644 (file)
--- a/csit/libraries/OcpAgentKeywords.robot
+++ b/csit/libraries/OcpAgentKeywords.robot
@@ -29,7 +29,7 @@ Start Emulator Single
     Set Suite Variable    ${mininet_conn_id}
     Utils.Flexible Mininet Login
     SSHLibrary.Write    java -cp /tmp/agent/simple-agent/target/classes/ org.opendaylight.ocpplugin.OcpAgent ${controller} 1033 ${vendorID} ${serialNumber}
-    SSHLibrary.Read Until   getParamResp
+    SSHLibrary.Read Until    getParamResp
     [Return]    ${mininet_conn_id}
 
 Stop Emulator And Exit

diff --git a/csit/libraries/VtnCoKeywords.robot b/csit/libraries/VtnCoKeywords.robot
index 51caebd1a3b8f69986789de703fc43c0d01ba78d..39c687da25143760726b671bae6703b1f4df083a 100644 (file)
--- a/csit/libraries/VtnCoKeywords.robot
+++ b/csit/libraries/VtnCoKeywords.robot
@@ -39,7 +39,7 @@ Start SuiteVtnCo
     SSHLibrary.Execute Command    sudo yum install -q -y http://yum.postgresql.org/9.3/redhat/rhel-7-x86_64/pgdg-centos93-9.3-1.noarch.rpm
     SSHLibrary.Execute Command    sudo yum install -q -y postgresql93-libs postgresql93 postgresql93-server postgresql93-contrib postgresql93-odbc-09.03.0400
     SSHLibrary.Execute Command    tar -C/ -jxvf ${WORKSPACE}/${BUNDLEFOLDER}/externalapps/*vtn-coordinator*-bin.tar.bz2
-    Run Keyword If    '${ODL_STREAM}' == 'boron'    SSHLibrary.Execute Command    sudo yum upgrade -q -y  java-1.8.0-openjdk-devel
+    Run Keyword If    '${ODL_STREAM}' == 'boron'    SSHLibrary.Execute Command    sudo yum upgrade -q -y    java-1.8.0-openjdk-devel
     SSHLibrary.Execute Command    /usr/local/vtn/sbin/db_setup
     SSHLibrary.Execute Command    /usr/local/vtn/bin/vtn_start
     SSHLibrary.Execute Command    /usr/local/vtn/bin/unc_dmctl status

diff --git a/csit/libraries/VtnMaKeywords.robot b/csit/libraries/VtnMaKeywords.robot
index c3eaf4bf21130e180e205b7290ced633fd4d264a..11052d8b48d5a9edb25f33d9b3b2ab490275e0d2 100644 (file)
--- a/csit/libraries/VtnMaKeywords.robot
+++ b/csit/libraries/VtnMaKeywords.robot
@@ -330,7 +330,7 @@ Add a vlan portmap
     [Arguments]    ${vtn_name}    ${vbr_name}    ${interface_name}    ${id}    ${node_id}    ${port_id}
     [Documentation]    Create a portmap for a interface of a vbridge
     ${resp}=    RequestsLibrary.Post Request    session    restconf/operations/vtn-port-map:set-port-map    data={"input": { "tenant-name":${vtn_name}, "bridge-name":${vbr_name}, "interface-name": ${interface_name}, "vlan-id": ${id}, "node":"${node_id}", "port-name":"${port_id}"}}
-        Should Be Equal As Strings    ${resp.status_code}    200
+    Should Be Equal As Strings    ${resp.status_code}    200
 
 Verify Flow Entries for Flowfilter
     [Arguments]    ${dumpflows}    @{flowfilter_actions}

diff --git a/csit/suites/netvirt/Devstack_Tempest_Tests/01__single_node_devstack_tempest_tests.robot b/csit/suites/netvirt/Devstack_Tempest_Tests/01__single_node_devstack_tempest_tests.robot
index a4229f78db8cb55df137ed6f25b3e18f968107ac..2bab7d7a9cd5b68f9cc34b7cdad690e007e9cf7d 100644 (file)
--- a/csit/suites/netvirt/Devstack_Tempest_Tests/01__single_node_devstack_tempest_tests.robot
+++ b/csit/suites/netvirt/Devstack_Tempest_Tests/01__single_node_devstack_tempest_tests.robot
@@ -79,12 +79,12 @@ List Nova Flavor
 Create Vm Instances For net1_network
     [Documentation]    Create Vm instances using flavor and image names.
     Create Vm Instances    net1_network    ${NET_1_VM_INSTANCES}
-    [Teardown]    Show Debugs      ${NET_1_VM_INSTANCES}
+    [Teardown]    Show Debugs    ${NET_1_VM_INSTANCES}
 
 Create Vm Instances For net2_network
     [Documentation]    Create Vm instances using flavor and image names.
     Create Vm Instances    net2_network    ${NET_2_VM_INSTANCES}
-    [Teardown]    Show Debugs      ${NET_2_VM_INSTANCES}
+    [Teardown]    Show Debugs    ${NET_2_VM_INSTANCES}
 
 Verify Created Vm Instance In Dump Flow
     [Documentation]    Verify the existence of the created vm instance ips in the dump flow.
@@ -126,8 +126,8 @@ Verify Deleted Vm Instance Removed In Dump Flow
 
 Delete Router Interfaces
     [Documentation]    Remove Interface to the subnets.
-    : FOR     ${interface}    IN     @{SUBNETS_NAME}
-    \     Remove Interface     router_1     ${interface}
+    : FOR    ${interface}    IN    @{SUBNETS_NAME}
+    \    Remove Interface    router_1    ${interface}
 
 Delete Routers
     [Documentation]    Delete Router and Interface to the subnets.

diff --git a/csit/suites/netvirt/Devstack_Tempest_Tests/02__additional_flows_verification_tests.robot b/csit/suites/netvirt/Devstack_Tempest_Tests/02__additional_flows_verification_tests.robot
index 05ab6247e711faf9714faf0ab861ef226f05e4ef..b9bf6fb78f6896cc93a92b059afb2c125719b91a 100644 (file)
--- a/csit/suites/netvirt/Devstack_Tempest_Tests/02__additional_flows_verification_tests.robot
+++ b/csit/suites/netvirt/Devstack_Tempest_Tests/02__additional_flows_verification_tests.robot
@@ -37,12 +37,12 @@ Create Subnets For network_2
 Create Vm Instances For network_1
     [Documentation]    Create Four Vm instances using flavor and image names for a network.
     Create Vm Instances    network_1    ${NET_1_VM_INSTANCES}
-    [Teardown]    Show Debugs      ${NET_1_VM_INSTANCES}
+    [Teardown]    Show Debugs    ${NET_1_VM_INSTANCES}
 
 Create Vm Instances For network_2
     [Documentation]    Create Four Vm instances using flavor and image names for a network.
     Create Vm Instances    network_2    ${NET_2_VM_INSTANCES}
-    [Teardown]    Show Debugs      ${NET_2_VM_INSTANCES}
+    [Teardown]    Show Debugs    ${NET_2_VM_INSTANCES}
 
 List Networks With Namespaces
     ${output}=    Write Commands Until Prompt    sudo ip netns list
@@ -68,25 +68,25 @@ Connectivity Tests From Vm Instance1 In network_1
     [Documentation]    Logging to the vm instance1
     ${dst_ip_list}=    Create List    @{NET_1_VM_IPS}[1]    @{DHCP_IPS}[0]
     Log    ${dst_ip_list}
-    Test Operations From Vm Instance      network_1     @{NET_1_VM_IPS}[0]    ${dst_ip_list}
+    Test Operations From Vm Instance    network_1    @{NET_1_VM_IPS}[0]    ${dst_ip_list}
 
 Connectivity Tests From Vm Instance2 In network_1
     [Documentation]    Logging to the vm instance2
     ${dst_ip_list}=    Create List    @{NET_1_VM_IPS}[0]    @{DHCP_IPS}[0]
     Log    ${dst_ip_list}
-    Test Operations From Vm Instance      network_1     @{NET_1_VM_IPS}[1]    ${dst_ip_list}
+    Test Operations From Vm Instance    network_1    @{NET_1_VM_IPS}[1]    ${dst_ip_list}
 
 Connectivity Tests From Vm Instance1 In network_2
     [Documentation]    Logging to the vm instance1
     ${dst_ip_list}=    Create List    @{NET_2_VM_IPS}[1]    @{DHCP_IPS}[1]
     Log    ${dst_ip_list}
-    Test Operations From Vm Instance      network_2     @{NET_2_VM_IPS}[0]    ${dst_ip_list}
+    Test Operations From Vm Instance    network_2    @{NET_2_VM_IPS}[0]    ${dst_ip_list}
 
 Connectivity Tests From Vm Instance2 In network_2
     [Documentation]    Logging to the vm instance2
     ${dst_ip_list}=    Create List    @{NET_2_VM_IPS}[0]    @{DHCP_IPS}[1]
     Log    ${dst_ip_list}
-    Test Operations From Vm Instance      network_2     @{NET_2_VM_IPS}[1]    ${dst_ip_list}
+    Test Operations From Vm Instance    network_2    @{NET_2_VM_IPS}[1]    ${dst_ip_list}
 
 Delete Vm Instance
     [Documentation]    Delete Vm instances using instance names.

diff --git a/csit/suites/ocpplugin/basic/010__ocp_get.robot b/csit/suites/ocpplugin/basic/010__ocp_get.robot
index 05a082a7807b3a43bf9b3f35ea387003db106bd2..5873f031f2bc167d066c3bbb6d8429986198f1a6 100644 (file)
--- a/csit/suites/ocpplugin/basic/010__ocp_get.robot
+++ b/csit/suites/ocpplugin/basic/010__ocp_get.robot
@@ -12,19 +12,20 @@ Resource          ../../../libraries/OcpAgentKeywords.robot
 Variables         ../../../variables/Variables.py
 
 *** Variables ***
-${NODE_ID}    /restconf/operational/opendaylight-inventory:nodes/node/ocp:
+${NODE_ID}        /restconf/operational/opendaylight-inventory:nodes/node/ocp:
 ${REST_GET_PARAM}    /restconf/operations/ocp-service:get-param-nb
+
 *** Test Cases ***
 Check if node exist
     [Documentation]    get inventory node
     [Tags]    get node
     OcpAgentKeywords.Install Agent
     ${mininet_conn_id}=    OcpAgentKeywords.Start Emulator Single
-    ${resp}    Get Request    session   ${NODE_ID}TST-100
+    ${resp}    Get Request    session    ${NODE_ID}TST-100
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Get param from emulator
-    [Documentation]    OCPPLUGIN  get param
+    [Documentation]    OCPPLUGIN get param
     [Tags]    OCPPLUGIN get
     ${resp}    Post Request    session    ${REST_GET_PARAM}    data={"input":{"nodeId":"ocp:TST-100","obj":[{"id":"ALL","param":[{"name":"ALL"}]}]}}
     Should Be Equal As Strings    ${resp.status_code}    200

diff --git a/csit/suites/openflowplugin/Performance/010_Cbench.robot b/csit/suites/openflowplugin/Performance/010_Cbench.robot
index 99579e382ad674fe34a76e76edcb71fcca60eb2b..f32b6d322c066e6dd22a2dfac0f9106c50351d36 100644 (file)
--- a/csit/suites/openflowplugin/Performance/010_Cbench.robot
+++ b/csit/suites/openflowplugin/Performance/010_Cbench.robot
@@ -48,7 +48,8 @@ Run Cbench And Log Results
     ##down can catch this problem and log the results as zero.    However, we need to know which
     ##file to log to, so setting it as a suite variable here.
     Set Suite Variable    ${output_filename}
-    ${output}=    Run Keyword If    "${cbench_system}" == "localhost"    Run Process    ${cbench_executable}    -c    ${ODL_SYSTEM_IP}    ${cbench_args}
+    ${output}=    Run Keyword If    "${cbench_system}" == "localhost"    Run Process    ${cbench_executable}    -c    ${ODL_SYSTEM_IP}
+    ...    ${cbench_args}
     ...    ELSE    Run Command On Remote System    ${cbench_system}    ${cbench_executable} -c ${ODL_SYSTEM_IP} ${cbench_args}    prompt_timeout=${test_timeout}
     Log    ${output}
     Should Contain    ${output}    RESULT