mirror of
https://github.com/Pardus-LiderAhenk/ahenk
synced 2024-11-29 05:02:20 +03:00
null check bug fixed
This commit is contained in:
parent
60f5543413
commit
65eb5068d1
1 changed files with 16 additions and 6 deletions
|
@ -196,18 +196,28 @@ class Registration:
|
||||||
|
|
||||||
def install_and_config_ad(self, reg_reply):
|
def install_and_config_ad(self, reg_reply):
|
||||||
self.logger.info('AD install process starting')
|
self.logger.info('AD install process starting')
|
||||||
|
|
||||||
domain_name = str(reg_reply['adDomainName'])
|
domain_name = str(reg_reply['adDomainName'])
|
||||||
host_name = str(reg_reply['adHostName'])
|
host_name = str(reg_reply['adHostName'])
|
||||||
ip_address = str(reg_reply['adIpAddress'])
|
ip_address = str(reg_reply['adIpAddress'])
|
||||||
password = str(reg_reply['adAdminPassword'])
|
password = str(reg_reply['adAdminPassword'])
|
||||||
ad_username = str(reg_reply['adAdminUserName'])
|
ad_username = str(reg_reply['adAdminUserName'])
|
||||||
dynamic_dns_update = reg_reply['dynamicDNSUpdate']
|
dynamic_dns_update = False
|
||||||
|
|
||||||
if domain_name is None or host_name is None or ip_address is None or password is None :
|
if 'dynamicDNSUpdate' in reg_reply:
|
||||||
self.logger.error("Registration params is null")
|
dynamic_dns_update = reg_reply['dynamicDNSUpdate']
|
||||||
return
|
self.logger.info("DynamicDNSUpdate is NOT NULL")
|
||||||
|
if domain_name is None or host_name is None or ip_address is None or password is None:
|
||||||
self.ad_login.authenticate(domain_name, host_name, ip_address, password, ad_username, dynamic_dns_update)
|
self.logger.error("Registration params is null")
|
||||||
|
return
|
||||||
|
self.ad_login.authenticate(domain_name, host_name, ip_address, password, ad_username, dynamic_dns_update)
|
||||||
|
else:
|
||||||
|
self.logger.info("DynamicDNSUpdate is NULL")
|
||||||
|
if domain_name is None or host_name is None or ip_address is None or password is None:
|
||||||
|
self.logger.error("Registration params is null")
|
||||||
|
return
|
||||||
|
self.ad_login.authenticate(domain_name, host_name, ip_address, password, ad_username, dynamic_dns_update)
|
||||||
|
# self.ad_login.authenticate(domain_name, host_name, ip_address, password, ad_username, dynamic_dns_update)
|
||||||
|
|
||||||
def registration_error(self, reg_reply):
|
def registration_error(self, reg_reply):
|
||||||
self.re_register()
|
self.re_register()
|
||||||
|
|
Loading…
Reference in a new issue