Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
controller
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TFS
controller
Commits
1c5947ab
Commit
1c5947ab
authored
1 year ago
by
Lluis Gifre Renom
Browse files
Options
Downloads
Patches
Plain Diff
Pre-merge code cleanup
parent
77a78c72
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!142
Release TeraFlowSDN 2.1
,
!139
Fixes on OpenConfig and ACLs
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/pathcomp/frontend/service/algorithms/tools/ComposeConfigRules.py
+14
-14
14 additions, 14 deletions
...p/frontend/service/algorithms/tools/ComposeConfigRules.py
with
14 additions
and
14 deletions
src/pathcomp/frontend/service/algorithms/tools/ComposeConfigRules.py
+
14
−
14
View file @
1c5947ab
...
...
@@ -79,10 +79,10 @@ def compose_device_config_rules(
config_rules
:
List
,
subservice_config_rules
:
List
,
path_hops
:
List
,
device_name_mapping
:
Dict
[
str
,
str
],
endpoint_name_mapping
:
Dict
[
Tuple
[
str
,
str
],
str
]
)
->
None
:
LOGGER
.
warnin
g
(
'
[compose_device_config_rules] begin
'
)
LOGGER
.
debu
g
(
'
[compose_device_config_rules] begin
'
)
LOGGER
.
warnin
g
(
'
[compose_device_config_rules] device_name_mapping={:s}
'
.
format
(
str
(
device_name_mapping
)))
LOGGER
.
warnin
g
(
'
[compose_device_config_rules] endpoint_name_mapping={:s}
'
.
format
(
str
(
endpoint_name_mapping
)))
LOGGER
.
debu
g
(
'
[compose_device_config_rules] device_name_mapping={:s}
'
.
format
(
str
(
device_name_mapping
)))
LOGGER
.
debu
g
(
'
[compose_device_config_rules] endpoint_name_mapping={:s}
'
.
format
(
str
(
endpoint_name_mapping
)))
devices_traversed
=
set
()
endpoints_traversed
=
set
()
...
...
@@ -92,28 +92,28 @@ def compose_device_config_rules(
endpoints_traversed
.
add
((
device_uuid_or_name
,
path_hop
[
'
ingress_ep
'
]))
endpoints_traversed
.
add
((
device_uuid_or_name
,
path_hop
[
'
egress_ep
'
]))
LOGGER
.
warnin
g
(
'
[compose_device_config_rules] devices_traversed={:s}
'
.
format
(
str
(
devices_traversed
)))
LOGGER
.
warnin
g
(
'
[compose_device_config_rules] endpoints_traversed={:s}
'
.
format
(
str
(
endpoints_traversed
)))
LOGGER
.
debu
g
(
'
[compose_device_config_rules] devices_traversed={:s}
'
.
format
(
str
(
devices_traversed
)))
LOGGER
.
debu
g
(
'
[compose_device_config_rules] endpoints_traversed={:s}
'
.
format
(
str
(
endpoints_traversed
)))
for
config_rule
in
config_rules
:
LOGGER
.
warnin
g
(
'
[compose_device_config_rules] processing config_rule: {:s}
'
.
format
(
LOGGER
.
debu
g
(
'
[compose_device_config_rules] processing config_rule: {:s}
'
.
format
(
grpc_message_to_json_string
(
config_rule
)))
if
config_rule
.
WhichOneof
(
'
config_rule
'
)
==
'
acl
'
:
LOGGER
.
warnin
g
(
'
[compose_device_config_rules] is acl
'
)
LOGGER
.
debu
g
(
'
[compose_device_config_rules] is acl
'
)
endpoint_id
=
config_rule
.
acl
.
endpoint_id
device_uuid_or_name
=
endpoint_id
.
device_id
.
device_uuid
.
uuid
LOGGER
.
warnin
g
(
'
[compose_device_config_rules] device_uuid_or_name={:s}
'
.
format
(
str
(
device_uuid_or_name
)))
LOGGER
.
debu
g
(
'
[compose_device_config_rules] device_uuid_or_name={:s}
'
.
format
(
str
(
device_uuid_or_name
)))
device_name_or_uuid
=
device_name_mapping
.
get
(
device_uuid_or_name
,
device_uuid_or_name
)
LOGGER
.
warnin
g
(
'
[compose_device_config_rules] device_name_or_uuid={:s}
'
.
format
(
str
(
device_name_or_uuid
)))
LOGGER
.
debu
g
(
'
[compose_device_config_rules] device_name_or_uuid={:s}
'
.
format
(
str
(
device_name_or_uuid
)))
device_keys
=
{
device_uuid_or_name
,
device_name_or_uuid
}
if
len
(
device_keys
.
intersection
(
devices_traversed
))
==
0
:
continue
endpoint_uuid
=
endpoint_id
.
endpoint_uuid
.
uuid
LOGGER
.
warnin
g
(
'
[compose_device_config_rules] endpoint_uuid={:s}
'
.
format
(
str
(
endpoint_uuid
)))
LOGGER
.
debu
g
(
'
[compose_device_config_rules] endpoint_uuid={:s}
'
.
format
(
str
(
endpoint_uuid
)))
# given endpoint uuids link 'eth-1/0/20.533', remove last part after the '.'
endpoint_uuid_or_name
=
(
endpoint_uuid
[::
-
1
].
split
(
'
.
'
,
maxsplit
=
1
)[
-
1
])[::
-
1
]
LOGGER
.
warnin
g
(
'
[compose_device_config_rules] endpoint_uuid_or_name={:s}
'
.
format
(
str
(
endpoint_uuid_or_name
)))
LOGGER
.
debu
g
(
'
[compose_device_config_rules] endpoint_uuid_or_name={:s}
'
.
format
(
str
(
endpoint_uuid_or_name
)))
endpoint_name_or_uuid_1
=
endpoint_name_mapping
[(
device_uuid_or_name
,
endpoint_uuid_or_name
)]
endpoint_name_or_uuid_2
=
endpoint_name_mapping
[(
device_name_or_uuid
,
endpoint_uuid_or_name
)]
endpoint_keys
=
{
endpoint_uuid_or_name
,
endpoint_name_or_uuid_1
,
endpoint_name_or_uuid_2
}
...
...
@@ -121,11 +121,11 @@ def compose_device_config_rules(
device_endpoint_keys
=
set
(
itertools
.
product
(
device_keys
,
endpoint_keys
))
if
len
(
device_endpoint_keys
.
intersection
(
endpoints_traversed
))
==
0
:
continue
LOGGER
.
warnin
g
(
'
[compose_device_config_rules] adding acl config rule
'
)
LOGGER
.
debu
g
(
'
[compose_device_config_rules] adding acl config rule
'
)
subservice_config_rules
.
append
(
config_rule
)
elif
config_rule
.
WhichOneof
(
'
config_rule
'
)
==
'
custom
'
:
LOGGER
.
warnin
g
(
'
[compose_device_config_rules] is custom
'
)
LOGGER
.
debu
g
(
'
[compose_device_config_rules] is custom
'
)
match
=
DEVICE_SETTINGS
.
match
(
config_rule
.
custom
.
resource_key
)
if
match
is
not
None
:
...
...
@@ -153,4 +153,4 @@ def compose_device_config_rules(
else
:
continue
LOGGER
.
warnin
g
(
'
[compose_device_config_rules] end
'
)
LOGGER
.
debu
g
(
'
[compose_device_config_rules] end
'
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment