Skip to content

Closes: #143 - Adding the new login URL of NSO 5.7.5.1 #95

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
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Closes: #143 - Adding the new login URL of NSO 5.7.5.1 #95

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
e1015f2
Adding the new login URL of NSO 5.7.5.1
Mathias-gt Nov 22, 2022
7002f79
Update implementation.py
Mathias-gt Jun 8, 2023
12b9794
Add unit test
Mathias-gt Feb 26, 2025
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
12 changes: 8 additions & 4 deletions src/rest/connector/libs/nso/implementation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ def connect(self,
ip=ip,
port=port)

self.login_url = '{f}/api'.format(f=self.base_url)
self.login_urls = ['{f}/api'.format(f=self.base_url),'{f}/restconf'.format(f=self.base_url)]

log.info("Connecting to '{d}' with alias "
"'{a}'".format(d=self.device.name, a=self.alias))
Expand All @@ -129,10 +129,14 @@ def connect(self,
self.session.auth = (username, password)

# Connect to the device via requests
response = self.session.get(self.login_url, timeout=timeout)
for login_url in self.login_urls:
response = self.session.get(login_url, timeout=timeout)
log.debug("Response: {c} {r}, headers: {h}".format(c=response.status_code,
r=response.reason, h=response.headers))
if response.status_code == requests.codes.ok:
self.login_url = login_url
break
output = response.text
log.debug("Response: {c} {r}, headers: {h}".format(c=response.status_code,
r=response.reason, h=response.headers))
if verbose:
log.info("Response text:\n%s" % output)

Expand Down
15 changes: 15 additions & 0 deletions src/rest/connector/tests/test_nso.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,21 @@ def test_connect(self, **kwargs):
self.assertEqual(output, response_text)
return connection

def test_connect_restconf(self, **kwargs):
connection = Rest(device=self.device, alias='rest', via='rest')

response_text ="""\
<restconf xmlns="urn:ietf:params:xml:ns:yang:ietf-restconf">
<data/>
<operations/>
<yang-library-version>2019-01-04</yang-library-version>
</restconf>
"""

kwargs['mock'].get('http://198.51.100.2:8080/restconf', text=response_text)
output = connection.connect(verbose=True).text
self.assertEqual(output, response_text)
return connection

def test_get(self, **kwargs):
connection = self.test_connect()
Expand Down