UDS 3.4 now uses volumev3 for non legacy openstack connections (legacy maintains v2)

actor/src/actor_client.py

@@ -67,7 +67,7 @@ if __name__ == "__main__":
     # Note: Signals are only checked on python code execution, so we create a timer to force call back to python
     timer = QTimer(qApp)
     timer.start(1000)
-    timer.timeout.connect(lambda *a: None)  # type: ignore  # timeout can be connected to a callable
+    timer.timeout.connect(lambda *a: None)  # timeout can be connected to a callable
 
     qApp.exec_()
 

client-py3/full/src/uds/forward.py

@@ -25,7 +25,11 @@ class CheckfingerPrints(paramiko.MissingHostKeyPolicy):
         if self.fingerPrints:
             remotefingerPrints = hexlify(key.get_fingerprint()).decode().lower()
             if remotefingerPrints not in self.fingerPrints.split(','):
-                logger.error("Server {!r} has invalid fingerPrints. ({} vs {})".format(hostname, remotefingerPrints, self.fingerPrints))
+                logger.error(
+                    "Server {!r} has invalid fingerPrints. ({} vs {})".format(
+                        hostname, remotefingerPrints, self.fingerPrints
+                    )
+                )
                 raise paramiko.SSHException(
                     "Server {!r} has invalid fingerPrints".format(hostname)
                 )
@@ -47,21 +51,39 @@ class Handler(socketserver.BaseRequestHandler):
         self.thread.currentConnections += 1
 
         try:
-            chan = self.ssh_transport.open_channel('direct-tcpip',
+            chan = self.ssh_transport.open_channel(
+                'direct-tcpip',
                 (self.chain_host, self.chain_port),
-                                                   self.request.getpeername())
+                self.request.getpeername(),
+            )
         except Exception as e:
-            logger.exception('Incoming request to %s:%d failed: %s', self.chain_host, self.chain_port, repr(e))
+            logger.exception(
+                'Incoming request to %s:%d failed: %s',
+                self.chain_host,
+                self.chain_port,
+                repr(e),
+            )
             return
         if chan is None:
-            logger.error('Incoming request to %s:%d was rejected by the SSH server.', self.chain_host, self.chain_port)
+            logger.error(
+                'Incoming request to %s:%d was rejected by the SSH server.',
+                self.chain_host,
+                self.chain_port,
+            )
             return
 
-        logger.debug('Connected!  Tunnel open %r -> %r -> %r', self.request.getpeername(), chan.getpeername(), (self.chain_host, self.chain_port))
+        logger.debug(
+            'Connected!  Tunnel open %r -> %r -> %r',
+            self.request.getpeername(),
+            chan.getpeername(),
+            (self.chain_host, self.chain_port),
+        )
         # self.ssh_transport.set_keepalive(10)  # Keep alive every 10 seconds...
         try:
             while self.event.is_set() is False:
-                r, _w, _x = select.select([self.request, chan], [], [], 1)  # pylint: disable=unused-variable
+                r, _w, _x = select.select(
+                    [self.request, chan], [], [], 1
+                )  # pylint: disable=unused-variable
 
                 if self.request in r:
                     data = self.request.recv(1024)
@@ -80,7 +102,10 @@ class Handler(socketserver.BaseRequestHandler):
             peername = self.request.getpeername()
             chan.close()
             self.request.close()
-            logger.debug('Tunnel closed from %r', peername,)
+            logger.debug(
+                'Tunnel closed from %r',
+                peername,
+            )
         except Exception:
             pass
 
@@ -95,7 +120,18 @@ class ForwardThread(threading.Thread):
     client: typing.Optional[paramiko.SSHClient]
     fs: typing.Optional[ForwardServer]
 
-    def __init__(self, server, port, username, password, localPort, redirectHost, redirectPort, waitTime, fingerPrints):
+    def __init__(
+        self,
+        server,
+        port,
+        username,
+        password,
+        localPort,
+        redirectHost,
+        redirectPort,
+        waitTime,
+        fingerPrints,
+    ):
         threading.Thread.__init__(self)
         self.client = None
         self.fs = None
@@ -124,7 +160,17 @@ class ForwardThread(threading.Thread):
         if localPort is None:
             localPort = random.randrange(33000, 53000)
 
-        ft = ForwardThread(self.server, self.port, self.username, self.password, localPort, redirectHost, redirectPort, self.waitTime, self.fingerPrints)
+        ft = ForwardThread(
+            self.server,
+            self.port,
+            self.username,
+            self.password,
+            localPort,
+            redirectHost,
+            redirectPort,
+            self.waitTime,
+            self.fingerPrints,
+        )
         ft.client = self.client
         self.client.useCount += 1  # type: ignore
         ft.start()
