Development

docker/routlin-dash/app/action_dnsserver.py

@@ -5,14 +5,14 @@ from config_utils import load_config, save_config_with_snapshot, verify_config_h
 import sanitize
 import validation as validate
 
-bp = Blueprint('action_upstreamdns', __name__)
+bp = Blueprint('action_dnsserver', __name__)
 
-_VIEW = '/view/view_upstream_dns'
+_VIEW = '/view/view_dns_server'
 
 
-@bp.route('/action/upstreamdns_cardupstreamdns_save', methods=['POST'])
+@bp.route('/action/dnsserver_cardupstreamdns_save', methods=['POST'])
 @require_level('administrator')
-def upstreamdns_cardupstreamdns_save():
+def dnsserver_cardupstreamdns_save():
     strict_order = 'strict_order' in request.form
     submitted    = request.form.getlist('upstream_servers')
 
@@ -59,9 +59,9 @@ def upstreamdns_cardupstreamdns_save():
     return redirect(_VIEW)
 
 
-@bp.route('/action/upstreamdns_cardforwardingdnsservice_save', methods=['POST'])
+@bp.route('/action/dnsserver_carddnsforwarding_save', methods=['POST'])
 @require_level('administrator')
-def upstreamdns_cardforwardingdnsservice_save():
+def dnsserver_carddnsforwarding_save():
     cache_size = validate.int_range(request.form.get('cache_size', '').strip(), 0, None)
     if cache_size is None:
         flash('Cache Size must be a non-negative integer.', 'error')

docker/routlin-dash/app/action_networklayout.py

@@ -6,9 +6,9 @@ from config_utils import load_config, save_config_with_snapshot, verify_config_h
 import sanitize
 import validation as validate
 
-bp = Blueprint('action_apply_vlans', __name__)
+bp = Blueprint('action_networklayout', __name__)
 
-VIEW = '/view/view_vlans'
+VIEW = '/view/view_network_layout'
 
 _VLAN_FIELDS = ['name', 'is_vpn', 'subnet', 'subnet_mask', 'dnsmasq_log_queries',
                 'radius_default', 'mdns_reflection', 'use_blocklists']
@@ -28,9 +28,9 @@ def _hash_ok():
     return True
 
 
-@bp.route('/action/add_vlan', methods=['POST'])
+@bp.route('/action/networklayout_cardaddvlan_addvlan', methods=['POST'])
 @require_level('administrator')
-def add_vlan():
+def networklayout_cardaddvlan_addvlan():
     name               = sanitize.name(request.form.get('name', ''))
     is_vpn             = 'is_vpn' in request.form
     subnet             = sanitize.ip(request.form.get('subnet', ''))
@@ -101,9 +101,9 @@ def add_vlan():
     return redirect(VIEW)
 
 
-@bp.route('/action/edit_vlan', methods=['POST'])
+@bp.route('/action/networklayout_tablevlans_edit', methods=['POST'])
 @require_level('administrator')
-def edit_vlan():
+def networklayout_tablevlans_edit():
     idx = _row_index()
     if idx is None:
         flash('Invalid request.', 'error')
@@ -194,9 +194,9 @@ def edit_vlan():
     return redirect(VIEW)
 
 
-@bp.route('/action/delete_vlan', methods=['POST'])
+@bp.route('/action/networklayout_tablevlans_delete', methods=['POST'])
 @require_level('administrator')
-def delete_vlan():
+def networklayout_tablevlans_delete():
     idx = _row_index()
     if idx is None:
         flash('Invalid request.', 'error')

docker/routlin-dash/app/action_physicalinterfaces.py

@@ -7,9 +7,9 @@ from config_utils import load_config, save_config_with_snapshot, verify_config_h
 import sanitize
 import validation as validate
 
-bp = Blueprint('action_networkinterfaces', __name__)
+bp = Blueprint('action_physicalinterfaces', __name__)
 
-_VIEW = '/view/view_network_interfaces'
+_VIEW = '/view/view_physical_interfaces'
 
 _EXCLUDE_PREFIXES = ('lo', 'wg', 'docker', 'br-', 'veth',
                      'tun', 'tap', 'ppp', 'virbr',
@@ -31,9 +31,9 @@ def _valid_interface(name):
     return name in _get_system_interfaces()
 
 
-@bp.route('/action/networkinterfaces_cardnetworkinterface_save', methods=['POST'])
+@bp.route('/action/physicalinterfaces_cardphysicalinterface_save', methods=['POST'])
 @require_level('administrator')
-def networkinterfaces_cardnetworkinterface_save():
+def physicalinterfaces_cardphysicalinterface_save():
     wan = sanitize.interface_name(request.form.get('wan_interface', ''))
     lan = sanitize.interface_name(request.form.get('lan_interface', ''))
 
@@ -74,9 +74,9 @@ def networkinterfaces_cardnetworkinterface_save():
     return redirect(_VIEW)
 
 
-@bp.route('/action/networkinterfaces_cardinterfaceconfiguration_apply', methods=['POST'])
+@bp.route('/action/physicalinterfaces_cardinterfaceconfiguration_apply', methods=['POST'])
 @require_level('administrator')
-def networkinterfaces_cardinterfaceconfiguration_apply():
+def physicalinterfaces_cardinterfaceconfiguration_apply():
     if not verify_config_hash(request.form.get('config_hash', '')):
         flash('Configuration was modified by another session. Please refresh and try again.', 'error')
         return redirect(_VIEW)

docker/routlin-dash/app/main.py

@@ -2,14 +2,14 @@ import os, json, sys
 from flask import Flask
 from view_page import bp as view_page_bp
 from action_actions import bp as action_actions_bp
-from action_networkinterfaces import bp as action_networkinterfaces_bp
-from action_upstreamdns import bp as action_upstreamdns_bp
+from action_physicalinterfaces import bp as action_physicalinterfaces_bp
+from action_dnsserver import bp as action_dnsserver_bp
 from action_apply_mdns import bp as action_apply_mdns_bp
 from action_apply_vpn import bp as action_apply_vpn_bp
 from action_apply_banned_ips import bp as action_apply_banned_ips_bp
 from action_apply_host_overrides import bp as action_apply_host_overrides_bp
 from action_dnsblocking import bp as action_dnsblocking_bp
-from action_apply_vlans import bp as action_apply_vlans_bp
+from action_networklayout import bp as action_networklayout_bp
 from action_apply_inter_vlan import bp as action_apply_inter_vlan_bp
 from action_apply_port_forwarding import bp as action_apply_port_forwarding_bp
 from action_apply_dhcp_reservations import bp as action_apply_dhcp_reservations_bp
@@ -28,14 +28,14 @@ app = Flask(__name__)
 app.secret_key = os.environ.get('SECRET_KEY', os.urandom(24))
 app.register_blueprint(view_page_bp)
 app.register_blueprint(action_actions_bp)
-app.register_blueprint(action_networkinterfaces_bp)
-app.register_blueprint(action_upstreamdns_bp)
+app.register_blueprint(action_physicalinterfaces_bp)
+app.register_blueprint(action_dnsserver_bp)
 app.register_blueprint(action_apply_mdns_bp)
 app.register_blueprint(action_apply_vpn_bp)
 app.register_blueprint(action_apply_banned_ips_bp)
 app.register_blueprint(action_apply_host_overrides_bp)
 app.register_blueprint(action_dnsblocking_bp)
-app.register_blueprint(action_apply_vlans_bp)
+app.register_blueprint(action_networklayout_bp)
 app.register_blueprint(action_apply_inter_vlan_bp)
 app.register_blueprint(action_apply_port_forwarding_bp)
 app.register_blueprint(action_apply_dhcp_reservations_bp)