Skip to content

[ZTP] Add __ztp_profile_loaded guard to __discoverOnly() #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gord1306 wants to merge 1 commit into
base: 202311.X_4630_10g_prod
Choose a base branch
from
Open

[ZTP] Add __ztp_profile_loaded guard to __discoverOnly() #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions src/usr/lib/ztp/ztp-engine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,13 +306,29 @@ def __loadZTPProfile(self, event):
return False

def __discoverOnly(self):
'''!
Prepare the system for ZTP discovery when a saved configuration is being
used (use_config_db). This is a one time setup, mirroring the behavior of
__loadZTPProfile().

ztp-profile.sh discoverOnly restarts rsyslog and interfaces-config. Without
the __ztp_profile_loaded guard it is re-executed on every iteration of the
discovery loop (discovery-interval, 10s by default), which repeatedly tears
down in-band interfaces and their DHCP clients.

@return False - If discovery setup was already performed
True - If discovery setup was performed
'''
# Do not attempt to install ZTP configuration if working in unit test mode
if self.test_mode:
return False

cmd = getCfg('ztp-lib-dir')+'/ztp-profile.sh discoverOnly'
rc = runCommand(cmd, capture_stdout=False)
return True
if self.__ztp_profile_loaded is False:
cmd = getCfg('ztp-lib-dir')+'/ztp-profile.sh discoverOnly'
rc = runCommand(cmd, capture_stdout=False)
self.__ztp_profile_loaded = True
return True
return False

def __createProvScriptJson(self):
'''!
Expand Down
Loading