proximl 0.5.10__py3-none-any.whl → 0.5.11__py3-none-any.whl

proximl/cli/cloudbender/reservation.py

@@ -1,159 +0,0 @@
-import click
-from proximl.cli import cli, pass_config, search_by_id_name
-from proximl.cli.cloudbender import cloudbender
-
-
-@cloudbender.group()
-@pass_config
-def reservation(config):
-    """proxiML CloudBender reservation commands."""
-    pass
-
-
-@reservation.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 reservations for.",
-)
-@pass_config
-def list(config, provider, region):
-    """List reservations."""
-    data = [
-        ["ID", "NAME", "TYPE", "RESOURCE", "HOSTNAME"],
-        [
-            "-" * 80,
-            "-" * 80,
-            "-" * 80,
-            "-" * 80,
-            "-" * 80,
-        ],
-    ]
-
-    reservations = config.proximl.run(
-        config.proximl.client.cloudbender.reservations.list(
-            provider_uuid=provider, region_uuid=region
-        )
-    )
-
-    for reservation in reservations:
-        data.append(
-            [
-                reservation.id,
-                reservation.name,
-                reservation.type,
-                reservation.resource,
-                reservation.hostname,
-            ]
-        )
-
-    for row in data:
-        click.echo(
-            "{: >37.36} {: >29.28} {: >9.8} {: >9.8} {: >29.28}"
-            "".format(*row),
-            file=config.stdout,
-        )
-
-
-@reservation.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 reservation in.",
-)
-@click.option(
-    "--type",
-    "-t",
-    type=click.Choice(
-        [
-            "port",
-        ],
-        case_sensitive=False,
-    ),
-    required=True,
-    help="The type of reservation to create.",
-)
-@click.option(
-    "--hostname",
-    "-h",
-    type=click.STRING,
-    required=True,
-    help="The hostname to make the reservation on",
-)
-@click.option(
-    "--resource",
-    "-r",
-    type=click.STRING,
-    required=True,
-    help="The resource to reserve",
-)
-@click.argument("name", type=click.STRING, required=True)
-@pass_config
-def create(config, provider, region, type, hostname, resource, name):
-    """
-    Creates a reservation.
-    """
-    return config.proximl.run(
-        config.proximl.client.cloudbender.reservations.create(
-            provider_uuid=provider,
-            region_uuid=region,
-            name=name,
-            hostname=hostname,
-            resource=resource,
-            type=type,
-        )
-    )
-
-
-@reservation.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 reservation from.",
-)
-@click.argument("reservation", type=click.STRING)
-@pass_config
-def remove(config, provider, region, reservation):
-    """
-    Remove a reservation.
-
-    RESERVATION may be specified by name or ID, but ID is preferred.
-    """
-    reservations = config.proximl.run(
-        config.proximl.client.cloudbender.reservations.list(
-            provider_uuid=provider, region_uuid=region
-        )
-    )
-
-    found = search_by_id_name(reservation, reservations)
-    if None is found:
-        raise click.UsageError("Cannot find specified reservation.")
-
-    return config.proximl.run(found.remove())

proximl/cli/project.py

