forked from pool/python-junos-eznc
- Support added for Python 3.10 and above version.
- 2.6.8:
- Introduced optional argument routing instance for fs.cp() API
- Introduced optional argument member_id for installation of pkg on
specific member id of EX-VC
- Changed the VlanTable field name to vlan-name and BfdSessionTable
field name to client-name #423
- Fixed the port details in StartShell to use the port from Device
object instead of default Port 22 #573
- Fixed the sw.install to use Windows file path for package copy
#1206
- Fixed the sw.install to install the vc_master after the other
vc_members gets installed for EX-3400 where unlink is set by
default #1247
- Removed Unused Dependency: Netaddr #1257
- Fixed "object": version_info(re_version) emits ValueError: invalid
literal for int() with base 10: '17-EVO' for EVO version
X50.17-EVO#1264
- Drop python-junos-eznc-remove-nose.patch
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-junos-eznc?expand=0&rev=28
351 lines
13 KiB
Diff
351 lines
13 KiB
Diff
Index: py-junos-eznc-2.7.0/lib/jnpr/junos/command/__init__.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/lib/jnpr/junos/command/__init__.py
|
|
+++ py-junos-eznc-2.7.0/lib/jnpr/junos/command/__init__.py
|
|
@@ -4,7 +4,7 @@ from importlib.abc import Loader, MetaPa
|
|
from importlib.util import spec_from_loader
|
|
|
|
import yaml
|
|
-import yamlordereddictloader
|
|
+import yamlloader
|
|
from jnpr.junos.factory.factory_loader import FactoryLoader
|
|
|
|
__all__ = []
|
|
@@ -32,7 +32,7 @@ class MetaPathLoader(Loader):
|
|
with open(os.path.join(os.path.dirname(__file__), mod + ".yml"), "r") as stream:
|
|
try:
|
|
modules = FactoryLoader().load(
|
|
- yaml.load(stream, Loader=yamlordereddictloader.Loader)
|
|
+ yaml.load(stream, Loader=yamlloader.ordereddict.Loader)
|
|
)
|
|
except yaml.YAMLError as exc:
|
|
raise ImportError("%s is not loaded" % mod)
|
|
Index: py-junos-eznc-2.7.0/tests/unit/factory/test_cmdtable.py
|
|
===================================================================
|
|
--- py-junos-eznc-2.7.0.orig/tests/unit/factory/test_cmdtable.py
|
|
+++ py-junos-eznc-2.7.0/tests/unit/factory/test_cmdtable.py
|
|
@@ -11,7 +11,7 @@ from jnpr.junos.exception import RpcErro
|
|
from ncclient.manager import Manager, make_device_handler
|
|
from ncclient.transport import SSHSession
|
|
from mock import MagicMock, patch
|
|
-import yamlordereddictloader
|
|
+import yamlloader
|
|
from jnpr.junos.factory.factory_loader import FactoryLoader
|
|
import yaml
|
|
import json
|
|
@@ -49,7 +49,7 @@ CMErrorView:
|
|
"""
|
|
globals().update(
|
|
FactoryLoader().load(
|
|
- yaml.load(yaml_data, Loader=yamlordereddictloader.Loader)
|
|
+ yaml.load(yaml_data, Loader=yamlloader.ordereddict.Loader)
|
|
)
|
|
)
|
|
stats = CMErrorTable(self.dev)
|
|
@@ -84,7 +84,7 @@ sysctlView:
|
|
"""
|
|
globals().update(
|
|
FactoryLoader().load(
|
|
- yaml.load(yaml_data, Loader=yamlordereddictloader.Loader)
|
|
+ yaml.load(yaml_data, Loader=yamlloader.ordereddict.Loader)
|
|
)
|
|
)
|
|
stats = sysctlVeriexecTable(self.dev)
|
|
@@ -125,7 +125,7 @@ CMErrorView:
|
|
"""
|
|
globals().update(
|
|
FactoryLoader().load(
|
|
- yaml.load(yaml_data, Loader=yamlordereddictloader.Loader)
|
|
+ yaml.load(yaml_data, Loader=yamlloader.ordereddict.Loader)
|
|
)
|
|
)
|
|
stats = CMErrorTable(self.dev)
|
|
@@ -187,7 +187,7 @@ CMErrorView:
|
|
"""
|
|
globals().update(
|
|
FactoryLoader().load(
|
|
- yaml.load(yaml_data, Loader=yamlordereddictloader.Loader)
|
|
+ yaml.load(yaml_data, Loader=yamlloader.ordereddict.Loader)
|
|
)
|
|
)
|
|
stats = CMErrorTable(self.dev)
|
|
@@ -211,7 +211,7 @@ CMErrorView:
|
|
"""
|
|
globals().update(
|
|
FactoryLoader().load(
|
|
- yaml.load(yaml_data, Loader=yamlordereddictloader.Loader)
|
|
+ yaml.load(yaml_data, Loader=yamlloader.ordereddict.Loader)
|
|
)
|
|
)
|
|
stats = CMErrorTable(self.dev)
|
|
@@ -239,7 +239,7 @@ CMErrorView:
|
|
"""
|
|
globals().update(
|
|
FactoryLoader().load(
|
|
- yaml.load(yaml_data, Loader=yamlordereddictloader.Loader)
|
|
+ yaml.load(yaml_data, Loader=yamlloader.ordereddict.Loader)
|
|
)
|
|
)
|
|
stats = CMErrorTable(self.dev)
|
|
@@ -266,7 +266,7 @@ CMErrorView:
|
|
"""
|
|
globals().update(
|
|
FactoryLoader().load(
|
|
- yaml.load(yaml_data, Loader=yamlordereddictloader.Loader)
|
|
+ yaml.load(yaml_data, Loader=yamlloader.ordereddict.Loader)
|
|
)
|
|
)
|
|
stats = CMErrorTable(self.dev)
|
|
@@ -292,7 +292,7 @@ CMErrorView:
|
|
"""
|
|
globals().update(
|
|
FactoryLoader().load(
|
|
- yaml.load(yaml_data, Loader=yamlordereddictloader.Loader)
|
|
+ yaml.load(yaml_data, Loader=yamlloader.ordereddict.Loader)
|
|
)
|
|
)
|
|
stats = CMErrorTable(self.dev).get()
|
|
@@ -326,7 +326,7 @@ FPCLinkStatTable:
|
|
"""
|
|
globals().update(
|
|
FactoryLoader().load(
|
|
- yaml.load(yaml_data, Loader=yamlordereddictloader.Loader)
|
|
+ yaml.load(yaml_data, Loader=yamlloader.ordereddict.Loader)
|
|
)
|
|
)
|
|
stats = FPCLinkStatTable(self.dev)
|
|
@@ -370,7 +370,7 @@ ShowLuchipView:
|
|
"""
|
|
globals().update(
|
|
FactoryLoader().load(
|
|
- yaml.load(yaml_data, Loader=yamlordereddictloader.Loader)
|
|
+ yaml.load(yaml_data, Loader=yamlloader.ordereddict.Loader)
|
|
)
|
|
)
|
|
stats = ShowLuchipTable(self.dev)
|
|
@@ -473,7 +473,7 @@ FPCLinkStatTable:
|
|
"""
|
|
globals().update(
|
|
FactoryLoader().load(
|
|
- yaml.load(yaml_data, Loader=yamlordereddictloader.Loader)
|
|
+ yaml.load(yaml_data, Loader=yamlloader.ordereddict.Loader)
|
|
)
|
|
)
|
|
stats = FPCLinkStatTable(self.dev)
|
|
@@ -517,7 +517,7 @@ XMChipStatsView:
|
|
"""
|
|
globals().update(
|
|
FactoryLoader().load(
|
|
- yaml.load(yaml_data, Loader=yamlordereddictloader.Loader)
|
|
+ yaml.load(yaml_data, Loader=yamlloader.ordereddict.Loader)
|
|
)
|
|
)
|
|
stats = XMChipStatsTable(self.dev)
|
|
@@ -536,7 +536,7 @@ FPCLinkStatTable:
|
|
"""
|
|
globals().update(
|
|
FactoryLoader().load(
|
|
- yaml.load(yaml_data, Loader=yamlordereddictloader.Loader)
|
|
+ yaml.load(yaml_data, Loader=yamlloader.ordereddict.Loader)
|
|
)
|
|
)
|
|
stats = FPCLinkStatTable(self.dev)
|
|
@@ -635,7 +635,7 @@ FPCTTPReceiveStatsView:
|
|
"""
|
|
globals().update(
|
|
FactoryLoader().load(
|
|
- yaml.load(yaml_data, Loader=yamlordereddictloader.Loader)
|
|
+ yaml.load(yaml_data, Loader=yamlloader.ordereddict.Loader)
|
|
)
|
|
)
|
|
stats = FPCTTPStatsTable(self.dev)
|
|
@@ -709,7 +709,7 @@ MtipCgeStatisticsTable:
|
|
"""
|
|
globals().update(
|
|
FactoryLoader().load(
|
|
- yaml.load(yaml_data, Loader=yamlordereddictloader.Loader)
|
|
+ yaml.load(yaml_data, Loader=yamlloader.ordereddict.Loader)
|
|
)
|
|
)
|
|
stats = MtipCgeSummaryTable(self.dev)
|
|
@@ -803,7 +803,7 @@ _ICMPRateView:
|
|
"""
|
|
globals().update(
|
|
FactoryLoader().load(
|
|
- yaml.load(yaml_data, Loader=yamlordereddictloader.Loader)
|
|
+ yaml.load(yaml_data, Loader=yamlloader.ordereddict.Loader)
|
|
)
|
|
)
|
|
stats = ICMPStatsTable(self.dev)
|
|
@@ -904,7 +904,7 @@ _ThrottleStatsTable:
|
|
"""
|
|
globals().update(
|
|
FactoryLoader().load(
|
|
- yaml.load(yaml_data, Loader=yamlordereddictloader.Loader)
|
|
+ yaml.load(yaml_data, Loader=yamlloader.ordereddict.Loader)
|
|
)
|
|
)
|
|
stats = IthrottleIDTable(self.dev).get(target="fpc2")
|
|
@@ -945,7 +945,7 @@ ShowPciErrorsView:
|
|
"""
|
|
globals().update(
|
|
FactoryLoader().load(
|
|
- yaml.load(yaml_data, Loader=yamlordereddictloader.Loader)
|
|
+ yaml.load(yaml_data, Loader=yamlloader.ordereddict.Loader)
|
|
)
|
|
)
|
|
stats = ShowPciErrorsTable(self.dev).get()
|
|
@@ -987,7 +987,7 @@ FPCMemoryView:
|
|
"""
|
|
globals().update(
|
|
FactoryLoader().load(
|
|
- yaml.load(yaml_data, Loader=yamlordereddictloader.Loader)
|
|
+ yaml.load(yaml_data, Loader=yamlloader.ordereddict.Loader)
|
|
)
|
|
)
|
|
stats = FPCMemory(self.dev).get()
|
|
@@ -1045,7 +1045,7 @@ PQ3PCI:
|
|
"""
|
|
globals().update(
|
|
FactoryLoader().load(
|
|
- yaml.load(yaml_data, Loader=yamlordereddictloader.Loader)
|
|
+ yaml.load(yaml_data, Loader=yamlloader.ordereddict.Loader)
|
|
)
|
|
)
|
|
stats = PQ3PCITable(self.dev)
|
|
@@ -1171,7 +1171,7 @@ _TopThreadTable:
|
|
"""
|
|
globals().update(
|
|
FactoryLoader().load(
|
|
- yaml.load(yaml_data, Loader=yamlordereddictloader.Loader)
|
|
+ yaml.load(yaml_data, Loader=yamlloader.ordereddict.Loader)
|
|
)
|
|
)
|
|
stats = SchedulerTable(self.dev)
|
|
@@ -1208,7 +1208,7 @@ HostlbStatusSummaryView:
|
|
"""
|
|
globals().update(
|
|
FactoryLoader().load(
|
|
- yaml.load(yaml_data, Loader=yamlordereddictloader.Loader)
|
|
+ yaml.load(yaml_data, Loader=yamlloader.ordereddict.Loader)
|
|
)
|
|
)
|
|
stats = HostlbStatusSummaryTable(self.dev)
|
|
@@ -1234,7 +1234,7 @@ HostlbStatusSummaryView:
|
|
"""
|
|
globals().update(
|
|
FactoryLoader().load(
|
|
- yaml.load(yaml_data, Loader=yamlordereddictloader.Loader)
|
|
+ yaml.load(yaml_data, Loader=yamlloader.ordereddict.Loader)
|
|
)
|
|
)
|
|
stats = HostlbStatusSummaryTable(
|
|
@@ -1310,7 +1310,7 @@ _TransmitPerQueueView:
|
|
"""
|
|
globals().update(
|
|
FactoryLoader().load(
|
|
- yaml.load(yaml_data, Loader=yamlordereddictloader.Loader)
|
|
+ yaml.load(yaml_data, Loader=yamlloader.ordereddict.Loader)
|
|
)
|
|
)
|
|
stats = DevicesLocalTable(self.dev)
|
|
@@ -1381,7 +1381,7 @@ _ReceiveView:
|
|
"""
|
|
globals().update(
|
|
FactoryLoader().load(
|
|
- yaml.load(yaml_data, Loader=yamlordereddictloader.Loader)
|
|
+ yaml.load(yaml_data, Loader=yamlloader.ordereddict.Loader)
|
|
)
|
|
)
|
|
stats = DevicesLocalTable(self.dev)
|
|
@@ -1401,7 +1401,7 @@ EthernetSwitchStatisticsIterTable:
|
|
"""
|
|
globals().update(
|
|
FactoryLoader().load(
|
|
- yaml.load(yaml_data, Loader=yamlordereddictloader.Loader)
|
|
+ yaml.load(yaml_data, Loader=yamlloader.ordereddict.Loader)
|
|
)
|
|
)
|
|
stats = EthernetSwitchStatisticsIterTable(self.dev)
|
|
@@ -1531,7 +1531,7 @@ _EthSwitchStatsFpc5Table:
|
|
"""
|
|
globals().update(
|
|
FactoryLoader().load(
|
|
- yaml.load(yaml_data, Loader=yamlordereddictloader.Loader)
|
|
+ yaml.load(yaml_data, Loader=yamlloader.ordereddict.Loader)
|
|
)
|
|
)
|
|
stats = EthernetSwitchStatistics(self.dev)
|
|
@@ -1688,7 +1688,7 @@ _ShowToePfePacketStatsStream_rx_errors:
|
|
"""
|
|
globals().update(
|
|
FactoryLoader().load(
|
|
- yaml.load(yaml_data, Loader=yamlordereddictloader.Loader)
|
|
+ yaml.load(yaml_data, Loader=yamlloader.ordereddict.Loader)
|
|
)
|
|
)
|
|
stats = ShowToePfePacketStatsTable(self.dev)
|
|
@@ -1756,7 +1756,7 @@ _ShowToePfePacketStatsStream_rx_errors:
|
|
"""
|
|
globals().update(
|
|
FactoryLoader().load(
|
|
- yaml.load(yaml_data, Loader=yamlordereddictloader.Loader)
|
|
+ yaml.load(yaml_data, Loader=yamlloader.ordereddict.Loader)
|
|
)
|
|
)
|
|
stats = ShowToePfePacketStatsTable(self.dev)
|
|
@@ -2093,7 +2093,7 @@ XMChipInterruptStatsView:
|
|
"""
|
|
globals().update(
|
|
FactoryLoader().load(
|
|
- yaml.load(yaml_data, Loader=yamlordereddictloader.Loader)
|
|
+ yaml.load(yaml_data, Loader=yamlloader.ordereddict.Loader)
|
|
)
|
|
)
|
|
stats = XMChipInterruptStatsTable(self.dev)
|
|
@@ -2126,7 +2126,7 @@ XMChipInterruptStatsView:
|
|
"""
|
|
globals().update(
|
|
FactoryLoader().load(
|
|
- yaml.load(yaml_data, Loader=yamlordereddictloader.Loader)
|
|
+ yaml.load(yaml_data, Loader=yamlloader.ordereddict.Loader)
|
|
)
|
|
)
|
|
stats = XMChipInterruptStatsTable(self.dev)
|
|
@@ -2160,7 +2160,7 @@ FPCThreadView:
|
|
"""
|
|
globals().update(
|
|
FactoryLoader().load(
|
|
- yaml.load(yaml_data, Loader=yamlordereddictloader.Loader)
|
|
+ yaml.load(yaml_data, Loader=yamlloader.ordereddict.Loader)
|
|
)
|
|
)
|
|
stats = FPCThreads(self.dev)
|
|
@@ -2327,7 +2327,7 @@ CChipLoStatsView:
|
|
"""
|
|
globals().update(
|
|
FactoryLoader().load(
|
|
- yaml.load(yaml_data, Loader=yamlordereddictloader.Loader)
|
|
+ yaml.load(yaml_data, Loader=yamlloader.ordereddict.Loader)
|
|
)
|
|
)
|
|
stats = CChipLoStatsTable(self.dev)
|
|
@@ -2355,7 +2355,7 @@ ARPview:
|
|
"""
|
|
globals().update(
|
|
FactoryLoader().load(
|
|
- yaml.load(yaml_data, Loader=yamlordereddictloader.Loader)
|
|
+ yaml.load(yaml_data, Loader=yamlloader.ordereddict.Loader)
|
|
)
|
|
)
|
|
stats = ARPtable(self.dev)
|
|
@@ -2386,7 +2386,7 @@ ARPview:
|
|
"""
|
|
globals().update(
|
|
FactoryLoader().load(
|
|
- yaml.load(yaml_data, Loader=yamlordereddictloader.Loader)
|
|
+ yaml.load(yaml_data, Loader=yamlloader.ordereddict.Loader)
|
|
)
|
|
)
|
|
stats = ARPtable(self.dev)
|