order

ansible/scripts/switch-rules-down.sh.j2

@@ -7,10 +7,12 @@ iptables -t mangle -F NEXTGEN_SWITCH
 {% for plan in routePlans %}
 ip rule del pref 400 fwmark {{plan.destMark}} lookup {{plan.destMark}}
 restore_mark_switch -D {{plan.destMark}}
+restore_mark_switch -D {{plan.destMark}}
 {% endfor %}
 {% for gw in gateways %}
 {% if gw.selectionMark > 0 %}
 restore_mark_switch -D {{gw.selectionMark}}
+restore_mark_switch -D {{gw.selectionMark}}
 {% endif %}
 {% endfor %}
 

ansible/scripts/switch-rules-up.sh.j2

 #!/bin/bash
 source {{ansible_user_dir}}/nextgen-network/scripts/utility.sh
 
-## route plans
+## route plans chnroute
 {% for plan in routePlans %}
 ip rule add pref 400 fwmark {{plan.destMark}} lookup {{plan.destMark}}
 interface_switch_chnroute -A u_{{plan.name}}_chnroute {{plan.destMark}}
-interface_switch -A u_{{plan.name}}_all {{plan.destMark}}
 restore_mark_switch -A {{plan.destMark}}
 {% endfor %}
 
-## local gateways
+## local gateways chnroute
 {% for gw in gateways %}
 {% if gw.selectionMark > 0 %}
 interface_switch_chnroute -A u_{{gw.isp}}_chnroute {{gw.selectionMark}}
-interface_switch -A u_{{gw.isp}}_all {{gw.selectionMark}}
+restore_mark_switch -A {{gw.selectionMark}}
+{% endif %}
+{% endfor %}
+
+## route plans
+{% for plan in routePlans %}
+interface_switch -A u_{{plan.name}} {{plan.destMark}}
+restore_mark_switch -A {{plan.destMark}}
+{% endfor %}
+
+## local gateways
+{% for gw in gateways %}
+{% if gw.selectionMark > 0 %}
+interface_switch-A u_{{gw.isp}}= {{gw.selectionMark}}
 restore_mark_switch -A {{gw.selectionMark}}
 {% endif %}
 {% endfor %}