Code Review / integration / test.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Topoprocessing - tests correction
[integration/test.git] / csit / suites / topoprocessing / basic-topology-operations / 050_Aggregation_filtration.robot
diff --git a/csit/suites/topoprocessing/basic-topology-operations/050_Aggregation_filtration.robot b/csit/suites/topoprocessing/basic-topology-operations/050_Aggregation_filtration.robot
index a1f5c42c26ec4e68362a93d5ecfc0f77b316b853..19f5ff1ff2fb3e2a7fcb86dc5f5c7f350692b916 100644 (file)
--- a/csit/suites/topoprocessing/basic-topology-operations/050_Aggregation_filtration.robot
+++ b/csit/suites/topoprocessing/basic-topology-operations/050_Aggregation_filtration.robot
@@ -20,13 +20,14 @@ Resource          ../../../libraries/TopoprocessingKeywords.robot
 Unification Filtration Node Inside Network Topology model
     [Documentation]    Test unification filtration inside operation on Network Topology model
     ${request}    Prepare Unification Filtration Inside Topology Request    ${UNIFICATION_FILTRATION_NT_AGGREGATE_INSIDE}    network-topology-model    node    l3-unicast-igp-topology:igp-node-attributes/isis-topology:isis-node-attributes/isis-topology:ted/isis-topology:te-router-id-ipv4    network-topo:4
-    ${request}    Insert Filter    ${request}    ${FILTER_IPV4}    l3-unicast-igp-topology:igp-node-attributes/isis-topology:isis-node-attributes/isis-topology:ted/isis-topology:te-router-id-ipv4
+    ${request}    Insert Filter With ID    ${request}    ${FILTER_IPV4}    l3-unicast-igp-topology:igp-node-attributes/isis-topology:isis-node-attributes/isis-topology:ted/isis-topology:te-router-id-ipv4    1
+    ${request}    Insert Apply Filters    ${request}    1    1
     ${request}    Set IPV4 Filter    ${request}    192.168.2.1/24
     ${resp}    Send Basic Request    ${request}    network-topology:network-topology/topology/topo:1
     Should Contain    ${resp.content}    <topology-id>topo:1</topology-id>
     Should Contain X Times    ${resp.content}    <node-id>node:    2
     Should Contain    ${resp.content}    <node-ref>bgp:    3
-    : FOR    ${index}    IN RANGE    18    20
+    : FOR    ${index}    IN RANGE    18    21
     \    Should Contain X Times    ${resp.content}    <node-ref>bgp:${index}</node-ref>    1
     ${node}    Get Element    ${resp.content}    xpath=.//node/supporting-node[node-ref='bgp:18']/..
     ${node}    Element to String    ${node}
@@ -37,13 +38,14 @@ Unification Filtration Node Inside Network Topology model
 Unification Filtration Node Inside Inventory model
     [Documentation]    Test unification filtration inside operation on Inventory model
     ${request}    Prepare Unification Filtration Inside Topology Request    ${UNIFICATION_FILTRATION_NT_AGGREGATE_INSIDE}    opendaylight-inventory-model    node    flow-node-inventory:ip-address    openflow-topo:4
-    ${request}    Insert Filter    ${request}    ${FILTER_IPV4}    flow-node-inventory:ip-address
+    ${request}    Insert Filter With ID    ${request}    ${FILTER_IPV4}    flow-node-inventory:ip-address    1
+    ${request}    Insert Apply Filters    ${request}    1    1
     ${request}    Set IPV4 Filter    ${request}    192.168.2.1/24
     ${resp}    Send Basic Request    ${request}    network-topology:network-topology/topology/topo:1
     Should Contain    ${resp.content}    <topology-id>topo:1</topology-id>
     Should Contain X Times    ${resp.content}    <node-id>node:    2
     Should Contain    ${resp.content}    <node-ref>of-node:    4
-    : FOR    ${index}    IN RANGE    17    20
+    : FOR    ${index}    IN RANGE    17    21
     \    Should Contain X Times    ${resp.content}    <node-ref>of-node:${index}</node-ref>    1
     ${node}    Get Element    ${resp.content}    xpath=.//node/supporting-node[node-ref='of-node:17']/..
     ${node}    Element to String    ${node}
@@ -54,9 +56,10 @@ Unification Filtration Node Inside Inventory model
 
 Unification Filtration Termination Point Inside Network Topology model
     [Documentation]    Test unification filtration inside operation on Network Topology model
