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
ded005de
Commit
ded005de
authored
1 year ago
by
Pablo Armingol
Browse files
Options
Downloads
Patches
Plain Diff
Add support for new vendor in Openconfig Driver
parent
b0a502e7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!235
Release TeraFlowSDN 3.0
,
!162
Resolve "(TID) Add support for Juniper in OpenConfig Driver"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/device/service/drivers/openconfig/OpenConfigDriver.py
+12
-1
12 additions, 1 deletion
src/device/service/drivers/openconfig/OpenConfigDriver.py
src/device/service/drivers/openconfig/templates/Inventory.py
+1
-3
1 addition, 3 deletions
src/device/service/drivers/openconfig/templates/Inventory.py
with
13 additions
and
4 deletions
src/device/service/drivers/openconfig/OpenConfigDriver.py
+
12
−
1
View file @
ded005de
...
...
@@ -53,6 +53,8 @@ MAX_RETRIES = 15
DELAY_FUNCTION
=
delay_exponential
(
initial
=
0.01
,
increment
=
2.0
,
maximum
=
5.0
)
RETRY_DECORATOR
=
retry
(
max_retries
=
MAX_RETRIES
,
delay_function
=
DELAY_FUNCTION
,
prepare_method_name
=
'
connect
'
)
LOGGER
=
logging
.
getLogger
(
__name__
)
class
NetconfSessionHandler
:
def
__init__
(
self
,
address
:
str
,
port
:
int
,
**
settings
)
->
None
:
self
.
__lock
=
threading
.
RLock
()
...
...
@@ -109,7 +111,16 @@ class NetconfSessionHandler:
@RETRY_DECORATOR
def
get
(
self
,
filter
=
None
,
with_defaults
=
None
):
# pylint: disable=redefined-builtin
with
self
.
__lock
:
return
self
.
__manager
.
get
(
filter
=
filter
,
with_defaults
=
with_defaults
)
if
self
.
__vendor
==
'
JUNIPER
'
and
not
'
component
'
in
str
(
filter
):
LOGGER
.
info
(
'
filtros = {:s}
'
.
format
(
str
(
filter
)))
data
=
self
.
__manager
.
get_config
(
source
=
"
running
"
,
filter
=
filter
,
with_defaults
=
with_defaults
)
LOGGER
.
info
(
'
resultado = {:s}
'
.
format
(
str
(
data
)))
return
self
.
__manager
.
get_config
(
source
=
"
running
"
,
filter
=
filter
,
with_defaults
=
with_defaults
)
else
:
LOGGER
.
info
(
'
filtros2 = {:s}
'
.
format
(
str
(
filter
)))
data
=
self
.
__manager
.
get
(
filter
=
filter
,
with_defaults
=
with_defaults
)
LOGGER
.
info
(
'
resultado2 = {:s}
'
.
format
(
str
(
data
)))
return
self
.
__manager
.
get
(
filter
=
filter
,
with_defaults
=
with_defaults
)
@RETRY_DECORATOR
def
edit_config
(
...
...
This diff is collapsed.
Click to expand it.
src/device/service/drivers/openconfig/templates/Inventory.py
+
1
−
3
View file @
ded005de
...
...
@@ -89,9 +89,7 @@ def parse(xml_data : ET.Element) -> List[Tuple[str, Dict[str, Any]]]:
add_value_from_tag
(
inventory
[
'
attributes
'
],
'
empty
'
,
component_empty
)
component_parent
=
xml_component
.
find
(
'
ocp:state/ocp:parent
'
,
namespaces
=
NAMESPACES
)
if
component_parent
is
None
or
component_parent
.
text
is
None
:
add_value_from_tag
(
inventory
,
'
parent-component-references
'
,
component_type
)
else
:
if
not
component_parent
is
None
:
add_value_from_tag
(
inventory
,
'
parent-component-references
'
,
component_parent
)
component_HW
=
xml_component
.
find
(
'
ocp:state/ocp:hardware-version
'
,
namespaces
=
NAMESPACES
)
...
...
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