Loading src/common/tools/object_factory/PolicyRule.py +3 −7 Original line number Diff line number Diff line Loading @@ -14,7 +14,6 @@ import logging from typing import Dict, List, Optional from common.proto.policy_condition_pb2 import BooleanOperator from common.proto.policy_pb2 import PolicyRuleStateEnum LOGGER = logging.getLogger(__name__) Loading @@ -23,11 +22,9 @@ def json_policyrule_id(policyrule_uuid : str) -> Dict: return {'uuid': {'uuid': policyrule_uuid}} def json_policyrule( policyrule_uuid : str, policy_priority : int = 1, policyrule_uuid : str, policy_priority : int = 1, policy_kpi_id : str = '', policy_state : PolicyRuleStateEnum = PolicyRuleStateEnum.POLICY_UNDEFINED, policy_state_message : str = '', boolean_operator : BooleanOperator = BooleanOperator.POLICYRULE_CONDITION_BOOLEAN_AND, condition_list : List[Dict] = [], action_list : List[Dict] = [], service_id : Optional[Dict] = None, device_id_list : List[Dict] = [] action_list : List[Dict] = [], service_id : Optional[Dict] = None, device_id_list : List[Dict] = [] ) -> Dict: basic = { 'policyRuleId': json_policyrule_id(policyrule_uuid), Loading @@ -36,8 +33,7 @@ def json_policyrule( 'policyRuleStateMessage': policy_state_message, }, 'priority': policy_priority, 'conditionList': condition_list, 'booleanOperator': boolean_operator, 'kpiId': policy_kpi_id, 'actionList': action_list, } Loading Loading
src/common/tools/object_factory/PolicyRule.py +3 −7 Original line number Diff line number Diff line Loading @@ -14,7 +14,6 @@ import logging from typing import Dict, List, Optional from common.proto.policy_condition_pb2 import BooleanOperator from common.proto.policy_pb2 import PolicyRuleStateEnum LOGGER = logging.getLogger(__name__) Loading @@ -23,11 +22,9 @@ def json_policyrule_id(policyrule_uuid : str) -> Dict: return {'uuid': {'uuid': policyrule_uuid}} def json_policyrule( policyrule_uuid : str, policy_priority : int = 1, policyrule_uuid : str, policy_priority : int = 1, policy_kpi_id : str = '', policy_state : PolicyRuleStateEnum = PolicyRuleStateEnum.POLICY_UNDEFINED, policy_state_message : str = '', boolean_operator : BooleanOperator = BooleanOperator.POLICYRULE_CONDITION_BOOLEAN_AND, condition_list : List[Dict] = [], action_list : List[Dict] = [], service_id : Optional[Dict] = None, device_id_list : List[Dict] = [] action_list : List[Dict] = [], service_id : Optional[Dict] = None, device_id_list : List[Dict] = [] ) -> Dict: basic = { 'policyRuleId': json_policyrule_id(policyrule_uuid), Loading @@ -36,8 +33,7 @@ def json_policyrule( 'policyRuleStateMessage': policy_state_message, }, 'priority': policy_priority, 'conditionList': condition_list, 'booleanOperator': boolean_operator, 'kpiId': policy_kpi_id, 'actionList': action_list, } Loading