mirror of
https://github.com/GNS3/gns3-server.git
synced 2026-10-27 18:52:23 +02:00
fix(typing): resolve mypy errors in schemas.controller.computes
This commit is contained in:
parent
36945daa83
commit
0954723ebd
@ -38,10 +38,10 @@ class ComputeBase(BaseModel):
|
|||||||
Data to create a compute.
|
Data to create a compute.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
protocol: Protocol
|
protocol: Optional[Protocol] = None
|
||||||
host: str
|
host: Optional[str] = None
|
||||||
port: int = Field(..., gt=0, le=65535)
|
port: Optional[int] = Field(None, gt=0, le=65535)
|
||||||
user: str = None
|
user: Optional[str] = None
|
||||||
password: Optional[SecretStr] = None
|
password: Optional[SecretStr] = None
|
||||||
name: Optional[str] = None
|
name: Optional[str] = None
|
||||||
model_config = ConfigDict(use_enum_values=True)
|
model_config = ConfigDict(use_enum_values=True)
|
||||||
@ -52,7 +52,10 @@ class ComputeCreate(ComputeBase):
|
|||||||
Data to create a compute.
|
Data to create a compute.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
compute_id: Union[str, uuid.UUID] = None
|
protocol: Protocol
|
||||||
|
host: str
|
||||||
|
port: int = Field(..., gt=0, le=65535)
|
||||||
|
compute_id: Optional[Union[str, uuid.UUID]] = None
|
||||||
model_config = ConfigDict(
|
model_config = ConfigDict(
|
||||||
json_schema_extra={
|
json_schema_extra={
|
||||||
"example": {"name": "My compute", "host": "127.0.0.1", "port": 3080, "user": "user", "password": "password"}
|
"example": {"name": "My compute", "host": "127.0.0.1", "port": 3080, "user": "user", "password": "password"}
|
||||||
@ -77,9 +80,6 @@ class ComputeUpdate(ComputeBase):
|
|||||||
Data to update a compute.
|
Data to update a compute.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
protocol: Optional[Protocol] = None
|
|
||||||
host: Optional[str] = None
|
|
||||||
port: Optional[int] = Field(None, gt=0, le=65535)
|
|
||||||
user: Optional[str] = None
|
user: Optional[str] = None
|
||||||
password: Optional[SecretStr] = None
|
password: Optional[SecretStr] = None
|
||||||
model_config = ConfigDict(
|
model_config = ConfigDict(
|
||||||
@ -110,6 +110,9 @@ class Compute(DateTimeModelMixin, ComputeBase):
|
|||||||
Data returned for a compute.
|
Data returned for a compute.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
protocol: Protocol
|
||||||
|
host: str
|
||||||
|
port: int = Field(..., gt=0, le=65535)
|
||||||
compute_id: Union[str, uuid.UUID]
|
compute_id: Union[str, uuid.UUID]
|
||||||
name: str
|
name: str
|
||||||
connected: Optional[bool] = Field(None, description="Whether the controller is connected to the compute or not")
|
connected: Optional[bool] = Field(None, description="Whether the controller is connected to the compute or not")
|
||||||
|
|||||||
@ -43,7 +43,7 @@ class ComputesService:
|
|||||||
|
|
||||||
async def create_compute(self, compute_create: schemas.ComputeCreate, connect: bool = False) -> models.Compute:
|
async def create_compute(self, compute_create: schemas.ComputeCreate, connect: bool = False) -> models.Compute:
|
||||||
|
|
||||||
if await self._computes_repo.get_compute(compute_create.compute_id):
|
if compute_create.compute_id and await self._computes_repo.get_compute(compute_create.compute_id):
|
||||||
raise ControllerBadRequestError(f"Compute '{compute_create.compute_id}' is already registered")
|
raise ControllerBadRequestError(f"Compute '{compute_create.compute_id}' is already registered")
|
||||||
db_compute = await self._computes_repo.create_compute(compute_create)
|
db_compute = await self._computes_repo.create_compute(compute_create)
|
||||||
compute = await self._controller.add_compute(
|
compute = await self._controller.add_compute(
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user