@@ -1,154 +0,0 @@
-import click
-from proximl.cli import cli, pass_config, search_by_id_name
-
-
-@cli.group()
-@pass_config
-def project(config):
-    """proxiML project commands."""
-    pass
-
-
-@project.command()
-@pass_config
-def list(config):
-    """List projects."""
-    data = [
-        ["ID", "NAME", "OWNER", "MINE"],
-        [
-            "-" * 80,
-            "-" * 80,
-            "-" * 80,
-            "-" * 80,
-        ],
-    ]
-
-    projects = config.proximl.run(config.proximl.client.projects.list())
-
-    for project in projects:
-        data.append(
-            [
-                project.id,
-                project.name,
-                project.owner_name,
-                "X" if project.is_owner else "",
-            ]
-        )
-
-    for row in data:
-        click.echo(
-            "{: >38.36} {: >30.28} {: >15.13} {: >4.4}" "".format(*row),
-            file=config.stdout,
-        )
-
-
-@project.command()
-@click.argument("name", type=click.STRING)
-@pass_config
-def create(config, name):
-    """
-    Create a project.
-
-    Project is created with the specified NAME.
-    """
-
-    return config.proximl.run(
-        config.proximl.client.projects.create(
-            name=name,
-        )
-    )
-
-
-@project.command()
-@click.argument("project", type=click.STRING)
-@pass_config
-def remove(config, project):
-    """
-    Remove a project.
-
-    PROJECT may be specified by name or ID, but ID is preferred.
-    """
-    projects = config.proximl.run(config.proximl.client.projects.list())
-
-    found = search_by_id_name(project, projects)
-    if None is found:
-        raise click.UsageError("Cannot find specified project.")
-
-    return config.proximl.run(found.remove())
-
-
-@project.command()
-@pass_config
-def list_datastores(config):
-    """List project datastores."""
-    data = [
-        ["ID", "NAME", "TYPE", "REGION_UUID"],
-        [
-            "-" * 80,
-            "-" * 80,
-            "-" * 80,
-            "-" * 80,
-        ],
-    ]
-    project = config.proximl.run(
-        config.proximl.client.projects.get(config.proximl.client.project)
-    )
-
-    datastores = config.proximl.run(project.list_datastores())
-
-    for datastore in datastores:
-        data.append(
-            [
-                datastore.id,
-                datastore.name,
-                datastore.type,
-                datastore.region_uuid,
-            ]
-        )
-
-    for row in data:
-        click.echo(
-            "{: >38.36} {: >30.28} {: >15.13} {: >38.36}" "".format(*row),
-            file=config.stdout,
-        )
-
-
-@project.command()
-@pass_config
-def list_reservations(config):
-    """List project reservations."""
-    data = [
-        ["ID", "NAME", "TYPE", "RESOURCE", "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())
-
-    for reservation in reservations:
-        data.append(
-            [
-                reservation.id,
-                reservation.name,
-                reservation.type,
-                reservation.resource,
-                reservation.hostname,
-                reservation.region_uuid,
-            ]
-        )
-
-    for row in data:
-        click.echo(
-            "{: >38.36} {: >30.28} {: >8.6} {: >15.13} {: >30.28} {: >38.36}"
-            "".format(*row),
-            file=config.stdout,
-        )

proximl/cloudbender/reservations.py

@@ -1,126 +0,0 @@
-import json
-import logging
-
-
-class Reservations(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}",
-            "GET",
-            kwargs,
-        )
-        return Reservation(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",
-            "GET",
-            kwargs,
-        )
-        reservations = [
-            Reservation(self.proximl, **reservation) for reservation in resp
-        ]
-        return reservations
-
-    async def create(
-        self,
-        provider_uuid,
-        region_uuid,
-        name,
-        type,
-        resource,
-        hostname,
-        **kwargs,
-    ):
-        logging.info(f"Creating Reservation {name}")
-        data = dict(
-            name=name,
-            type=type,
-            resource=resource,
-            hostname=hostname,
-            **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",
-            "POST",
-            None,
-            payload,
-        )
-        reservation = Reservation(self.proximl, **resp)
-        logging.info(f"Created Reservation {name} with id {reservation.id}")
-        return reservation
-
-    async def remove(self, provider_uuid, region_uuid, id, **kwargs):
-        await self.proximl._query(
-            f"/provider/{provider_uuid}/region/{region_uuid}/reservation/{id}",
-            "DELETE",
-            kwargs,
-        )
-
-
-class Reservation:
-    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")
-
-    @property
-    def id(self) -> str:
-        return self._id
-
-    @property
-    def provider_uuid(self) -> str:
-        return self._provider_uuid
-
-    @property
-    def region_uuid(self) -> str:
-        return self._region_uuid
-
-    @property
-    def type(self) -> str:
-        return self._type
-
-    @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()})
-
-    def __repr__(self):
-        return f"Reservation( proximl , **{self._reservation.__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}",
-            "DELETE",
-        )
-
-    async def refresh(self):
-        resp = await self.proximl._query(
-            f"/provider/{self._provider_uuid}/region/{self._region_uuid}/reservation/{self._id}",
-            "GET",
-        )
-        self.__init__(self.proximl, **resp)
-        return self

proximl/projects.py

