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
eac09e4f
Commit
eac09e4f
authored
6 months ago
by
Lluis Gifre Renom
Browse files
Options
Downloads
Patches
Plain Diff
Debug OFC24, Service and Optical Controller
parent
d89f0667
No related branches found
No related tags found
2 merge requests
!294
Release TeraFlowSDN 4.0
,
!285
Resolve: "(CNIT) New SBI Driver based on OpenROADM for ROADMs"
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/service/service/task_scheduler/TaskExecutor.py
+23
-5
23 additions, 5 deletions
src/service/service/task_scheduler/TaskExecutor.py
src/service/service/task_scheduler/tasks/Task_OpticalConnectionDeconfigure.py
+10
-1
10 additions, 1 deletion
...task_scheduler/tasks/Task_OpticalConnectionDeconfigure.py
with
33 additions
and
6 deletions
src/service/service/task_scheduler/TaskExecutor.py
+
23
−
5
View file @
eac09e4f
...
@@ -219,13 +219,22 @@ class TaskExecutor:
...
@@ -219,13 +219,22 @@ class TaskExecutor:
service
=
item
service
=
item
if
(
isinstance
(
item
,
ServiceId
)):
if
(
isinstance
(
item
,
ServiceId
)):
service
=
self
.
get_service
(
item
)
service
=
self
.
get_service
(
item
)
class_
service_handler
=
None
service_handler
=
None
service_handler_settings
=
{}
service_handler_settings
=
{}
for
connection
in
connections
.
connections
:
for
connection
in
connections
.
connections
:
connection_uuid
=
connection
.
connection_id
.
connection_uuid
connection_uuid
=
connection
.
connection_id
.
connection_uuid
if
class_service_handler
is
None
:
if
service_handler
is
None
:
class_service_handler
=
self
.
get_service_handler
(
connection
,
service
,
**
service_handler_settings
)
service_handlers
=
self
.
get_service_handlers
(
if
class_service_handler
.
check_media_channel
(
connection_uuid
):
connection
,
service
,
**
service_handler_settings
)
# TODO: improve to select different service handlers when needed
# By now, assume a single service handler is retrieved for all the
# device types in the path, i.e., all entries carry the same
# service handler, so we choose the first one retrieved.
if
len
(
service_handlers
)
<
1
:
raise
Exception
(
'
Unsupported case: {:s}
'
.
format
(
str
(
service_handlers
)))
service_handler
,
_
=
list
(
service_handlers
.
values
())[
0
]
if
service_handler
.
check_media_channel
(
connection_uuid
):
return
True
return
True
return
False
return
False
...
@@ -234,7 +243,16 @@ class TaskExecutor:
...
@@ -234,7 +243,16 @@ class TaskExecutor:
)
->
bool
:
)
->
bool
:
service_handler_settings
=
{}
service_handler_settings
=
{}
connection_uuid
=
connection
.
connection_id
.
connection_uuid
connection_uuid
=
connection
.
connection_id
.
connection_uuid
service_handler_class
=
self
.
get_service_handler
(
connection
,
service
,
**
service_handler_settings
)
classes_service_handlers
=
self
.
get_service_handlers
(
connection
,
service
,
**
service_handler_settings
)
# TODO: improve to select different service handlers when needed
# By now, assume a single service handler is retrieved for all the
# device types in the path, i.e., all entries carry the same
# service handler, so we choose the first one retrieved.
if
len
(
classes_service_handlers
)
<
1
:
raise
Exception
(
'
Unsupported case: {:s}
'
.
format
(
str
(
classes_service_handlers
)))
service_handler_class
,
_
=
list
(
classes_service_handlers
.
values
())[
0
]
return
service_handler_class
.
check_media_channel
(
connection_uuid
)
return
service_handler_class
.
check_media_channel
(
connection_uuid
)
def
get_device_controller
(
self
,
device
:
Device
)
->
Optional
[
Device
]:
def
get_device_controller
(
self
,
device
:
Device
)
->
Optional
[
Device
]:
...
...
This diff is collapsed.
Click to expand it.
src/service/service/task_scheduler/tasks/Task_OpticalConnectionDeconfigure.py
+
10
−
1
View file @
eac09e4f
...
@@ -48,7 +48,16 @@ class Task_OpticalConnectionDeconfigure(_Task):
...
@@ -48,7 +48,16 @@ class Task_OpticalConnectionDeconfigure(_Task):
service
=
self
.
_task_executor
.
get_service
(
connection
.
service_id
)
service
=
self
.
_task_executor
.
get_service
(
connection
.
service_id
)
errors
=
[]
errors
=
[]
service_handler_settings
=
{}
service_handler_settings
=
{}
service_handler
=
self
.
_task_executor
.
get_service_handler
(
connection
,
service
,
**
service_handler_settings
)
service_handlers
=
self
.
_task_executor
.
get_service_handlers
(
connection
,
service
,
**
service_handler_settings
)
# TODO: improve to select different service handlers when needed
# By now, assume a single service handler is retrieved for all the
# device types in the path, i.e., all entries carry the same
# service handler, so we choose the first one retrieved.
if
len
(
service_handlers
)
<
1
:
raise
Exception
(
'
Unsupported case: {:s}
'
.
format
(
str
(
service_handlers
)))
service_handler
,
_
=
list
(
service_handlers
.
values
())[
0
]
endpointids_to_delete
=
endpointids_to_raw
(
connection
.
path_hops_endpoint_ids
)
endpointids_to_delete
=
endpointids_to_raw
(
connection
.
path_hops_endpoint_ids
)
connection_uuid
=
connection
.
connection_id
.
connection_uuid
.
uuid
connection_uuid
=
connection
.
connection_id
.
connection_uuid
.
uuid
...
...
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