Skip to content

Commit 67aee00

Browse files
author
SRBuilds
committed
22.5.1 released
1 parent bb93dc5 commit 67aee00

File tree

16 files changed

+224
-96
lines changed

16 files changed

+224
-96
lines changed

README.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@ Copyright 2021 Nokia.
3232

3333
The license is located [here](LICENSE.md).
3434

35+
## Reporting issues ##
36+
37+
Issues, suggestions, and enhancements are welcome. Please use the Nokia support
38+
process. Issues raised in GitHub may be considered for inclusion into the project
39+
by Nokia. Pull requests are not accepted.
40+
3541
## Installation ##
3642

3743
Multiple installation methods are available:
@@ -109,3 +115,10 @@ these include:
109115
- singlehtml
110116
- man
111117
- text
118+
119+
120+
## Further reading and assistance ##
121+
122+
- [Nokia product documentation](https://documentation.nokia.com)
123+
- [Technical support](https://customer.nokia.com/support/s/)
124+

docs/source/conf.py

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
1-
# Configuration file for the Sphinx documentation builder.
2-
#
3-
# This file only contains a selection of the most common options. For a full
4-
# list see the documentation:
5-
# https://www.sphinx-doc.org/en/master/usage/configuration.html
6-
7-
# -- Path setup --------------------------------------------------------------
8-
9-
# If extensions (or modules to document with autodoc) are in another directory,
10-
# add these directories to sys.path here. If the directory is relative to the
11-
# documentation root, use os.path.abspath to make it absolute, like shown here.
12-
#
131
import os
142
import sys
153
sys.path.insert(0, os.path.relpath('../'))
@@ -22,15 +10,12 @@
2210
author = 'Nokia'
2311

2412
# The full version, including alpha/beta/rc tags
25-
version = '22.2.1'
26-
release = '22.2.1'
13+
version = '22.5.1'
14+
release = '22.5.1'
2715

2816

2917
# -- General configuration ---------------------------------------------------
3018

31-
# Add any Sphinx extension module names here, as strings. They can be
32-
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
33-
# ones.
3419
extensions = [ 'sphinx.ext.autodoc',
3520
'sphinx.ext.autosectionlabel',
3621
'sphinx.ext.autosummary',
@@ -45,7 +30,6 @@
4530
}
4631

4732

48-
# Add any paths that contain templates here, relative to this directory.
4933
templates_path = ['_templates']
5034

5135
# List of patterns, relative to source directory, that match files and
@@ -61,14 +45,7 @@
6145

6246
# -- Options for HTML output -------------------------------------------------
6347

64-
# The theme to use for HTML and HTML Help pages. See the documentation for
65-
# a list of builtin themes.
66-
#
6748
html_theme = 'sphinx_rtd_theme'
68-
69-
# Add any paths that contain custom static files (such as style sheets) here,
70-
# relative to this directory. They are copied after the builtin static files,
71-
# so a file named "default.css" will overwrite the builtin "default.css".
7249
html_static_path = ['_static']
7350
html_logo = "_static/nokia-logo-white-on-blue.png"
7451

docs/source/examples.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pySROS libraries.
1919
pySROS data structures
2020
######################
2121

22-
Having made a connection to an SR OS device it is important to understand the data structures returned by the
22+
Having made a connection to an SR OS device, it is important to understand the data structures returned by the
2323
:py:meth:`pysros.management.Datastore.get` function and those that can be sent to a router using
2424
:py:meth:`pysros.management.Datastore.set`.
2525

docs/source/features.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
============
2+
New features
3+
============
4+
5+
.. toctree::
6+
:maxdepth: 3
7+
:glob:
8+
:reversed:
9+
10+
features/*

docs/source/features/22.2.rst

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Release 22.2
2+
************
3+
4+
22.2.2
5+
######
6+
7+
8+
22.2.1
9+
######
10+
11+
* Performance improvements for connections when the YANG
12+
schema has already been generated.
13+
* :py:meth:`pysros.management.Datastore.get_list_keys` method
14+
introduced.
15+
16+
.. Reviewed by PLM 20220316
17+
18+
19+

docs/source/features/22.5.rst

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
Release 22.5
2+
************
3+
4+
22.5.1
5+
######
6+
7+
* Introduction of new feature announcements in this documentation (backdated to release 22.2.1)
8+
9+
.. Reviewed by PLM 20220503
10+
.. Reviewed by TechComms 20220503
11+
12+
13+
14+

docs/source/glossary.rst

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
********
2-
Glossary
3-
********
1+
***********************
2+
Glossary and assistance
3+
***********************
44

55
Glossary of terms
66
#################
@@ -16,9 +16,14 @@ Glossary of terms
1616
NETCONF
1717
Network Configuration protocol
1818

19+
.. Reviewed by PLM 20220303
20+
.. Reviewed by TechComms 20220503
1921
20-
References
21-
##########
22+
Additional assistance
23+
#####################
24+
25+
Further reading
26+
***************
2227

2328
.. seealso::
2429

@@ -37,7 +42,18 @@ References
3742
`Nokia Network Developer Portal <https://network.developer.nokia.com>`_
3843
Additional resources for developing with SR OS
3944

45+
`Nokia product documentation <https://documentation.nokia.com>`_
46+
Product documentation
47+
48+
.. Reviewed by PLM 20220303
49+
.. Reviewed by TechComms 20220503
50+
51+
Support and feedback
52+
********************
53+
54+
* `Nokia technical support portal <https://customer.nokia.com/support/s/>`_
55+
* `Documentation feedback <mailto:[email protected]>`_
4056

41-
.. Reviewed by PLM 20210902
42-
.. Reviewed by TechComms 20210902
57+
.. Reviewed by PLM 20220303
58+
.. Reviewed by TechComms 20220503
4359

docs/source/index.rst

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ documentation will be updated accordingly.
1616
.. list-table::
1717
:header-rows: 0
1818

19-
* - pySROS release: 22.2.1
20-
* - Document Number: 3HE 18378 AAAA TQZZA
19+
* - pySROS release: 22.5.1
20+
* - Document Number: 3HE 18378 AAAC TQZZA
2121

22-
.. Reviewed by PLM 20220125
23-
.. Reviewed by TechComms 20220125
22+
.. Reviewed by PLM 20220303
23+
.. Reviewed by TechComms 20220503
2424
2525
2626
.. toctree::
@@ -31,6 +31,7 @@ documentation will be updated accordingly.
3131
examples
3232
modules
3333
glossary
34+
features
3435

3536

3637

examples/show_port_counters.py

Lines changed: 102 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@
2020
2121
This application to display system information demonstrates how to parse
2222
different arguments depending on if the application is running locally or
23-
remotely. It also demonstrates how to print table headers in a different
24-
language. The state element names and text values are displayed in English,
25-
since this how they appear in the state datastore.
23+
remotely. It also demonstrates how to print table headers and element names
24+
in a different language.
2625
2726
Add the following alias so that the Python application can be run as a
2827
native MD-CLI command.
@@ -463,7 +462,6 @@ def show_port_counters_output(connection_object, language):
463462
print_row_with_spacing(
464463
local_str["spacer"][language], width, local_str["Port"][language], str(port)
465464
)
466-
print("-" * 80)
467465

468466
# Print oper-state values
469467
print_row_with_spacing(
@@ -544,60 +542,113 @@ def show_port_counters_output(connection_object, language):
544542
print_row_with_spacing(
545543
local_str["spacer"][language],
546544
width,
547-
local_str["in-multicast-packets"][language],
548-
port_stats[port]["statistics"]["in-multicast-packets"].data,
549-
)
550-
print_row_with_spacing(
551-
local_str["spacer"][language],
552-
width,
553-
local_str["in-unicast-packets"][language],
554-
port_stats[port]["statistics"]["in-unicast-packets"].data,
545+
local_str["counter-discontinuity-time"][language],
546+
str(port_stats[port]["statistics"]["counter-discontinuity-time"].data),
555547
)
556548

557-
# Print output statistics
558-
print_row_with_spacing(
559-
local_str["spacer"][language],
560-
width,
561-
local_str["out-discards"][language],
562-
port_stats[port]["statistics"]["out-discards"].data,
563-
)
564-
print_row_with_spacing(
565-
local_str["spacer"][language],
566-
width,
567-
local_str["out-errors"][language],
568-
port_stats[port]["statistics"]["out-errors"].data,
569-
)
549+
# last-cleared-time is a conditional state leaf, check existence
550+
if "last-cleared-time" in port_stats[port]["statistics"]:
570551
print_row_with_spacing(
571552
local_str["spacer"][language],
572553
width,
573-
local_str["out-octets"][language],
574-
port_stats[port]["statistics"]["out-octets"].data,
575-
)
576-
print_row_with_spacing(
577-
local_str["spacer"][language],
578-
width,
579-
local_str["out-packets"][language],
580-
port_stats[port]["statistics"]["out-packets"].data,
581-
)
582-
print_row_with_spacing(
583-
local_str["spacer"][language],
584-
width,
585-
local_str["out-broadcast-packets"][language],
586-
port_stats[port]["statistics"]["out-broadcast-packets"].data,
587-
)
588-
print_row_with_spacing(
589-
local_str["spacer"][language],
590-
width,
591-
local_str["out-multicast-packets"][language],
592-
port_stats[port]["statistics"]["out-multicast-packets"].data,
593-
)
594-
print_row_with_spacing(
595-
local_str["spacer"][language],
596-
width,
597-
local_str["out-unicast-packets"][language],
598-
port_stats[port]["statistics"]["out-unicast-packets"].data,
554+
local_str["last-cleared-time"][language],
555+
str(port_stats[port]["statistics"]["last-cleared-time"].data),
599556
)
600557

558+
# Print input statistics
559+
print_row_with_spacing(
560+
local_str["spacer"][language],
561+
width,
562+
local_str["in-discards"][language],
563+
port_stats[port]["statistics"]["in-discards"].data,
564+
)
565+
print_row_with_spacing(
566+
local_str["spacer"][language],
567+
width,
568+
local_str["in-errors"][language],
569+
port_stats[port]["statistics"]["in-errors"].data,
570+
)
571+
print_row_with_spacing(
572+
local_str["spacer"][language],
573+
width,
574+
local_str["in-octets"][language],
575+
port_stats[port]["statistics"]["in-octets"].data,
576+
)
577+
print_row_with_spacing(
578+
local_str["spacer"][language],
579+
width,
580+
local_str["in-packets"][language],
581+
port_stats[port]["statistics"]["in-packets"].data,
582+
)
583+
print_row_with_spacing(
584+
local_str["spacer"][language],
585+
width,
586+
local_str["in-unknown-protocol-discards"][language],
587+
port_stats[port]["statistics"]["in-unknown-protocol-discards"].data,
588+
)
589+
print_row_with_spacing(
590+
local_str["spacer"][language],
591+
width,
592+
local_str["in-broadcast-packets"][language],
593+
port_stats[port]["statistics"]["in-broadcast-packets"].data,
594+
)
595+
print_row_with_spacing(
596+
local_str["spacer"][language],
597+
width,
598+
local_str["in-multicast-packets"][language],
599+
port_stats[port]["statistics"]["in-multicast-packets"].data,
600+
)
601+
print_row_with_spacing(
602+
local_str["spacer"][language],
603+
width,
604+
local_str["in-unicast-packets"][language],
605+
port_stats[port]["statistics"]["in-unicast-packets"].data,
606+
)
607+
608+
# Print output statistics
609+
print_row_with_spacing(
610+
local_str["spacer"][language],
611+
width,
612+
local_str["out-discards"][language],
613+
port_stats[port]["statistics"]["out-discards"].data,
614+
)
615+
print_row_with_spacing(
616+
local_str["spacer"][language],
617+
width,
618+
local_str["out-errors"][language],
619+
port_stats[port]["statistics"]["out-errors"].data,
620+
)
621+
print_row_with_spacing(
622+
local_str["spacer"][language],
623+
width,
624+
local_str["out-octets"][language],
625+
port_stats[port]["statistics"]["out-octets"].data,
626+
)
627+
print_row_with_spacing(
628+
local_str["spacer"][language],
629+
width,
630+
local_str["out-packets"][language],
631+
port_stats[port]["statistics"]["out-packets"].data,
632+
)
633+
print_row_with_spacing(
634+
local_str["spacer"][language],
635+
width,
636+
local_str["out-broadcast-packets"][language],
637+
port_stats[port]["statistics"]["out-broadcast-packets"].data,
638+
)
639+
print_row_with_spacing(
640+
local_str["spacer"][language],
641+
width,
642+
local_str["out-multicast-packets"][language],
643+
port_stats[port]["statistics"]["out-multicast-packets"].data,
644+
)
645+
print_row_with_spacing(
646+
local_str["spacer"][language],
647+
width,
648+
local_str["out-unicast-packets"][language],
649+
port_stats[port]["statistics"]["out-unicast-packets"].data,
650+
)
651+
601652
# Print the closing delimator
602653
print("=" * 80)
603654

0 commit comments

Comments
 (0)