refactor: rename ResourceZone to SRMResourceZone across the codebase for consistency (28adf399) · Commits · OOP / code / open-exposure-gateway

src/open_exposure_gateway/adapters/http/srm_client.py

+3 −3

Original line number	Diff line number	Diff line
		@@ -13,9 +13,9 @@ from open_exposure_gateway.core.exceptions import (
		NotFoundException,
		)
		from open_exposure_gateway.domain.edge_application_management import (
		ResourceZone,
		SRMCatalogPayload,
		SRMCatalogServiceSpecificationCreated,
		SRMResourceZone,
		SRMServiceInstance,
		)

		@@ -105,7 +105,7 @@ class SRMClient:
		region: str \| None = None,
		status: str \| None = None,
		x_correlator: str \| None = None,
		) -> list[ResourceZone]:
		) -> list[SRMResourceZone]:
		params = {}
		if region is not None:
		params["region"] = region
		@@ -122,7 +122,7 @@ class SRMClient:
		params=params or None,
		headers=headers or None,
		)
		return [ResourceZone.model_validate(z) for z in data]
		return [SRMResourceZone.model_validate(z) for z in data]

		async def create_qod_session(
		self,

+2 −2

Original line number	Diff line number	Diff line
		@@ -41,7 +41,6 @@ from open_exposure_gateway.domain.edge_application_management import (
		GpuPool,
		NetworkInterface,
		RequiredResources,
		ResourceZone,
		SRMAccelerator,
		SRMCapabilityRequirement,
		SRMCatalogPayload,
		@@ -54,6 +53,7 @@ from open_exposure_gateway.domain.edge_application_management import (
		SRMDeployTarget,
		SRMNetworkInterface,
		SRMRepoMetadata,
		SRMResourceZone,
		SRMServiceInstance,
		SRMServiceSpecDescriptor,
		SRMServiceSpecEntry,
		@@ -117,7 +117,7 @@ def _parse_storage_mb(value: str) -> int:
		return int(amount)


		def build_edge_cloud_zone(srm_zone: ResourceZone) -> EdgeCloudZone:
		def build_edge_cloud_zone(srm_zone: SRMResourceZone) -> EdgeCloudZone:
		try:
		status = EdgeCloudZoneStatus(srm_zone.state)
		except ValueError:

+2 −2

Original line number	Diff line number	Diff line
		@@ -37,9 +37,9 @@ from open_exposure_gateway.core.exceptions import (
		NotImplementedException,
		)
		from open_exposure_gateway.domain.edge_application_management import (
		ResourceZone,
		SRMCatalogPayload,
		SRMOperationCompleted,
		SRMResourceZone,
		Subject,
		)
		from open_exposure_gateway.domain.models import (
		@@ -136,7 +136,7 @@ class EdgeApplicationManagementService:
		return manifests

		def _log_skipped_entry(
		self, kind: str, entry: ResourceZone \| SRMCatalogPayload, exc: Exception
		self, kind: str, entry: SRMResourceZone \| SRMCatalogPayload, exc: Exception
		) -> None:
		logger.warning(
		"unmappable_srm_entry_skipped",

+5 −5

Original line number	Diff line number	Diff line
		@@ -94,21 +94,21 @@ class AppDeploymentTranslation(BaseModel):
		requested_at: str


		class ResourceZoneLocation(BaseModel):
		class SRMResourceZoneLocation(BaseModel):
		region: str \| None = None
		geo: Any \| None = None


		class ResourceZoneMetadata(BaseModel):
		class SRMResourceZoneMetadata(BaseModel):
		provider: str
		location: ResourceZoneLocation \| None = None
		location: SRMResourceZoneLocation \| None = None


		class ResourceZone(BaseModel):
		class SRMResourceZone(BaseModel):
		id: str
		name: str
		state: str
		metadata: ResourceZoneMetadata
		metadata: SRMResourceZoneMetadata


		class SRMAccelerator(BaseModel):

+2 −2

Original line number	Diff line number	Diff line
		@@ -5,9 +5,9 @@ from open_exposure_gateway.api.camara.quality_on_demand.v0_10_1.schemas import (
		QoDSessionResponse,
		)
		from open_exposure_gateway.domain.edge_application_management import (
		ResourceZone,
		SRMCatalogPayload,
		SRMCatalogServiceSpecificationCreated,
		SRMResourceZone,
		SRMServiceInstance,
		)

		@@ -18,7 +18,7 @@ class SRMClientPort(Protocol):
		region: str \| None,
		status: str \| None,
		x_correlator: str \| None,
		) -> list[ResourceZone]: ...
		) -> list[SRMResourceZone]: ...

		async def get_apps(self, x_correlator: str \| None) -> list[SRMCatalogPayload]: ...