From: Samuel Kontriš Date: Wed, 23 Mar 2016 15:47:33 +0000 (+0100) Subject: Topoprocessing - corrected tests for filtration on links X-Git-Tag: release/lithium-sr4~71 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Ftest.git;a=commitdiff_plain;h=59a4e0878db9f3a46ca246875e025671f320e18c Topoprocessing - corrected tests for filtration on links Change-Id: I7bd7235c256ce7965003d30b8ab49be5dea6c262 Signed-off-by: Samuel Kontriš --- 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 fa902be6d3..b83df2e47c 100644 --- a/csit/suites/topoprocessing/basic-topology-operations/040_Filtration_links.robot +++ b/csit/suites/topoprocessing/basic-topology-operations/040_Filtration_links.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 Links Test Teardown +Test Teardown Test Teardown network-topology:network-topology/topology/topo:1 Library RequestsLibrary Library SSHLibrary Library XML @@ -25,6 +25,7 @@ Filtration Range Number Network Topology Model ${resp} Send Basic Request ${request} network-topology:network-topology/topology/topo:1 Should Contain ${resp.content} topo:1 Should Contain X Times ${resp.content} link: 3 + Check Supporting Links in Links ${resp.content} 3 Should Contain X Times ${resp.content} /network-topology/topology/network-topo:1/link/link:1:4 1 Should Contain X Times ${resp.content} /network-topology/topology/network-topo:1/link/link:1:3 1 Should Contain X Times ${resp.content} /network-topology/topology/network-topo:1/link/link:1:2-1 1 @@ -37,8 +38,9 @@ Filtration Range Number Inventory Model ${resp} Send Basic Request ${request} network-topology:network-topology/topology/topo:1 Should Contain ${resp.content} topo:1 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 + Check Supporting Links in Links ${resp.content} 2 + Should Contain X Times ${resp.content} /network-topology/topology/openflow-topo:3/link/link:14:12 1 + Should Contain X Times ${resp.content} /network-topology/topology/openflow-topo:3/link/link:15:13 1 Filtration Specific String Network Topology Model [Documentation] Test of specific string type of filtration operation on Network Topology model @@ -48,6 +50,7 @@ Filtration Specific String Network Topology Model ${resp} Send Basic Request ${request} network-topology:network-topology/topology/topo:1 Should Contain ${resp.content} topo:1 Should Contain X Times ${resp.content} link: 2 + Check Supporting Links in Links ${resp.content} 2 Should Contain X Times ${resp.content} /network-topology/topology/network-topo:1/link/link:1:4 1 Should Contain X Times ${resp.content} /network-topology/topology/network-topo:1/link/link:1:2-1 1 @@ -59,7 +62,8 @@ Filtration Specific String Inventory Model ${resp} Send Basic Request ${request} network-topology:network-topology/topology/topo:1 Should Contain ${resp.content} topo:1 Should Contain X Times ${resp.content} link: 1 - Should Contain X Times ${resp.content} link:15:13 1 + Check Supporting Links in Links ${resp.content} 1 + Should Contain X Times ${resp.content} /network-topology/topology/openflow-topo:3/link/link:15:13 1 Filtration Range String Network Topology Model [Documentation] Test of range string type of filtration operation on Network Topology model @@ -69,6 +73,7 @@ Filtration Range String Network Topology Model ${resp} Send Basic Request ${request} network-topology:network-topology/topology/topo:1 Should Contain ${resp.content} topo:1 Should Contain X Times ${resp.content} link: 3 + Check Supporting Links in Links ${resp.content} 3 Should Contain X Times ${resp.content} /network-topology/topology/network-topo:1/link/link:1:4 1 Should Contain X Times ${resp.content} /network-topology/topology/network-topo:1/link/link:1:2-1 1 Should Contain X Times ${resp.content} /network-topology/topology/network-topo:1/link/link:1:3 1 @@ -81,8 +86,9 @@ Filtration Range String Inventory Model ${resp} Send Basic Request ${request} network-topology:network-topology/topology/topo:1 Should Contain ${resp.content} topo:1 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 + Check Supporting Links in Links ${resp.content} 2 + Should Contain X Times ${resp.content} /network-topology/topology/openflow-topo:3/link/link:14:12 1 + Should Contain X Times ${resp.content} /network-topology/topology/openflow-topo:3/link/link:15:13 1 Filtration Script Network Topology Model [Documentation] Test of script type of filtration operation on Network Topology model @@ -93,6 +99,7 @@ Filtration Script Network Topology Model ${resp} Send Basic Request ${request} network-topology:network-topology/topology/topo:1 Should Contain ${resp.content} topo:1 Should Contain X Times ${resp.content} link: 2 + Check Supporting Links in Links ${resp.content} 2 Should Contain X Times ${resp.content} /network-topology/topology/network-topo:1/link/link:1:3 1 Should Contain X Times ${resp.content} /network-topology/topology/network-topo:1/link/link:1:2-2 1 @@ -105,11 +112,15 @@ Filtration Script Inventory Model ${resp} Send Basic Request ${request} network-topology:network-topology/topology/topo:1 Should Contain ${resp.content} topo:1 Should Contain X Times ${resp.content} link: 3 - 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 + Check Supporting Links in Links ${resp.content} 3 + Should Contain X Times ${resp.content} /network-topology/topology/openflow-topo:3/link/link:11:12 1 + Should Contain X Times ${resp.content} /network-topology/topology/openflow-topo:3/link/link:14:12 1 + Should Contain X Times ${resp.content} /network-topology/topology/openflow-topo:3/link/link:15:13 1 *** Keywords *** -Filtration Links Test Teardown - Test Teardown network-topology:network-topology/topology/topo:1 - Report_Failure_Due_To_Bug 5188 +Check Supporting Links in Links + [Arguments] ${content} ${number_of_links} + : FOR ${index} IN RANGE 1 ${number_of_links} + 1 + \ ${link} Get Element ${content} xpath=.//link[${index}] + \ ${link} Element To String ${link} + \ Should Contain X Times ${link} 1