Code Review / integration / test.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Updated code to match new rules
[integration/test.git] / csit / variables / pcepuser / variables.py
diff --git a/csit/variables/pcepuser/variables.py b/csit/variables/pcepuser/variables.py
index 1db0fbc810f63a93adbf80b8205e6cf1ca9cb615..32e1834cb3eb4271f513302d821c48a38a59208a 100644 (file)
--- a/csit/variables/pcepuser/variables.py
+++ b/csit/variables/pcepuser/variables.py
@@ -12,14 +12,15 @@ than do manipulation in Robot file."""
 # terms of the Eclipse Public License v1.0 which accompanies this distribution,
 # and is available at http://www.eclipse.org/legal/epl-v10.html
 
+import binascii
+from string import Template
+
+
 __author__ = "Vratko Polak"
 __copyright__ = "Copyright(c) 2015, Cisco Systems, Inc."
 __license__ = "Eclipse Public License v1.0"
 __email__ = "vrpolak@cisco.com"
 
-import binascii
-from string import Template
-
 
 def get_variables(mininet_ip):
     """Return dict of variables for the given IP address of Mininet VM."""
@@ -177,58 +178,67 @@ def get_variables(mininet_ip):
     # There are three operations, so let us just write templates from information at
     # https://wiki.opendaylight.org/view/BGP_LS_PCEP:Programmer_Guide#Tunnel_Management_for_draft-ietf-pce-stateful-pce-07_and_draft-ietf-pce-pce-initiated-lsp-00
     # _xml describes content type and also distinguishes from similarly named _json strings.
-    add_xml_templ = Template('''<input xmlns="urn:opendaylight:params:xml:ns:yang:topology:pcep">
- <node>pcc://$IP</node>
- <name>$NAME</name>
- <network-topology-ref xmlns:topo="urn:TBD:params:xml:ns:yang:network-topology">/topo:network-topology/topo:topology'''
-                             + '''[topo:topology-id="pcep-topology"]</network-topology-ref>
- <arguments>
-  <lsp xmlns="urn:opendaylight:params:xml:ns:yang:pcep:ietf:stateful">
-   <delegate>true</delegate>
-   <administrative>true</administrative>
-  </lsp>
-  <endpoints-obj>
-   <ipv4>
-    <source-ipv4-address>$IP</source-ipv4-address>
-    <destination-ipv4-address>1.1.1.1</destination-ipv4-address>
-   </ipv4>
-  </endpoints-obj>
-  <ero>
-   <subobject>
-    <loose>false</loose>
-    <ip-prefix><ip-prefix>1.1.1.1/32</ip-prefix></ip-prefix>
-   </subobject>
-  </ero>
- </arguments>
-</input>''')
-    update_xml_templ = Template('''<input xmlns="urn:opendaylight:params:xml:ns:yang:topology:pcep">
- <node>pcc://$IP</node>
- <name>$NAME</name>
- <network-topology-ref xmlns:topo="urn:TBD:params:xml:ns:yang:network-topology">/topo:network-topology/topo:topology'''
-                                + '''[topo:topology-id="pcep-topology"]</network-topology-ref>
- <arguments>
-  <lsp xmlns="urn:opendaylight:params:xml:ns:yang:pcep:ietf:stateful">
-   <delegate>true</delegate>
-   <administrative>true</administrative>
-  </lsp>
-  <ero>
-   <subobject>
-    <loose>false</loose>
-    <ip-prefix><ip-prefix>2.2.2.2/32</ip-prefix></ip-prefix>
-   </subobject>
-   <subobject>
-    <loose>false</loose>
-    <ip-prefix><ip-prefix>1.1.1.1/32</ip-prefix></ip-prefix>
-   </subobject>
-  </ero>
- </arguments>
-</input>''')
-    remove_xml_templ = Template('''<input xmlns="urn:opendaylight:params:xml:ns:yang:topology:pcep">
- <node>pcc://$IP</node>
- <name>$NAME</name>
- <network-topology-ref xmlns:topo="urn:TBD:params:xml:ns:yang:network-topology">/topo:network-topology/topo:topology'''
-                                + '''[topo:topology-id="pcep-topology"]</network-topology-ref>
-</input>''')
+    add_xml_templ = Template(
+       '<input xmlns="urn:opendaylight:params:xml:ns:yang:topology:pcep">\n'
+       ' <node>pcc://$IP</node>\n'
+       ' <name>$NAME</name>\n'
+       ' <network-topology-ref xmlns:topo="urn:TBD:params:xml:ns:yang:network-topology">'
+       '/topo:network-topology/topo:topology[topo:topology-id="pcep-topology"]'
+       '</network-topology-ref>\n'
+       ' <arguments>\n'
+       '  <lsp xmlns="urn:opendaylight:params:xml:ns:yang:pcep:ietf:stateful">\n'
+       '   <delegate>true</delegate>\n'
+       '   <administrative>true</administrative>\n'
+       '  </lsp>\n'
+       '  <endpoints-obj>\n'
+       '   <ipv4>\n'
+       '    <source-ipv4-address>$IP</source-ipv4-address>\n'
+       '    <destination-ipv4-address>1.1.1.1</destination-ipv4-address>\n'
+       '   </ipv4>\n'
+       '  </endpoints-obj>\n'
+       '  <ero>\n'
+       '   <subobject>\n'
+       '    <loose>false</loose>\n'
+       '    <ip-prefix><ip-prefix>1.1.1.1/32</ip-prefix></ip-prefix>\n'
+       '   </subobject>\n'
+       '  </ero>\n'
+       ' </arguments>\n'
+       '</input>\n'
+    )
+    update_xml_templ = Template(
+        '<input xmlns="urn:opendaylight:params:xml:ns:yang:topology:pcep">\n'
+        ' <node>pcc://$IP</node>\n'
+        ' <name>$NAME</name>\n'
+        ' <network-topology-ref xmlns:topo="urn:TBD:params:xml:ns:yang:network-topology">'
+        '/topo:network-topology/topo:topology[topo:topology-id="pcep-topology"]'
+        '</network-topology-ref>\n'
+        ' <arguments>\n'
+        '  <lsp xmlns="urn:opendaylight:params:xml:ns:yang:pcep:ietf:stateful">\n'
+        '   <delegate>true</delegate>\n'
+        '   <administrative>true</administrative>\n'
+        '  </lsp>\n'
+        '  <ero>\n'
+        '   <subobject>\n'
+        '    <loose>false</loose>\n'
+        '    <ip-prefix><ip-prefix>2.2.2.2/32</ip-prefix></ip-prefix>\n'
+        '   </subobject>\n'
+        '   <subobject>\n'
+        '    <loose>false</loose>\n'
+        '    <ip-prefix><ip-prefix>1.1.1.1/32</ip-prefix></ip-prefix>\n'
+        '   </subobject>\n'
+        '  </ero>\n'
+        ' </arguments>\n'
+        '</input>\n'
+    )
+    remove_xml_templ = Template(
+        '<input xmlns="urn:opendaylight:params:xml:ns:yang:topology:pcep">\n'
+        ' <node>pcc://$IP</node>\n'
+        ' <name>$NAME</name>\n'
+        ' <network-topology-ref xmlns:topo="urn:TBD:params:xml:ns:yang:network-topology">'
+        '/topo:network-topology/topo:topology[topo:topology-id="pcep-topology"]'
+        '</network-topology-ref>\n'
+        '</input>\n'
+    )
     # The operations can be applied to either delegated or instantiated tunnel, NAME is the only distinguishing value.
     # Also, the final IP substitution can be done here.
     repl_dict = {'IP': mininet_ip}
Integration test