Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Nounous
re2o
Commits
eded66be
Commit
eded66be
authored
Jul 09, 2018
by
Gabriel Detraz
Committed by
Grizzly
Sep 27, 2018
Browse files
Gestion des switchs à provisioner automatiquement
parent
b44021a9
Changes
4
Hide whitespace changes
Inline
Side-by-side
preferences/forms.py
View file @
eded66be
...
...
@@ -45,7 +45,6 @@ from .models import (
)
from
topologie.models
import
Switch
class
EditOptionalUserForm
(
ModelForm
):
"""Formulaire d'édition des options de l'user. (solde, telephone..)"""
class
Meta
:
...
...
@@ -96,7 +95,14 @@ class EditOptionalMachineForm(ModelForm):
class
EditOptionalTopologieForm
(
ModelForm
):
"""Options de topologie, formulaire d'edition (vlan par default etc)"""
"""Options de topologie, formulaire d'edition (vlan par default etc)
On rajoute un champ automatic provision switchs pour gérer facilement
l'ajout de switchs au provisionning automatique"""
automatic_provision_switchs
=
forms
.
ModelMultipleChoiceField
(
Switch
.
objects
.
all
(),
required
=
False
)
class
Meta
:
model
=
OptionalTopologie
fields
=
'__all__'
...
...
@@ -114,6 +120,14 @@ class EditOptionalTopologieForm(ModelForm):
self
.
fields
[
'vlan_decision_nok'
].
label
=
_
(
"VLAN for machines rejected"
" by RADIUS"
)
self
.
initial
[
'automatic_provision_switchs'
]
=
Switch
.
objects
.
filter
(
automatic_provision
=
True
)
def
save
(
self
,
commit
=
True
):
instance
=
super
().
save
(
commit
)
Switch
.
objects
.
all
().
update
(
automatic_provision
=
False
)
self
.
cleaned_data
[
'automatic_provision_switchs'
].
update
(
automatic_provision
=
True
)
return
instance
class
EditGeneralOptionForm
(
ModelForm
):
"""Options générales (affichages de résultats de recherche, etc)"""
...
...
preferences/models.py
View file @
eded66be
...
...
@@ -34,6 +34,7 @@ from django.forms import ValidationError
from
django.utils.translation
import
ugettext_lazy
as
_
import
machines.models
from
re2o.mixins
import
AclMixin
from
re2o.aes_field
import
AESEncryptedField
from
datetime
import
timedelta
...
...
topologie/migrations/0064_switch_automatic_provision.py
0 → 100644
View file @
eded66be
# -*- coding: utf-8 -*-
# Generated by Django 1.10.7 on 2018-09-20 16:28
from
__future__
import
unicode_literals
from
django.db
import
migrations
,
models
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'topologie'
,
'0063_auto_20180919_2225'
),
]
operations
=
[
migrations
.
AddField
(
model_name
=
'switch'
,
name
=
'automatic_provision'
,
field
=
models
.
BooleanField
(
default
=
False
,
help_text
=
'Provision automatique de ce switch'
),
),
]
topologie/models.py
View file @
eded66be
...
...
@@ -247,6 +247,10 @@ class Switch(AclMixin, Machine):
on_delete
=
models
.
PROTECT
,
help_text
=
"Identifiant de management de ce switch"
)
automatic_provision
=
models
.
BooleanField
(
default
=
False
,
help_text
=
'Provision automatique de ce switch'
,
)
class
Meta
:
unique_together
=
(
'stack'
,
'stack_member_id'
)
...
...
Write
Preview
Supports
Markdown
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