diff options
author | Paul Vinciguerra <pvinci@vinciconsulting.com> | 2018-12-19 02:05:25 -0800 |
---|---|---|
committer | Dave Barach <openvpp@barachs.net> | 2019-01-10 21:26:08 +0000 |
commit | 339bc6b51dd1ea7d783b211c485881ccb495fd0d (patch) | |
tree | d910b6bf0dcc49b675ac406cffd3e576e9090061 /extras/vpp_config/scripts | |
parent | 6ad7231c00287b7c1241c6e1dbbfda86f15798b4 (diff) |
vpp_config: Rework for Python2/3 compatibility.
On ubuntu:
$cd <basedir>/extras/vpp_config
$./scripts/clean.sh
$./scripts/cp-data.sh
$sudo apt-get install python3-pip python3-setuptools
$python3 -m pip install .
$vpp-config
Changes:
* Convert to print() function.
* raw_input changes.
* floor division changes.
* replace vpp-config.py with a setuptools 'vpp-config' entry_point.
* replace netaddr with ipaddress from the standard library and backport.
* .decode() subprocess.Popen's stdout because in python3 they are bytes.
Change-Id: Id98894ee54e0c31a0ba0304134b159caef415705
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
Diffstat (limited to 'extras/vpp_config/scripts')
-rwxr-xr-x | extras/vpp_config/scripts/dpdk-devbind.py | 3 | ||||
-rwxr-xr-x | extras/vpp_config/scripts/vpp-config | 22 |
2 files changed, 2 insertions, 23 deletions
diff --git a/extras/vpp_config/scripts/dpdk-devbind.py b/extras/vpp_config/scripts/dpdk-devbind.py index f1d374d6b08..b65677dab0c 100755 --- a/extras/vpp_config/scripts/dpdk-devbind.py +++ b/extras/vpp_config/scripts/dpdk-devbind.py @@ -1,4 +1,4 @@ -#! /usr/bin/python +#! /usr/bin/env python # # BSD LICENSE # @@ -647,5 +647,6 @@ def main(): get_crypto_details() do_arg_actions() + if __name__ == "__main__": main() diff --git a/extras/vpp_config/scripts/vpp-config b/extras/vpp_config/scripts/vpp-config deleted file mode 100755 index 7cb27fc20e8..00000000000 --- a/extras/vpp_config/scripts/vpp-config +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/python - -# Copyright (c) 2016 Cisco and/or its affiliates. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -"""VPP Configuration Utility Wrapper""" - -import os -import sys -import vpp_config as vpp - -vpp.config_main() |