|
|
|
@ -20030,6 +20030,10 @@ network %s")%net)
|
|
|
|
|
self.printERROR(_("Can not found 'range' in config file %s")\
|
|
|
|
|
%dhcpObj.nameConfigFile)
|
|
|
|
|
return False
|
|
|
|
|
# Флаг ip найден в одной из сетей
|
|
|
|
|
flagFoundIpInNet = False
|
|
|
|
|
# Флаг ошибки в конфигурационном файле
|
|
|
|
|
flagErrorConfig = False
|
|
|
|
|
# Проверка на сеть
|
|
|
|
|
for data in ranges:
|
|
|
|
|
flagCorrect = False
|
|
|
|
@ -20039,25 +20043,28 @@ network %s")%net)
|
|
|
|
|
rpIPA = r[0].rpartition(".")[0]
|
|
|
|
|
rpIPB = r[1].rpartition(".")[0]
|
|
|
|
|
if rpIPA != rpIPB:
|
|
|
|
|
self.printErrConfig(dhcpObj, net)
|
|
|
|
|
flagErrorConfig = True
|
|
|
|
|
break
|
|
|
|
|
if len(r) != 2:
|
|
|
|
|
self.printErrConfig(dhcpObj, net)
|
|
|
|
|
flagErrorConfig = True
|
|
|
|
|
break
|
|
|
|
|
if rpIP == rpIPA:
|
|
|
|
|
try:
|
|
|
|
|
numA = int(r[0].rpartition(".")[2])
|
|
|
|
|
numB = int(r[1].rpartition(".")[2])
|
|
|
|
|
except:
|
|
|
|
|
self.printErrConfig(dhcpObj, net)
|
|
|
|
|
flagErrorConfig = True
|
|
|
|
|
break
|
|
|
|
|
# ip найден в существующих сетях
|
|
|
|
|
if not flagFoundIpInNet:
|
|
|
|
|
flagFoundIpInNet = True
|
|
|
|
|
numA, numB = [max([numA,numB]), min([numA,numB])]
|
|
|
|
|
if numA > numB:
|
|
|
|
|
if not (numIP <= numA and numIP >= numB):
|
|
|
|
|
flagCorrect = True
|
|
|
|
|
break
|
|
|
|
|
else:
|
|
|
|
|
self.printErrConfig(dhcpObj, net)
|
|
|
|
|
flagErrorConfig = True
|
|
|
|
|
break
|
|
|
|
|
# Проверка на статические хосты
|
|
|
|
|
if flagCorrect:
|
|
|
|
@ -20073,8 +20080,17 @@ network %s")%net)
|
|
|
|
|
flagCorrect = False
|
|
|
|
|
break
|
|
|
|
|
else:
|
|
|
|
|
self.printERROR(_("Found %s in dynamic ip range")%ip + " " +\
|
|
|
|
|
_("in config file %s")%dhcpObj.nameConfigFile)
|
|
|
|
|
# Если ip не найден в существующих сетях
|
|
|
|
|
if not flagFoundIpInNet:
|
|
|
|
|
self.printERROR(_("Can not found %s in networks") %ip + " " +\
|
|
|
|
|
_("in config file %s")%dhcpObj.nameConfigFile)
|
|
|
|
|
# Если ошибка в конфигурационном файле
|
|
|
|
|
elif flagErrorConfig:
|
|
|
|
|
self.printErrConfig(dhcpObj, net)
|
|
|
|
|
# Если ip попал в динамический диапазон
|
|
|
|
|
else:
|
|
|
|
|
self.printERROR(_("Found %s in dynamic ip range")%ip + " " +\
|
|
|
|
|
_("in config file %s")%dhcpObj.nameConfigFile)
|
|
|
|
|
return flagCorrect
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|