Skip to content
Snippets Groups Projects
Commit 0b09e575 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Pre-merge clean-up

parent 1c1a3785
No related branches found
No related tags found
2 merge requests!235Release TeraFlowSDN 3.0,!199Resolve "(CTTC) Implement Service Handler for L3 services using ACTN SBI driver"
......@@ -39,7 +39,7 @@ spec:
- containerPort: 9192
env:
- name: LOG_LEVEL
value: "DEBUG"
value: "INFO"
startupProbe:
exec:
command: ["/bin/grpc_health_probe", "-addr=:2020"]
......
......@@ -37,7 +37,7 @@ spec:
- containerPort: 9192
env:
- name: LOG_LEVEL
value: "DEBUG"
value: "INFO"
readinessProbe:
exec:
command: ["/bin/grpc_health_probe", "-addr=:9090"]
......
......@@ -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"]
......
......@@ -36,7 +36,7 @@ spec:
- containerPort: 9192
env:
- name: LOG_LEVEL
value: "DEBUG"
value: "INFO"
readinessProbe:
exec:
command: ["/bin/grpc_health_probe", "-addr=:3030"]
......
......@@ -39,7 +39,7 @@ spec:
- containerPort: 8004
env:
- name: LOG_LEVEL
value: "DEBUG"
value: "INFO"
- name: WEBUISERVICE_SERVICE_BASEURL_HTTP
value: "/webui/"
readinessProbe:
......
......@@ -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'),
}
......
......@@ -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))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment