Commit ddc98296 authored by Dimitrios Laskaratos's avatar Dimitrios Laskaratos
Browse files

Merge branch 'dev-dimitris' into 'main' 

Dev dimitris

See merge request !2
parents f18e9318 3ae87ee4

edge_cloud_management_api/controllers/app_controllers.py

+0 −2
Original line number Diff line number Diff line
@@ -84,8 +84,6 @@ def delete_app(appId, x_correlator=None): 
            500,

        )







def create_app_instance():

    logger.info("Received request to create app instance")

edge_cloud_management_api/controllers/edge_cloud_controller.py

+1 −5
Original line number Diff line number Diff line
@@ -111,13 +111,9 @@ def get_edge_cloud_zones(x_correlator: str | None = None, region=None, status=No 
        }

        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

edge_cloud_management_api/services/federation_services.py

+1 −4
Original line number Diff line number Diff line 


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

edge_cloud_management_api/specification/openapi.yaml

+8 −11
Original line number Diff line number Diff line
@@ -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: