Change pcep topology for bgp topology

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áň <andrej.zan@pantheon.sk>

diff --git a/csit/libraries/TopoprocessingKeywords.robot b/csit/libraries/TopoprocessingKeywords.robot
index ee6cd3bd61425d0e39382851253481d82567c06c..710c76a4f3553bd6db6b28a53115baf1278848c3 100644 (file)
--- 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 62d6f3c72135a75c500b550b5eee901bfa11393f..a43776cee73be9ad9957bac79af353b8d72dadf2 100644 (file)
--- 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}    <topology-id>topo:1</topology-id>
     Should Contain X Times    ${resp.content}    <node-id>node:    9
     : FOR    ${index}    IN RANGE    1    9
-    \    Should Contain X Times    ${resp.content}    <node-ref>pcep:${index}</node-ref>    1
-    ${node}    Get Element    ${resp.content}    xpath=.//node/supporting-node[node-ref='pcep:10']/..
+    \    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:10']/..
     ${node}    Element to String    ${node}
-    Should Contain X Times    ${node}    <node-ref>pcep:10</node-ref>    1
-    Should Contain X Times    ${node}    <node-ref>pcep:5</node-ref>    1
+    Should Contain X Times    ${node}    <node-ref>bgp:10</node-ref>    1
+    Should Contain X Times    ${node}    <node-ref>bgp:5</node-ref>    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}    <node-ref>of-node:10</node-ref>    1
     Should Contain X Times    ${node}    <node-ref>of-node:4</node-ref>    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}    <topology-id>topo:1</topology-id>
     Should Contain X Times    ${resp.content}    <node-id>node:    9
     : FOR    ${index}    IN RANGE    1    10
-    \    Should Contain X Times    ${resp.content}    <node-ref>pcep:${index}</node-ref>    1
-    ${node}    Get Element    ${resp.content}    xpath=.//node/supporting-node[node-ref='pcep:1']/..
+    \    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:1']/..
     ${node}    Element to String    ${node}
-    Should Contain X Times    ${node}    <node-ref>pcep:1</node-ref>    1
-    Should Contain X Times    ${node}    <node-ref>pcep:6</node-ref>    1
+    Should Contain X Times    ${node}    <node-ref>bgp:1</node-ref>    1
+    Should Contain X Times    ${node}    <node-ref>bgp:6</node-ref>    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}    <topology-id>topo:1</topology-id>
     Should Contain X Times    ${resp.content}    <node-id>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}    <supporting-node>    2
-    Should Contain    ${node}    <supporting-node><node-ref>pcep:3</node-ref>
-    Should Contain    ${node}    <supporting-node><node-ref>pcep:4</node-ref>
+    Should Contain    ${node}    <supporting-node><node-ref>bgp:3</node-ref>
+    Should Contain    ${node}    <supporting-node><node-ref>bgp:4</node-ref>
 
 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-id>node:    5
     Should Contain X Times    ${response_xml}    <termination-point>    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}    <termination-point>    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}    <termination-point>    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}    <termination-point>    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}    <termination-point>    1
 
@@ -149,4 +150,4 @@ Unification Termination Point Inside Inventory
     Should Contain X Times    ${node}    <termination-point>    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}    <termination-point>    1
\ No newline at end of file
+    Should Contain X Times    ${node}    <termination-point>    1

diff --git a/csit/variables/topoprocessing/Topologies.py b/csit/variables/topoprocessing/Topologies.py
index 13c77968446a980beb854c60c5d4153a418b03fe..f4473dde53d48f07f72bc9fec547ec1f655956b2 100644 (file)
--- a/csit/variables/topoprocessing/Topologies.py
+++ b/csit/variables/topoprocessing/Topologies.py
@@ -1,16 +1,18 @@
 NETWORK_UNDERLAY_TOPOLOGY_1 = '''<topology
                                 xmlns="urn:TBD:params:xml:ns:yang:network-topology"
-                                xmlns:pcep="urn:opendaylight:params:xml:ns:yang:topology:pcep"
+                                xmlns:igp="urn:TBD:params:xml:ns:yang:nt:l3-unicast-igp-topology"
+                                xmlns:isis="urn:TBD:params:xml:ns:yang:network:isis-topology"
                                 xmlns:ovsdb="urn:opendaylight:params:xml:ns:yang:ovsdb">
                             <topology-id>network-topo:1</topology-id>
-                            <topology-types>
-                                <pcep:topology-pcep></pcep:topology-pcep>
-                            </topology-types>
                             <node>
-                                <node-id>pcep:1</node-id>
-                                <pcep:path-computation-client>
-                                    <pcep:ip-address>192.168.1.1</pcep:ip-address>
-                                </pcep:path-computation-client>
+                                <node-id>bgp:1</node-id>
+                                <igp:igp-node-attributes>
+                                    <isis:isis-node-attributes>
+                                        <isis:ted>
+                                            <isis:te-router-id-ipv4>192.168.1.1</isis:te-router-id-ipv4>
+                                        </isis:ted>
+                                    </isis:isis-node-attributes>
+                                </igp:igp-node-attributes>
                                 <termination-point>
                                     <tp-id>tp:1:1</tp-id>
                                     <ovsdb:ofport>1119</ovsdb:ofport>
@@ -25,16 +27,24 @@ NETWORK_UNDERLAY_TOPOLOGY_1 = '''<topology
                                 </termination-point>
                             </node>
                             <node>
-                                <node-id>pcep:2</node-id>
-                                <pcep:path-computation-client>
-                                    <pcep:ip-address>192.168.1.2</pcep:ip-address>
-                                </pcep:path-computation-client>
+                                <node-id>bgp:2</node-id>
+                                <igp:igp-node-attributes>
+                                    <isis:isis-node-attributes>
+                                        <isis:ted>
+                                            <isis:te-router-id-ipv4>192.168.1.2</isis:te-router-id-ipv4>
+                                        </isis:ted>
+                                    </isis:isis-node-attributes>
+                                </igp:igp-node-attributes>
                             </node>
                             <node>
-                                <node-id>pcep:3</node-id>
-                                <pcep:path-computation-client>
-                                    <pcep:ip-address>192.168.2.1</pcep:ip-address>
-                                </pcep:path-computation-client>
+                                <node-id>bgp:3</node-id>
+                                <igp:igp-node-attributes>
+                                    <isis:isis-node-attributes>
+                                        <isis:ted>
+                                            <isis:te-router-id-ipv4>192.168.2.1</isis:te-router-id-ipv4>
+                                        </isis:ted>
+                                    </isis:isis-node-attributes>
+                                </igp:igp-node-attributes>
                                 <termination-point>
                                     <tp-id>tp:3:1</tp-id>
                                     <ovsdb:ofport>1118</ovsdb:ofport>
@@ -45,10 +55,14 @@ NETWORK_UNDERLAY_TOPOLOGY_1 = '''<topology
                                 </termination-point>
                             </node>
                             <node>
-                                <node-id>pcep:4</node-id>
-                                <pcep:path-computation-client>
-                                    <pcep:ip-address>192.168.2.1</pcep:ip-address>
-                                </pcep:path-computation-client>
+                                <node-id>bgp:4</node-id>
+                                <igp:igp-node-attributes>
+                                    <isis:isis-node-attributes>
+                                        <isis:ted>
+                                            <isis:te-router-id-ipv4>192.168.2.1</isis:te-router-id-ipv4>
+                                        </isis:ted>
+                                    </isis:isis-node-attributes>
+                                </igp:igp-node-attributes>
                                 <termination-point>
                                     <tp-id>tp:4:1</tp-id>
                                     <ovsdb:ofport>1117</ovsdb:ofport>
@@ -59,10 +73,14 @@ NETWORK_UNDERLAY_TOPOLOGY_1 = '''<topology
                                 </termination-point>
                             </node>
                             <node>
-                                <node-id>pcep:5</node-id>
-                                <pcep:path-computation-client>
-                                    <pcep:ip-address>192.168.2.3</pcep:ip-address>
-                                </pcep:path-computation-client>
+                                <node-id>bgp:5</node-id>
+                                <igp:igp-node-attributes>
+                                    <isis:isis-node-attributes>
+                                        <isis:ted>
+                                            <isis:te-router-id-ipv4>192.168.2.3</isis:te-router-id-ipv4>
+                                        </isis:ted>
+                                    </isis:isis-node-attributes>
+                                </igp:igp-node-attributes>
                                 <termination-point>
                                     <tp-id>tp:5:1</tp-id>
                                     <ovsdb:ofport>1116</ovsdb:ofport>
@@ -72,57 +90,75 @@ NETWORK_UNDERLAY_TOPOLOGY_1 = '''<topology
 
 NETWORK_UNDERLAY_TOPOLOGY_2 = '''<topology
                                 xmlns="urn:TBD:params:xml:ns:yang:network-topology"
-                                xmlns:pcep="urn:opendaylight:params:xml:ns:yang:topology:pcep"
+                                xmlns:igp="urn:TBD:params:xml:ns:yang:nt:l3-unicast-igp-topology"
+                                xmlns:isis="urn:TBD:params:xml:ns:yang:network:isis-topology"
                                 xmlns:ovsdb="urn:opendaylight:params:xml:ns:yang:ovsdb">
                             <topology-id>network-topo:2</topology-id>
-                            <topology-types>
-                                <pcep:topology-pcep></pcep:topology-pcep>
-                            </topology-types>
                             <node>
-                                <node-id>pcep:6</node-id>
-                                <pcep:path-computation-client>
-                                    <pcep:ip-address>192.168.1.3</pcep:ip-address>
-                                </pcep:path-computation-client>
+                                <node-id>bgp:6</node-id>
+                                <igp:igp-node-attributes>
+                                    <isis:isis-node-attributes>
+                                        <isis:ted>
+                                            <isis:te-router-id-ipv4>192.168.1.3</isis:te-router-id-ipv4>
+                                        </isis:ted>
+                                    </isis:isis-node-attributes>
+                                </igp:igp-node-attributes>
                                 <termination-point>
                                     <tp-id>tp:6:1</tp-id>
                                     <ovsdb:ofport>1116</ovsdb:ofport>
                                 </termination-point>
                             </node>
                             <node>
-                                <node-id>pcep:7</node-id>
-                                <pcep:path-computation-client>
-                                    <pcep:ip-address>192.168.1.4</pcep:ip-address>
-                                </pcep:path-computation-client>
+                                <node-id>bgp:7</node-id>
+                                <igp:igp-node-attributes>
+                                    <isis:isis-node-attributes>
+                                        <isis:ted>
+                                            <isis:te-router-id-ipv4>192.168.1.4</isis:te-router-id-ipv4>
+                                        </isis:ted>
+                                    </isis:isis-node-attributes>
+                                </igp:igp-node-attributes>
                                 <termination-point>
                                     <tp-id>tp:7:1</tp-id>
                                     <ovsdb:ofport>1117</ovsdb:ofport>
                                 </termination-point>
                             </node>
                             <node>
-                                <node-id>pcep:8</node-id>
-                                <pcep:path-computation-client>
-                                    <pcep:ip-address>192.168.2.4</pcep:ip-address>
-                                </pcep:path-computation-client>
+                                <node-id>bgp:8</node-id>
+                                <igp:igp-node-attributes>
+                                    <isis:isis-node-attributes>
+                                        <isis:ted>
+                                            <isis:te-router-id-ipv4>192.168.2.4</isis:te-router-id-ipv4>
+                                        </isis:ted>
+                                    </isis:isis-node-attributes>
+                                </igp:igp-node-attributes>
                                 <termination-point>
                                     <tp-id>tp:8:1</tp-id>
                                     <ovsdb:ofport>11120</ovsdb:ofport>
                                 </termination-point>
                             </node>
                             <node>
-                                <node-id>pcep:9</node-id>
-                                <pcep:path-computation-client>
-                                    <pcep:ip-address>192.168.2.5</pcep:ip-address>
-                                </pcep:path-computation-client>
+                                <node-id>bgp:9</node-id>
+                                <igp:igp-node-attributes>
+                                    <isis:isis-node-attributes>
+                                        <isis:ted>
+                                            <isis:te-router-id-ipv4>192.168.2.5</isis:te-router-id-ipv4>
+                                        </isis:ted>
+                                    </isis:isis-node-attributes>
+                                </igp:igp-node-attributes>
                                 <termination-point>
                                     <tp-id>tp:9:1</tp-id>
                                     <ovsdb:ofport>1121</ovsdb:ofport>
                                 </termination-point>
                             </node>
                             <node>
-                                <node-id>pcep:10</node-id>
-                                <pcep:path-computation-client>
-                                    <pcep:ip-address>192.168.2.3</pcep:ip-address>
-                                </pcep:path-computation-client>
+                                <node-id>bgp:10</node-id>
+                                <igp:igp-node-attributes>
+                                    <isis:isis-node-attributes>
+                                        <isis:ted>
+                                            <isis:te-router-id-ipv4>192.168.2.3</isis:te-router-id-ipv4>
+                                        </isis:ted>
+                                    </isis:isis-node-attributes>
+                                </igp:igp-node-attributes>
                                 <termination-point>
                                     <tp-id>tp:10:1</tp-id>
                                     <ovsdb:ofport>1122</ovsdb:ofport>