X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Fvariables%2Ftopoprocessing%2FTopologyRequests.py;h=f3220c9cd55f789fc5a68ee61f3720eb9f6d0cc2;hb=c874b7ba512e68c0207b7cf90926d76a145607f7;hp=795884cd574c1510af9e625ec9650e7bb8ad50a5;hpb=334eb29d58eccffc74307fc71d08208f7e429bd4;p=integration%2Ftest.git

diff --git a/csit/variables/topoprocessing/TopologyRequests.py b/csit/variables/topoprocessing/TopologyRequests.py
index 795884cd57..f3220c9cd5 100644
--- a/csit/variables/topoprocessing/TopologyRequests.py
+++ b/csit/variables/topoprocessing/TopologyRequests.py
@@ -1,4 +1,4 @@
-UNIFICATION_NT = '''<topology xmlns="urn:opendaylight:topology:correlation" xmlns:n="urn:TBD:params:xml:ns:yang:network-topology">
+UNIFICATION_NT = '''<n:topology xmlns="urn:opendaylight:topology:correlation" xmlns:n="urn:TBD:params:xml:ns:yang:network-topology">
                         <n:topology-id>topo:1</n:topology-id>
                         <correlations>
                             <output-model>{output-model}</output-model>
@@ -23,9 +23,9 @@ UNIFICATION_NT = '''<topology xmlns="urn:opendaylight:topology:correlation" xmln
                                 </aggregation>
                             </correlation>
                         </correlations>
-                    </topology>'''
+                    </n:topology>'''
 
-UNIFICATION_NT_AGGREGATE_INSIDE = '''<topology xmlns="urn:opendaylight:topology:correlation" xmlns:n="urn:TBD:params:xml:ns:yang:network-topology">
+UNIFICATION_NT_AGGREGATE_INSIDE = '''<n:topology xmlns="urn:opendaylight:topology:correlation" xmlns:n="urn:TBD:params:xml:ns:yang:network-topology">
                         <n:topology-id>topo:1</n:topology-id>
                         <correlations>
                             <output-model>{output-model}</output-model>
@@ -44,9 +44,9 @@ UNIFICATION_NT_AGGREGATE_INSIDE = '''<topology xmlns="urn:opendaylight:topology:
                                 </aggregation>
                             </correlation>
                         </correlations>
-                    </topology>'''
+                    </n:topology>'''
 
-UNIFICATION_FILTRATION_NT_AGGREGATE_INSIDE = '''<topology xmlns="urn:opendaylight:topology:correlation" xmlns:n="urn:TBD:params:xml:ns:yang:network-topology">
+UNIFICATION_FILTRATION_NT_AGGREGATE_INSIDE = '''<n:topology xmlns="urn:opendaylight:topology:correlation" xmlns:n="urn:TBD:params:xml:ns:yang:network-topology">
                         <n:topology-id>topo:1</n:topology-id>
                         <correlations>
                             <output-model>{output-model}</output-model>
@@ -70,9 +70,9 @@ UNIFICATION_FILTRATION_NT_AGGREGATE_INSIDE = '''<topology xmlns="urn:opendayligh
                                 </filtration>
                             </correlation>
                         </correlations>
-                    </topology>'''
+                    </n:topology>'''
 
-UNIFICATION_FILTRATION_NT = '''<topology xmlns="urn:opendaylight:topology:correlation" xmlns:n="urn:TBD:params:xml:ns:yang:network-topology">
+UNIFICATION_FILTRATION_NT = '''<n:topology xmlns="urn:opendaylight:topology:correlation" xmlns:n="urn:TBD:params:xml:ns:yang:network-topology">
                         <n:topology-id>topo:1</n:topology-id>
                         <correlations>
                             <output-model>{output-model}</output-model>
@@ -103,9 +103,9 @@ UNIFICATION_FILTRATION_NT = '''<topology xmlns="urn:opendaylight:topology:correl
                                 </filtration>
                             </correlation>
                         </correlations>
-                    </topology>'''
+                    </n:topology>'''
 
-FILTRATION_NT = '''<topology xmlns="urn:opendaylight:topology:correlation" xmlns:n="urn:TBD:params:xml:ns:yang:network-topology">
+FILTRATION_NT = '''<n:topology xmlns="urn:opendaylight:topology:correlation" xmlns:n="urn:TBD:params:xml:ns:yang:network-topology">
                     <n:topology-id>topo:1</n:topology-id>
                     <correlations>
                         <output-model>{output-model}</output-model>
@@ -119,7 +119,7 @@ FILTRATION_NT = '''<topology xmlns="urn:opendaylight:topology:correlation" xmlns
                             </filtration>
                         </correlation>
                     </correlations>
-                </topology>'''
+                </n:topology>'''
 
 APPLY_FILTERS = '''
 <apply-filters>{filter-id}</apply-filters>
@@ -248,8 +248,10 @@ LINK_COMPUTATION = '''<link-computation xmlns="urn:opendaylight:topology:link:co
 
 NODE_ISIS = '''<node xmlns="urn:TBD:params:xml:ns:yang:network-topology"
             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:isis="urn:TBD:params:xml:ns:yang:network:isis-topology"
+            xmlns:ovsdb="urn:opendaylight:params:xml:ns:yang:ovsdb">
             <node-id>{node-id}</node-id>
+            <ovsdb:ovs-version>{ovs-version}</ovsdb:ovs-version>
             <igp:igp-node-attributes>
                 <isis:isis-node-attributes>
                     <isis:ted>
@@ -262,6 +264,7 @@ NODE_ISIS = '''<node xmlns="urn:TBD:params:xml:ns:yang:network-topology"
 NODE_OPENFLOW = '''<node xmlns="urn:opendaylight:inventory" xmlns:flov-inv="urn:opendaylight:flow:inventory">
         <id>{node-id}</id>
         <flov-inv:ip-address>{ip-address}</flov-inv:ip-address>
+        <flov-inv:serial-number>{serial-number}</flov-inv:serial-number>
     </node>'''
 
 TERMINATION_POINT_OVSDB = '''<termination-point xmlns="urn:TBD:params:xml:ns:yang:network-topology"
@@ -274,3 +277,20 @@ NODE_CONNECTOR_OPENFLOW = '''<node-connector xmlns="urn:opendaylight:inventory"
             <id>{nc-id}</id>
             <flov-inv:port-number>{port-number}</flov-inv:port-number>
         </node-connector>'''
+
+LINK = '''<link xmlns="urn:TBD:params:xml:ns:yang:network-topology"
+                                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">
+        <link-id>{link-id}</link-id>
+        <source>
+            <source-node>{source-node}</source-node>
+        </source>
+        <destination>
+            <dest-node>{dest-node}</dest-node>
+        </destination>
+        <igp:igp-link-attributes>
+            <igp:name>{name}</igp:name>
+            <igp:metric>{metric}</igp:metric>
+        </igp:igp-link-attributes>
+    </link>'''