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/vpplib/VppHugePageUtil.py | |
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/vpplib/VppHugePageUtil.py')
-rw-r--r-- | extras/vpp_config/vpplib/VppHugePageUtil.py | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/extras/vpp_config/vpplib/VppHugePageUtil.py b/extras/vpp_config/vpplib/VppHugePageUtil.py index 43df72a455a..3a632828883 100644 --- a/extras/vpp_config/vpplib/VppHugePageUtil.py +++ b/extras/vpp_config/vpplib/VppHugePageUtil.py @@ -11,6 +11,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +from __future__ import print_function + """VPP Huge Page Utilities""" import re @@ -95,16 +97,16 @@ class VppHugePageUtil(object): node = self._node hugepages = node['hugepages'] - print " {:30}: {}".format("Total System Memory", - hugepages['memtotal']) - print " {:30}: {}".format("Total Free Memory", - hugepages['memfree']) - print " {:30}: {}".format("Actual Huge Page Total", - hugepages['actual_total']) - print " {:30}: {}".format("Configured Huge Page Total", - hugepages['total']) - print " {:30}: {}".format("Huge Pages Free", hugepages['free']) - print " {:30}: {}".format("Huge Page Size", hugepages['size']) + print (" {:30}: {}".format("Total System Memory", + hugepages['memtotal'])) + print (" {:30}: {}".format("Total Free Memory", + hugepages['memfree'])) + print (" {:30}: {}".format("Actual Huge Page Total", + hugepages['actual_total'])) + print (" {:30}: {}".format("Configured Huge Page Total", + hugepages['total'])) + print (" {:30}: {}".format("Huge Pages Free", hugepages['free'])) + print (" {:30}: {}".format("Huge Page Size", hugepages['size'])) def get_huge_page_config(self): """ |