resolve conflicts

edge_cloud_management_api/controllers/app_controllers.py

@@ -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():
     logger.info("Received request to create app instance")

edge_cloud_management_api/controllers/edge_cloud_controller.py

@@ -110,15 +110,13 @@ 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
-    
-<<<<<<< HEAD
 
 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
->>>>>>> 1c306f8dd595452cbe7804c3473f2f4b77a0b270
+
+def get_zone_details(zoneId:str):
+    pass
+

edge_cloud_management_api/controllers/network_functions_controller.py

 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.services.pi_edge_services import PiEdgeAPIClientFactory
 
@@ -138,4 +138,4 @@ def get_all_traffic_influence_resources():
             return (
             jsonify({"error": "An unexpected error occurred", "details": str(e)}),
             500,
-    )
\ No newline at end of file
+    )

edge_cloud_management_api/services/pi_edge_services.py

@@ -340,86 +340,7 @@ class PiEdgeAPIClient:
             logger.info(e.args)
             return e.args    
 
-    def create_qod_session(self, body:dict):
-
-        url = f"{self.base_url}/sessions"
-        request_headers = self._get_headers()
-        try:
-            response = requests.post(url, json=body, headers=request_headers,verify=False)
-            response.raise_for_status()
-            return response.json()
-        except Exception as e:
-            logger.info(e.args)
-            return e.args
-
-    def get_qod_session(self, sessionId: str):
-
-        url = f"{self.base_url}/sessions/"+sessionId
-        request_headers = self._get_headers()
-        try:
-            response = requests.get(url, headers=request_headers,verify=False)
-            response.raise_for_status()
-            return response
-        except Exception as e:
-            logger.info(e.args)
-            return e.args
-        
-    def delete_qod_session(self, sessionId: str):
-
-        url = f"{self.base_url}/sessions/"+sessionId
-        request_headers = self._get_headers()
-        try:
-            response = requests.delete(url, headers=request_headers,verify=False)
-            response.raise_for_status()
-            return response
-        except Exception as e:
-            logger.info(e.args)
-            return e.args
 
-    def create_traffic_influence_resource(self, body_dict):
-        url = f"{self.base_url}/traffic-influences/"
-        request_headers = self._get_headers()
-        try:
-            response = requests.post(url, json=body_dict, headers=request_headers,verify=False)
-            response.raise_for_status()
-            return response.json()
-        except Exception as e:
-            logger.info(e.args)
-            return e.args
-
-    def delete_traffic_influence_resource(self, id: str):
-        url = f"{self.base_url}/traffic-influences/"+id
-        request_headers = self._get_headers()
-        try:
-            response = requests.delete(url, headers=request_headers,verify=False)
-            response.raise_for_status()
-            return response
-        except Exception as e:
-            logger.info(e.args)
-            return e.args
-
-    def get_traffic_influence_resource(self, id: str):
-        url = f"{self.base_url}/traffic-influences/"+id
-        request_headers = self._get_headers()
-        try:
-            response = requests.get(url, headers=request_headers,verify=False)
-            response.raise_for_status()
-            return response.json()
-        except Exception as e:
-            logger.info(e.args)
-            return e.args
-
-    def get_all_traffic_influence_resources(self):
-        url = f"{self.base_url}/traffic-influences/"
-        request_headers = self._get_headers()
-        try:
-            response = requests.get(url, headers=request_headers,verify=False)
-            response.raise_for_status()
-            return response.json()
-        except Exception as e:
-            logger.info(e.args)
-            return e.args
-        
 
 
 class PiEdgeAPIClientFactory: