python-chi 1.0.0__tar.gz → 1.0.2__tar.gz

python_chi-1.0.2/ChangeLog

@@ -0,0 +1,7 @@
+CHANGES
+=======
+
+v1.0.2
+------
+
+* Add check for amount when using node\_type

{python_chi-1.0.0 → python_chi-1.0.2}/PKG-INFO

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

{python_chi-1.0.0 → python_chi-1.0.2}/chi/hardware.py

@@ -180,14 +180,14 @@ def get_nodes(
 
             if isinstance(node.gpu, list):
                 gpu_filter = gpu is None or (
-                    node.gpu and gpu == bool(node.gpu[0]["gpu"])
+                    node.gpu and gpu == bool(node.gpu[0].get("gpu"))
                 )
             else:
-                gpu_filter = gpu is None or (node.gpu and gpu == bool(node.gpu["gpu"]))
+                gpu_filter = gpu is None or (node.gpu and gpu == bool(node.gpu.get("gpu")))
 
             cpu_filter = (
                 min_number_cpu is None
-                or node.architecture["smt_size"] >= min_number_cpu
+                or node.architecture.get("smt_size", 0) >= min_number_cpu
             )
 
             if (
@@ -198,7 +198,7 @@ def get_nodes(
             ):
                 nodes.append(node)
 
-    if node_type not in node_types:
+    if node_type is not None and node_type not in node_types:
         if all_sites:
             raise exception.CHIValueError(
                 f"Unknown node_type '{node_type}' at all sites."

{python_chi-1.0.0 → python_chi-1.0.2}/chi/lease.py

@@ -308,6 +308,10 @@ class Lease:
                     reservation_list=self.node_reservations, node_name=node.name
                 )
         else:
+            if not amount or not (node_type or node_name):
+                raise CHIValueError(
+                    "You must specify amount and either node_type or node_name"
+                )
             add_node_reservation(
                 reservation_list=self.node_reservations,
                 count=amount,

{python_chi-1.0.0 → python_chi-1.0.2}/chi/server.py

@@ -595,9 +595,11 @@ def list_flavors() -> List[Flavor]:
     Returns:
         A list of all flavors.
     """
-    nova_client = nova()
-    flavors = nova_client.flavors.list()
-    return [Flavor(name=f.name, disk=f.disk, ram=f.ram, vcpus=f.vcpus) for f in flavors]
+    if Version(context.version) >= Version("1.0"):
+        nova_client = nova()
+        flavors = nova_client.flavors.list()
+        return [Flavor(name=f.name, disk=f.disk, ram=f.ram, vcpus=f.vcpus) for f in flavors]
+    return nova().flavors.list()
 
 
 def get_flavor(ref) -> NovaFlavor:

{python_chi-1.0.0 → python_chi-1.0.2}/python_chi.egg-info/PKG-INFO

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

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

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

{python_chi-1.0.0 → python_chi-1.0.2}/setup.py

@@ -5,5 +5,5 @@ from setuptools import setup
 setup(
     setup_requires=["pbr"],
     pbr=True,
-    version='v1.0.0'
+    version='v1.0.2'
 )

python_chi-1.0.0/ChangeLog

@@ -1,7 +0,0 @@
-CHANGES
-=======
-
-v1.0.0
-------
-
-* Re-add missing chi imports

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

@@ -1 +0,0 @@
-{"git_version": "16b6624", "is_release": false}