python-chi 1.2.4__tar.gz → 1.2.6__tar.gz

python_chi-1.2.6/AUTHORS

@@ -0,0 +1 @@
+Mark Powers <markpowers@uchicago.edu>

python_chi-1.2.6/ChangeLog

@@ -0,0 +1,7 @@
+CHANGES
+=======
+
+v1.2.6
+------
+
+* Kvm improvments (#90)

{python_chi-1.2.4 → python_chi-1.2.6}/PKG-INFO

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

{python_chi-1.2.4 → python_chi-1.2.6}/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.4 → python_chi-1.2.6}/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.4 → python_chi-1.2.6}/chi/lease.py

@@ -484,14 +484,23 @@ class Lease:
         """
         add_fip_reservation(reservation_list=self.fip_reservations, count=amount)
 
-    def add_flavor_reservation(self, id, amount=1):
+    def add_flavor_reservation(self, id=None, name=None, amount=1):
         """
-        Add a reservation for a KVM flavor to the list of reservations.
+        Add a reservation for a KVM flavor to the list of reservations by name or ID.
 
         Args:
             id (str): The ID of the flavor to reserve
-            count (int): The number of floating IPs to reserve.
+            name (str): The name of the flavor to reserve
+            amount (int): The number of instances of this flavor to reserve
         """
+        # Do not permit both or neither name and id.
+        if (name and id) or not (name or id):
+            raise CHIValueError("You must specify exactly one of id or name")
+
+        # Blazar API requires flavor ID, so we must convert from name
+        if not id:
+            id = server.get_flavor(name).id
+
         self.flavor_reservations.append(
             {
                 "resource_type": "flavor:instance",
@@ -783,9 +792,7 @@ class Lease:
         """
         flavors = []
         for res in self.flavor_reservations:
-            flavors.extend(
-                server.list_flavors(reservable=True, reservation_id=res.get("id"))
-            )
+            flavors.extend(server.list_flavors(reservation_id=res.get("id")))
         return flavors
 
 

{python_chi-1.2.4 → python_chi-1.2.6}/chi/server.py

@@ -699,11 +699,12 @@ class Flavor:
         return f"<{self.__class__.__name__} '{self.name}' {self.description} (disk={self.disk}) (ram={self.ram}) (vcpus={self.vcpus})>"
 
 
-def list_flavors(reservable=None, reservation_id=None) -> List[Flavor]:
-    """Get a list of all available flavors.
+def list_flavors(reservable=None, gpu=None, reservation_id=None) -> List[Flavor]:
+    """Get a list of flavors
 
     Args:
-        reservable (bool): Whether to filter by reservable flavors. Defaults to True.
+        reservable (bool): If given, whether to filter by reservable flavors.
+        gpu (bool): If given, whether to filter by GPU flavors.
         reservation_id (str, optional): The reservation ID to filter by. Defaults to None.
 
     Returns:
@@ -715,13 +716,19 @@ def list_flavors(reservable=None, reservation_id=None) -> List[Flavor]:
         chi_flavors = []
         for f in flavors:
             extras = f.get_keys()
-            # include a flavor if:
-            # - not filtering by reservable
-            # - is reservable in blazar & not an active reservation flavor
-            if not reservable or (
-                extras.get("aggregate_instance_extra_specs:reservation")
+            is_reservable = not any(
+                e.startswith("resources:CUSTOM_RESERVATION_") for e in extras
+            )
+            is_gpu = f.extra_specs.get("trait:CUSTOM_GPU") == "required"
+            matching_reservation = (
+                reservation_id is None
+                or extras.get("aggregate_instance_extra_specs:reservation", None)
                 == reservation_id
-                and extras.get("trait:CUSTOM_BLAZAR_FLAVOR_RESERVATION") == "required"
+            )
+            if (
+                (reservable is None or reservable == is_reservable)
+                and (gpu is None or gpu == is_gpu)
+                and matching_reservation
             ):
                 chi_flavors.append(
                     Flavor(

{python_chi-1.2.4 → python_chi-1.2.6}/python_chi.egg-info/PKG-INFO

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

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

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

python_chi-1.2.6/setup.py

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

python_chi-1.2.4/AUTHORS

@@ -1 +0,0 @@
-Rohan Babbar <rohanbabbar0408@yahoo.com>

python_chi-1.2.4/ChangeLog

@@ -1,7 +0,0 @@
-CHANGES
-=======
-
-v1.2.4
-------
-
-* Fix condition with usage\_type and stitch provider (#89)

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

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

python_chi-1.2.4/setup.py

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