From 9efef027745377af347270817472ac67ec9a07c1 Mon Sep 17 00:00:00 2001 From: Dan Goscomb Date: Mon, 4 Jan 2021 11:38:03 +0000 Subject: [PATCH 01/14] Check return type is an etree Element, if not return None for no changes. Fixes #1082 --- lib/jnpr/junos/utils/config.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/jnpr/junos/utils/config.py b/lib/jnpr/junos/utils/config.py index 32b99b6ad..8c0b8007d 100644 --- a/lib/jnpr/junos/utils/config.py +++ b/lib/jnpr/junos/utils/config.py @@ -260,6 +260,10 @@ def diff(self, rb_id=0, ignore_warning=False, use_fast_diff=False): else: raise + # Check return type is an etree Element, if not return None for no changes + if not type(rsp) == etree._Element: + return None + diff_txt = rsp.find("configuration-output").text return None if diff_txt == "\n" else diff_txt From 02cbd1b94d885875c6b6fe8062f3883b5f8f9b55 Mon Sep 17 00:00:00 2001 From: Stephen Steiner Date: Mon, 1 Feb 2021 08:16:28 -0500 Subject: [PATCH 02/14] adding openssl to windows agent Signed-off-by: Stephen Steiner --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 2efd182b7..9fc81fb02 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,7 @@ matrix: python: 3.7 before_install: - choco install python3 --version=3.7.4 + - choco install choco install openssl=1.1.1.900 - pip install ntc_templates==1.4.1 - pip install textfsm==0.4.1 env: From 7821b5c4c4163fd8bb6e62edb6e2c133725e632c Mon Sep 17 00:00:00 2001 From: Stephen Steiner Date: Mon, 1 Feb 2021 11:53:02 -0500 Subject: [PATCH 03/14] typo Signed-off-by: Stephen Steiner --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9fc81fb02..1dee9370e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ matrix: python: 3.7 before_install: - choco install python3 --version=3.7.4 - - choco install choco install openssl=1.1.1.900 + - choco install openssl=1.1.1.900 - pip install ntc_templates==1.4.1 - pip install textfsm==0.4.1 env: From a0e51964615c850a6b7b4f99335246d5222e0aa4 Mon Sep 17 00:00:00 2001 From: Stephen Steiner Date: Tue, 2 Feb 2021 08:31:07 -0500 Subject: [PATCH 04/14] typo in choco install...doh Signed-off-by: Stephen Steiner --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1dee9370e..c6ede7ee6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ matrix: python: 3.7 before_install: - choco install python3 --version=3.7.4 - - choco install openssl=1.1.1.900 + - choco install openssl --version=1.1.1.900 - pip install ntc_templates==1.4.1 - pip install textfsm==0.4.1 env: From 3c3375c5e92eb25a1b65baaa737a78919a8c2a0e Mon Sep 17 00:00:00 2001 From: Stephen Steiner Date: Fri, 5 Feb 2021 08:21:37 -0500 Subject: [PATCH 05/14] added manual links to lib path Signed-off-by: Stephen Steiner --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index c6ede7ee6..704bd0645 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,8 @@ matrix: env: - PATH=/c/Python37:/c/Python37/Scripts:$PATH - TRAVIS_PYTHON_VERSION=3.7 + - LIBPATH=/c/utils/OpenSSL-win64/lib + - INCLUDE=/c/utils/OpenSSL-win64/include addons: apt: packages: From 0851134b8280dfe8aaa2f7ad086e2269dd0cde53 Mon Sep 17 00:00:00 2001 From: Stephen Steiner Date: Mon, 8 Feb 2021 14:14:12 -0500 Subject: [PATCH 06/14] removing openssl and adding rust libs Signed-off-by: Stephen Steiner --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 704bd0645..9dde7afc1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ matrix: python: 3.7 before_install: - choco install python3 --version=3.7.4 - - choco install openssl --version=1.1.1.900 + - choco install rust --version=1.49.0 - pip install ntc_templates==1.4.1 - pip install textfsm==0.4.1 env: From 8861ee16e25c6bf1cf7085290e8d4f51ffbd2f80 Mon Sep 17 00:00:00 2001 From: Stephen Steiner Date: Mon, 8 Feb 2021 16:33:40 -0500 Subject: [PATCH 07/14] disable rust build Signed-off-by: Stephen Steiner --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9dde7afc1..42ff39940 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,14 +16,12 @@ matrix: python: 3.7 before_install: - choco install python3 --version=3.7.4 - - choco install rust --version=1.49.0 - pip install ntc_templates==1.4.1 - pip install textfsm==0.4.1 env: - PATH=/c/Python37:/c/Python37/Scripts:$PATH - TRAVIS_PYTHON_VERSION=3.7 - - LIBPATH=/c/utils/OpenSSL-win64/lib - - INCLUDE=/c/utils/OpenSSL-win64/include + - CRYPTOGRAPHY_DONT_BUILD_RUST=1 addons: apt: packages: From 868a2c9934ba3e56eb4a6536575189375b040e1b Mon Sep 17 00:00:00 2001 From: Stephen Steiner Date: Tue, 9 Feb 2021 08:03:01 -0500 Subject: [PATCH 08/14] need openssl after all Signed-off-by: Stephen Steiner --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 42ff39940..1d0c640bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,7 @@ matrix: python: 3.7 before_install: - choco install python3 --version=3.7.4 + - choco install openssl=1.1.1.900 - pip install ntc_templates==1.4.1 - pip install textfsm==0.4.1 env: From a312830678aff9638bc49ccabe84bf0d2a4f097a Mon Sep 17 00:00:00 2001 From: Stephen Steiner Date: Tue, 9 Feb 2021 08:39:36 -0500 Subject: [PATCH 09/14] need openssl after all Signed-off-by: Stephen Steiner --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1d0c640bf..2cad7e8a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ matrix: python: 3.7 before_install: - choco install python3 --version=3.7.4 - - choco install openssl=1.1.1.900 + - choco install openssl --version=1.1.1.900 - pip install ntc_templates==1.4.1 - pip install textfsm==0.4.1 env: From c4ba249ebcf73e49514e4ad4c6edf16e5438f65e Mon Sep 17 00:00:00 2001 From: Stephen Steiner Date: Tue, 9 Feb 2021 10:36:23 -0500 Subject: [PATCH 10/14] need openssl after all Signed-off-by: Stephen Steiner --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 2cad7e8a2..4cebf0934 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,8 @@ matrix: - PATH=/c/Python37:/c/Python37/Scripts:$PATH - TRAVIS_PYTHON_VERSION=3.7 - CRYPTOGRAPHY_DONT_BUILD_RUST=1 + - LIBPATH=/c/utils/OpenSSL-win64/lib + - INCLUDE=/c/utils/OpenSSL-win64/include addons: apt: packages: From bbf189d46bc90f78b7c4f795b64e5f1e0a128ae1 Mon Sep 17 00:00:00 2001 From: Stephen Steiner Date: Tue, 9 Feb 2021 15:27:32 -0500 Subject: [PATCH 11/14] need openssl after all Signed-off-by: Stephen Steiner --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4cebf0934..9192a8bd3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,8 +23,8 @@ matrix: - PATH=/c/Python37:/c/Python37/Scripts:$PATH - TRAVIS_PYTHON_VERSION=3.7 - CRYPTOGRAPHY_DONT_BUILD_RUST=1 - - LIBPATH=/c/utils/OpenSSL-win64/lib - - INCLUDE=/c/utils/OpenSSL-win64/include + - LIB=/c/utils/OpenSSL-win64/lib:/c/OpenSSL-win64/lib:$LIB + - INCLUDE=/c/utils/OpenSSL-win64/include:/c/OpenSSL-win64/include:$INCLUDE addons: apt: packages: From 087812342ddb6759a28e5756169f616533974a4a Mon Sep 17 00:00:00 2001 From: Stephen Steiner Date: Wed, 10 Feb 2021 08:26:51 -0500 Subject: [PATCH 12/14] debug windows env vars Signed-off-by: Stephen Steiner --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 9192a8bd3..5ac4a91e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,7 @@ matrix: - choco install openssl --version=1.1.1.900 - pip install ntc_templates==1.4.1 - pip install textfsm==0.4.1 + - set env: - PATH=/c/Python37:/c/Python37/Scripts:$PATH - TRAVIS_PYTHON_VERSION=3.7 From 103a98f6cd814854f3c70541755446c441197b69 Mon Sep 17 00:00:00 2001 From: Stephen Steiner Date: Wed, 10 Feb 2021 12:24:18 -0500 Subject: [PATCH 13/14] debug in wrong section Signed-off-by: Stephen Steiner --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5ac4a91e7..536163ecd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,6 @@ matrix: - choco install openssl --version=1.1.1.900 - pip install ntc_templates==1.4.1 - pip install textfsm==0.4.1 - - set env: - PATH=/c/Python37:/c/Python37/Scripts:$PATH - TRAVIS_PYTHON_VERSION=3.7 @@ -34,6 +33,7 @@ addons: - libxslt1-dev install: + - "set" - "pip install -r development.txt" - "pip install -r requirements.txt" - "pip install ." From 0aea414a2ee36a2826321aab620558edeebeccb2 Mon Sep 17 00:00:00 2001 From: Stephen Steiner Date: Wed, 10 Feb 2021 15:09:14 -0500 Subject: [PATCH 14/14] debug in wrong section Signed-off-by: Stephen Steiner --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 536163ecd..e4d217379 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,8 +23,8 @@ matrix: - PATH=/c/Python37:/c/Python37/Scripts:$PATH - TRAVIS_PYTHON_VERSION=3.7 - CRYPTOGRAPHY_DONT_BUILD_RUST=1 - - LIB=/c/utils/OpenSSL-win64/lib:/c/OpenSSL-win64/lib:$LIB - - INCLUDE=/c/utils/OpenSSL-win64/include:/c/OpenSSL-win64/include:$INCLUDE + - INCLUDE='C:\OpenSSL-Win32\include' + - LIB='C:\OpenSSL-Win32\lib' addons: apt: packages: