From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Thu, 14 Jan 2016 00:09:57 +0000 (-0500)
Subject: Pin pep8 to version 1.5.7
X-Git-Tag: release/beryllium-sr1~225
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=2736084e267e6af30bb65f81665c92af1cf21bba;p=integration%2Ftest.git

Pin pep8 to version 1.5.7

integration/test appears to fail pep8 against versions >=1.6.0 so pin to
an older version until pep8 failures are resolved.

Also fix pep8 underindent issue with variables.py

Change-Id: Id30d7ef8de7cea3da6b2538c7b5fc32f82587cb0
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---

diff --git a/csit/variables/pcepuser/variables.py b/csit/variables/pcepuser/variables.py
index 32e1834cb3..1df0afd665 100644
--- a/csit/variables/pcepuser/variables.py
+++ b/csit/variables/pcepuser/variables.py
@@ -179,31 +179,31 @@ def get_variables(mininet_ip):
     # 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">\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'
+        '<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'
diff --git a/tox.ini b/tox.ini
index 78dc42860f..ab5d3b4d0e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,9 @@ envlist = pep8
 skipsdist = true
 
 [testenv:pep8]
-deps = flake8
+deps =
+    flake8
+    pep8==1.5.7
 commands = flake8
 
 [flake8]