Merge pull request #25 from openvstorage/develop

Develop

Author: JeffreyDevloo

.gitignore

@@ -10,3 +10,4 @@
 syntax: regexp
 \._.*
 .orig$
+*.iml

helpers/api.py

@@ -21,11 +21,14 @@
 import time
 import urllib
 import hashlib
+import logging
 import requests
 from requests.packages.urllib3 import disable_warnings
 from requests.packages.urllib3.exceptions import InsecurePlatformWarning
 from requests.packages.urllib3.exceptions import InsecureRequestWarning
 from requests.packages.urllib3.exceptions import SNIMissingWarning
+from ovs.log.log_handler import LogHandler
+logging.getLogger('urllib3').setLevel(logging.WARNING)
 
 
 class HttpException(RuntimeError):
@@ -53,10 +56,19 @@ def __init__(self, *args, **kwargs):
         super(NotFoundException, self).__init__(404, *args, **kwargs)
 
 
+class TimeOutError(RuntimeError):
+    """
+    Custom tineout class
+    """
+    def __init__(self, status_code, *args, **kwargs):
+        super(TimeOutError, self).__init__(*args, **kwargs)
+
+
 class OVSClient(object):
     """
     Represents the OVS client
     """
+    _logger = LogHandler.get('helpers', name='api')
 
     disable_warnings(InsecurePlatformWarning)
     disable_warnings(InsecureRequestWarning)
@@ -249,15 +261,21 @@ def wait_for_task(self, task_id, timeout=None):
         """
         start = time.time()
         finished = False
+        previous_metadata = None
         while finished is False:
             if timeout is not None and timeout < (time.time() - start):
-                raise RuntimeError('Waiting for task {0} has timed out.'.format(task_id))
+                raise TimeOutError('Waiting for task {0} has timed out.'.format(task_id))
             task_metadata = self.get('/tasks/{0}/'.format(task_id))
             finished = task_metadata['status'] in ('FAILURE', 'SUCCESS')
             if finished is False:
-                # print task_metadata
+                if task_metadata != previous_metadata:
+                    OVSClient._logger.debug('Waiting for task {0}, got: {1}'.format(task_id, task_metadata))
+                    previous_metadata = task_metadata
+                else:
+                    OVSClient._logger.debug('Still waiting for task {0}...'.format(task_id))
                 time.sleep(1)
             else:
+                OVSClient._logger.debug('Task {0} finished, got: {1}'.format(task_id, task_metadata))
                 return task_metadata['successful'], task_metadata['result']
 
     @staticmethod

helpers/disk.py

@@ -96,5 +96,4 @@ def get_roles_from_disk(storagerouter_ip, disk_name):
                     roles_on_disk.append(role)
             return roles_on_disk
         else:
-            raise RuntimeError("Disk with name `{0}` not found on storagerouter `{1}`".format(disk_name,
-                                                                                              storagerouter_ip))
+            raise RuntimeError("Disk with name `{0}` not found on storagerouter `{1}`".format(disk_name, storagerouter_ip))

helpers/domain.py

@@ -114,6 +114,5 @@ def get_storagedrivers_in_same_domain(domain_guid):
         :rtype: list
         """
 
-        return [storagedriver for storagedriver in StorageDriverList.get_storagedrivers()
-                if domain_guid in storagedriver.storagerouter.regular_domains]
+        return [storagedriver for storagedriver in StorageDriverList.get_storagedrivers() if domain_guid in storagedriver.storagerouter.regular_domains]
 

helpers/hypervisor/apis/kvm/sdk.py

