8636259780

Committed 10 Apr 2024 06:48PM UTC coverage: 51.124% (+0.4%) from 50.772%

Build # 8636259780

Build Type

Pull #225

github

Committed by

web-flow

Commit Message

Merge 09b3050d2 into 81df84777

Pull Request Pull Request #225: Handle connection deletions

Run Details

289 of 535 branches covered (54.02%)

Branch coverage included in aggregate %.

20 of 22 new or added lines in 3 files covered. (90.91%)

33 existing lines in 2 files now uncovered.

712 of 1423 relevant lines covered (50.04%)

2.0 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

92.5

/sdx_controller/controllers/connection_controller.py

import json
import logging
import uuid

import connexion
from flask import current_app

from sdx_controller.handlers.connection_handler import ConnectionHandler
from sdx_controller.utils.db_utils import DbUtils

LOG_FORMAT = (
    "%(levelname) -10s %(asctime)s %(name) -30s %(funcName) "
    "-35s %(lineno) -5d: %(message)s"
)
logger = logging.getLogger(__name__)
logging.getLogger("pika").setLevel(logging.WARNING)
logger.setLevel(logging.DEBUG)

# Get DB connection and tables set up.
db_instance = DbUtils()
db_instance.initialize_db()
connection_handler = ConnectionHandler(db_instance)


def delete_connection(connection_id):
    """
    Delete connection order by ID.

    :param connection_id: ID of the connection that needs to be
        deleted
    :type connection_id: int

    :rtype: None
    """
    logger.info(
        f"Handling delete (connecton id: {connection_id}) "
        f"with te_manager: {current_app.te_manager}"
    )

    try:
        # TODO: pce's unreserve_vlan() method silently returns even if the
        # connection_id is not found.  This should in fact be an error.
        #
        # https://github.com/atlanticwave-sdx/pce/issues/180
        current_app.te_manager.unreserve_vlan(connection_id)
    except Exception as e:
        logger.info(f"Delete failed (connection id: {connection_id}): {e}")

    return "OK", 200


def getconnection_by_id(connection_id):
    """
    Find connection by ID.

    :param connection_id: ID of connection that needs to be fetched
    :type connection_id: int

    :rtype: Connection
    """
    value = db_instance.read_from_db(f"{connection_id}")
    return value


def place_connection(body):
    """
    Place an connection request from the SDX-Controller.

    :param body: order placed for creating a connection
    :type body: dict | bytes

    :rtype: Connection
    """
    request_id = uuid.uuid4()
    logger.info(f"Placing connection: request: {body}, request_id: {request_id}")

    if connexion.request.is_json:
        body = connexion.request.get_json()
        logger.info(f"Gathered connexion JSON: {body}")

    logger.info("Placing connection. Saving to database.")
    db_instance.add_key_value_pair_to_db("connection_data", json.dumps(body))
    logger.info("Saving to database complete.")

    logger.info(
        f"Handling request {request_id} with te_manager: {current_app.te_manager}"
    )

    reason, code = connection_handler.place_connection(current_app.te_manager, body)
    logger.info(
        f"place_connection result: request_id: {request_id} reason='{reason}', code={code}"
    )

    result = {
        "request_id": request_id,
        "status": "OK" if code == 200 else "Failure",
        "reason": reason,
    }

    return result, code

1	import json	4✔
2	import logging	4✔
3	import uuid	4✔
4
5	import connexion	4✔
6	from flask import current_app	4✔
7
8	from sdx_controller.handlers.connection_handler import ConnectionHandler	4✔
9	from sdx_controller.utils.db_utils import DbUtils	4✔
10
11	LOG_FORMAT = (	4✔
12	"%(levelname) -10s %(asctime)s %(name) -30s %(funcName) "
13	"-35s %(lineno) -5d: %(message)s"
14	)
15	logger = logging.getLogger(__name__)	4✔
16	logging.getLogger("pika").setLevel(logging.WARNING)	4✔
17	logger.setLevel(logging.DEBUG)	4✔
18
19	# Get DB connection and tables set up.
20	db_instance = DbUtils()	4✔
21	db_instance.initialize_db()	4✔
22	connection_handler = ConnectionHandler(db_instance)	4✔
23
24
25	def delete_connection(connection_id):	4✔
26	"""
27	Delete connection order by ID.
28
29	:param connection_id: ID of the connection that needs to be
30	deleted
31	:type connection_id: int
32
33	:rtype: None
34	"""
35	logger.info(	4✔
36	f"Handling delete (connecton id: {connection_id}) "
37	f"with te_manager: {current_app.te_manager}"
38	)
39
40	try:	4✔
41	# TODO: pce's unreserve_vlan() method silently returns even if the
42	# connection_id is not found. This should in fact be an error.
43	#
44	# https://github.com/atlanticwave-sdx/pce/issues/180
45	current_app.te_manager.unreserve_vlan(connection_id)	4✔
NEW 46	except Exception as e:	×
NEW 47	logger.info(f"Delete failed (connection id: {connection_id}): {e}")	×
48
49	return "OK", 200	4✔
50
51
52	def getconnection_by_id(connection_id):	4✔
53	"""
54	Find connection by ID.
55
56	:param connection_id: ID of connection that needs to be fetched
57	:type connection_id: int
58
59	:rtype: Connection
60	"""
61	value = db_instance.read_from_db(f"{connection_id}")	4✔
62	return value	4✔
63
64
65	def place_connection(body):	4✔
66	"""
67	Place an connection request from the SDX-Controller.
68
69	:param body: order placed for creating a connection
70	:type body: dict \| bytes
71
72	:rtype: Connection
73	"""
74	request_id = uuid.uuid4()	4✔
75	logger.info(f"Placing connection: request: {body}, request_id: {request_id}")	4✔
76
77	if connexion.request.is_json:	4✔
78	body = connexion.request.get_json()	4✔
79	logger.info(f"Gathered connexion JSON: {body}")	4✔
80
81	logger.info("Placing connection. Saving to database.")	4!
82	db_instance.add_key_value_pair_to_db("connection_data", json.dumps(body))	4✔
83	logger.info("Saving to database complete.")	4✔
84
85	logger.info(	4✔
86	f"Handling request {request_id} with te_manager: {current_app.te_manager}"
87	)
88
89	reason, code = connection_handler.place_connection(current_app.te_manager, body)	4✔
90	logger.info(	4✔
91	f"place_connection result: request_id: {request_id} reason='{reason}', code={code}"
92	)
93
94	result = {	4✔
95	"request_id": request_id,
96	"status": "OK" if code == 200 else "Failure",
97	"reason": reason,
98	}
99
100	return result, code	4✔

atlanticwave-sdx / sdx-controller / 8636259780

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous