Commit b42005fb authored by Waleed Akbar's avatar Waleed Akbar
Browse files

fix(webui): Store real context/topology UUIDs in session and display names in UI

Previously, selecting a context/topology on the home page stored the
context and topology *names* under session['context_uuid'] and
session['topology_uuid']. Any code using these keys as real UUIDs failed
when a name differed from its UUID.

- main/routes.py: encode ctx_uuid, topo_uuid, ctx_name, topo_name in the
  context/topology selector value and store the UUIDs and names in
  separate session keys (context_uuid/topology_uuid and
  context_name/topology_name). The old 2-value (names only) format is
  still accepted.
- __init__.py: get_working_context()/get_working_topology() now return
  the name and fall back to the UUID, then '---'.
- templates (bgpls, device, link, optical_link, policy_rule, qkd_app,
  service): show session context_name in the "found in context" header,
  falling back to context_uuid, so the UI shows readable names
  instead of raw UUIDs.
parent ee2ba66f
Loading
Loading
Loading
Loading
+2 −2
Changes for src/webui/service/__init__.py: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -25,10 +25,10 @@ from common.Settings import (
)

def get_working_context() -> str:
    return session['context_uuid'] if 'context_uuid' in session else '---'
    return session.get('context_name', session.get('context_uuid', '---'))

def get_working_topology() -> str:
    return session['topology_uuid'] if 'topology_uuid' in session else '---'
    return session.get('topology_name', session.get('topology_uuid', '---'))

def liveness():
    pass
+16 −8
Changes for src/webui/service/main/routes.py: 16 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -60,13 +60,13 @@ def home():

    contexts : ContextList = context_client.ListContexts(Empty())
    for context_ in contexts.contexts:
        #context_uuid : str = context_.context_id.context_uuid.uuid
        context_uuid : str = context_.context_id.context_uuid.uuid
        context_name : str = context_.name
        topologies : TopologyList = context_client.ListTopologies(context_.context_id)
        for topology_ in topologies.topologies:
            #topology_uuid : str = topology_.topology_id.topology_uuid.uuid
            topology_uuid : str = topology_.topology_id.topology_uuid.uuid
            topology_name : str = topology_.name
            raw_values = context_name, topology_name
            raw_values = context_uuid, topology_uuid, context_name, topology_name
            b64_values = [base64.b64encode(v.encode('utf-8')).decode('utf-8') for v in raw_values]
            context_topology_uuid = ','.join(b64_values)
            context_topology_name  = 'Context({:s}):Topology({:s})'.format(context_name, topology_name)
@@ -78,13 +78,21 @@ def home():
        if len(context_topology_uuid) > 0:
            b64_values = context_topology_uuid.split(',')
            raw_values = [base64.b64decode(v.encode('utf-8')).decode('utf-8') for v in b64_values]
            context_name, topology_name = raw_values
            #session.clear()
            session['context_topology_uuid'] = context_topology_uuid
            # Support both old format (2 values: ctx_name,topo_name) and new format (4 values: ctx_uuid,topo_uuid,ctx_name,topo_name)
            if len(raw_values) == 4:
                context_uuid, topology_uuid, context_name, topology_name = raw_values
                session['context_uuid'] = context_uuid
                session['topology_uuid'] = topology_uuid
                session['context_name'] = context_name
                session['topology_name'] = topology_name
            else:
                context_name, topology_name = raw_values[:2]
                session['context_uuid'] = context_name
            #session['context_name'] = context_name
                session['topology_uuid'] = topology_name
            #session['topology_name'] = topology_name
                session['context_name'] = context_name
                session['topology_name'] = topology_name
            #session.clear()
            session['context_topology_uuid'] = context_topology_uuid
            MSG = f'Context({context_name})/Topology({topology_name}) successfully selected.'
            flash(MSG, 'success')

+1 −1
Changes for src/webui/service/templates/bgpls/editSpeakers.html: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@
    <div class="row">
       
        <div class="col">
            {{ speakers | length }} speakers found in context <i>{{ session['context_uuid'] }}</i>
            {{ speakers | length }} speakers found in context <i>{{ session.get('context_name', session['context_uuid']) }}</i>
        </div>
    </div>
    
+1 −1
Changes for src/webui/service/templates/bgpls/home.html: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@
    <div class="row">
       
        <div class="col">
            {{ speakers | length }} speakers found in context <i>{{ session['context_uuid'] }}</i>
            {{ speakers | length }} speakers found in context <i>{{ session.get('context_name', session['context_uuid']) }}</i>
        </div>
    </div>
        <div class="row">
+1 −1
Changes for src/webui/service/templates/device/home.html: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@
            </a>
        </div>
        <div class="col">
            {{ devices | length }} devices found in context <i>{{ session['context_uuid'] }}</i>
            {{ devices | length }} devices found in context <i>{{ session.get('context_name', session['context_uuid']) }}</i>
        </div>
        <!-- <div class="col">
            <form>
Loading