python-chi 1.2.3__tar.gz → 1.2.5__tar.gz

python_chi-1.2.5/ChangeLog

@@ -0,0 +1,7 @@
+CHANGES
+=======
+
+v1.2.5
+------
+
+* Add container exposed\_ports default arg

{python_chi-1.2.3 → python_chi-1.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-chi
-Version: 1.2.3
+Version: 1.2.5
 Summary: Helper library for Chameleon Infrastructure (CHI) testbed
 Home-page: https://www.chameleoncloud.org
 Author: University of Chicago

{python_chi-1.2.3 → python_chi-1.2.5}/chi/container.py

@@ -70,7 +70,7 @@ class Container:
         self,
         name: str,
         image_ref: str,
-        exposed_ports: List[str],
+        exposed_ports: List[str] = None,
         reservation_id: str = None,
         start: bool = True,
         start_timeout: int = 0,

{python_chi-1.2.3 → python_chi-1.2.5}/chi/hardware.py

@@ -390,14 +390,15 @@ def show_nodes(nodes: Optional[List[Node]] = None) -> None:
 
     rows = []
     for n in nodes:
+        fixed_gpu = {} if not n.gpu or isinstance(n.gpu, list) else n.gpu
         rows.append(
             {
                 "Node Name": n.name,
                 "Type": n.type,
-                "Clock Speed (GHz)": round(n.cpu.get("clock_speed", 0) / 1e9, 2),
+                "Clock Speed (GHz)": round((n.cpu.get("clock_speed") or 0) / 1e9, 2),
                 "RAM": n.main_memory.get("humanized_ram_size", "N/A"),
-                "GPU Model": (n.gpu or {}).get("gpu_model") or "",
-                "GPU Count": (n.gpu or {}).get("gpu_count") or "",
+                "GPU Model": fixed_gpu.get("gpu_model") or "",
+                "GPU Count": fixed_gpu.get("gpu_count") or "",
                 "Storage Size": n.storage_devices[0].get("humanized_size", "N/A")
                 if n.storage_devices
                 else "N/A",

{python_chi-1.2.3 → python_chi-1.2.5}/chi/lease.py

@@ -1069,13 +1069,13 @@ def add_network_reservation(
 
     if physical_network:
         extra_constraints.append(["==", "$physical_network", physical_network])
-    if stitch_provider and stitch_provider != "fabric":
+    if stitch_provider == "fabric":
         extra_constraints.append(["==", "$stitch_provider", stitch_provider])
-    else:
+    elif stitch_provider is not None:
         raise CHIValueError("stitch_provider must be 'fabric' or None")
-    if usage_type and usage_type != "storage":
+    if usage_type == "storage":
         extra_constraints.append(["==", "$usage_type", usage_type])
-    else:
+    elif usage_type is not None:
         raise CHIValueError("usage_type must be 'storage' or None")
 
     resource_properties = _format_resource_properties(

{python_chi-1.2.3 → python_chi-1.2.5}/chi/server.py

@@ -191,7 +191,7 @@ class Server:
             image=self.image_name,
             flavor=self.flavor_name,
             key=self.keypair.name,
-            net_ids=[chi_network.get_network_id(DEFAULT_NETWORK)],
+            net_ids=[chi_network.get_network_id(self.network_name)],
             **kwargs,
         )
 

{python_chi-1.2.3 → python_chi-1.2.5}/python_chi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-chi
-Version: 1.2.3
+Version: 1.2.5
 Summary: Helper library for Chameleon Infrastructure (CHI) testbed
 Home-page: https://www.chameleoncloud.org
 Author: University of Chicago

python_chi-1.2.5/python_chi.egg-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "9e8725f", "is_release": false}

python_chi-1.2.5/setup.py

@@ -0,0 +1,5 @@
+#!/usr/bin/env python
+
+from setuptools import setup
+
+setup(setup_requires=["pbr"], pbr=True, version="v1.2.5")

python_chi-1.2.3/ChangeLog

@@ -1,7 +0,0 @@
-CHANGES
-=======
-
-v1.2.3
-------
-
-* Fix formatting and tests

python_chi-1.2.3/python_chi.egg-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "3ff8f3d", "is_release": false}

python_chi-1.2.3/setup.py

@@ -1,5 +0,0 @@
-#!/usr/bin/env python
-
-from setuptools import setup
-
-setup(setup_requires=["pbr"], pbr=True, version="v1.2.3")