diff options
| author | Giga Murphy <giga1699@gmail.com> | 2023-08-20 15:46:50 +0000 |
|---|---|---|
| committer | Giga Murphy <giga1699@gmail.com> | 2023-08-20 15:46:50 +0000 |
| commit | 525beb3202bb3ccb15c28d2c41e24e68762af253 (patch) | |
| tree | 6ce4a98ac789cd6344cc99b899970986d84ecd71 /interface-definitions | |
| parent | d110af71cb1c8b62758feae724e13877a278c578 (diff) | |
| download | vyos-1x-525beb3202bb3ccb15c28d2c41e24e68762af253.tar.gz vyos-1x-525beb3202bb3ccb15c28d2c41e24e68762af253.zip | |
T5447: Implement maintainer feedback
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/include/interface/macsec-key.xml.i | 15 | ||||
| -rw-r--r-- | interface-definitions/interfaces-macsec.xml.in | 34 |
2 files changed, 20 insertions, 29 deletions
diff --git a/interface-definitions/include/interface/macsec-key.xml.i b/interface-definitions/include/interface/macsec-key.xml.i new file mode 100644 index 000000000..5a857a612 --- /dev/null +++ b/interface-definitions/include/interface/macsec-key.xml.i @@ -0,0 +1,15 @@ +<!-- include start from interface/macsec-key.xml.i --> +<leafNode name="key"> + <properties> + <help>MACsec static key</help> + <valueHelp> + <format>txt</format> + <description>16-byte (128-bit) hex-string (32 hex-digits) for gcm-aes-128 or 32-byte (256-bit) hex-string (64 hex-digits) for gcm-aes-256</description> + </valueHelp> + <constraint> + <regex>[A-Fa-f0-9]{32}</regex> + <regex>[A-Fa-f0-9]{64}</regex> + </constraint> + </properties> +</leafNode> +<!-- include end --> diff --git a/interface-definitions/interfaces-macsec.xml.in b/interface-definitions/interfaces-macsec.xml.in index b81c9b40c..766b0bede 100644 --- a/interface-definitions/interfaces-macsec.xml.in +++ b/interface-definitions/interfaces-macsec.xml.in @@ -54,46 +54,22 @@ </leafNode> <node name="static"> <properties> - <help>Assign static MACSec keys instead of using MKA</help> + <help>Use static keys for MACsec [static Secure Authentication Key (SAK) mode]</help> </properties> <children> - <leafNode name="tx-key"> - <properties> - <help>Set the static transmit key</help> - <valueHelp> - <format>txt</format> - <description>16-byte (128-bit) hex-string (32 hex-digits) for gcm-aes-128 or 32-byte (256-bit) hex-string (64 hex-digits) for gcm-aes-256</description> - </valueHelp> - <constraint> - <regex>[A-Fa-f0-9]{32}</regex> - <regex>[A-Fa-f0-9]{64}</regex> - </constraint> - </properties> - </leafNode> + #include <include/interface/macsec-key.xml.i> <tagNode name="peer"> <properties> - <help>peer alias</help> + <help>MACsec peer name</help> <constraint> <regex>[^ ]{1,100}</regex> </constraint> - <constraintErrorMessage>peer alias too long (limit 100 characters)</constraintErrorMessage> + <constraintErrorMessage>MACsec peer name exceeds limit of 100 characters</constraintErrorMessage> </properties> <children> #include <include/generic-disable-node.xml.i> #include <include/interface/mac.xml.i> - <leafNode name="rx-key"> - <properties> - <help>Set the static receive key for peer</help> - <valueHelp> - <format>txt</format> - <description>16-byte (128-bit) hex-string (32 hex-digits) for gcm-aes-128 or 32-byte (256-bit) hex-string (64 hex-digits) for gcm-aes-256</description> - </valueHelp> - <constraint> - <regex>[A-Fa-f0-9]{32}</regex> - <regex>[A-Fa-f0-9]{64}</regex> - </constraint> - </properties> - </leafNode> + #include <include/interface/macsec-key.xml.i> </children> </tagNode> </children> |