diff options
author | Kim Hagen <khagen@multi-development.com> | 2014-07-02 00:26:59 +0200 |
---|---|---|
committer | Kim Hagen <khagen@multi-development.com> | 2014-07-02 00:26:59 +0200 |
commit | d8bca3dcac051a2e6b942fcc58df2145ea9ef894 (patch) | |
tree | e7c3cec358f591f11c3b6f9b7f16d41dc1bbc8be | |
parent | 004f92bd2f2f6c7699e43b337cbc3ea91c1a7fa8 (diff) | |
download | vyatta-cfg-firewall-d8bca3dcac051a2e6b942fcc58df2145ea9ef894.tar.gz vyatta-cfg-firewall-d8bca3dcac051a2e6b942fcc58df2145ea9ef894.zip |
Set separate virual interface for QinQ.
-rwxr-xr-x | gen-interface-policy-templates.pl | 21 | ||||
-rwxr-xr-x | gen-interface-templates.pl | 49 |
2 files changed, 39 insertions, 31 deletions
diff --git a/gen-interface-policy-templates.pl b/gen-interface-policy-templates.pl index 9452c8b..f27c329 100755 --- a/gen-interface-policy-templates.pl +++ b/gen-interface-policy-templates.pl @@ -34,24 +34,27 @@ my $debug = 0; # the partial pathname under the config template tree "interfaces/". # my %interface_hash = ( - 'adsl/node.tag/pvc/node.tag/bridged-ethernet' => '$VAR(../../../../@)', - 'adsl/node.tag/pvc/node.tag/classical-ipoa' => '$VAR(../../../../@)', - 'adsl/node.tag/pvc/node.tag/pppoa/node.tag' => 'pppoa$VAR(../../@)', - 'adsl/node.tag/pvc/node.tag/pppoe/node.tag' => 'pppoe$VAR(../../@)', + 'adsl/node.tag/pvc/node.tag/bridged-ethernet' => '$VAR(../../../../@)', + 'adsl/node.tag/pvc/node.tag/classical-ipoa' => '$VAR(../../../../@)', + 'adsl/node.tag/pvc/node.tag/pppoa/node.tag' => 'pppoa$VAR(../../@)', + 'adsl/node.tag/pvc/node.tag/pppoe/node.tag' => 'pppoe$VAR(../../@)', - 'bonding/node.tag' => '$VAR(../../@)', - 'bonding/node.tag/vif/node.tag' => '$VAR(../../../@).$VAR(../../@)', - 'bonding/node.tag/vif/node.tag/vif/node.tag' => '$VAR(../../../../@).$VAR(../../../@).$VAR(../../@)', + 'bonding/node.tag' => '$VAR(../../@)', + 'bonding/node.tag/vif/node.tag' => '$VAR(../../../@).$VAR(../../@)', + 'bonding/node.tag/vif-s/node.tag' => '$VAR(../../../@).$VAR(../../@)', + 'bonding/node.tag/vif-s/node.tag/vif-c/node.tag' => '$VAR(../../../../@).$VAR(../../../@).$VAR(../../@)', 'ethernet/node.tag' => '$VAR(../../@)', 'ethernet/node.tag/pppoe/node.tag' => 'pppoe$VAR(../../@)', 'ethernet/node.tag/vif/node.tag' => '$VAR(../../../@).$VAR(../../@)', 'ethernet/node.tag/vif/node.tag/pppoe/node.tag' => 'pppoe$VAR(../../@)', - 'ethernet/node.tag/vif/node.tag/vif/node.tag' => '$VAR(../../../../@).$VAR(../../../@).$VAR(../../@)', + 'ethernet/node.tag/vif-s/node.tag' => '$VAR(../../../@).$VAR(../../@)', + 'ethernet/node.tag/vif-s/node.tag/vif-c/node.tag' => '$VAR(../../../../@).$VAR(../../../@).$VAR(../../@)', 'pseudo-ethernet/node.tag' => '$VAR(../../@)', 'pseudo-ethernet/node.tag/vif/node.tag' => '$VAR(../../../@).$VAR(../../@)', - 'pseudo-ethernet/node.tag/vif/node.tag/vif/node.tag' => '$VAR(../../../../@).$VAR(../../../@).$VAR(../../@)', + 'pseudo-ethernet/node.tag/vif-s/node.tag' => '$VAR(../../../@).$VAR(../../@)', + 'pseudo-ethernet/node.tag/vif-s/node.tag/vif-c/node.tag' => '$VAR(../../../../@).$VAR(../../../@).$VAR(../../@)', 'wireless/node.tag' => '$VAR(../../@)', 'wireless/node.tag/vif/node.tag' => '$VAR(../../../@).$VAR(../../@)', diff --git a/gen-interface-templates.pl b/gen-interface-templates.pl index 82e11fb..475d837 100755 --- a/gen-interface-templates.pl +++ b/gen-interface-templates.pl @@ -34,24 +34,27 @@ my $debug = 0; # the partial pathname under the config template tree "interfaces/". # my %interface_hash = ( - 'adsl/node.tag/pvc/node.tag/bridged-ethernet' => '$VAR(../../../../../@)', - 'adsl/node.tag/pvc/node.tag/classical-ipoa' => '$VAR(../../../../../@)', - 'adsl/node.tag/pvc/node.tag/pppoa/node.tag' => 'pppoa$VAR(../../../@)', - 'adsl/node.tag/pvc/node.tag/pppoe/node.tag' => 'pppoe$VAR(../../../@)', - - 'bonding/node.tag' => '$VAR(../../../@)', - 'bonding/node.tag/vif/node.tag' => '$VAR(../../../../@).$VAR(../../../@)', - 'bonding/node.tag/vif/node.tag/vif/node.tag' => '$VAR(../../../../@).$VAR(../../../@).$VAR(../../@)', - - 'ethernet/node.tag' => '$VAR(../../../@)', - 'ethernet/node.tag/pppoe/node.tag' => 'pppoe$VAR(../../../@)', - 'ethernet/node.tag/vif/node.tag' => '$VAR(../../../../@).$VAR(../../../@)', - 'ethernet/node.tag/vif/node.tag/pppoe/node.tag' => 'pppoe$VAR(../../../@)', - 'ethernet/node.tag/vif/node.tag/vif/node.tag' => '$VAR(../../../../@).$VAR(../../../@).$VAR(../../@)', - - 'pseudo-ethernet/node.tag' => '$VAR(../../../@)', - 'pseudo-ethernet/node.tag/vif/node.tag' => '$VAR(../../../../@).$VAR(../../../@)', - 'pseudo-ethernet/node.tag/vif/node.tag/vif/node.tag' => '$VAR(../../../../@).$VAR(../../../@).$VAR(../../@)', + 'adsl/node.tag/pvc/node.tag/bridged-ethernet' => '$VAR(../../../../../@)', + 'adsl/node.tag/pvc/node.tag/classical-ipoa' => '$VAR(../../../../../@)', + 'adsl/node.tag/pvc/node.tag/pppoa/node.tag' => 'pppoa$VAR(../../../@)', + 'adsl/node.tag/pvc/node.tag/pppoe/node.tag' => 'pppoe$VAR(../../../@)', + + 'bonding/node.tag' => '$VAR(../../../@)', + 'bonding/node.tag/vif/node.tag' => '$VAR(../../../../@).$VAR(../../../@)', + 'bonding/node.tag/vif-s/node.tag' => '$VAR(../../../../@).$VAR(../../../@)', + 'bonding/node.tag/vif-s/node.tag/vif-c/node.tag' => '$VAR(../../../../@).$VAR(../../../@).$VAR(../../@)', + + 'ethernet/node.tag' => '$VAR(../../../@)', + 'ethernet/node.tag/pppoe/node.tag' => 'pppoe$VAR(../../../@)', + 'ethernet/node.tag/vif/node.tag' => '$VAR(../../../../@).$VAR(../../../@)', + 'ethernet/node.tag/vif/node.tag/pppoe/node.tag' => 'pppoe$VAR(../../../@)', + 'ethernet/node.tag/vif-s/node.tag' => '$VAR(../../../../@).$VAR(../../../@)', + 'ethernet/node.tag/vif-s/node.tag/vif-c/node.tag' => '$VAR(../../../../@).$VAR(../../../@).$VAR(../../@)', + + 'pseudo-ethernet/node.tag' => '$VAR(../../../@)', + 'pseudo-ethernet/node.tag/vif/node.tag' => '$VAR(../../../../@).$VAR(../../../@)', + 'pseudo-ethernet/node.tag/vif-s/node.tag' => '$VAR(../../../../@).$VAR(../../../@)', + 'pseudo-ethernet/node.tag/vif-s/node.tag/vif-c/node.tag' => '$VAR(../../../../@).$VAR(../../../@).$VAR(../../@)', 'wireless/node.tag' => '$VAR(../../../@)', 'wireless/node.tag/vif/node.tag' => '$VAR(../../../../@).$VAR(../../../@)', @@ -84,21 +87,23 @@ my %firewall_hash = ( 'adsl/node.tag/pvc/node.tag/pppoe/node.tag' => 'adsl $VAR(../../../@) pvc $VAR(../../@) pppoe $VAR(../@)', 'bonding/node.tag' => 'bonding $VAR(../@)', 'bonding/node.tag/vif/node.tag' => 'bonding $VAR(../../../@) vif $VAR(../@)', - 'bonding/node.tag/vif/node.tag/vif/node.tag' => 'bonding $VAR(../../../../@) vif $VAR(../../@) vif $VAR(../@)', + 'bonding/node.tag/vif-s/node.tag' => 'bonding $VAR(../../../@) vif-s $VAR(../@)', + 'bonding/node.tag/vif-s/node.tag/vif-c/node.tag' => 'bonding $VAR(../../../../@) vif-s $VAR(../../@) vif-c $VAR(../@)', 'bridge/node.tag' => 'bridge $VAR(../@)', 'ethernet/node.tag' => 'ethernet $VAR(../@)', 'ethernet/node.tag/pppoa/node.tag' => 'ethernet $VAR(../../@) pppoa $VAR(../@)', 'ethernet/node.tag/pppoe/node.tag' => 'ethernet $VAR(../../@) pppoe $VAR(../@)', 'ethernet/node.tag/vif/node.tag' => 'ethernet $VAR(../../../@) vif $VAR(../@)', - 'ethernet/node.tag/vif/node.tag/vif/node.tag' => 'ethernet $VAR(../../../../@) vif $VAR(../../@) vif $VAR(../@)', + 'ethernet/node.tag/vif-s/node.tag' => 'ethernet $VAR(../../../@) vif-s $VAR(../@)', + 'ethernet/node.tag/vif-s/node.tag/vif-c/node.tag' => 'ethernet $VAR(../../../../@) vif-s $VAR(../../@) vif-c $VAR(../@)', 'ethernet/node.tag/vif/node.tag/pppoe/node.tag' => 'ethernet $VAR(../../../../@) vif $VAR(../../@) pppoe $VAR(../@)', - 'ethernet/node.tag/vif/node.tag/vif/node.tag/pppoe/node.tag' => 'ethernet $VAR(../../../../../@) vif $VAR(../../../@)vif $VAR(../../@) pppoe $VAR(../@)', 'input/node.tag' => 'input $VAR(../@)', 'multilink/node.tag/vif/node.tag' => 'multilink $VAR(../../../@) vif $VAR(../@)', 'openvpn/node.tag' => 'openvpn $VAR(../@)', 'pseudo-ethernet/node.tag' => 'pseudo-ethernet $VAR(../@)', 'pseudo-ethernet/node.tag/vif/node.tag' => 'pseudo-ethernet $VAR(../../../@) vif $VAR(../@)', - 'pseudo-ethernet/node.tag/vif/node.tag/vif/node.tag' => 'pseudo-ethernet $VAR(../../../../@) vif $VAR(../../@) vif $VAR(../@)', + 'pseudo-ethernet/node.tag/vif-s/node.tag' => 'pseudo-ethernet $VAR(../../../@) vif-s $VAR(../@)', + 'pseudo-ethernet/node.tag/vif-s/node.tag/vif-c/node.tag' => 'pseudo-ethernet $VAR(../../../../@) vif-s $VAR(../../@) vif-c $VAR(../@)', 'serial/node.tag/cisco-hdlc/vif/node.tag' => 'serial $VAR(../../../@) cisco-hdlc vif $VAR(../@)', 'serial/node.tag/frame-relay/vif/node.tag' => 'serial $VAR(../../../@) frame-relay vif $VAR(../@)', 'serial/node.tag/ppp/vif/node.tag' => 'serial $VAR(../../../@) ppp vif $VAR(../@)', |