Skip to content
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

pull requests for issue #1322 #1315 #1334

Merged
merged 3 commits into from
Oct 15, 2024
Merged

pull requests for issue #1322 #1315 #1334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9dad522
pull requests for issue #1322 #1315
chidanandpujar Oct 14, 2024
8e4331d
pull requests for issue #1322 #1315
chidanandpujar Oct 14, 2024
dfeb169
pull requests for issue #1322 #1315
chidanandpujar Oct 14, 2024
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
2 changes: 2 additions & 0 deletions lib/jnpr/junos/device.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,6 +735,8 @@ def cli(self, command, format="text", warning=True):
if rsp is True:
return ""
if rsp.tag in ["output", "rpc-reply"]:
if rsp.tag == "output" and rsp.getparent() is not None:
rsp = rsp.getparent()
encode = None if sys.version < "3" else "unicode"
return etree.tostring(
rsp, method="text", with_tail=False, encoding=encode
Expand Down
6 changes: 6 additions & 0 deletions lib/jnpr/junos/utils/sw.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -984,11 +984,17 @@ def _progress(report):
kwargs.update({"no_validate": True})

if issu is True:
if validate is False: # To Check validation is False
# Need to pass the no_validate option via kwargs
kwargs.update({"no_validate": True})
_progress("ISSU: installing software ... please be patient ...")
return self.pkgaddISSU(
remote_package, vmhost=vmhost, dev_timeout=timeout, **kwargs
)
elif nssu is True:
if validate is False:
# Need to pass the no_validate option via kwargs
kwargs.update({"no_validate": True})
_progress("NSSU: installing software ... please be patient ...")
return self.pkgaddNSSU(remote_package, dev_timeout=timeout, **kwargs)
elif member_id is not None:
Expand Down
24 changes: 24 additions & 0 deletions tests/unit/utils/test_sw.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,12 +242,36 @@ def test_sw_install_issu(self, mock_execute):
package = "test.tgz"
self.assertTrue(self.sw.install(package, issu=True, no_copy=True))

@patch("jnpr.junos.Device.execute")
def test_sw_install_issu_validate_False(self, mock_execute):
mock_execute.side_effect = self._mock_manager
package = "test.tgz"
self.assertTrue(self.sw.install(package, issu=True, no_copy=True, validate=False))

@patch("jnpr.junos.Device.execute")
def test_sw_install_issu_validate_True(self, mock_execute):
mock_execute.side_effect = self._mock_manager
package = "test.tgz"
self.assertTrue(self.sw.install(package, issu=True, no_copy=True, validate=True))

@patch("jnpr.junos.Device.execute")
def test_sw_install_nssu(self, mock_execute):
mock_execute.side_effect = self._mock_manager
package = "test.tgz"
self.assertTrue(self.sw.install(package, nssu=True, no_copy=True))

@patch("jnpr.junos.Device.execute")
def test_sw_install_nssu_validate_False(self, mock_execute):
mock_execute.side_effect = self._mock_manager
package = "test.tgz"
self.assertTrue(self.sw.install(package, nssu=True, no_copy=True, validate=False))

@patch("jnpr.junos.Device.execute")
def test_sw_install_nssu_validate_True(self, mock_execute):
mock_execute.side_effect = self._mock_manager
package = "test.tgz"
self.assertTrue(self.sw.install(package, nssu=True, no_copy=True, validate=True))

@patch("jnpr.junos.Device.execute")
def test_sw_install_issu_nssu_both_error(self, mock_execute):
mock_execute.side_effect = self._mock_manager
Expand Down
Loading