Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
verktoy
kindnavsync
Commits
94b93777
Commit
94b93777
authored
Jun 26, 2018
by
Morten Brekkevold
Browse files
also ignore equipment with no rooms
parent
fbcdfeec
Changes
2
Hide whitespace changes
Inline
Side-by-side
bin/kindnavsync
View file @
94b93777
...
...
@@ -140,12 +140,21 @@ def find_duplicates(names):
def
clean_data
(
kind_data
):
kind_devices
=
[
KindDevice
.
from_json_record
(
record
)
for
record
in
kind_data
]
invalid_names
=
{
device
.
name
for
device
in
kind_devices
if
not
device_name_is_okay
(
device
.
name
)}
LOG
.
error
(
"Ignorerer følgende utstyr som ikke har gyldige navn i Kind: %r"
,
sorted
(
invalid_names
))
if
invalid_names
:
LOG
.
error
(
"Ignorerer følgende utstyr som ikke har gyldige navn i Kind: "
"%r"
,
sorted
(
invalid_names
))
no_nettinstallasjon
=
{
device
.
name
for
device
in
kind_devices
if
not
device
.
room
}
if
no_nettinstallasjon
:
LOG
.
error
(
"Ignorerer følgende utstyr som ikke har nettinstallasjon "
"satt i Kind: %r"
,
sorted
(
no_nettinstallasjon
))
return
{
device
.
name
:
device
for
device
in
kind_devices
if
device
.
name
not
in
invalid_names
}
if
device
.
name
not
in
(
invalid_names
|
no_nettinstallasjon
)
}
def
device_name_is_okay
(
name
):
...
...
@@ -393,9 +402,6 @@ class KindDevice(object):
self
.
ignore_insert
=
False
self
.
netbox
=
None
if
not
room
:
LOG
.
warning
(
"%s mangler nettinstallasjon!"
,
self
)
@
classmethod
def
from_json_record
(
cls
,
record
):
return
cls
(
...
...
setup.py
View file @
94b93777
...
...
@@ -3,7 +3,7 @@ from setuptools import setup
setup
(
name
=
"kindnavsync"
,
version
=
"0.2.
4
"
,
version
=
"0.2.
5
"
,
author
=
"Morten Brekkevold"
,
author_email
=
"morten.brekkevold@uninett.no"
,
description
=
"Synchronizes device information from Kind to NAV"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment