From 339bc6b51dd1ea7d783b211c485881ccb495fd0d Mon Sep 17 00:00:00 2001 From: Paul Vinciguerra Date: Wed, 19 Dec 2018 02:05:25 -0800 Subject: vpp_config: Rework for Python2/3 compatibility. On ubuntu: $cd /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 --- extras/vpp_config/README.rst | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'extras/vpp_config/README.rst') diff --git a/extras/vpp_config/README.rst b/extras/vpp_config/README.rst index ec9c8e46cf4..8995edfce9f 100644 --- a/extras/vpp_config/README.rst +++ b/extras/vpp_config/README.rst @@ -11,7 +11,7 @@ Use: The installation and executing of the VPP configuration utility is simple. First install the python pip module. Using pip install, then pip install vpp-config. -Then simply type Òvpp-configÓ and answer the questions. If you are not sure what +Then simply type �vpp-config� and answer the questions. If you are not sure what to answer choose the default. For yes or no questions the capital letter designates the default. For example, for a question that shows [Y/n] Y is the default. For numbers the default is within the brackets for example for a @@ -36,14 +36,15 @@ environment so you can start from scratch. These are the steps to run the utilit in this environment. The scripts are meant to be run from the root directory. ./scripts/clean.sh - ./scripts/cp-data.sh - ./vpp_config.py + ./scripts/cp-data.sh + ./vpp-config When the utility is installed with pip the wrapper scripts/vpp-config is written to /usr/local/bin. However, the starting point when debugging this script locally is -./vpp_config.py. Run the utility by executing ./vpp_config.py from the root directory. +vpp-config. Run the utility by executing vpp-config. -The start point in the code is in vpp_config.py. However, most of the work is done in +The start point in the code is in vpp_config.py. However, most of the work is +done in the files in ./vpplib Uploading to PyPi: @@ -51,7 +52,7 @@ Uploading to PyPi: To upload this utility to PpPi simple do the following. Currently, I have my own account when we want everyone to contribute we will need to change that. - sudo ÐH bash + sudo �H bash cd vpp_config python setup.py sdist bdist_wheel twine upload dist/* @@ -137,7 +138,7 @@ There are no VPP packages on node localhost. Do you want to install VPP [Y/n]? INFO:root: Local Command: ls /etc/apt/sources.list.d/99fd.io.list.orig INFO:root: /etc/apt/sources.list.d/99fd.io.list.orig -ÉÉ.. +��.. What would you like to do? -- cgit 1.2.3-korg