diff options
Diffstat (limited to 'extras')
| -rw-r--r-- | extras/vpp_config/vpplib/AutoConfig.py | 2 | ||||
| -rw-r--r-- | extras/vpp_config/vpplib/VppGrubUtil.py | 114 |
2 files changed, 58 insertions, 58 deletions
diff --git a/extras/vpp_config/vpplib/AutoConfig.py b/extras/vpp_config/vpplib/AutoConfig.py index c4777104c0b..8c052a02773 100644 --- a/extras/vpp_config/vpplib/AutoConfig.py +++ b/extras/vpp_config/vpplib/AutoConfig.py @@ -122,7 +122,7 @@ class AutoConfig(object): answer = input("Please enter the netmask [n.n.n.n]: ") plen = ip_address(answer).netmask_bits() return '{}/{}'.format(ipaddr, plen) - except None: + except ValueError: print("Please enter a valid IPv4 address.") @staticmethod diff --git a/extras/vpp_config/vpplib/VppGrubUtil.py b/extras/vpp_config/vpplib/VppGrubUtil.py index d199f1eb053..f17efd8a868 100644 --- a/extras/vpp_config/vpplib/VppGrubUtil.py +++ b/extras/vpp_config/vpplib/VppGrubUtil.py @@ -164,63 +164,63 @@ class VppGrubUtil(object): """ vpp_cmdline = self.create_cmdline(isolated_cpus) - if vpp_cmdline == '': - return vpp_cmdline - - # Update grub - # Save the original file - rootdir = node['rootdir'] - grubcmdline = node['cpu']['grubcmdline'] - ofilename = rootdir + node['cpu']['grub_config_file'] + '.orig' - filename = rootdir + node['cpu']['grub_config_file'] - - # Write the output file - # Does a copy of the original file exist, if not create one - (ret, stdout, stderr) = VPPUtil.exec_command('ls {}'.format(ofilename)) - if ret != 0: - if stdout.strip('\n') != ofilename: - cmd = 'sudo cp {} {}'.format(filename, ofilename) - (ret, stdout, stderr) = VPPUtil.exec_command(cmd) - if ret != 0: - raise RuntimeError('{} failed on node {} {}'. - format(cmd, self._node['host'], stderr)) - - # Get the contents of the current grub config file - cmd = 'cat {}'.format(filename) - (ret, stdout, stderr) = VPPUtil.exec_command(cmd) - if ret != 0: - raise RuntimeError('{} failed on node {} {}'.format( - cmd, - self._node['host'], - stderr)) - - # Write the new contents - # Get the Default Linux command line, ignoring commented lines - content = "" - lines = stdout.split('\n') - for line in lines: - if line == '': - content += line + '\n' - continue - if line[0] == '#': - content += line + '\n' - continue - - ldefault = re.findall(r'{}=.+'.format(grubcmdline), line) - if ldefault: - content += vpp_cmdline + '\n' - else: - content += line + '\n' - - content = content.replace(r"`", r"\`") - content = content.rstrip('\n') - cmd = "sudo cat > {0} << EOF\n{1}\n".format(filename, content) - (ret, stdout, stderr) = VPPUtil.exec_command(cmd) - if ret != 0: - raise RuntimeError('{} failed on node {} {}'.format( - cmd, - self._node['host'], - stderr)) + if len(vpp_cmdline): + # Update grub + # Save the original file + rootdir = node['rootdir'] + grubcmdline = node['cpu']['grubcmdline'] + ofilename = rootdir + node['cpu']['grub_config_file'] + '.orig' + filename = rootdir + node['cpu']['grub_config_file'] + + # Write the output file + # Does a copy of the original file exist, if not create one + (ret, stdout, stderr) = VPPUtil.exec_command( + 'ls {}'.format(ofilename)) + if ret != 0: + if stdout.strip('\n') != ofilename: + cmd = 'sudo cp {} {}'.format(filename, ofilename) + (ret, stdout, stderr) = VPPUtil.exec_command(cmd) + if ret != 0: + raise RuntimeError('{} failed on node {} {}'. + format(cmd, self._node['host'], + stderr)) + + # Get the contents of the current grub config file + cmd = 'cat {}'.format(filename) + (ret, stdout, stderr) = VPPUtil.exec_command(cmd) + if ret != 0: + raise RuntimeError('{} failed on node {} {}'.format( + cmd, + self._node['host'], + stderr)) + + # Write the new contents + # Get the Default Linux command line, ignoring commented lines + content = "" + lines = stdout.split('\n') + for line in lines: + if line == '': + content += line + '\n' + continue + if line[0] == '#': + content += line + '\n' + continue + + ldefault = re.findall(r'{}=.+'.format(grubcmdline), line) + if ldefault: + content += vpp_cmdline + '\n' + else: + content += line + '\n' + + content = content.replace(r"`", r"\`") + content = content.rstrip('\n') + cmd = "sudo cat > {0} << EOF\n{1}\n".format(filename, content) + (ret, stdout, stderr) = VPPUtil.exec_command(cmd) + if ret != 0: + raise RuntimeError('{} failed on node {} {}'.format( + cmd, + self._node['host'], + stderr)) return vpp_cmdline |