x/compass-core
Code Issues Proposed changes

Update DHCP health check to validate netmasks

Browse Source 
Change-Id: I87af3b046107de5c5edeb979302b2b345c775ded
This commit is contained in:
Xicheng Chang 2014-04-10 21:19:32 +00:00
parent d8af02a286
commit 1bbdf4a918
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compass/actions/cli.py
View File

@ -91,7 +91,7 @@ class BootCLI(object):
pretty_print("Checking Module: %s" % module,
"============================")
chk = check.BootCheck()
method = "chk.check_" + module + "()"
method = "chk._check_" + module + "()"
res = eval(method)
print "\n".join(msg for msg in res[1])

23
compass/actions/health_check/check_dhcp.py
View File

@ -60,6 +60,7 @@ class DhcpCheck(base.BaseCheck):
self.check_cobbler_dhcp_template()
print "[Done]"
self.check_dhcp_service()
self.check_dhcp_netmask()
print "[Done]"
if self.code == 1:
self.messages.append(
@ -145,10 +146,30 @@ class DhcpCheck(base.BaseCheck):
return True
def check_dhcp_netmask(self):
with open('/etc/dhcp/dhcpd.conf') as conf_reader:
lines = conf_reader.readlines()
for line in lines:
if re.search('^subnet', line):
elm_list = line.split(' ')
break
subnet_ip = elm_list[1]
netmask = elm_list[-2]
subnet_ip_elm = subnet_ip.split('.')
netmask_elm = netmask.split('.')
for index, digit in enumerate(subnet_ip_elm):
if int(digit) & int(netmask_elm[index]) != int(digit):
self._set_status(
0,
"[%s]Info: DHCP subnet IP and "
"netmask do not match" % self.NAME)
break
return True
def check_dhcp_service(self):
"""Checks if DHCP is running on port 67."""
print "Checking DHCP service......",
if 'dhcp' not in commands.getoutput('ps -ef'):
if not commands.getoutput('pgrep dhcp'):
self._set_status(
0,
"[%s]Error: dhcp service does not "