From a446c04f779faffa8262d2f1d2c9ce7e506d6525 Mon Sep 17 00:00:00 2001
From: Michael Johnson <johnsomor@gmail.com>
Date: Thu, 10 Sep 2020 16:54:08 -0700
Subject: [PATCH] Revert pyroute2 workaround

The pyroute2 module had a regression in 0.5.13, but neutron needed a fix
that was included in 0.5.13. It was easier for us to work around it than
for neutron to revert the update to 0.5.13, so we hacked a workaround[1].

A new pyroute2 release, 0.5.14, has been published, so this patch reverts
the hack and bumps our minimum version of pyroute2 to 0.5.14.

[1] https://review.opendev.org/#/c/744045

Change-Id: Ia4357a4f5db07e1a6b0beb11b58ce125215eeef1
---
 .../amphora-agent-source-install/75-amphora-agent-install   | 6 ------
 lower-constraints.txt                                       | 2 +-
 requirements.txt                                            | 2 +-
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/elements/amphora-agent/install.d/amphora-agent-source-install/75-amphora-agent-install b/elements/amphora-agent/install.d/amphora-agent-source-install/75-amphora-agent-install
index 76f1a94cfd..940b7ae6e7 100755
--- a/elements/amphora-agent/install.d/amphora-agent-source-install/75-amphora-agent-install
+++ b/elements/amphora-agent/install.d/amphora-agent-source-install/75-amphora-agent-install
@@ -19,12 +19,6 @@ $AMP_VENV/bin/pip install -U -c /opt/upper-constraints.txt /opt/amphora-agent
 # Let's capture the git reference we installed in the venv
 git  --git-dir=/opt/amphora-agent/.git rev-parse HEAD >> /opt/amphora-agent.gitref
 
-# Workaround https://github.com/svinota/pyroute2/issues/724
-# TODO(johnsom) Remove once a that is resolved and 0.5.13 has been blocked in
-# global requirements.
-$AMP_VENV/bin/pip uninstall -y pyroute2
-$AMP_VENV/bin/pip install pyroute2==0.5.12
-
 # Link the amphora-agent out to /usr/local/bin where the startup scripts look
 ln -s $AMP_VENV/bin/amphora-agent /usr/local/bin/amphora-agent || true
 
diff --git a/lower-constraints.txt b/lower-constraints.txt
index ca4bead7f6..d6aacb5adc 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -118,7 +118,7 @@ PyNaCl==1.2.1
 pyOpenSSL==19.1.0
 pyparsing==2.2.0
 pyperclip==1.6.0
-pyroute2==0.5.13
+pyroute2==0.5.14
 python-barbicanclient==4.5.2
 python-dateutil==2.7.0
 python-editor==1.0.3
diff --git a/requirements.txt b/requirements.txt
index 17df8d49ed..d9dfe7d477 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -52,6 +52,6 @@ setproctitle>=1.1.10 # BSD
 Flask!=0.11,>=0.10 # BSD
 netifaces>=0.10.4 # MIT
 cryptography>=3.0 # BSD/Apache-2.0
-pyroute2>=0.5.13;sys_platform!='win32' # Apache-2.0 (+ dual licensed GPL2)
+pyroute2>=0.5.14;sys_platform!='win32' # Apache-2.0 (+ dual licensed GPL2)
 gunicorn>=19.9.0 # MIT
 Werkzeug>=0.14.1 # BSD License