X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FN2VC.git;a=blobdiff_plain;f=n2vc%2Fk8s_helm_conn.py;h=9ce992f9163f1dca0f9134e62fb7422e7651a835;hp=aca528e2385694dff7c293471093c6dbbede2e8e;hb=1ac78b3b0c1440f4c69834387c7ceafdff27ac28;hpb=847f3c055188614da2cd7ea8028db8ab025eb1d8 diff --git a/n2vc/k8s_helm_conn.py b/n2vc/k8s_helm_conn.py index aca528e..9ce992f 100644 --- a/n2vc/k8s_helm_conn.py +++ b/n2vc/k8s_helm_conn.py @@ -20,7 +20,6 @@ # contact with: nfvlabs@tid.es ## -import paramiko import subprocess import os import shutil @@ -1122,6 +1121,8 @@ class K8sHelmConnector(K8sConnector): return output, return_code + except asyncio.CancelledError: + raise except K8sException: raise except Exception as e: @@ -1132,34 +1133,6 @@ class K8sHelmConnector(K8sConnector): else: return '', -1 - def _remote_exec( - self, - hostname: str, - username: str, - password: str, - command: str, - timeout: int = 10 - ) -> (str, int): - - command = K8sHelmConnector._remove_multiple_spaces(command) - self.debug('Executing sync remote ssh command: {}'.format(command)) - - ssh = paramiko.SSHClient() - ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy()) - ssh.connect(hostname=hostname, username=username, password=password) - ssh_stdin, ssh_stdout, ssh_stderr = ssh.exec_command(command=command, timeout=timeout) - output = ssh_stdout.read().decode('utf-8') - error = ssh_stderr.read().decode('utf-8') - if error: - self.error('ERROR: {}'.format(error)) - return_code = 1 - else: - return_code = 0 - output = output.replace('\\n', '\n') - self.debug('OUTPUT: {}'.format(output)) - - return output, return_code - def _check_file_exists(self, filename: str, exception_if_not_exists: bool = False): self.debug('Checking if file {} exists...'.format(filename)) if os.path.exists(filename):