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

Fixing Pipeline Errors

parent f9aa93db

src/common/tests/MockServicerImpl_Context.py

+3 −5
Original line number Diff line number Diff line
@@ -654,7 +654,7 @@ class MockServicerImpl_Context(ContextServiceServicer): 


    def GetPolicyRule(self, request : PolicyRuleId, context : grpc.ServicerContext):

        LOGGER.debug('[GetPolicyRule] request={:s}'.format(grpc_message_to_json_string(request)))

        reply = self.obj_db.get_entry('policy_rule', request.uuid.uuid, context)

        reply = self.obj_db.get_entry('policy', request.uuid.uuid, context)

        LOGGER.debug('[GetPolicyRule] reply={:s}'.format(grpc_message_to_json_string(reply)))

        return reply
@@ -669,10 +669,8 @@ class MockServicerImpl_Context(ContextServiceServicer): 


    def RemovePolicyRule(self, request : PolicyRuleId, context : grpc.ServicerContext):

        LOGGER.debug('[RemovePolicyRule] request={:s}'.format(grpc_message_to_json_string(request)))

        policy_type = request.WhichOneof('policy_rule')

        policy_uuid = getattr(request, policy_type).policyRuleBasic.policyRuleId.uuid.uuid

        rule_id_field = '{:s}.policyRuleBasic.policyRuleId'.format(policy_type)

        reply = self._del(request, 'policy', policy_uuid, rule_id_field, TOPIC_CONTEXT, context)

        policy_uuid = request.uuid.uuid

        reply = self._del(request, 'policy', policy_uuid, 'uuid', TOPIC_POLICY, context)

        LOGGER.debug('[RemovePolicyRule] reply={:s}'.format(grpc_message_to_json_string(reply)))

        return reply

src/context/service/database/PolicyRule.py

+3 −2
Original line number Diff line number Diff line
@@ -89,8 +89,9 @@ def policyrule_set(db_engine : Engine, messagebroker : MessageBroker, request : 
        'policyrule_kind'     : policyrule_kind,

        'policyrule_state'    : policyrule_state,

        'policyrule_state_msg': policyrule_state_msg,

        'policyrule_priority' : policyrule_basic.priority,

        'policyrule_kpi_id'   : policyrule_basic.kpiId.kpi_id.uuid,

        'policyrule_priority' : policyrule_basic.policyRulePriority,

        'policyrule_kpi_id'   : policyrule_basic.policyRuleKpiList[0].policyRuleKpiUuid.uuid

                                if len(policyrule_basic.policyRuleKpiList) > 0 else '',

        'policyrule_eca_data' : policyrule_eca_data,

        'created_at'          : now,

        'updated_at'          : now,

src/context/service/database/models/PolicyRuleModel.py

+3 −2
Original line number Diff line number Diff line
@@ -58,8 +58,9 @@ class PolicyRuleModel(_Base): 
                'policyRuleState': self.policyrule_state.value,

                'policyRuleStateMessage': self.policyrule_state_msg,

            },

            'priority': self.policyrule_priority,

            'kpiId': {'kpi_id': {'uuid': self.policyrule_kpi_id}},

            'policyRulePriority': self.policyrule_priority,

            'policyRuleKpiList': [{'policyRuleKpiUuid': {'uuid': self.policyrule_kpi_id}}]

                                 if self.policyrule_kpi_id else [],

        })

        result = {

            'policyRuleBasic': policyrule_basic,