From 84e3ed2547169df3f59128603a604f400d70c24c Mon Sep 17 00:00:00 2001 From: Darren Loher Date: Tue, 10 Mar 2026 14:02:48 -0700 Subject: [PATCH] Update error handling for CLI and OC value conflicts Clarified error handling for conflicting CLI and OC values, specifying that the gRPC error string should indicate the conflicting paths. --- rpc/gnmi/gnmi-union_replace.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/rpc/gnmi/gnmi-union_replace.md b/rpc/gnmi/gnmi-union_replace.md index d65b8ea..c3fde3b 100644 --- a/rpc/gnmi/gnmi-union_replace.md +++ b/rpc/gnmi/gnmi-union_replace.md @@ -396,11 +396,13 @@ an acceptable alternative if option 1 cannot be supported. ##### Option 1: Resolving issues with union of CLI and OC values with error If a configuration item is explicitly set in CLI and OC using different values, -the target MUST return an `INVALID_ARGUMENT` error. It may be necessary to set -the same values in both CLI and OC to conform to constraints, such as list keys, -which will need to be specified in both models if they are both targeting -configuration towards the same logical list entries. It is up to the client to -provide CLI and OC which are not in conflict. +the target MUST return an `INVALID_ARGUMENT` error. The gRPC error string +SHOULD indicate the OC path and CLI which are in conflict for human consumption. +Note that it may be necessary to set the same values in both CLI and OC to +conform to constraints, such as list keys, which will need to be specified in +both models if they are both targeting configuration towards the same logical +list entries. It is up to the client to provide CLI and OC which are not in +conflict. ##### Option 2: Resolving issues with merging CLI and OC by overwriting