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

Merge branch 'develop' of ssh://gifrerenom_labs.etsi.org/tfs/controller into... 

Merge branch 'develop' of ssh://gifrerenom_labs.etsi.org/tfs/controller into feat/320-cttc-ietf-simap-basic-support-with-kafka-yang-push
parents 0618ca07 ee95258b

src/nbi/service/ietf_l3vpn/L3VPN_Service.py

+5 −3
Original line number Diff line number Diff line
@@ -21,10 +21,12 @@ from common.tools.context_queries.Service import get_service_by_uuid 
from context.client.ContextClient import ContextClient

from service.client.ServiceClient import ServiceClient

from typing import Dict, List

from .._tools.Authentication import HTTP_AUTH

from .._tools.HttpStatusCodes import HTTP_GATEWAYTIMEOUT, HTTP_NOCONTENT, HTTP_OK, HTTP_SERVERERROR, HTTP_CREATED

from .Handlers import  update_vpn

from werkzeug.exceptions import UnsupportedMediaType

from nbi.service._tools.Authentication import HTTP_AUTH

from nbi.service._tools.HttpStatusCodes import (

    HTTP_GATEWAYTIMEOUT, HTTP_NOCONTENT, HTTP_OK, HTTP_SERVERERROR, HTTP_CREATED

)

from .Handlers import  update_vpn

from .YangValidator import YangValidator



LOGGER = logging.getLogger(__name__)

src/pathcomp/.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -68,8 +68,8 @@ unit_test pathcomp-backend: 
    - docker pull "$CI_REGISTRY_IMAGE/${IMAGE_NAME}-backend:${IMAGE_TAG}"

    - docker pull "$CI_REGISTRY_IMAGE/${IMAGE_NAME}-backend:${IMAGE_TAG}-builder"

    - docker ps -a

    #- docker run --name ${IMAGE_NAME}-backend -d -p 8081:8081 -v "$PWD/src/${IMAGE_NAME}/backend/tests:/opt/results" --network=teraflowbridge ${IMAGE_NAME}-backend:${IMAGE_TAG}-builder

    - docker run --name ${IMAGE_NAME}-backend -d -p 8081:8081 --network=teraflowbridge ${IMAGE_NAME}-backend:${IMAGE_TAG}-builder

    #- docker run --name ${IMAGE_NAME}-backend -d -p 8081:8081 -v "$PWD/src/${IMAGE_NAME}/backend/tests:/opt/results" --network=teraflowbridge "$CI_REGISTRY_IMAGE/${IMAGE_NAME}-backend:${IMAGE_TAG}-builder"

    - docker run --name ${IMAGE_NAME}-backend -d -p 8081:8081 --network=teraflowbridge "$CI_REGISTRY_IMAGE/${IMAGE_NAME}-backend:${IMAGE_TAG}-builder"

    - sleep 5

    - docker ps -a

    - docker logs ${IMAGE_NAME}-backend