italovalcy
commented
6 months ago One way of fixing this would be the following approach:
-
On sdx-pce
--- a/src/sdx_pce/topology/temanager.py 2024-02-13 23:36:19.397703493 +0000 +++ b/src/sdx_pce/topology/temanager.py 2024-02-14 14:40:14.566765586 +0000 @@ -343,7 +343,7 @@ return result -
def generate_connection_breakdown(self, solution: ConnectionSolution) -> dict:
-
def generate_connection_breakdown(self, solution: ConnectionSolution, connection_request: dict) -> dict: """ Take a connection solution and generate a breakdown. """ @@ -414,12 +414,12 @@ if first: first = False
ingress port for this domain is on the first link.
-
ingressport, = self._get_ports_by_link(links[0])
-
ingress_port = self._get_port_by_id(connection_request["ingress_port"]["id"])
egress port for this domain is on the last link.
egress_port, next_ingress_port = self._get_ports_by_link(links[-1]) elif i == len(breakdown) - 1: ingress_port = next_ingress_port -
_, egress_port = self._get_ports_by_link(links[-1])
-
egress_port = self._get_port_by_id(connection_request["egress_port"]["id"]) else: ingress_port = next_ingress_port egress_port, next_ingress_port = self._get_ports_by_link(links[-1]) @@ -454,6 +454,16 @@
expected format.
return tagged_breakdown.to_dict().get("breakdowns") -
def _get_port_by_id(self, port_id: str):
-
"""
-
Given port id, returns a Port.
-
"""
-
for node in self.topology_manager.get_topology().get_nodes():
-
for port in node.ports:
-
if port.id == port_id:
-
return port.to_dict()
-
raise ValidationError(f"Invalid port id ({port_id}).")
-
def _get_ports_by_link(self, link: ConnectionPath): """ Given a link, find the ports associated with it.
-
on sdx-controller:
--- a/sdx_controller/handlers/connection_handler.py
+++ b/sdx_controller/handlers/connection_handler.py
@@ -155,8 +155,8 @@ class ConnectionHandler:
if solution is None or solution.connection_map is None:
return "Could not solve the request", 400
- breakdown = temanager.generate_connection_breakdown(solution)
+ breakdown = temanager.generate_connection_breakdown(solution, connection_request)
#self._send_breakdown_to_lc(breakdown, connection_request)
return self._send_breakdown_to_lc(breakdown, connection_request)
def handle_link_failure(self, msg_json):This approach will keep the ConnectionRequest and ConnectionSolution as they are, while providing more info for generate_connection_breakdown() to do the actual correct attribution of first ingress_port and last egress_port.
Of course, ideally topology model should provide a get_port_by_id instead of doing that on temanager.
YufengXin
When creating connections, the sdx_pce
TEManager.generate_connection_breakdown()can wrongly set the first ingress_port and last egress_port for the generated VlanTaggedBreakdowns, as per:First ingress_port: https://github.com/atlanticwave-sdx/pce/blob/main/src/sdx_pce/topology/temanager.py#L417
Last egress_port: https://github.com/atlanticwave-sdx/pce/blob/main/src/sdx_pce/topology/temanager.py#L422
By wrong ports, I mean ports that are different from the user's request. Thus, if the user requested, let's say,
ingress_port=Domain1.NodeA.PortAandegress_port=DomainN.NodeZ.PortZ, the resulting breakdown connections will start atingress_port=Domain1.NodeA.PortXand end onegress_port=DomainN.NodeZ.PortY, where PortX is the backbone port on NodeA which belongs to the resulting path on Domain1, as well as PortY is the backbone port on NodeZ which belongs to the resulting path on DomainN.If we follow the code workflow,
generate_connection_breakdown()only receives the ConnectionSolution. And the ConnectionSolution does not contain the original user-requested ingress/egress ports. Instead, the ConnectionSolution only contains the nodes where the user-requested ingress/egress ports were located. This can be seen as per:https://github.com/atlanticwave-sdx/pce/blob/main/src/sdx_pce/topology/temanager.py#L201-L202
This leads to instantiating ConnectionRequest with the nodes only (not the original ingress/egress ports): https://github.com/atlanticwave-sdx/pce/blob/main/src/sdx_pce/topology/temanager.py#L245-L250
Later, the Breakdowns will take the first ingress and last egress from the ConnectionSolution, which does not guarantee it is the correct port according to the user request.
How to reproduce:
urn:sdx:node:amlight.net:A1:ingress_port.id == urn:ogf:network:sdx:port:zaoxi:B2:1andegress_port.id == urn:sdx:port:amlight.net:A1:3Expected result:
VlanTaggedBreakdown.uni_a.port_id == "urn:ogf:network:sdx:port:zaoxi:B2:1"VlanTaggedBreakdown.uni_z.port_id == urn:sdx:port:amlight.net:A1:3Actual result:
VlanTaggedBreakdown.uni_a.port_id == "urn:ogf:network:sdx:port:zaoxi:B2:2"VlanTaggedBreakdown.uni_z.port_id == urn:sdx:port:amlight.net:A1:1Relevant log entries: