summaryrefslogtreecommitdiffstats
path: root/extras/vpp_config/vpplib/VPPUtil.py
diff options
context:
space:
mode:
authorJohn DeNisco <jdenisco@cisco.com>2018-01-26 14:55:33 -0500
committerJohn DeNisco <jdenisco@cisco.com>2018-01-26 14:55:33 -0500
commita7da67fcc6df3ab319a6873a20a18ee1092d2a9e (patch)
treefa8344502d360a856d084f8bb0cd358ba345d1d9 /extras/vpp_config/vpplib/VPPUtil.py
parent4399c2eb848b79762ff52a95fa5d9fab222c73bd (diff)
Add support for 18.01.
Fixed bugs. Improved some config as the result of Tetration experience. Change-Id: Ie4b8d2d77ca3ad165675c42fa2d9a4798d871f9d Signed-off-by: John DeNisco <jdenisco@cisco.com>
Diffstat (limited to 'extras/vpp_config/vpplib/VPPUtil.py')
-rw-r--r--extras/vpp_config/vpplib/VPPUtil.py15
1 files changed, 8 insertions, 7 deletions
diff --git a/extras/vpp_config/vpplib/VPPUtil.py b/extras/vpp_config/vpplib/VPPUtil.py
index 4551cf45a5e..4ea94135b49 100644
--- a/extras/vpp_config/vpplib/VPPUtil.py
+++ b/extras/vpp_config/vpplib/VPPUtil.py
@@ -20,7 +20,8 @@ import platform
from collections import Counter
# VPP_VERSION = '1707'
-VPP_VERSION = '1710'
+# VPP_VERSION = '1710'
+VPP_VERSION = '1801'
class VPPUtil(object):
@@ -141,10 +142,9 @@ class VPPUtil(object):
reps = 'deb [trusted=yes] https://nexus.fd.io/content/'
# When using a stable branch
- # reps += 'repositories/fd.io.stable.{}.ubuntu.{}.main/ ./\n' \
- # .format(fdio_release, ubuntu_version)
- reps += 'repositories/fd.io.ubuntu.{}.main/ ./\n' \
- .format(ubuntu_version)
+ # reps += 'repositories/fd.io.stable.{}.ubuntu.{}.main/ ./\n'.format(fdio_release, ubuntu_version)
+ # When using release
+ reps += 'repositories/fd.io.ubuntu.{}.main/ ./\n'.format(ubuntu_version)
cmd = 'echo "{0}" | sudo tee {1}'.format(reps, sfile)
(ret, stdout, stderr) = self.exec_command(cmd)
@@ -207,8 +207,8 @@ class VPPUtil(object):
# When using stable
# reps += 'baseurl=https://nexus.fd.io/content/repositories/fd.io.stable.{}.{}/\n'.\
# format(fdio_release, centos_version)
- reps += 'baseurl=https://nexus.fd.io/content/repositories/fd.io.{}/\n'.\
- format(centos_version)
+ # When using release
+ reps += 'baseurl=https://nexus.fd.io/content/repositories/fd.io.{}/\n'.format(centos_version)
reps += 'enabled=1\n'
reps += 'gpgcheck=0'
@@ -661,6 +661,7 @@ class VPPUtil(object):
format(cmd, node['host'],
stdout, stderr))
+ # noinspection RegExpRedundantEscape
@staticmethod
def status(node):
"""