improve id/name handling

Author: gronke

libiocage/lib/Jail.py

@@ -711,22 +711,21 @@ def _teardown_mounts(self):
                 )
 
     def _resolve_name(self, text):
+
+        if (text is None) or (len(text)==0):
+            raise libiocage.lib.errors.JailNotSupplied(logger=self.logger)
+
         jails_dataset = self.host.datasets.jails
-        best_guess = ""
+
         for dataset in list(jails_dataset.children):
+            
             dataset_name = dataset.name[(len(jails_dataset.name) + 1):]
-            if text == dataset_name:
-                # Exact match, immediately return
-                return dataset_name
-            elif dataset_name.startswith(text) and len(text) > len(best_guess):
-                best_guess = text
-
-        if len(best_guess) > 0:
-            self.logger.debug(f"Resolved {text} to uuid {dataset_name}")
-            return best_guess
+            humanreadable_name = libiocage.lib.helpers.to_humanreadable_name(
+                dataset_name
+            )
 
-        if not best_guess:
-            raise libiocage.lib.errors.JailNotSupplied(logger=self.logger)
+            if text in [dataset_name, humanreadable_name]:
+                return dataset_name
 
         raise libiocage.lib.errors.JailNotFound(text, logger=self.logger)
 
@@ -906,14 +905,6 @@ class Jail(JailGenerator):
 
     def start(self, *args, **kwargs):
         return list(JailGenerator.start(self, *args, **kwargs))
-        # libiocage.lib.helpers.print_event_generator(
-        #     JailGenerator.start(self, *args, **kwargs),
-        #     logger=self.logger
-        # )
 
     def stop(self, *args, **kwargs):
-        return list(JailGenerator.start(self, *args, **kwargs))
-        # libiocage.lib.helpers.print_event_generator(
-        #     JailGenerator.stop(self, *args, **kwargs),
-        #     logger=self.logger
-        # )
+        return list(JailGenerator.stop(self, *args, **kwargs))

libiocage/lib/JailConfig.py

@@ -1,4 +1,5 @@
 import re
+import uuid
 
 import libiocage.lib.JailConfigAddresses
 import libiocage.lib.JailConfigDefaults
@@ -73,15 +74,12 @@ def __init__(self,
             self.jail = None
             self.fstab = None
 
-        data_keys = data.keys()
-
-        # the UUID is used in many other variables and needs to be set first
-        if "name" in data_keys:
-            self["name"] = data["name"]
-        elif "uuid" in data_keys:
-            self["name"] = data["uuid"]
-        else:
-            self["id"] = None
+        # the name is used in many other variables and needs to be set first
+        self["id"] = None
+        for key in ["id", "name", "uuid"]:
+            if key in data.keys():
+                self["name"] = data[key]
+                break
 
         # be aware of iocage-legacy jails for migration
         try:
@@ -129,8 +127,13 @@ def clone(self, data, skip_on_error=False):
                 Passed to __setitem__
 
         """
-        for key in data:
-            self.__setitem__(key, data[key], skip_on_error=skip_on_error)
+        current_id = self["id"]
+        for key, value in data.items():
+
+            if (key in ["id", "name", "uuid"]) and (current_id is not None):
+                value = current_id
+
+            self.__setitem__(key, value, skip_on_error=skip_on_error)
 
     def read(self):
 
@@ -205,15 +208,19 @@ def _set_name(self, name, **kwargs):
             )
             self.logger.error(msg)
 
-        if libiocage.lib.helpers.validate_name(name) is False:
-            raise libiocage.lib.errors.InvalidJailName(logger=self.logger)
-
-        self.id = name
+        is_valid_name = libiocage.lib.helpers.validate_name(name)
+        if is_valid_name is True:
+            self["id"] = name
+        else:
+            try:
+                self["id"] = str(uuid.UUID(name)) # legacy support
+            except:
+                raise libiocage.lib.errors.InvalidJailName(logger=self.logger)
 
         try:
-            self.host_hostname
+            self["host_hostname"]
         except:
-            self.host_hostname = name
+            self["host_hostname"] = name
 
         self.logger.spam(
             f"Set jail name to {name}",

libiocage/lib/JailConfigDefaults.py

@@ -7,6 +7,7 @@
 class JailConfigDefaults(dict):
 
     DEFAULTS = {
+        "id": None,
         "basejail": False,
         "defaultrouter": None,
         "defaultrouter6": None,

libiocage/lib/Jails.py

@@ -47,13 +47,10 @@ def __iter__(self):
                 yield jail
 
     def _create_jail(self, *args, **kwargs):
-        return libiocage.lib.Jail.JailGenerator(
-            *args,
-            logger=self.logger,
-            host=self.host,
-            zfs=self.zfs,
-            **kwargs
-        )
+        kwargs["logger"] = self.logger
+        kwargs["host"] = self.host
+        kwargs["zfs"] = self.zfs
+        return libiocage.lib.Jail.Jail(*args,**kwargs)
 
     @property
     def filters(self):
@@ -99,13 +96,10 @@ def _get_name_from_jail_dataset(
 class Jails(JailsGenerator):
 
     def _create_jail(self, *args, **kwargs):
-        return libiocage.lib.Jail.Jail(
-            *args,
-            logger=self.logger,
-            host=self.host,
-            zfs=self.zfs,
-            **kwargs
-        )
+        kwargs["logger"] = self.logger
+        kwargs["host"] = self.host
+        kwargs["zfs"] = self.zfs
+        return libiocage.lib.Jail.Jail(*args,**kwargs)
 
     def __iter__(self):
         return list(JailsGenerator.__iter__(self))

libiocage/lib/Logger.py

@@ -85,7 +85,7 @@ def __init__(self, print_level=None, log_directory="/var/log/iocage"):
 
     @property
     def default_print_level(self):
-        return "info"
+        return "spam"
 
     @property
     def print_level(self):