From 0b09e57583d55cf5e2540b59d84d853b0c463302 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Tue, 6 Feb 2024 17:16:40 +0000
Subject: [PATCH] Pre-merge clean-up
---
manifests/deviceservice.yaml | 2 +-
manifests/nbiservice.yaml | 2 +-
manifests/pathcompservice.yaml | 4 ++--
manifests/serviceservice.yaml | 2 +-
manifests/webuiservice.yaml | 2 +-
src/common/tools/descriptor/Loader.py | 20 +++++++++----------
.../algorithms/tools/ComposeConfigRules.py | 6 +++---
7 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/manifests/deviceservice.yaml b/manifests/deviceservice.yaml
index 7f7885daf..77e421f29 100644
--- a/manifests/deviceservice.yaml
+++ b/manifests/deviceservice.yaml
@@ -39,7 +39,7 @@ spec:
- containerPort: 9192
env:
- name: LOG_LEVEL
- value: "DEBUG"
+ value: "INFO"
startupProbe:
exec:
command: ["/bin/grpc_health_probe", "-addr=:2020"]
diff --git a/manifests/nbiservice.yaml b/manifests/nbiservice.yaml
index f5477aeb4..de97ba364 100644
--- a/manifests/nbiservice.yaml
+++ b/manifests/nbiservice.yaml
@@ -37,7 +37,7 @@ spec:
- containerPort: 9192
env:
- name: LOG_LEVEL
- value: "DEBUG"
+ value: "INFO"
readinessProbe:
exec:
command: ["/bin/grpc_health_probe", "-addr=:9090"]
diff --git a/manifests/pathcompservice.yaml b/manifests/pathcompservice.yaml
index 0ebd1811b..87d907a72 100644
--- a/manifests/pathcompservice.yaml
+++ b/manifests/pathcompservice.yaml
@@ -36,9 +36,9 @@ spec:
- containerPort: 9192
env:
- name: LOG_LEVEL
- value: "DEBUG"
+ value: "INFO"
- name: ENABLE_FORECASTER
- value: "NO"
+ value: "YES"
readinessProbe:
exec:
command: ["/bin/grpc_health_probe", "-addr=:10020"]
diff --git a/manifests/serviceservice.yaml b/manifests/serviceservice.yaml
index 3865fd6c0..7d7bdaa4e 100644
--- a/manifests/serviceservice.yaml
+++ b/manifests/serviceservice.yaml
@@ -36,7 +36,7 @@ spec:
- containerPort: 9192
env:
- name: LOG_LEVEL
- value: "DEBUG"
+ value: "INFO"
readinessProbe:
exec:
command: ["/bin/grpc_health_probe", "-addr=:3030"]
diff --git a/manifests/webuiservice.yaml b/manifests/webuiservice.yaml
index 89de36fc5..43caa9f04 100644
--- a/manifests/webuiservice.yaml
+++ b/manifests/webuiservice.yaml
@@ -39,7 +39,7 @@ spec:
- containerPort: 8004
env:
- name: LOG_LEVEL
- value: "DEBUG"
+ value: "INFO"
- name: WEBUISERVICE_SERVICE_BASEURL_HTTP
value: "/webui/"
readinessProbe:
diff --git a/src/common/tools/descriptor/Loader.py b/src/common/tools/descriptor/Loader.py
index 11500a32b..4ab33beae 100644
--- a/src/common/tools/descriptor/Loader.py
+++ b/src/common/tools/descriptor/Loader.py
@@ -57,20 +57,20 @@ LOGGERS = {
ENTITY_TO_TEXT = {
# name => singular, plural
- 'context' : ('Context', 'Contexts' ),
- 'topology' : ('Topology', 'Topologies' ),
- 'controller': ('Controller', 'Controllers' ),
- 'device' : ('Device', 'Devices' ),
- 'link' : ('Link', 'Links' ),
- 'service' : ('Service', 'Services' ),
- 'slice' : ('Slice', 'Slices' ),
- 'connection': ('Connection', 'Connections' ),
+ 'context' : ('Context', 'Contexts' ),
+ 'topology' : ('Topology', 'Topologies' ),
+ 'controller': ('Controller', 'Controllers'),
+ 'device' : ('Device', 'Devices' ),
+ 'link' : ('Link', 'Links' ),
+ 'service' : ('Service', 'Services' ),
+ 'slice' : ('Slice', 'Slices' ),
+ 'connection': ('Connection', 'Connections'),
}
ACTION_TO_TEXT = {
# action => infinitive, past
- 'add' : ('Add', 'Added'),
- 'update' : ('Update', 'Updated'),
+ 'add' : ('Add', 'Added' ),
+ 'update' : ('Update', 'Updated' ),
'config' : ('Configure', 'Configured'),
}
diff --git a/src/pathcomp/frontend/service/algorithms/tools/ComposeConfigRules.py b/src/pathcomp/frontend/service/algorithms/tools/ComposeConfigRules.py
index 8e99a1ae1..2d4ff4fd5 100644
--- a/src/pathcomp/frontend/service/algorithms/tools/ComposeConfigRules.py
+++ b/src/pathcomp/frontend/service/algorithms/tools/ComposeConfigRules.py
@@ -159,7 +159,7 @@ def compose_device_config_rules(
match = RE_DEVICE_SETTINGS.match(config_rule.custom.resource_key)
if match is not None:
device_uuid_or_name = match.group(1)
- device_keys = {'?', device_uuid_or_name}
+ device_keys = {device_uuid_or_name}
device_name_or_uuid = device_name_mapping.get(device_uuid_or_name)
if device_name_or_uuid is not None: device_keys.add(device_name_or_uuid)
@@ -171,12 +171,12 @@ def compose_device_config_rules(
match = RE_ENDPOINT_VLAN_SETTINGS.match(config_rule.custom.resource_key)
if match is not None:
device_uuid_or_name = match.group(1)
- device_keys = {'?', device_uuid_or_name}
+ device_keys = {device_uuid_or_name}
device_name_or_uuid = device_name_mapping.get(device_uuid_or_name)
if device_name_or_uuid is not None: device_keys.add(device_name_or_uuid)
endpoint_uuid_or_name = match.group(2)
- endpoint_keys = {'?', endpoint_uuid_or_name}
+ endpoint_keys = {endpoint_uuid_or_name}
endpoint_name_or_uuid_1 = endpoint_name_mapping.get((device_uuid_or_name, endpoint_uuid_or_name))
if endpoint_name_or_uuid_1 is not None: endpoint_keys.add(endpoint_name_or_uuid_1)
endpoint_name_or_uuid_2 = endpoint_name_mapping.get((device_name_or_uuid, endpoint_uuid_or_name))
--
GitLab