Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
Python
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
xAAL
Code
Python
Commits
26907d94
"...git@gitlab.imt-atlantique.fr:iota-imt/goshimmer.git" did not exist on "7f4f1727389b04c0e7eca481d8a206d34f6b2b23"
Commit
26907d94
authored
4 months ago
by
KERDREUX Jerome
Browse files
Options
Downloads
Patches
Plain Diff
Formating, fix ruff errors
parent
0e88f033
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
core/metadb/xaal/metadb/app.py
+13
-13
13 additions, 13 deletions
core/metadb/xaal/metadb/app.py
with
13 additions
and
13 deletions
core/metadb/xaal/metadb/app.py
+
13
−
13
View file @
26907d94
...
@@ -10,7 +10,7 @@ logger = logging.getLogger(PACKAGE_NAME)
...
@@ -10,7 +10,7 @@ logger = logging.getLogger(PACKAGE_NAME)
class
MetaDB
(
object
):
class
MetaDB
(
object
):
def
__init__
(
self
,
engine
):
def
__init__
(
self
,
engine
):
self
.
engine
=
engine
self
.
engine
=
engine
self
.
config
()
self
.
config
()
self
.
setup
()
self
.
setup
()
...
@@ -44,7 +44,7 @@ class MetaDB(object):
...
@@ -44,7 +44,7 @@ class MetaDB(object):
self
.
engine
.
add_device
(
dev
)
self
.
engine
.
add_device
(
dev
)
self
.
engine
.
add_timer
(
self
.
periodic_save
,
60
)
self
.
engine
.
add_timer
(
self
.
periodic_save
,
60
)
def
get_devices
(
self
,
_key
=
None
,
_value
=
None
):
def
get_devices
(
self
,
_key
=
None
,
_value
=
None
):
devices
=
self
.
cfg
[
'
devices
'
]
devices
=
self
.
cfg
[
'
devices
'
]
result
=
devices
.
keys
()
result
=
devices
.
keys
()
logger
.
debug
(
"
Searching for %s / %s
"
%
(
_key
,
_value
))
logger
.
debug
(
"
Searching for %s / %s
"
%
(
_key
,
_value
))
...
@@ -75,21 +75,21 @@ class MetaDB(object):
...
@@ -75,21 +75,21 @@ class MetaDB(object):
result
.
remove
(
dev
)
result
.
remove
(
dev
)
return
{
'
key
'
:
_key
,
'
value
'
:
_value
,
'
devices
'
:
result
}
return
{
'
key
'
:
_key
,
'
value
'
:
_value
,
'
devices
'
:
result
}
def
get_device
(
self
,
addr
):
def
get_device
(
self
,
addr
):
devices
=
self
.
cfg
[
'
devices
'
]
devices
=
self
.
cfg
[
'
devices
'
]
try
:
try
:
return
devices
[
str
(
addr
)]
return
devices
[
str
(
addr
)]
except
KeyError
:
except
KeyError
:
return
None
return
None
def
get_keys_values
(
self
,
_device
):
def
get_keys_values
(
self
,
_device
):
dev
=
self
.
get_device
(
_device
)
dev
=
self
.
get_device
(
_device
)
if
dev
:
if
dev
:
return
{
'
device
'
:
_device
,
'
map
'
:
dev
.
dict
()}
return
{
'
device
'
:
_device
,
'
map
'
:
dev
.
dict
()}
# logger.debug('Unknown device %s' % _device)
# logger.debug('Unknown device %s' % _device)
return
{
'
device
'
:
_device
,
'
map
'
:
{}}
return
{
'
device
'
:
_device
,
'
map
'
:
{}}
def
get_value
(
self
,
_device
,
_key
):
def
get_value
(
self
,
_device
,
_key
):
dev
=
self
.
get_device
(
_device
)
dev
=
self
.
get_device
(
_device
)
if
not
dev
:
if
not
dev
:
logger
.
info
(
'
Unknown device %s
'
%
_device
)
logger
.
info
(
'
Unknown device %s
'
%
_device
)
...
@@ -100,13 +100,13 @@ class MetaDB(object):
...
@@ -100,13 +100,13 @@ class MetaDB(object):
logger
.
info
(
'
Unknown key %s for %s
'
%
(
_key
,
_device
))
logger
.
info
(
'
Unknown key %s for %s
'
%
(
_key
,
_device
))
pass
pass
def
update_keys_values
(
self
,
_device
,
_map
):
def
update_keys_values
(
self
,
_device
,
_map
):
dev
=
self
.
get_device
(
_device
)
dev
=
self
.
get_device
(
_device
)
updated
=
{}
updated
=
{}
if
dev
:
if
dev
:
# if _map is empty, remove the device
# if _map is empty, remove the device
if
_map
==
None
:
if
_map
is
None
:
# self.cfg['devices'].pop(str(_device))
# self.cfg['devices'].pop(str(_device))
dev
=
{}
dev
=
{}
self
.
dirty
=
True
self
.
dirty
=
True
...
@@ -116,15 +116,15 @@ class MetaDB(object):
...
@@ -116,15 +116,15 @@ class MetaDB(object):
updated
.
update
({
k
:
_map
[
k
]})
updated
.
update
({
k
:
_map
[
k
]})
self
.
dirty
=
True
self
.
dirty
=
True
# remove item if empty
# remove item if empty
if
_map
[
k
]
==
None
:
if
_map
[
k
]
is
None
:
dev
.
pop
(
k
)
dev
.
pop
(
k
)
else
:
else
:
dev
.
update
({
k
:
_map
[
k
]})
dev
.
update
({
k
:
_map
[
k
]})
elif
_map
!=
None
:
elif
_map
is
not
None
:
updated
=
{}
updated
=
{}
for
k
,
v
in
_map
.
items
():
for
k
,
v
in
_map
.
items
():
if
v
!=
None
:
if
v
is
not
None
:
updated
.
update
({
k
:
v
})
updated
.
update
({
k
:
v
})
self
.
cfg
[
'
devices
'
][
str
(
_device
)]
=
updated
self
.
cfg
[
'
devices
'
][
str
(
_device
)]
=
updated
self
.
dirty
=
True
self
.
dirty
=
True
...
@@ -133,8 +133,8 @@ class MetaDB(object):
...
@@ -133,8 +133,8 @@ class MetaDB(object):
self
.
cfg
[
'
devices
'
].
pop
(
str
(
_device
))
self
.
cfg
[
'
devices
'
].
pop
(
str
(
_device
))
if
len
(
updated
):
if
len
(
updated
):
body
=
{
'
device
'
:
_device
,
'
map
'
:
updated
}
body
=
{
'
device
'
:
_device
,
'
map
'
:
updated
}
self
.
engine
.
send_notification
(
self
.
dev
,
'
keys_values_changed
'
,
body
)
self
.
engine
.
send_notification
(
self
.
dev
,
'
keys_values_changed
'
,
body
)
logger
.
debug
(
f
"
Updated
{
_device
}
=>
{
self
.
get_device
(
_device
)
}
"
)
logger
.
debug
(
f
"
Updated
{
_device
}
=>
{
self
.
get_device
(
_device
)
}
"
)
def
periodic_save
(
self
):
def
periodic_save
(
self
):
...
@@ -145,7 +145,7 @@ class MetaDB(object):
...
@@ -145,7 +145,7 @@ class MetaDB(object):
# devices.pop(key)
# devices.pop(key)
devices
=
{
key
:
val
for
key
,
val
in
sorted
(
devices
.
items
(),
key
=
lambda
ele
:
ele
[
0
])}
devices
=
{
key
:
val
for
key
,
val
in
sorted
(
devices
.
items
(),
key
=
lambda
ele
:
ele
[
0
])}
self
.
cfg
[
'
devices
'
]
=
devices
self
.
cfg
[
'
devices
'
]
=
devices
logger
.
info
(
"
Saving configuration file
"
)
logger
.
info
(
"
Saving configuration file
"
)
self
.
cfg
.
write
()
self
.
cfg
.
write
()
self
.
dirty
=
False
self
.
dirty
=
False
...
...
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