network: update vlan forms and tables

circle/network/forms.py

@@ -201,18 +201,14 @@ class VlanForm(ModelForm):
             ),
             Fieldset(
                 'IPv4',
-                'net4',
-                'prefix4',
-                'ipv4',
+                'network4',
                 'snat_to',
                 'snat_ip',
                 'dhcp_pool',
             ),
             Fieldset(
                 'IPv6',
-                'net6',
-                'prefix6',
-                'ipv6',
+                'network6',
             ),
             Fieldset(
                 'Domain name service',

circle/network/tables.py

@@ -132,7 +132,8 @@ class VlanTable(Table):
     class Meta:
         model = Vlan
         attrs = {'class': 'table table-striped table-condensed'}
-        fields = ('vid', 'name', 'interface', 'ipv4', 'ipv6', 'domain', )
+        fields = ('vid', 'name', 'interface', 'network4', 'network6',
+                  'domain', )
         order_by = 'vid'