Pre-merge clean-up

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"]

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"]

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"]

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"]

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:

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'),
 }
 

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))