Commit f5245d1e authored by George Papathanail's avatar George Papathanail
Browse files

resolve conflicts

parent be4c643f

.coverage

(52 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

coverage.xml

+327 −163

File changed.

Preview size limit exceeded, changes collapsed.

edge_cloud_management_api/controllers/app_controllers.py

+0 −73
Original line number Original line Diff line number Diff line
@@ -85,79 +85,6 @@ def delete_app(appId, x_correlator=None): 
        )

        )









#def create_app_instance():

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



  #  try:

        # Step 1: Get request body

   #     body = request.get_json()

    #    logger.debug(f"Request body: {body}")



        # Step 2: Validate body format

     #   app_id = body.get('appId')

     #   app_zones = body.get('appZones')



      #  if not app_id or not app_zones:

       #     return jsonify({"error": "Missing required fields: appId or appZones"}), 400



        # Step 3: Connect to Mongo and check if app exists

        # with MongoManager() as mongo_manager:

        #     app_data = mongo_manager.find_document("apps", {"_id": app_id})

       # pi_edge_client_factory = PiEdgeAPIClientFactory()

       # pi_edge_client = pi_edge_client_factory.create_pi_edge_api_client()

        # app_data = pi_edge_client.get_app(app_id)



        # if len(app_data)<1:

        #     logger.warning(f"No application found with ID {app_id}")

        #     return jsonify({"error": "App not found", "details": f"No application found with ID {app_id}"}), 404



        # logger.info(f"Application {app_id} found in database")



        # Step 4: Deploy app instance using Pi-Edge client

    



        #logger.info(f"Preparing to send deployment request to SRM for appId={app_id}")



       # deployment_payload = {

        #    "appId": app_id,

        #    "appZones": app_zones

        #}



        #Print everything before sending

       # print("\n=== Preparing Deployment Request ===")

       # print(f"Endpoint: {pi_edge_client.base_url}/deployedServiceFunction")

       # print(f"Headers: {pi_edge_client._get_headers()}")

       # print(f"Payload: {deployment_payload}")

       # print("=== End of Deployment Request ===\n")



        #Try sending to Pi-Edge, catch connection errors separately

       # try:

        #    response = pi_edge_client.deploy_service_function(data=deployment_payload)



         #   if isinstance(response, dict) and "error" in response:

          #      logger.warning(f"Failed to deploy service function: {response}")

           #     return jsonify({

            #        "warning": "Deployment not completed (SRM service unreachable)",

             #       "details": response

             #   }), 202  # Still accept the request but warn



           # logger.info(f"Deployment response from SRM: {response}")



       # except Exception as inner_error:

        #    logger.error(f"Exception while trying to deploy to SRM: {inner_error}")

         #   return jsonify({

          #      "warning": "SRM backend unavailable. Deployment request was built correctly.",

           #     "details": str(inner_error)

           # }), 202  # Still accept it (because your backend worked)



       # return jsonify({"message": f"Application {app_id} instantiation accepted"}), 202



   # except ValidationError as e:

    #    logger.error(f"Validation error: {str(e)}")

     #   return jsonify({"error": "Validation error", "details": str(e)}), 400

    #except Exception as e:

     #   logger.error(f"Unexpected error in create_app_instance: {str(e)}")

     #   return jsonify({"error": "An unexpected error occurred", "details": str(e)}), 500





def create_app_instance():

def create_app_instance():

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

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

edge_cloud_management_api/controllers/edge_cloud_controller.py

+4 −6
Original line number Original line Diff line number Diff line
@@ -111,14 +111,12 @@ def get_edge_cloud_zones(x_correlator: str | None = None, region=None, status=No 
        }

        }

        return jsonify(error_info), 500

        return jsonify(error_info), 500





<<<<<<< HEAD



def edge_cloud_zone_details(zoneId: str) -> dict:

def edge_cloud_zone_details(zoneId: str) -> dict:

    pi_edge_factory = PiEdgeAPIClientFactory()

    pi_edge_factory = PiEdgeAPIClientFactory()

    api_client = pi_edge_factory.create_pi_edge_api_client()

    api_client = pi_edge_factory.create_pi_edge_api_client()

    result = api_client.edge_cloud_zone_details(zone_id=zoneId)

    result = api_client.edge_cloud_zone_details(zone_id=zoneId)

    return result

    return result

=======



def get_zone_details(zoneId:str):

def get_zone_details(zoneId:str):

    pass

    pass

>>>>>>> 1c306f8dd595452cbe7804c3473f2f4b77a0b270

edge_cloud_management_api/controllers/network_functions_controller.py

+2 −2
Original line number Original line Diff line number Diff line 
from flask import jsonify

from flask import jsonify

from pydantic import Field, ValidationError

from pydantic import ValidationError #Field

from edge_cloud_management_api.managers.log_manager import logger

from edge_cloud_management_api.managers.log_manager import logger

from edge_cloud_management_api.services.pi_edge_services import PiEdgeAPIClientFactory

from edge_cloud_management_api.services.pi_edge_services import PiEdgeAPIClientFactory