-    ${request}    Prepare Unification Filtration Inside Topology Request    ${UNIFICATION_FILTRATION_NT_AGGREGATE_INSIDE}    network-topology-model    termination-point    l3-unicast-igp-topology:igp-termination-point-attributes/l3-unicast-igp-topology:ip-address    network-topo:5
-    ${request}    Insert Filter    ${request}    ${FILTER_IPV4}    l3-unicast-igp-topology:igp-termination-point-attributes/l3-unicast-igp-topology:ip-address
-    ${request}    Set IPV4 Filter    ${request}    192.168.1.1/24
+    ${request}    Prepare Unification Filtration Inside Topology Request    ${UNIFICATION_FILTRATION_NT_AGGREGATE_INSIDE}    network-topology-model    termination-point    ovsdb:name    network-topo:5
+    ${request}    Insert Filter With ID    ${request}    ${FILTER_SPECIFIC_STRING}    ovsdb:name    1
+    ${request}    Insert Apply Filters    ${request}    1    1
+    ${request}    Set Specific String Filter    ${request}    portA
     ${resp}    Send Basic Request    ${request}    network-topology:network-topology/topology/topo:1
     Should Contain    ${resp.content}    <topology-id>topo:1</topology-id>
     Should Contain X Times    ${resp.content}    <node-id>node:    5
@@ -83,54 +86,45 @@ Unification Filtration Termination Point Inside Network Topology model
 
 Unification Filtration Node Network Topology model
     [Documentation]    Test unification filtration operation on Network Topology model
-    ${request}    Prepare Unification Filtration Inside Topology Request    ${UNIFICATION_FILTRATION_NT}    network-topology-model    node    l3-unicast-igp-topology:igp-node-attributes/isis-topology:isis-node-attributes/isis-topology:ted/isis-topology:te-router-id-ipv4    network-topo:4
-    ${request}    Prepare Unification Filtration Topology Request    ${request}    network-topology-model    l3-unicast-igp-topology:igp-node-attributes/isis-topology:isis-node-attributes/isis-topology:ted/isis-topology:te-router-id-ipv4    network-topo:1
-    ${request}    Insert Filter    ${request}    ${FILTER_IPV4}    l3-unicast-igp-topology:igp-node-attributes/isis-topology:isis-node-attributes/isis-topology:ted/isis-topology:te-router-id-ipv4
-    ${request}    Set IPV4 Filter    ${request}    192.168.2.1/24
+    ${target_field}    Set Variable    l3-unicast-igp-topology:igp-node-attributes/isis-topology:isis-node-attributes/isis-topology:ted/isis-topology:te-router-id-ipv4
+    ${request}    Prepare Unification Filtration Topology Request    ${UNIFICATION_FILTRATION_NT}    network-topology-model    node    ${target_field}    network-topo:4
+    ...    ${target_field}    network-topo:1
+    ${request}    Insert Filter With ID    ${request}    ${FILTER_IPV4}    l3-unicast-igp-topology:igp-node-attributes/isis-topology:isis-node-attributes/isis-topology:ted/isis-topology:te-router-id-ipv4    1
+    ${request}    Insert Apply Filters    ${request}    1    1
+    ${request}    Insert Apply Filters    ${request}    2    1
+    ${request}    Set IPV4 Filter    ${request}    192.168.1.1/24
     ${resp}    Send Basic Request    ${request}    network-topology:network-topology/topology/topo:1
     Should Contain    ${resp.content}    <topology-id>topo:1</topology-id>
-    Should Contain X Times    ${resp.content}    <node-id>node:    5
-    : FOR    ${index}    IN RANGE    18    20
-    \    Should Contain X Times    ${resp.content}    <node-ref>bgp:${index}</node-ref>    1
-    : FOR    ${index}    IN RANGE    1    5
-    \    Should Contain X Times    ${resp.content}    <node-ref>bgp:${index}</node-ref>    1
-    ${node}    Get Element    ${resp.content}    xpath=.//node/supporting-node[node-ref='bgp:18']/..
-    ${node}    Element to String    ${node}
-    Should Contain X Times    ${node}    <supporting-node>    4
-    Should Contain    ${node}    <node-ref>bgp:18</node-ref>
-    Should Contain    ${node}    <node-ref>bgp:20</node-ref>
-    Should Contain    ${node}    <node-ref>bgp:3</node-ref>
-    Should Contain    ${node}    <node-ref>bgp:4</node-ref>
-    Should Contain    ${node}    <termination-point>    4
-    Should Contain    ${node}    <tp-id>tp:3:1</tp-id>
-    Should Contain    ${node}    <tp-id>tp:3:2</tp-id>
-    Should Contain    ${node}    <tp-id>tp:4:1</tp-id>
-    Should Contain    ${node}    <tp-id>tp:4:2</tp-id>
-    ${node}    Get Element    ${resp.content}    xpath=.//node/supporting-node[node-ref='bgp:5']/..
-    ${node}    Element to String    ${node}
-    Should Contain    ${node}    <termination-point>    1
-    Should Contain    ${node}    <tp-id>tp:5:1</tp-id>
+    Should Contain X Times    ${resp.content}    <node>    2
     ${node}    Get Element    ${resp.content}    xpath=.//node/supporting-node[node-ref='bgp:1']/..
     ${node}    Element to String    ${node}
