Преглед изворни кода

removed incomplete modules, fixed bug on menu

Roberto Berto пре 4 година
родитељ
комит
57dc8d74c7
100 измењених фајлова са 77 додато и 659 уклоњено
  1. 1 1
      vycontrol/accounts/views.py
  2. 0 0
      vycontrol/arp/__init__.py
  3. 0 3
      vycontrol/arp/admin.py
  4. 0 5
      vycontrol/arp/apps.py
  5. 0 0
      vycontrol/arp/migrations/__init__.py
  6. 0 3
      vycontrol/arp/models.py
  7. 0 12
      vycontrol/arp/templates/arp/list.html
  8. 0 3
      vycontrol/arp/tests.py
  9. 0 12
      vycontrol/arp/urls.py
  10. 0 26
      vycontrol/arp/views.py
  11. 0 0
      vycontrol/bgp/__init__.py
  12. 0 3
      vycontrol/bgp/admin.py
  13. 0 5
      vycontrol/bgp/apps.py
  14. 0 0
      vycontrol/bgp/migrations/__init__.py
  15. 0 3
      vycontrol/bgp/models.py
  16. 0 12
      vycontrol/bgp/templates/bgp/list.html
  17. 0 3
      vycontrol/bgp/tests.py
  18. 0 12
      vycontrol/bgp/urls.py
  19. 0 26
      vycontrol/bgp/views.py
  20. 10 10
      vycontrol/config/views.py
  21. 0 0
      vycontrol/dashboard/__init__.py
  22. 0 3
      vycontrol/dashboard/admin.py
  23. 0 5
      vycontrol/dashboard/apps.py
  24. 0 0
      vycontrol/dashboard/migrations/__init__.py
  25. 0 3
      vycontrol/dashboard/models.py
  26. 0 3
      vycontrol/dashboard/tests.py
  27. 0 7
      vycontrol/dashboard/urls.py
  28. 0 7
      vycontrol/dashboard/views.py
  29. 0 0
      vycontrol/dhcp/__init__.py
  30. 0 3
      vycontrol/dhcp/admin.py
  31. 0 5
      vycontrol/dhcp/apps.py
  32. 0 0
      vycontrol/dhcp/migrations/__init__.py
  33. 0 3
      vycontrol/dhcp/models.py
  34. 0 12
      vycontrol/dhcp/templates/dhcp/list.html
  35. 0 3
      vycontrol/dhcp/tests.py
  36. 0 12
      vycontrol/dhcp/urls.py
  37. 0 25
      vycontrol/dhcp/views.py
  38. 10 5
      vycontrol/dnsresolver/views.py
  39. 14 14
      vycontrol/firewall/views.py
  40. 5 5
      vycontrol/interface/views.py
  41. 0 0
      vycontrol/ipsec/__init__.py
  42. 0 3
      vycontrol/ipsec/admin.py
  43. 0 5
      vycontrol/ipsec/apps.py
  44. 0 0
      vycontrol/ipsec/migrations/__init__.py
  45. 0 3
      vycontrol/ipsec/models.py
  46. 0 12
      vycontrol/ipsec/templates/ipsec/list.html
  47. 0 3
      vycontrol/ipsec/tests.py
  48. 0 12
      vycontrol/ipsec/urls.py
  49. 0 26
      vycontrol/ipsec/views.py
  50. 0 0
      vycontrol/nat/__init__.py
  51. 0 3
      vycontrol/nat/admin.py
  52. 0 5
      vycontrol/nat/apps.py
  53. 0 0
      vycontrol/nat/migrations/__init__.py
  54. 0 3
      vycontrol/nat/models.py
  55. 0 12
      vycontrol/nat/templates/nat/list.html
  56. 0 3
      vycontrol/nat/tests.py
  57. 0 12
      vycontrol/nat/urls.py
  58. 0 26
      vycontrol/nat/views.py
  59. 9 5
      vycontrol/ntp/views.py
  60. 0 0
      vycontrol/openvpn/__init__.py
  61. 0 3
      vycontrol/openvpn/admin.py
  62. 0 5
      vycontrol/openvpn/apps.py
  63. 0 0
      vycontrol/openvpn/migrations/__init__.py
  64. 0 3
      vycontrol/openvpn/models.py
  65. 0 12
      vycontrol/openvpn/templates/openvpn/list.html
  66. 0 3
      vycontrol/openvpn/tests.py
  67. 0 12
      vycontrol/openvpn/urls.py
  68. 0 26
      vycontrol/openvpn/views.py
  69. 0 0
      vycontrol/ospf/__init__.py
  70. 0 3
      vycontrol/ospf/admin.py
  71. 0 5
      vycontrol/ospf/apps.py
  72. 0 0
      vycontrol/ospf/migrations/__init__.py
  73. 0 3
      vycontrol/ospf/models.py
  74. 0 12
      vycontrol/ospf/templates/ospf/list.html
  75. 0 3
      vycontrol/ospf/tests.py
  76. 0 12
      vycontrol/ospf/urls.py
  77. 0 26
      vycontrol/ospf/views.py
  78. 0 0
      vycontrol/qos/__init__.py
  79. 0 3
      vycontrol/qos/admin.py
  80. 0 5
      vycontrol/qos/apps.py
  81. 0 0
      vycontrol/qos/migrations/__init__.py
  82. 0 3
      vycontrol/qos/models.py
  83. 0 12
      vycontrol/qos/templates/qos/list.html
  84. 0 3
      vycontrol/qos/tests.py
  85. 0 12
      vycontrol/qos/urls.py
  86. 0 29
      vycontrol/qos/views.py
  87. 7 0
      vycontrol/s/main.css
  88. 0 0
      vycontrol/ssh/__init__.py
  89. 0 3
      vycontrol/ssh/admin.py
  90. 0 5
      vycontrol/ssh/apps.py
  91. 0 0
      vycontrol/ssh/migrations/__init__.py
  92. 0 3
      vycontrol/ssh/models.py
  93. 0 12
      vycontrol/ssh/templates/ssh/list.html
  94. 0 3
      vycontrol/ssh/tests.py
  95. 0 12
      vycontrol/ssh/urls.py
  96. 0 26
      vycontrol/ssh/views.py
  97. 3 3
      vycontrol/static/views.py
  98. 18 9
      vycontrol/vycontrol/templates/base.html
  99. 0 1
      vycontrol/vycontrol/urls.py
  100. 0 0
      vycontrol/wanlb/__init__.py

+ 1 - 1
vycontrol/accounts/views.py

@@ -50,7 +50,7 @@ def index(request):
 
 @is_authenticated    
 def profile(request):
-    all_instances = vyos.instance_getall()
+    all_instances = vyos.instance_getall_by_group(request)
     is_superuser = perms.get_is_superuser(request.user)
     hostname_default = vyos.get_hostname_prefered(request)
     msg = vmsg.msg()

+ 0 - 0
vycontrol/arp/__init__.py


+ 0 - 3
vycontrol/arp/admin.py

@@ -1,3 +0,0 @@
-from django.contrib import admin
-
-# Register your models here.

+ 0 - 5
vycontrol/arp/apps.py

@@ -1,5 +0,0 @@
-from django.apps import AppConfig
-
-
-class ArpConfig(AppConfig):
-    name = 'arp'

+ 0 - 0
vycontrol/arp/migrations/__init__.py


+ 0 - 3
vycontrol/arp/models.py

@@ -1,3 +0,0 @@
-from django.db import models
-
-# Create your models here.

+ 0 - 12
vycontrol/arp/templates/arp/list.html

@@ -1,12 +0,0 @@
-{% extends "base.html" %}
-
-{% block header_title %}ARP List{% endblock %}
-{% block section_title %}ARP List{% endblock %}
-
-{% block debug %}
-{% endblock %}
-
-{% block content %}
-content
-{% endblock %}
-

+ 0 - 3
vycontrol/arp/tests.py

@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.

+ 0 - 12
vycontrol/arp/urls.py

@@ -1,12 +0,0 @@
-from django.urls import path
-
-from . import views
-
-app_name = 'arp'
-
-
-urlpatterns = [
-    path('', views.index, name='arp-list'),
-]
-
-

+ 0 - 26
vycontrol/arp/views.py

@@ -1,26 +0,0 @@
-from django.shortcuts import render
-from django.http import HttpResponse
-from django.template import loader
-from django.shortcuts import redirect
-from django.conf import settings
-from django.urls import reverse
-
-
-import vyos
-
-
-
-def index(request):
-    if not request.user.is_authenticated:
-        return redirect('%s?next=%s' % (reverse('registration-login'), request.path))
-
-    all_instances = vyos.instance_getall()
-    hostname_default = vyos.get_hostname_prefered(request)
-
-    template = loader.get_template('arp/list.html')
-    context = { 
-        'instances': all_instances,
-        'hostname_default': hostname_default,
-    }   
-    return HttpResponse(template.render(context, request))
-

+ 0 - 0
vycontrol/bgp/__init__.py


+ 0 - 3
vycontrol/bgp/admin.py

@@ -1,3 +0,0 @@
-from django.contrib import admin
-
-# Register your models here.

+ 0 - 5
vycontrol/bgp/apps.py

@@ -1,5 +0,0 @@
-from django.apps import AppConfig
-
-
-class BgpConfig(AppConfig):
-    name = 'bgp'

+ 0 - 0
vycontrol/bgp/migrations/__init__.py


+ 0 - 3
vycontrol/bgp/models.py

@@ -1,3 +0,0 @@
-from django.db import models
-
-# Create your models here.

+ 0 - 12
vycontrol/bgp/templates/bgp/list.html

@@ -1,12 +0,0 @@
-{% extends "base.html" %}
-
-{% block header_title %}Option{% endblock %}
-{% block section_title %}Option{% endblock %}
-
-{% block debug %}
-{% endblock %}
-
-{% block content %}
-content
-{% endblock %}
-

+ 0 - 3
vycontrol/bgp/tests.py

@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.

+ 0 - 12
vycontrol/bgp/urls.py

@@ -1,12 +0,0 @@
-from django.urls import path
-
-from . import views
-
-app_name = 'bgp'
-
-
-urlpatterns = [
-    path('', views.index, name='bgp-list'),
-]
-
-

+ 0 - 26
vycontrol/bgp/views.py

@@ -1,26 +0,0 @@
-from django.shortcuts import render
-from django.http import HttpResponse
-from django.template import loader
-from django.shortcuts import redirect
-from django.conf import settings
-from django.urls import reverse
-
-
-import vyos
-
-
-
-def index(request):
-    if not request.user.is_authenticated:
-        return redirect('%s?next=%s' % (reverse('registration-login'), request.path))
-        
-    all_instances = vyos.instance_getall()
-    hostname_default = vyos.get_hostname_prefered(request)
-
-    template = loader.get_template('bgp/list.html')
-    context = { 
-        'instances': all_instances,
-        'hostname_default': hostname_default,
-    }   
-    return HttpResponse(template.render(context, request))
-

+ 10 - 10
vycontrol/config/views.py

@@ -30,7 +30,7 @@ def index(request):
     is_superuser = perms.get_is_superuser(request.user)
  
     #interfaces = vyos.get_interfaces()
-    all_instances = vyos.instance_getall()
+    all_instances = vyos.instance_getall_by_group(request)
     for instance in all_instances:
         if group == None:
             all_instance[instance]['group'] = "admin"
@@ -55,7 +55,7 @@ def users_list(request):
 
 
     #interfaces = vyos.get_interfaces()
-    all_instances = vyos.instance_getall()
+    all_instances = vyos.instance_getall_by_group(request)
     hostname_default = vyos.get_hostname_prefered(request)
     users = User.objects.all()
     groups = Group.objects.all()
@@ -133,7 +133,7 @@ def groups_list(request):
     is_superuser = perms.get_is_superuser(request.user)
 
     #interfaces = vyos.get_interfaces()
-    all_instances = vyos.instance_getall()
+    all_instances = vyos.instance_getall_by_group(request)
     hostname_default = vyos.get_hostname_prefered(request)
     groups = Group.objects.all()
 
@@ -187,7 +187,7 @@ def instance_add(request):
     is_superuser = perms.get_is_superuser(request.user)
         
     #interfaces = vyos.get_interfaces()
-    all_instances = vyos.instance_getall()
+    all_instances = vyos.instance_getall_by_group(request)
     hostname_default = vyos.get_hostname_prefered(request)
 
     if len(request.POST) > 0:
@@ -221,7 +221,7 @@ def group_add(request):
     is_superuser = perms.get_is_superuser(request.user)
         
     #interfaces = vyos.get_interfaces()
-    all_instances = vyos.instance_getall()
+    all_instances = vyos.instance_getall_by_group(request)
     hostname_default = vyos.get_hostname_prefered(request)
 
     error_message = None
@@ -254,7 +254,7 @@ def user_add(request):
     is_superuser = perms.get_is_superuser(request.user)
 
     #interfaces = vyos.get_interfaces()
-    all_instances = vyos.instance_getall()
+    all_instances = vyos.instance_getall_by_group(request)
     hostname_default = vyos.get_hostname_prefered(request)
 
     error_message = None
@@ -314,7 +314,7 @@ def user_add(request):
 def instance_conntry(request, hostname):
     is_superuser = perms.get_is_superuser(request.user)
        
-    all_instances = vyos.instance_getall()
+    all_instances = vyos.instance_getall_by_group(request)
     hostname_default = vyos.get_hostname_prefered(request)
 
     if perms.user_has_hostname_access(request.user, hostname) == False:
@@ -342,7 +342,7 @@ def instance_conntry(request, hostname):
 @is_authenticated
 def instance_change(request, hostname = False):
         
-    all_instances = vyos.instance_getall()
+    all_instances = vyos.instance_getall_by_group(request)
 
     #method = None  
     if hostname != "__none__":
@@ -377,7 +377,7 @@ def instance_change(request, hostname = False):
 @is_authenticated
 def instance_remove(request, hostname):
         
-    all_instances = vyos.instance_getall()
+    all_instances = vyos.instance_getall_by_group(request)
 
     # permcheck
     instance = Instance.objects.get(hostname=hostname)
@@ -393,7 +393,7 @@ def instance_remove(request, hostname):
 @is_authenticated
 def instance_changegroup(request, hostname):
        
-    all_instances = vyos.instance_getall()
+    all_instances = vyos.instance_getall_by_group(request)
 
     group_name = request.POST.get('group')
     print(group_name, hostname)

+ 0 - 0
vycontrol/dashboard/__init__.py


+ 0 - 3
vycontrol/dashboard/admin.py

@@ -1,3 +0,0 @@
-from django.contrib import admin
-
-# Register your models here.

+ 0 - 5
vycontrol/dashboard/apps.py

@@ -1,5 +0,0 @@
-from django.apps import AppConfig
-
-
-class DashboardConfig(AppConfig):
-    name = 'dashboard'

+ 0 - 0
vycontrol/dashboard/migrations/__init__.py


+ 0 - 3
vycontrol/dashboard/models.py

@@ -1,3 +0,0 @@
-from django.db import models
-
-# Create your models here.

+ 0 - 3
vycontrol/dashboard/tests.py

@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.

+ 0 - 7
vycontrol/dashboard/urls.py

@@ -1,7 +0,0 @@
-from django.urls import path
-
-from . import views
-
-urlpatterns = [
-    path('', views.index, name='index'),
-]

+ 0 - 7
vycontrol/dashboard/views.py

@@ -1,7 +0,0 @@
-from django.shortcuts import render
-
-from django.http import HttpResponse
-
-
-def index(request):
-    return HttpResponse("Hello, world. You're at the polls index.")

+ 0 - 0
vycontrol/dhcp/__init__.py


+ 0 - 3
vycontrol/dhcp/admin.py

@@ -1,3 +0,0 @@
-from django.contrib import admin
-
-# Register your models here.

+ 0 - 5
vycontrol/dhcp/apps.py

@@ -1,5 +0,0 @@
-from django.apps import AppConfig
-
-
-class DhcpConfig(AppConfig):
-    name = 'dhcp'

+ 0 - 0
vycontrol/dhcp/migrations/__init__.py


+ 0 - 3
vycontrol/dhcp/models.py

@@ -1,3 +0,0 @@
-from django.db import models
-
-# Create your models here.

+ 0 - 12
vycontrol/dhcp/templates/dhcp/list.html

@@ -1,12 +0,0 @@
-{% extends "base.html" %}
-
-{% block header_title %}Option{% endblock %}
-{% block section_title %}Option{% endblock %}
-
-{% block debug %}
-{% endblock %}
-
-{% block content %}
-content
-{% endblock %}
-

+ 0 - 3
vycontrol/dhcp/tests.py

@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.

+ 0 - 12
vycontrol/dhcp/urls.py

@@ -1,12 +0,0 @@
-from django.urls import path
-
-from . import views
-
-app_name = 'dhcp'
-
-
-urlpatterns = [
-    path('', views.index, name='dhcp-list'),
-]
-
-

+ 0 - 25
vycontrol/dhcp/views.py

@@ -1,25 +0,0 @@
-from django.shortcuts import render
-from django.http import HttpResponse
-from django.template import loader
-from django.shortcuts import redirect
-from django.conf import settings
-from django.urls import reverse
-
-import vyos
-
-
-
-def index(request):
-    if not request.user.is_authenticated:
-        return redirect('%s?next=%s' % (reverse('registration-login'), request.path))
-        
-    all_instances = vyos.instance_getall()
-    hostname_default = vyos.get_hostname_prefered(request)
-
-    template = loader.get_template('dhcp/list.html')
-    context = { 
-        'instances': all_instances,
-        'hostname_default': hostname_default,
-    }   
-    return HttpResponse(template.render(context, request))
-

+ 10 - 5
vycontrol/dnsresolver/views.py

@@ -11,10 +11,12 @@ import vycontrol_vyos_api as vapi
 import vycontrol_messages as vmsg
 import perms
 import validators
+from perms import is_authenticated
 
-@login_required
+
+@is_authenticated
 def index(request):
-    all_instances = vyos.instance_getall()
+    all_instances = vyos.instance_getall_by_group(request)
     hostname_default = vyos.get_hostname_prefered(request)
     is_superuser = perms.get_is_superuser(request.user)
 
@@ -29,16 +31,17 @@ def index(request):
         'hostname_default':                         hostname_default,
         'dnsresolver_servers' :                     dnsresolver_servers,
         'is_superuser' :                            is_superuser,
+        'username':                                 request.user,
     }
 
     return render(request, 'dnsresolver/list.html', context)
 
 
-@login_required
+@is_authenticated
 def add(request):
     msg = vmsg.msg()
 
-    all_instances = vyos.instance_getall()
+    all_instances = vyos.instance_getall_by_group(request)
     hostname_default = vyos.get_hostname_prefered(request)
     is_superuser = perms.get_is_superuser(request.user)
 
@@ -55,14 +58,16 @@ def add(request):
     context = {
         'instances':                                all_instances,
         'hostname_default':                         hostname_default,
+        'username':                                 request.user,
         'is_superuser' :                            is_superuser,
+
         'msg' :                                     msg.get_all(),
     }
 
     return render(request, 'dnsresolver/add.html', context)
 
 
-@login_required
+@is_authenticated
 def remove(request, server):
     hostname_default = vyos.get_hostname_prefered(request)
 

+ 14 - 14
vycontrol/firewall/views.py

@@ -74,7 +74,7 @@ def index(request):
 def create(request):
         
     #interfaces = vyos.get_interfaces()
-    all_instances = vyos.instance_getall()
+    all_instances = vyos.instance_getall_by_group(request)
     hostname_default = vyos.get_hostname_prefered(request)
     is_superuser = perms.get_is_superuser(request.user)
 
@@ -107,7 +107,7 @@ def create(request):
 
 @is_authenticated
 def firewall_removerule(request, firewall_name, firewall_rulenumber):
-    all_instances = vyos.instance_getall()
+    all_instances = vyos.instance_getall_by_group(request)
     hostname_default = vyos.get_hostname_prefered(request)
 
     firewall = vyos.get_firewall(hostname_default, firewall_name)
@@ -122,7 +122,7 @@ def changerule(request, firewall_name, mode, rulenumber=None):
     msg = vmsg.msg()
 
     #interfaces = vyos.get_interfaces()
-    all_instances = vyos.instance_getall()
+    all_instances = vyos.instance_getall_by_group(request)
     hostname_default = vyos.get_hostname_prefered(request)
     is_superuser = perms.get_is_superuser(request.user)
 
@@ -975,7 +975,7 @@ def editrule(request, firewall_name, rulenumber):
 def show(request, firewall_name):
         
     #interfaces = vyos.get_interfaces()
-    all_instances = vyos.instance_getall()
+    all_instances = vyos.instance_getall_by_group(request)
     hostname_default = vyos.get_hostname_prefered(request)
     is_superuser = perms.get_is_superuser(request.user)
 
@@ -1471,7 +1471,7 @@ def firewall_networkgroup_desc(request, groupname):
 @is_authenticated
 def firewall_config(request, firewall_name):  
     #interfaces = vyos.get_interfaces()
-    all_instances = vyos.instance_getall()
+    all_instances = vyos.instance_getall_by_group(request)
     hostname_default = vyos.get_hostname_prefered(request)
     is_superuser = perms.get_is_superuser(request.user)
     
@@ -1494,7 +1494,7 @@ def firewall_config(request, firewall_name):
 def firewall_global(request):
    
     #interfaces = vyos.get_interfaces()
-    all_instances = vyos.instance_getall()
+    all_instances = vyos.instance_getall_by_group(request)
     hostname_default = vyos.get_hostname_prefered(request)
 
     if int(request.POST.get('allping', 0)) == 1:
@@ -1514,7 +1514,7 @@ def firewall_global(request):
 def firewall_remove(request, firewall_name):
        
     #interfaces = vyos.get_interfaces()
-    all_instances = vyos.instance_getall()
+    all_instances = vyos.instance_getall_by_group(request)
     hostname_default = vyos.get_hostname_prefered(request)
 
     firewall = vyos.delete_firewall(hostname_default, firewall_name)
@@ -1525,7 +1525,7 @@ def firewall_remove(request, firewall_name):
 def firewall_edit(request, firewall_name):
    
     #interfaces = vyos.get_interfaces()
-    all_instances = vyos.instance_getall()
+    all_instances = vyos.instance_getall_by_group(request)
     hostname_default = vyos.get_hostname_prefered(request)
     firewall = vyos.get_firewall(hostname_default, firewall_name)
     firewall['defaultaction'] = firewall['default-action']
@@ -1562,7 +1562,7 @@ def firewall_edit(request, firewall_name):
 @is_authenticated
 def firewall_zones(request):
     # basic methods all views should call
