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
Merge requests
!251
Resolve "(TID) Add inventory NBI to WebUI"
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Resolve "(TID) Add inventory NBI to WebUI"
feat/173-tid-add-inventory-nbi-to-webui
into
develop
Overview
0
Commits
12
Pipelines
13
Changes
2
Merged
Pablo Armingol
requested to merge
feat/173-tid-add-inventory-nbi-to-webui
into
develop
9 months ago
Overview
0
Commits
12
Pipelines
13
Changes
2
Expand
Closes
#173 (closed)
0
0
Merge request reports
Viewing commit
90bb0d50
Prev
Next
Show latest version
2 files
+
5
−
23
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
2
Search (e.g. *.vue) (Ctrl+P)
90bb0d50
pre merge code cleanup
· 90bb0d50
Pablo Armingol
authored
8 months ago
src/nbi/service/rest_server/nbi_plugins/ietf_hardware/YangHandler.py
+
4
−
21
Options
@@ -46,60 +46,45 @@ class YangHandler:
dnode
.
free
()
return
message
@staticmethod
def
convert_to_iso_date
(
date_str
:
str
)
->
Optional
[
str
]:
date_str
=
date_str
.
strip
(
'"'
)
# Define the regex pattern for ISO 8601 date format
pattern
=
r
"
\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d+)?(Z|[\+\-]\d{2}:\d{2})
"
# Check if the input date string matches the pattern
if
re
.
match
(
pattern
,
date_str
):
return
date_str
# Already in ISO format
return
date_str
else
:
try
:
# Parse the input date string as a datetime object
datetime_obj
=
datetime
.
datetime
.
strptime
(
date_str
,
"
%Y-%m-%d
"
)
# Convert to ISO format
iso_date
=
datetime_obj
.
isoformat
()
+
"
Z
"
return
iso_date
except
ValueError
:
return
None
# Invalid date format
return
None
def
compose
(
self
,
device
:
Device
)
->
Dict
:
hardware
=
self
.
_yang_context
.
create_data_path
(
'
/ietf-network-hardware-inventory:network-hardware-inventory
'
)
network_elements
=
hardware
.
create_path
(
'
network-elements
'
)
network_element
=
network_elements
.
create_path
(
'
network-element[uuid=
"
{:s}
"
]
'
.
format
(
device
.
device_id
.
device_uuid
.
uuid
))
network_element
.
create_path
(
'
uuid
'
,
device
.
device_id
.
device_uuid
.
uuid
)
network_element
.
create_path
(
'
name
'
,
device
.
name
)
components
=
network_element
.
create_path
(
'
components
'
)
physical_index
=
1
for
component
in
device
.
components
:
attributes
=
component
.
attributes
component_new
=
components
.
create_path
(
'
component[uuid=
"
{:s}
"
]
'
.
format
(
component
.
component_uuid
.
uuid
))
component_new
.
create_path
(
'
name
'
,
component
.
name
)
#Cambiar las clases especiales, su formato y añadir isfru
component_type
=
component
.
type
if
component_type
==
"
TRANSCEIVER
"
:
component_type
=
"
module
"
if
component_type
==
"
FRU
"
:
component_type
=
"
slack
"
component_type
=
component_type
.
replace
(
"
_
"
,
"
-
"
).
lower
()
component_type
=
'
iana-hardware:
'
+
component_type
component_new
.
create_path
(
'
class
'
,
component_type
)
#Añadir resto de atributos en IETF
physical_index
+=
1
component_new
.
create_path
(
'
description
'
,
attributes
[
"
description
"
].
replace
(
'
/
"'
,
""
))
if
"
CHASSIS
"
not
in
component
.
type
:
parent_component_references
=
component_new
.
create_path
(
'
parent-component-references
'
)
parent
=
parent_component_references
.
create_path
(
'
component-reference[index=
"
{:d}
"
]
'
.
format
(
physical_index
))
@@ -107,7 +92,6 @@ class YangHandler:
if
component
.
parent
==
component_parent
.
name
:
parent
.
create_path
(
'
uuid
'
,
component_parent
.
component_uuid
.
uuid
)
break
if
attributes
[
"
mfg-date
"
]
!=
""
:
mfg_date
=
self
.
convert_to_iso_date
(
attributes
[
"
mfg-date
"
])
component_new
.
create_path
(
'
mfg-date
'
,
mfg_date
)
@@ -137,7 +121,6 @@ class YangHandler:
component_new
.
create_path
(
'
uri
'
,
component
.
name
)
component_new
.
create_path
(
'
uuid
'
,
component
.
component_uuid
.
uuid
)
for
child
in
device
.
components
:
if
component
.
name
==
child
.
parent
:
component_new
.
create_path
(
'
contained-child
'
,
child
.
component_uuid
.
uuid
)
Loading