-    Should Contain    ${node}    <termination-point>    3
-    Should Contain    ${node}    <tp-id>tp:1:1</tp-id>
-    Should Contain    ${node}    <tp-id>tp:1:2</tp-id>
-    Should Contain    ${node}    <tp-id>tp:1:3</tp-id>
+    Should Contain X Times    ${node}    <supporting-node>    2
+    Should Contain X Times    ${node}    <node-ref>bgp:1</node-ref>    1
+    Should Contain X Times    ${node}    <node-ref>bgp:16</node-ref>    1
+    Should Contain X Times    ${node}    <tp-ref>/network-topology/topology/network-topo:1/node/bgp:1/termination-point/tp:1:3</tp-ref>    1
+    Should Contain X Times    ${node}    <tp-ref>/network-topology/topology/network-topo:1/node/bgp:1/termination-point/tp:1:2</tp-ref>    1
+    Should Contain X Times    ${node}    <tp-ref>/network-topology/topology/network-topo:1/node/bgp:1/termination-point/tp:1:1</tp-ref>    1
+    ${node}    Get Element    ${resp.content}    xpath=.//node/supporting-node[node-ref='bgp:2']/..
+    ${node}    Element to String    ${node}
+    Should Contain X Times    ${node}    <supporting-node>    2
+    Should Contain X Times    ${node}    <node-ref>bgp:2</node-ref>    1
+    Should Contain X Times    ${node}    <node-ref>bgp:17</node-ref>    1
 
 Unification Filtration Node Inventory model
     [Documentation]    Test unification filtration operation on Inventory model
-    ${request}    Prepare Unification Filtration Inside Topology Request    ${UNIFICATION_FILTRATION_NT}    opendaylight-inventory-model    node    flow-node-inventory:ip-address    openflow-topo:4
-    ${request}    Prepare Unification Filtration Topology Request    ${request}    opendaylight-inventory-model    flow-node-inventory:ip-address    openflow-topo:6
-    ${request}    Insert Filter    ${request}    ${FILTER_IPV4}    flow-node-inventory:ip-address
+    ${request}    Prepare Unification Filtration Topology Request    ${UNIFICATION_FILTRATION_NT}    opendaylight-inventory-model    node    flow-node-inventory:ip-address    openflow-topo:4
+    ...    flow-node-inventory:ip-address    openflow-topo:6
+    ${request}    Insert Filter With ID    ${request}    ${FILTER_IPV4}    flow-node-inventory:ip-address    1
+    ${request}    Insert Apply Filters    ${request}    1    1
+    ${request}    Insert Apply Filters    ${request}    2    1
     ${request}    Set IPV4 Filter    ${request}    192.168.1.1/24
     ${resp}    Send Basic Request    ${request}    network-topology:network-topology/topology/topo:1
     Should Contain    ${resp.content}    <topology-id>topo:1</topology-id>
-    Should Contain X Times    ${resp.content}    <node-id>node:    5
-    : FOR    ${index}    IN RANGE    6    10
-    \    Should Contain X Times    ${resp.content}    <node-ref>of-node:${index}</node-ref>    1
-    Should Contain X Times    ${resp.content}    <node-ref>of-node:16</node-ref>    1
-    ${node}    Get Element    ${resp.content}    xpath=.//node/supporting-node[node-ref='of-node:6']/..
+    Should Contain X Times    ${resp.content}    <node>    2
+    ${node}    Get Element    ${resp.content}    xpath=.//node/supporting-node[node-ref='of-node:26']/..
     ${node}    Element to String    ${node}
-    Should Contain X Times    ${node}    <supporting-node>    2
-    Should Contain    ${node}    <node-ref>of-node:6</node-ref>
-    Should Contain    ${node}    <node-ref>of-node:16</node-ref>
+    Should Contain X Times    ${node}    <node-ref>of-node:26</node-ref>    1
+    Should Contain X Times    ${node}    <node-ref>of-node:16</node-ref>    1
+    ${node}    Get Element    ${resp.content}    xpath=.//node/supporting-node[node-ref='of-node:28']/..
+    ${node}    Element to String    ${node}
+    Should Contain X Times    ${node}    <node-ref>of-node:28</node-ref>    1
Integration test