testcloud 0.11.0__tar.gz → 0.11.2__tar.gz

{testcloud-0.11.0/testcloud.egg-info → testcloud-0.11.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: testcloud
-Version: 0.11.0
+Version: 0.11.2
 Summary: A tool to download and boot cloud images locally, with an easy to use API.
 Home-page: https://pagure.io/testcloud
 Author: Mike Ruckman

{testcloud-0.11.0 → testcloud-0.11.2}/docs/source/conf.py

@@ -55,7 +55,7 @@ copyright = "2016-2024, testCloud devs"
 # built documents.
 #
 # The short X.Y version.
-version = "0.11.0"
+version = "0.11.2"
 # The full version, including alpha/beta/rc tags.
 release = version
 

{testcloud-0.11.0 → testcloud-0.11.2}/test/test_config.py

@@ -66,7 +66,7 @@ class TestConfig(object):
         test_config = config.ConfigData()
         assert test_config.DATA_DIR != REF_DATA_DIR
 
-        test_config.merge_object(test_config_obj)
+        test_config._merge_object(test_config_obj)
         assert test_config.DATA_DIR == REF_DATA_DIR
 
     def test_load_merge_config_file(self, tmpdir, monkeypatch):

{testcloud-0.11.0 → testcloud-0.11.2}/testcloud/__init__.py

@@ -1,5 +1,5 @@
 # NOTE: if you update version, *make sure* to also update `docs/source/conf.py`
-__version__ = "0.11.0"
+__version__ = "0.11.2"
 
 import signal
 import sys

{testcloud-0.11.0 → testcloud-0.11.2}/testcloud/config.py

@@ -45,7 +45,7 @@ def _parse_config():
 
     if config_filename is not None:
         loaded_config = _load_config(config_filename)
-        config.merge_object(loaded_config)
+        config._merge_object(loaded_config)
 
     return config
 
@@ -98,7 +98,20 @@ class ConfigData(object):
 
     # Directories testcloud cares about
 
-    DATA_DIR = "/var/lib/testcloud"
+    __DATA_DIR = "/var/lib/testcloud"
+
+    @property
+    def DATA_DIR(self):
+        return self.__DATA_DIR
+
+    @DATA_DIR.setter
+    def DATA_DIR(self, value):
+        if self.__DATA_DIR == value:
+            return
+        from testcloud import sql
+        sql.data_dir_changed(value)
+        self.__DATA_DIR = value
+
     STORE_DIR = "/var/lib/testcloud/backingstores"
 
     # Data for cloud-init
@@ -263,7 +276,7 @@ storage:
     UBUNTU_RELEASES_API = "https://api.launchpad.net/devel/ubuntu/series"
     UBUNTU_IMG_URL = "https://cloud-images.ubuntu.com/%s/current/%s-server-cloudimg-%s.img"
 
-    def merge_object(self, obj):
+    def _merge_object(self, obj):
         """Overwrites default values with values from a python object which have
         names containing all upper case letters.
 
@@ -273,4 +286,15 @@ storage:
 
         for key in dir(obj):
             if key.isupper():
-                setattr(self, key, getattr(obj, key))
+                if key != "DATA_DIR":
+                    setattr(self, key, getattr(obj, key))
+                else:
+                    # I hate life... but since we want to "automagically" work around TMT's
+                    #  way of changing the DATA_DIR on the fly, I don't see another way.
+                    try:
+                        self.DATA_DIR = getattr(obj, key)
+                    except AttributeError as e:
+                        if 'partially initialized module' in str(e):
+                            self.__DATA_DIR = getattr(obj, key)
+                        else:
+                            raise

{testcloud-0.11.0 → testcloud-0.11.2}/testcloud/instance.py

@@ -429,9 +429,9 @@ class Instance(object):
                 key_content = None
             # We need this weird code until the way of objects sharing with tmt gets refactored
             try:
-                bu_data = config_data.COREOS_DATA % key_content
+                bu_data = coreos_data_tpl % key_content
             except TypeError:
-                bu_data = config_data.COREOS_DATA
+                bu_data = coreos_data_tpl
             with open(self.bu_path, "w") as user_file:
                 user_file.write(bu_data)
 
@@ -571,13 +571,14 @@ class Instance(object):
                                          "qemu:///system and qemu:///session")
 
         excs = []
-        for _ in range(max(1, retries + 1)):
+        for i in range(max(1, retries + 1)):
             try:
                 self._start(timeout=timeout)
                 break
             except TestcloudInstanceError as exc:
                 excs.append(exc)
-                log.debug("Retrying instance creation due to hang...")
+                if i != range(max(1, retries + 1)):
+                    log.debug("Retrying instance creation due to hang...")
         else:
             raise excs[-1]
 
@@ -601,7 +602,7 @@ class Instance(object):
         poll_tick = 0.5
         timeout_ticks = timeout / poll_tick
         count = 0
-        port_open = -1
+        port_open = False
         domif = {}
         port = self.get_instance_port()
 
@@ -609,22 +610,45 @@ class Instance(object):
         # found, indicating that the boot process is post-cloud-init
         while count <= timeout_ticks:
             if self.connection == "qemu:///system":
+                log.debug("Checking if ssh is up on: %s" % self.name)
                 domif = dom.interfaceAddresses(libvirt.VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_LEASE)
             elif self.connection == "qemu:///session" and not self.coreos:
                 try:
-                    log.debug("Checking if cloud-init has finished its job for: " + self.name)
+                    log.debug("Checking if cloud-init has finished its job for: %s" % self.name)
                     requests.head("http://127.0.0.1:%d" % (port - 1000), timeout=1).raise_for_status()
-                    port_open = 0
+                    port_open = True
                 except Exception:
                     time.sleep(poll_tick * 4)  # Larger value to prevent SYN flood
                     count += 4
                     continue
             elif self.connection == "qemu:///session" and self.coreos:
                 domif = {}
-                sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-                port_open = sock.connect_ex(("127.0.0.1", self.get_instance_port()))
-
-            if len(domif) > 0 or port_open == 0:
+                log.debug("Checking if ssh is up on: %s" % self.name)
+                try:
+                    sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+                    sock.settimeout(poll_tick * 4)
+                    sock.connect(("127.0.0.1", self.get_instance_port()))
+                    resp = sock.recv(1024)
+                    assert resp is not None
+                    assert "ssh" in resp.decode("utf-8").lower()
+                    port_open = True
+                except ConnectionRefusedError:
+                    # To support old behavior where sock.connect fails before vm startup
+                    # We didn't wait for timeout in this branch
+                    domain_state = _find_domain(self.name, self.connection)
+                    if domain_state != "running":
+                        break
+                    time.sleep(poll_tick * 4)
+                except (TimeoutError, AssertionError):
+                    # AssertionError To break on abrupt libvirt domain shutoff
+                    # TimeoutError Expected while waiting for ssh in VM
+                    domain_state = _find_domain(self.name, self.connection)
+                    if domain_state != "running":
+                        break
+                finally:
+                    sock.close()
+
+            if len(domif) > 0 or port_open:
                 log.info("Successfully booted instance {}".format(self.name))
                 return
 

{testcloud-0.11.0 → testcloud-0.11.2}/testcloud/sql.py

@@ -15,7 +15,7 @@ logger.setLevel(logging.ERROR)
 
 
 cfg = config.get_config()
-if os.path.exists(cfg.DATA_DIR):
+if os.path.exists(cfg.DATA_DIR) and os.access(cfg.DATA_DIR, os.W_OK):
     DB = pw.SqliteDatabase(os.path.join(cfg.DATA_DIR, "testcloud.sqlite"))
 else:
     DB = pw.SqliteDatabase(":memory:")
@@ -51,5 +51,11 @@ class DBImage(pw.Model):
         table_name = "image"
 
 
+def data_dir_changed(pth):
+    global DB
+    DB = pw.SqliteDatabase(os.path.join(pth, "testcloud.sqlite"))
+    DB.connect()
+    DB.create_tables([DBImage])
+
 DB.connect()
 DB.create_tables([DBImage])

{testcloud-0.11.0 → testcloud-0.11.2/testcloud.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: testcloud
-Version: 0.11.0
+Version: 0.11.2
 Summary: A tool to download and boot cloud images locally, with an easy to use API.
 Home-page: https://pagure.io/testcloud
 Author: Mike Ruckman