Commit 2a03b264 authored by Pablo Armingol's avatar Pablo Armingol
Browse files

code clean up

parent ed24fc3f

src/device/service/drivers/transport_api/TransportApiDriver.py

+14 −3
Original line number Diff line number Diff line
@@ -164,9 +164,20 @@ class TransportApiDriver(_Driver): 
                        results.append(e)



                else:

                    # Unknown resource type

                    LOGGER.warning(f'Unknown resource type: {resource_key}')

                    results.append(True)  # Don't fail, just log warning

                    LOGGER.info('resource = {:s}'.format(str(resource)))

                    uuid = find_key(resource, 'uuid')

                    input_sip = find_key(resource, 'input_sip_uuid')

                    output_sip = find_key(resource, 'output_sip_uuid')

                    capacity_value = find_key(resource, 'capacity_value')

                    capacity_unit = find_key(resource, 'capacity_unit')

                    layer_protocol_name = find_key(resource, 'layer_protocol_name')

                    layer_protocol_qualifier = find_key(resource, 'layer_protocol_qualifier')

                    direction = find_key(resource, 'direction')



                    data = create_connectivity_service(

                        self.__tapi_root, uuid, input_sip, output_sip, direction, capacity_value, capacity_unit,

                        layer_protocol_name, layer_protocol_qualifier, timeout=self.__timeout, auth=self.__auth)

                    results.extend(data)



        return results

src/pathcomp/.gitlab-ci.yml

+3 −6
Original line number Diff line number Diff line
@@ -18,16 +18,14 @@ build pathcomp: 
    IMAGE_NAME: 'pathcomp' # name of the microservice

    IMAGE_TAG: 'latest' # tag of the container image (production, development, etc)

  stage: build

  timeout: 20m

  before_script:

    - docker image prune --force

    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY

    - docker buildx create --name cibuilder --driver docker-container --use || docker buildx use cibuilder

  script:

    # This first build tags the builder resulting image to prevent being removed by dangling image removal command

    - docker buildx build -t "${IMAGE_NAME}-backend:${IMAGE_TAG}-builder" --target builder --cache-from type=registry,ref=$CI_REGISTRY_IMAGE/${IMAGE_NAME}-backend:buildcache-builder --cache-to type=registry,ref=$CI_REGISTRY_IMAGE/${IMAGE_NAME}-backend:buildcache-builder,mode=max -f ./src/$IMAGE_NAME/backend/Dockerfile .

    - docker buildx build -t "${IMAGE_NAME}-backend:${IMAGE_TAG}" --cache-from type=registry,ref=$CI_REGISTRY_IMAGE/${IMAGE_NAME}-backend:buildcache --cache-to type=registry,ref=$CI_REGISTRY_IMAGE/${IMAGE_NAME}-backend:buildcache,mode=max -f ./src/$IMAGE_NAME/backend/Dockerfile .

    - docker buildx build -t "${IMAGE_NAME}-frontend:${IMAGE_TAG}" --cache-from type=registry,ref=$CI_REGISTRY_IMAGE/${IMAGE_NAME}-frontend:buildcache --cache-to type=registry,ref=$CI_REGISTRY_IMAGE/${IMAGE_NAME}-frontend:buildcache,mode=max -f ./src/$IMAGE_NAME/frontend/Dockerfile .

    - docker buildx build -t "${IMAGE_NAME}-backend:${IMAGE_TAG}-builder" --target builder -f ./src/$IMAGE_NAME/backend/Dockerfile .

    - docker buildx build -t "${IMAGE_NAME}-backend:${IMAGE_TAG}" -f ./src/$IMAGE_NAME/backend/Dockerfile .

    - docker buildx build -t "${IMAGE_NAME}-frontend:${IMAGE_TAG}" -f ./src/$IMAGE_NAME/frontend/Dockerfile .

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

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

    - docker tag "${IMAGE_NAME}-frontend:${IMAGE_TAG}" "$CI_REGISTRY_IMAGE/${IMAGE_NAME}-frontend:${IMAGE_TAG}"
@@ -35,7 +33,6 @@ build pathcomp: 
    - docker push "$CI_REGISTRY_IMAGE/${IMAGE_NAME}-backend:${IMAGE_TAG}"

    - docker push "$CI_REGISTRY_IMAGE/${IMAGE_NAME}-frontend:${IMAGE_TAG}"

  after_script:

    - docker buildx rm cibuilder || true

    - docker image prune --force

  rules:

    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH)'