@@ -1,187 +0,0 @@
-import json
-import logging
-
-
-class Projects(object):
-    def __init__(self, proximl):
-        self.proximl = proximl
-
-    async def get(self, id, **kwargs):
-        resp = await self.proximl._query(f"/project/{id}", "GET", kwargs)
-        return Project(self.proximl, **resp)
-
-    async def list(self, **kwargs):
-        resp = await self.proximl._query(f"/project", "GET", kwargs)
-        projects = [Project(self.proximl, **project) for project in resp]
-        return projects
-
-    async def create(self, name, copy_keys=False, **kwargs):
-        data = dict(
-            name=name,
-            copy_keys=copy_keys,
-        )
-        payload = {k: v for k, v in data.items() if v is not None}
-        logging.info(f"Creating Project {name}")
-        resp = await self.proximl._query("/project", "POST", None, payload)
-        project = Project(self.proximl, **resp)
-        logging.info(f"Created Project {name} with id {project.id}")
-
-        return project
-
-    async def remove(self, id, **kwargs):
-        await self.proximl._query(f"/project/{id}", "DELETE", kwargs)
-
-
-class ProjectDatastore:
-    def __init__(self, proximl, **kwargs):
-        self.proximl = proximl
-        self._datastore = kwargs
-        self._id = self._datastore.get("id")
-        self._project_uuid = self._datastore.get("project_uuid")
-        self._name = self._datastore.get("name")
-        self._type = self._datastore.get("type")
-        self._region_uuid = self._datastore.get("region_uuid")
-
-    @property
-    def id(self) -> str:
-        return self._id
-
-    @property
-    def project_uuid(self) -> str:
-        return self._project_uuid
-
-    @property
-    def name(self) -> str:
-        return self._name
-
-    @property
-    def type(self) -> str:
-        return self._type
-
-    @property
-    def region_uuid(self) -> str:
-        return self._region_uuid
-
-    def __str__(self):
-        return json.dumps({k: v for k, v in self._datastore.items()})
-
-    def __repr__(self):
-        return f"ProjectDatastore( proximl , **{self._datastore.__repr__()})"
-
-    def __bool__(self):
-        return bool(self._id)
-
-
-class ProjectReservation:
-    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")
-
-    @property
-    def id(self) -> str:
-        return self._id
-
-    @property
-    def project_uuid(self) -> str:
-        return self._project_uuid
-
-    @property
-    def name(self) -> str:
-        return self._name
-
-    @property
-    def type(self) -> str:
-        return self._type
-
-    @property
-    def hostname(self) -> str:
-        return self._hostname
-
-    @property
-    def resource(self) -> str:
-        return self._resource
-
-    @property
-    def region_uuid(self) -> str:
-        return self._region_uuid
-
-    def __str__(self):
-        return json.dumps({k: v for k, v in self._reservation.items()})
-
-    def __repr__(self):
-        return (
-            f"ProjectReservation( proximl , **{self._reservation.__repr__()})"
-        )
-
-    def __bool__(self):
-        return bool(self._id)
-
-
-class Project:
-    def __init__(self, proximl, **kwargs):
-        self.proximl = proximl
-        self._project = kwargs
-        self._id = self._project.get("id")
-        self._name = self._project.get("name")
-        self._is_owner = self._project.get("owner")
-        self._owner_name = self._project.get("owner_name")
-
-    @property
-    def id(self) -> str:
-        return self._id
-
-    @property
-    def name(self) -> str:
-        return self._name
-
-    @property
-    def is_owner(self) -> bool:
-        return self._is_owner
-
-    @property
-    def owner_name(self) -> str:
-        return self._owner_name
-
-    def __str__(self):
-        return json.dumps({k: v for k, v in self._project.items()})
-
-    def __repr__(self):
-        return f"Project( proximl , **{self._project.__repr__()})"
-
-    def __bool__(self):
-        return bool(self._id)
-
-    async def remove(self):
-        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
-        ]
-        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 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")

tests/integration/test_projects_integration.py

@@ -1,44 +0,0 @@
-import re
-import sys
-import asyncio
-from pytest import mark, fixture
-
-pytestmark = [mark.sdk, mark.integration, mark.projects]
-
-
-@mark.create
-@mark.asyncio
-class GetProjectsTests:
-    @fixture(scope="class")
-    async def project(self, proximl):
-        project = await proximl.projects.create(name="New Project", copy_keys=False)
-        yield project
-        await project.remove()
-
-    async def test_get_projects(self, proximl):
-        projects = await proximl.projects.list()
-        assert len(projects) > 0
-
-    async def test_get_project(self, proximl, project):
-        response = await proximl.projects.get(project.id)
-        assert response.id == project.id
-
-    async def test_project_properties(self, project):
-        assert isinstance(project.id, str)
-        assert isinstance(project.name, str)
-        assert isinstance(project.owner_name, str)
-        assert isinstance(project.is_owner, bool)
-        assert project.name == "New Project"
-        assert project.is_owner
-
-    async def test_project_str(self, project):
-        string = str(project)
-        regex = r"^{.*\"id\": \"" + project.id + r"\".*}$"
-        assert isinstance(string, str)
-        assert re.match(regex, string)
-
-    async def test_project_repr(self, project):
-        string = repr(project)
-        regex = r"^Project\( proximl , \*\*{.*'id': '" + project.id + r"'.*}\)$"
-        assert isinstance(string, str)
-        assert re.match(regex, string)

tests/unit/cli/cloudbender/test_cli_reservation_unit.py

@@ -1,38 +0,0 @@
-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.reservations]
-
-from proximl.cli.cloudbender import reservation as specimen
-from proximl.cloudbender.reservations import Reservation
-
-
-def test_list(runner, mock_reservations):
-    with patch("proximl.cli.ProxiML", new=AsyncMock) as mock_proximl:
-        mock_proximl.cloudbender = AsyncMock()
-        mock_proximl.cloudbender.reservations = AsyncMock()
-        mock_proximl.cloudbender.reservations.list = AsyncMock(
-            return_value=mock_reservations
-        )
-        result = runner.invoke(
-            specimen,
-            args=["list", "--provider=prov-id-1", "--region=reg-id-1"],
-        )
-        assert result.exit_code == 0
-        mock_proximl.cloudbender.reservations.list.assert_called_once_with(
-            provider_uuid="prov-id-1", region_uuid="reg-id-1"
-        )
-
-
-def test_list_no_provider(runner, mock_reservations):
-    with patch("proximl.cli.ProxiML", new=AsyncMock) as mock_proximl:
-        mock_proximl.cloudbender = AsyncMock()
-        mock_proximl.cloudbender.reservations = AsyncMock()
-        mock_proximl.cloudbender.reservations.list = AsyncMock(
-            return_value=mock_reservations
-        )
-        result = runner.invoke(specimen, ["list"])
-        assert result.exit_code != 0