-    all_instances = vyos.instance_getall()
+    all_instances = vyos.instance_getall_by_group(request)
     hostname_default = vyos.get_hostname_prefered(request)
     is_superuser = perms.get_is_superuser(request.user)
 
@@ -1625,7 +1625,7 @@ def firewall_zones_add(request):
     msg = vmsg.msg()
 
     # basic methods all views should call
-    all_instances       = vyos.instance_getall()
+    all_instances       = vyos.instance_getall_by_group(request)
     hostname_default    = vyos.get_hostname_prefered(request)
     is_superuser        = perms.get_is_superuser(request.user)
 
@@ -1743,7 +1743,7 @@ def firewall_zones_edit(request, zonename):
     msg = vmsg.msg()
     
     # basic methods all views should call
-    all_instances       = vyos.instance_getall()
+    all_instances       = vyos.instance_getall_by_group(request)
     hostname_default    = vyos.get_hostname_prefered(request)
     is_superuser        = perms.get_is_superuser(request.user)
 
@@ -1964,7 +1964,7 @@ def firewall_zones_remove(request, zonename):
     msg = vmsg.msg()
     
     # basic methods all views should call
-    all_instances       = vyos.instance_getall()
+    all_instances       = vyos.instance_getall_by_group(request)
     hostname_default    = vyos.get_hostname_prefered(request)
     is_superuser        = perms.get_is_superuser(request.user)
 
@@ -2004,7 +2004,7 @@ def firewall_zones_addrule(request):
     msg = vmsg.msg()
     
     # basic methods all views should call
-    all_instances       = vyos.instance_getall()
+    all_instances       = vyos.instance_getall_by_group(request)
     hostname_default    = vyos.get_hostname_prefered(request)
     is_superuser        = perms.get_is_superuser(request.user)
 
@@ -2106,7 +2106,7 @@ def firewall_zones_removerule(request, dstzone, srczone, firewall):
     msg = vmsg.msg()
     
     # basic methods all views should call
-    all_instances       = vyos.instance_getall()
+    all_instances       = vyos.instance_getall_by_group(request)
     hostname_default    = vyos.get_hostname_prefered(request)
     is_superuser        = perms.get_is_superuser(request.user)
 

+ 5 - 5
vycontrol/interface/views.py

@@ -28,7 +28,7 @@ def get_item(dictionary, key):
 def index(request):
     
     hostname_default = vyos.get_hostname_prefered(request)
-    all_instances = vyos.instance_getall()
+    all_instances = vyos.instance_getall_by_group(request)
     firewall_all = vyos.get_firewall_all(hostname_default)
     interfaces = vyos.get_interfaces(hostname_default)
     is_superuser = perms.get_is_superuser(request.user)
@@ -213,7 +213,7 @@ def index(request):
 @is_authenticated    
 def interface_show(request, interface_type, interface_name):
         
-    all_instances = vyos.instance_getall()
+    all_instances = vyos.instance_getall_by_group(request)
     hostname_default = vyos.get_hostname_prefered(request)
     is_superuser = perms.get_is_superuser(request.user)
     
@@ -246,7 +246,7 @@ def interface_show(request, interface_type, interface_name):
 @is_authenticated    
 def interface_firewall(request, interface_type, interface_name):
         
-    all_instances = vyos.instance_getall()
+    all_instances = vyos.instance_getall_by_group(request)
     is_superuser = perms.get_is_superuser(request.user)
 
     hostname_default = vyos.get_hostname_prefered(request)
@@ -342,7 +342,7 @@ def interface_delete(request, interface_type, interface_name, interface_vif=None
 
 @is_authenticated    
 def interface_add(request):      
-    all_instances = vyos.instance_getall()
+    all_instances = vyos.instance_getall_by_group(request)
     is_superuser = perms.get_is_superuser(request.user)
     hostname_default = vyos.get_hostname_prefered(request)
     msg = vmsg.msg()
@@ -421,7 +421,7 @@ def interface_add(request):
 
 @is_authenticated    
 def interface_add_vlan(request, interface_type=None, interface_name=None):      
-    all_instances = vyos.instance_getall()
+    all_instances = vyos.instance_getall_by_group(request)
     is_superuser = perms.get_is_superuser(request.user)
     hostname_default = vyos.get_hostname_prefered(request)
     msg = vmsg.msg()

+ 0 - 0
vycontrol/ipsec/__init__.py


+ 0 - 3
vycontrol/ipsec/admin.py

@@ -1,3 +0,0 @@
-from django.contrib import admin
-
-# Register your models here.

+ 0 - 5
vycontrol/ipsec/apps.py

@@ -1,5 +0,0 @@
-from django.apps import AppConfig
-
-
-class IpsecConfig(AppConfig):
-    name = 'ipsec'

+ 0 - 0
vycontrol/ipsec/migrations/__init__.py


+ 0 - 3
vycontrol/ipsec/models.py

@@ -1,3 +0,0 @@
-from django.db import models
-
-# Create your models here.

+ 0 - 12
vycontrol/ipsec/templates/ipsec/list.html

@@ -1,12 +0,0 @@
-{% extends "base.html" %}
-
-{% block header_title %}Option{% endblock %}
-{% block section_title %}Option{% endblock %}
-
-{% block debug %}
-{% endblock %}
-
-{% block content %}
-content
-{% endblock %}
-

+ 0 - 3
vycontrol/ipsec/tests.py

@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.

+ 0 - 12
vycontrol/ipsec/urls.py

@@ -1,12 +0,0 @@
-from django.urls import path
-
-from . import views
-
-app_name = 'ipsec'
-
-
-urlpatterns = [
-    path('', views.index, name='ipsec-list'),
-]
-
-

+ 0 - 26
vycontrol/ipsec/views.py

@@ -1,26 +0,0 @@
-from django.shortcuts import render
-from django.http import HttpResponse
-from django.template import loader
-from django.shortcuts import redirect
-from django.conf import settings
-from django.urls import reverse
-
-
-import vyos
-
-
-
-def index(request):
-    if not request.user.is_authenticated:
-        return redirect('%s?next=%s' % (reverse('registration-login'), request.path))
-        
-    all_instances = vyos.instance_getall()
-    hostname_default = vyos.get_hostname_prefered(request)
-
-    template = loader.get_template('ipsec/list.html')
-    context = { 
-        'instances': all_instances,
-        'hostname_default': hostname_default,
-    }   
-    return HttpResponse(template.render(context, request))
-

+ 0 - 0
vycontrol/nat/__init__.py


+ 0 - 3
vycontrol/nat/admin.py

@@ -1,3 +0,0 @@
-from django.contrib import admin
-
-# Register your models here.

+ 0 - 5
vycontrol/nat/apps.py

@@ -1,5 +0,0 @@
-from django.apps import AppConfig
-
-
-class NatConfig(AppConfig):
-    name = 'nat'

+ 0 - 0
vycontrol/nat/migrations/__init__.py


+ 0 - 3
vycontrol/nat/models.py

@@ -1,3 +0,0 @@
-from django.db import models
-
-# Create your models here.

+ 0 - 12
vycontrol/nat/templates/nat/list.html

@@ -1,12 +0,0 @@
-{% extends "base.html" %}
-
-{% block header_title %}Option{% endblock %}
-{% block section_title %}Option{% endblock %}
-
-{% block debug %}
-{% endblock %}
-
-{% block content %}
-content
-{% endblock %}
-

+ 0 - 3
vycontrol/nat/tests.py

@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.

+ 0 - 12
vycontrol/nat/urls.py

@@ -1,12 +0,0 @@
-from django.urls import path
-
-from . import views
-
-app_name = 'nat'
-
-
-urlpatterns = [
-    path('', views.index, name='nat-list'),
-]
-
-

+ 0 - 26
vycontrol/nat/views.py

@@ -1,26 +0,0 @@
-from django.shortcuts import render
-from django.http import HttpResponse
-from django.template import loader
-from django.shortcuts import redirect
-from django.conf import settings
-from django.urls import reverse
-
-
-import vyos
-
-
-
-def index(request):
-    if not request.user.is_authenticated:
-        return redirect('%s?next=%s' % (reverse('registration-login'), request.path))
-        
-    all_instances = vyos.instance_getall()
-    hostname_default = vyos.get_hostname_prefered(request)
-
-    template = loader.get_template('nat/list.html')
-    context = { 
-        'instances': all_instances,
-        'hostname_default': hostname_default,
-    }   
-    return HttpResponse(template.render(context, request))
-

+ 9 - 5
vycontrol/ntp/views.py

@@ -11,10 +11,12 @@ import vycontrol_vyos_api as vapi
 import vycontrol_messages as vmsg
 import perms
 import validators
+from perms import is_authenticated
 
-@login_required
+
+@is_authenticated
 def index(request):
-    all_instances = vyos.instance_getall()
+    all_instances = vyos.instance_getall_by_group(request)
     hostname_default = vyos.get_hostname_prefered(request)
     is_superuser = perms.get_is_superuser(request.user)
 
@@ -28,17 +30,18 @@ def index(request):
         'instances':                                all_instances,
         'hostname_default':                         hostname_default,
         'ntp_servers' :                             ntp_servers,
+        'username':                                 request.user,
         'is_superuser' :                            is_superuser,
     }
 
     return render(request, 'ntp/list.html', context)
 
 
-@login_required
+@is_authenticated
 def add(request):
     msg = vmsg.msg()
 
-    all_instances = vyos.instance_getall()
+    all_instances = vyos.instance_getall_by_group(request)
     hostname_default = vyos.get_hostname_prefered(request)
     is_superuser = perms.get_is_superuser(request.user)
 
@@ -56,13 +59,14 @@ def add(request):
         'instances':                                all_instances,
         'hostname_default':                         hostname_default,
         'is_superuser' :                            is_superuser,
+        'username':                                 request.user,
         'msg' :                                     msg.get_all(),
     }
 
     return render(request, 'ntp/add.html', context)
 
 
-@login_required
+@is_authenticated
 def remove(request, server):
     hostname_default = vyos.get_hostname_prefered(request)
 

+ 0 - 0
vycontrol/openvpn/__init__.py


+ 0 - 3
vycontrol/openvpn/admin.py

@@ -1,3 +0,0 @@
-from django.contrib import admin
-
-# Register your models here.

+ 0 - 5
vycontrol/openvpn/apps.py

@@ -1,5 +0,0 @@
-from django.apps import AppConfig
-
-
-class OpenvpnConfig(AppConfig):
-    name = 'openvpn'

+ 0 - 0
vycontrol/openvpn/migrations/__init__.py


+ 0 - 3
vycontrol/openvpn/models.py

@@ -1,3 +0,0 @@
-from django.db import models
-
-# Create your models here.

+ 0 - 12
vycontrol/openvpn/templates/openvpn/list.html

@@ -1,12 +0,0 @@
-{% extends "base.html" %}
-
-{% block header_title %}Option{% endblock %}
-{% block section_title %}Option{% endblock %}
-
-{% block debug %}
-{% endblock %}
-
-{% block content %}
-content
-{% endblock %}
-

+ 0 - 3
vycontrol/openvpn/tests.py

@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.

+ 0 - 12
vycontrol/openvpn/urls.py

@@ -1,12 +0,0 @@
-from django.urls import path
-
-from . import views
-
-app_name = 'openvpn'
-
-
-urlpatterns = [
-    path('', views.index, name='openvpn-list'),
-]
-
-

