fix!: removed hard-coded responses when network adapter is not available (e333683a) · Commits · OOP / code / service-resource-manager

service-resource-manager-implementation/src/controllers/network_functions_controller.py

+37 −38

Original line number	Diff line number	Diff line
		@@ -57,15 +57,10 @@ def create_qod_session():
		return _safe_http_json_response(response)
		else:
		return {
		"applicationServer": {
		"ipv4Address": "198.51.100.0/24"
		},
		"qosProfile": "QOS_L",
		"sink": "https://application-server.com/notifications",
		"sessionId": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
		"duration": 3600,
		"qosStatus": "REQUESTED"
		}, 200
		"status": 503,
		"code": "UNAVAILABLE",
		"message": "Service unavailable: Network Adapter",
		}, 503
		except Exception as ce_:
		logger.error(ce_)
		return {"error": str(ce_)}, 500
		@@ -79,7 +74,11 @@ def get_qod_session(session_id: str):
		response = network_adapter.get_qod_session(session_id)
		return _safe_http_json_response(response)
		else:
		return {"message": "Requested QoD session with ID: " + session_id}, 200
		return {
		"status": 503,
		"code": "UNAVAILABLE",
		"message": "Service unavailable: Network Adapter",
		}, 503
		except Exception as ce_:
		logger.error(ce_)
		return {"error": str(ce_)}, 500
		@@ -91,7 +90,11 @@ def delete_qod_session(session_id: str):
		response = network_adapter.delete_qod_session(session_id)
		return _safe_http_json_response(response)
		else:
		return {"message": "Deleting QoD session with ID: " + session_id}, 200
		return {
		"status": 503,
		"code": "UNAVAILABLE",
		"message": "Service unavailable: Network Adapter",
		}, 503
		except Exception as ce_:
		logger.error(ce_)
		return {"error": str(ce_)}, 500
		@@ -104,23 +107,10 @@ def create_traffic_influence_resource(body):
		return _safe_http_json_response(response)
		else:
		return {
		"trafficInfluenceID": "string",
		"apiConsumerId": "string",
		"appId": "6B29FC40-CA47-1067-B31D-00DD010662DA",
		"appInstanceId": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
		"edgeCloudRegion": "string",
		"edgeCloudZoneId": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
		"state": "ordered",
		"sourceTrafficFilters": {
		"sourcePort": 65535
		},
		"destinationTrafficFilters": {
		"destinationPort": 65535,
		"destinationProtocol": "TCP"
		},
		"notificationUri": "string",
		"notificationAuthToken": "string"
		}, 200
		"status": 503,
		"code": "UNAVAILABLE",
		"message": "Service unavailable: Network Adapter",
		}, 503
		except Exception as ce_:
		logger.error(ce_)
		return {"error": str(ce_)}, 500
		@@ -132,7 +122,11 @@ def delete_traffic_influence_resource(traffic_influence_id: str):
		response = network_adapter.delete_traffic_influence_resource(resource_id=traffic_influence_id)
		return _safe_http_json_response(response)
		else:
		return {"message": "Deleting Traffic Influence resource with ID: " + traffic_influence_id}, 200
		return {
		"status": 503,
		"code": "UNAVAILABLE",
		"message": "Service unavailable: Network Adapter",
		}, 503
		except Exception as ce_:
		logger.error(ce_)
		return {"error": str(ce_)}, 500
		@@ -144,7 +138,11 @@ def get_traffic_influence_resource(traffic_influence_id: str):
		response = network_adapter.get_individual_traffic_influence_resource(resource_id=traffic_influence_id)
		return _safe_http_json_response(response)
		else:
		return {"message": "Requested Traffic Influence resource with ID: " + traffic_influence_id}, 200
		return {
		"status": 503,
		"code": "UNAVAILABLE",
		"message": "Service unavailable: Network Adapter",
		}, 503
		except Exception as ce_:
		logger.error(ce_)
		return {"error": str(ce_)}, 500
		@@ -156,7 +154,11 @@ def get_all_traffic_influence_resources():
		response = network_adapter.get_all_traffic_influence_resources()
		return _safe_http_json_response(response)
		else:
		return {"message": "List all Traffic Influence resources"}, 200
		return {
		"status": 503,
		"code": "UNAVAILABLE",
		"message": "Service unavailable: Network Adapter",
		}, 503
		except Exception as ce_:
		logger.error(ce_)
		return {"error": str(ce_)}, 500
		@@ -174,13 +176,10 @@ def retrieve_location():
		return _safe_http_json_response(response)
		else:
		return {
		"lastLocationTime": "2024-01-01T00:00:00Z",
		"area": {
		"areaType": "CIRCLE",
		"center": {"latitude": 0.0, "longitude": 0.0},
		"radius": 50000
		}
		}, 200
		"status": 503,
		"code": "UNAVAILABLE",
		"message": "Service unavailable: Network Adapter",
		}, 503
		except Exception as ce_:
		logger.error(ce_)
		return {"error": str(ce_)}, 500

service-resource-manager-implementation/src/swagger/swagger.yaml

+18 −2

Original line number	Diff line number	Diff line
		@@ -315,6 +315,8 @@ paths:
		responses:
		"200":
		description: Session created.
		"503":
		description: Network Adapter not initialized
		x-openapi-router-controller: src.controllers.network_functions_controller
		/sessions/{sessionId}:
		get:
		@@ -338,6 +340,8 @@ paths:
		description: Method not allowed
		"404":
		description: Session not found
		"503":
		description: Network Adapter not initialized
		x-openapi-router-controller: src.controllers.network_functions_controller
		delete:
		tags:
		@@ -360,6 +364,8 @@ paths:
		description: Method not allowed
		"404":
		description: Session not found
		"503":
		description: Network Adapter not initialized
		x-openapi-router-controller: src.controllers.network_functions_controller
		/traffic-influences:
		post:
		@@ -376,6 +382,8 @@ paths:
		responses:
		"200":
		description: Resource created.
		"503":
		description: Network Adapter not initialized
		x-openapi-router-controller: src.controllers.network_functions_controller
		get:
		tags:
		@@ -385,6 +393,8 @@ paths:
		responses:
		"200":
		description: Resources retrieved.
		"503":
		description: Network Adapter not initialized
		x-openapi-router-controller: src.controllers.network_functions_controller
		/traffic-influences/{trafficInfluenceId}:
		get:
		@@ -408,6 +418,8 @@ paths:
		description: Method not allowed
		"404":
		description: Session not found
		"503":
		description: Network Adapter not initialized
		x-openapi-router-controller: src.controllers.network_functions_controller
		delete:
		tags:
		@@ -430,6 +442,8 @@ paths:
		description: Method not allowed
		"404":
		description: Session not found
		"503":
		description: Network Adapter not initialized
		x-openapi-router-controller: src.controllers.network_functions_controller
		/location/retrieve:
		post:
		@@ -456,6 +470,8 @@ paths:
		description: Device not found
		"500":
		description: Internal server error
		"503":
		description: Network Adapter not initialized
		x-openapi-router-controller: src.controllers.network_functions_controller
		components:
		schemas: