Commit d03919be authored Jan 10, 2023 by Lluis Gifre Renom

Context component:

- moved relational models to associated classes
- migrated support for slice subslices
- added filters to prevent upsert when there is nothing to update

parent d2316472

src/context/service/database/ConfigRule.py

+2 −1

Original line number	Diff line number	Diff line
		@@ -52,6 +52,7 @@ def upsert_config_rules(
		if service_uuid is not None: stmt = stmt.where(ConfigRuleModel.service_uuid == service_uuid)
		if slice_uuid is not None: stmt = stmt.where(ConfigRuleModel.slice_uuid == slice_uuid )
		session.execute(stmt)
		if len(config_rules) > 0:
		session.execute(insert(ConfigRuleModel).values(config_rules))

src/context/service/database/Constraint.py

+2 −1

Original line number	Diff line number	Diff line
		@@ -47,6 +47,7 @@ def upsert_constraints(
		if service_uuid is not None: stmt = stmt.where(ConstraintModel.service_uuid == service_uuid)
		if slice_uuid is not None: stmt = stmt.where(ConstraintModel.slice_uuid == slice_uuid )
		session.execute(stmt)
		if len(constraints) > 0:
		session.execute(insert(ConstraintModel).values(constraints))

		# def set_constraint(self, db_constraints: ConstraintsModel, grpc_constraint: Constraint, position: int

src/context/service/database/Device.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ from common.tools.object_factory.Device import json_device_id
		from context.service.database.ConfigRule import compose_config_rules_data, upsert_config_rules
		from .models.DeviceModel import DeviceModel
		from .models.EndPointModel import EndPointModel
		from .models.RelationModels import TopologyDeviceModel
		from .models.TopologyModel import TopologyDeviceModel
		from .models.enums.DeviceDriver import grpc_to_enum__device_driver
		from .models.enums.DeviceOperationalStatus import grpc_to_enum__device_operational_status
		from .models.enums.KpiSampleType import grpc_to_enum__kpi_sample_type

src/context/service/database/Link.py

+2 −2

Original line number	Diff line number	Diff line
		@@ -20,8 +20,8 @@ from typing import Dict, List, Optional, Set, Tuple
		from common.proto.context_pb2 import Link, LinkId, LinkIdList, LinkList
		from common.rpc_method_wrapper.ServiceExceptions import NotFoundException
		from common.tools.object_factory.Link import json_link_id
		from .models.LinkModel import LinkModel
		from .models.RelationModels import LinkEndPointModel, TopologyLinkModel
		from .models.LinkModel import LinkModel, LinkEndPointModel
		from .models.TopologyModel import TopologyLinkModel
		from .uuids.EndPoint import endpoint_get_uuid
		from .uuids.Link import link_get_uuid

src/context/service/database/Service.py

+1 −2

Original line number	Diff line number	Diff line
		@@ -25,8 +25,7 @@ from context.service.database.ConfigRule import compose_config_rules_data, upser
		from context.service.database.Constraint import compose_constraints_data, upsert_constraints
		from .models.enums.ServiceStatus import grpc_to_enum__service_status
		from .models.enums.ServiceType import grpc_to_enum__service_type
		from .models.RelationModels import ServiceEndPointModel
		from .models.ServiceModel import ServiceModel
		from .models.ServiceModel import ServiceModel, ServiceEndPointModel
		from .uuids.Context import context_get_uuid
		from .uuids.EndPoint import endpoint_get_uuid
		from .uuids.Service import service_get_uuid