+ 0 - 26
vycontrol/openvpn/views.py

@@ -1,26 +0,0 @@
-from django.shortcuts import render
-from django.http import HttpResponse
-from django.template import loader
-from django.shortcuts import redirect
-from django.conf import settings
-from django.urls import reverse
-
-
-import vyos
-
-
-
-def index(request):
-    if not request.user.is_authenticated:
-        return redirect('%s?next=%s' % (reverse('registration-login'), request.path))
-        
-    all_instances = vyos.instance_getall()
-    hostname_default = vyos.get_hostname_prefered(request)
-
-    template = loader.get_template('openvpn/list.html')
-    context = { 
-        'instances': all_instances,
-        'hostname_default': hostname_default,
-    }   
-    return HttpResponse(template.render(context, request))
-

+ 0 - 0
vycontrol/ospf/__init__.py


+ 0 - 3
vycontrol/ospf/admin.py

@@ -1,3 +0,0 @@
-from django.contrib import admin
-
-# Register your models here.

+ 0 - 5
vycontrol/ospf/apps.py

@@ -1,5 +0,0 @@
-from django.apps import AppConfig
-
-
-class OspfConfig(AppConfig):
-    name = 'ospf'

+ 0 - 0
vycontrol/ospf/migrations/__init__.py


+ 0 - 3
vycontrol/ospf/models.py

@@ -1,3 +0,0 @@
-from django.db import models
-
-# Create your models here.

+ 0 - 12
vycontrol/ospf/templates/ospf/list.html

@@ -1,12 +0,0 @@
-{% extends "base.html" %}
-
-{% block header_title %}Option{% endblock %}
-{% block section_title %}Option{% endblock %}
-
-{% block debug %}
-{% endblock %}
-
-{% block content %}
-content
-{% endblock %}
-

+ 0 - 3
vycontrol/ospf/tests.py

@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.

+ 0 - 12
vycontrol/ospf/urls.py

@@ -1,12 +0,0 @@
-from django.urls import path
-
-from . import views
-
-app_name = 'ospf'
-
-
-urlpatterns = [
-    path('', views.index, name='ospf-list'),
-]
-
-

+ 0 - 26
vycontrol/ospf/views.py

@@ -1,26 +0,0 @@
-from django.shortcuts import render
-from django.http import HttpResponse
-from django.template import loader
-from django.shortcuts import redirect
-from django.conf import settings
-from django.urls import reverse
-
-
-import vyos
-
-
-
-def index(request):
-    if not request.user.is_authenticated:
-        return redirect('%s?next=%s' % (reverse('registration-login'), request.path))
-
-    all_instances = vyos.instance_getall()
-    hostname_default = vyos.get_hostname_prefered(request)
-
-    template = loader.get_template('ospf/list.html')
-    context = { 
-        'instances': all_instances,
-        'hostname_default': hostname_default,
-    }   
-    return HttpResponse(template.render(context, request))
-

+ 0 - 0
vycontrol/qos/__init__.py


+ 0 - 3
vycontrol/qos/admin.py

@@ -1,3 +0,0 @@
-from django.contrib import admin
-
-# Register your models here.

+ 0 - 5
vycontrol/qos/apps.py

@@ -1,5 +0,0 @@
-from django.apps import AppConfig
-
-
-class QosConfig(AppConfig):
-    name = 'qos'

+ 0 - 0
vycontrol/qos/migrations/__init__.py


+ 0 - 3
vycontrol/qos/models.py

@@ -1,3 +0,0 @@
-from django.db import models
-
-# Create your models here.

+ 0 - 12
vycontrol/qos/templates/qos/list.html

@@ -1,12 +0,0 @@
-{% extends "base.html" %}
-
-{% block header_title %}QoS List{% endblock %}
-{% block section_title %}QoS List{% endblock %}
-
-{% block debug %}
-{% endblock %}
-
-{% block content %}
-content
-{% endblock %}
-

+ 0 - 3
vycontrol/qos/tests.py

@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.

+ 0 - 12
vycontrol/qos/urls.py

@@ -1,12 +0,0 @@
-from django.urls import path
-
-from . import views
-
-app_name = 'qos'
-
-
-urlpatterns = [
-    path('', views.index, name='qos-list'),
-]
-
-

+ 0 - 29
vycontrol/qos/views.py

@@ -1,29 +0,0 @@
-from django.shortcuts import render
-from django.http import HttpResponse
-from django.template import loader
-from django.shortcuts import redirect
-from django.conf import settings
-from django.urls import reverse
-
-
-import vyos
-
-
-
-
-
-def index(request):
-    if not request.user.is_authenticated:
-        return redirect('%s?next=%s' % (reverse('registration-login'), request.path))
-
-    
-    all_instances = vyos.instance_getall()
-    hostname_default = vyos.get_hostname_prefered(request)
-
-    template = loader.get_template('qos/list.html')
-    context = { 
-        'instances': all_instances,
-        'hostname_default': hostname_default,
-    }   
-    return HttpResponse(template.render(context, request))
-

+ 7 - 0
vycontrol/s/main.css

@@ -162,6 +162,13 @@ input[type=submit] {
   color:#101088 ;
 }
 
+#icon-username {
+  font-size: 10x;
+  position: relative;
+  top: 5px;
+  left: 2px;
+}
+
 .label_for_h3 {
   margin-bottom: 0;
 }

+ 0 - 0
vycontrol/ssh/__init__.py


+ 0 - 3
vycontrol/ssh/admin.py

@@ -1,3 +0,0 @@
-from django.contrib import admin
-
-# Register your models here.

+ 0 - 5
vycontrol/ssh/apps.py

@@ -1,5 +0,0 @@
-from django.apps import AppConfig
-
-
-class SshConfig(AppConfig):
-    name = 'ssh'

