diff --git a/edge_cloud_management_api/controllers/app_controllers.py b/edge_cloud_management_api/controllers/app_controllers.py index 2a0010605b578f738613079fad5d451af08eda0e..604e10d5e0fd477bd7a2112fed73a671392b6a43 100644 --- a/edge_cloud_management_api/controllers/app_controllers.py +++ b/edge_cloud_management_api/controllers/app_controllers.py @@ -84,8 +84,6 @@ def delete_app(appId, x_correlator=None): 500, ) - - def create_app_instance(): logger.info("Received request to create app instance") diff --git a/edge_cloud_management_api/controllers/edge_cloud_controller.py b/edge_cloud_management_api/controllers/edge_cloud_controller.py index a87191ef1c84617b865beee3d9937917cf9c4ff6..5fe9f5e0246c02041fe9bc0d7817a1727abae0e4 100644 --- a/edge_cloud_management_api/controllers/edge_cloud_controller.py +++ b/edge_cloud_management_api/controllers/edge_cloud_controller.py @@ -110,14 +110,10 @@ def get_edge_cloud_zones(x_correlator: str | None = None, region=None, status=No "message": f"An error occurred: {str(e)}", } return jsonify(error_info), 500 + def edge_cloud_zone_details(zoneId: str) -> dict: pi_edge_factory = PiEdgeAPIClientFactory() api_client = pi_edge_factory.create_pi_edge_api_client() result = api_client.edge_cloud_zone_details(zone_id=zoneId) return result - -def get_zone_details(zoneId:str): - pass - - diff --git a/edge_cloud_management_api/services/federation_services.py b/edge_cloud_management_api/services/federation_services.py index 021994af5b4d3b3f64eb8c900b19a15fc843f868..92be7f48ce6101eb68f5c6116fb497cb6102936c 100644 --- a/edge_cloud_management_api/services/federation_services.py +++ b/edge_cloud_management_api/services/federation_services.py @@ -1,4 +1,3 @@ - import os import requests from requests.exceptions import Timeout, ConnectionError @@ -6,8 +5,6 @@ from edge_cloud_management_api.configs.env_config import config from edge_cloud_management_api.managers.log_manager import logger from edge_cloud_management_api.services.pi_edge_services import PiEdgeAPIClientFactory - - class FederationManagerClient: def __init__(self, base_url=None): self.base_url = base_url or config.FEDERATION_MANAGER_HOST @@ -209,7 +206,7 @@ class FederationManagerClientFactory: }) return {"onboardingResults": results}, 202 - + if __name__ == "__main__": factory = FederationManagerClientFactory() diff --git a/edge_cloud_management_api/specification/openapi.yaml b/edge_cloud_management_api/specification/openapi.yaml index 000c0be3d6bf8dd80472a0e8b419e9c04b567eda..66776eedb79fb8d491241075822a88eec56da88b 100644 --- a/edge_cloud_management_api/specification/openapi.yaml +++ b/edge_cloud_management_api/specification/openapi.yaml @@ -152,15 +152,8 @@ externalDocs: description: Product documentation at Camara url: https://github.com/camaraproject/EdgeCloud -# servers: -# - url: "{apiRoot}/{basePath}" -# variables: -# apiRoot: -# default: http://localhost:443 -# description: API root -# basePath: -# default: edge-application-management/vwip -# description: Base path for the Edge Application Management API +servers: +- url: http://vitrualserver:8080/oeg/1.0.0 tags: - name: Application @@ -629,7 +622,7 @@ paths: # - openId: # - edge-application-management:edge-cloud-zones:read tags: - - Edge Cloud + - Edge Cloud Zones summary: Retrieve a list of the operators Edge Cloud Zones and their status description: | @@ -678,7 +671,7 @@ paths: /edge-cloud-zones/{zoneId}: get: tags: - - Edge Cloud + - Edge Cloud Zones summary: Retrieve the details of an Edge Cloud Zone description: | List of the operators Edge Cloud Zones and their @@ -824,8 +817,12 @@ paths: "405": description: Method not allowed "404": +<<<<<<< HEAD + description: Session not found +======= description: Session not found +>>>>>>> f18e931881554973db7ae6241588db6e667dbf10 /partner: post: tags: