Commit bff30add authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'feat/pathcomp-component-frontend' of... 

Merge branch 'feat/pathcomp-component-frontend' of https://gitlab.com/teraflow-h2020/controller into feat/ecoc22-dc-interconnect-disjoint
parents ce0208b1 94ae57b1

.gitignore

+3 −0
Original line number Diff line number Diff line
@@ -130,6 +130,9 @@ venv.bak/ 
# VSCode project settings

.vscode/



# Visual Studio project settings

/.vs



# Rope project settings

.ropeproject

.gitlab-ci.yml

+1 −0
Original line number Diff line number Diff line
@@ -41,3 +41,4 @@ include: 
  #- local: '/src/l3_attackmitigator/.gitlab-ci.yml'

  #- local: '/src/slice/.gitlab-ci.yml'

  #- local: '/src/interdomain/.gitlab-ci.yml'

  - local: '/src/pathcomp/.gitlab-ci.yml'

scripts/run_tests_locally-pathcomp.sh→scripts/run_tests_locally-pathcomp-frontend.sh

+1 −1
Original line number Diff line number Diff line
@@ -25,4 +25,4 @@ RCFILE=$PROJECTDIR/coverage/.coveragerc 
#-o log_cli=true -o log_file=service.log -o log_file_level=DEBUG



coverage run --rcfile=$RCFILE --append -m pytest --log-level=INFO --verbose \

    pathcomp/tests/test_unitary.py
 
    pathcomp/frontend/tests/test_unitary.py

src/common/tools/object_factory/Link.py

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ from typing import Dict, List 
def get_link_uuid(a_endpoint_id : Dict, z_endpoint_id : Dict) -> str:

    return '{:s}/{:s}=={:s}/{:s}'.format(

        a_endpoint_id['device_id']['device_uuid']['uuid'], a_endpoint_id['endpoint_uuid']['uuid'],

        a_endpoint_id['device_id']['device_uuid']['uuid'], z_endpoint_id['endpoint_uuid']['uuid'])

        z_endpoint_id['device_id']['device_uuid']['uuid'], z_endpoint_id['endpoint_uuid']['uuid'])



def json_link_id(link_uuid : str):

    return {'link_uuid': {'uuid': link_uuid}}

src/common/tools/object_factory/Service.py

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ from common.tools.object_factory.Context import json_context_id 
def get_service_uuid(a_endpoint_id : Dict, z_endpoint_id : Dict) -> str:

    return 'svc:{:s}/{:s}=={:s}/{:s}'.format(

        a_endpoint_id['device_id']['device_uuid']['uuid'], a_endpoint_id['endpoint_uuid']['uuid'],

        a_endpoint_id['device_id']['device_uuid']['uuid'], z_endpoint_id['endpoint_uuid']['uuid'])

        z_endpoint_id['device_id']['device_uuid']['uuid'], z_endpoint_id['endpoint_uuid']['uuid'])



def json_service_id(service_uuid : str, context_id : Optional[Dict] = None):

    result = {'service_uuid': {'uuid': service_uuid}}