+ 0 - 0
vycontrol/ssh/migrations/__init__.py


+ 0 - 3
vycontrol/ssh/models.py

@@ -1,3 +0,0 @@
-from django.db import models
-
-# Create your models here.

+ 0 - 12
vycontrol/ssh/templates/ssh/list.html

@@ -1,12 +0,0 @@
-{% extends "base.html" %}
-
-{% block header_title %}Option{% endblock %}
-{% block section_title %}Option{% endblock %}
-
-{% block debug %}
-{% endblock %}
-
-{% block content %}
-content
-{% endblock %}
-

+ 0 - 3
vycontrol/ssh/tests.py

@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.

+ 0 - 12
vycontrol/ssh/urls.py

@@ -1,12 +0,0 @@
-from django.urls import path
-
-from . import views
-
-app_name = 'ssh'
-
-
-urlpatterns = [
-    path('', views.index, name='ssh-list'),
-]
-
-

+ 0 - 26
vycontrol/ssh/views.py

@@ -1,26 +0,0 @@
-from django.shortcuts import render
-from django.http import HttpResponse
-from django.template import loader
-from django.shortcuts import redirect
-from django.conf import settings
-from django.urls import reverse
-
-
-import vyos
-
-
-
-def index(request):
-    if not request.user.is_authenticated:
-        return redirect('%s?next=%s' % (reverse('registration-login'), request.path))
-        
-    all_instances = vyos.instance_getall()
-    hostname_default = vyos.get_hostname_prefered(request)
-
-    template = loader.get_template('ssh/list.html')
-    context = { 
-        'instances': all_instances,
-        'hostname_default': hostname_default,
-    }   
-    return HttpResponse(template.render(context, request))
-

+ 3 - 3
vycontrol/static/views.py

@@ -17,7 +17,7 @@ import perms
 
 @is_authenticated    
 def static_list(request):
-    all_instances = vyos.instance_getall()
+    all_instances = vyos.instance_getall_by_group(request)
     hostname_default = vyos.get_hostname_prefered(request)
     static_dict = vyos.get_route_static(hostname_default)
     is_superuser = perms.get_is_superuser(request.user)
@@ -45,7 +45,7 @@ def static_list(request):
 def static_add(request):
     msg = vmsg.msg()
 
-    all_instances = vyos.instance_getall()
+    all_instances = vyos.instance_getall_by_group(request)
     hostname_default = vyos.get_hostname_prefered(request)
     static_list = vyos.get_route_static(hostname_default)
     is_superuser = perms.get_is_superuser(request.user)
@@ -73,7 +73,7 @@ def static_add(request):
 @is_authenticated    
 def static_remove(request, route, nexthop):
         
-    all_instances = vyos.instance_getall()
+    all_instances = vyos.instance_getall_by_group(request)
     hostname_default = vyos.get_hostname_prefered(request)
     static_list = vyos.get_route_static(hostname_default)
 

+ 18 - 9
vycontrol/vycontrol/templates/base.html

@@ -5,6 +5,9 @@
     <!-- Required meta tags -->
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
+
+
     <link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon"> 
 
     <!-- Bootstrap CSS -->
@@ -17,7 +20,7 @@
 
     <link rel="stylesheet" href="https://code.jquery.com/ui/1.12.1/themes/smoothness/jquery-ui.css">
 
-
+    
     <title>{% block header_title %}{% endblock %} - VyControl</title>
   </head>
   <body >
@@ -46,7 +49,8 @@
               </select>
             
 
-              <span id="menu-username"><a href="{%  url 'accounts:accounts-profile' %}">{% block username %}{% endblock %}</a></span> <span id="vycontrol-config-menu"> <a href="{% url 'accounts-logout' %}">Logout</a></span>
+              <span id="menu-username"><a href="{%  url 'accounts:accounts-profile' %}"><i class="material-icons" id="icon-username">person</i>
+              {% block username %}{% endblock %}</a></span> <span id="vycontrol-config-menu"> <a href="{% url 'accounts-logout' %}">Logout</a></span>
 
 
           </p>
@@ -74,15 +78,20 @@
     <li><a href="{% url 'ntp:ntp-list' %}">NTP</a></li>
     </ul>
     
-
-
-    <h2>Configuration</h2>
+ 
+    {% if is_superuser %}
+    <h2>VyControl Administrator</h2>
     <ul>
     <li><a href="{% url 'config:instances' %}">Instances</a></li>
-    {% if is_superuser %}<li><a href="{% url 'config:users-list' %}">Users</a></li>{% endif %}
-    {% if is_superuser %}<li><a href="{% url 'config:groups-list' %}">Groups</a></li>{% endif %}
-
-  </ul>
+    <li><a href="{% url 'config:users-list' %}">Users</a></li>
+    <li><a href="{% url 'config:groups-list' %}">Groups</a></li>
+    </ul>
+    {% else %}
+    <h2>VyControl</h2>
+    <ul>
+    <li><a href="{% url 'config:instances' %}">Instances</a></li>
+    </ul>
+    {% endif %}
 
 
     </div>

+ 0 - 1
vycontrol/vycontrol/urls.py

@@ -37,7 +37,6 @@ urlpatterns = [
     path('', accounts_views.index, name='main-page'),
     path('accounts/', include('accounts.urls')),
     path('config/', include('config.urls')),
-    path('dashboard/', include('dashboard.urls')),
     path('admin/', admin.site.urls, name="django-admin"),
     path('login/', auth_views.LoginView.as_view(template_name='accounts/login.html'), name="accounts-login"),
     path('logout/', auth_views.LogoutView.as_view(template_name='accounts/logout.html'), name="accounts-logout"),

+ 0 - 0
vycontrol/wanlb/__init__.py


Неке датотеке нису приказане због велике количине промена