Skip to content

default value is modified in variable in_min #521

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

Merged
merged 2 commits into from
Aug 25, 2020
Merged

default value is modified in variable in_min #521

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d3e8e1
CHanging the default value in in_min option
Aug 25, 2020
1978852
Modifying the check for in_min timeout modification
Aug 25, 2020
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
9 changes: 4 additions & 5 deletions library/juniper_junos_system.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
value of C(zeroize). The I(in_min) option is mutually exclusive with
the I(at) option.
required: false
default: none
default: 0
type: int
all_re:
description:
Expand Down Expand Up @@ -273,7 +273,7 @@ def main():
in_min=dict(type='int',
required=False,
aliases=['in'],
default=None),
default=0),
all_re=dict(type='bool',
required=False,
default=True),
Expand Down Expand Up @@ -313,7 +313,7 @@ def main():
#Four actions are expected - reboot, shutdown, halt and zeroize
if action not in ['reboot', 'shutdown', 'halt']:
# at, in_min and other_re option only applies to reboot, shutdown, or halt action.
for arg_type,arg_val in {"at":at,"in_min":in_min,"other_re":other_re}:
for arg_type, arg_val in {"at": at, "in_min": in_min, "other_re": other_re}:
if arg_val is not None:
junos_module.fail_json(msg='The %s option can only be used when '
'the action option has the value "reboot", '
Expand Down Expand Up @@ -341,8 +341,7 @@ def main():
# </rpc-reply> and therefore might get an RpcTimeout.
# (This is a known Junos bug.) Set the timeout low so this happens
# relatively quickly.
if (at == 'now' or in_min == 0 or
(at is None and in_min is None)):
if at == 'now' or (in_min == 0 and at is None):
if junos_module.dev.timeout > 5:
junos_module.logger.debug("Decreasing device RPC timeout "
"to 5 seconds.")
Expand Down