feat(network): Allow tun and tap to be added to Vulture

Author: ELDiablO59152

vulture_os/services/openvpn/views.py

@@ -282,6 +282,7 @@ def openvpn_start(request, object_id, api=False):
             status = 500
         else:
             status = 202
+            res.pop('instance')
             if not res.get('message'):
                 res['message'] = _("Starting service. Please wait a moment please...")
 
@@ -319,6 +320,7 @@ def openvpn_restart(request, object_id, api=False):
             status = 500
         else:
             status = 202
+            res.pop('instance')
             if not res.get('message'):
                 res['message'] = _("Restarting service. Please wait a moment please...")
 
@@ -355,6 +357,7 @@ def openvpn_stop(request, object_id, api=False):
             status = 500
         else:
             status = 202
+            res.pop('instance')
             if not res.get('message'):
                 res['message'] = _("Stopping service. Please wait a moment please...")
 
@@ -392,6 +395,7 @@ def openvpn_reload(request, object_id, api=False):
             status = 500
         else:
             status = 202
+            res.pop('instance')
             if not res.get('message'):
                 res['message'] = _("Reloading service. Please wait a moment please...")
 

vulture_os/system/cluster/models.py

@@ -169,7 +169,7 @@ def to_dict(self, fields=None):
         if not fields or "id" in fields:
             result['id'] = str(result['id'])
         if not fields or "intfs" in fields:
-            excluded_intf = ("lo0", "lo1", "lo2", "lo3", "lo4", "lo5", "lo6", "pflog0", "vm-public", "tap0", "tun0")
+            excluded_intf = ("lo0", "lo1", "lo2", "lo3", "lo4", "lo5", "lo6", "pflog0", "vm-public")
             result['intfs'] = [n.to_dict() for n in NetworkInterfaceCard.objects.filter(node=self).exclude(dev__in=excluded_intf)]
         if not fields or "is_master_mongo" in fields:
             result['is_master_mongo'] = self.is_master_mongo
@@ -893,7 +893,7 @@ def get_list(self):
         :return: ['em0', 'lo0', ...]
         """
         return list(set(subprocess.check_output(['/sbin/ifconfig', '-l']).strip().decode('utf-8').split(' ')) -
-                    {'lo0', 'lo1', 'lo2', 'lo3', 'lo4', 'lo5', 'lo6', 'pflog0', 'vm-public', 'tap0', 'tun0'})
+                    {'lo0', 'lo1', 'lo2', 'lo3', 'lo4', 'lo5', 'lo6', 'pflog0', 'vm-public'})
 
     def get_running_addresses(self):
         """ Retrieve available RUNNING IP addresses on the NIC

vulture_os/system/netif/api.py

@@ -42,7 +42,7 @@
 class NetworkInterfaceCardAPIv1(View):
     @api_need_key('cluster_api_key')
     def get(self, request, object_id=None):
-        excluded_intf = ("lo0", "lo1", "lo2", "lo3", "lo4", "lo5", "lo6", "pflog0", "vm-public", "tap0", "tun0")
+        excluded_intf = ("lo0", "lo1", "lo2", "lo3", "lo4", "lo5", "lo6", "pflog0", "vm-public")
 
         dev = request.GET.get('dev')
         node_name = request.GET.get('node_name')

vulture_os/system/netif/form.py

@@ -42,7 +42,7 @@ class NetIfForm(ModelForm):
     nic = ModelMultipleChoiceField(
         queryset=NetworkInterfaceCard.objects.exclude(dev__in=[
             'lo0', 'lo1', 'lo2', 'lo3', 'lo4', 'lo5', 'lo6',
-            'pflog0', 'vm-public', 'tap0', 'tun0'
+            'pflog0', 'vm-public'
         ]),
         widget=SelectMultiple(attrs={'class': 'form-control select2'}),
     )