summaryrefslogtreecommitdiff
path: root/interface-definitions
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-05-21 12:48:09 +0200
committerChristian Poessinger <christian@poessinger.com>2020-05-21 12:48:15 +0200
commit63a3110298e5f3f6d24d5ed57eff0a8abf27f6ac (patch)
treeaca9c86d462238dd532c597711fb53d1a353cdb8 /interface-definitions
parent5cde2142a25390ee8accfc392d835d2c145a7ecb (diff)
downloadvyos-1x-63a3110298e5f3f6d24d5ed57eff0a8abf27f6ac.tar.gz
vyos-1x-63a3110298e5f3f6d24d5ed57eff0a8abf27f6ac.zip
macsec: T2023: cli: move "cipher" and "encryption" under new "secutiry" node
This is best suited as a key is required, too.
Diffstat (limited to 'interface-definitions')
-rw-r--r--interface-definitions/interfaces-macsec.xml.in45
1 files changed, 26 insertions, 19 deletions
diff --git a/interface-definitions/interfaces-macsec.xml.in b/interface-definitions/interfaces-macsec.xml.in
index f16760112..53a347f11 100644
--- a/interface-definitions/interfaces-macsec.xml.in
+++ b/interface-definitions/interfaces-macsec.xml.in
@@ -17,27 +17,34 @@
</properties>
<children>
#include <include/address-ipv4-ipv6.xml.i>
- <leafNode name="cipher">
+ <node name="security">
<properties>
- <help>Cipher suite used</help>
- <completionHelp>
- <list>gcm-aes-128</list>
- </completionHelp>
- <valueHelp>
- <format>gcm-aes-128</format>
- <description>Galois/Counter Mode of AES cipher with 128-bit key (default)</description>
- </valueHelp>
- <constraint>
- <regex>(gcm-aes-128)</regex>
- </constraint>
+ <help>Security/Encryption Settings</help>
</properties>
- </leafNode>
- <leafNode name="encrypt">
- <properties>
- <help>Enable optional MACsec encryption</help>
- <valueless/>
- </properties>
- </leafNode>
+ <children>
+ <leafNode name="cipher">
+ <properties>
+ <help>Cipher suite used</help>
+ <completionHelp>
+ <list>gcm-aes-128</list>
+ </completionHelp>
+ <valueHelp>
+ <format>gcm-aes-128</format>
+ <description>Galois/Counter Mode of AES cipher with 128-bit key (default)</description>
+ </valueHelp>
+ <constraint>
+ <regex>(gcm-aes-128)</regex>
+ </constraint>
+ </properties>
+ </leafNode>
+ <leafNode name="encrypt">
+ <properties>
+ <help>Enable optional MACsec encryption</help>
+ <valueless/>
+ </properties>
+ </leafNode>
+ </children>
+ </node>
#include <include/interface-description.xml.i>
#include <include/interface-disable.xml.i>
#include <include/interface-vrf.xml.i>