From 0a21905786d31e759416dd335d87726f9ed46ffa Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 20 Sep 2020 13:40:51 +0200 Subject: vif-s: ifconfig: T2903: use explicit VLAN protocol over raw numbers In the past we had to provide the ethertype value used for the VLAN protocol (0x88A8 -> 802.1ad or 0x8100 -> 802.1q). This should be changed to a more user friendly CLI node (protocol over ethertype) and 802.1ad over it's raw value 0x88A8. There is no need in presenting RAW information from the ethernet header to the user. Also iproute2 calls it protocol which makes way more sense over the "raw" value. --- interface-definitions/include/vif-s.xml.i | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'interface-definitions/include') diff --git a/interface-definitions/include/vif-s.xml.i b/interface-definitions/include/vif-s.xml.i index a6d7c81ce..cd0afe742 100644 --- a/interface-definitions/include/vif-s.xml.i +++ b/interface-definitions/include/vif-s.xml.i @@ -13,25 +13,26 @@ #include #include #include - + - Set Ethertype + Protocol used for service VLAN (default: 802.1ad) - 0x88A8 0x8100 + 802.1ad 802.1q - 0x88A8 - 802.1ad + 802.1ad + Provider Bridging (IEEE 802.1ad, Q-inQ), ethertype 0x88a8 - 0x8100 - 802.1q + 802.1q + VLAN-tagged frame (IEEE 802.1q), ethertype 0x8100 - (0x88A8|0x8100) + (802.1q|802.1ad) - Ethertype must be 0x88A8 or 0x8100 + Ethertype must be 802.1ad or 802.1q + 802.1ad -- cgit v1.2.3 From 993f6873c02f3f79013acedfe61ce705bdb3a4d0 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 20 Sep 2020 13:53:55 +0200 Subject: wwan: ifconfig: T2905: sync CLI nodes in dialup interfaces Both PPPoE and WWAN interfaces are dialer interfaces handled by ppp, but use different CLI nodes for the same functionality. PPPoE has "connect-on-demand" to initiate an "on-demand" dialing and WWAN uses "ondemand" for this purpose. Rename WWAN "ondemand" node to "connect-on-demand". --- data/templates/wwan/peer.tmpl | 2 +- .../include/interface-dial-on-demand.xml.i | 6 ++++++ interface-definitions/interfaces-pppoe.xml.in | 7 +------ interface-definitions/interfaces-wirelessmodem.xml.in | 7 +------ smoketest/scripts/cli/test_interfaces_wirelessmodem.py | 2 +- src/migration-scripts/interfaces/12-to-13 | 14 ++++++++++++++ 6 files changed, 24 insertions(+), 14 deletions(-) create mode 100644 interface-definitions/include/interface-dial-on-demand.xml.i (limited to 'interface-definitions/include') diff --git a/data/templates/wwan/peer.tmpl b/data/templates/wwan/peer.tmpl index aa759f741..e23881bf8 100644 --- a/data/templates/wwan/peer.tmpl +++ b/data/templates/wwan/peer.tmpl @@ -21,7 +21,7 @@ noauth crtscts lock persist -{{ "demand" if ondemand is defined }} +{{ "demand" if connect_on_demand is defined }} connect '/usr/sbin/chat -v -t6 -f /etc/ppp/peers/chat.{{ ifname }}' diff --git a/interface-definitions/include/interface-dial-on-demand.xml.i b/interface-definitions/include/interface-dial-on-demand.xml.i new file mode 100644 index 000000000..c14ddf6f5 --- /dev/null +++ b/interface-definitions/include/interface-dial-on-demand.xml.i @@ -0,0 +1,6 @@ + + + Establishment connection automatically when traffic is sent + + + diff --git a/interface-definitions/interfaces-pppoe.xml.in b/interface-definitions/interfaces-pppoe.xml.in index 8a6c61312..b6208e0b9 100644 --- a/interface-definitions/interfaces-pppoe.xml.in +++ b/interface-definitions/interfaces-pppoe.xml.in @@ -42,12 +42,7 @@ - - - Automatic establishment of PPPOE connection when traffic is sent - - - + #include Default route insertion behaviour (default: auto) diff --git a/interface-definitions/interfaces-wirelessmodem.xml.in b/interface-definitions/interfaces-wirelessmodem.xml.in index d375b808d..96604ff00 100644 --- a/interface-definitions/interfaces-wirelessmodem.xml.in +++ b/interface-definitions/interfaces-wirelessmodem.xml.in @@ -80,12 +80,7 @@ - - - Only dial when traffic is available - - - + #include diff --git a/smoketest/scripts/cli/test_interfaces_wirelessmodem.py b/smoketest/scripts/cli/test_interfaces_wirelessmodem.py index 40cd03b93..efc9c0e98 100755 --- a/smoketest/scripts/cli/test_interfaces_wirelessmodem.py +++ b/smoketest/scripts/cli/test_interfaces_wirelessmodem.py @@ -43,7 +43,7 @@ class WWANInterfaceTest(unittest.TestCase): def test_wlm_1(self): for interface in self._interfaces: self.session.set(base_path + [interface, 'no-peer-dns']) - self.session.set(base_path + [interface, 'ondemand']) + self.session.set(base_path + [interface, 'connect-on-demand']) # check validate() - APN must be configure with self.assertRaises(ConfigSessionError): diff --git a/src/migration-scripts/interfaces/12-to-13 b/src/migration-scripts/interfaces/12-to-13 index 17d1d0b0a..f866ca9a6 100755 --- a/src/migration-scripts/interfaces/12-to-13 +++ b/src/migration-scripts/interfaces/12-to-13 @@ -17,6 +17,8 @@ # - T2903: Change vif-s ethertype from numeric number to literal # - 0x88a8 -> 802.1ad # - 0x8100 -> 802.1q +# - T2905: Change WWAN "ondemand" node to "connect-on-demand" to have identical +# CLI nodes for both types of dialer interfaces from sys import exit, argv from vyos.configtree import ConfigTree @@ -32,6 +34,9 @@ if __name__ == '__main__': config = ConfigTree(config_file) + # + # T2903 + # for type in config.list_nodes(['interfaces']): for interface in config.list_nodes(['interfaces', type]): if not config.exists(['interfaces', type, interface, 'vif-s']): @@ -48,6 +53,15 @@ if __name__ == '__main__': config.set(base_path + ['protocol'], value=protocol) config.delete(base_path + ['ethertype']) + # + # T2905 + # + wwan_base = ['interfaces', 'wirelessmodem'] + if config.exists(wwan_base): + for interface in config.list_nodes(wwan_base): + if config.exists(wwan_base + [interface, 'ondemand']): + config.rename(wwan_base + [interface, 'ondemand'], 'connect-on-demand') + try: with open(file_name, 'w') as f: f.write(config.to_string()) -- cgit v1.2.3 From bef17a3da6bcd40c0fcee64e68a7fe300a11b2e1 Mon Sep 17 00:00:00 2001 From: sever-sever Date: Tue, 22 Sep 2020 16:55:55 +0000 Subject: conf-mode: T2915: Adding lost option proxy-arp-pvlan for vlan --- interface-definitions/include/vif.xml.i | 1 + 1 file changed, 1 insertion(+) (limited to 'interface-definitions/include') diff --git a/interface-definitions/include/vif.xml.i b/interface-definitions/include/vif.xml.i index 5a4e52122..919e4d493 100644 --- a/interface-definitions/include/vif.xml.i +++ b/interface-definitions/include/vif.xml.i @@ -50,6 +50,7 @@ #include #include #include + #include -- cgit v1.2.3 From f325d869515e008b09a8f2de7a4bda81dffd1158 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sat, 26 Sep 2020 12:49:04 +0200 Subject: xml: interface-definitions: fix wrong file extension of inlcude files Files which are included by others whouls have the ".xml.i" extension. --- .../include/accel-client-ipv6-pool.xml.i | 59 ++++++++++ .../include/accel-client-ipv6-pool.xml.in | 59 ---------- .../include/accel-name-server.xml.i | 18 +++ .../include/accel-name-server.xml.in | 18 --- .../include/accel-radius-additions.xml.i | 125 +++++++++++++++++++++ .../include/accel-radius-additions.xml.in | 125 --------------------- interface-definitions/service_ipoe-server.xml.in | 6 +- interface-definitions/service_pppoe-server.xml.in | 6 +- interface-definitions/vpn_l2tp.xml.in | 4 +- interface-definitions/vpn_pptp.xml.in | 2 +- interface-definitions/vpn_sstp.xml.in | 6 +- 11 files changed, 214 insertions(+), 214 deletions(-) create mode 100644 interface-definitions/include/accel-client-ipv6-pool.xml.i delete mode 100644 interface-definitions/include/accel-client-ipv6-pool.xml.in create mode 100644 interface-definitions/include/accel-name-server.xml.i delete mode 100644 interface-definitions/include/accel-name-server.xml.in create mode 100644 interface-definitions/include/accel-radius-additions.xml.i delete mode 100644 interface-definitions/include/accel-radius-additions.xml.in (limited to 'interface-definitions/include') diff --git a/interface-definitions/include/accel-client-ipv6-pool.xml.i b/interface-definitions/include/accel-client-ipv6-pool.xml.i new file mode 100644 index 000000000..455ada6ef --- /dev/null +++ b/interface-definitions/include/accel-client-ipv6-pool.xml.i @@ -0,0 +1,59 @@ + + + Pool of client IPv6 addresses + + + + + Pool of addresses used to assign to clients + + ipv6net + IPv6 address and prefix length + + + + + + + + + Prefix length used for individual client + + <48-128> + Client prefix length (default: 64) + + + + + + + + + + + Subnet used to delegate prefix through DHCPv6-PD (RFC3633) + + ipv6net + IPv6 address and prefix length + + + + + + + + + Prefix length delegated to client + + <32-64> + Delegated prefix length + + + + + + + + + + diff --git a/interface-definitions/include/accel-client-ipv6-pool.xml.in b/interface-definitions/include/accel-client-ipv6-pool.xml.in deleted file mode 100644 index 455ada6ef..000000000 --- a/interface-definitions/include/accel-client-ipv6-pool.xml.in +++ /dev/null @@ -1,59 +0,0 @@ - - - Pool of client IPv6 addresses - - - - - Pool of addresses used to assign to clients - - ipv6net - IPv6 address and prefix length - - - - - - - - - Prefix length used for individual client - - <48-128> - Client prefix length (default: 64) - - - - - - - - - - - Subnet used to delegate prefix through DHCPv6-PD (RFC3633) - - ipv6net - IPv6 address and prefix length - - - - - - - - - Prefix length delegated to client - - <32-64> - Delegated prefix length - - - - - - - - - - diff --git a/interface-definitions/include/accel-name-server.xml.i b/interface-definitions/include/accel-name-server.xml.i new file mode 100644 index 000000000..82ed6771d --- /dev/null +++ b/interface-definitions/include/accel-name-server.xml.i @@ -0,0 +1,18 @@ + + + Domain Name Server (DNS) propagated to client + + ipv4 + Domain Name Server (DNS) IPv4 address + + + ipv6 + Domain Name Server (DNS) IPv6 address + + + + + + + + diff --git a/interface-definitions/include/accel-name-server.xml.in b/interface-definitions/include/accel-name-server.xml.in deleted file mode 100644 index 82ed6771d..000000000 --- a/interface-definitions/include/accel-name-server.xml.in +++ /dev/null @@ -1,18 +0,0 @@ - - - Domain Name Server (DNS) propagated to client - - ipv4 - Domain Name Server (DNS) IPv4 address - - - ipv6 - Domain Name Server (DNS) IPv6 address - - - - - - - - diff --git a/interface-definitions/include/accel-radius-additions.xml.i b/interface-definitions/include/accel-radius-additions.xml.i new file mode 100644 index 000000000..e37b68514 --- /dev/null +++ b/interface-definitions/include/accel-radius-additions.xml.i @@ -0,0 +1,125 @@ + + + + + + + Accounting port + + 1-65535 + Numeric IP port (default: 1813) + + + + + + + + + Mark server unavailable for <n> seconds on failure + + 0-600 + Fail time penalty + + + + + Fail time must be between 0 and 600 seconds + + + + + + + Timeout in seconds to wait response from RADIUS server + + 1-60 + Timeout in seconds + + + + + Timeout must be between 1 and 60 seconds + + + + + Timeout for Interim-Update packets, terminate session afterwards (default 3 seconds) + + 0-60 + Timeout in seconds, 0 to keep active + + + + + Timeout must be between 0 and 60 seconds + + + + + Number of tries to send Access-Request/Accounting-Request queries + + 1-20 + Maximum tries + + + + + Maximum tries must be between 1 and 20 + + + + + NAS-Identifier attribute sent to RADIUS + + + + + NAS-IP-Address attribute sent to RADIUS + + + + + ipv4 + NAS-IP-Address attribute + + + + + + Dynamic Authorization Extension/Change of Authorization server + + + + + IP address for Dynamic Authorization Extension server (DM/CoA) + + + + + ipv4 + IPv4 address for aynamic authorization server + + + + + + Port for Dynamic Authorization Extension server (DM/CoA) + + number + TCP port + + + + + + + + + Shared secret for Dynamic Authorization Extension server + + + + + + diff --git a/interface-definitions/include/accel-radius-additions.xml.in b/interface-definitions/include/accel-radius-additions.xml.in deleted file mode 100644 index e37b68514..000000000 --- a/interface-definitions/include/accel-radius-additions.xml.in +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - - Accounting port - - 1-65535 - Numeric IP port (default: 1813) - - - - - - - - - Mark server unavailable for <n> seconds on failure - - 0-600 - Fail time penalty - - - - - Fail time must be between 0 and 600 seconds - - - - - - - Timeout in seconds to wait response from RADIUS server - - 1-60 - Timeout in seconds - - - - - Timeout must be between 1 and 60 seconds - - - - - Timeout for Interim-Update packets, terminate session afterwards (default 3 seconds) - - 0-60 - Timeout in seconds, 0 to keep active - - - - - Timeout must be between 0 and 60 seconds - - - - - Number of tries to send Access-Request/Accounting-Request queries - - 1-20 - Maximum tries - - - - - Maximum tries must be between 1 and 20 - - - - - NAS-Identifier attribute sent to RADIUS - - - - - NAS-IP-Address attribute sent to RADIUS - - - - - ipv4 - NAS-IP-Address attribute - - - - - - Dynamic Authorization Extension/Change of Authorization server - - - - - IP address for Dynamic Authorization Extension server (DM/CoA) - - - - - ipv4 - IPv4 address for aynamic authorization server - - - - - - Port for Dynamic Authorization Extension server (DM/CoA) - - number - TCP port - - - - - - - - - Shared secret for Dynamic Authorization Extension server - - - - - - diff --git a/interface-definitions/service_ipoe-server.xml.in b/interface-definitions/service_ipoe-server.xml.in index 9ee5d5156..ee09d01d6 100644 --- a/interface-definitions/service_ipoe-server.xml.in +++ b/interface-definitions/service_ipoe-server.xml.in @@ -111,8 +111,8 @@ - #include - #include + #include + #include Client authentication methods @@ -198,7 +198,7 @@ #include - #include + #include diff --git a/interface-definitions/service_pppoe-server.xml.in b/interface-definitions/service_pppoe-server.xml.in index 605f47b37..64fd6e4ef 100644 --- a/interface-definitions/service_pppoe-server.xml.in +++ b/interface-definitions/service_pppoe-server.xml.in @@ -109,7 +109,7 @@ #include #include - #include + #include @@ -200,8 +200,8 @@ - #include - #include + #include + #include interface(s) to listen on diff --git a/interface-definitions/vpn_l2tp.xml.in b/interface-definitions/vpn_l2tp.xml.in index 702ef8b5a..4de28d2bd 100644 --- a/interface-definitions/vpn_l2tp.xml.in +++ b/interface-definitions/vpn_l2tp.xml.in @@ -36,7 +36,7 @@ - #include + #include L2TP Network Server (LNS) @@ -203,7 +203,7 @@ - #include + #include Description for L2TP remote-access settings diff --git a/interface-definitions/vpn_pptp.xml.in b/interface-definitions/vpn_pptp.xml.in index 032455b4d..f37c9bd01 100644 --- a/interface-definitions/vpn_pptp.xml.in +++ b/interface-definitions/vpn_pptp.xml.in @@ -153,7 +153,7 @@ #include - #include + #include diff --git a/interface-definitions/vpn_sstp.xml.in b/interface-definitions/vpn_sstp.xml.in index f0c93b882..5da2f8f24 100644 --- a/interface-definitions/vpn_sstp.xml.in +++ b/interface-definitions/vpn_sstp.xml.in @@ -96,7 +96,7 @@ #include - #include + #include @@ -207,8 +207,8 @@ - #include - #include + #include + #include #include -- cgit v1.2.3