Tidied up robot files

[integration/test.git] / csit / suites / topoprocessing / basic-topology-operations / 010_Aggregation.robot

diff --git a/csit/suites/topoprocessing/basic-topology-operations/010_Aggregation.robot b/csit/suites/topoprocessing/basic-topology-operations/010_Aggregation.robot
index 7859078a259e2c3df2ce9804303994507625c1b2..261bb9c25e32b49fb836e0e70fe2ed471580d644 100644 (file)
--- a/csit/suites/topoprocessing/basic-topology-operations/010_Aggregation.robot
+++ b/csit/suites/topoprocessing/basic-topology-operations/010_Aggregation.robot
@@ -25,7 +25,8 @@ Unification Node
     ${request}    Insert Target Field    ${request}    0    ${ISIS_NODE_TE_ROUTER_ID_IPV4}    0
     ${request}    Insert Target Field    ${request}    1    ${ISIS_NODE_TE_ROUTER_ID_IPV4}    0
     Basic Request Put    ${request}    ${OVERLAY_TOPO_URL}
-    ${resp}    Wait Until Keyword Succeeds    3x    1s    Output Topo Should Be Complete    node_count=8    supporting-node_count=10    tp_count=14    tp-ref_count=14
+    ${resp}    Wait Until Keyword Succeeds    3x    1s    Output Topo Should Be Complete    node_count=8    supporting-node_count=10
+    ...    tp_count=14    tp-ref_count=14
     Check Aggregated Node in Topology    ${model}    ${resp.content}    2    bgp:5    bgp:10
     Check Aggregated Node in Topology    ${model}    ${resp.content}    1    bgp:9
     Check Aggregated Node in Topology    ${model}    ${resp.content}    1    bgp:8
@@ -42,7 +43,8 @@ Unification Node Inventory
     ${request}    Insert Target Field    ${request}    0    ${OPENFLOW_NODE_IP_ADDRESS}    0
     ${request}    Insert Target Field    ${request}    1    ${OPENFLOW_NODE_IP_ADDRESS}    0
     Basic Request Put    ${request}    ${OVERLAY_TOPO_URL}
-    ${resp}    Wait Until Keyword Succeeds    3x    1s    Output Topo Should Be Complete    node_count=7    supporting-node_count=10    tp_count=12    tp-ref_count=12
+    ${resp}    Wait Until Keyword Succeeds    3x    1s    Output Topo Should Be Complete    node_count=7    supporting-node_count=10
+    ...    tp_count=12    tp-ref_count=12
     Check Aggregated Node in Topology    ${model}    ${resp.content}    3    of-node:10    of-node:4
     Check Aggregated Node in Topology    ${model}    ${resp.content}    0    of-node:7    of-node:9
     Check Aggregated Node in Topology    ${model}    ${resp.content}    0    of-node:8
@@ -59,7 +61,8 @@ Unification Scripting Node
     ${request}    Insert Target Field    ${request}    1    ${ISIS_NODE_TE_ROUTER_ID_IPV4}    0
     ${request}    Insert Scripting into Request    ${request}    javascript    if (originalItem.getLeafNodes().get(java.lang.Integer.valueOf('0')).getValue().indexOf("192.168.1.1") > -1 && newItem.getLeafNodes().get(java.lang.Integer.valueOf('0')).getValue().indexOf("192.168.1.3") > -1 || originalItem.getLeafNodes().get(java.lang.Integer.valueOf('0')).getValue().indexOf("192.168.1.3") > -1 && newItem.getLeafNodes().get(java.lang.Integer.valueOf('0')).getValue().indexOf("192.168.1.1") > -1) {aggregable.setResult(true);} else { aggregable.setResult(false);}
     Basic Request Put    ${request}    ${OVERLAY_TOPO_URL}
-    ${resp}    Wait Until Keyword Succeeds    3x    1s    Output Topo Should Be Complete    node_count=9    supporting-node_count=10    tp_count=14    tp-ref_count=14
+    ${resp}    Wait Until Keyword Succeeds    3x    1s    Output Topo Should Be Complete    node_count=9    supporting-node_count=10
+    ...    tp_count=14    tp-ref_count=14
     Check Aggregated Node in Topology    ${model}    ${resp.content}    1    bgp:10
     Check Aggregated Node in Topology    ${model}    ${resp.content}    1    bgp:9
     Check Aggregated Node in Topology    ${model}    ${resp.content}    1    bgp:8
@@ -78,7 +81,8 @@ Unification Scripting Node Inventory
     ${request}    Insert Target Field    ${request}    1    ${OPENFLOW_NODE_IP_ADDRESS}    0
     ${request}    Insert Scripting into Request    ${request}    javascript    if (originalItem.getLeafNodes().get(java.lang.Integer.valueOf('0')).getValue().indexOf("192.168.1.2") > -1 && newItem.getLeafNodes().get(java.lang.Integer.valueOf('0')).getValue().indexOf("192.168.1.4") > -1 || originalItem.getLeafNodes().get(java.lang.Integer.valueOf('0')).getValue().indexOf("192.168.1.4") > -1 && newItem.getLeafNodes().get(java.lang.Integer.valueOf('0')).getValue().indexOf("192.168.1.2") > -1) {aggregable.setResult(true);} else { aggregable.setResult(false);}
     Basic Request Put    ${request}    ${OVERLAY_TOPO_URL}