@@ -134,7 +180,6 @@ class ForwardThread(threading.Thread):
 
         return (ft, localPort)
 
-
     def _timerFnc(self):
         self.timer = None
         logger.debug('Timer fnc: %s', self.currentConnections)
@@ -148,12 +193,21 @@ class ForwardThread(threading.Thread):
                 self.client = paramiko.SSHClient()
                 self.client.useCount = 1  # type: ignore
                 self.client.load_system_host_keys()
-                self.client.set_missing_host_key_policy(CheckfingerPrints(self.fingerPrints))
+                self.client.set_missing_host_key_policy(
+                    CheckfingerPrints(self.fingerPrints)
+                )
 
                 logger.debug('Connecting to ssh host %s:%d ...', self.server, self.port)
 
                 # To disable ssh-ageng asking for passwords: allow_agent=False
-                self.client.connect(self.server, self.port, username=self.username, password=self.password, timeout=5, allow_agent=False)
+                self.client.connect(
+                    self.server,
+                    self.port,
+                    username=self.username,
+                    password=self.password,
+                    timeout=5,
+                    allow_agent=False,
+                )
             except Exception:
                 logger.exception('Exception connecting: ')
                 self.status = 2  # Error
@@ -194,7 +248,17 @@ class ForwardThread(threading.Thread):
             logger.exception('Exception stopping')
 
 
-def forward(server, port, username, password, redirectHost, redirectPort, localPort=None, waitTime=10, fingerPrints=None):
+def forward(
+    server,
+    port,
+    username,
+    password,
+    redirectHost,
+    redirectPort,
+    localPort=None,
+    waitTime=10,
+    fingerPrints=None,
+):
     '''
     Instantiates an ssh connection to server:port
     Returns the Thread created and the local redirected port as a list: (thread, port)
@@ -204,10 +268,28 @@ def forward(server, port, username, password, redirectHost, redirectPort, localP
     if localPort is None:
         localPort = random.randrange(40000, 50000)
 
-    logger.debug('Connecting to %s:%s using %s/%s redirecting to %s:%s, listening on 127.0.0.1:%s',
+    logger.debug(
-                 server, port, username, password, redirectHost, redirectPort, localPort)
+        'Connecting to %s:%s using %s/%s redirecting to %s:%s, listening on 127.0.0.1:%s',
+        server,
+        port,
+        username,
+        password,
+        redirectHost,
+        redirectPort,
+        localPort,
+    )
 
-    ft = ForwardThread(server, port, username, password, localPort, redirectHost, redirectPort, waitTime, fingerPrints)
+    ft = ForwardThread(
+        server,
+        port,
+        username,
+        password,
+        localPort,
+        redirectHost,
+        redirectPort,
+        waitTime,
+        fingerPrints,
+    )
 
     ft.start()
 

client-py3/full/src/uds/log.py

@@ -29,8 +29,6 @@
 '''
 @author: Adolfo Gómez, dkmaster at dkmon dot com
 '''
-from __future__ import unicode_literals
-
 import logging
 import os
 import os.path
@@ -57,7 +55,7 @@ try:
         filename=logFile,
         filemode='a',
         format='%(levelname)s %(asctime)s %(message)s',
-        level=LOGLEVEL
+        level=LOGLEVEL,
     )
 except Exception:
     logging.basicConfig(format='%(levelname)s %(asctime)s %(message)s', level=LOGLEVEL)

client-py3/full/src/uds/os_detector.py

@@ -30,14 +30,13 @@
 '''
 @author: Adolfo Gómez, dkmaster at dkmon dot com
 '''
-from __future__ import unicode_literals
-
 import sys
 
 LINUX = 'Linux'
 WINDOWS = 'Windows'
 MAC_OS_X = 'Mac os x'
 
+
 def getOs():
     if sys.platform.startswith('linux'):
         return LINUX

client-py3/full/src/uds/rest.py

@@ -29,8 +29,6 @@
 '''
 @author: Adolfo Gómez, dkmaster at dkmon dot com
 '''
-# pylint: disable=c-extension-no-member,no-name-in-module
-
 import json
 import bz2
 import base64
@@ -63,9 +61,11 @@ CertCallbackType = typing.Callable[[str, str], bool]
 class UDSException(Exception):
     pass
 
+
 class RetryException(UDSException):
     pass
 
+
 class InvalidVersion(UDSException):
     downloadUrl: str
 
@@ -73,6 +73,7 @@ class InvalidVersion(UDSException):
         super().__init__(downloadUrl)
         self.downloadUrl = downloadUrl
 
+
 class RestApi:
 
     _restApiUrl: str  # base Rest API URL
@@ -90,14 +91,18 @@ class RestApi:
         self._callbackInvalidCert = callbackInvalidCert
         self._serverVersion = ''
 
-    def get(self, url: str, params: typing.Optional[typing.Mapping[str, str]] = None) -> typing.Any:
+    def get(
+        self, url: str, params: typing.Optional[typing.Mapping[str, str]] = None
+    ) -> typing.Any:
         if params:
             url += '?' + '&'.join(
                 '{}={}'.format(k, urllib.parse.quote(str(v).encode('utf8')))
                 for k, v in params.items()
             )
 
-        return json.loads(RestApi.getUrl(self._restApiUrl + url, self._callbackInvalidCert))
+        return json.loads(
+            RestApi.getUrl(self._restApiUrl + url, self._callbackInvalidCert)
+        )
 
     def processError(self, data: typing.Any) -> None:
         if 'error' in data:
@@ -106,7 +111,6 @@ class RestApi:
 
             raise UDSException(data['error'])
 
-
     def getVersion(self) -> str:
         '''Gets and stores the serverVersion.
         Also checks that the version is valid for us. If not,
