diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-12-23 13:31:32 +0100 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2024-12-23 13:31:32 +0100 |
| commit | 020f217c2e4bfcff3cecb0b33c93af517775f4ae (patch) | |
| tree | 733e151c9ce6b0881cff6d93d1f687d853af0741 /interface-definitions/include/static | |
| parent | c9febcc4c53d0bce09ce6b62d6fba12ea017d3f1 (diff) | |
| download | vyos-1x-020f217c2e4bfcff3cecb0b33c93af517775f4ae.tar.gz vyos-1x-020f217c2e4bfcff3cecb0b33c93af517775f4ae.zip | |
xml: T5738: re-use XML building blocks for interfaces as much as possible
Change XML definitions to re-use already existing building blocks, or merge
two building block sinto one (e.g. static route interfaces).
Diffstat (limited to 'interface-definitions/include/static')
3 files changed, 2 insertions, 19 deletions
diff --git a/interface-definitions/include/static/static-route-interface.xml.i b/interface-definitions/include/static/static-route-interface.xml.i deleted file mode 100644 index cb5436847..000000000 --- a/interface-definitions/include/static/static-route-interface.xml.i +++ /dev/null @@ -1,17 +0,0 @@ -<!-- include start from static/static-route-interface.xml.i --> -<leafNode name="interface"> - <properties> - <help>Gateway interface name</help> - <completionHelp> - <script>${vyos_completion_dir}/list_interfaces</script> - </completionHelp> - <valueHelp> - <format>txt</format> - <description>Gateway interface name</description> - </valueHelp> - <constraint> - #include <include/constraint/interface-name.xml.i> - </constraint> - </properties> -</leafNode> -<!-- include end --> diff --git a/interface-definitions/include/static/static-route.xml.i b/interface-definitions/include/static/static-route.xml.i index fd7366286..c261874f5 100644 --- a/interface-definitions/include/static/static-route.xml.i +++ b/interface-definitions/include/static/static-route.xml.i @@ -49,7 +49,7 @@ <children> #include <include/generic-disable-node.xml.i> #include <include/static/static-route-distance.xml.i> - #include <include/static/static-route-interface.xml.i> + #include <include/generic-interface.xml.i> #include <include/static/static-route-vrf.xml.i> <node name="bfd"> <properties> diff --git a/interface-definitions/include/static/static-route6.xml.i b/interface-definitions/include/static/static-route6.xml.i index 6fcc18b8a..a3d972d39 100644 --- a/interface-definitions/include/static/static-route6.xml.i +++ b/interface-definitions/include/static/static-route6.xml.i @@ -49,7 +49,7 @@ <children> #include <include/generic-disable-node.xml.i> #include <include/static/static-route-distance.xml.i> - #include <include/static/static-route-interface.xml.i> + #include <include/generic-interface.xml.i> #include <include/static/static-route-segments.xml.i> #include <include/static/static-route-vrf.xml.i> <node name="bfd"> |