-    ${resp}    Wait Until Keyword Succeeds    3x    1s    Output Topo Should Be Complete    node_count=9    supporting-node_count=10    tp_count=12    tp-ref_count=12
+    ${resp}    Wait Until Keyword Succeeds    3x    1s    Output Topo Should Be Complete    node_count=9    supporting-node_count=10
+    ...    tp_count=12    tp-ref_count=12
     Check Aggregated Node in Topology    ${model}    ${resp.content}    0    of-node:10
     Check Aggregated Node in Topology    ${model}    ${resp.content}    0    of-node:9
     Check Aggregated Node in Topology    ${model}    ${resp.content}    3    of-node:2    of-node:8
@@ -95,7 +99,8 @@ Unification Node Inside
     ${request}    Prepare Unification Inside Topology Request    ${UNIFICATION_NT_AGGREGATE_INSIDE}    ${model}    node    network-topo:1
     ${request}    Insert Target Field    ${request}    0    ${ISIS_NODE_TE_ROUTER_ID_IPV4}    0
     Basic Request Put    ${request}    ${OVERLAY_TOPO_URL}
-    ${resp}    Wait Until Keyword Succeeds    3x    1s    Output Topo Should Be Complete    node_count=4    supporting-node_count=5    tp_count=8    tp-ref_count=8
+    ${resp}    Wait Until Keyword Succeeds    3x    1s    Output Topo Should Be Complete    node_count=4    supporting-node_count=5
+    ...    tp_count=8    tp-ref_count=8
     Check Aggregated Node in Topology    ${model}    ${resp.content}    1    bgp:5
     Check Aggregated Node in Topology    ${model}    ${resp.content}    4    bgp:3    bgp:4
     Check Aggregated Node in Topology    ${model}    ${resp.content}    0    bgp:2
@@ -107,7 +112,8 @@ Unification Node Inside Inventory
     ${request}    Prepare Unification Inside Topology Request    ${UNIFICATION_NT_AGGREGATE_INSIDE}    ${model}    node    openflow-topo:2
     ${request}    Insert Target Field    ${request}    0    ${OPENFLOW_NODE_IP_ADDRESS}    0
     Basic Request Put    ${request}    ${OVERLAY_TOPO_URL}
-    ${resp}    Wait Until Keyword Succeeds    3x    1s    Output Topo Should Be Complete    node_count=4    supporting-node_count=5    tp_count=0
+    ${resp}    Wait Until Keyword Succeeds    3x    1s    Output Topo Should Be Complete    node_count=4    supporting-node_count=5
+    ...    tp_count=0
     Check Aggregated Node in Topology    ${model}    ${resp.content}    0    of-node:10
     Check Aggregated Node in Topology    ${model}    ${resp.content}    0    of-node:7    of-node:9
     Check Aggregated Node in Topology    ${model}    ${resp.content}    0    of-node:8
@@ -119,7 +125,8 @@ Unification Termination Point Inside
     ${request}    Prepare Unification Inside Topology Request    ${UNIFICATION_NT_AGGREGATE_INSIDE}    ${model}    termination-point    network-topo:1
     ${request}    Insert Target Field    ${request}    0    ${OVSDB_OFPORT}    0
     Basic Request Put    ${request}    ${OVERLAY_TOPO_URL}
-    ${resp}    Wait Until Keyword Succeeds    3x    1s    Output Topo Should Be Complete    node_count=5    supporting-node_count=5    tp_count=6    tp-ref_count=8
+    ${resp}    Wait Until Keyword Succeeds    3x    1s    Output Topo Should Be Complete    node_count=5    supporting-node_count=5
+    ...    tp_count=6    tp-ref_count=8
     ${topology_id}    Set Variable    network-topo:1
     Check Aggregated Termination Point in Node    ${model}    ${resp.content}    ${topology_id}    bgp:1    tp:1:1    tp:1:1
     ...    tp:1:2
@@ -136,7 +143,8 @@ Unification Termination Point Inside Inventory
     ${request}    Prepare Unification Inside Topology Request    ${UNIFICATION_NT_AGGREGATE_INSIDE}    ${model}    termination-point    openflow-topo:1
     ${request}    Insert Target Field    ${request}    0    ${OPENFLOW_NODE_CONNECTOR_PORT_NUMBER}    0
     Basic Request Put    ${request}    ${OVERLAY_TOPO_URL}
-    ${resp}    Wait Until Keyword Succeeds    3x    1s    Output Topo Should Be Complete    node_count=5    supporting-node_count=5    tp_count=8    tp-ref_count=12
+    ${resp}    Wait Until Keyword Succeeds    3x    1s    Output Topo Should Be Complete    node_count=5    supporting-node_count=5
+    ...    tp_count=8    tp-ref_count=12
     ${topology_id}    Set Variable    openflow-topo:1
     Check Aggregated Termination Point in Node    ${model}    ${resp.content}    ${topology_id}    of-node:5    tp:5:1    tp:5:1
     Check Aggregated Termination Point in Node    ${model}    ${resp.content}    ${topology_id}    of-node:4    tp:4:1    tp:4:1