use the primitive types in more places (#514)

This commit is contained in:
bmc-msft
2021-02-05 13:10:37 -05:00
committed by GitHub
parent 51f4eea069
commit 1d74379a70
17 changed files with 74 additions and 61 deletions

View File

@ -12,7 +12,7 @@ from pydantic import BaseModel, Extra, Field
from .enums import OS, Architecture, NodeState, TaskState
from .models import AutoScaleConfig, Error, JobConfig, Report, TaskConfig, UserInfo
from .primitives import Container, Region
from .primitives import Container, PoolName, Region
from .responses import BaseResponse
@ -66,7 +66,7 @@ class EventPing(BaseResponse):
class EventScalesetCreated(BaseEvent):
scaleset_id: UUID
pool_name: str
pool_name: PoolName
vm_sku: str
image: str
region: Region
@ -75,21 +75,21 @@ class EventScalesetCreated(BaseEvent):
class EventScalesetFailed(BaseEvent):
scaleset_id: UUID
pool_name: str
pool_name: PoolName
error: Error
class EventScalesetDeleted(BaseEvent):
scaleset_id: UUID
pool_name: str
pool_name: PoolName
class EventPoolDeleted(BaseEvent):
pool_name: str
pool_name: PoolName
class EventPoolCreated(BaseEvent):
pool_name: str
pool_name: PoolName
os: OS
arch: Architecture
managed: bool
@ -112,19 +112,19 @@ class EventProxyFailed(BaseEvent):
class EventNodeCreated(BaseEvent):
machine_id: UUID
scaleset_id: Optional[UUID]
pool_name: str
pool_name: PoolName
class EventNodeDeleted(BaseEvent):
machine_id: UUID
scaleset_id: Optional[UUID]
pool_name: str
pool_name: PoolName
class EventNodeStateUpdated(BaseEvent):
machine_id: UUID
scaleset_id: Optional[UUID]
pool_name: str
pool_name: PoolName
state: NodeState

View File

@ -334,7 +334,7 @@ class ClientCredentials(BaseModel):
class AgentConfig(BaseModel):
client_credentials: Optional[ClientCredentials]
onefuzz_url: str
pool_name: str
pool_name: PoolName
heartbeat_queue: Optional[str]
instrumentation_key: Optional[str]
telemetry_key: Optional[str]

View File

@ -135,7 +135,7 @@ class NodeSearch(BaseRequest):
machine_id: Optional[UUID]
state: Optional[List[NodeState]]
scaleset_id: Optional[UUID]
pool_name: Optional[str]
pool_name: Optional[PoolName]
class NodeGet(BaseRequest):