Skip to content
This repository was archived by the owner on Feb 10, 2018. It is now read-only.

Commit 5a3721a

Browse files
authored
Merge pull request #182 from napalm-automation/develop
Release 0.11.0
2 parents 564817e + 4ae56e9 commit 5a3721a

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

napalm_junos/junos.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ def __init__(self, hostname, username, password, timeout=60, optional_args=None)
6565
* port (int): custom port
6666
* key_file (string): SSH key file path
6767
* keepalive (int): Keepalive interval
68+
* ignore_warning (boolean): not generate warning exceptions
6869
"""
6970
self.hostname = hostname
7071
self.username = username
@@ -82,6 +83,7 @@ def __init__(self, hostname, username, password, timeout=60, optional_args=None)
8283
self.key_file = optional_args.get('key_file', None)
8384
self.keepalive = optional_args.get('keepalive', 30)
8485
self.ssh_config_file = optional_args.get('ssh_config_file', None)
86+
self.ignore_warning = optional_args.get('ignore_warning', False)
8587

8688
if self.key_file:
8789
self.device = Device(hostname,
@@ -205,7 +207,8 @@ def _load_candidate(self, filename, config, overwrite):
205207
if fmt == "xml":
206208
configuration = etree.XML(configuration)
207209

208-
self.device.cu.load(configuration, format=fmt, overwrite=overwrite)
210+
self.device.cu.load(configuration, format=fmt, overwrite=overwrite,
211+
ignore_warning=self.ignore_warning)
209212
except ConfigLoadError as e:
210213
if self.config_replace:
211214
raise ReplaceConfigException(e.message)

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
setup(
1414
name="napalm-junos",
15-
version="0.10.3",
15+
version="0.11.0",
1616
packages=find_packages(),
1717
author="David Barroso, Mircea Ulinic",
1818

0 commit comments

Comments
 (0)