@@ -805,7 +805,8 @@ def revert_to_snapshot(self, vmid, snapshot_name, flags=0):
         """
         if not isinstance(vmid, libvirt.virDomain):
             vmid = self.get_vm_object(vmid)
-        vmid.revertToSnapshot(snapshot_name, flags)
+        snapshot = vmid.snapshotLookupByName(snapshot_name)
+        vmid.revertToSnapshot(snapshot, flags)
 
     @staticmethod
     def shell_safe(argument):

helpers/init_manager.py

@@ -20,7 +20,6 @@
 from ..helpers.exceptions import UnsupportedInitManager
 
 
-
 class InitManagerSupported(object):
 
     INIT = "init"

helpers/network.py

@@ -14,12 +14,16 @@
 # Open vStorage is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY of any kind.
 import re
+import socket
+from ovs.extensions.generic.remote import remote
+from ovs.log.log_handler import LogHandler
 
 
 class NetworkHelper(object):
     """
     NetworkHelper class
     """
+    LOGGER = LogHandler.get(source="helpers", name="ci_network_helper")
 
     def __init__(self):
         pass
@@ -29,3 +33,27 @@ def validate_ip(ip):
         pattern = re.compile(r"^(?<!\S)((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\b|\.\b){7}(?!\S)$")
         if not pattern.match(ip):
             raise ValueError('Not a valid IP address')
+
+    @staticmethod
+    def get_free_port(listener_ip, logger=LOGGER):
+        """
+        Returns a free port
+        :param listener_ip: ip to listen on
+        :type listener_ip: str
+        :param logger: logging instance
+        :type logger: ovs.log.log_handler.LogHandler
+        :return: port number
+        :rtype: int
+        """
+        with remote(listener_ip, [socket]) as rem:
+            listening_socket = rem.socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+            try:
+                # Bind to first available port
+                listening_socket.bind(('', 0))
+                port = listening_socket.getsockname()[1]
+                return port
+            except socket.error as ex:
+                logger.error('Could not bind the socket. Got {0}'.format(str(ex)))
+                raise
+            finally:
+                listening_socket.close()

helpers/thread.py

@@ -23,7 +23,7 @@ class ThreadHelper(object):
     LOGGER = LogHandler.get(source='helpers', name='ci.threading')
 
     @staticmethod
-    def start_thread_with_event(target, name, args=(), kwargs={}):
+    def start_thread_with_event(target, name, args=(), kwargs=None):
         """
         Starts a thread and an event to it
         :param target: target - usually a method
@@ -35,6 +35,8 @@ def start_thread_with_event(target, name, args=(), kwargs={}):
         :return: a tuple with the thread and event
         :rtype: tuple(threading.Thread, threading.Event)
         """
+        if kwargs is None:
+            kwargs = {}
         ThreadHelper.LOGGER.info('Starting thread with target {0}'.format(target))
         event = threading.Event()
         args = args + (event,)
@@ -44,13 +46,30 @@ def start_thread_with_event(target, name, args=(), kwargs={}):
         return thread, event
 
     @staticmethod
-    def start_thread(target, name, args=(), kwargs={}):
+    def start_thread(target, name, args=(), kwargs=None):
+        if kwargs is None:
+            kwargs = {}
         ThreadHelper.LOGGER.info('Starting thread with target {0}'.format(target))
         thread = threading.Thread(target=target, args=tuple(args), kwargs=kwargs)
         thread.setName(str(name))
         thread.start()
         return thread
 
+    @staticmethod
+    def stop_evented_threads(thread_pairs, r_semaphore=None, logger=LOGGER):
+        for thread_pair in thread_pairs:
+            if thread_pair[0].isAlive():
+                thread_pair[1].set()
+            # Wait again to sync
+            logger.info('Syncing threads')
+        if r_semaphore is not None:
+            while r_semaphore.get_counter() < len(thread_pairs):  # Wait for the number of threads we currently have.
+                time.sleep(0.05)
+            r_semaphore.wait()  # Unlock them to let them stop (the object is set -> wont loop)
+        # Wait for threads to die
+        for thread_pair in thread_pairs:
+            thread_pair[0].join()
+
 
 # @todo import from -> from ovs.extensions.generic.threadhelpers import Waiter instead of this when PR (https://github.com/openvstorage/framework/pull/1467) is in Fargo n unstable
 class Waiter(object):

packaging/debian/debian/control

@@ -8,5 +8,5 @@ Build-Depends: python-all (>= 2.7.2), debhelper (>= 9)
 Package: openvstorage-automation-lib
 Architecture: amd64
 Pre-Depends: python (>= 2.7.2)
-Depends: python-libvirt (>= 1.3.1-0), virtinst (>= 1:1.3.2), openvstorage (>= 2.8), openvstorage (<< 2.9)
+Depends: python-libvirt (>= 1.3.1-0), virtinst (>= 1:1.3.2), openvstorage (>= 2.8), openvstorage (<< 2.10)
 Description: Automation library for OpenvStorage. Contains API wrapper.

packaging/settings.json

@@ -5,6 +5,6 @@
     "source_contents": "--transform 's,^,{0}-{1}/,' helpers remove setup validate __init__.py *.txt",
     "version": {
         "major": 0,
-        "minor": 1
+        "minor": 2
     }
 }