proximl 0.5.5__tar.gz → 0.5.6__tar.gz

{proximl-0.5.5/proximl.egg-info → proximl-0.5.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: proximl
-Version: 0.5.5
+Version: 0.5.6
 Summary: proxiML client SDK and command line utilities
 Home-page: https://github.com/proxiML/python-sdk
 Author: proxiML

{proximl-0.5.5 → proximl-0.5.6}/proximl/__init__.py

@@ -13,5 +13,5 @@ logging.basicConfig(
 logger = logging.getLogger(__name__)
 
 
-__version__ = "0.5.5"
+__version__ = "0.5.6"
 __all__ = "ProxiML"

{proximl-0.5.5 → proximl-0.5.6}/proximl/cli/cloudbender/__init__.py

@@ -15,4 +15,4 @@ from proximl.cli.cloudbender.region import region
 from proximl.cli.cloudbender.node import node
 from proximl.cli.cloudbender.device import device
 from proximl.cli.cloudbender.datastore import datastore
-from proximl.cli.cloudbender.reservation import reservation
+from proximl.cli.cloudbender.service import service

proximl-0.5.6/proximl/cli/cloudbender/service.py

@@ -0,0 +1,129 @@
+import click
+from proximl.cli import cli, pass_config, search_by_id_name
+from proximl.cli.cloudbender import cloudbender
+
+
+@cloudbender.group()
+@pass_config
+def service(config):
+    """proxiML CloudBender service commands."""
+    pass
+
+
+@service.command()
+@click.option(
+    "--provider",
+    "-p",
+    type=click.STRING,
+    required=True,
+    help="The provider ID of the region.",
+)
+@click.option(
+    "--region",
+    "-r",
+    type=click.STRING,
+    required=True,
+    help="The region ID to list services for.",
+)
+@pass_config
+def list(config, provider, region):
+    """List services."""
+    data = [
+        ["ID", "NAME", "HOSTNAME"],
+        [
+            "-" * 80,
+            "-" * 80,
+            "-" * 80,
+        ],
+    ]
+
+    services = config.proximl.run(
+        config.proximl.client.cloudbender.services.list(
+            provider_uuid=provider, region_uuid=region
+        )
+    )
+
+    for service in services:
+        data.append(
+            [
+                service.id,
+                service.name,
+                service.hostname,
+            ]
+        )
+
+    for row in data:
+        click.echo(
+            "{: >25.24} {: >29.28} {: >40.39}" "".format(*row),
+            file=config.stdout,
+        )
+
+
+@service.command()
+@click.option(
+    "--provider",
+    "-p",
+    type=click.STRING,
+    required=True,
+    help="The provider ID of the region.",
+)
+@click.option(
+    "--region",
+    "-r",
+    type=click.STRING,
+    required=True,
+    help="The region ID to create the service in.",
+)
+@click.option(
+    "--public/--no-public",
+    default=True,
+    show_default=True,
+    help="Service should be accessible from the public internet.",
+)
+@click.argument("name", type=click.STRING, required=True)
+@pass_config
+def create(config, provider, region, public, name):
+    """
+    Creates a service.
+    """
+    return config.proximl.run(
+        config.proximl.client.cloudbender.services.create(
+            provider_uuid=provider, region_uuid=region, name=name, public=public
+        )
+    )
+
+
+@service.command()
+@click.option(
+    "--provider",
+    "-p",
+    type=click.STRING,
+    required=True,
+    help="The provider ID of the region.",
+)
+@click.option(
+    "--region",
+    "-r",
+    type=click.STRING,
+    required=True,
+    help="The region ID to remove the service from.",
+)
+@click.argument("service", type=click.STRING)
+@pass_config
+def remove(config, provider, region, service):
+    """
+    Remove a service.
+
+    RESERVATION may be specified by name or ID, but ID is preferred.
+    """
+    services = config.proximl.run(
+        config.proximl.client.cloudbender.services.list(
+            provider_uuid=provider, region_uuid=region
+        )
+    )
+
+    found = search_by_id_name(service, services)
+    if None is found:
+        raise click.UsageError("Cannot find specified service.")
+
+    return config.proximl.run(found.remove())

{proximl-0.5.5 → proximl-0.5.6}/proximl/cli/project.py

@@ -115,40 +115,35 @@ def list_datastores(config):
 
 @project.command()
 @pass_config
-def list_reservations(config):
-    """List project reservations."""
+def list_services(config):
+    """List project services."""
     data = [
-        ["ID", "NAME", "TYPE", "RESOURCE", "HOSTNAME", "REGION_UUID"],
+        ["ID", "NAME", "HOSTNAME", "REGION_UUID"],
         [
             "-" * 80,
             "-" * 80,
             "-" * 80,
             "-" * 80,
-            "-" * 80,
-            "-" * 80,
         ],
     ]
     project = config.proximl.run(
         config.proximl.client.projects.get(config.proximl.client.project)
     )
 
-    reservations = config.proximl.run(project.list_reservations())
+    services = config.proximl.run(project.list_services())
 
-    for reservation in reservations:
+    for service in services:
         data.append(
             [
-                reservation.id,
-                reservation.name,
-                reservation.type,
-                reservation.resource,
-                reservation.hostname,
-                reservation.region_uuid,
+                service.id,
+                service.name,
+                service.hostname,
+                service.region_uuid,
             ]
         )
 
     for row in data:
         click.echo(
-            "{: >38.36} {: >30.28} {: >8.6} {: >15.13} {: >30.28} {: >38.36}"
-            "".format(*row),
+            "{: >38.36} {: >30.28} {: >30.28} {: >38.36}" "".format(*row),
             file=config.stdout,
         )

{proximl-0.5.5 → proximl-0.5.6}/proximl/cloudbender/cloudbender.py

@@ -3,7 +3,7 @@ from .regions import Regions
 from .nodes import Nodes
 from .devices import Devices
 from .datastores import Datastores
-from .reservations import Reservations
+from .services import Services
 from .device_configs import DeviceConfigs
 
 
@@ -15,5 +15,5 @@ class Cloudbender(object):
         self.nodes = Nodes(proximl)
         self.devices = Devices(proximl)
         self.datastores = Datastores(proximl)
-        self.reservations = Reservations(proximl)
+        self.services = Services(proximl)
         self.device_configs = DeviceConfigs(proximl)

proximl-0.5.5/proximl/cloudbender/reservations.py → proximl-0.5.6/proximl/cloudbender/services.py

@@ -2,77 +2,70 @@ import json
 import logging
 
 
-class Reservations(object):
+class Services(object):
     def __init__(self, proximl):
         self.proximl = proximl
 
     async def get(self, provider_uuid, region_uuid, id, **kwargs):
         resp = await self.proximl._query(
-            f"/provider/{provider_uuid}/region/{region_uuid}/reservation/{id}",
+            f"/provider/{provider_uuid}/region/{region_uuid}/service/{id}",
             "GET",
             kwargs,
         )
-        return Reservation(self.proximl, **resp)
+        return Service(self.proximl, **resp)
 
     async def list(self, provider_uuid, region_uuid, **kwargs):
         resp = await self.proximl._query(
-            f"/provider/{provider_uuid}/region/{region_uuid}/reservation",
+            f"/provider/{provider_uuid}/region/{region_uuid}/service",
             "GET",
             kwargs,
         )
-        reservations = [
-            Reservation(self.proximl, **reservation) for reservation in resp
-        ]
-        return reservations
+        services = [Service(self.proximl, **service) for service in resp]
+        return services
 
     async def create(
         self,
         provider_uuid,
         region_uuid,
         name,
-        type,
-        resource,
-        hostname,
+        public,
         **kwargs,
     ):
-        logging.info(f"Creating Reservation {name}")
+        logging.info(f"Creating Service {name}")
         data = dict(
             name=name,
-            type=type,
-            resource=resource,
-            hostname=hostname,
+            public=public,
             **kwargs,
         )
         payload = {k: v for k, v in data.items() if v is not None}
         resp = await self.proximl._query(
-            f"/provider/{provider_uuid}/region/{region_uuid}/reservation",
+            f"/provider/{provider_uuid}/region/{region_uuid}/service",
             "POST",
             None,
             payload,
         )
-        reservation = Reservation(self.proximl, **resp)
-        logging.info(f"Created Reservation {name} with id {reservation.id}")
-        return reservation
+        service = Service(self.proximl, **resp)
+        logging.info(f"Created Service {name} with id {service.id}")
+        return service
 
     async def remove(self, provider_uuid, region_uuid, id, **kwargs):
         await self.proximl._query(
-            f"/provider/{provider_uuid}/region/{region_uuid}/reservation/{id}",
+            f"/provider/{provider_uuid}/region/{region_uuid}/service/{id}",
             "DELETE",
             kwargs,
         )
 
 
-class Reservation:
+class Service:
     def __init__(self, proximl, **kwargs):
         self.proximl = proximl
-        self._reservation = kwargs
-        self._id = self._reservation.get("reservation_id")
-        self._provider_uuid = self._reservation.get("provider_uuid")
-        self._region_uuid = self._reservation.get("region_uuid")
-        self._type = self._reservation.get("type")
-        self._name = self._reservation.get("name")
-        self._resource = self._reservation.get("resource")
-        self._hostname = self._reservation.get("hostname")
+        self._service = kwargs
+        self._id = self._service.get("service_id")
+        self._provider_uuid = self._service.get("provider_uuid")
+        self._region_uuid = self._service.get("region_uuid")
+        self._public = self._service.get("public")
+        self._name = self._service.get("name")
+        self._hostname = self._service.get("hostname")
 
     @property
     def id(self) -> str:
@@ -87,39 +80,35 @@ class Reservation:
         return self._region_uuid
 
     @property
-    def type(self) -> str:
-        return self._type
+    def public(self) -> bool:
+        return self._public
 
     @property
     def name(self) -> str:
         return self._name
 
-    @property
-    def resource(self) -> str:
-        return self._resource
-
     @property
     def hostname(self) -> str:
         return self._hostname
 
     def __str__(self):
-        return json.dumps({k: v for k, v in self._reservation.items()})
+        return json.dumps({k: v for k, v in self._service.items()})
 
     def __repr__(self):
-        return f"Reservation( proximl , **{self._reservation.__repr__()})"
+        return f"Service( proximl , **{self._service.__repr__()})"
 
     def __bool__(self):
         return bool(self._id)
 
     async def remove(self):
         await self.proximl._query(
-            f"/provider/{self._provider_uuid}/region/{self._region_uuid}/reservation/{self._id}",
+            f"/provider/{self._provider_uuid}/region/{self._region_uuid}/service/{self._id}",
             "DELETE",
         )
 
     async def refresh(self):
         resp = await self.proximl._query(
-            f"/provider/{self._provider_uuid}/region/{self._region_uuid}/reservation/{self._id}",
+            f"/provider/{self._provider_uuid}/region/{self._region_uuid}/service/{self._id}",
             "GET",
         )
         self.__init__(self.proximl, **resp)

{proximl-0.5.5 → proximl-0.5.6}/proximl/projects.py

@@ -72,17 +72,17 @@ class ProjectDatastore:
         return bool(self._id)
 
 
-class ProjectReservation:
+class ProjectService:
     def __init__(self, proximl, **kwargs):
         self.proximl = proximl
-        self._reservation = kwargs
-        self._id = self._reservation.get("id")
-        self._project_uuid = self._reservation.get("project_uuid")
-        self._name = self._reservation.get("name")
-        self._type = self._reservation.get("type")
-        self._hostname = self._reservation.get("hostname")
-        self._resource = self._reservation.get("resource")
-        self._region_uuid = self._reservation.get("region_uuid")
+        self._service = kwargs
+        self._id = self._service.get("id")
+        self._project_uuid = self._service.get("project_uuid")
+        self._name = self._service.get("name")
+        self._type = self._service.get("type")
+        self._hostname = self._service.get("hostname")
+        self._resource = self._service.get("resource")
+        self._region_uuid = self._service.get("region_uuid")
 
     @property
     def id(self) -> str:
@@ -113,12 +113,10 @@ class ProjectReservation:
         return self._region_uuid
 
     def __str__(self):
-        return json.dumps({k: v for k, v in self._reservation.items()})
+        return json.dumps({k: v for k, v in self._service.items()})
 
     def __repr__(self):
-        return (
-            f"ProjectReservation( proximl , **{self._reservation.__repr__()})"
-        )
+        return f"ProjectService( proximl , **{self._service.__repr__()})"
 
     def __bool__(self):
         return bool(self._id)
@@ -162,26 +160,17 @@ class Project:
         await self.proximl._query(f"/project/{self._id}", "DELETE")
 
     async def list_datastores(self):
-        resp = await self.proximl._query(
-            f"/project/{self._id}/datastores", "GET"
-        )
-        datastores = [
-            ProjectDatastore(self.proximl, **datastore) for datastore in resp
-        ]
+        resp = await self.proximl._query(f"/project/{self._id}/datastores", "GET")
+        datastores = [ProjectDatastore(self.proximl, **datastore) for datastore in resp]
         return datastores
 
-    async def list_reservations(self):
-        resp = await self.proximl._query(
-            f"/project/{self._id}/reservations", "GET"
-        )
-        reservations = [
-            ProjectReservation(self.proximl, **reservation)
-            for reservation in resp
-        ]
-        return reservations
+    async def list_services(self):
+        resp = await self.proximl._query(f"/project/{self._id}/services", "GET")
+        services = [ProjectService(self.proximl, **service) for service in resp]
+        return services
 
     async def refresh_datastores(self):
         await self.proximl._query(f"/project/{self._id}/datastores", "PATCH")
 
-    async def refresh_reservations(self):
-        await self.proximl._query(f"/project/{self._id}/reservations", "PATCH")
+    async def refresh_services(self):
+        await self.proximl._query(f"/project/{self._id}/services", "PATCH")

{proximl-0.5.5 → proximl-0.5.6/proximl.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: proximl
-Version: 0.5.5
+Version: 0.5.6
 Summary: proxiML client SDK and command line utilities
 Home-page: https://github.com/proxiML/python-sdk
 Author: proxiML

{proximl-0.5.5 → proximl-0.5.6}/proximl.egg-info/SOURCES.txt

@@ -41,7 +41,7 @@ proximl/cli/cloudbender/device.py
 proximl/cli/cloudbender/node.py
 proximl/cli/cloudbender/provider.py
 proximl/cli/cloudbender/region.py
-proximl/cli/cloudbender/reservation.py
+proximl/cli/cloudbender/service.py
 proximl/cli/job/__init__.py
 proximl/cli/job/create.py
 proximl/cloudbender/__init__.py
@@ -52,7 +52,7 @@ proximl/cloudbender/devices.py
 proximl/cloudbender/nodes.py
 proximl/cloudbender/providers.py
 proximl/cloudbender/regions.py
-proximl/cloudbender/reservations.py
+proximl/cloudbender/services.py
 tests/integration/__init__.py
 tests/integration/conftest.py
 tests/integration/test_checkpoints_integration.py
@@ -103,4 +103,4 @@ tests/unit/cloudbender/test_devices_unit.py
 tests/unit/cloudbender/test_nodes_unit.py
 tests/unit/cloudbender/test_providers_unit.py
 tests/unit/cloudbender/test_regions_unit.py
-tests/unit/cloudbender/test_reservations_unit.py
+tests/unit/cloudbender/test_services_unit.py

{proximl-0.5.5 → proximl-0.5.6}/pyproject.toml

@@ -21,7 +21,7 @@ markers = [
     "nodes: Nodes tests",
     "devices: Devices tests",
     "datastores: Datastores tests",
-    "reservations: Reservations tests",
+    "services: Services tests",
     "device_configs: DeviceConfigs tests",
     "unit: All unit tests (no proxiML environment required)",
     "integration: All integration tests (proxiML environment required)",

proximl-0.5.6/tests/unit/cli/cloudbender/test_cli_reservation_unit.py

@@ -0,0 +1,34 @@
+import re
+import json
+import click
+from unittest.mock import AsyncMock, patch
+from pytest import mark, fixture, raises
+
+pytestmark = [mark.cli, mark.unit, mark.cloudbender, mark.services]
+
+from proximl.cli.cloudbender import service as specimen
+from proximl.cloudbender.services import Service
+
+
+def test_list(runner, mock_services):
+    with patch("proximl.cli.ProxiML", new=AsyncMock) as mock_proximl:
+        mock_proximl.cloudbender = AsyncMock()
+        mock_proximl.cloudbender.services = AsyncMock()
+        mock_proximl.cloudbender.services.list = AsyncMock(return_value=mock_services)
+        result = runner.invoke(
+            specimen,
+            args=["list", "--provider=prov-id-1", "--region=reg-id-1"],
+        )
+        assert result.exit_code == 0
+        mock_proximl.cloudbender.services.list.assert_called_once_with(
+            provider_uuid="prov-id-1", region_uuid="reg-id-1"
+        )
+
+
+def test_list_no_provider(runner, mock_services):
+    with patch("proximl.cli.ProxiML", new=AsyncMock) as mock_proximl:
+        mock_proximl.cloudbender = AsyncMock()
+        mock_proximl.cloudbender.services = AsyncMock()
+        mock_proximl.cloudbender.services.list = AsyncMock(return_value=mock_services)
+        result = runner.invoke(specimen, ["list"])
+        assert result.exit_code != 0

{proximl-0.5.5 → proximl-0.5.6}/tests/unit/cli/test_cli_project_unit.py

@@ -23,9 +23,7 @@ def test_list(runner, mock_projects):
 def test_list_datastores(runner, mock_project_datastores):
     with patch("proximl.cli.ProxiML", new=AsyncMock) as mock_proximl:
         mock_project = create_autospec(Project)
-        mock_project.list_datastores = AsyncMock(
-            return_value=mock_project_datastores
-        )
+        mock_project.list_datastores = AsyncMock(return_value=mock_project_datastores)
         mock_proximl.projects.get = AsyncMock(return_value=mock_project)
         result = runner.invoke(specimen, ["list-datastores"])
         print(result)
@@ -33,14 +31,12 @@ def test_list_datastores(runner, mock_project_datastores):
         mock_project.list_datastores.assert_called_once()
 
 
-def test_list_reservations(runner, mock_project_reservations):
+def test_list_services(runner, mock_project_services):
     with patch("proximl.cli.ProxiML", new=AsyncMock) as mock_proximl:
         mock_project = create_autospec(Project)
-        mock_project.list_reservations = AsyncMock(
-            return_value=mock_project_reservations
-        )
+        mock_project.list_services = AsyncMock(return_value=mock_project_services)
         mock_proximl.projects.get = AsyncMock(return_value=mock_project)
-        result = runner.invoke(specimen, ["list-reservations"])
+        result = runner.invoke(specimen, ["list-services"])
         print(result)
         assert result.exit_code == 0
-        mock_project.list_reservations.assert_called_once()
+        mock_project.list_services.assert_called_once()