From: beierlm <mark.beierl@canonical.com>
Date: Mon, 30 May 2022 17:43:47 +0000 (+0200)
Subject: Revert "Update paramiko version to 2.11.0"
X-Git-Tag: v10.1.1rc2
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=9ac6ea33d4c482fc0a9042331f9a88116b85ef17;p=osm%2FRO.git

Revert "Update paramiko version to 2.11.0"

This reverts commit cb45c373633f15fb73e3371c2c6f7d04bec64c3f.

Reason for revert: Hold off until 10.1.0 is released

Change-Id: Id8608b9492e2236255a6efbf0f8faa53567582ff
Signed-off-by: aticig <gulsum.atici@canonical.com>
Signed-off-by: beierlm <mark.beierl@canonical.com>
---

diff --git a/RO-plugin/osm_ro_plugin/vimconn.py b/RO-plugin/osm_ro_plugin/vimconn.py
index 3e6d29cd..312c307a 100644
--- a/RO-plugin/osm_ro_plugin/vimconn.py
+++ b/RO-plugin/osm_ro_plugin/vimconn.py
@@ -757,12 +757,6 @@ 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:
@@ -772,14 +766,8 @@ class VimConnector:
                     pkey = None
 
                 client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
-
                 client.connect(
-                    ip_addr,
-                    username=user,
-                    password=password,
-                    pkey=pkey,
-                    timeout=30,
-                    auth_timeout=60,
+                    ip_addr, username=user, password=password, pkey=pkey, timeout=30
                 )
 
                 for command in commands:
diff --git a/releasenotes/notes/update_paramiko-53f3302ea926bd0a.yaml b/releasenotes/notes/update_paramiko-53f3302ea926bd0a.yaml
deleted file mode 100644
index 4fbe1b0a..00000000
--- a/releasenotes/notes/update_paramiko-53f3302ea926bd0a.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-#######################################################################################
-# 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 cdc43f72..2d6abdf6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -265,7 +265,7 @@ oslo.utils==4.12.0
     #   python-openstackclient
 packaging==21.3
     # via oslo.utils
-paramiko==2.11.0
+paramiko==2.9.2
     # via
     #   -r RO-SDN-dpb/requirements.in
     #   -r RO-VIM-gcp/requirements.in