Commit f9aa93db authored by Pablo Armingol's avatar Pablo Armingol
Browse files

Fixing Pipeline errors

parent c9fbdde5

src/common/tools/object_factory/PolicyRule.py

+2 −2
Original line number Diff line number Diff line
@@ -32,8 +32,8 @@ def json_policyrule( 
            'policyRuleState': policy_state,

            'policyRuleStateMessage': policy_state_message,

        },

        'priority': policy_priority,

        'kpiId': {'kpi_id': {'uuid': policy_kpi_id}},

        'policyRulePriority': policy_priority,

        'policyRuleKpiList': [{'policyRuleKpiUuid': {'uuid': policy_kpi_id}}] if policy_kpi_id else [],

        'actionList': action_list,

    }

src/context/tests/test_policy.py

+8 −8
Original line number Diff line number Diff line
@@ -46,8 +46,8 @@ def test_policy(context_client : ContextClient): 
    # ----- Get when the object exists ---------------------------------------------------------------------------------

    response = context_client.GetPolicyRule(PolicyRuleId(**POLICYRULE_ID))

    assert response.device.policyRuleBasic.policyRuleId.uuid.uuid == policyrule_uuid

    assert response.device.policyRuleBasic.priority == 1

    assert response.device.policyRuleBasic.kpiId.kpi_id.uuid == 'my-kpi-id'

    assert response.device.policyRuleBasic.policyRulePriority == 1

    assert response.device.policyRuleBasic.policyRuleKpiList[0].policyRuleKpiUuid.uuid == 'my-kpi-id'



    # ----- List when the object exists --------------------------------------------------------------------------------

    response = context_client.ListPolicyRuleIds(Empty())
@@ -57,15 +57,15 @@ def test_policy(context_client : ContextClient): 
    response = context_client.ListPolicyRules(Empty())

    assert len(response.policyRules) == 1

    assert response.policyRules[0].device.policyRuleBasic.policyRuleId.uuid.uuid == policyrule_uuid

    assert response.policyRules[0].device.policyRuleBasic.priority == 1

    assert response.policyRules[0].device.policyRuleBasic.kpiId.kpi_id.uuid == 'my-kpi-id'

    assert response.policyRules[0].device.policyRuleBasic.policyRulePriority == 1

    assert response.policyRules[0].device.policyRuleBasic.policyRuleKpiList[0].policyRuleKpiUuid.uuid == 'my-kpi-id'



    # ----- Update the object ------------------------------------------------------------------------------------------

    new_policy_priority = 100

    new_policy_kpi_id = 'new-kpi-id'

    POLICYRULE_UPDATED = copy.deepcopy(POLICYRULE)

    POLICYRULE_UPDATED['device']['policyRuleBasic']['priority'] = new_policy_priority

    POLICYRULE_UPDATED['device']['policyRuleBasic']['kpiId']['kpi_id']['uuid'] = new_policy_kpi_id

    POLICYRULE_UPDATED['device']['policyRuleBasic']['policyRulePriority'] = new_policy_priority

    POLICYRULE_UPDATED['device']['policyRuleBasic']['policyRuleKpiList'] = [{'policyRuleKpiUuid': {'uuid': new_policy_kpi_id}}]

    response = context_client.SetPolicyRule(PolicyRule(**POLICYRULE_UPDATED))

    assert response.uuid.uuid == policyrule_uuid
@@ -81,8 +81,8 @@ def test_policy(context_client : ContextClient): 
    response = context_client.ListPolicyRules(Empty())

    assert len(response.policyRules) == 1

    assert response.policyRules[0].device.policyRuleBasic.policyRuleId.uuid.uuid == policyrule_uuid

    assert response.policyRules[0].device.policyRuleBasic.priority == new_policy_priority

    assert response.policyRules[0].device.policyRuleBasic.kpiId.kpi_id.uuid == new_policy_kpi_id

    assert response.policyRules[0].device.policyRuleBasic.policyRulePriority == new_policy_priority

    assert response.policyRules[0].device.policyRuleBasic.policyRuleKpiList[0].policyRuleKpiUuid.uuid == new_policy_kpi_id



    # ----- Remove the object ------------------------------------------------------------------------------------------

    context_client.RemovePolicyRule(PolicyRuleId(**POLICYRULE_ID))

src/slice/.gitlab-ci.yml

+4 −1
Original line number Diff line number Diff line
@@ -18,14 +18,17 @@ build slice: 
    IMAGE_NAME: 'slice' # 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:

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

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

    - docker tag "$IMAGE_NAME:$IMAGE_TAG" "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG"

    - docker push "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$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)'