diff options
| author | Nataliia Solomko <natalirs1985@gmail.com> | 2025-02-19 16:33:59 +0200 |
|---|---|---|
| committer | Nataliia Solomko <natalirs1985@gmail.com> | 2025-02-19 16:33:59 +0200 |
| commit | 8241857167968e9d2e9fabd1e84db578c0d022e7 (patch) | |
| tree | 8eb6d9d82034a0c1e0f97b1d583637c4106c50df /interface-definitions | |
| parent | 32c4beae5d4869974bc151a4fb11c0f62d21c38c (diff) | |
| download | vyos-1x-8241857167968e9d2e9fabd1e84db578c0d022e7.tar.gz vyos-1x-8241857167968e9d2e9fabd1e84db578c0d022e7.zip | |
T6628: IPoE-server rename "static-ip" to "ip-address" for local auth
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/include/ip-address.xml.i | 14 | ||||
| -rw-r--r-- | interface-definitions/service_dhcp-server.xml.in | 13 | ||||
| -rw-r--r-- | interface-definitions/service_ipoe-server.xml.in | 13 |
3 files changed, 16 insertions, 24 deletions
diff --git a/interface-definitions/include/ip-address.xml.i b/interface-definitions/include/ip-address.xml.i new file mode 100644 index 000000000..6027e97ee --- /dev/null +++ b/interface-definitions/include/ip-address.xml.i @@ -0,0 +1,14 @@ +<!-- include start from ip-address.xml.i --> +<leafNode name="ip-address"> + <properties> + <help>Fixed IP address of static mapping</help> + <valueHelp> + <format>ipv4</format> + <description>IPv4 address used in static mapping</description> + </valueHelp> + <constraint> + <validator name="ipv4-address"/> + </constraint> + </properties> +</leafNode> +<!-- include end --> diff --git a/interface-definitions/service_dhcp-server.xml.in b/interface-definitions/service_dhcp-server.xml.in index cb5f9a804..9a194de4f 100644 --- a/interface-definitions/service_dhcp-server.xml.in +++ b/interface-definitions/service_dhcp-server.xml.in @@ -211,18 +211,7 @@ #include <include/dhcp/option-v4.xml.i> #include <include/generic-description.xml.i> #include <include/generic-disable-node.xml.i> - <leafNode name="ip-address"> - <properties> - <help>Fixed IP address of static mapping</help> - <valueHelp> - <format>ipv4</format> - <description>IPv4 address used in static mapping</description> - </valueHelp> - <constraint> - <validator name="ipv4-address"/> - </constraint> - </properties> - </leafNode> + #include <include/ip-address.xml.i> #include <include/interface/mac.xml.i> #include <include/interface/duid.xml.i> </children> diff --git a/interface-definitions/service_ipoe-server.xml.in b/interface-definitions/service_ipoe-server.xml.in index 6cc4471af..fe9d32bbd 100644 --- a/interface-definitions/service_ipoe-server.xml.in +++ b/interface-definitions/service_ipoe-server.xml.in @@ -70,18 +70,7 @@ <constraintErrorMessage>VLAN IDs need to be in range 1-4094</constraintErrorMessage> </properties> </leafNode> - <leafNode name="static-ip"> - <properties> - <help>Static client IP address</help> - <valueHelp> - <format>ipv4</format> - <description>IPv4 address</description> - </valueHelp> - <constraint> - <validator name="ipv4-address"/> - </constraint> - </properties> - </leafNode> + #include <include/ip-address.xml.i> </children> </tagNode> </children> |