From 7edb1e3bbc1c53ef97ec4f528e80017ac02247b0 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Tue, 24 Dec 2024 17:17:15 +0000
Subject: [PATCH] Context component:
- Added logic to manage link type
- Corrected deprecated method datetime.utcnow()
---
src/context/service/database/Connection.py | 2 +-
src/context/service/database/Context.py | 3 ++-
src/context/service/database/Device.py | 2 +-
src/context/service/database/Link.py | 9 +++++++--
src/context/service/database/OpticalLink.py | 2 +-
src/context/service/database/PolicyRule.py | 2 +-
src/context/service/database/Service.py | 5 +++--
src/context/service/database/Slice.py | 5 +++--
src/context/service/database/Topology.py | 3 ++-
src/context/service/database/models/LinkModel.py | 10 +++++++++-
10 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/src/context/service/database/Connection.py b/src/context/service/database/Connection.py
index de45151a5..529c02d6e 100644
--- a/src/context/service/database/Connection.py
+++ b/src/context/service/database/Connection.py
@@ -74,7 +74,7 @@ def connection_set(db_engine : Engine, messagebroker : MessageBroker, request :
_,service_uuid = service_get_uuid(request.service_id, allow_random=False)
settings = grpc_message_to_json_string(request.settings),
- now = datetime.datetime.utcnow()
+ now = datetime.datetime.now(datetime.timezone.utc)
connection_data = [{
'connection_uuid': connection_uuid,
diff --git a/src/context/service/database/Context.py b/src/context/service/database/Context.py
index f0cd36f83..f3ef214c3 100644
--- a/src/context/service/database/Context.py
+++ b/src/context/service/database/Context.py
@@ -82,7 +82,8 @@ def context_set(db_engine : Engine, messagebroker : MessageBroker, request : Con
if len(request.slice_ids) > 0: # pragma: no cover
LOGGER.warning('Items in field "slice_ids" ignored. This field is used for retrieval purposes only.')
- now = datetime.datetime.utcnow()
+ now = datetime.datetime.now(datetime.timezone.utc)
+
context_data = [{
'context_uuid': context_uuid,
'context_name': context_name,
diff --git a/src/context/service/database/Device.py b/src/context/service/database/Device.py
index 930b5299f..7515f8d68 100644
--- a/src/context/service/database/Device.py
+++ b/src/context/service/database/Device.py
@@ -92,7 +92,7 @@ def device_set(db_engine : Engine, messagebroker : MessageBroker, request : Devi
oper_status = grpc_to_enum__device_operational_status(request.device_operational_status)
device_drivers = [grpc_to_enum__device_driver(d) for d in request.device_drivers]
- now = datetime.datetime.utcnow()
+ now = datetime.datetime.now(datetime.timezone.utc)
topology_uuids : Set[str] = set()
related_topologies : List[Dict] = list()
diff --git a/src/context/service/database/Link.py b/src/context/service/database/Link.py
index deef3769c..6244a8517 100644
--- a/src/context/service/database/Link.py
+++ b/src/context/service/database/Link.py
@@ -22,11 +22,12 @@ from common.proto.context_pb2 import Empty, EventTypeEnum, Link, LinkId, LinkIdL
from common.message_broker.MessageBroker import MessageBroker
from common.method_wrappers.ServiceExceptions import NotFoundException
from common.tools.object_factory.Link import json_link_id
-from context.service.database.uuids.Topology import topology_get_uuid
+from .models.enums.LinkType import grpc_to_enum__link_type_enum
from .models.LinkModel import LinkModel, LinkEndPointModel
from .models.TopologyModel import TopologyLinkModel, TopologyModel
from .uuids.EndPoint import endpoint_get_uuid
from .uuids.Link import link_get_uuid
+from .uuids.Topology import topology_get_uuid
from .Events import notify_event_context, notify_event_link, notify_event_topology
LOGGER = logging.getLogger(__name__)
@@ -68,7 +69,9 @@ def link_set(db_engine : Engine, messagebroker : MessageBroker, request : Link)
link_name = raw_link_uuid if len(raw_link_name) == 0 else raw_link_name
link_uuid = link_get_uuid(request.link_id, link_name=link_name, allow_random=True)
- now = datetime.datetime.utcnow()
+ link_type = grpc_to_enum__link_type_enum(request.link_type)
+
+ now = datetime.datetime.now(datetime.timezone.utc)
topology_uuids : Set[str] = set()
related_topologies : List[Dict] = list()
@@ -117,6 +120,7 @@ def link_set(db_engine : Engine, messagebroker : MessageBroker, request : Link)
link_data = [{
'link_uuid' : link_uuid,
'link_name' : link_name,
+ 'link_type' : link_type,
'total_capacity_gbps' : total_capacity_gbps,
'used_capacity_gbps' : used_capacity_gbps,
'created_at' : now,
@@ -129,6 +133,7 @@ def link_set(db_engine : Engine, messagebroker : MessageBroker, request : Link)
index_elements=[LinkModel.link_uuid],
set_=dict(
link_name = stmt.excluded.link_name,
+ link_type = stmt.excluded.link_type,
total_capacity_gbps = stmt.excluded.total_capacity_gbps,
used_capacity_gbps = stmt.excluded.used_capacity_gbps,
updated_at = stmt.excluded.updated_at,
diff --git a/src/context/service/database/OpticalLink.py b/src/context/service/database/OpticalLink.py
index 53fd7bdb5..1f45daf43 100644
--- a/src/context/service/database/OpticalLink.py
+++ b/src/context/service/database/OpticalLink.py
@@ -64,7 +64,7 @@ def optical_link_set(db_engine : Engine, messagebroker : MessageBroker, request
link_name = raw_link_uuid if len(raw_link_name) == 0 else raw_link_name
link_uuid = link_get_uuid(request.link_id, link_name=link_name, allow_random=True)
- now = datetime.datetime.utcnow()
+ now = datetime.datetime.now(datetime.timezone.utc)
# By default, always add link to default Context/Topology
topology_uuids : Set[str] = set()
diff --git a/src/context/service/database/PolicyRule.py b/src/context/service/database/PolicyRule.py
index 3d59c59b3..ad38838fc 100644
--- a/src/context/service/database/PolicyRule.py
+++ b/src/context/service/database/PolicyRule.py
@@ -84,7 +84,7 @@ def policyrule_set(db_engine : Engine, messagebroker : MessageBroker, request :
'actionList': json_policyrule_basic.get('actionList', []),
}, sort_keys=True)
- now = datetime.datetime.utcnow()
+ now = datetime.datetime.now(datetime.timezone.utc)
policyrule_data = [{
'policyrule_uuid' : policyrule_uuid,
diff --git a/src/context/service/database/Service.py b/src/context/service/database/Service.py
index c789b291b..62f07e4fb 100644
--- a/src/context/service/database/Service.py
+++ b/src/context/service/database/Service.py
@@ -91,7 +91,7 @@ def service_set(db_engine : Engine, messagebroker : MessageBroker, request : Ser
service_status = grpc_to_enum__service_status(request.service_status.service_status)
- now = datetime.datetime.utcnow()
+ now = datetime.datetime.now(datetime.timezone.utc)
service_endpoints_data : List[Dict] = list()
for i,endpoint_id in enumerate(request.service_endpoint_ids):
@@ -180,7 +180,8 @@ def service_unset(db_engine : Engine, messagebroker : MessageBroker, request : S
['should be == request.service_id.context_id.context_uuid.uuid({:s})'.format(raw_context_uuid)])
service_endpoint_uuids.add(endpoint_get_uuid(endpoint_id, allow_random=False)[2])
- now = datetime.datetime.utcnow()
+ now = datetime.datetime.now(datetime.timezone.utc)
+
constraints = compose_constraints_data(request.service_constraints, now, service_uuid=service_uuid)
config_rules = compose_config_rules_data(request.service_config.config_rules, now, service_uuid=service_uuid)
diff --git a/src/context/service/database/Slice.py b/src/context/service/database/Slice.py
index 18620e6fc..84e210e02 100644
--- a/src/context/service/database/Slice.py
+++ b/src/context/service/database/Slice.py
@@ -89,7 +89,7 @@ def slice_set(db_engine : Engine, messagebroker : MessageBroker, request : Slice
slice_status = grpc_to_enum__slice_status(request.slice_status.slice_status)
- now = datetime.datetime.utcnow()
+ now = datetime.datetime.now(datetime.timezone.utc)
slice_endpoints_data : List[Dict] = list()
for i,endpoint_id in enumerate(request.slice_endpoint_ids):
@@ -222,7 +222,8 @@ def slice_unset(db_engine : Engine, messagebroker : MessageBroker, request : Sli
for subslice_id in request.slice_subslice_ids
}
- now = datetime.datetime.utcnow()
+ now = datetime.datetime.now(datetime.timezone.utc)
+
constraints = compose_constraints_data(request.slice_constraints, now, slice_uuid=slice_uuid)
config_rules = compose_config_rules_data(request.slice_config.config_rules, now, slice_uuid=slice_uuid)
diff --git a/src/context/service/database/Topology.py b/src/context/service/database/Topology.py
index ba2649c69..1ee5d1642 100644
--- a/src/context/service/database/Topology.py
+++ b/src/context/service/database/Topology.py
@@ -134,7 +134,8 @@ def topology_set(db_engine : Engine, messagebroker : MessageBroker, request : To
MSG += 'Items in field "link_ids" ignored. This field is used for retrieval purposes only.'
LOGGER.warning(MSG)
- now = datetime.datetime.utcnow()
+ now = datetime.datetime.now(datetime.timezone.utc)
+
topology_data = [{
'context_uuid' : context_uuid,
'topology_uuid': topology_uuid,
diff --git a/src/context/service/database/models/LinkModel.py b/src/context/service/database/models/LinkModel.py
index 423e39832..1bfa532d8 100644
--- a/src/context/service/database/models/LinkModel.py
+++ b/src/context/service/database/models/LinkModel.py
@@ -13,17 +13,22 @@
# limitations under the License.
import operator
-from sqlalchemy import CheckConstraint, Column, DateTime, Float, ForeignKey, Integer, String
+from sqlalchemy import (
+ CheckConstraint, Column, DateTime, Enum, Float, ForeignKey, Integer, String
+)
from sqlalchemy.dialects.postgresql import UUID
from sqlalchemy.orm import relationship
from typing import Dict
+from common.proto.context_pb2 import LinkTypeEnum
from ._Base import _Base
+from .enums.LinkType import ORM_LinkTypeEnum
class LinkModel(_Base):
__tablename__ = 'link'
link_uuid = Column(UUID(as_uuid=False), primary_key=True)
link_name = Column(String, nullable=False)
+ link_type = Column(Enum(ORM_LinkTypeEnum), nullable=False)
total_capacity_gbps = Column(Float, nullable=True)
used_capacity_gbps = Column(Float, nullable=True)
created_at = Column(DateTime, nullable=False)
@@ -44,11 +49,14 @@ class LinkModel(_Base):
result = {
'link_id' : self.dump_id(),
'name' : self.link_name,
+ 'link_type' : self.link_type.value,
'link_endpoint_ids': [
link_endpoint.endpoint.dump_id()
for link_endpoint in sorted(self.link_endpoints, key=operator.attrgetter('position'))
],
}
+ if self.link_type is None:
+ self.link_type = LinkTypeEnum.LINKTYPE_UNKNOWN
if self.total_capacity_gbps is not None:
attributes : Dict = result.setdefault('attributes', dict())
attributes.setdefault('total_capacity_gbps', self.total_capacity_gbps)
--
GitLab