X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Fvariables%2Ftopoprocessing%2FTopologyRequests.py;h=79b65a3f2da951185e6f996d39fd6d83296d546d;hb=a108bd396bc5cc8e7cda1d24a3988dc7d34ada50;hp=03a459a49bdc22de47ed1beac34c8fe2b974ad41;hpb=613f0f2894a1f983eb18f8548c83e002b61dd7c6;p=integration%2Ftest.git

diff --git a/csit/variables/topoprocessing/TopologyRequests.py b/csit/variables/topoprocessing/TopologyRequests.py
index 03a459a49b..79b65a3f2d 100644
--- a/csit/variables/topoprocessing/TopologyRequests.py
+++ b/csit/variables/topoprocessing/TopologyRequests.py
@@ -11,13 +11,13 @@ UNIFICATION_NT = '''<topology xmlns="urn:opendaylight:topology:correlation" xmln
                                     <mapping>
                                         <input-model>{input-model}</input-model>
                                         <underlay-topology>{underlay-topology-id}</underlay-topology>
-                                        <target-field>{target-field}</target-field>
+                                        <!-- target field -->
                                         <aggregate-inside>false</aggregate-inside>
                                     </mapping>
                                     <mapping>
                                         <input-model>{input-model}</input-model>
                                         <underlay-topology>{underlay-topology-id}</underlay-topology>
-                                        <target-field>{target-field}</target-field>
+                                        <!-- target field -->
                                         <aggregate-inside>false</aggregate-inside>
                                     </mapping>
                                 </aggregation>
@@ -25,7 +25,7 @@ UNIFICATION_NT = '''<topology xmlns="urn:opendaylight:topology:correlation" xmln
                         </correlations>
                     </topology>'''
 
-UNIFICATION_NT_AGREGATE_INSIDE = '''<topology xmlns="urn:opendaylight:topology:correlation" xmlns:n="urn:TBD:params:xml:ns:yang:network-topology">
+UNIFICATION_NT_AGGREGATE_INSIDE = '''<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>
@@ -38,7 +38,7 @@ UNIFICATION_NT_AGREGATE_INSIDE = '''<topology xmlns="urn:opendaylight:topology:c
                                     <mapping>
                                         <input-model>{input-model}</input-model>
                                         <underlay-topology>{underlay-topology-id}</underlay-topology>
-                                        <target-field>{target-field}</target-field>
+                                        <!-- target field -->
                                         <aggregate-inside>true</aggregate-inside>
                                     </mapping>
                                 </aggregation>
@@ -46,6 +46,65 @@ UNIFICATION_NT_AGREGATE_INSIDE = '''<topology xmlns="urn:opendaylight:topology:c
                         </correlations>
                     </topology>'''
 
+UNIFICATION_FILTRATION_NT_AGGREGATE_INSIDE = '''<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>
+                            <correlation>
+                                <correlation-id>1</correlation-id>
+                                <type>{type}</type>
+                                <correlation-item>{correlation-item}</correlation-item>
+                                <aggregation>
+                                    <aggregation-type>{aggregation-type}</aggregation-type>
+                                    <mapping>
+                                        <input-model>{input-model}</input-model>
+                                        <underlay-topology>{underlay-topology-id}</underlay-topology>
+                                        <aggregate-inside>true</aggregate-inside>
+                                        <!-- target field -->
+                                        <!-- apply filters -->
+                                    </mapping>
+                                </aggregation>
+                                <filtration>
+                                    <underlay-topology>{underlay-topology-id}</underlay-topology>
+                                    <!-- Filter -->
+                                </filtration>
+                            </correlation>
+                        </correlations>
+                    </topology>'''
+
+UNIFICATION_FILTRATION_NT = '''<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>
+                            <correlation>
+                                <correlation-id>1</correlation-id>
+                                <type>{type}</type>
+                                <correlation-item>{correlation-item}</correlation-item>
+                                <aggregation>
+                                    <aggregation-type>{aggregation-type}</aggregation-type>
+                                    <mapping>
+                                        <input-model>{input-model}</input-model>
+                                        <underlay-topology>{underlay-topology-id}</underlay-topology>
+                                        <aggregate-inside>false</aggregate-inside>
+                                        <!-- target field -->
+                                        <!-- apply filters -->
+                                    </mapping>
+                                    <mapping>
+                                        <input-model>{input-model}</input-model>
+                                        <underlay-topology>{underlay-topology-id}</underlay-topology>
+                                        <aggregate-inside>false</aggregate-inside>
+                                        <!-- target field -->
+                                        <!-- apply filters -->
+                                    </mapping>
+                                </aggregation>
+                                <filtration>
+                                    <underlay-topology>{underlay-topology-id}</underlay-topology>
+                                    <!-- Filter -->
+                                </filtration>
+                            </correlation>
+                        </correlations>
+                    </topology>'''
+
 FILTRATION_NT = '''<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>
@@ -62,6 +121,17 @@ FILTRATION_NT = '''<topology xmlns="urn:opendaylight:topology:correlation" xmlns
                     </correlations>
                 </topology>'''
 
+APPLY_FILTERS = '''
+<apply-filters>{filter-id}</apply-filters>
+'''
+
+TARGET_FIELD = '''
+<target-field>
+    <target-field-path>{target-field-path}</target-field-path>
+    <matching-key>{matching-key}</matching-key>
+</target-field>
+'''
+
 SCRIPTING = '''
 <scripting>
     <language>{language}</language>
