refactor: rename SRMResourceZone to SRMZone and update related references across the codebase (305146a0) · Commits · OOP / code / open-exposure-gateway

src/open_exposure_gateway/adapters/http/srm_client.py

+4 −4

Original line number	Diff line number	Diff line
		@@ -15,8 +15,8 @@ from open_exposure_gateway.core.exceptions import (
		from open_exposure_gateway.domain.edge_application_management import (
		SRMCatalogPayload,
		SRMCatalogServiceSpecificationCreated,
		SRMResourceZone,
		SRMServiceInstance,
		SRMZone,
		)

		logger = structlog.get_logger(__name__)
		@@ -100,12 +100,12 @@ class SRMClient:
		details=str(exc),
		)

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

		async def create_qod_session(
		self,

src/open_exposure_gateway/application/mappers/edge_application_mapper.py

+7 −11

Original line number	Diff line number	Diff line
		@@ -53,7 +53,6 @@ from open_exposure_gateway.domain.edge_application_management import (
		SRMDeployTarget,
		SRMNetworkInterface,
		SRMRepoMetadata,
		SRMResourceZone,
		SRMServiceInstance,
		SRMServiceSpecDescriptor,
		SRMServiceSpecEntry,
		@@ -61,6 +60,7 @@ from open_exposure_gateway.domain.edge_application_management import (
		SRMTerminateCommand,
		SRMTerminatePayload,
		SRMTopologyConstraints,
		SRMZone,
		)
		from open_exposure_gateway.domain.models import AppInstance, AppInstanceState

		@@ -131,7 +131,7 @@ def _parse_storage_mb(value: str) -> int:
		return int(amount)


		def build_edge_cloud_zone(srm_zone: SRMResourceZone) -> EdgeCloudZone:
		def build_edge_cloud_zone(srm_zone: SRMZone) -> EdgeCloudZone:
		try:
		status = EdgeCloudZoneStatus(srm_zone.state)
		except ValueError:
		@@ -315,9 +315,7 @@ def build_app_instance_info(instance: SRMServiceInstance, app_id: UUID) -> AppIn
		appId=app_id,
		appProvider=instance.app_provider_id,
		status=status,
		edgeCloudZoneId=UUID(instance.resource_zone_id)
		if instance.resource_zone_id
		else UUID(int=0),
		edgeCloudZoneId=UUID(instance.zone_id) if instance.zone_id else UUID(int=0),
		componentEndpointInfo=endpoint_info or None,
		)

		@@ -590,11 +588,9 @@ def build_app_deployment_translation(
		correlation_id=correlation_id,
		tenant_id=tenant_id,
		app_provider_id=app_provider_id,
		resource_zone_id=str(request.edgeCloudZoneId),
		zone_id=str(request.edgeCloudZoneId),
		name=request.name,
		compute_domain_id=str(request.kubernetesClusterRef)
		if request.kubernetesClusterRef
		else None,
		domain_id=str(request.kubernetesClusterRef) if request.kubernetesClusterRef else None,
		idempotency_key=idempotency_key,
		requested_at="",
		)
		@@ -613,8 +609,8 @@ def build_deploy_command(
		targets=[
		SRMDeployTarget(
		app_instance_id=str(translation.app_instance_id),
		resource_zone_id=translation.resource_zone_id,
		compute_domain_id=translation.compute_domain_id,
		zone_id=translation.zone_id,
		domain_id=translation.domain_id,
		)
		],
		deploy=SRMDeployPayload(

src/open_exposure_gateway/application/services/edge_application_management_service.py

+6 −6

Original line number	Diff line number	Diff line
		@@ -40,7 +40,7 @@ from open_exposure_gateway.core.exceptions import (
		from open_exposure_gateway.domain.edge_application_management import (
		SRMCatalogPayload,
		SRMOperationCompleted,
		SRMResourceZone,
		SRMZone,
		Subject,
		)
		from open_exposure_gateway.domain.models import (
		@@ -135,7 +135,7 @@ class EdgeApplicationManagementService:
		status: Optional[str] = None,
		x_correlator: Optional[str] = None,
		) -> list[EdgeCloudZone]:
		srm_zones = await self.srm_client.get_resource_zones(
		srm_zones = await self.srm_client.get_zones(
		region=region,
		status=status,
		x_correlator=x_correlator,
		@@ -164,7 +164,7 @@ class EdgeApplicationManagementService:
		return manifests

		def _log_skipped_entry(
		self, kind: str, entry: SRMResourceZone \| SRMCatalogPayload, exc: Exception
		self, kind: str, entry: SRMZone \| SRMCatalogPayload, exc: Exception
		) -> None:
		logger.warning(
		"unmappable_srm_entry_skipped",
		@@ -364,8 +364,8 @@ class EdgeApplicationManagementService:
		app_registration_id=app_registration.app_registration_id,
		metadata={
		"name": translation.name,
		"resource_zone_id": translation.resource_zone_id,
		"compute_domain_id": translation.compute_domain_id,
		"zone_id": translation.zone_id,
		"domain_id": translation.domain_id,
		},
		)
		)
		@@ -417,7 +417,7 @@ class EdgeApplicationManagementService:
		appId=translation.app_id,
		appProvider=translation.app_provider_id,
		status=AppInstanceStatus.INSTANTIATING,
		edgeCloudZoneId=UUID(translation.resource_zone_id),
		edgeCloudZoneId=UUID(translation.zone_id),
		)

		async def get_app_instances(

src/open_exposure_gateway/domain/edge_application_management.py

+10 −10

Original line number	Diff line number	Diff line
		@@ -89,28 +89,28 @@ class AppDeploymentTranslation(BaseModel):
		correlation_id: str
		tenant_id: str
		app_provider_id: str
		resource_zone_id: str
		zone_id: str
		name: str
		compute_domain_id: str \| None = None
		domain_id: str \| None = None
		idempotency_key: str \| None = None
		requested_at: str


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


		class SRMResourceZoneMetadata(BaseModel):
		class SRMZoneMetadata(BaseModel):
		provider: str
		location: SRMResourceZoneLocation \| None = None
		location: SRMZoneLocation \| None = None


		class SRMResourceZone(BaseModel):
		class SRMZone(BaseModel):
		id: str
		name: str
		state: str
		metadata: SRMResourceZoneMetadata
		metadata: SRMZoneMetadata


		class SRMAccelerator(BaseModel):
		@@ -218,8 +218,8 @@ class SRMDeployPayload(BaseModel):

		class SRMDeployTarget(BaseModel):
		app_instance_id: str
		resource_zone_id: str
		compute_domain_id: str \| None = None
		zone_id: str
		domain_id: str \| None = None


		class SRMDeployCommand(BaseModel):
		@@ -320,7 +320,7 @@ class SRMServiceInstance(BaseModel):
		service_specification_id: str
		state: str
		app_provider_id: str
		resource_zone_id: str \| None = None
		zone_id: str \| None = None
		name: str \| None = None
		capability_instances: list[SRMCapabilityInstanceSummary] = []

src/open_exposure_gateway/ports/srm_port.py

+3 −3

Original line number	Diff line number	Diff line
		@@ -7,18 +7,18 @@ from open_exposure_gateway.api.camara.quality_on_demand.v0_10_1.schemas import (
		from open_exposure_gateway.domain.edge_application_management import (
		SRMCatalogPayload,
		SRMCatalogServiceSpecificationCreated,
		SRMResourceZone,
		SRMServiceInstance,
		SRMZone,
		)


		class SRMClientPort(Protocol):
		async def get_resource_zones(
		async def get_zones(
		self,
		region: str \| None,
		status: str \| None,
		x_correlator: str \| None,
		) -> list[SRMResourceZone]: ...
		) -> list[SRMZone]: ...

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

Admin message