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

juniper modules/states docstring, parameter name fixes #57281

Merged
merged 20 commits into from
May 18, 2020
Merged

juniper modules/states docstring, parameter name fixes #57281

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
fffface
fix junos.load and junos.rpc
vnitinv May 13, 2020
270faef
correct replace documententation
vnitinv May 14, 2020
3f90526
fix docstring for states->install-config->path
vnitinv May 14, 2020
47c7653
fix states->junos.cli to take command as argument
vnitinv May 14, 2020
ea827c2
added ephemeral support
vnitinv May 14, 2020
6b12dba
fix get_table and sw.install
vnitinv May 14, 2020
a101033
added version for newly added params
vnitinv May 14, 2020
65abb34
Merge pull request #143 from vnitinv/fix-142
May 14, 2020
2214539
pylint fix
vnitinv May 14, 2020
d83da27
Merge pull request #144 from vnitinv/fix-142
May 14, 2020
eef07c1
fix unit test for junos
vnitinv May 14, 2020
5f7b03e
Merge pull request #145 from vnitinv/fix-142
May 14, 2020
f1c407a
fix pre-commit failures
May 14, 2020
682cb0a
changes as per david comments
May 16, 2020
721ab53
pre-commit fix
May 16, 2020
69b2c90
test cases for junos proxy
May 18, 2020
f8b97e2
test cases for junos proxy
May 18, 2020
87dda5e
changed debug to warning
May 18, 2020
8faabae
pre-commit fix in test_junos.py
May 18, 2020
2e5443b
pre-commit fix in test_junos.py
May 18, 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
7 changes: 3 additions & 4 deletions tests/unit/proxy/test_junos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
import salt.proxy.junos as junos

import sys
Expand All @@ -8,16 +9,14 @@
from tests.support.unit import TestCase, skipIf

if sys.version < "3":
from six import StringIO
from salt.ext.six import StringIO
dmurphy18 marked this conversation as resolved.
Show resolved Hide resolved
else:
from io import BytesIO as StringIO

try:
from jnpr.junos.device import Device
from jnpr.junos.device import Device # pylint: disable=unused-import
from jnpr.junos.exception import ConnectError
import jxmlease # pylint: disable=unused-import
from ncclient.transport.ssh import SSHSession
from ncclient.devices.junos import JunosDeviceHandler

HAS_JUNOS = True
except ImportError:
Expand Down