From 992637f25d5454de57b7fa5f6f460e77cc2af2f3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andrej=20Z=C3=A1=C5=88?= Date: Mon, 21 Dec 2015 13:42:08 +0100 Subject: [PATCH] Change pcep topology for bgp topology MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit used path-computation-client from network-topology-pcep.yang is declared as config false. After 1014 was merged, we can't use it in configuration. This change is fix for https://bugs.opendaylight.org/show_bug.cgi?id=4813 Change-Id: Iece364eab5a9c6e14e537791ee0a2f1a922c780f Signed-off-by: Andrej Záň --- csit/libraries/TopoprocessingKeywords.robot | 2 +- .../010_Aggregation.robot | 39 +++--- csit/variables/topoprocessing/Topologies.py | 132 +++++++++++------- 3 files changed, 105 insertions(+), 68 deletions(-) diff --git a/csit/libraries/TopoprocessingKeywords.robot b/csit/libraries/TopoprocessingKeywords.robot index ee6cd3bd61..710c76a4f3 100644 --- a/csit/libraries/TopoprocessingKeywords.robot +++ b/csit/libraries/TopoprocessingKeywords.robot @@ -39,7 +39,7 @@ Setup Environment ${features} Get Installed Features ${lines} Get Lines Containing String ${features} odl-topoprocessing-framework ${length} Get Length ${lines} - Install a Feature odl-openflowplugin-nsf-model-li odl-topoprocessing-framework odl-topoprocessing-network-topology odl-topoprocessing-inventory odl-bgpcep-pcep-all odl-ovsdb-southbound-impl timeout=100 + Install a Feature odl-openflowplugin-nsf-model-li odl-topoprocessing-framework odl-topoprocessing-network-topology odl-topoprocessing-inventory odl-mdsal-models odl-ovsdb-southbound-impl timeout=120 Run Keyword If ${length} == 0 Wait For Karaf Log Registering Topology Request Listener 60 Prepare New Feature Installation Insert Underlay topologies diff --git a/csit/suites/topoprocessing/basic-topology-operations/010_Aggregation.robot b/csit/suites/topoprocessing/basic-topology-operations/010_Aggregation.robot index 62d6f3c721..a43776cee7 100644 --- a/csit/suites/topoprocessing/basic-topology-operations/010_Aggregation.robot +++ b/csit/suites/topoprocessing/basic-topology-operations/010_Aggregation.robot @@ -19,17 +19,17 @@ Resource ../../../libraries/TopoprocessingKeywords.robot *** Test Cases *** Unification Node [Documentation] Test unification operation on Network Topology model - ${request} Prepare Unification Topology Request ${UNIFICATION_NT} network-topology-model node network-topology-pcep:path-computation-client/network-topology-pcep:ip-address network-topo:1 + ${request} Prepare Unification Topology Request ${UNIFICATION_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:1 ... network-topo: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: 9 : FOR ${index} IN RANGE 1 9 - \ Should Contain X Times ${resp.content} pcep:${index} 1 - ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='pcep: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} - Should Contain X Times ${node} pcep:10 1 - Should Contain X Times ${node} pcep:5 1 + Should Contain X Times ${node} bgp:10 1 + Should Contain X Times ${node} bgp:5 1 Unification Node Inventory [Documentation] Test unification operation on inventory model @@ -48,20 +48,21 @@ Unification Node Inventory ${node} Element to String ${node} Should Contain X Times ${node} of-node:10 1 Should Contain X Times ${node} of-node:4 1 + Unification Scripting Node [Documentation] Test unification operation on Network Topology model using scripting - ${request} Prepare Unification Topology Request ${UNIFICATION_NT} network-topology-model node network-topology-pcep:path-computation-client/network-topology-pcep:ip-address network-topo:1 + ${request} Prepare Unification Topology Request ${UNIFICATION_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:1 ... network-topo:2 ${request} Insert Scripting into Request ${request} javascript if (originalItem.getLeafNode().getValue().indexOf("192.168.1.1") > -1 && newItem.getLeafNode().getValue().indexOf("192.168.1.3") > -1 || originalItem.getLeafNode().getValue().indexOf("192.168.1.3") > -1 && newItem.getLeafNode().getValue().indexOf("192.168.1.1") > -1) {aggregable.setResult(true);} else { aggregable.setResult(false);} ${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 - \ Should Contain X Times ${resp.content} pcep:${index} 1 - ${node} Get Element ${resp.content} xpath=.//node/supporting-node[node-ref='pcep:1']/.. + \ 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} - Should Contain X Times ${node} pcep:1 1 - Should Contain X Times ${node} pcep:6 1 + Should Contain X Times ${node} bgp:1 1 + Should Contain X Times ${node} bgp:6 1 Unification Scripting Node Inventory [Documentation] Test unification operation on inventory model using scripting @@ -80,16 +81,16 @@ Unification Scripting Node Inventory Unification Node Inside [Documentation] Test of unification type of aggregation inside on nodes on Network Topology model - ${request} Prepare Unification Inside Topology Request ${UNIFICATION_NT_AGGREGATE_INSIDE} network-topology-model node network-topology-pcep:path-computation-client/network-topology-pcep:ip-address network-topo:1 + ${request} Prepare Unification Inside Topology Request ${UNIFICATION_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:1 ${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 ${response_xml} Parse XML ${resp.content} - ${node} Get Element ${response_xml} xpath=.//node/supporting-node[node-ref='pcep:3']/.. + ${node} Get Element ${response_xml} xpath=.//node/supporting-node[node-ref='bgp:3']/.. ${node} Element To String ${node} Should Contain X Times ${node} 2 - Should Contain ${node} pcep:3 - Should Contain ${node} pcep:4 + Should Contain ${node} bgp:3 + Should Contain ${node} bgp:4 Unification Node Inside Inventory [Documentation] Test of unification type of aggregation inside on nodes on Inventory model @@ -113,16 +114,16 @@ Unification Termination Point Inside ${response_xml} Element to String ${response_xml} Should Contain X Times ${resp.content} node: 5 Should Contain X Times ${response_xml} 6 - ${node} Get Element ${response_xml} xpath=.//node/supporting-node[node-ref='pcep:1']/.. + ${node} Get Element ${response_xml} xpath=.//node/supporting-node[node-ref='bgp:1']/.. ${node} Element to String ${node} Should Contain X Times ${node} 2 - ${node} Get Element ${response_xml} xpath=.//node/supporting-node[node-ref='pcep:3']/.. + ${node} Get Element ${response_xml} xpath=.//node/supporting-node[node-ref='bgp:3']/.. ${node} Element to String ${node} Should Contain X Times ${node} 2 - ${node} Get Element ${response_xml} xpath=.//node/supporting-node[node-ref='pcep:4']/.. + ${node} Get Element ${response_xml} xpath=.//node/supporting-node[node-ref='bgp:4']/.. ${node} Element to String ${node} Should Contain X Times ${node} 1 - ${node} Get Element ${response_xml} xpath=.//node/supporting-node[node-ref='pcep:5']/.. + ${node} Get Element ${response_xml} xpath=.//node/supporting-node[node-ref='bgp:5']/.. ${node} Element to String ${node} Should Contain X Times ${node} 1 @@ -149,4 +150,4 @@ Unification Termination Point Inside Inventory Should Contain X Times ${node} 1 ${node} Get Element ${response_xml} xpath=.//node/supporting-node[node-ref='of-node:5']/.. ${node} Element to String ${node} - Should Contain X Times ${node} 1 \ No newline at end of file + Should Contain X Times ${node} 1 diff --git a/csit/variables/topoprocessing/Topologies.py b/csit/variables/topoprocessing/Topologies.py index 13c7796844..f4473dde53 100644 --- a/csit/variables/topoprocessing/Topologies.py +++ b/csit/variables/topoprocessing/Topologies.py @@ -1,16 +1,18 @@ NETWORK_UNDERLAY_TOPOLOGY_1 = ''' network-topo:1 - - - - pcep:1 - - 192.168.1.1 - + bgp:1 + + + + 192.168.1.1 + + + tp:1:1 1119 @@ -25,16 +27,24 @@ NETWORK_UNDERLAY_TOPOLOGY_1 = ''' - pcep:2 - - 192.168.1.2 - + bgp:2 + + + + 192.168.1.2 + + + - pcep:3 - - 192.168.2.1 - + bgp:3 + + + + 192.168.2.1 + + + tp:3:1 1118 @@ -45,10 +55,14 @@ NETWORK_UNDERLAY_TOPOLOGY_1 = ''' - pcep:4 - - 192.168.2.1 - + bgp:4 + + + + 192.168.2.1 + + + tp:4:1 1117 @@ -59,10 +73,14 @@ NETWORK_UNDERLAY_TOPOLOGY_1 = ''' - pcep:5 - - 192.168.2.3 - + bgp:5 + + + + 192.168.2.3 + + + tp:5:1 1116 @@ -72,57 +90,75 @@ NETWORK_UNDERLAY_TOPOLOGY_1 = ''' network-topo:2 - - - - pcep:6 - - 192.168.1.3 - + bgp:6 + + + + 192.168.1.3 + + + tp:6:1 1116 - pcep:7 - - 192.168.1.4 - + bgp:7 + + + + 192.168.1.4 + + + tp:7:1 1117 - pcep:8 - - 192.168.2.4 - + bgp:8 + + + + 192.168.2.4 + + + tp:8:1 11120 - pcep:9 - - 192.168.2.5 - + bgp:9 + + + + 192.168.2.5 + + + tp:9:1 1121 - pcep:10 - - 192.168.2.3 - + bgp:10 + + + + 192.168.2.3 + + + tp:10:1 1122 -- 2.36.6