Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
re2o
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Nounous
re2o
Commits
db0c9bd2
Commit
db0c9bd2
authored
Sep 08, 2017
by
chirac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix les erreurs de none sur macaddress
parent
b40bc970
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
1 deletion
+9
-1
machines/models.py
machines/models.py
+9
-1
No files found.
machines/models.py
View file @
db0c9bd2
...
...
@@ -213,7 +213,15 @@ class Interface(models.Model):
def
mac_bare
(
self
):
return
str
(
EUI
(
self
.
mac_address
,
dialect
=
mac_bare
)).
lower
()
def
filter_macaddress
(
self
):
mac_address
=
str
(
EUI
(
self
.
mac_address
))
if
mac_address
:
self
.
mac_address
=
mac_address
else
:
raise
ValidationError
(
"La mac donnée est invalide"
)
def
clean
(
self
,
*
args
,
**
kwargs
):
self
.
filter_macaddress
()
self
.
mac_address
=
str
(
EUI
(
self
.
mac_address
))
or
None
if
not
self
.
ipv4
or
self
.
type
.
ip_type
!=
self
.
ipv4
.
ip_type
:
self
.
assign_ipv4
()
...
...
@@ -237,7 +245,7 @@ class Interface(models.Model):
self
.
save
()
def
save
(
self
,
*
args
,
**
kwargs
):
self
.
mac_address
=
str
(
EUI
(
self
.
mac_address
))
or
None
self
.
filter_macaddress
()
# On verifie la cohérence en forçant l'extension par la méthode
if
self
.
type
.
ip_type
!=
self
.
ipv4
.
ip_type
:
raise
ValidationError
(
"L'ipv4 et le type de la machine ne correspondent pas"
)
...
...
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