From fa8bd60238d8d65e1deb9bea54a3fee57d3bc105 Mon Sep 17 00:00:00 2001 From: Liam Brady Date: Tue, 13 Jan 2026 09:23:44 -0500 Subject: [PATCH] README: Change YANG `connections` key to `name` Connections were previously keyed based off of `to` (i.e. the remote node/network name), which is not unique in the case of parallel p2p links (managed via `remote-name`) or dummy interfaces. The key is shifted to `name`, which is guarenteed to be unique, even when implicitely set by munet. Signed-off-by: Liam Brady --- README.org | 21 +++++++++++---------- doc/source/config.rst | 11 ++++++----- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/README.org b/README.org index 48eccf5..da77a24 100644 --- a/README.org +++ b/README.org @@ -86,11 +86,11 @@ module: labn-munet-config | | +--rw expects* string | | +--rw sends* string | | +--rw timeout? uint32 - | +--rw connections* [to] - | | +--rw to string + | +--rw connections* [name] + | | +--rw to? string | | +--rw ip? string | | +--rw ipv6? string - | | +--rw name? string + | | +--rw name string | | +--rw hostintf? string | | +--rw physical? string | | +--rw remote-name? string @@ -142,9 +142,9 @@ module: labn-munet-config | | | +--rw rate? number64 | | | +--rw limit? number64 | | | +--rw burst? number64 - | | +--rw connections* [to] + | | +--rw connections* [name] | | +--rw to string - | | +--rw name? string + | | +--rw name string | | +--rw remote-name? string | | +--rw delay? uint64 | | +--rw jitter? uint64 @@ -198,11 +198,11 @@ module: labn-munet-config | | +--rw expects* string | | +--rw sends* string | | +--rw timeout? uint32 - | +--rw connections* [to] - | | +--rw to string + | +--rw connections* [name] + | | +--rw to? string | | +--rw ip? string | | +--rw ipv6? string - | | +--rw name? string + | | +--rw name string | | +--rw hostintf? string | | +--rw physical? string | | +--rw remote-name? string @@ -819,7 +819,7 @@ munet> must "not(../hostnet) and not(../server)" { error-message "SSHRemote and hostnet nodes have no munet connections."; } - key to; + key name; description "Connections to other networks or nodes from this node"; leaf to { @@ -1142,7 +1142,7 @@ munet> uses intf-constraints; list connections { - key to; + key name; description "Overriding network side configuration for connections to nodes from this network. If the default network tc parameters are not being @@ -1151,6 +1151,7 @@ munet> leaf to { type string; + mandatory true; description "The target of this connection."; } leaf name { diff --git a/doc/source/config.rst b/doc/source/config.rst index 5a52482..2f5e5e8 100644 --- a/doc/source/config.rst +++ b/doc/source/config.rst @@ -115,9 +115,9 @@ Tree diagram for network config:: | +--rw rate? number64 | +--rw limit? number64 | +--rw burst? number64 - +--rw connections* [to] + +--rw connections* [name] +--rw to string - +--rw name? string + +--rw name string +--rw remote-name? string +--rw delay? uint64 +--rw jitter? uint64 @@ -208,10 +208,11 @@ Tree diagram for node connections:: +--rw topology | +--rw nodes* [name] - | +--rw connections* [to] - | | +--rw to string + | +--rw connections* [name] + | | +--rw to? string | | +--rw ip? string - | | +--rw name? string + | | +--rw ipv6? string + | | +--rw name string | | +--rw hostintf? string | | +--rw physical? string | | +--rw remote-name? string