From a108bd396bc5cc8e7cda1d24a3988dc7d34ada50 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Samuel=20Kontri=C5=A1?= Date: Fri, 26 Feb 2016 13:30:26 +0100 Subject: [PATCH] Topoprocessing - tests correction MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit - reworked aggregation with filtration tests - reworked Filtration termination points tests - removed unnecessary files - corrected some other tests Change-Id: I8fc28154433517f22965d5eb93a52f218f2401ed Signed-off-by: Samuel Kontriš --- csit/libraries/TopoprocessingKeywords.robot | 23 +++- .../010_Aggregation.robot | 8 +- .../020_Filtration_nodes.robot | 14 +-- .../030_Filtration_termination_points.robot | 93 ++++++---------- .../040_Filtration_links.robot | 44 ++------ .../050_Aggregation_filtration.robot | 88 +++++++-------- .../basic/010_Restconf_OK.robot | 18 --- .../010_Unifications_Tests.robot | 79 ------------- csit/variables/topoprocessing/Requests.py | 104 ------------------ csit/variables/topoprocessing/Topologies.py | 22 +++- .../topoprocessing/TopologyRequests.py | 19 +++- 11 files changed, 149 insertions(+), 363 deletions(-) delete mode 100644 csit/suites/topoprocessing/basic/010_Restconf_OK.robot delete mode 100644 csit/suites/topoprocessing/topology-operations/010_Unifications_Tests.robot delete mode 100644 csit/variables/topoprocessing/Requests.py diff --git a/csit/libraries/TopoprocessingKeywords.robot b/csit/libraries/TopoprocessingKeywords.robot index 14a5569ff4..ebede24c4a 100644 --- a/csit/libraries/TopoprocessingKeywords.robot +++ b/csit/libraries/TopoprocessingKeywords.robot @@ -72,7 +72,7 @@ Insert Underlay Topologies [Documentation] Insert underlay topologies used by following tests Log Inserting underlay topologies # Network underlay topologies - : FOR ${index} IN RANGE 1 6 + : FOR ${index} IN RANGE 1 7 \ ${resp} Put Request session ${CONFIG_API}/${TOPOLOGY_URL}/network-topo:${index} data=${NETWORK_UNDERLAY_TOPOLOGY_${index}} \ Log ${resp.content} \ Should Be Equal As Strings ${resp.status_code} 200 @@ -81,7 +81,7 @@ Insert Underlay Topologies Log ${resp.content} Should Be Equal As Strings ${resp.status_code} 200 # Openflow underlay topologies - : FOR ${index} IN RANGE 1 6 + : FOR ${index} IN RANGE 1 7 \ ${resp} Put Request session ${CONFIG_API}/${TOPOLOGY_URL}/openflow-topo:${index} data=${OPENFLOW_UNDERLAY_TOPOLOGY_${index}} \ Log ${resp.content} \ Should Be Equal As Strings ${resp.status_code} 200 @@ -110,10 +110,12 @@ Prepare Unification Topology Request [Return] ${request_template} Prepare Unification Filtration Topology Request - [Arguments] ${request_template} ${model} ${target_field} ${underlay_topo2} + [Arguments] ${request_template} ${model} ${correlation_item} ${target_field1} ${underlay_topo1} ${target_field2} + ... ${underlay_topo2} [Documentation] Prepare topology request for unification on two topologies from template + ${request_template} Prepare Unification Filtration Inside Topology Request ${request_template} ${model} ${correlation_item} ${target_field1} ${underlay_topo1} ${request_template} Set Element Text ${request_template} ${underlay_topo2} xpath=.//correlation/aggregation/mapping[2]/underlay-topology - Insert Target Field ${request_template} 2 ${target_field} 1 + Insert Target Field ${request_template} 2 ${target_field2} 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} @@ -132,6 +134,12 @@ Prepare Unification Filtration Inside Topology Request ${request_template} Element to String ${request_template} [Return] ${request_template} +Insert Apply Filters + [Arguments] ${request_template} ${mapping} ${filter_id} + ${request_template} Add Element ${request_template} ${APPLY_FILTERS} xpath=.//correlation/aggregation/mapping[${mapping}] + ${request_template} Set Element Text ${request_template} ${filter_id} xpath=.//correlation/aggregation/mapping[${mapping}]/apply-filters + [Return] ${request_template} + Prepare Filtration Topology Request [Arguments] ${request_template} ${model} ${correlation_item} ${underlay_topo} [Documentation] Prepare topology request for filtration from template @@ -158,6 +166,13 @@ Insert Filter ${request_template} Set Element Text ${request_template} ${target_field} xpath=.//correlation/filtration/filter/target-field [Return] ${request_template} +Insert Filter With ID + [Arguments] ${request_template} ${filter_template} ${target_field} ${filter_id} + [Documentation] Add filter to filtration with specified id + ${request_template} Insert Filter ${request_template} ${filter_template} ${target_field} + ${request_template} Set Element Text ${request_template} ${filter_id} xpath=.//correlation/filtration/filter/filter-id + [Return] ${request_template} + Set IPV4 Filter [Arguments] ${request_template} ${ip_address} [Documentation] Set filter ipv4 address diff --git a/csit/suites/topoprocessing/basic-topology-operations/010_Aggregation.robot b/csit/suites/topoprocessing/basic-topology-operations/010_Aggregation.robot index 0e9def6dd4..d457dbb6ba 100644 --- a/csit/suites/topoprocessing/basic-topology-operations/010_Aggregation.robot +++ b/csit/suites/topoprocessing/basic-topology-operations/010_Aggregation.robot @@ -25,7 +25,7 @@ Unification Node ${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: 9 - : FOR ${index} IN RANGE 1 9 + : FOR ${index} IN RANGE 1 10 \ Should Contain X Times ${resp.content} bgp:${index} 1 ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='bgp:10']/.. ${node} Element to String ${node} @@ -40,7 +40,7 @@ Unification Node Inventory ${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: 8 - : FOR ${index} IN RANGE 1 10 + : FOR ${index} IN RANGE 1 11 \ Should Contain X Times ${resp.content} of-node:${index} 1 ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='of-node:1']/.. ${node} Element to String ${node} @@ -60,7 +60,7 @@ Unification Scripting Node ${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: 9 - : FOR ${index} IN RANGE 1 10 + : FOR ${index} IN RANGE 1 11 \ Should Contain X Times ${resp.content} bgp:${index} 1 ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='bgp:1']/.. ${node} Element to String ${node} @@ -76,7 +76,7 @@ Unification Scripting Node Inventory ${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: 9 - : FOR ${index} IN RANGE 1 10 + : FOR ${index} IN RANGE 1 11 \ Should Contain X Times ${resp.content} of-node:${index} 1 ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='of-node:2']/.. ${node} Element to String ${node} 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 134ab9286d..e1d1133e99 100644 --- a/csit/suites/topoprocessing/basic-topology-operations/020_Filtration_nodes.robot +++ b/csit/suites/topoprocessing/basic-topology-operations/020_Filtration_nodes.robot @@ -42,7 +42,7 @@ Filtration IPV4 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} node: 3 - : FOR ${index} IN RANGE 1 3 + : FOR ${index} IN RANGE 1 4 \ Should Contain X Times ${resp.content} of-node:${index} 1 Filtration Range Number Network Topology Model @@ -53,7 +53,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} node: 4 - : FOR ${index} IN RANGE 7 10 + : FOR ${index} IN RANGE 7 11 \ Should Contain X Times ${resp.content} bgp:${index} 1 Should Contain X Times ${resp.content} 5 #node bgp:7 @@ -82,7 +82,7 @@ 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} node: 3 - : FOR ${index} IN RANGE 8 10 + : FOR ${index} IN RANGE 8 11 \ Should Contain X Times ${resp.content} of-node:${index} 1 Filtration Specific Number Network Topology Model @@ -151,7 +151,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} node: 4 - : FOR ${index} IN RANGE 7 10 + : FOR ${index} IN RANGE 7 11 \ Should Contain X Times ${resp.content} bgp:${index} 1 Should Contain X Times ${resp.content} 5 #node bgp:7 @@ -180,7 +180,7 @@ 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} node: 3 - : FOR ${index} IN RANGE 8 10 + : FOR ${index} IN RANGE 8 11 \ Should Contain X Times ${resp.content} of-node:${index} 1 Filtration IPV6 Network Topology Model @@ -224,7 +224,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} node: 3 - : FOR ${index} IN RANGE 3 5 + : FOR ${index} IN RANGE 3 6 \ Should Contain X Times ${resp.content} bgp:${index} 1 Should Contain X Times ${resp.content} 5 #node bgp:3 @@ -251,5 +251,5 @@ 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} node: 3 - : FOR ${index} IN RANGE 1 3 + : FOR ${index} IN RANGE 1 4 \ Should Contain X Times ${resp.content} of-node:${index} 1 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 f9a3410eac..b51ce671b8 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 @@ -17,26 +17,6 @@ Resource ../../../libraries/Utils.robot Resource ../../../libraries/TopoprocessingKeywords.robot *** Test Cases *** -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/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 - Should Contain X Times ${resp.content} 4 - ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='bgp:1']/.. - ${node} Element to String ${node} - Should Contain X Times ${node} 2 - Should Contain ${node} tp:1:1 - Should Contain ${node} tp:1:2 - ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='bgp:3']/.. - ${node} Element to String ${node} - Should Contain X Times ${node} 2 - Should Contain ${node} tp:3:1 - Should Contain ${node} tp:3:2 - Filtration Range Number Network Topology Model [Documentation] Test of range number type of filtration operation on Network Topology model ${request} Prepare Filtration Topology Request ${FILTRATION_NT} network-topology-model termination-point network-topo:2 @@ -49,12 +29,12 @@ Filtration Range Number 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} 2 - Should Contain ${node} tp:7:1 - Should Contain ${node} tp:7:2 + 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} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='bgp:6']/.. ${node} Element to String ${node} Should Contain X Times ${node} 1 - Should Contain ${node} tp:6:1 + Should Contain X Times ${node} /network-topology/topology/network-topo:2/node/bgp:6/termination-point/tp:6:1 1 Filtration Range Number Inventory Model [Documentation] Test of range number type of filtration operation on Inventory model @@ -68,14 +48,17 @@ Filtration Range Number Inventory Model ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='of-node:2']/.. ${node} Element to String ${node} Should Contain X Times ${node} 2 + Should Contain X Times ${node} openflow:2:3 1 + Should Contain X Times ${node} openflow:2:2 1 ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='of-node:3']/.. ${node} Element to String ${node} Should Contain X Times ${node} 2 + Should Contain X Times ${node} openflow:3:2 1 + Should Contain X Times ${node} openflow:3:1 1 ${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 Test Teardown network-topology:network-topology/topology/topo:1 - ... AND Report_Failure_Due_To_Bug 4674 + Should Contain X Times ${node} openflow:5:1 1 Filtration Specific Number Network Topology Model [Documentation] Test of specific number type of filtration operation on Network Topology model @@ -89,31 +72,27 @@ Filtration Specific Number 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 - Should Contain ${node} tp:7:1 + Should Contain X Times ${node} /network-topology/topology/network-topo:2/node/bgp:7/termination-point/tp:7:1 1 Filtration Specific Number Inventory Model [Documentation] Test of specific number type of filtration operation on Inventory model ${request} Prepare Filtration Topology Request ${FILTRATION_NT} opendaylight-inventory-model termination-point openflow-topo:1 - ${request} Insert Filter ${request} ${FILTER_SPECIFIC_NUMBER} flow-node-inventory:port-number - ${request} Set Specific Number Filter ${request} 1 + #${request} Insert Filter ${request} ${FILTER_SPECIFIC_NUMBER} flow-node-inventory:port-number + ${request} Insert Filter ${request} ${FILTER_SPECIFIC_NUMBER} flow-node-inventory:maximum-speed + ${request} Set Specific Number Filter ${request} 2 ${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 - Should Contain X Times ${resp.content} 7 - ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='of-node:1']/.. - ${node} Element to String ${node} - Should Contain X Times ${node} 2 + Should Contain X Times ${resp.content} 3 ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='of-node:2']/.. ${node} Element to String ${node} Should Contain X Times ${node} 1 + Should Contain X Times ${node} openflow:2:2 1 ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='of-node:3']/.. ${node} Element to String ${node} - Should Contain X Times ${node} 1 - ${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 Test Teardown network-topology:network-topology/topology/topo:1 - ... AND Report_Failure_Due_To_Bug 4674 + Should Contain X Times ${node} 2 + Should Contain X Times ${node} openflow:3:2 1 + Should Contain X Times ${node} openflow:3:1 1 Filtration Specific String Network Topology Model [Documentation] Test of specific string type of filtration operation on Network Topology model @@ -127,6 +106,7 @@ 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 + Should Contain X Times ${node} /network-topology/topology/network-topo:2/node/bgp:7/termination-point/tp:7:2 1 Filtration Specific String Inventory Model [Documentation] Test of specific string type of filtration operation on Inventory model @@ -139,11 +119,11 @@ Filtration Specific String Inventory Model ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='of-node:2']/.. ${node} Element to String ${node} Should Contain X Times ${node} 1 + Should Contain X Times ${node} openflow:2:1 1 ${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 Test Teardown network-topology:network-topology/topology/topo:1 - ... AND Report_Failure_Due_To_Bug 4674 + Should Contain X Times ${node} openflow:5:1 1 Filtration Range String Network Topology Model [Documentation] Test of range string type of filtration operation on Network Topology model @@ -157,12 +137,15 @@ Filtration Range String Network Topology Model ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='bgp:6']/.. ${node} Element to String ${node} Should Contain X Times ${node} 1 + Should Contain ${node} /network-topology/topology/network-topo:2/node/bgp:6/termination-point/tp:6:1 ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='bgp:7']/.. ${node} Element to String ${node} Should Contain X Times ${node} 1 + Should Contain ${node} /network-topology/topology/network-topo:2/node/bgp:7/termination-point/tp:7:2 ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='bgp:10']/.. ${node} Element to String ${node} Should Contain X Times ${node} 1 + Should Contain ${node} /network-topology/topology/network-topo:2/node/bgp:10/termination-point/tp:10:1 Filtration Range String Inventory Model [Documentation] Test of range string type of filtration operation on Inventory model @@ -175,30 +158,18 @@ Filtration Range String Inventory Model ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='of-node:2']/.. ${node} Element to String ${node} Should Contain X Times ${node} 2 + Should Contain ${node} openflow:2:1 + Should Contain ${node} openflow:2:3 ${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 Test Teardown network-topology:network-topology/topology/topo:1 - ... AND Report_Failure_Due_To_Bug 4674 - -Filtration IPV6 Network Topology Model - [Documentation] Test of ipv6 type of filtration operation on Network Topology model - ${request} Prepare Filtration Topology Request ${FILTRATION_NT} network-topology-model termination-point network-topo:3 - ${request} Insert Filter ${request} ${FILTER_IPV6} l3-unicast-igp-topology:igp-termination-point-attributes/l3-unicast-igp-topology:ip-address - ${request} Set IPV6 Filter ${request} fe80:0:0:0:0:0:c0a8:101/120 - ${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 - Should Contain X Times ${resp.content} 1 - ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='bgp:11']/.. - ${node} Element to String ${node} - Should Contain X Times ${node} 1 + Should Contain ${node} openflow:5:1 Filtration Script Network Topology Model [Documentation] Test of script 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_SCRIPT} l3-unicast-igp-topology:igp-termination-point-attributes/l3-unicast-igp-topology:ip-address - ${script} Set Variable if (node.getValue().indexOf("192.168.1") > -1 ) {filterOut.setResult(true);} else {filterOut.setResult(false);} + ${request} Insert Filter ${request} ${FILTER_SCRIPT} ovsdb:ofport + ${script} Set Variable if (node.getValue() > 1117 ) {filterOut.setResult(true);} else {filterOut.setResult(false);} ${request} Set Script Filter ${request} javascript ${script} ${resp} Send Basic Request ${request} network-topology:network-topology/topology/topo:1 Should Contain ${resp.content} topo:1 @@ -207,9 +178,12 @@ Filtration Script Network Topology Model ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='bgp:4']/.. ${node} Element to String ${node} Should Contain X Times ${node} 2 + Should Contain X Times ${node} /network-topology/topology/network-topo:1/node/bgp:4/termination-point/tp:4:2 1 + Should Contain X Times ${node} /network-topology/topology/network-topo:1/node/bgp:4/termination-point/tp:4:1 1 ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='bgp:5']/.. ${node} Element to String ${node} Should Contain X Times ${node} 1 + 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 @@ -224,8 +198,9 @@ Filtration Script Inventory Model ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='of-node:2']/.. ${node} Element to String ${node} Should Contain X Times ${node} 2 + Should Contain X Times ${node} openflow:2:3 1 + Should Contain X Times ${node} openflow:2:2 1 ${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 Test Teardown network-topology:network-topology/topology/topo:1 - ... AND Report_Failure_Due_To_Bug 4674 + Should Contain X Times ${node} openflow:1:1 1 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 aa94ccd756..fa902be6d3 100644 --- a/csit/suites/topoprocessing/basic-topology-operations/040_Filtration_links.robot +++ b/csit/suites/topoprocessing/basic-topology-operations/040_Filtration_links.robot @@ -25,9 +25,9 @@ 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 - Should Contain X Times ${resp.content} link:1:4 1 - Should Contain X Times ${resp.content} link:1:3 1 - Should Contain X Times ${resp.content} link:1:2-1 1 + 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 Filtration Range Number Inventory Model [Documentation] Test of range number type of filtration operation on Inventory model @@ -40,30 +40,6 @@ Filtration Range Number Inventory Model Should Contain X Times ${resp.content} link:14:12 1 Should Contain X Times ${resp.content} link:15:13 1 -Filtration Specific Number Network Topology Model - [Documentation] Test of specific number type of filtration operation on Network Topology model - Pass Execution Test is being passed due to incorrect target field. Test will be included in execution when corrected. - ${request} Prepare Filtration Topology Request ${FILTRATION_NT} network-topology-model link network-topo:1 - ${request} Insert Filter ${request} ${FILTER_SPECIFIC_NUMBER} l3-unicast-igp-topology:igp-link-attributes/l3-unicast-igp-topology:metric - ${request} Set Specific Number Filter ${request} 12 - ${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:1:4 1 - Should Contain X Times ${resp.content} link:1:2-1 1 - -Filtration Specific Number Inventory Model - [Documentation] Test of specific number type of filtration operation on Inventory model - Pass Execution Test is being passed due to incorrect target field. Test will be included in execution when corrected. - ${request} Prepare Filtration Topology Request ${FILTRATION_NT} opendaylight-inventory-model link openflow-topo:3 - ${request} Insert Filter ${request} ${FILTER_SPECIFIC_NUMBER} l3-unicast-igp-topology:igp-link-attributes/l3-unicast-igp-topology:metric - ${request} Set Specific Number Filter ${request} 16 - ${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:11:12 1 - [Teardown] Run Keywords Filtration Links Test Teardown - Filtration Specific String Network Topology Model [Documentation] Test of specific string type of filtration operation on Network Topology model ${request} Prepare Filtration Topology Request ${FILTRATION_NT} network-topology-model link network-topo:1 @@ -72,8 +48,8 @@ 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 - Should Contain X Times ${resp.content} link:1:4 1 - Should Contain X Times ${resp.content} link:1:2-1 1 + 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 Filtration Specific String Inventory Model [Documentation] Test of specific string type of filtration operation on Inventory model @@ -93,9 +69,9 @@ 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 - Should Contain X Times ${resp.content} link:1:4 1 - Should Contain X Times ${resp.content} link:1:3 1 - Should Contain X Times ${resp.content} link:1:2-1 1 + 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 Filtration Range String Inventory Model [Documentation] Test of range string type of filtration operation on Inventory model @@ -117,8 +93,8 @@ 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 - Should Contain X Times ${resp.content} link:1:3 1 - Should Contain X Times ${resp.content} link:1:2-2 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-2 1 Filtration Script Inventory Model [Documentation] Test of script type of filtration operation on Inventory model 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 a1f5c42c26..19f5ff1ff2 100644 --- 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} topo:1 Should Contain X Times ${resp.content} node: 2 Should Contain ${resp.content} bgp: 3 - : FOR ${index} IN RANGE 18 20 + : FOR ${index} IN RANGE 18 21 \ Should Contain X Times ${resp.content} bgp:${index} 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} topo:1 Should Contain X Times ${resp.content} node: 2 Should Contain ${resp.content} of-node: 4 - : FOR ${index} IN RANGE 17 20 + : FOR ${index} IN RANGE 17 21 \ Should Contain X Times ${resp.content} of-node:${index} 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} topo:1 Should Contain X Times ${resp.content} 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} topo:1 - Should Contain X Times ${resp.content} node: 5 - : FOR ${index} IN RANGE 18 20 - \ Should Contain X Times ${resp.content} bgp:${index} 1 - : FOR ${index} IN RANGE 1 5 - \ Should Contain X Times ${resp.content} bgp:${index} 1 - ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='bgp:18']/.. - ${node} Element to String ${node} - Should Contain X Times ${node} 4 - Should Contain ${node} bgp:18 - Should Contain ${node} bgp:20 - Should Contain ${node} bgp:3 - Should Contain ${node} bgp:4 - Should Contain ${node} 4 - Should Contain ${node} tp:3:1 - Should Contain ${node} tp:3:2 - Should Contain ${node} tp:4:1 - Should Contain ${node} tp:4:2 - ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='bgp:5']/.. - ${node} Element to String ${node} - Should Contain ${node} 1 - Should Contain ${node} tp:5:1 + Should Contain X Times ${resp.content} 2 ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='bgp:1']/.. ${node} Element to String ${node} - Should Contain ${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} 2 + Should Contain X Times ${node} bgp:1 1 + Should Contain X Times ${node} bgp:16 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 ${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:1 1 + ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='bgp:2']/.. + ${node} Element to String ${node} + Should Contain X Times ${node} 2 + Should Contain X Times ${node} bgp:2 1 + Should Contain X Times ${node} bgp:17 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} topo:1 - Should Contain X Times ${resp.content} node: 5 - : FOR ${index} IN RANGE 6 10 - \ Should Contain X Times ${resp.content} of-node:${index} 1 - Should Contain X Times ${resp.content} of-node:16 1 - ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='of-node:6']/.. + Should Contain X Times ${resp.content} 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} 2 - Should Contain ${node} of-node:6 - Should Contain ${node} of-node:16 + Should Contain X Times ${node} of-node:26 1 + Should Contain X Times ${node} of-node:16 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} of-node:28 1 diff --git a/csit/suites/topoprocessing/basic/010_Restconf_OK.robot b/csit/suites/topoprocessing/basic/010_Restconf_OK.robot deleted file mode 100644 index aa17f2c11a..0000000000 --- a/csit/suites/topoprocessing/basic/010_Restconf_OK.robot +++ /dev/null @@ -1,18 +0,0 @@ -*** Settings *** -Documentation Test suite to verify Restconf is OK -Suite Setup Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} -Suite Teardown Delete All Sessions -Library RequestsLibrary -Variables ../../../variables/Variables.py -Resource ../../../libraries/Utils.robot - -*** Variables *** -${REST_CONTEXT} /restconf/modules - -*** Test Cases *** -Get Controller Modules - [Documentation] Get the controller modules via Restconf - ${resp} RequestsLibrary.Get Request session ${REST_CONTEXT} - Log ${resp.content} - Should Be Equal As Strings ${resp.status_code} 200 - Should Contain ${resp.content} ietf-restconf diff --git a/csit/suites/topoprocessing/topology-operations/010_Unifications_Tests.robot b/csit/suites/topoprocessing/topology-operations/010_Unifications_Tests.robot deleted file mode 100644 index fea8bbc9fe..0000000000 --- a/csit/suites/topoprocessing/topology-operations/010_Unifications_Tests.robot +++ /dev/null @@ -1,79 +0,0 @@ -*** Settings *** -Documentation Test suite to verify unification operation on different models. -... Before test starts, configurational file have to be rewriten to change listners registration datastore type from CONFIGURATION to OPERATIONAL. -... Need for this change is also a reason why main feature (odl-topoprocessing-framework) is installed after file change and not during boot. -... Tests themselves install feature required for specific model, clear karaf logs for futher synchronization, send configurational 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 Enviroment -Suite Teardown Test Teardown -Library RequestsLibrary -Library SSHLibrary -Variables ../../../variables/topoprocessing/Requests.py -Variables ../../../variables/Variables.py -Resource ../../../libraries/Utils.robot -Resource ../../../libraries/KarafKeywords.robot - -*** Variables *** -${CONFIGURATION_XML} ${CURDIR}/../configuration.xml -${OPERATIONAL_XML} ${CURDIR}/../operational.xml -${REMOTE_FILE} ${WORKSPACE}/${BUNDLEFOLDER}/etc/opendaylight/karaf/80-topoprocessing-config.xml -${OPERATIONAL} /restconf/operational -${CONFIGURATION} /restconf/config - -*** Test Cases *** -Unification on Network Topology - [Documentation] Test unification operation on Network Topology model - Prepare New Feature Installation - Install a Feature odl-topoprocessing-network-topology odl-bgpcep-pcep-all timeout=30 - Wait For Karaf Log Registering Topology Request Listener 300 - ${resp} RequestsLibrary.Put Request session ${CONFIGURATION}/${TOPOLOGY_URL}/unif:1 data=${UNIFICATION_NT} - Log ${CONFIGURATION}/${TOPOLOGY_URL}/unif:1 - Should Be Equal As Strings ${resp.status_code} 200 - Wait For Karaf Log Correlation configuration successfully read - ${resp} RequestsLibrary.Put Request session ${CONFIGURATION}/${TOPOLOGY_URL}/und-topo:1 data=${UNDERLAY_TOPOLOGY_1} - Log ${resp.content} - Should Be Equal As Strings ${resp.status_code} 200 - Issue Command On Karaf Console log:clear - ${resp} RequestsLibrary.Put Request session ${CONFIGURATION}/${TOPOLOGY_URL}/und-topo:2 data=${UNDERLAY_TOPOLOGY_2} - Log ${resp.content} - Should Be Equal As Strings ${resp.status_code} 200 - Wait For Karaf Log Transaction successfully written - ${resp} RequestsLibrary.Get Request session ${OPERATIONAL}/network-topology:network-topology - Log ${resp.content} - Should Be Equal As Strings ${resp.status_code} 200 - Should Contain ${resp.content} unif:1 - Should Contain X Times ${resp.content} node: 9 - Should Match Regexp ${resp.content} node:.?((pcep:5und-topo:1)|(pcep:10und-topo:2)){2} - -*** Keywords *** -Setup Enviroment - [Documentation] Setup karaf enviroment for following tests - Open Connection ${ODL_SYSTEM_IP} - Flexible Controller Login - Put File ${CONFIGURATION_XML} ${REMOTE_FILE} - Close Connection - Issue Command On Karaf Console log:set DEBUG org.opendaylight.topoprocessing - Install a Feature odl-topoprocessing-framework odl-restconf-noauth timeout=30 - Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${SEND_ACCEPT_XML_HEADERS} - -Test Teardown - [Documentation] Revert startup changes - Open Connection ${ODL_SYSTEM_IP} - Flexible Controller Login - Put File ${OPERATIONAL_XML} ${REMOTE_FILE} - Close Connection - Delete All Sessions - -Wait For Karaf Log - [Arguments] ${message} ${timeout}=60 - [Documentation] Read karaf logs until message appear - Open Connection ${ODL_SYSTEM_IP} port=${KARAF_SHELL_PORT} prompt=${KARAF_PROMPT} timeout=${timeout} - Flexible SSH Login ${KARAF_USER} ${KARAF_PASSWORD} - Write log:tail - Read Until ${message} - Close Connection - -Prepare New Feature Installation - [Documentation] Clears karaf logs and CONFIGURATION datastore - ${resp} RequestsLibrary.Delete Request session ${CONFIGURATION}/network-topology:network-topology - Issue Command On Karaf Console log:clear diff --git a/csit/variables/topoprocessing/Requests.py b/csit/variables/topoprocessing/Requests.py deleted file mode 100644 index 85b05ea8fa..0000000000 --- a/csit/variables/topoprocessing/Requests.py +++ /dev/null @@ -1,104 +0,0 @@ -UNIFICATION_NT = ''' - unif:1 - - network-topology-model - - 1 - aggregation-only - node - - unification - - network-topology-model - und-topo:1 - network-topology-pcep:path-computation-client/network-topology-pcep:ip-address - false - - - network-topology-model - und-topo:2 - network-topology-pcep:path-computation-client/network-topology-pcep:ip-address - false - - - - - ''' - -UNDERLAY_TOPOLOGY_1 = ''' - und-topo:1 - - - - - pcep:1 - - 192.168.1.1 - - - - pcep:2 - - 192.168.1.2 - - - - pcep:3 - - 192.168.2.1 - - - - pcep:4 - - 192.168.2.2 - - - - pcep:5 - - 192.168.2.3 - - - ''' - -UNDERLAY_TOPOLOGY_2 = ''' - und-topo:2 - - - - - pcep:6 - - 192.168.1.3 - - - - pcep:7 - - 192.168.1.4 - - - - pcep:8 - - 192.168.2.4 - - - - pcep:9 - - 192.168.2.5 - - - - pcep:10 - - 192.168.2.3 - - - ''' diff --git a/csit/variables/topoprocessing/Topologies.py b/csit/variables/topoprocessing/Topologies.py index 2056d3bb83..783ac76532 100644 --- a/csit/variables/topoprocessing/Topologies.py +++ b/csit/variables/topoprocessing/Topologies.py @@ -399,7 +399,8 @@ NETWORK_UNDERLAY_TOPOLOGY_4 = ''' + xmlns:isis="urn:TBD:params:xml:ns:yang:network:isis-topology" + xmlns:ovsdb="urn:opendaylight:params:xml:ns:yang:ovsdb"> network-topo:5 bgp:21 @@ -412,18 +413,21 @@ NETWORK_UNDERLAY_TOPOLOGY_5 = ''' tp:21:1 + portA 192.168.1.9 tp:21:2 + portA 192.168.1.8 tp:21:3 + portA 192.168.1.8 @@ -440,12 +444,14 @@ NETWORK_UNDERLAY_TOPOLOGY_5 = ''' tp:22:1 + portA 192.168.2.9 tp:22:2 + portB 192.168.1.7 @@ -472,18 +478,21 @@ NETWORK_UNDERLAY_TOPOLOGY_5 = ''' tp:24:1 + portA 192.168.1.7 tp:24:2 + portA 192.168.1.7 tp:24:3 + portB 192.168.1.7 @@ -619,6 +628,7 @@ OPENFLOW_UNDERLAY_NODES = ''' openflow:1:1 1 + 1 portC @@ -634,16 +644,19 @@ OPENFLOW_UNDERLAY_NODES = ''' openflow:2:1 1 + 1 portB openflow:2:2 2 + 2 portD openflow:2:3 3 + 3 portA Pantheon Technologies @@ -655,14 +668,17 @@ OPENFLOW_UNDERLAY_NODES = ''' openflow:3:1 2 + 2 openflow:3:2 2 + 2 openflow:3:3 1 + 1 Pantheon Technologies 192.168.1.3 @@ -673,14 +689,17 @@ OPENFLOW_UNDERLAY_NODES = ''' openflow:4:1 1 + 1 openflow:4:2 1 + 1 openflow:4:3 1 + 1 Cisco 192.168.2.1 @@ -691,6 +710,7 @@ OPENFLOW_UNDERLAY_NODES = ''' openflow:5:1 3 + 3 portB Cisco diff --git a/csit/variables/topoprocessing/TopologyRequests.py b/csit/variables/topoprocessing/TopologyRequests.py index 96531d2994..79b65a3f2d 100644 --- a/csit/variables/topoprocessing/TopologyRequests.py +++ b/csit/variables/topoprocessing/TopologyRequests.py @@ -57,15 +57,16 @@ UNIFICATION_FILTRATION_NT_AGGREGATE_INSIDE = '''{correlation-item} {aggregation-type} - - 1 + {input-model} {underlay-topology-id} - false + + {input-model} {underlay-topology-id} - false + + {underlay-topology-id} + @@ -118,6 +121,10 @@ FILTRATION_NT = ''' ''' +APPLY_FILTERS = ''' +{filter-id} +''' + TARGET_FIELD = ''' {target-field-path} -- 2.36.6