diff options
| author | Christian Poessinger <christian@poessinger.com> | 2022-04-22 22:02:43 +0200 | 
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2022-04-22 22:02:43 +0200 | 
| commit | be4aa3ae247bdc90ad151845bb2a02e5f199af5d (patch) | |
| tree | af8b84f9e590761eaf18bbd486632390ec4aa49f | |
| parent | a858e5a62000f164bc4b28125914b4d8db9da3b8 (diff) | |
| download | vyos-1x-be4aa3ae247bdc90ad151845bb2a02e5f199af5d.tar.gz vyos-1x-be4aa3ae247bdc90ad151845bb2a02e5f199af5d.zip | |
dhcpv6: T4357: rename vsio -> vendor-option
| -rw-r--r-- | data/templates/dhcp-server/dhcpdv6.conf.j2 | 4 | ||||
| -rw-r--r-- | interface-definitions/dhcpv6-server.xml.in | 10 | 
2 files changed, 7 insertions, 7 deletions
| diff --git a/data/templates/dhcp-server/dhcpdv6.conf.j2 b/data/templates/dhcp-server/dhcpdv6.conf.j2 index 6d114361e..5c3471316 100644 --- a/data/templates/dhcp-server/dhcpdv6.conf.j2 +++ b/data/templates/dhcp-server/dhcpdv6.conf.j2 @@ -118,8 +118,8 @@ shared-network {{ network }} {          }  {%                     endfor %}  {%                 endif %} -{%                 if subnet_config.vsio.cisco.tftp_server is vyos_defined %} -        option cisco.tftp-servers {{ subnet_config.vsio.cisco.tftp_server | join(', ') }}; +{%                 if subnet_config.vendor_option.cisco.tftp_server is vyos_defined %} +        option cisco.tftp-servers {{ subnet_config.vendor_option.cisco.tftp_server | join(', ') }};  {%                 endif %}      }  {%             endfor %} diff --git a/interface-definitions/dhcpv6-server.xml.in b/interface-definitions/dhcpv6-server.xml.in index 5f290595e..10335b07e 100644 --- a/interface-definitions/dhcpv6-server.xml.in +++ b/interface-definitions/dhcpv6-server.xml.in @@ -338,22 +338,22 @@                        </leafNode>                      </children>                    </tagNode> -                  <node name="vsio"> +                  <node name="vendor-option">                      <properties> -                      <help>Vendor-specific Information Option</help> +                      <help>Vendor Specific Options</help>                      </properties>                      <children>                        <node name="cisco">                          <properties> -                          <help>Parameters for cisco</help> +                          <help>Cisco specific parameters</help>                          </properties>                          <children>                            <leafNode name="tftp-server">                              <properties> -                              <help>Parameters for cisco VoIP</help> +                              <help>TFTP server name</help>                                <valueHelp>                                  <format>ipv6</format> -                                <description>TFTP IPv6 address</description> +                                <description>TFTP server IPv6 address</description>                                </valueHelp>                                <constraint>                                  <validator name="ipv6-address"/> | 
