diff --git a/src/common/tests/MockServicerImpl_Context.py b/src/common/tests/MockServicerImpl_Context.py
index b50b044a12548e11888468e7acbfad9280491022..464517a767f31d95277dc8205cf49f527fe96a48 100644
--- a/src/common/tests/MockServicerImpl_Context.py
+++ b/src/common/tests/MockServicerImpl_Context.py
@@ -25,12 +25,7 @@ from common.proto.context_pb2 import (
Slice, SliceEvent, SliceFilter, SliceId, SliceIdList, SliceList,
Topology, TopologyDetails, TopologyEvent, TopologyId, TopologyIdList, TopologyList)
from common.proto.context_pb2_grpc import ContextServiceServicer
-from common.proto.policy_pb2 import (
- PolicyRule,
- PolicyRuleId,
- PolicyRuleIdList,
- PolicyRuleList,
-)
+from common.proto.policy_pb2 import PolicyRule, PolicyRuleId, PolicyRuleIdList, PolicyRuleList
from common.tools.grpc.Tools import grpc_message_to_json, grpc_message_to_json_string
from common.tools.object_factory.Device import json_device_id
from common.tools.object_factory.Link import json_link_id
@@ -170,10 +165,12 @@ class MockServicerImpl_Context(ContextServiceServicer):
rw_request = Topology()
rw_request.CopyFrom(request)
+ # pylint: disable=no-member
del rw_request.device_ids[:]
for device_uuid in sorted(device_uuids):
rw_request.device_ids.append(DeviceId(**json_device_id(device_uuid)))
+ # pylint: disable=no-member
del rw_request.link_ids[:]
for link_uuid in sorted(link_uuids):
rw_request.link_ids.append(LinkId(**json_link_id(link_uuid)))
@@ -187,7 +184,9 @@ class MockServicerImpl_Context(ContextServiceServicer):
if _topology_id.topology_uuid.uuid == topology_uuid: break
else:
# topology not found, add it
- context_.topology_ids.add().topology_uuid.uuid = topology_uuid
+ topology_id = context_.topology_ids.add()
+ topology_id.context_id.context_uuid.uuid = context_uuid
+ topology_id.topology_uuid.uuid = topology_uuid
LOGGER.debug('[SetTopology] reply={:s}'.format(grpc_message_to_json_string(reply)))
return reply
@@ -201,9 +200,10 @@ class MockServicerImpl_Context(ContextServiceServicer):
context_ = self.obj_db.get_entry('context', context_uuid, context)
for _topology_id in context_.topology_ids:
- if _topology_id.topology_uuid.uuid == topology_uuid:
- context_.topology_ids.remove(_topology_id)
- break
+ if _topology_id.context_id.context_uuid.uuid != context_uuid: continue
+ if _topology_id.topology_uuid.uuid != topology_uuid: continue
+ context_.topology_ids.remove(_topology_id)
+ break
LOGGER.debug('[RemoveTopology] reply={:s}'.format(grpc_message_to_json_string(reply)))
return reply
@@ -429,7 +429,9 @@ class MockServicerImpl_Context(ContextServiceServicer):
if _slice_id.slice_uuid.uuid == slice_uuid: break
else:
# slice not found, add it
- context_.slice_ids.add().slice_uuid.uuid = slice_uuid
+ slice_id = context_.slice_ids.add()
+ slice_id.context_id.context_uuid.uuid = context_uuid
+ slice_id.slice_uuid.uuid = slice_uuid
LOGGER.debug('[SetSlice] reply={:s}'.format(grpc_message_to_json_string(reply)))
return reply
@@ -443,9 +445,10 @@ class MockServicerImpl_Context(ContextServiceServicer):
context_ = self.obj_db.get_entry('context', context_uuid, context)
for _slice_id in context_.slice_ids:
- if _slice_id.slice_uuid.uuid == slice_uuid:
- context_.slice_ids.remove(_slice_id)
- break
+ if _slice_id.context_id.context_uuid.uuid != context_uuid: continue
+ if _slice_id.slice_uuid.uuid != slice_uuid: continue
+ context_.slice_ids.remove(_slice_id)
+ break
LOGGER.debug('[RemoveSlice] reply={:s}'.format(grpc_message_to_json_string(reply)))
return reply
@@ -521,7 +524,9 @@ class MockServicerImpl_Context(ContextServiceServicer):
if _service_id.service_uuid.uuid == service_uuid: break
else:
# service not found, add it
- context_.service_ids.add().service_uuid.uuid = service_uuid
+ service_id = context_.service_ids.add()
+ service_id.context_id.context_uuid.uuid = context_uuid
+ service_id.service_uuid.uuid = service_uuid
LOGGER.debug('[SetService] reply={:s}'.format(grpc_message_to_json_string(reply)))
return reply
@@ -535,9 +540,10 @@ class MockServicerImpl_Context(ContextServiceServicer):
context_ = self.obj_db.get_entry('context', context_uuid, context)
for _service_id in context_.service_ids:
- if _service_id.service_uuid.uuid == service_uuid:
- context_.service_ids.remove(_service_id)
- break
+ if _service_id.context_id.context_uuid.uuid != context_uuid: continue
+ if _service_id.service_uuid.uuid != service_uuid: continue
+ context_.service_ids.remove(_service_id)
+ break
LOGGER.debug('[RemoveService] reply={:s}'.format(grpc_message_to_json_string(reply)))
return reply
@@ -622,7 +628,7 @@ class MockServicerImpl_Context(ContextServiceServicer):
LOGGER.debug('[GetConnectionEvents] request={:s}'.format(grpc_message_to_json_string(request)))
for message in self.msg_broker.consume({TOPIC_CONNECTION}): yield ConnectionEvent(**json.loads(message.content))
- def ListPolicyRuleIds(self, request : Empty, context : grpc.ServicerContext):
+ def ListPolicyRuleIds(self, request : Empty, context : grpc.ServicerContext): # pylint: disable=unused-argument
LOGGER.debug('[ListPolicyRuleIds] request={:s}'.format(grpc_message_to_json_string(request)))
reply = PolicyRuleIdList(policyRuleIdList=[
getattr(policy_rule, policy_rule.WhichOneof('policy_rule')).policyRuleBasic.policyRuleId
@@ -631,7 +637,7 @@ class MockServicerImpl_Context(ContextServiceServicer):
LOGGER.debug('[ListPolicyRuleIds] reply={:s}'.format(grpc_message_to_json_string(reply)))
return reply
- def ListPolicyRules(self, request : Empty, context : grpc.ServicerContext):
+ def ListPolicyRules(self, request : Empty, context : grpc.ServicerContext): # pylint: disable=unused-argument
LOGGER.debug('[ListPolicyRules] request={:s}'.format(grpc_message_to_json_string(request)))
reply = PolicyRuleList(policyRules=self.obj_db.get_entries('policy'))
LOGGER.debug('[ListPolicyRules] reply={:s}'.format(grpc_message_to_json_string(reply)))
@@ -643,7 +649,7 @@ class MockServicerImpl_Context(ContextServiceServicer):
LOGGER.debug('[GetPolicyRule] reply={:s}'.format(grpc_message_to_json_string(reply)))
return reply
- def SetPolicyRule(self, request : PolicyRule, context : grpc.ServicerContext):
+ def SetPolicyRule(self, request : PolicyRule, context : grpc.ServicerContext): # pylint: disable=unused-argument
LOGGER.debug('[SetPolicyRule] 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