Commit 0724a912 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Pre-merge code cleanup

parent fd85ee15

my_deploy.sh

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ export CRDB_DEPLOY_MODE="single" 
export CRDB_DROP_DATABASE_IF_EXISTS=""



# Disable flag for re-deploying CockroachDB from scratch.

export CRDB_REDEPLOY="YES"

export CRDB_REDEPLOY=""





# ----- NATS -------------------------------------------------------------------

src/webui/service/__init__.py

+19 −17
Original line number Diff line number Diff line
@@ -21,7 +21,8 @@ from context.client.ContextClient import ContextClient 
from device.client.DeviceClient import DeviceClient

from qkd_app.client.QKDAppClient import QKDAppClient

from common.Settings import (

    is_deployed_bgpls, is_deployed_load_gen, is_deployed_policy, is_deployed_qkd_app, is_deployed_slice

    is_deployed_bgpls, is_deployed_load_gen, is_deployed_optical,

    is_deployed_policy, is_deployed_qkd_app, is_deployed_slice

)



def get_working_context() -> str:
@@ -135,6 +136,7 @@ def create_app(use_config=None, web_app_root=None): 


        'is_deployed_bgpls'   : is_deployed_bgpls,

        'is_deployed_load_gen': is_deployed_load_gen,

        'is_deployed_optical' : is_deployed_optical,

        'is_deployed_policy'  : is_deployed_policy,

        'is_deployed_qkd_app' : is_deployed_qkd_app,

        'is_deployed_slice'   : is_deployed_slice,

src/webui/service/optical_link/routes.py

+0 −4
Original line number Diff line number Diff line
@@ -111,7 +111,3 @@ def delete_all () : 
    except Exception as e :

        flash(f"Problem in delete all optical link  => {e}",'danger')    

    return redirect(url_for('optical_link.home'))    
            

        

    

    
 No newline at end of file

src/webui/service/templates/base.html

+10 −21
Original line number Diff line number Diff line
@@ -79,6 +79,8 @@ 
                  <a class="nav-link" href="{{ url_for('service.home') }}">Service</a>

                  {% endif %}

                </li>



                {% if is_deployed_slice() %}

                  <li class="nav-item">

                    {% if '/slice/' in request.path %}

                    <a class="nav-link active" aria-current="page" href="{{ url_for('slice.home') }}">Slice</a>
@@ -86,6 +88,9 @@ 
                    <a class="nav-link" href="{{ url_for('slice.home') }}">Slice</a>

                    {% endif %}

                  </li>

                {% endif %}



                {% if is_deployed_optical() %}

                  <li class="nav-item">

                    {% if '/base_optical/' in request.path %}

                    <a class="nav-link active" aria-current="page" href="{{ url_for('base_optical.home') }}">Optical Config</a>
@@ -93,22 +98,6 @@ 
                    <a class="nav-link" href="{{ url_for('base_optical.home') }}">Optical Config</a>

                    {% endif %}

                  </li>

                <li class="nav-item">

                  {% if '/policy_rule/' in request.path %}

                  <a class="nav-link active" aria-current="page" href="{{ url_for('policy_rule.home') }}">Policy Rules</a>

                  {% else %}

                  <a class="nav-link" href="{{ url_for('policy_rule.home') }}">Policy Rules</a>

                  {% endif %}

                </li>



                {% if is_deployed_slice() %}

                  <li class="nav-item">

                    {% if '/slice/' in request.path %}

                    <a class="nav-link active" aria-current="page" href="{{ url_for('slice.home') }}">Slice</a>

                    {% else %}

                    <a class="nav-link" href="{{ url_for('slice.home') }}">Slice</a>

                    {% endif %}

                  </li>

                {% endif %}



                {% if is_deployed_policy() %}

src/webui/service/templates/opticalconfig/add_transceiver.html

+2 −1
Original line number Diff line number Diff line
@@ -52,4 +52,5 @@ 
    </div>

    </fieldset>

</form>



{% endblock %}