@@ -127,7 +131,9 @@ class RestApi:
         except Exception as e:
             raise UDSException(e)
 
-    def getScriptAndParams(self, ticket: str, scrambler: str) -> typing.Tuple[str, typing.Any]:
+    def getScriptAndParams(
+        self, ticket: str, scrambler: str
+    ) -> typing.Tuple[str, typing.Any]:
         '''Gets the transport script, validates it if necesary
         and returns it'''
         try:
@@ -173,7 +179,6 @@ class RestApi:
 
         # exec(script.decode("utf-8"), globals(), {'parent': self, 'sp': params})
 
-
     @staticmethod
     def _open(
         url: str, certErrorCallback: typing.Optional[CertCallbackType] = None
@@ -193,7 +198,8 @@ class RestApi:
         if url.startswith('https'):
             port = port or '443'
             with ctx.wrap_socket(
-                socket.socket(socket.AF_INET, socket.SOCK_STREAM), server_hostname=hostname
+                socket.socket(socket.AF_INET, socket.SOCK_STREAM),
+                server_hostname=hostname,
             ) as s:
                 s.connect((hostname, int(port)))
                 # Get binary certificate
@@ -211,9 +217,12 @@ class RestApi:
 
         def urlopen(url: str):
             # Generate the request with the headers
-            req = urllib.request.Request(url, headers={
+            req = urllib.request.Request(
+                url,
+                headers={
                     'User-Agent': os_detector.getOs() + " - UDS Connector " + VERSION
-            })
+                },
+            )
             return urllib.request.urlopen(req, context=ctx)
 
         try:

client-py3/full/src/uds/tools.py

@@ -163,7 +163,9 @@ def unlinkFiles(early: bool = False) -> None:
 
 def addTaskToWait(task: typing.Any, includeSubprocess: bool = False) -> None:
     logger.debug(
-        'Added task %s to wait %s', task, 'with subprocesses' if includeSubprocess else ''
+        'Added task %s to wait %s',
+        task,
+        'with subprocesses' if includeSubprocess else '',
     )
     _tasksToWait.append((task, includeSubprocess))
 
@@ -178,12 +180,22 @@ def waitForTasks() -> None:
             elif hasattr(task, 'wait'):
                 task.wait()
             # If wait for spanwed process (look for process with task pid) and we can look for them...
-            logger.debug('Psutil: %s, waitForSubp: %s, hasattr: %s', psutil, waitForSubp, hasattr(task, 'pid'))
+            logger.debug(
+                'Psutil: %s, waitForSubp: %s, hasattr: %s',
+                psutil,
+                waitForSubp,
+                hasattr(task, 'pid'),
+            )
             if psutil and waitForSubp and hasattr(task, 'pid'):
-                subProcesses = list(filter(
+                subProcesses = list(
-                    lambda x: x.ppid() == task.pid, psutil.process_iter(attrs=('ppid',))
+                    filter(
-                ))
+                        lambda x: x.ppid() == task.pid,  # type: ignore
-                logger.debug('Waiting for subprocesses... %s, %s', task.pid, subProcesses)
+                        psutil.process_iter(attrs=('ppid',)),
+                    )
+                )
+                logger.debug(
+                    'Waiting for subprocesses... %s, %s', task.pid, subProcesses
+                )
                 for i in subProcesses:
                     logger.debug('Found %s', i)
                     i.wait()
@@ -229,6 +241,7 @@ def verifySignature(script: bytes, signature: bytes) -> bool:
     # If no exception, the script was fine...
     return True
 
+
 def getCaCertsFile() -> str:
     try:
         if os.path.exists(certifi.where()):

server/src/uds/services/OpenStack/openstack/openstack_client.py

@@ -145,6 +145,7 @@ class Client:  # pylint: disable=too-many-public-methods
     _tokenId: typing.Optional[str]
     _catalog: typing.Optional[typing.List[typing.Dict[str, typing.Any]]]
     _isLegacy: bool
+    _volume: str
     _access: typing.Optional[str]
     _domain: str
     _username: str
@@ -188,6 +189,7 @@ class Client:  # pylint: disable=too-many-public-methods
         self._project = None
         self._region = region
         self._timeout = 10
+        self._volume = 'volumev2' if self._isLegacy else 'volumev3'
 
         if legacyVersion:
             self._authUrl = 'http{}://{}:{}/'.format('s' if useSSL else '', host, port)
@@ -271,6 +273,7 @@ class Client:  # pylint: disable=too-many-public-methods
         if self._projectId is not None:
             self._catalog = token['catalog']
                 
+
     def ensureAuthenticated(self) -> None:
         if (
             self._authenticated is False
@@ -331,7 +334,7 @@ class Client:  # pylint: disable=too-many-public-methods
     @authProjectRequired
     def listVolumeTypes(self) -> typing.Iterable[typing.Any]:
         return getRecurringUrlJson(
-            self._getEndpointFor('volumev2') + '/types',
+            self._getEndpointFor(self._volume) + '/types',
             self._session,
             headers=self._requestHeaders(),
             key='volume_types',
@@ -341,9 +344,8 @@ class Client:  # pylint: disable=too-many-public-methods
 
     @authProjectRequired
     def listVolumes(self) -> typing.Iterable[typing.Any]:
-        # self._getEndpointFor('volumev2') + '/volumes'
         return getRecurringUrlJson(
-            self._getEndpointFor('volumev2') + '/volumes/detail',
+            self._getEndpointFor(self._volume) + '/volumes/detail',
             self._session,
             headers=self._requestHeaders(),
             key='volumes',
@@ -356,7 +358,7 @@ class Client:  # pylint: disable=too-many-public-methods
         self, volumeId: typing.Optional[typing.Dict[str, typing.Any]] = None
     ) -> typing.Iterable[typing.Any]:
         for s in getRecurringUrlJson(
-            self._getEndpointFor('volumev2') + '/snapshots',
+            self._getEndpointFor(self._volume) + '/snapshots',
             self._session,
             headers=self._requestHeaders(),
             key='snapshots',
@@ -474,7 +476,7 @@ class Client:  # pylint: disable=too-many-public-methods
     @authProjectRequired
     def getVolume(self, volumeId: str) -> typing.Dict[str, typing.Any]:
         r = self._session.get(
-            self._getEndpointFor('volumev2')
+            self._getEndpointFor(self._volume)
             + '/volumes/{volume_id}'.format(volume_id=volumeId),
             headers=self._requestHeaders(),
             verify=VERIFY_SSL,
@@ -492,7 +494,7 @@ class Client:  # pylint: disable=too-many-public-methods
             creating, available, deleting, error,  error_deleting
         """
         r = self._session.get(
-            self._getEndpointFor('volumev2')
+            self._getEndpointFor(self._volume)
             + '/snapshots/{snapshot_id}'.format(snapshot_id=snapshotId),
             headers=self._requestHeaders(),
             verify=VERIFY_SSL,
@@ -518,7 +520,7 @@ class Client:  # pylint: disable=too-many-public-methods
             data['snapshot']['description'] = description
 
         r = self._session.put(
-            self._getEndpointFor('volumev2')
+            self._getEndpointFor(self._volume)
             + '/snapshots/{snapshot_id}'.format(snapshot_id=snapshotId),
             data=json.dumps(data),
             headers=self._requestHeaders(),
@@ -547,7 +549,7 @@ class Client:  # pylint: disable=too-many-public-methods
         # First, ensure volume is in state "available"
 
         r = self._session.post(
-            self._getEndpointFor('volumev2') + '/snapshots',
+            self._getEndpointFor(self._volume) + '/snapshots',
             data=json.dumps(data),
             headers=self._requestHeaders(),
             verify=VERIFY_SSL,
@@ -575,7 +577,7 @@ class Client:  # pylint: disable=too-many-public-methods
         }
 
         r = self._session.post(
-            self._getEndpointFor('volumev2') + '/volumes',
+            self._getEndpointFor(self._volume) + '/volumes',
             data=json.dumps(data),
             headers=self._requestHeaders(),
             verify=VERIFY_SSL,
@@ -662,7 +664,7 @@ class Client:  # pylint: disable=too-many-public-methods
     @authProjectRequired
     def deleteSnapshot(self, snapshotId: str) -> None:
         r = self._session.delete(
-            self._getEndpointFor('volumev2')
+            self._getEndpointFor(self._volume)
             + '/snapshots/{snapshot_id}'.format(snapshot_id=snapshotId),
             headers=self._requestHeaders(),
             verify=VERIFY_SSL,