diff options
| author | Cheeze-It <16260577+Cheeze-It@users.noreply.github.com> | 2023-04-04 07:41:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-04 07:41:59 -0700 |
| commit | 4d5bc82590533c2f1d65334636fd8427c2a1bf6b (patch) | |
| tree | 1a5479aec55199ac195bd4c6761d7e693cdbfb8a /interface-definitions/container.xml.in | |
| parent | d6ef0c54ad8c8f9f2c5f1811781dba6111201fe4 (diff) | |
| parent | 94b65bb3936b607a6bc85fe23176ff855c722519 (diff) | |
| download | vyos-1x-4d5bc82590533c2f1d65334636fd8427c2a1bf6b.tar.gz vyos-1x-4d5bc82590533c2f1d65334636fd8427c2a1bf6b.zip | |
Merge branch 'vyos:current' into current
Diffstat (limited to 'interface-definitions/container.xml.in')
| -rw-r--r-- | interface-definitions/container.xml.in | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/interface-definitions/container.xml.in b/interface-definitions/container.xml.in index 6947ed500..9b6d2369d 100644 --- a/interface-definitions/container.xml.in +++ b/interface-definitions/container.xml.in @@ -117,7 +117,7 @@ <properties> <help>Container host name</help> <constraint> - #include <include/constraint/host-name.xml.in> + #include <include/constraint/host-name.xml.i> </constraint> <constraintErrorMessage>Host-name must be alphanumeric and can contain hyphens</constraintErrorMessage> </properties> @@ -191,15 +191,20 @@ <children> <leafNode name="address"> <properties> - <!-- PODMAN currently does not support more then one IPv4 or IPv6 address assignments to a container --> <help>Assign static IP address to container</help> <valueHelp> <format>ipv4</format> <description>IPv4 address</description> </valueHelp> + <valueHelp> + <format>ipv6</format> + <description>IPv6 address</description> + </valueHelp> <constraint> <validator name="ipv4-address"/> + <validator name="ipv6-address"/> </constraint> + <multi/> </properties> </leafNode> </children> @@ -343,11 +348,7 @@ <constraintErrorMessage>Network name cannot be longer than 11 characters</constraintErrorMessage> </properties> <children> - <leafNode name="description"> - <properties> - <help>Network description</help> - </properties> - </leafNode> + #include <include/generic-description.xml.i> <leafNode name="prefix"> <properties> <help>Prefix which allocated to that network</help> @@ -366,6 +367,7 @@ <multi/> </properties> </leafNode> + #include <include/interface/vrf.xml.i> </children> </tagNode> <tagNode name="registry"> |