Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
misc: Fix python scripts shebang line
[vpp.git]
/
extras
/
vpp_config
/
vpp_config.py
diff --git
a/extras/vpp_config/vpp_config.py
b/extras/vpp_config/vpp_config.py
index
1f79201
..
e863cde
100755
(executable)
--- a/
extras/vpp_config/vpp_config.py
+++ b/
extras/vpp_config/vpp_config.py
@@
-1,4
+1,4
@@
-#!/usr/bin/env python
+#!/usr/bin/env python
3
# Copyright (c) 2016 Cisco and/or its affiliates.
# Copyright (c) 2018 Vinci Consulting Corp. All rights reserved.
# Copyright (c) 2016 Cisco and/or its affiliates.
# Copyright (c) 2018 Vinci Consulting Corp. All rights reserved.
@@
-341,12
+341,6
@@
def autoconfig_dryrun(ask_questions=True):
"""
"""
- vutil = VPPUtil()
- pkgs = vutil.get_installed_vpp_pkgs()
- if len(pkgs) == 0:
- print ("\nVPP is not installed, please install VPP.")
- return
-
acfg = AutoConfig(rootdir, VPP_AUTO_CONFIGURATION_FILE, clean=True)
# Stop VPP on each node
acfg = AutoConfig(rootdir, VPP_AUTO_CONFIGURATION_FILE, clean=True)
# Stop VPP on each node
@@
-371,6
+365,13
@@
def autoconfig_dryrun(ask_questions=True):
else:
acfg.update_interfaces_config()
else:
acfg.update_interfaces_config()
+ # If there are no interfaces, just return
+ for i in nodes.items():
+ node = i[1]
+ if not acfg.has_interfaces(node):
+ print("\nThere are no VPP interfaces configured, please configure at least 1.")
+ return
+
# Modify CPU
acfg.modify_cpu(ask_questions)
# Modify CPU
acfg.modify_cpu(ask_questions)