tft-cli 0.0.22__py3-none-any.whl → 0.0.24__py3-none-any.whl

tft/cli/config.py

@@ -17,6 +17,8 @@ settings = LazySettings(
     WATCH_TICK=3,
     DEFAULT_API_TIMEOUT=10,
     DEFAULT_API_RETRIES=7,
+    # default reservation duration in minutes
+    DEFAULT_RESERVATION_DURATION=30,
     # should lead to delays of 0.5, 1, 2, 4, 8, 16, 32 seconds
     DEFAULT_RETRY_BACKOFF_FACTOR=1,
     # system CA certificates path, default for RHEL variants
@@ -24,5 +26,5 @@ settings = LazySettings(
     # Testing Farm sanity test,
     TESTING_FARM_TESTS_GIT_URL="https://gitlab.com/testing-farm/tests",
     TESTING_FARM_SANITY_PLAN="/testing-farm/sanity",
-    PUBLIC_IP_CHECKER_URL="http://icanhazip.com",
+    PUBLIC_IP_CHECKER_URL="https://ipv4.icanhazip.com",
 )

tft/cli/tool.py

@@ -17,6 +17,7 @@ app.command()(commands.reserve)
 app.command()(commands.run)
 app.command()(commands.version)
 app.command()(commands.watch)
+app.command()(commands.encrypt)
 
 # This command is available only for the container based deployment
 if os.path.exists(settings.CONTAINER_SIGN):

tft/cli/utils.py

@@ -69,10 +69,29 @@ def hw_constraints(hardware: List[str]) -> Dict[Any, Any]:
         if not path or not value:
             exit_error(f"cannot parse hardware constraint `{raw_constraint}`")
 
+        path_splitted = path.split('.')
+        first_key = path_splitted[0]
+
+        # Special handling for network and disk as they are lists
+        if first_key in ("network", "disk"):
+            if first_key not in constraints:
+                constraints[first_key] = []
+
+            if len(path_splitted) > 1:
+                new_dict = {}
+                current = new_dict
+                # Handle all nested levels except the last one
+                for key in path_splitted[1:-1]:
+                    current[key] = {}
+                    current = current[key]
+                # Set the final value
+                current[path_splitted[-1]] = value
+                constraints[first_key].append(new_dict)
+            continue
+
         # Walk the path, step by step, and initialize containers along the way. The last step is not
         # a name of another nested container, but actually a name in the last container.
         container: Any = constraints
-        path_splitted = path.split('.')
 
         while len(path_splitted) > 1:
             step = path_splitted.pop(0)
@@ -91,9 +110,7 @@ def hw_constraints(hardware: List[str]) -> Dict[Any, Any]:
             value_mixed = False
 
         container[path_splitted.pop()] = value_mixed
-
-    # automatically convert disk and network values to a list, as the standard requires
-    return {key: value if key not in ("disk", "network") else [value] for key, value in constraints.items()}
+    return constraints
 
 
 def options_from_file(filepath) -> Dict[str, str]:

{tft_cli-0.0.22.dist-info → tft_cli-0.0.24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tft-cli
-Version: 0.0.22
+Version: 0.0.24
 Summary: Testing Farm CLI tool
 License: Apache-2.0
 Author: Miroslav Vadkerti
@@ -11,11 +11,12 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Requires-Dist: click (>=8.0.4,<8.1.0)
+Requires-Dist: click (>=8.0.4,<9.0.0)
 Requires-Dist: colorama (>=0.4.4,<0.5.0)
-Requires-Dist: dynaconf (>=3.1.7,<4.0.0)
+Requires-Dist: dynaconf (>=3.1.2,<4.0.0)
 Requires-Dist: requests (>=2.27.1,<3.0.0)
-Requires-Dist: rich (>=12,<13)
-Requires-Dist: ruamel-yaml (>=0.18.6,<0.19.0)
+Requires-Dist: rich (>=12)
+Requires-Dist: ruamel-yaml (>=0.18.5,<0.19.0)
 Requires-Dist: setuptools
-Requires-Dist: typer[all] (>=0.7.0,<0.8.0)
+Requires-Dist: shellingham (>=1.3.0,<2.0.0)
+Requires-Dist: typer (>=0.11)

tft_cli-0.0.24.dist-info/RECORD

@@ -0,0 +1,11 @@
+tft/cli/__init__.py,sha256=uEJkNJbqC583PBtNI30kxWdeOr3Wj6zJzIYKf0AD72I,92
+tft/cli/commands.py,sha256=MaImy2RpS8S6kwlWZbeFtSOpVZTL9xAXj2ngsB1045M,79678
+tft/cli/commands.py.backup,sha256=z7mkUNEvA71k0LFxe8wcrfVsvRFSZJPMt6j9zpbR1q0,83805
+tft/cli/config.py,sha256=JiVLrgM4REWdljA9DjAuH4fNR1ekE7Crv2oM6vBPt9Q,1254
+tft/cli/tool.py,sha256=nuz57u3yE4fKgdMgNtAFM7PCTcF6PSNFBQbCYDzxBOw,897
+tft/cli/utils.py,sha256=KAk52TRCqHvrIZEKTpJn7HWskeEU4yvNEVlfnkfgMW4,8191
+tft_cli-0.0.24.dist-info/LICENSE,sha256=YpVAQfXkIyzQAdm5LZkI6L5UWqLppa6O8_tgDSdoabQ,574
+tft_cli-0.0.24.dist-info/METADATA,sha256=Q7cjteFX3oSiWp-Vb1ZCv0WfaH1ZEK3pD5nYE9YMhn8,789
+tft_cli-0.0.24.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+tft_cli-0.0.24.dist-info/entry_points.txt,sha256=xzdebHkH5Bx-YRf-XPMsIoVpvgfUqqcRQGuo8DFkiao,49
+tft_cli-0.0.24.dist-info/RECORD,,

tft_cli-0.0.22.dist-info/RECORD

@@ -1,10 +0,0 @@
-tft/cli/__init__.py,sha256=uEJkNJbqC583PBtNI30kxWdeOr3Wj6zJzIYKf0AD72I,92
-tft/cli/commands.py,sha256=mRIeB9JsvRHhiAGJUxXLFMTKuvEt2AGN8AhVujBQcZo,62824
-tft/cli/config.py,sha256=CQrqucLMNlRrjK_y5WY6vLbAYA5TcnHG_kw8CgJ09OA,1165
-tft/cli/tool.py,sha256=wFcVxe1NRGW8stputOZlKMasZHjpysas7f0sgpEzipQ,865
-tft/cli/utils.py,sha256=iWQnjA5rYhwMaz8cP_zmfJ5HihTbaKE3XzZk0N4nfcE,7664
-tft_cli-0.0.22.dist-info/LICENSE,sha256=YpVAQfXkIyzQAdm5LZkI6L5UWqLppa6O8_tgDSdoabQ,574
-tft_cli-0.0.22.dist-info/METADATA,sha256=1FC__NfxUWFgQUr-8R1glWqIKi3kBvsSpZrM4rEBUEM,762
-tft_cli-0.0.22.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-tft_cli-0.0.22.dist-info/entry_points.txt,sha256=xzdebHkH5Bx-YRf-XPMsIoVpvgfUqqcRQGuo8DFkiao,49
-tft_cli-0.0.22.dist-info/RECORD,,