Pre-release fixing

src/monitoring/tests/test_unitary.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import copy, os, pytest #, threading, time
-import logging
+import logging, json
 #from queue import Queue
 from random import random
 from time import sleep
@@ -25,7 +25,7 @@ from grpc._channel import _MultiThreadedRendezvous
 from common.Constants import ServiceNameEnum
 from common.Settings import (
     ENVVAR_SUFIX_SERVICE_HOST, ENVVAR_SUFIX_SERVICE_PORT_GRPC, get_env_var_name, get_service_port_grpc)
-from common.proto.context_pb2 import DeviceOperationalStatusEnum, EventTypeEnum, DeviceEvent, Device, Empty
+from common.proto.context_pb2 import ConfigActionEnum, DeviceOperationalStatusEnum, EventTypeEnum, DeviceEvent, Device, Empty
 from common.proto.context_pb2_grpc import add_ContextServiceServicer_to_server
 from common.proto.kpi_sample_types_pb2 import KpiSampleType
 from common.proto.monitoring_pb2 import KpiId, KpiDescriptor, SubsDescriptor, SubsList, AlarmID, \
@@ -602,21 +602,18 @@ def test_listen_events(
     LOGGER.info('Adding Device {:s}'.format(DEVICE_DEV1_UUID))
     device_with_connect_rules = copy.deepcopy(DEVICE_DEV1)
     device_with_connect_rules['device_config']['config_rules'].extend(DEVICE_DEV1_CONNECT_RULES)
-    device_with_connect_rules['device_config']['config_rules'].append(
-        json_config_rule_set(
-            '/interface[{:s}]'.format(ENDPOINT_END1_UUID),
-            {'name': ENDPOINT_END1_UUID, 'enabled': True}
-        )
-    )
     response = device_client.AddDevice(Device(**device_with_connect_rules))
     assert response.device_uuid.uuid == DEVICE_DEV1_UUID
 
     LOGGER.info('Activating Device {:s}'.format(DEVICE_DEV1_UUID))
-
     device = context_client.GetDevice(response)
     device_with_op_state = Device()
     device_with_op_state.CopyFrom(device)
     device_with_op_state.device_operational_status = DeviceOperationalStatusEnum.DEVICEOPERATIONALSTATUS_ENABLED
+    config_rule = device_with_op_state.device_config.config_rules.add()
+    config_rule.action = ConfigActionEnum.CONFIGACTION_SET
+    config_rule.custom.resource_key = '/interface[{:s}]'.format(ENDPOINT_END1_UUID)
+    config_rule.custom.resource_value = json.dumps({'name': ENDPOINT_END1_UUID, 'enabled': True})
     response = context_client.SetDevice(device_with_op_state)
     assert response.device_uuid.uuid == DEVICE_DEV1_UUID