diff --git a/pilab/events/meta.py b/pilab/events/meta.py index 85713c7cb5c623a80fbc8596a640d6114778c328..b65d8f2d261ba2ec2307d8313157854f44fc651a 100644 --- a/pilab/events/meta.py +++ b/pilab/events/meta.py @@ -31,19 +31,19 @@ class Host(BaseModel): mac: str ipv4_address: IPv4Address hostname: str + model: str class Switch(Host): """ representation of host object with id """ - model: str poe: bool class Controller(Host): """ representation of host object with id """ - model: str + pass class HostUpdate(Host): @@ -58,7 +58,6 @@ class Pi(Host): representation of pi object with host id """ serial: bytes - display: bool position: int ssh_host_ed25519_key: Optional[str] diff --git a/pilab/events/reservation.py b/pilab/events/reservation.py index 293346517981bf7e193a7071d1e984288026a5aa..862ac929ca4beb398576bec41eb00e0955d50bdc 100644 --- a/pilab/events/reservation.py +++ b/pilab/events/reservation.py @@ -25,7 +25,7 @@ class Reservation(BaseModel): pi_id : int starttime: datetime endtime: datetime - extraUsers: Optional[List[str]] = None + extra_users: Optional[List[str]] = None reason: str @@ -302,10 +302,10 @@ def get_active_users(pi_id: int): raise RuntimeError("Reservation consumer is not initialized") if res and res.endtime > datetime.utcnow().replace(tzinfo=ZoneInfo('UTC')): - if res.extraUsers is None: + if res.extra_users is None: return [res.owner] else: - return [*res.extraUsers, res.owner] + return [*res.extra_users, res.owner] else: return [] diff --git a/setup.py b/setup.py index d02e696706e81bf5f46e66c8f10d05802702a123..17257795335a85d2dff570a7e44d6340ef9170a9 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages setup( name='pilab', - version='4.3.0', + version='4.3.1', description='Shared-Libs for the pi-lab microservices', url='https://code.fbi.h-da.de/api/v4/projects/27896/packages/pypi/pilab', author='Max Reinheimer',