@@ -70,6 +140,21 @@ SCRIPTING = '''
     </script>
 </scripting>
 '''
+FILTER_SCRIPT = '''<filter>
+                        <input-model>{input-model}</input-model>
+                        <filter-id>1</filter-id>
+                        <target-field>{target-field}</target-field>
+                        <filter-type>script</filter-type>
+                        <script-filter>
+                            <scripting>
+                                <language>{language}</language>
+                                <script>
+                                  {script}
+                                </script>
+                            </scripting>
+                        </script-filter>
+                 </filter>'''
+
 
 FILTER_IPV4 = '''<filter>
                         <input-model>{input-model}</input-model>
@@ -80,3 +165,83 @@ FILTER_IPV4 = '''<filter>
                              <ipv4-address>{ipv4}</ipv4-address>
                         </ipv4-address-filter>
                  </filter>'''
+
+FILTER_IPV6 = '''<filter>
+                        <input-model>{input-model}</input-model>
+                        <filter-id>1</filter-id>
+                        <target-field>{target-field}</target-field>
+                        <filter-type>ipv6-address</filter-type>
+                        <ipv6-address-filter>
+                             <ipv6-address>{ipv6}</ipv6-address>
+                        </ipv6-address-filter>
+                 </filter>'''
+
+FILTER_RANGE_NUMBER = '''<filter>
+                        <input-model>{input-model}</input-model>
+                        <filter-id>1</filter-id>
+                        <target-field>{target-field}</target-field>
+                        <filter-type>range-number</filter-type>
+                        <range-number-filter>
+                             <min-number-value>{min}</min-number-value>
+                             <max-number-value>{max}</max-number-value>
+                        </range-number-filter>
+                 </filter>'''
+
+FILTER_RANGE_STRING = '''<filter>
+                        <input-model>{input-model}</input-model>
+                        <filter-id>1</filter-id>
+                        <target-field>{target-field}</target-field>
+                        <filter-type>range-string</filter-type>
+                        <range-string-filter>
+                             <min-string-value>{min}</min-string-value>
+                             <max-string-value>{max}</max-string-value>
+                        </range-string-filter>
+                 </filter>'''
+
+FILTER_SPECIFIC_NUMBER = '''<filter>
+                        <input-model>{input-model}</input-model>
+                        <filter-id>1</filter-id>
+                        <target-field>{target-field}</target-field>
+                        <filter-type>specific-number</filter-type>
+                        <specific-number-filter>
+                             <specific-number>{number}</specific-number>
+                        </specific-number-filter>
+                 </filter>'''
+
+FILTER_SPECIFIC_STRING = '''<filter>
+                        <input-model>{input-model}</input-model>
+                        <filter-id>1</filter-id>
+                        <target-field>{target-field}</target-field>
+                        <filter-type>specific-string</filter-type>
+                        <specific-string-filter>
+                             <specific-string>{string}</specific-string>
+                        </specific-string-filter>
+                 </filter>'''
+
+LINK_COMPUTATION_INSIDE = '''<link-computation xmlns="urn:opendaylight:topology:link:computation" xmlns:n="urn:opendaylight:topology:correlation">
+            <output-model>{output-model}</output-model>
+            <node-info>
+                <node-topology>topo:1</node-topology>
+                <input-model>{input-model}</input-model>
+            </node-info>
+            <link-info>
+                <link-topology>{underlay-topology-id}</link-topology>
+                <input-model>{input-model}</input-model>
+            </link-info>
+        </link-computation>'''
+
+LINK_COMPUTATION = '''<link-computation xmlns="urn:opendaylight:topology:link:computation" xmlns:n="urn:opendaylight:topology:correlation">
+            <output-model>{output-model}</output-model>
+            <node-info>
+                <node-topology>topo:1</node-topology>
+                <input-model>{input-model}</input-model>
+            </node-info>
+            <link-info>
+                <link-topology>{underlay-topology-1-id}</link-topology>
+                <input-model>{input-model}</input-model>
+            </link-info>
+            <link-info>
+                <link-topology>{underlay-topology-2-id}</link-topology>
+                <input-model>{input-model}</input-model>
+            </link-info>
+        </link-computation>'''