From: aticig <gulsum.atici@canonical.com>
Date: Fri, 27 May 2022 07:21:51 +0000 (+0300)
Subject: Update paramiko version to 2.11.0
X-Git-Tag: v11.0.3~1
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F33%2F12133%2F4;p=osm%2FRO.git

Update paramiko version to 2.11.0

Update paramiko version and increase auth_timeout and log paramiko operations
in order to fix Authentication Failed error during ssh key injection

Change-Id: Ic5e5acc7f58e6c21210dd9b5011e955c07351d2f
Signed-off-by: aticig <gulsum.atici@canonical.com>
---

diff --git a/RO-plugin/osm_ro_plugin/vimconn.py b/RO-plugin/osm_ro_plugin/vimconn.py
index 312c307a..3e6d29cd 100644
--- a/RO-plugin/osm_ro_plugin/vimconn.py
+++ b/RO-plugin/osm_ro_plugin/vimconn.py
@@ -757,6 +757,12 @@ class VimConnector:
                 "chmod 644 ~/.ssh/authorized_keys",
                 "chmod 700 ~/.ssh/",
             }
+
+            logging.basicConfig(
+                format="%(asctime)s %(levelname)s %(name)s %(filename)s:%(lineno)s %(message)s"
+            )
+            logging.getLogger("paramiko").setLevel(logging.DEBUG)
+
             client = paramiko.SSHClient()
 
             try:
@@ -766,8 +772,14 @@ class VimConnector:
                     pkey = None
 
                 client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
+
                 client.connect(
-                    ip_addr, username=user, password=password, pkey=pkey, timeout=30
+                    ip_addr,
+                    username=user,
+                    password=password,
+                    pkey=pkey,
+                    timeout=30,
+                    auth_timeout=60,
                 )
 
                 for command in commands:
diff --git a/releasenotes/notes/update_paramiko-53f3302ea926bd0a.yaml b/releasenotes/notes/update_paramiko-53f3302ea926bd0a.yaml
new file mode 100644
index 00000000..4fbe1b0a
--- /dev/null
+++ b/releasenotes/notes/update_paramiko-53f3302ea926bd0a.yaml
@@ -0,0 +1,21 @@
+#######################################################################################
+# Copyright ETSI Contributors and Others.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#######################################################################################
+---
+other:
+  - |
+    Update paramiko version and increase auth_timeout to fix "AuthenticationException"
+    error during ssh key injection
diff --git a/requirements.txt b/requirements.txt
index dd6155e0..39e2676c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -265,7 +265,7 @@ oslo.utils==4.12.2
     #   python-openstackclient
 packaging==21.3
     # via oslo.utils
-paramiko==2.10.3
+paramiko==2.11.0
     # via
     #   -r RO-SDN-dpb/requirements.in
     #   -r RO-VIM-gcp/requirements.in