From 91b1a3d441b9f114f1797c02b27afc16da5d0b06 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Samuel=20Kontri=C5=A1?= Date: Thu, 25 Feb 2016 14:20:27 +0100 Subject: [PATCH] Topoprocessing - bugfix for bug5156 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: Iaf9e7aadbc05bc49400286fe5c37f814ecc7650c Signed-off-by: Samuel Kontriš --- csit/libraries/TopoprocessingKeywords.robot | 6 +- .../010_Aggregation.robot | 10 +- .../020_Filtration_nodes.robot | 112 +++++++++++------- .../030_Filtration_termination_points.robot | 33 ++---- .../040_Filtration_links.robot | 14 +-- .../050_Aggregation_filtration.robot | 13 +- 6 files changed, 82 insertions(+), 106 deletions(-) diff --git a/csit/libraries/TopoprocessingKeywords.robot b/csit/libraries/TopoprocessingKeywords.robot index 0a03c9c2e5..14a5569ff4 100644 --- a/csit/libraries/TopoprocessingKeywords.robot +++ b/csit/libraries/TopoprocessingKeywords.robot @@ -110,10 +110,10 @@ Prepare Unification Topology Request [Return] ${request_template} Prepare Unification Filtration Topology Request - [Arguments] ${request_template} ${model} ${target-field} ${underlay_topo2} + [Arguments] ${request_template} ${model} ${target_field} ${underlay_topo2} [Documentation] Prepare topology request for unification on two topologies from template ${request_template} Set Element Text ${request_template} ${underlay_topo2} xpath=.//correlation/aggregation/mapping[2]/underlay-topology - ${request_template} Set Element Text ${request_template} ${target-field} xpath=.//correlation/aggregation/mapping[2]/target-field[1]/target-field-path + Insert Target Field ${request_template} 2 ${target_field} 1 ${request_template} Set Element Text ${request_template} ${model} xpath=.//correlation/aggregation/mapping[2]/input-model ${request_template} Element to String ${request_template} [Return] ${request_template} @@ -127,7 +127,7 @@ Prepare Unification Filtration Inside Topology Request ${request_template} Set Element Text ${request_template} unification xpath=.//correlation/aggregation/aggregation-type ${request_template} Set Element Text ${request_template} ${model} xpath=.//correlation/aggregation/mapping[1]/input-model ${request_template} Set Element Text ${request_template} ${underlay_topo} xpath=.//correlation/aggregation/mapping[1]/underlay-topology - ${request_template} Set Element Text ${request_template} ${target-field} xpath=.//correlation/aggregation/mapping[1]/target-field[1]/target-field-path + Insert Target Field ${request_template} 1 ${target-field} 1 ${request_template} Set Element Text ${request_template} ${underlay_topo} xpath=.//correlation/filtration/underlay-topology ${request_template} Element to String ${request_template} [Return] ${request_template} diff --git a/csit/suites/topoprocessing/basic-topology-operations/010_Aggregation.robot b/csit/suites/topoprocessing/basic-topology-operations/010_Aggregation.robot index 0de1ab6e6d..0e9def6dd4 100644 --- a/csit/suites/topoprocessing/basic-topology-operations/010_Aggregation.robot +++ b/csit/suites/topoprocessing/basic-topology-operations/010_Aggregation.robot @@ -6,7 +6,7 @@ Documentation Test suite to verify unification operation on different models ... xmls and verify output. Topology-id on the end of each urls must match topology-id from xml. Yang models of components in topology are defined in xmls. Suite Setup Setup Environment Suite Teardown Clean Environment -Test Teardown Aggregation Test Teardown +Test Teardown Test Teardown network-topology:network-topology/topology/topo:1 Library RequestsLibrary Library SSHLibrary Library XML @@ -179,10 +179,4 @@ Unification Termination Point Inside Inventory ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='of-node:5']/.. ${node} Element to String ${node} Should Contain X Times ${node} 1 - [Teardown] Run Keywords Aggregation Test Teardown - ... AND Report_Failure_Due_To_Bug 4674 - -*** Keywords *** -Aggregation Test Teardown - Test Teardown network-topology:network-topology/topology/topo:1 - Report_Failure_Due_To_Bug 5157 + [Teardown] Report_Failure_Due_To_Bug 4674 diff --git a/csit/suites/topoprocessing/basic-topology-operations/020_Filtration_nodes.robot b/csit/suites/topoprocessing/basic-topology-operations/020_Filtration_nodes.robot index 7e97aa66b6..134ab9286d 100644 --- a/csit/suites/topoprocessing/basic-topology-operations/020_Filtration_nodes.robot +++ b/csit/suites/topoprocessing/basic-topology-operations/020_Filtration_nodes.robot @@ -6,7 +6,7 @@ Documentation Test suite to verify fitration operation on different models. ... Topology-id on the end of each urls must match topology-id from xml. Yang models of components in topology are defined in xmls. Suite Setup Setup Environment Suite Teardown Clean Environment -Test Teardown Filtration Nodes Test Teardown +Test Teardown Test Teardown network-topology:network-topology/topology/topo:1 Library RequestsLibrary Library SSHLibrary Library XML @@ -29,9 +29,9 @@ Filtration IPV4 Network Topology Model ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='bgp:1']/.. ${node} Element to String ${node} Should Contain X Times ${node} 3 - Should Contain ${node} tp:1:1 - Should Contain ${node} tp:1:2 - Should Contain ${node} tp:1:3 + Should Contain X Times ${node} /network-topology/topology/network-topo:1/node/bgp:1/termination-point/tp:1:3 1 + Should Contain X Times ${node} /network-topology/topology/network-topo:1/node/bgp:1/termination-point/tp:1:2 1 + Should Contain X Times ${node} /network-topology/topology/network-topo:1/node/bgp:1/termination-point/tp:1:3 1 Should Contain X Times ${resp.content} bgp:2 1 Filtration IPV4 Inventory Model @@ -44,8 +44,6 @@ Filtration IPV4 Inventory Model Should Contain X Times ${resp.content} node: 3 : FOR ${index} IN RANGE 1 3 \ Should Contain X Times ${resp.content} of-node:${index} 1 - [Teardown] Run Keywords Filtration Nodes Test Teardown - ... AND Report_Failure_Due_To_Bug 4683 Filtration Range Number Network Topology Model [Documentation] Test of range number type of filtration operation on Network Topology model @@ -58,11 +56,23 @@ Filtration Range Number Network Topology Model : FOR ${index} IN RANGE 7 10 \ Should Contain X Times ${resp.content} bgp:${index} 1 Should Contain X Times ${resp.content} 5 - Should Contain ${resp.content} tp:7:1 - Should Contain ${resp.content} tp:7:2 - Should Contain ${resp.content} tp:8:1 - Should Contain ${resp.content} tp:9:1 - Should Contain ${resp.content} tp:10:1 + #node bgp:7 + ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='bgp:7']/.. + ${node} Element to String ${node} + Should Contain X Times ${node} /network-topology/topology/network-topo:2/node/bgp:7/termination-point/tp:7:1 1 + Should Contain X Times ${node} /network-topology/topology/network-topo:2/node/bgp:7/termination-point/tp:7:2 1 + #node bgp:8 + ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='bgp:8']/.. + ${node} Element to String ${node} + Should Contain X Times ${node} /network-topology/topology/network-topo:2/node/bgp:8/termination-point/tp:8:1 1 + #node bgp:9 + ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='bgp:9']/.. + ${node} Element to String ${node} + Should Contain X Times ${node} /network-topology/topology/network-topo:2/node/bgp:9/termination-point/tp:9:1 1 + #node bgp:10 + ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='bgp:10']/.. + ${node} Element to String ${node} + Should Contain X Times ${node} /network-topology/topology/network-topo:2/node/bgp:10/termination-point/tp:10:1 1 Filtration Range Number Inventory Model [Documentation] Test of range number type of filtration operation on Inventory model @@ -74,8 +84,6 @@ Filtration Range Number Inventory Model Should Contain X Times ${resp.content} node: 3 : FOR ${index} IN RANGE 8 10 \ Should Contain X Times ${resp.content} of-node:${index} 1 - [Teardown] Run Keywords Filtration Nodes Test Teardown - ... AND Report_Failure_Due_To_Bug 4683 Filtration Specific Number Network Topology Model [Documentation] Test of specific number type of filtration operation on Network Topology model @@ -91,8 +99,6 @@ Filtration Specific Number Network Topology Model Should Contain X Times ${resp.content} 2 Should Contain ${resp.content} tp:9:1 Should Contain ${resp.content} tp:10:1 - [Teardown] Run Keywords Filtration Nodes Test Teardown - ... AND Report_Failure_Due_To_Bug 4721 Filtration Specific Number Inventory Model [Documentation] Test of specific number type of filtration operation on Inventory model @@ -105,9 +111,6 @@ Filtration Specific Number Inventory Model Should Contain X Times ${resp.content} node: 2 Should Contain X Times ${resp.content} of-node:8 1 Should Contain X Times ${resp.content} of-node:9 1 - [Teardown] Run Keywords Filtration Nodes Test Teardown - ... AND Report_Failure_Due_To_Bug 4683 - ... AND Report_Failure_Due_To_Bug 4721 Filtration Specific String Network Topology Model [Documentation] Test of specific string type of filtration operation on Network Topology model @@ -120,8 +123,14 @@ Filtration Specific String Network Topology Model Should Contain X Times ${resp.content} bgp:9 1 Should Contain X Times ${resp.content} bgp:10 1 Should Contain X Times ${resp.content} 2 - Should Contain ${resp.content} tp:9:1 - Should Contain ${resp.content} tp:10:1 + #node bgp:9 + ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='bgp:9']/.. + ${node} Element to String ${node} + Should Contain X Times ${node} /network-topology/topology/network-topo:2/node/bgp:9/termination-point/tp:9:1 1 + #node bgp:10 + ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='bgp:10']/.. + ${node} Element to String ${node} + Should Contain X Times ${node} /network-topology/topology/network-topo:2/node/bgp:10/termination-point/tp:10:1 1 Filtration Specific String Inventory Model [Documentation] Test of specific string type of filtration operation on Inventory model @@ -133,8 +142,6 @@ Filtration Specific String Inventory Model Should Contain X Times ${resp.content} node: 2 Should Contain X Times ${resp.content} of-node:8 1 Should Contain X Times ${resp.content} of-node:9 1 - [Teardown] Run Keywords Filtration Nodes Test Teardown - ... AND Report_Failure_Due_To_Bug 4683 Filtration Range String Network Topology Model [Documentation] Test of range string type of filtration operation on Network Topology model @@ -147,11 +154,23 @@ Filtration Range String Network Topology Model : FOR ${index} IN RANGE 7 10 \ Should Contain X Times ${resp.content} bgp:${index} 1 Should Contain X Times ${resp.content} 5 - Should Contain ${resp.content} tp:7:1 - Should Contain ${resp.content} tp:7:2 - Should Contain ${resp.content} tp:8:1 - Should Contain ${resp.content} tp:9:1 - Should Contain ${resp.content} tp:10:1 + #node bgp:7 + ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='bgp:7']/.. + ${node} Element to String ${node} + Should Contain X Times ${node} /network-topology/topology/network-topo:2/node/bgp:7/termination-point/tp:7:1 1 + Should Contain X Times ${node} /network-topology/topology/network-topo:2/node/bgp:7/termination-point/tp:7:2 1 + #node bgp:8 + ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='bgp:8']/.. + ${node} Element to String ${node} + Should Contain X Times ${node} /network-topology/topology/network-topo:2/node/bgp:8/termination-point/tp:8:1 1 + #node bgp:9 + ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='bgp:9']/.. + ${node} Element to String ${node} + Should Contain X Times ${node} /network-topology/topology/network-topo:2/node/bgp:9/termination-point/tp:9:1 1 + #node bgp:10 + ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='bgp:10']/.. + ${node} Element to String ${node} + Should Contain X Times ${node} /network-topology/topology/network-topo:2/node/bgp:10/termination-point/tp:10:1 1 Filtration Range String Inventory Model [Documentation] Test of range string type of filtration operation on Inventory model @@ -163,8 +182,6 @@ Filtration Range String Inventory Model Should Contain X Times ${resp.content} node: 3 : FOR ${index} IN RANGE 8 10 \ Should Contain X Times ${resp.content} of-node:${index} 1 - [Teardown] Run Keywords Filtration Nodes Test Teardown - ... AND Report_Failure_Due_To_Bug 4683 Filtration IPV6 Network Topology Model [Documentation] Test of ipv6 type of filtration operation on Network Topology model @@ -177,7 +194,14 @@ Filtration IPV6 Network Topology Model Should Contain X Times ${resp.content} bgp:11 1 Should Contain X Times ${resp.content} bgp:12 1 Should Contain X Times ${resp.content} 1 - Should Contain ${resp.content} tp:11:1 + #node bgp:11 + ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='bgp:11']/.. + ${node} Element to String ${node} + Should Contain X Times ${node} /network-topology/topology/network-topo:3/node/bgp:11/termination-point/tp:11:1 1 + #node bgp:12 + ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='bgp:12']/.. + ${node} Element to String ${node} + Should Not Contain ${node} Filtration IPV6 Inventory Model [Documentation] Test of ipv6 type of filtration operation on Inventory model @@ -190,8 +214,6 @@ Filtration IPV6 Inventory Model Should Contain X Times ${resp.content} of-node:12 1 Should Contain X Times ${resp.content} of-node:14 1 Should Contain X Times ${resp.content} of-node:15 1 - [Teardown] Run Keywords Filtration Nodes Test Teardown - ... AND Report_Failure_Due_To_Bug 4683 Filtration Script Network Topology Model [Documentation] Test of script type of filtration operation on Network Topology model @@ -205,11 +227,20 @@ Filtration Script Network Topology Model : FOR ${index} IN RANGE 3 5 \ Should Contain X Times ${resp.content} bgp:${index} 1 Should Contain X Times ${resp.content} 5 - Should Contain ${resp.content} tp:3:1 - Should Contain ${resp.content} tp:3:2 - Should Contain ${resp.content} tp:4:1 - Should Contain ${resp.content} tp:4:2 - Should Contain ${resp.content} tp:5:1 + #node bgp:3 + ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='bgp:3']/.. + ${node} Element to String ${node} + Should Contain X Times ${node} /network-topology/topology/network-topo:1/node/bgp:3/termination-point/tp:3:1 1 + Should Contain X Times ${node} /network-topology/topology/network-topo:1/node/bgp:3/termination-point/tp:3:2 1 + #node bgp:4 + ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='bgp:4']/.. + ${node} Element to String ${node} + Should Contain X Times ${node} /network-topology/topology/network-topo:1/node/bgp:4/termination-point/tp:4:1 1 + Should Contain X Times ${node} /network-topology/topology/network-topo:1/node/bgp:4/termination-point/tp:4:2 1 + #node bgp:5 + ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='bgp:5']/.. + ${node} Element to String ${node} + Should Contain X Times ${node} /network-topology/topology/network-topo:1/node/bgp:5/termination-point/tp:5:1 1 Filtration Script Inventory Model [Documentation] Test of script type of filtration operation on Inventory model @@ -222,10 +253,3 @@ Filtration Script Inventory Model Should Contain X Times ${resp.content} node: 3 : FOR ${index} IN RANGE 1 3 \ Should Contain X Times ${resp.content} of-node:${index} 1 - [Teardown] Run Keywords Filtration Nodes Test Teardown - ... AND Report_Failure_Due_To_Bug 4683 - -*** Keywords *** -Filtration Nodes Test Teardown - Test Teardown network-topology:network-topology/topology/topo:1 - Report_Failure_Due_To_Bug 4673 diff --git a/csit/suites/topoprocessing/basic-topology-operations/030_Filtration_termination_points.robot b/csit/suites/topoprocessing/basic-topology-operations/030_Filtration_termination_points.robot index 54565a9633..f9a3410eac 100644 --- a/csit/suites/topoprocessing/basic-topology-operations/030_Filtration_termination_points.robot +++ b/csit/suites/topoprocessing/basic-topology-operations/030_Filtration_termination_points.robot @@ -6,7 +6,7 @@ Documentation Test suite to verify fitration operation on different models. ... Topology-id on the end of each urls must match topology-id from xml. Yang models of components in topology are defined in xmls. Suite Setup Setup Environment Suite Teardown Clean Environment -Test Teardown Filtration Termination Points Test Teardown +Test Teardown Test Teardown network-topology:network-topology/topology/topo:1 Library RequestsLibrary Library SSHLibrary Library XML @@ -21,7 +21,7 @@ Filtration IPV4 Network Topology Model [Documentation] Test of ipv4 type of filtration operation on Network Topology model ${request} Prepare Filtration Topology Request ${FILTRATION_NT} network-topology-model termination-point network-topo:1 ${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} Set IPV4 Filter ${request} 192.168.1.1/8 ${resp} Send Basic Request ${request} network-topology:network-topology/topology/topo:1 Should Contain ${resp.content} topo:1 Should Contain X Times ${resp.content} node: 5 @@ -36,8 +36,6 @@ Filtration IPV4 Network Topology Model Should Contain X Times ${node} 2 Should Contain ${node} tp:3:1 Should Contain ${node} tp:3:2 - [Teardown] Run Keywords Filtration Termination Points Test Teardown - ... AND Report_Failure_Due_To_Bug 4750 Filtration Range Number Network Topology Model [Documentation] Test of range number type of filtration operation on Network Topology model @@ -57,8 +55,6 @@ Filtration Range Number Network Topology Model ${node} Element to String ${node} Should Contain X Times ${node} 1 Should Contain ${node} tp:6:1 - [Teardown] Run Keywords Filtration Termination Points Test Teardown - ... AND Report_Failure_Due_To_Bug 4750 Filtration Range Number Inventory Model [Documentation] Test of range number type of filtration operation on Inventory model @@ -78,7 +74,7 @@ Filtration Range Number Inventory Model ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='of-node:5']/.. ${node} Element to String ${node} Should Contain X Times ${node} 1 - [Teardown] Run Keywords Filtration Termination Points Test Teardown + [Teardown] Run Keywords Test Teardown network-topology:network-topology/topology/topo:1 ... AND Report_Failure_Due_To_Bug 4674 Filtration Specific Number Network Topology Model @@ -94,8 +90,6 @@ Filtration Specific Number Network Topology Model ${node} Element to String ${node} Should Contain X Times ${node} 1 Should Contain ${node} tp:7:1 - [Teardown] Run Keywords Filtration Termination Points Test Teardown - ... AND Report_Failure_Due_To_Bug 4750 Filtration Specific Number Inventory Model [Documentation] Test of specific number type of filtration operation on Inventory model @@ -118,7 +112,7 @@ Filtration Specific Number Inventory Model ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='of-node:4']/.. ${node} Element to String ${node} Should Contain X Times ${node} 3 - [Teardown] Run Keywords Filtration Termination Points Test Teardown + [Teardown] Run Keywords Test Teardown network-topology:network-topology/topology/topo:1 ... AND Report_Failure_Due_To_Bug 4674 Filtration Specific String Network Topology Model @@ -133,8 +127,6 @@ Filtration Specific String Network Topology Model ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='bgp:7']/.. ${node} Element to String ${node} Should Contain X Times ${node} 1 - [Teardown] Run Keywords Filtration Termination Points Test Teardown - ... AND Report_Failure_Due_To_Bug 4750 Filtration Specific String Inventory Model [Documentation] Test of specific string type of filtration operation on Inventory model @@ -150,7 +142,7 @@ Filtration Specific String Inventory Model ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='of-node:5']/.. ${node} Element to String ${node} Should Contain X Times ${node} 1 - [Teardown] Run Keywords Filtration Termination Points Test Teardown + [Teardown] Run Keywords Test Teardown network-topology:network-topology/topology/topo:1 ... AND Report_Failure_Due_To_Bug 4674 Filtration Range String Network Topology Model @@ -171,8 +163,6 @@ Filtration Range String Network Topology Model ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='bgp:10']/.. ${node} Element to String ${node} Should Contain X Times ${node} 1 - [Teardown] Run Keywords Filtration Termination Points Test Teardown - ... AND Report_Failure_Due_To_Bug 4750 Filtration Range String Inventory Model [Documentation] Test of range string type of filtration operation on Inventory model @@ -188,7 +178,7 @@ Filtration Range String Inventory Model ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='of-node:5']/.. ${node} Element to String ${node} Should Contain X Times ${node} 1 - [Teardown] Run Keywords Filtration Termination Points Test Teardown + [Teardown] Run Keywords Test Teardown network-topology:network-topology/topology/topo:1 ... AND Report_Failure_Due_To_Bug 4674 Filtration IPV6 Network Topology Model @@ -203,8 +193,6 @@ Filtration IPV6 Network Topology Model ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='bgp:11']/.. ${node} Element to String ${node} Should Contain X Times ${node} 1 - [Teardown] Run Keywords Filtration Termination Points Test Teardown - ... AND Report_Failure_Due_To_Bug 4750 Filtration Script Network Topology Model [Documentation] Test of script type of filtration operation on Network Topology model @@ -222,8 +210,6 @@ Filtration Script Network Topology Model ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='bgp:5']/.. ${node} Element to String ${node} Should Contain X Times ${node} 1 - [Teardown] Run Keywords Filtration Termination Points Test Teardown - ... AND Report_Failure_Due_To_Bug 4750 Filtration Script Inventory Model [Documentation] Test of script type of filtration operation on Inventory model @@ -241,10 +227,5 @@ Filtration Script Inventory Model ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='of-node:1']/.. ${node} Element to String ${node} Should Contain X Times ${node} 1 - [Teardown] Run Keywords Filtration Termination Points Test Teardown + [Teardown] Run Keywords Test Teardown network-topology:network-topology/topology/topo:1 ... AND Report_Failure_Due_To_Bug 4674 - -*** Keywords *** -Filtration Termination Points Test Teardown - Test Teardown network-topology:network-topology/topology/topo:1 - Report_Failure_Due_To_Bug 4673 diff --git a/csit/suites/topoprocessing/basic-topology-operations/040_Filtration_links.robot b/csit/suites/topoprocessing/basic-topology-operations/040_Filtration_links.robot index cb88d327da..aa94ccd756 100644 --- a/csit/suites/topoprocessing/basic-topology-operations/040_Filtration_links.robot +++ b/csit/suites/topoprocessing/basic-topology-operations/040_Filtration_links.robot @@ -39,8 +39,6 @@ Filtration Range Number Inventory Model Should Contain X Times ${resp.content} link: 2 Should Contain X Times ${resp.content} link:14:12 1 Should Contain X Times ${resp.content} link:15:13 1 - [Teardown] Run Keywords Filtration Links Test Teardown - ... AND Report_Failure_Due_To_Bug 4761 Filtration Specific Number Network Topology Model [Documentation] Test of specific number type of filtration operation on Network Topology model @@ -53,8 +51,6 @@ Filtration Specific Number Network Topology Model Should Contain X Times ${resp.content} link: 2 Should Contain X Times ${resp.content} link:1:4 1 Should Contain X Times ${resp.content} link:1:2-1 1 - [Teardown] Run Keywords Filtration Links Test Teardown - ... AND Report_Failure_Due_To_Bug 4721 Filtration Specific Number Inventory Model [Documentation] Test of specific number type of filtration operation on Inventory model @@ -67,8 +63,6 @@ Filtration Specific Number Inventory Model Should Contain X Times ${resp.content} link: 1 Should Contain X Times ${resp.content} link:11:12 1 [Teardown] Run Keywords Filtration Links Test Teardown - ... AND Report_Failure_Due_To_Bug 4761 - ... AND Report_Failure_Due_To_Bug 4721 Filtration Specific String Network Topology Model [Documentation] Test of specific string type of filtration operation on Network Topology model @@ -90,8 +84,6 @@ Filtration Specific String Inventory Model Should Contain ${resp.content} topo:1 Should Contain X Times ${resp.content} link: 1 Should Contain X Times ${resp.content} link:15:13 1 - [Teardown] Run Keywords Filtration Links Test Teardown - ... AND Report_Failure_Due_To_Bug 4761 Filtration Range String Network Topology Model [Documentation] Test of range string type of filtration operation on Network Topology model @@ -115,8 +107,6 @@ Filtration Range String Inventory Model Should Contain X Times ${resp.content} link: 2 Should Contain X Times ${resp.content} link:14:12 1 Should Contain X Times ${resp.content} link:15:13 1 - [Teardown] Run Keywords Filtration Links Test Teardown - ... AND Report_Failure_Due_To_Bug 4761 Filtration Script Network Topology Model [Documentation] Test of script type of filtration operation on Network Topology model @@ -142,10 +132,8 @@ Filtration Script Inventory Model Should Contain X Times ${resp.content} link:11:12 1 Should Contain X Times ${resp.content} link:14:12 1 Should Contain X Times ${resp.content} link:15:13 1 - [Teardown] Run Keywords Filtration Links Test Teardown - ... AND Report_Failure_Due_To_Bug 4761 *** Keywords *** Filtration Links Test Teardown Test Teardown network-topology:network-topology/topology/topo:1 - Report_Failure_Due_To_Bug 4673 + Report_Failure_Due_To_Bug 5188 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 e229c5d1c0..a1f5c42c26 100644 --- a/csit/suites/topoprocessing/basic-topology-operations/050_Aggregation_filtration.robot +++ b/csit/suites/topoprocessing/basic-topology-operations/050_Aggregation_filtration.robot @@ -6,7 +6,7 @@ Documentation Test suite to verify fitration operation on different models. ... Topology-id on the end of each urls must match topology-id from xml. Yang models of components in topology are defined in xmls. Suite Setup Setup Environment Suite Teardown Clean Environment -Test Teardown Aggregation Filtration Test Teardown +Test Teardown Test Teardown network-topology:network-topology/topology/topo:1 Library RequestsLibrary Library SSHLibrary Library XML @@ -51,8 +51,6 @@ Unification Filtration Node Inside Inventory model Should Contain ${node} of-node:17 Should Contain ${node} of-node:19 Should Contain ${node} of-node:20 - [Teardown] Run Keywords Aggregation Filtration Test Teardown - ... AND Report_Failure_Due_To_Bug 4683 Unification Filtration Termination Point Inside Network Topology model [Documentation] Test unification filtration inside operation on Network Topology model @@ -82,8 +80,6 @@ Unification Filtration Termination Point Inside Network Topology model Should Contain ${node} tp:24:1 Should Contain ${node} tp:24:2 Should Contain ${node} tp:24:3 - [Teardown] Run Keywords Aggregation Filtration Test Teardown - ... AND Report_Failure_Due_To_Bug 4750 Unification Filtration Node Network Topology model [Documentation] Test unification filtration operation on Network Topology model @@ -138,10 +134,3 @@ Unification Filtration Node Inventory model Should Contain X Times ${node} 2 Should Contain ${node} of-node:6 Should Contain ${node} of-node:16 - [Teardown] Run Keywords Aggregation Filtration Test Teardown - ... AND Report_Failure_Due_To_Bug 4683 - -*** Keywords *** -Aggregation Filtration Test Teardown - Test Teardown network-topology:network-topology/topology/topo:1 - Report_Failure_Due_To_Bug 4673 -- 2.36.6