add group active/inactive; refactor code

vycontrol/config/models.py

@@ -12,5 +12,4 @@ class Instance(models.Model):
     group = models.ForeignKey(Group, null=True, on_delete=models.SET_NULL)
 
     
-
-
+Group.add_to_class('active', models.BooleanField(default=True))

vycontrol/config/templates/config/groups_list.html

@@ -24,12 +24,18 @@
     <table border="1" width="100%">
     <tr>
         <th>name</th>
+        <th>status</th>
+        <th>actions</th>
     </tr>
 
     {% for group in groups %}
     <tr>
         <td>{{ group }}</td>
-    
+        <td>{% if group.active == True %}active{% else %}inactive{% endif %}</td>
+        <td>
+            {% if group.active == True %}<a href="{% url 'config:group-inactivate' group %}">inactivate</a>{% else %}<a href="{% url 'config:group-activate' group %}">activate</a>{% endif %}
+        </td>
+
     </tr>
 
     {% endfor %}

vycontrol/config/templates/config/users_list.html

@@ -51,7 +51,10 @@
                 {% endfor %}
             {% endif %}
         </select></td>
-        <td><a href="{% url 'config:user-edit' user %}">edit</a> | {% if user.is_active == True %}<a href="{% url 'config:user-inactivate' user %}">inactivate</a>{% else %}<a href="{% url 'config:user-activate' user %}">activate</a>{% endif %}</td>
+        <td>
+            <a href="{% url 'config:user-edit' user %}">edit</a> | 
+            {% if user.is_active == True %}<a href="{% url 'config:user-inactivate' user %}">inactivate</a>{% else %}<a href="{% url 'config:user-activate' user %}">activate</a>{% endif %}
+        </td>
 
 
     </tr>

vycontrol/config/urls.py

