openstack
/
fuel-web
Code Issues Proposed changes

Merge "Always print empty table if nothing is found by dhcpchecker"

This commit is contained in:
Jenkins 2014-11-26 10:45:17 +00:00 committed by Gerrit Code Review
parent 1f609f7b30 936d3e23eb
commit 78bde1ba11
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
network_checker/dhcp_checker/commands.py
View File

@ -18,6 +18,7 @@ import logging
from cliff import command
from cliff import lister
from dhcp_checker import api
from dhcp_checker.utils import DHCP_OFFER_COLUMNS
LOG = logging.getLogger(__name__)
@ -48,12 +49,19 @@ class ListDhcpServers(lister.Lister, BaseCommand):
def take_action(self, parsed_args):
LOG.info('Starting dhcp discover for {0}'.format(parsed_args.ifaces))
res = api.check_dhcp(parsed_args.ifaces,
timeout=parsed_args.timeout,
repeat=parsed_args.repeat)
first = res.next()
columns = first.keys()
return columns, [first.values()] + [item.values() for item in res]
res = list(api.check_dhcp(
parsed_args.ifaces,
timeout=parsed_args.timeout,
repeat=parsed_args.repeat))
#NOTE(dshulyak) unfortunately cliff doesnt allow to configure
# PrettyTable output, see link:
# https://github.com/dhellmann/cliff/blob/master/
# cliff/formatters/table.py#L34
# and in case i want always print empty table if nothing found
# it is not possible by configuration
if not res:
return DHCP_OFFER_COLUMNS, [('',) * len(DHCP_OFFER_COLUMNS)]
return DHCP_OFFER_COLUMNS, [item.values() for item in res]
class ListDhcpAssignment(lister.Lister, BaseCommand):

8
network_checker/dhcp_checker/utils.py
View File

@ -19,6 +19,10 @@ import sys
from scapy import all as scapy
DHCP_OFFER_COLUMNS = ('iface', 'mac', 'server_ip', 'server_id', 'gateway',
'dport', 'message', 'yiaddr')
def command_util(*command):
"""object with stderr and stdout
"""
@ -113,8 +117,6 @@ def _dhcp_options(dhcp_options):
def format_answer(ans, iface):
columns = ('iface', 'mac', 'server_ip', 'server_id', 'gateway',
'dport', 'message', 'yiaddr')
dhcp_options = dict(_dhcp_options(ans[scapy.DHCP].options))
results = (
iface, ans[scapy.Ether].src, ans[scapy.IP].src,
@ -122,7 +124,7 @@ def format_answer(ans, iface):
ans[scapy.UDP].sport,
scapy.DHCPTypes[dhcp_options['message-type']],
ans[scapy.BOOTP].yiaddr)
return dict(zip(columns, results))
return dict(zip(DHCP_OFFER_COLUMNS, results))
def single_format(func):