From 865e4632a2f1dd52f443c072fda5c629dc38ac72 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Fri, 27 Nov 2020 19:10:54 +0100 Subject: include: ipv6: combine autoconf and eui64 into a single file --- docs/_include/interface-common.txt | 6 +----- docs/_include/interface-ipv6-addr-autoconf.txt | 19 ---------------- docs/_include/interface-ipv6-addr-eui64.txt | 9 -------- docs/_include/interface-ipv6-address.txt | 30 ++++++++++++++++++++++++++ docs/_include/interface-vlan-8021ad.txt | 12 +---------- docs/_include/interface-vlan-8021q.txt | 9 +------- 6 files changed, 33 insertions(+), 52 deletions(-) delete mode 100644 docs/_include/interface-ipv6-addr-autoconf.txt delete mode 100644 docs/_include/interface-ipv6-addr-eui64.txt create mode 100644 docs/_include/interface-ipv6-address.txt (limited to 'docs') diff --git a/docs/_include/interface-common.txt b/docs/_include/interface-common.txt index de29356f..f9bc640a 100644 --- a/docs/_include/interface-common.txt +++ b/docs/_include/interface-common.txt @@ -22,11 +22,7 @@ :var0: {{ var0 }} :var1: {{ var1 }} -.. cmdinclude:: ../_include/interface-ipv6-addr-autoconf.txt - :var0: {{ var0 }} - :var1: {{ var1 }} - -.. cmdinclude:: ../_include/interface-ipv6-addr-eui64.txt +.. cmdinclude:: ../_include/interface-ipv6-address.txt :var0: {{ var0 }} :var1: {{ var1 }} diff --git a/docs/_include/interface-ipv6-addr-autoconf.txt b/docs/_include/interface-ipv6-addr-autoconf.txt deleted file mode 100644 index fea1125e..00000000 --- a/docs/_include/interface-ipv6-addr-autoconf.txt +++ /dev/null @@ -1,19 +0,0 @@ -.. cfgcmd:: set interfaces {{ var0 }} {{ var2 }} {{ var3 }} - {{ var5 }} {{ var6 }} ipv6 address autoconf - - :abbr:`SLAAC (Stateless Address Autoconfiguration)` :rfc:`4862`. IPv6 hosts - can configure themselves automatically when connected to an IPv6 network using - the Neighbor Discovery Protocol via :abbr:`ICMPv6 (Internet Control Message - Protocol version 6)` router discovery messages. When first connected to a - network, a host sends a link-local router solicitation multicast request for - its configuration parameters; routers respond to such a request with a router - advertisement packet that contains Internet Layer configuration parameters. - - .. note:: This method automatically disables IPv6 traffic forwarding on the - interface in question. - - Example: - - .. code-block:: none - - set interfaces {{ var0 }} {{ var1 }} {{ var2 }} {{ var4 }} {{ var5 }} {{ var7 }} ipv6 address autoconf diff --git a/docs/_include/interface-ipv6-addr-eui64.txt b/docs/_include/interface-ipv6-addr-eui64.txt deleted file mode 100644 index e6a58372..00000000 --- a/docs/_include/interface-ipv6-addr-eui64.txt +++ /dev/null @@ -1,9 +0,0 @@ -.. cfgcmd:: set interfaces {{ var0 }} {{ var2 }} {{ var3 }} - {{ var5 }} {{ var6 }} ipv6 address eui64 - - :abbr:`EUI-64 (64-Bit Extended Unique Identifier)` as specified in - :rfc:`4291` allows a host to assign iteslf a unique 64-Bit IPv6 address. - - .. code-block:: none - - set interfaces {{ var0 }} {{ var1 }} {{ var2 }} {{ var4 }} {{ var5 }} {{ var7 }} ipv6 address eui64 2001:db8:beef::/64 diff --git a/docs/_include/interface-ipv6-address.txt b/docs/_include/interface-ipv6-address.txt new file mode 100644 index 00000000..bde3f50d --- /dev/null +++ b/docs/_include/interface-ipv6-address.txt @@ -0,0 +1,30 @@ +.. cfgcmd:: set interfaces {{ var0 }} {{ var2 }} {{ var3 }} + {{ var5 }} {{ var6 }} ipv6 address autoconf + + :abbr:`SLAAC (Stateless Address Autoconfiguration)` :rfc:`4862`. IPv6 hosts + can configure themselves automatically when connected to an IPv6 network using + the Neighbor Discovery Protocol via :abbr:`ICMPv6 (Internet Control Message + Protocol version 6)` router discovery messages. When first connected to a + network, a host sends a link-local router solicitation multicast request for + its configuration parameters; routers respond to such a request with a router + advertisement packet that contains Internet Layer configuration parameters. + + .. note:: This method automatically disables IPv6 traffic forwarding on the + interface in question. + + Example: + + .. code-block:: none + + set interfaces {{ var0 }} {{ var1 }} {{ var2 }} {{ var4 }} {{ var5 }} {{ var7 }} ipv6 address autoconf + + +.. cfgcmd:: set interfaces {{ var0 }} {{ var2 }} {{ var3 }} + {{ var5 }} {{ var6 }} ipv6 address eui64 + + :abbr:`EUI-64 (64-Bit Extended Unique Identifier)` as specified in + :rfc:`4291` allows a host to assign iteslf a unique 64-Bit IPv6 address. + + .. code-block:: none + + set interfaces {{ var0 }} {{ var1 }} {{ var2 }} {{ var4 }} {{ var5 }} {{ var7 }} ipv6 address eui64 2001:db8:beef::/64 diff --git a/docs/_include/interface-vlan-8021ad.txt b/docs/_include/interface-vlan-8021ad.txt index a1e971be..6ccfbe82 100644 --- a/docs/_include/interface-vlan-8021ad.txt +++ b/docs/_include/interface-vlan-8021ad.txt @@ -88,17 +88,7 @@ tag is the one closer/closest to the Ethernet header, its name is S-TAG :var6: :var7: 20 -.. cmdinclude:: ../_include/interface-ipv6-addr-autoconf.txt - :var0: {{ var0 }} - :var1: {{ var1 }} - :var2: vif-s - :var3: - :var4: 1000 - :var5: vif-c - :var6: - :var7: 20 - -.. cmdinclude:: ../_include/interface-ipv6-addr-eui64.txt +.. cmdinclude:: ../_include/interface-ipv6-address.txt :var0: {{ var0 }} :var1: {{ var1 }} :var2: vif-s diff --git a/docs/_include/interface-vlan-8021q.txt b/docs/_include/interface-vlan-8021q.txt index 2c7e58f7..69e8227f 100644 --- a/docs/_include/interface-vlan-8021q.txt +++ b/docs/_include/interface-vlan-8021q.txt @@ -71,14 +71,7 @@ term used for this is ``vif``. :var3: :var4: 10 -.. cmdinclude:: ../_include/interface-ipv6-addr-autoconf.txt - :var0: {{ var0 }} - :var1: {{ var1 }} - :var2: vif - :var3: - :var4: 10 - -.. cmdinclude:: ../_include/interface-ipv6-addr-eui64.txt +.. cmdinclude:: ../_include/interface-ipv6-address.txt :var0: {{ var0 }} :var1: {{ var1 }} :var2: vif -- cgit v1.2.3