@@ -13,6 +13,10 @@ urlpatterns = [
     path('user-edit/<str:username>', views.user_edit, name='user-edit'),
     path('groups-list', views.groups_list, name='groups-list'),
     path('group-add', views.group_add, name='group-add'),
+    #path('group-edit/<str:group_name>', views.group_edit, name='group-edit'),
+    path('group-activate/<str:group_name>', views.group_activate, name='group-activate'),
+    path('group-inactivate/<str:group_name>', views.group_inactivate, name='group-inactivate'),
+
     path('user-add', views.user_add, name='user-add'),
     path('instance-add', views.instance_add, name='instance-add'),
     path('instance-conntry/<str:hostname>', views.instance_conntry, name='instance-conntry'),

vycontrol/config/views.py

@@ -118,7 +118,7 @@ def instances(request):
         else:
             return redirect('config:instance-add')
 
-    groups = Group.objects.all()
+    groups = Group.objects.filter(active=True)
 
     context = viewinfo.context(vinfo)    
     localcontext = {
@@ -256,7 +256,7 @@ def user_activate(request, username):
         user.is_active = True
         user.save()
 
-    return redirect('config:users-list') 
+    return redirect('config:users-list')
 
     
 @perms.is_superuser
@@ -374,4 +374,27 @@ def instance_changegroup(request, hostname):
         instance.save()
 
 
-    return redirect('config:instances')
+    return redirect('config:instances')
+
+
+@perms.is_superuser
+@is_authenticated    
+def group_inactivate(request, group_name):
+    vinfo = viewinfo.prepare(request)
+    if validator_group(group_name):
+        group = Group.objects.get(name=group_name)
+        group.active = False
+        group.save()
+
+    return redirect('config:groups-list')
+
+@perms.is_superuser
+@is_authenticated    
+def group_activate(request, group_name):
+    vinfo = viewinfo.prepare(request)
+    if validator_group(group_name):
+        group = Group.objects.get(name=group_name)
+        group.active = True
+        group.save()
+
+    return redirect('config:groups-list')

vycontrol/firewall/views.py

@@ -32,8 +32,8 @@ from libs.vycontrol_filters import get_item_network
 def index(request):
 
     #interfaces = vyos.get_interfaces()
-    all_instances = vyos.instance_getall_by_group(request)
-    hostname_default = vyos.get_hostname_prefered(request)
+    all_instances = perms.instance_getall_by_group(request)
+    hostname_default = perms.get_hostname_prefered(request)
 
 
     """firewall2 = vapilib.api(
@@ -74,8 +74,8 @@ def index(request):
 def create(request):
         
     #interfaces = vyos.get_interfaces()
-    all_instances = vyos.instance_getall_by_group(request)
-    hostname_default = vyos.get_hostname_prefered(request)
+    all_instances = perms.instance_getall_by_group(request)
+    hostname_default = perms.get_hostname_prefered(request)
     is_superuser = perms.get_is_superuser(request.user)
 
     if 'name' in request.POST:
@@ -107,8 +107,8 @@ def create(request):
 
 @is_authenticated
 def firewall_removerule(request, firewall_name, firewall_rulenumber):
-    all_instances = vyos.instance_getall_by_group(request)
-    hostname_default = vyos.get_hostname_prefered(request)
+    all_instances = perms.instance_getall_by_group(request)
+    hostname_default = perms.get_hostname_prefered(request)
 
     firewall = vyos.get_firewall(hostname_default, firewall_name)
     firewall_rule = vyos.get_firewall_rule(hostname_default, firewall_name, firewall_rulenumber)
@@ -122,8 +122,8 @@ def changerule(request, firewall_name, mode, rulenumber=None):
     msg = vmsg.msg()
 
     #interfaces = vyos.get_interfaces()
-    all_instances = vyos.instance_getall_by_group(request)
-    hostname_default = vyos.get_hostname_prefered(request)
+    all_instances = perms.instance_getall_by_group(request)
+    hostname_default = perms.get_hostname_prefered(request)
     is_superuser = perms.get_is_superuser(request.user)
 
     # get all firewall groups
@@ -975,8 +975,8 @@ def editrule(request, firewall_name, rulenumber):
 def show(request, firewall_name):
         
     #interfaces = vyos.get_interfaces()
-    all_instances = vyos.instance_getall_by_group(request)
-    hostname_default = vyos.get_hostname_prefered(request)
+    all_instances = perms.instance_getall_by_group(request)
+    hostname_default = perms.get_hostname_prefered(request)
     is_superuser = perms.get_is_superuser(request.user)
 
     firewall = vyos.get_firewall(hostname_default, firewall_name)
@@ -997,9 +997,9 @@ def show(request, firewall_name):
 @is_authenticated
 def firewall_portgroup_list(request):
         
-    hostname_default = vyos.get_hostname_prefered(request)
+    hostname_default = perms.get_hostname_prefered(request)
     firewall_portgroup = vyos.get_firewall_portgroup(hostname_default)
-    all_instances = vyos.instance_getall_by_group(request)
+    all_instances = perms.instance_getall_by_group(request)
     is_superuser = perms.get_is_superuser(request.user)
 
     template = loader.get_template('firewall/portgroup-list.html')
@@ -1014,14 +1014,14 @@ def firewall_portgroup_list(request):
 
 @is_authenticated
 def firewall_portgroup_del(request, groupname):
-    hostname_default = vyos.get_hostname_prefered(request)
+    hostname_default = perms.get_hostname_prefered(request)
     vyos.set_firewall_portgroup_del(hostname_default, groupname)
     return redirect('firewall:firewall-portgroup-list')
 
 @is_authenticated
 def firewall_portgroup_add(request):
-    hostname_default = vyos.get_hostname_prefered(request)
-    all_instances = vyos.instance_getall_by_group(request)
+    hostname_default = perms.get_hostname_prefered(request)
+    all_instances = perms.instance_getall_by_group(request)
     is_superuser = perms.get_is_superuser(request.user)
     netservices = network.get_services()
 
@@ -1055,8 +1055,8 @@ def firewall_portgroup_add(request):
 
 @is_authenticated
 def firewall_portgroup_edit(request, groupname):
-    hostname_default = vyos.get_hostname_prefered(request)
-    all_instances = vyos.instance_getall_by_group(request)
+    hostname_default = perms.get_hostname_prefered(request)
+    all_instances = perms.instance_getall_by_group(request)
     is_superuser = perms.get_is_superuser(request.user)
     netservices = network.get_services()
     portgroups = vyos.get_firewall_portgroup(hostname_default)
@@ -1122,9 +1122,9 @@ def firewall_portgroup_edit(request, groupname):
 @is_authenticated
 def firewall_networkgroup_list(request):
         
-    hostname_default = vyos.get_hostname_prefered(request)
+    hostname_default = perms.get_hostname_prefered(request)
     firewall_networkgroup = vyos.get_firewall_networkgroup(hostname_default)
-    all_instances = vyos.instance_getall_by_group(request)
+    all_instances = perms.instance_getall_by_group(request)
     is_superuser = perms.get_is_superuser(request.user)
 
     template = loader.get_template('firewall/networkgroup-list.html')
@@ -1139,8 +1139,8 @@ def firewall_networkgroup_list(request):
 
 @is_authenticated
 def firewall_networkgroup_add(request):
-    hostname_default = vyos.get_hostname_prefered(request)
-    all_instances = vyos.instance_getall_by_group(request)
+    hostname_default = perms.get_hostname_prefered(request)
+    all_instances = perms.instance_getall_by_group(request)
     is_superuser = perms.get_is_superuser(request.user)
 
     if (    request.POST.get('name', None) != None 
@@ -1194,16 +1194,16 @@ def firewall_networkgroup_add(request):
 
 @is_authenticated
 def firewall_networkgroup_del(request, groupname):
-    hostname_default = vyos.get_hostname_prefered(request)
+    hostname_default = perms.get_hostname_prefered(request)
     vyos.set_firewall_networkgroup_del(hostname_default, groupname)
     return redirect('firewall:firewall-networkgroup-list')
 
 @is_authenticated
 def firewall_addressgroup_list(request):
         
-    hostname_default = vyos.get_hostname_prefered(request)
+    hostname_default = perms.get_hostname_prefered(request)
     firewall_addressgroup = vyos.get_firewall_addressgroup(hostname_default)
-    all_instances = vyos.instance_getall_by_group(request)
+    all_instances = perms.instance_getall_by_group(request)
     is_superuser = perms.get_is_superuser(request.user)
 
     template = loader.get_template('firewall/addressgroup-list.html')
@@ -1218,8 +1218,8 @@ def firewall_addressgroup_list(request):
 
 @is_authenticated
 def firewall_addressgroup_add(request):
-    hostname_default = vyos.get_hostname_prefered(request)
-    all_instances = vyos.instance_getall_by_group(request)
+    hostname_default = perms.get_hostname_prefered(request)
+    all_instances = perms.instance_getall_by_group(request)
     is_superuser = perms.get_is_superuser(request.user)
 
     if (    request.POST.get('name', None) != None 
@@ -1273,14 +1273,14 @@ def firewall_addressgroup_add(request):
 
 @is_authenticated
 def firewall_addressgroup_del(request, groupname):
-    hostname_default = vyos.get_hostname_prefered(request)
+    hostname_default = perms.get_hostname_prefered(request)
     vyos.set_firewall_addressgroup_del(hostname_default, groupname)
     return redirect('firewall:firewall-addressgroup-list')
 
 @is_authenticated
 def firewall_addressgroup_desc(request, groupname):
-    hostname_default = vyos.get_hostname_prefered(request)
-    all_instances = vyos.instance_getall_by_group(request)
+    hostname_default = perms.get_hostname_prefered(request)
+    all_instances = perms.instance_getall_by_group(request)
     is_superuser = perms.get_is_superuser(request.user)
 
     v = vapilib.api (
@@ -1374,8 +1374,8 @@ def firewall_addressgroup_desc(request, groupname):
 
 @is_authenticated
 def firewall_networkgroup_desc(request, groupname):
-    hostname_default = vyos.get_hostname_prefered(request)
-    all_instances = vyos.instance_getall_by_group(request)
+    hostname_default = perms.get_hostname_prefered(request)
+    all_instances = perms.instance_getall_by_group(request)
     is_superuser = perms.get_is_superuser(request.user)
 
 
@@ -1471,8 +1471,8 @@ def firewall_networkgroup_desc(request, groupname):
 @is_authenticated
 def firewall_config(request, firewall_name):  
     #interfaces = vyos.get_interfaces()
-    all_instances = vyos.instance_getall_by_group(request)
-    hostname_default = vyos.get_hostname_prefered(request)
+    all_instances = perms.instance_getall_by_group(request)
+    hostname_default = perms.get_hostname_prefered(request)
     is_superuser = perms.get_is_superuser(request.user)
     
     firewall = vyos.get_firewall(hostname_default, firewall_name)
@@ -1494,8 +1494,8 @@ def firewall_config(request, firewall_name):
 def firewall_global(request):
    
     #interfaces = vyos.get_interfaces()
-    all_instances = vyos.instance_getall_by_group(request)
-    hostname_default = vyos.get_hostname_prefered(request)
+    all_instances = perms.instance_getall_by_group(request)
+    hostname_default = perms.get_hostname_prefered(request)
 
     if int(request.POST.get('allping', 0)) == 1:
         vyos.set_firewall_allping_enable(hostname_default)
@@ -1514,8 +1514,8 @@ def firewall_global(request):
 def firewall_remove(request, firewall_name):
        
     #interfaces = vyos.get_interfaces()
-    all_instances = vyos.instance_getall_by_group(request)
-    hostname_default = vyos.get_hostname_prefered(request)
+    all_instances = perms.instance_getall_by_group(request)
+    hostname_default = perms.get_hostname_prefered(request)
 
     firewall = vyos.delete_firewall(hostname_default, firewall_name)
     
@@ -1525,8 +1525,8 @@ def firewall_remove(request, firewall_name):
 def firewall_edit(request, firewall_name):
    
     #interfaces = vyos.get_interfaces()
-    all_instances = vyos.instance_getall_by_group(request)
-    hostname_default = vyos.get_hostname_prefered(request)
+    all_instances = perms.instance_getall_by_group(request)
+    hostname_default = perms.get_hostname_prefered(request)
     firewall = vyos.get_firewall(hostname_default, firewall_name)
     firewall['defaultaction'] = firewall['default-action']
     is_superuser = perms.get_is_superuser(request.user)
@@ -1562,8 +1562,8 @@ def firewall_edit(request, firewall_name):
 @is_authenticated
 def firewall_zones(request):
     # basic methods all views should call
-    all_instances = vyos.instance_getall_by_group(request)
-    hostname_default = vyos.get_hostname_prefered(request)
+    all_instances = perms.instance_getall_by_group(request)
+    hostname_default = perms.get_hostname_prefered(request)
     is_superuser = perms.get_is_superuser(request.user)
 
     # local methods to prepare env
@@ -1625,8 +1625,8 @@ def firewall_zones_add(request):
     msg = vmsg.msg()
 
     # basic methods all views should call
-    all_instances       = vyos.instance_getall_by_group(request)
-    hostname_default    = vyos.get_hostname_prefered(request)
+    all_instances       = perms.instance_getall_by_group(request)
+    hostname_default    = perms.get_hostname_prefered(request)
     is_superuser        = perms.get_is_superuser(request.user)
 
     # local methods to prepare env
@@ -1743,8 +1743,8 @@ def firewall_zones_edit(request, zonename):
     msg = vmsg.msg()
     
     # basic methods all views should call
-    all_instances       = vyos.instance_getall_by_group(request)
-    hostname_default    = vyos.get_hostname_prefered(request)
+    all_instances       = perms.instance_getall_by_group(request)
+    hostname_default    = perms.get_hostname_prefered(request)
     is_superuser        = perms.get_is_superuser(request.user)
 
     # local methods to prepare env
@@ -1964,8 +1964,8 @@ def firewall_zones_remove(request, zonename):
     msg = vmsg.msg()
     
     # basic methods all views should call
-    all_instances       = vyos.instance_getall_by_group(request)
-    hostname_default    = vyos.get_hostname_prefered(request)
+    all_instances       = perms.instance_getall_by_group(request)
+    hostname_default    = perms.get_hostname_prefered(request)
     is_superuser        = perms.get_is_superuser(request.user)
 
     # local methods to prepare env
@@ -2004,8 +2004,8 @@ def firewall_zones_addrule(request):
     msg = vmsg.msg()
     
     # basic methods all views should call
-    all_instances       = vyos.instance_getall_by_group(request)
-    hostname_default    = vyos.get_hostname_prefered(request)
+    all_instances       = perms.instance_getall_by_group(request)
+    hostname_default    = perms.get_hostname_prefered(request)
     is_superuser        = perms.get_is_superuser(request.user)
 
     # local methods to prepare env
@@ -2106,8 +2106,8 @@ def firewall_zones_removerule(request, dstzone, srczone, firewall):
     msg = vmsg.msg()
     
     # basic methods all views should call
-    all_instances       = vyos.instance_getall_by_group(request)
-    hostname_default    = vyos.get_hostname_prefered(request)
+    all_instances       = perms.instance_getall_by_group(request)
+    hostname_default    = perms.get_hostname_prefered(request)
     is_superuser        = perms.get_is_superuser(request.user)
 
     # local methods to prepare env

vycontrol/interface/views.py

@@ -27,8 +27,8 @@ def get_item(dictionary, key):
 @is_authenticated    
 def index(request):
     
-    hostname_default = vyos.get_hostname_prefered(request)
-    all_instances = vyos.instance_getall_by_group(request)
+    hostname_default = perms.get_hostname_prefered(request)
+    all_instances = perms.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,8 +213,8 @@ def index(request):
 @is_authenticated    
 def interface_show(request, interface_type, interface_name):
         
-    all_instances = vyos.instance_getall_by_group(request)
-    hostname_default = vyos.get_hostname_prefered(request)
+    all_instances = perms.instance_getall_by_group(request)
+    hostname_default = perms.get_hostname_prefered(request)
     is_superuser = perms.get_is_superuser(request.user)
     
     firewall_all = vyos.get_firewall_all(hostname_default)  
@@ -246,10 +246,10 @@ def interface_show(request, interface_type, interface_name):
 @is_authenticated    
 def interface_firewall(request, interface_type, interface_name):
         
-    all_instances = vyos.instance_getall_by_group(request)
+    all_instances = perms.instance_getall_by_group(request)
     is_superuser = perms.get_is_superuser(request.user)
 
-    hostname_default = vyos.get_hostname_prefered(request)
+    hostname_default = perms.get_hostname_prefered(request)
     
     interface = vyos.get_interface(interface_type, interface_name, hostname=hostname_default)
     
@@ -268,7 +268,7 @@ def interface_firewall(request, interface_type, interface_name):
 
 @is_authenticated    
 def interface_set_firewall(request, interface_type, interface_name):
-    hostname_default = vyos.get_hostname_prefered(request)
+    hostname_default = perms.get_hostname_prefered(request)
     
     interface = vyos.get_interface(interface_type, interface_name, hostname=hostname_default)
     interface_detail = vyos.detail_interface(interface_type, interface_name)
@@ -302,7 +302,7 @@ def interface_set_firewall(request, interface_type, interface_name):
 
 @is_authenticated    
 def interface_set(request, interface_type, interface_name):
-    hostname_default = vyos.get_hostname_prefered(request)   
+    hostname_default = perms.get_hostname_prefered(request)   
     #interface = vyos.get_interface(interface_type, interface_name, hostname=hostname_default)
     interface_detail = vyos.detail_interface(interface_type, interface_name)
     interface_vif = interface_detail['vlan_id']
@@ -331,7 +331,7 @@ def interface_set(request, interface_type, interface_name):
 
 @is_authenticated    
 def interface_delete(request, interface_type, interface_name, interface_vif=None):
-    hostname_default = vyos.get_hostname_prefered(request)   
+    hostname_default = perms.get_hostname_prefered(request)   
     
     if interface_vif == None:
         v = vapi.delete_interface(hostname_default, interface_type, interface_name)
@@ -342,9 +342,9 @@ def interface_delete(request, interface_type, interface_name, interface_vif=None
 
 @is_authenticated    
 def interface_add(request):      
-    all_instances = vyos.instance_getall_by_group(request)
+    all_instances = perms.instance_getall_by_group(request)
     is_superuser = perms.get_is_superuser(request.user)
-    hostname_default = vyos.get_hostname_prefered(request)
+    hostname_default = perms.get_hostname_prefered(request)
     msg = vmsg.msg()
 
     changed = False
@@ -421,9 +421,9 @@ def interface_add(request):
 
 @is_authenticated    
 def interface_add_vlan(request, interface_type=None, interface_name=None):      
-    all_instances = vyos.instance_getall_by_group(request)
+    all_instances = perms.instance_getall_by_group(request)
     is_superuser = perms.get_is_superuser(request.user)
-    hostname_default = vyos.get_hostname_prefered(request)
+    hostname_default = perms.get_hostname_prefered(request)
     msg = vmsg.msg()
 
     changed = False

vycontrol/libs/vycontrol_validators.py

@@ -7,6 +7,11 @@ import re
 def validator_letters_numbers(value):
     if re.match("^[A-Za-z0-9]*$", value):
         return True
+
+@validator
+def validator_group(value):
+    if re.match("^[A-Za-z0-9\.\-_]*$", value):
+        return True
        
 @validator
 def validator_ipv4_cidr(value):

vycontrol/ntp/views.py

@@ -16,8 +16,8 @@ from perms import is_authenticated
 
 @is_authenticated
 def index(request):
-    all_instances = vyos.instance_getall_by_group(request)
-    hostname_default = vyos.get_hostname_prefered(request)
+    all_instances = perms.instance_getall_by_group(request)
+    hostname_default = perms.get_hostname_prefered(request)
     is_superuser = perms.get_is_superuser(request.user)
 
     ntp_srv = vapi.get_ntp(hostname_default)
@@ -41,8 +41,8 @@ def index(request):
 def add(request):
     msg = vmsg.msg()
 
-    all_instances = vyos.instance_getall_by_group(request)
-    hostname_default = vyos.get_hostname_prefered(request)
+    all_instances = perms.instance_getall_by_group(request)
+    hostname_default = perms.get_hostname_prefered(request)
     is_superuser = perms.get_is_superuser(request.user)
 
     if 'server' in request.POST:
@@ -68,7 +68,7 @@ def add(request):
 
 @is_authenticated
 def remove(request, server):
-    hostname_default = vyos.get_hostname_prefered(request)
+    hostname_default = perms.get_hostname_prefered(request)
 
     ntp_servers = vapi.get_ntp(hostname_default)
 

vycontrol/perms.py

@@ -27,6 +27,11 @@ def is_authenticated(func):
         if user.count() != 1:
             return redirect('%s?next=%s' % (reverse('accounts-login'), request.path))
         
+        # check if return a valid hostname
+        hostname = get_hostname_prefered(request)
+        if hostname == None:
+            return redirect('%s?next=%s' % (reverse('accounts-login'), request.path))
+
         value = func(*args, **kwargs)
         return value
     return wrapper_perm
@@ -90,7 +95,6 @@ def instance_getall_by_group(request):
         instances = Instance.objects.all()
         return instances
     else:
-        # get usergroup - VyControl groups is one to one
         try:
             usergroup = Group.objects.get(user=username)
         except Group.DoesNotExist:
@@ -139,7 +143,7 @@ def get_hostname_prefered(request):
 
     # get usergroup - VyControl groups is one to one
     try:
-        usergroup = Group.objects.get(user=username)
+        usergroup = Group.objects.get(user=username, active=True)
     except Group.DoesNotExist:
         usergroup = None
 
@@ -162,6 +166,7 @@ def get_hostname_prefered(request):
         except Instance.DoesNotExist:
             pass
 
+
     # if we have no hostname yet try to get the default one from database
     if hostname == None:
         try:
@@ -182,5 +187,5 @@ def get_hostname_prefered(request):
 
             except Instance.DoesNotExist:
                 pass
-    return None
-
+   
+    return hostname

vycontrol/static/views.py

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

vycontrol/viewinfo.py

@@ -14,8 +14,8 @@ class prepareClass:
 def prepare(request):
     p = prepareClass()
 
-    p.all_instances = vyos.instance_getall_by_group(request)
-    p.hostname_default = vyos.get_hostname_prefered(request)
+    p.all_instances = perms.instance_getall_by_group(request)
+    p.hostname_default = perms.get_hostname_prefered(request)
     p.is_superuser = perms.get_is_superuser(request.user)
     p.request = request
     p.msg = vmsg.msg()

vycontrol/vyos.py

@@ -10,16 +10,6 @@ from django.contrib.auth.models import User
 
 import perms
 
-def instance_getall(*args, **kwargs):
-    return perms.instance_getall(*args, **kwargs)
-
-
-def get_hostname_prefered(*args, **kwargs):
-    return perms.get_hostname_prefered(*args, **kwargs)
-
-def instance_getall_by_group(*args, **kwargs):
-    return perms.instance_getall_by_group(*args, **kwargs)
-
 def repvar(s):
     return s.replace("-", "_")