mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-11-05 09:26:27 +00:00
Modèle et constructeurs de switches
This commit is contained in:
parent
0efe0c27d2
commit
315560ba5c
12 changed files with 489 additions and 7 deletions
|
@ -216,6 +216,15 @@ class SortTable:
|
||||||
'stack_id': ['stack_id'],
|
'stack_id': ['stack_id'],
|
||||||
'default': ['stack_id'],
|
'default': ['stack_id'],
|
||||||
}
|
}
|
||||||
|
TOPOLOGIE_INDEX_MODEL_SWITCH = {
|
||||||
|
'model_switch_name': ['reference'],
|
||||||
|
'model_switch__contructor' : ['constructor__name'],
|
||||||
|
'default': ['reference'],
|
||||||
|
}
|
||||||
|
TOPOLOGIE_INDEX_CONSTRUCTOR_SWITCH = {
|
||||||
|
'room_name': ['name'],
|
||||||
|
'default': ['name'],
|
||||||
|
}
|
||||||
LOGS_INDEX = {
|
LOGS_INDEX = {
|
||||||
'sum_date': ['revision__date_created'],
|
'sum_date': ['revision__date_created'],
|
||||||
'default': ['-revision__date_created'],
|
'default': ['-revision__date_created'],
|
||||||
|
|
|
@ -29,7 +29,7 @@ from __future__ import unicode_literals
|
||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
from reversion.admin import VersionAdmin
|
from reversion.admin import VersionAdmin
|
||||||
|
|
||||||
from .models import Port, Room, Switch, Stack
|
from .models import Port, Room, Switch, Stack, ModelSwitch, ConstructorSwitch
|
||||||
|
|
||||||
|
|
||||||
class StackAdmin(VersionAdmin):
|
class StackAdmin(VersionAdmin):
|
||||||
|
@ -52,7 +52,19 @@ class RoomAdmin(VersionAdmin):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
class ModelSwitchAdmin(VersionAdmin):
|
||||||
|
"""Administration d'un modèle de switch"""
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
class ConstructorSwitchAdmin(VersionAdmin):
|
||||||
|
"""Administration d'un constructeur d'un switch"""
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
admin.site.register(Port, PortAdmin)
|
admin.site.register(Port, PortAdmin)
|
||||||
admin.site.register(Room, RoomAdmin)
|
admin.site.register(Room, RoomAdmin)
|
||||||
admin.site.register(Switch, SwitchAdmin)
|
admin.site.register(Switch, SwitchAdmin)
|
||||||
admin.site.register(Stack, StackAdmin)
|
admin.site.register(Stack, StackAdmin)
|
||||||
|
admin.site.register(ModelSwitch, ModelSwitchAdmin)
|
||||||
|
admin.site.register(ConstructorSwitch, ConstructorSwitchAdmin)
|
||||||
|
|
|
@ -34,7 +34,7 @@ from __future__ import unicode_literals
|
||||||
|
|
||||||
from machines.models import Interface
|
from machines.models import Interface
|
||||||
from django.forms import ModelForm
|
from django.forms import ModelForm
|
||||||
from .models import Port, Switch, Room, Stack
|
from .models import Port, Switch, Room, Stack, ModelSwitch, ConstructorSwitch
|
||||||
|
|
||||||
|
|
||||||
class PortForm(ModelForm):
|
class PortForm(ModelForm):
|
||||||
|
@ -136,3 +136,25 @@ class EditRoomForm(ModelForm):
|
||||||
def __init__(self, *args, **kwargs):
|
def __init__(self, *args, **kwargs):
|
||||||
prefix = kwargs.pop('prefix', self.Meta.model.__name__)
|
prefix = kwargs.pop('prefix', self.Meta.model.__name__)
|
||||||
super(EditRoomForm, self).__init__(*args, prefix=prefix, **kwargs)
|
super(EditRoomForm, self).__init__(*args, prefix=prefix, **kwargs)
|
||||||
|
|
||||||
|
|
||||||
|
class EditModelSwitchForm(ModelForm):
|
||||||
|
"""Permet d'éediter un modèle de switch : nom et constructeur"""
|
||||||
|
class Meta:
|
||||||
|
model = ModelSwitch
|
||||||
|
fields = '__all__'
|
||||||
|
|
||||||
|
def __init__(self, *args, **kwargs):
|
||||||
|
prefix = kwargs.pop('prefix', self.Meta.model.__name__)
|
||||||
|
super(EditModelSwitchForm, self).__init__(*args, prefix=prefix, **kwargs)
|
||||||
|
|
||||||
|
|
||||||
|
class EditConstructorSwitchForm(ModelForm):
|
||||||
|
"""Permet d'éediter le nom d'un constructeur"""
|
||||||
|
class Meta:
|
||||||
|
model = ConstructorSwitch
|
||||||
|
fields = '__all__'
|
||||||
|
|
||||||
|
def __init__(self, *args, **kwargs):
|
||||||
|
prefix = kwargs.pop('prefix', self.Meta.model.__name__)
|
||||||
|
super(EditConstructorSwitchForm, self).__init__(*args, prefix=prefix, **kwargs)
|
||||||
|
|
36
topologie/migrations/0032_auto_20171026_0338.py
Normal file
36
topologie/migrations/0032_auto_20171026_0338.py
Normal file
|
@ -0,0 +1,36 @@
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
# Generated by Django 1.10.7 on 2017-10-26 01:38
|
||||||
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
import django.db.models.deletion
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('topologie', '0031_auto_20171015_2033'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='ConstructorSwitch',
|
||||||
|
fields=[
|
||||||
|
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||||
|
('name', models.CharField(max_length=255)),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='ModelSwitch',
|
||||||
|
fields=[
|
||||||
|
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||||
|
('reference', models.CharField(max_length=255)),
|
||||||
|
('constructor', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='topologie.ConstructorSwitch')),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='switch',
|
||||||
|
name='model',
|
||||||
|
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='topologie.ModelSwitch'),
|
||||||
|
),
|
||||||
|
]
|
|
@ -93,12 +93,18 @@ class Switch(models.Model):
|
||||||
number = models.PositiveIntegerField()
|
number = models.PositiveIntegerField()
|
||||||
details = models.CharField(max_length=255, blank=True)
|
details = models.CharField(max_length=255, blank=True)
|
||||||
stack = models.ForeignKey(
|
stack = models.ForeignKey(
|
||||||
Stack,
|
'topologie.Stack',
|
||||||
blank=True,
|
blank=True,
|
||||||
null=True,
|
null=True,
|
||||||
on_delete=models.SET_NULL
|
on_delete=models.SET_NULL
|
||||||
)
|
)
|
||||||
stack_member_id = models.PositiveIntegerField(blank=True, null=True)
|
stack_member_id = models.PositiveIntegerField(blank=True, null=True)
|
||||||
|
model = models.ForeignKey(
|
||||||
|
'topologie.ModelSwitch',
|
||||||
|
blank=True,
|
||||||
|
null=True,
|
||||||
|
on_delete=models.SET_NULL
|
||||||
|
)
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
unique_together = ('stack', 'stack_member_id')
|
unique_together = ('stack', 'stack_member_id')
|
||||||
|
@ -121,6 +127,26 @@ class Switch(models.Model):
|
||||||
ne peut être nul"})
|
ne peut être nul"})
|
||||||
|
|
||||||
|
|
||||||
|
class ModelSwitch(models.Model):
|
||||||
|
"""Un modèle (au sens constructeur) de switch"""
|
||||||
|
reference = models.CharField(max_length=255)
|
||||||
|
constructor = models.ForeignKey(
|
||||||
|
'topologie.ConstructorSwitch',
|
||||||
|
on_delete=models.PROTECT
|
||||||
|
)
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
|
return str(self.constructor) + ' ' + str(self.reference)
|
||||||
|
|
||||||
|
|
||||||
|
class ConstructorSwitch(models.Model):
|
||||||
|
"""Un constructeur de switch"""
|
||||||
|
name = models.CharField(max_length=255)
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
|
return str(self.name)
|
||||||
|
|
||||||
|
|
||||||
class Port(models.Model):
|
class Port(models.Model):
|
||||||
""" Definition d'un port. Relié à un switch(foreign_key),
|
""" Definition d'un port. Relié à un switch(foreign_key),
|
||||||
un port peut etre relié de manière exclusive à :
|
un port peut etre relié de manière exclusive à :
|
||||||
|
|
54
topologie/templates/topologie/aff_constructor_switch.html
Normal file
54
topologie/templates/topologie/aff_constructor_switch.html
Normal file
|
@ -0,0 +1,54 @@
|
||||||
|
{% comment %}
|
||||||
|
Re2o est un logiciel d'administration développé initiallement au rezometz. Il
|
||||||
|
se veut agnostique au réseau considéré, de manière à être installable en
|
||||||
|
quelques clics.
|
||||||
|
|
||||||
|
Copyright © 2017 Gabriel Détraz
|
||||||
|
Copyright © 2017 Goulven Kermarec
|
||||||
|
Copyright © 2017 Augustin Lemesle
|
||||||
|
|
||||||
|
This program is free software; you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation; either version 2 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License along
|
||||||
|
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
|
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
{% endcomment %}
|
||||||
|
|
||||||
|
{% if constructor_switch_list.paginator %}
|
||||||
|
{% include "pagination.html" with list=constructor_switch_list %}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
<table class="table table-striped">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>{% include "buttons/sort.html" with prefix='constructor-switch' col='name' text='Constructeur' %}</th>
|
||||||
|
<th></th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
{% for constructor_switch in constructor_switch_list %}
|
||||||
|
<tr>
|
||||||
|
<td>{{constructor_switch}}</td>
|
||||||
|
<td class="text-right">
|
||||||
|
<a class="btn btn-info btn-sm" role="button" title="Historique" href="{% url 'topologie:history' 'constructor_switch' constructor_switch.pk %}">
|
||||||
|
<i class="glyphicon glyphicon-time"></i>
|
||||||
|
</a>
|
||||||
|
{% if is_infra %}
|
||||||
|
<a class="btn btn-primary btn-sm" role="button" title="Éditer" href="{% url 'topologie:edit-constructor-switch' constructor_switch.id %}">
|
||||||
|
<i class="glyphicon glyphicon-edit"></i>
|
||||||
|
</a>
|
||||||
|
<a class="btn btn-danger btn-sm" role="button" title="Supprimer" href="{% url 'topologie:del-constructor-switch' constructor_switch.id %}">
|
||||||
|
<i class="glyphicon glyphicon-trash"></i>
|
||||||
|
</a>
|
||||||
|
{% endif %}
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
{% endfor %}
|
||||||
|
</table>
|
56
topologie/templates/topologie/aff_model_switch.html
Normal file
56
topologie/templates/topologie/aff_model_switch.html
Normal file
|
@ -0,0 +1,56 @@
|
||||||
|
{% comment %}
|
||||||
|
Re2o est un logiciel d'administration développé initiallement au rezometz. Il
|
||||||
|
se veut agnostique au réseau considéré, de manière à être installable en
|
||||||
|
quelques clics.
|
||||||
|
|
||||||
|
Copyright © 2017 Gabriel Détraz
|
||||||
|
Copyright © 2017 Goulven Kermarec
|
||||||
|
Copyright © 2017 Augustin Lemesle
|
||||||
|
|
||||||
|
This program is free software; you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation; either version 2 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License along
|
||||||
|
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
|
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
{% endcomment %}
|
||||||
|
|
||||||
|
{% if model_switch_list.paginator %}
|
||||||
|
{% include "pagination.html" with list=model_switch_list %}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
<table class="table table-striped">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>{% include "buttons/sort.html" with prefix='model-switch' col='reference' text='Référence' %}</th>
|
||||||
|
<th>{% include "buttons/sort.html" with prefix='model-switch' col='constructor' text='Constructeur' %}</th>
|
||||||
|
<th></th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
{% for model_switch in model_switch_list %}
|
||||||
|
<tr>
|
||||||
|
<td>{{model_switch.reference}}</td>
|
||||||
|
<td>{{model_switch.constructor}}</td>
|
||||||
|
<td class="text-right">
|
||||||
|
<a class="btn btn-info btn-sm" role="button" title="Historique" href="{% url 'topologie:history' 'model_switch' model_switch.pk %}">
|
||||||
|
<i class="glyphicon glyphicon-time"></i>
|
||||||
|
</a>
|
||||||
|
{% if is_infra %}
|
||||||
|
<a class="btn btn-primary btn-sm" role="button" title="Éditer" href="{% url 'topologie:edit-model-switch' model_switch.id %}">
|
||||||
|
<i class="glyphicon glyphicon-edit"></i>
|
||||||
|
</a>
|
||||||
|
<a class="btn btn-danger btn-sm" role="button" title="Supprimer" href="{% url 'topologie:del-model-switch' model_switch.id %}">
|
||||||
|
<i class="glyphicon glyphicon-trash"></i>
|
||||||
|
</a>
|
||||||
|
{% endif %}
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
{% endfor %}
|
||||||
|
</table>
|
|
@ -30,7 +30,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
<th>{% include "buttons/sort.html" with prefix='switch' col='loc' text='Localisation' %}</th>
|
<th>{% include "buttons/sort.html" with prefix='switch' col='loc' text='Localisation' %}</th>
|
||||||
<th>{% include "buttons/sort.html" with prefix='switch' col='ports' text='Ports' %}</th>
|
<th>{% include "buttons/sort.html" with prefix='switch' col='ports' text='Ports' %}</th>
|
||||||
<th>{% include "buttons/sort.html" with prefix='switch' col='stack' text='Stack' %}</th>
|
<th>{% include "buttons/sort.html" with prefix='switch' col='stack' text='Stack' %}</th>
|
||||||
<th>Id interne stack</th>
|
<th>Id stack</th>
|
||||||
|
<th>Modèle</th>
|
||||||
<th>Détails</th>
|
<th>Détails</th>
|
||||||
<th></th>
|
<th></th>
|
||||||
</tr>
|
</tr>
|
||||||
|
@ -47,6 +48,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
<td>{{switch.number}}</td>
|
<td>{{switch.number}}</td>
|
||||||
<td>{{switch.stack.name}}</td>
|
<td>{{switch.stack.name}}</td>
|
||||||
<td>{{switch.stack_member_id}}</td>
|
<td>{{switch.stack_member_id}}</td>
|
||||||
|
<td>{{switch.model}}</td>
|
||||||
<td>{{switch.details}}</td>
|
<td>{{switch.details}}</td>
|
||||||
<td class="text-right">
|
<td class="text-right">
|
||||||
{% include 'buttons/history.html' with href='topologie:history' name='switch' id=switch.pk%}
|
{% include 'buttons/history.html' with href='topologie:history' name='switch' id=switch.pk%}
|
||||||
|
|
46
topologie/templates/topologie/index_model_switch.html
Normal file
46
topologie/templates/topologie/index_model_switch.html
Normal file
|
@ -0,0 +1,46 @@
|
||||||
|
{% extends "topologie/sidebar.html" %}
|
||||||
|
{% comment %}
|
||||||
|
Re2o est un logiciel d'administration développé initiallement au rezometz. Il
|
||||||
|
se veut agnostique au réseau considéré, de manière à être installable en
|
||||||
|
quelques clics.
|
||||||
|
|
||||||
|
Copyright © 2017 Gabriel Détraz
|
||||||
|
Copyright © 2017 Goulven Kermarec
|
||||||
|
Copyright © 2017 Augustin Lemesle
|
||||||
|
|
||||||
|
This program is free software; you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation; either version 2 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License along
|
||||||
|
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
|
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
{% endcomment %}
|
||||||
|
|
||||||
|
{% load bootstrap3 %}
|
||||||
|
|
||||||
|
{% block title %}Modèles de switches{% endblock %}
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
|
<h2>Modèles de switches</h2>
|
||||||
|
{% if is_infra %}
|
||||||
|
<a class="btn btn-primary btn-sm" role="button" href="{% url 'topologie:new-model-switch' %}"><i class="glyphicon glyphicon-plus"></i> Ajouter un modèle</a>
|
||||||
|
<hr>
|
||||||
|
{% endif %}
|
||||||
|
{% include "topologie/aff_model_switch.html" with model_switch_list=model_switch_list %}
|
||||||
|
<h2>Constructeurs de switches</h2>
|
||||||
|
{% if is_infra %}
|
||||||
|
<a class="btn btn-primary btn-sm" role="button" href="{% url 'topologie:new-constructor-switch' %}"><i class="glyphicon glyphicon-plus"></i> Ajouter un constructeur</a>
|
||||||
|
<hr>
|
||||||
|
{% endif %}
|
||||||
|
{% include "topologie/aff_constructor_switch.html" with constructor_switch_list=constructor_switch_list %}
|
||||||
|
<br />
|
||||||
|
<br />
|
||||||
|
<br />
|
||||||
|
{% endblock %}
|
|
@ -37,4 +37,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
<i class="glyphicon glyphicon-list"></i>
|
<i class="glyphicon glyphicon-list"></i>
|
||||||
Stacks
|
Stacks
|
||||||
</a>
|
</a>
|
||||||
|
<a class="list-group-item list-group-item-info" href="{% url "topologie:index-model-switch" %}">
|
||||||
|
<i class="glyphicon glyphicon-list"></i>
|
||||||
|
Modèles switches et constructeurs
|
||||||
|
</a>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -54,6 +54,12 @@ urlpatterns = [
|
||||||
url(r'^history/(?P<object_name>stack)/(?P<object_id>[0-9]+)$',
|
url(r'^history/(?P<object_name>stack)/(?P<object_id>[0-9]+)$',
|
||||||
views.history,
|
views.history,
|
||||||
name='history'),
|
name='history'),
|
||||||
|
url(r'^history/(?P<object_name>model_switch)/(?P<object_id>[0-9]+)$',
|
||||||
|
views.history,
|
||||||
|
name='history'),
|
||||||
|
url(r'^history/(?P<object_name>constructor_switch)/(?P<object_id>[0-9]+)$',
|
||||||
|
views.history,
|
||||||
|
name='history'),
|
||||||
url(r'^edit_port/(?P<port_id>[0-9]+)$', views.edit_port, name='edit-port'),
|
url(r'^edit_port/(?P<port_id>[0-9]+)$', views.edit_port, name='edit-port'),
|
||||||
url(r'^new_port/(?P<switch_id>[0-9]+)$', views.new_port, name='new-port'),
|
url(r'^new_port/(?P<switch_id>[0-9]+)$', views.new_port, name='new-port'),
|
||||||
url(r'^del_port/(?P<port_id>[0-9]+)$', views.del_port, name='del-port'),
|
url(r'^del_port/(?P<port_id>[0-9]+)$', views.del_port, name='del-port'),
|
||||||
|
@ -68,4 +74,32 @@ urlpatterns = [
|
||||||
url(r'^del_stack/(?P<stack_id>[0-9]+)$',
|
url(r'^del_stack/(?P<stack_id>[0-9]+)$',
|
||||||
views.del_stack,
|
views.del_stack,
|
||||||
name='del-stack'),
|
name='del-stack'),
|
||||||
|
url(r'^index_model_switch/$',
|
||||||
|
views.index_model_switch,
|
||||||
|
name='index-model-switch'
|
||||||
|
),
|
||||||
|
url(r'^index_model_switch/$',
|
||||||
|
views.index_model_switch,
|
||||||
|
name='index-model-switch'
|
||||||
|
),
|
||||||
|
url(r'^new_model_switch/$',
|
||||||
|
views.new_model_switch,
|
||||||
|
name='new-model-switch'
|
||||||
|
),
|
||||||
|
url(r'^edit_model_switch/(?P<model_switch_id>[0-9]+)$',
|
||||||
|
views.edit_model_switch,
|
||||||
|
name='edit-model-switch'),
|
||||||
|
url(r'^del_model_switch/(?P<model_switch_id>[0-9]+)$',
|
||||||
|
views.del_model_switch,
|
||||||
|
name='del-model-switch'),
|
||||||
|
url(r'^new_constructor_switch/$',
|
||||||
|
views.new_constructor_switch,
|
||||||
|
name='new-constructor-switch'
|
||||||
|
),
|
||||||
|
url(r'^edit_constructor_switch/(?P<constructor_switch_id>[0-9]+)$',
|
||||||
|
views.edit_constructor_switch,
|
||||||
|
name='edit-constructor-switch'),
|
||||||
|
url(r'^del_constructor_switch/(?P<constructor_switch_id>[0-9]+)$',
|
||||||
|
views.del_constructor_switch,
|
||||||
|
name='del-constructor-switch'),
|
||||||
]
|
]
|
||||||
|
|
|
@ -45,12 +45,31 @@ from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
|
||||||
from reversion import revisions as reversion
|
from reversion import revisions as reversion
|
||||||
from reversion.models import Version
|
from reversion.models import Version
|
||||||
|
|
||||||
from topologie.models import Switch, Port, Room, Stack
|
from topologie.models import (
|
||||||
|
Switch,
|
||||||
|
Port,
|
||||||
|
Room,
|
||||||
|
Stack,
|
||||||
|
ModelSwitch,
|
||||||
|
ConstructorSwitch
|
||||||
|
)
|
||||||
from topologie.forms import EditPortForm, NewSwitchForm, EditSwitchForm
|
from topologie.forms import EditPortForm, NewSwitchForm, EditSwitchForm
|
||||||
from topologie.forms import AddPortForm, EditRoomForm, StackForm
|
from topologie.forms import (
|
||||||
|
AddPortForm,
|
||||||
|
EditRoomForm,
|
||||||
|
StackForm,
|
||||||
|
EditModelSwitchForm,
|
||||||
|
EditConstructorSwitchForm
|
||||||
|
)
|
||||||
from users.views import form
|
from users.views import form
|
||||||
from re2o.utils import SortTable
|
from re2o.utils import SortTable
|
||||||
from machines.forms import DomainForm, NewMachineForm, EditMachineForm, EditInterfaceForm, AddInterfaceForm
|
from machines.forms import (
|
||||||
|
DomainForm,
|
||||||
|
NewMachineForm,
|
||||||
|
EditMachineForm,
|
||||||
|
EditInterfaceForm,
|
||||||
|
AddInterfaceForm
|
||||||
|
)
|
||||||
from machines.views import generate_ipv4_mbf_param
|
from machines.views import generate_ipv4_mbf_param
|
||||||
from preferences.models import AssoOption, GeneralOption
|
from preferences.models import AssoOption, GeneralOption
|
||||||
|
|
||||||
|
@ -103,6 +122,18 @@ def history(request, object_name, object_id):
|
||||||
except Room.DoesNotExist:
|
except Room.DoesNotExist:
|
||||||
messages.error(request, "Stack inexistante")
|
messages.error(request, "Stack inexistante")
|
||||||
return redirect("/topologie/")
|
return redirect("/topologie/")
|
||||||
|
elif object_name == 'model_switch':
|
||||||
|
try:
|
||||||
|
object_instance = ModelSwitch.objects.get(pk=object_id)
|
||||||
|
except ModelSwitch.DoesNotExist:
|
||||||
|
messages.error(request, "SwitchModel inexistant")
|
||||||
|
return redirect("/topologie/")
|
||||||
|
elif object_name == 'constructor_switch':
|
||||||
|
try:
|
||||||
|
object_instance = ConstructorSwitch.objects.get(pk=object_id)
|
||||||
|
except ConstructorSwitch.DoesNotExist:
|
||||||
|
messages.error(request, "SwitchConstructor inexistant")
|
||||||
|
return redirect("/topologie/")
|
||||||
else:
|
else:
|
||||||
messages.error(request, "Objet inconnu")
|
messages.error(request, "Objet inconnu")
|
||||||
return redirect("/topologie/")
|
return redirect("/topologie/")
|
||||||
|
@ -198,6 +229,30 @@ def index_stack(request):
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
|
@login_required
|
||||||
|
@permission_required('cableur')
|
||||||
|
def index_model_switch(request):
|
||||||
|
""" Affichage de l'ensemble des modèles de switches"""
|
||||||
|
model_switch_list = ModelSwitch.objects
|
||||||
|
constructor_switch_list = ConstructorSwitch.objects
|
||||||
|
model_switch_list = SortTable.sort(
|
||||||
|
model_switch_list,
|
||||||
|
request.GET.get('col'),
|
||||||
|
request.GET.get('order'),
|
||||||
|
SortTable.TOPOLOGIE_INDEX_MODEL_SWITCH
|
||||||
|
)
|
||||||
|
constructor_switch_list = SortTable.sort(
|
||||||
|
constructor_switch_list,
|
||||||
|
request.GET.get('col'),
|
||||||
|
request.GET.get('order'),
|
||||||
|
SortTable.TOPOLOGIE_INDEX_CONSTRUCTOR_SWITCH
|
||||||
|
)
|
||||||
|
return render(request, 'topologie/index_model_switch.html', {
|
||||||
|
'model_switch_list': model_switch_list,
|
||||||
|
'constructor_switch_list': constructor_switch_list,
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
@login_required
|
@login_required
|
||||||
@permission_required('infra')
|
@permission_required('infra')
|
||||||
def new_port(request, switch_id):
|
def new_port(request, switch_id):
|
||||||
|
@ -538,3 +593,129 @@ def del_room(request, room_id):
|
||||||
'objet': room,
|
'objet': room,
|
||||||
'objet_name': 'Chambre'
|
'objet_name': 'Chambre'
|
||||||
}, 'topologie/delete.html', request)
|
}, 'topologie/delete.html', request)
|
||||||
|
|
||||||
|
|
||||||
|
@login_required
|
||||||
|
@permission_required('infra')
|
||||||
|
def new_model_switch(request):
|
||||||
|
"""Nouveau modèle de switch"""
|
||||||
|
model_switch = EditModelSwitchForm(request.POST or None)
|
||||||
|
if model_switch.is_valid():
|
||||||
|
with transaction.atomic(), reversion.create_revision():
|
||||||
|
model_switch.save()
|
||||||
|
reversion.set_user(request.user)
|
||||||
|
reversion.set_comment("Création")
|
||||||
|
messages.success(request, "Le modèle a été créé")
|
||||||
|
return redirect("/topologie/index_model_switch/")
|
||||||
|
return form({'topoform': model_switch}, 'topologie/topo.html', request)
|
||||||
|
|
||||||
|
|
||||||
|
@login_required
|
||||||
|
@permission_required('infra')
|
||||||
|
def edit_model_switch(request, model_switch_id):
|
||||||
|
""" Edition d'un modèle de switch"""
|
||||||
|
try:
|
||||||
|
model_switch = ModelSwitch.objects.get(pk=model_switch_id)
|
||||||
|
except ModelSwitch.DoesNotExist:
|
||||||
|
messages.error(request, u"Modèle inconnu")
|
||||||
|
return redirect("/topologie/index_model_switch/")
|
||||||
|
model_switch = EditModelSwitchForm(request.POST or None, instance=model_switch)
|
||||||
|
if model_switch.is_valid():
|
||||||
|
with transaction.atomic(), reversion.create_revision():
|
||||||
|
model_switch.save()
|
||||||
|
reversion.set_user(request.user)
|
||||||
|
reversion.set_comment("Champs modifié(s) : %s" % ', '.join(
|
||||||
|
field for field in model_switch.changed_data)
|
||||||
|
)
|
||||||
|
messages.success(request, "Le modèle a bien été modifié")
|
||||||
|
return redirect("/topologie/index_model_switch/")
|
||||||
|
return form({'topoform': model_switch}, 'topologie/topo.html', request)
|
||||||
|
|
||||||
|
|
||||||
|
@login_required
|
||||||
|
@permission_required('infra')
|
||||||
|
def del_model_switch(request, model_switch_id):
|
||||||
|
""" Suppression d'un modèle de switch"""
|
||||||
|
try:
|
||||||
|
model_switch = ModelSwitch.objects.get(pk=model_switch_id)
|
||||||
|
except ModelSwitch.DoesNotExist:
|
||||||
|
messages.error(request, u"Modèle inexistant")
|
||||||
|
return redirect("/topologie/index_model_switch/")
|
||||||
|
if request.method == "POST":
|
||||||
|
try:
|
||||||
|
with transaction.atomic(), reversion.create_revision():
|
||||||
|
model_switch.delete()
|
||||||
|
reversion.set_user(request.user)
|
||||||
|
reversion.set_comment("Destruction")
|
||||||
|
messages.success(request, "Le modèle a été détruit")
|
||||||
|
except ProtectedError:
|
||||||
|
messages.error(request, "Le modèle %s est affectée à un autre objet,\
|
||||||
|
impossible de la supprimer (switch ou user)" % model_switch)
|
||||||
|
return redirect("/topologie/index_model_switch/")
|
||||||
|
return form({
|
||||||
|
'objet': model_switch,
|
||||||
|
'objet_name': 'Modèle de switch'
|
||||||
|
}, 'topologie/delete.html', request)
|
||||||
|
|
||||||
|
|
||||||
|
@login_required
|
||||||
|
@permission_required('infra')
|
||||||
|
def new_constructor_switch(request):
|
||||||
|
"""Nouveau constructeur de switch"""
|
||||||
|
constructor_switch = EditConstructorSwitchForm(request.POST or None)
|
||||||
|
if constructor_switch.is_valid():
|
||||||
|
with transaction.atomic(), reversion.create_revision():
|
||||||
|
constructor_switch.save()
|
||||||
|
reversion.set_user(request.user)
|
||||||
|
reversion.set_comment("Création")
|
||||||
|
messages.success(request, "Le constructeur a été créé")
|
||||||
|
return redirect("/topologie/index_model_switch/")
|
||||||
|
return form({'topoform': constructor_switch}, 'topologie/topo.html', request)
|
||||||
|
|
||||||
|
|
||||||
|
@login_required
|
||||||
|
@permission_required('infra')
|
||||||
|
def edit_constructor_switch(request, constructor_switch_id):
|
||||||
|
""" Edition d'un constructeur de switch"""
|
||||||
|
try:
|
||||||
|
constructor_switch = ConstructorSwitch.objects.get(pk=constructor_switch_id)
|
||||||
|
except ConstructorSwitch.DoesNotExist:
|
||||||
|
messages.error(request, u"Constructeur inconnu")
|
||||||
|
return redirect("/topologie/index_model_switch/")
|
||||||
|
constructor_switch = EditConstructorSwitchForm(request.POST or None, instance=constructor_switch)
|
||||||
|
if constructor_switch.is_valid():
|
||||||
|
with transaction.atomic(), reversion.create_revision():
|
||||||
|
constructor_switch.save()
|
||||||
|
reversion.set_user(request.user)
|
||||||
|
reversion.set_comment("Champs modifié(s) : %s" % ', '.join(
|
||||||
|
field for field in constructor_switch.changed_data)
|
||||||
|
)
|
||||||
|
messages.success(request, "Le modèle a bien été modifié")
|
||||||
|
return redirect("/topologie/index_model_switch/")
|
||||||
|
return form({'topoform': constructor_switch}, 'topologie/topo.html', request)
|
||||||
|
|
||||||
|
|
||||||
|
@login_required
|
||||||
|
@permission_required('infra')
|
||||||
|
def del_constructor_switch(request, constructor_switch_id):
|
||||||
|
""" Suppression d'un constructeur de switch"""
|
||||||
|
try:
|
||||||
|
constructor_switch = ConstructorSwitch.objects.get(pk=constructor_switch_id)
|
||||||
|
except ConstructorSwitch.DoesNotExist:
|
||||||
|
messages.error(request, u"Constructeur inexistant")
|
||||||
|
return redirect("/topologie/index_model_switch/")
|
||||||
|
if request.method == "POST":
|
||||||
|
try:
|
||||||
|
with transaction.atomic(), reversion.create_revision():
|
||||||
|
constructor_switch.delete()
|
||||||
|
reversion.set_user(request.user)
|
||||||
|
reversion.set_comment("Destruction")
|
||||||
|
messages.success(request, "Le constructeur a été détruit")
|
||||||
|
except ProtectedError:
|
||||||
|
messages.error(request, "Le constructeur %s est affecté à un autre objet,\
|
||||||
|
impossible de la supprimer (switch ou user)" % constructor_switch)
|
||||||
|
return redirect("/topologie/index_model_switch/")
|
||||||
|
return form({
|
||||||
|
'objet': constructor_switch,
|
||||||
|
'objet_name': 'Constructeur de switch'
|
||||||
|
}, 'topologie/delete.html', request)
|
||||||
|
|
Loading…
Reference in a new issue