From 2c8aa1b16ebc6dbc25c9f96130528e569649d3f9 Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Mon, 19 Mar 2018 10:16:16 +0100 Subject: [PATCH] inteno-netmodes: adapt netmodes configs to new vlan and dsl config way --- .../files/etc/netmodes/bridged/network | 31 +++++++++++- .../etc/netmodes/internet_iptv_voip/network | 47 ++++++++++++++++++- .../layer2_interface_adsl | 0 .../layer2_interface_ethernet | 6 --- .../layer2_interface_vdsl | 0 .../layer2_interface_vlan | 0 .../repeater_brcm_2g_up_5g_down/network | 5 ++ .../layer2_interface_adsl | 0 .../layer2_interface_ethernet | 6 --- .../layer2_interface_vdsl | 0 .../layer2_interface_vlan | 0 .../repeater_brcm_2g_up_dual_down/network | 5 ++ .../routed_brcm/layer2_interface_adsl | 13 ----- .../routed_brcm/layer2_interface_ethernet | 5 -- .../routed_brcm/layer2_interface_vdsl | 9 ---- .../routed_brcm/layer2_interface_vlan | 0 .../files/etc/netmodes/routed_brcm/network | 15 ++++++ 17 files changed, 100 insertions(+), 42 deletions(-) delete mode 100644 inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_5g_down/layer2_interface_adsl delete mode 100644 inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_5g_down/layer2_interface_ethernet delete mode 100644 inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_5g_down/layer2_interface_vdsl delete mode 100644 inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_5g_down/layer2_interface_vlan delete mode 100644 inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_dual_down/layer2_interface_adsl delete mode 100644 inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_dual_down/layer2_interface_ethernet delete mode 100644 inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_dual_down/layer2_interface_vdsl delete mode 100644 inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_dual_down/layer2_interface_vlan delete mode 100644 inteno-netmodes/files/etc/netmodes/routed_brcm/layer2_interface_adsl delete mode 100644 inteno-netmodes/files/etc/netmodes/routed_brcm/layer2_interface_ethernet delete mode 100644 inteno-netmodes/files/etc/netmodes/routed_brcm/layer2_interface_vdsl delete mode 100644 inteno-netmodes/files/etc/netmodes/routed_brcm/layer2_interface_vlan diff --git a/inteno-netmodes/files/etc/netmodes/bridged/network b/inteno-netmodes/files/etc/netmodes/bridged/network index fea398b0e..a39f5c105 100644 --- a/inteno-netmodes/files/etc/netmodes/bridged/network +++ b/inteno-netmodes/files/etc/netmodes/bridged/network @@ -28,10 +28,39 @@ config interface 'iptv' option proto 'dhcp' option gateway '0.0.0.0' option reqopts 'staticroutes' - option ifname 'ptm0.100 atm1.1 $WAN.100 $LAN4' + option ifname 'ptm0.100 $WAN.100 $LAN4' option defaultroute '0' config interface 'wan6' option proto 'dhcpv6' option ifname '@wan' +config device 'atmwan' + option type 'untagged' + option ifname 'atm0' + option name 'atm0.1' + +config device 'ptmwan' + option type 'untagged' + option ifname 'ptm0' + option name 'ptm0.1' + +config device 'ethwan' + option type 'untagged' + option ifname '$WAN' + option name '$WAN.1' + +config device 'ethtv' + option type '8021q' + option name '$WAN.100' + option ifname '$WAN' + option vid '100' + option priority '0' + +config device 'ptmtv' + option type '8021q' + option name 'ptm0.100' + option ifname 'ptm0' + option vid '100' + option priority '0' + diff --git a/inteno-netmodes/files/etc/netmodes/internet_iptv_voip/network b/inteno-netmodes/files/etc/netmodes/internet_iptv_voip/network index d0069feeb..8a5fb2ef6 100644 --- a/inteno-netmodes/files/etc/netmodes/internet_iptv_voip/network +++ b/inteno-netmodes/files/etc/netmodes/internet_iptv_voip/network @@ -28,7 +28,7 @@ config interface 'iptv' option proto 'dhcp' option gateway '0.0.0.0' option reqopts 'staticroutes' - option ifname 'ptm0.100 atm1.1 $WAN.100 $LAN4' + option ifname 'ptm0.100 $WAN.100 $LAN4' option defaultroute '0' config interface 'voip' @@ -36,10 +36,53 @@ config interface 'voip' option proto 'dhcp' option gateway '0.0.0.0' option reqopts 'staticroutes' - option ifname 'ptm0.200 atm2.1 $WAN.200' + option ifname 'ptm0.200 $WAN.200' option defaultroute '0' config interface 'wan6' option proto 'dhcpv6' option ifname '@wan' +config device 'atmwan' + option type 'untagged' + option ifname 'atm0' + option name 'atm0.1' + +config device 'ptmwan' + option type 'untagged' + option ifname 'ptm0' + option name 'ptm0.1' + +config device 'ethwan' + option type 'untagged' + option ifname '$WAN' + option name '$WAN.1' + +config device 'ethtv' + option type '8021q' + option name '$WAN.100' + option ifname '$WAN' + option vid '100' + option priority '0' + +config device 'ptmtv' + option type '8021q' + option name 'ptm0.100' + option ifname 'ptm0' + option vid '100' + option priority '0' + +config device 'ethvoip' + option type '8021q' + option name '$WAN.200' + option ifname '$WAN' + option vid '200' + option priority '0' + +config device 'ptmvoip' + option type '8021q' + option name 'ptm0.200' + option ifname 'ptm0' + option vid '200' + option priority '0' + diff --git a/inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_5g_down/layer2_interface_adsl b/inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_5g_down/layer2_interface_adsl deleted file mode 100644 index e69de29bb..000000000 diff --git a/inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_5g_down/layer2_interface_ethernet b/inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_5g_down/layer2_interface_ethernet deleted file mode 100644 index 68088bf7e..000000000 --- a/inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_5g_down/layer2_interface_ethernet +++ /dev/null @@ -1,6 +0,0 @@ -config ethernet_interface 'Wan' - option baseifname '$WAN' - option ifname '$WAN.1' - option name 'WAN' - option bridge '1' - diff --git a/inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_5g_down/layer2_interface_vdsl b/inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_5g_down/layer2_interface_vdsl deleted file mode 100644 index e69de29bb..000000000 diff --git a/inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_5g_down/layer2_interface_vlan b/inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_5g_down/layer2_interface_vlan deleted file mode 100644 index e69de29bb..000000000 diff --git a/inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_5g_down/network b/inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_5g_down/network index 221a9b99a..ddb1e6a4f 100644 --- a/inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_5g_down/network +++ b/inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_5g_down/network @@ -13,3 +13,8 @@ config interface 'wan' option ifname '$WAN.1 $LAN1 $LAN2 $LAN3 $LAN4' option reqopts '43' +config device 'ethwan' + option type 'untagged' + option ifname '$WAN' + option name '$WAN.1' + diff --git a/inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_dual_down/layer2_interface_adsl b/inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_dual_down/layer2_interface_adsl deleted file mode 100644 index e69de29bb..000000000 diff --git a/inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_dual_down/layer2_interface_ethernet b/inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_dual_down/layer2_interface_ethernet deleted file mode 100644 index 68088bf7e..000000000 --- a/inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_dual_down/layer2_interface_ethernet +++ /dev/null @@ -1,6 +0,0 @@ -config ethernet_interface 'Wan' - option baseifname '$WAN' - option ifname '$WAN.1' - option name 'WAN' - option bridge '1' - diff --git a/inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_dual_down/layer2_interface_vdsl b/inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_dual_down/layer2_interface_vdsl deleted file mode 100644 index e69de29bb..000000000 diff --git a/inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_dual_down/layer2_interface_vlan b/inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_dual_down/layer2_interface_vlan deleted file mode 100644 index e69de29bb..000000000 diff --git a/inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_dual_down/network b/inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_dual_down/network index 221a9b99a..ddb1e6a4f 100644 --- a/inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_dual_down/network +++ b/inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_dual_down/network @@ -13,3 +13,8 @@ config interface 'wan' option ifname '$WAN.1 $LAN1 $LAN2 $LAN3 $LAN4' option reqopts '43' +config device 'ethwan' + option type 'untagged' + option ifname '$WAN' + option name '$WAN.1' + diff --git a/inteno-netmodes/files/etc/netmodes/routed_brcm/layer2_interface_adsl b/inteno-netmodes/files/etc/netmodes/routed_brcm/layer2_interface_adsl deleted file mode 100644 index a22d7bbb6..000000000 --- a/inteno-netmodes/files/etc/netmodes/routed_brcm/layer2_interface_adsl +++ /dev/null @@ -1,13 +0,0 @@ - -config atm_bridge - option link_type 'EoA' - option encapseoa 'llcsnap_eth' - option unit '0' - option ifname 'atm0.1' - option baseifname 'atm0' - option atmtype 'ubr' - option name 'atm_inet' - option vpi '8' - option vci '35' - - diff --git a/inteno-netmodes/files/etc/netmodes/routed_brcm/layer2_interface_ethernet b/inteno-netmodes/files/etc/netmodes/routed_brcm/layer2_interface_ethernet deleted file mode 100644 index 32fda333a..000000000 --- a/inteno-netmodes/files/etc/netmodes/routed_brcm/layer2_interface_ethernet +++ /dev/null @@ -1,5 +0,0 @@ -config ethernet_interface 'Wan' - option baseifname '$WAN' - option ifname '$WAN.1' - option name 'WAN' - diff --git a/inteno-netmodes/files/etc/netmodes/routed_brcm/layer2_interface_vdsl b/inteno-netmodes/files/etc/netmodes/routed_brcm/layer2_interface_vdsl deleted file mode 100644 index 6c2179eb0..000000000 --- a/inteno-netmodes/files/etc/netmodes/routed_brcm/layer2_interface_vdsl +++ /dev/null @@ -1,9 +0,0 @@ -config vdsl_interface - option unit '0' - option ifname 'ptm0.1' - option baseifname 'ptm0' - option name 'VDSL2' - option dslat '1' - option ptmprio '1' - option ipqos '1' - diff --git a/inteno-netmodes/files/etc/netmodes/routed_brcm/layer2_interface_vlan b/inteno-netmodes/files/etc/netmodes/routed_brcm/layer2_interface_vlan deleted file mode 100644 index e69de29bb..000000000 diff --git a/inteno-netmodes/files/etc/netmodes/routed_brcm/network b/inteno-netmodes/files/etc/netmodes/routed_brcm/network index fb2cd2d6e..22df817cd 100644 --- a/inteno-netmodes/files/etc/netmodes/routed_brcm/network +++ b/inteno-netmodes/files/etc/netmodes/routed_brcm/network @@ -27,3 +27,18 @@ config interface 'wan6' option proto 'dhcpv6' option ifname '@wan' +config device 'atmwan' + option type 'untagged' + option ifname 'atm0' + option name 'atm0.1' + +config device 'ptmwan' + option type 'untagged' + option ifname 'ptm0' + option name 'ptm0.1' + +config device 'ethwan' + option type 'untagged' + option ifname '$WAN' + option name '$WAN.1' +