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

Commit

Permalink
Merge pull request #182 from napalm-automation/develop
Browse files Browse the repository at this point in the history
Release 0.11.0
  • Loading branch information
mirceaulinic authored Jul 5, 2017
2 parents 564817e + 4ae56e9 commit 5a3721a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
5 changes: 4 additions & 1 deletion napalm_junos/junos.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ def __init__(self, hostname, username, password, timeout=60, optional_args=None)
* port (int): custom port
* key_file (string): SSH key file path
* keepalive (int): Keepalive interval
* ignore_warning (boolean): not generate warning exceptions
"""
self.hostname = hostname
self.username = username
Expand All @@ -82,6 +83,7 @@ def __init__(self, hostname, username, password, timeout=60, optional_args=None)
self.key_file = optional_args.get('key_file', None)
self.keepalive = optional_args.get('keepalive', 30)
self.ssh_config_file = optional_args.get('ssh_config_file', None)
self.ignore_warning = optional_args.get('ignore_warning', False)

if self.key_file:
self.device = Device(hostname,
Expand Down Expand Up @@ -205,7 +207,8 @@ def _load_candidate(self, filename, config, overwrite):
if fmt == "xml":
configuration = etree.XML(configuration)

self.device.cu.load(configuration, format=fmt, overwrite=overwrite)
self.device.cu.load(configuration, format=fmt, overwrite=overwrite,
ignore_warning=self.ignore_warning)
except ConfigLoadError as e:
if self.config_replace:
raise ReplaceConfigException(e.message)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

setup(
name="napalm-junos",
version="0.10.3",
version="0.11.0",
packages=find_packages(),
author="David Barroso, Mircea Ulinic",
author_email="dbarrosop@dravetech.com, mircea@cloudflare.com",
Expand Down

0 comments on commit 5a3721a

Please sign in to comment.