-
Notifications
You must be signed in to change notification settings - Fork 1
/
draft-ietf-netconf-privcand-05.xml
1191 lines (1167 loc) · 60.8 KB
/
draft-ietf-netconf-privcand-05.xml
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
<?xml version='1.0' encoding='utf-8'?>
<!--
draft-rfcxml-general-template-standard-01
This template includes examples of the most commonly used features of RFCXML with comments
explaining how to customise them. This template can be quickly turned into an I-D by editing
the examples provided. Look for [REPLACE], [REPLACE/DELETE], [CHECK] and edit accordingly.
Note - 'DELETE' means delete the element or attribute, not just the contents.
Documentation is at https://authors.ietf.org/en/templates-and-schemas
-->
<?xml-model href="rfc7991bis.rnc"?>
<!-- Required for schema validation and schema-aware editing -->
<!-- <?xml-stylesheet type="text/xsl" href="rfc2629.xslt" ?> -->
<!-- This third-party XSLT can be enabled for direct transformations in XML processors, including most browsers -->
<!DOCTYPE rfc [
<!ENTITY nbsp " ">
<!ENTITY zwsp "​">
<!ENTITY nbhy "‑">
<!ENTITY wj "⁠">
]>
<!-- If further character entities are required then they should be added to the DOCTYPE above.
Use of an external entity file is not recommended. -->
<rfc xmlns:xi="http://www.w3.org/2001/XInclude"
category="std"
docName="draft-ietf-netconf-privcand-05"
ipr="trust200902"
obsoletes=""
updates="6241,8342,8526,9144"
submissionType="IETF"
xml:lang="en"
version="3"
consensus="true">
<front>
<title abbrev="NETCONF Private Candidates">NETCONF Private Candidates</title>
<seriesInfo name="Internet-Draft" value="draft-ietf-netconf-privcand-05"/>
<author fullname="James Cumming" initials="JG" surname="Cumming">
<organization>Nokia</organization>
<address>
<email>[email protected]</email>
</address>
</author>
<author fullname="Robert Wills" initials="R" surname="Wills">
<organization>Cisco Systems</organization>
<address>
<email>[email protected]</email>
</address>
</author>
<date year="2024"/>
<!-- On draft subbmission:
* If only the current year is specified, the current day and month will be used.
* If the month and year are both specified and are the current ones, the current day will
be used
* If the year is not the current one, it is necessary to specify at least a month and day="1" will be used.
-->
<area>General</area>
<workgroup>Internet Engineering Task Force</workgroup>
<!-- "Internet Engineering Task Force" is fine for individual submissions. If this element is
not present, the default is "Network Working Group", which is used by the RFC Editor as
a nod to the history of the RFC Series. -->
<keyword>NETCONF</keyword>
<abstract>
<t>This document provides a mechanism to extend the Network Configuration Protocol
(NETCONF) and RESTCONF protocol to support multiple clients making configuration changes simultaneously and
ensuring that they commit only those changes that they defined.</t>
<t>This document addresses two specific aspects: The interaction with a private candidate
over the NETCONF and RESTCONF protocols and the methods to identify and resolve conflicts between
clients.</t>
</abstract>
</front>
<middle>
<section>
<name>Introduction</name>
<t><xref target="RFC6241">NETCONF</xref> and <xref target="RFC8040">RESTCONF</xref>
both provide a mechanism for one or more
clients to make configuration changes to a device running as a NETCONF/RESTCONF
server. Each client has the ability to make one or more
configuration changes to the server's shared candidate configuration.<br/><br/>
As the name shared candidate suggests, all clients have access to the same candidate
configuration. This means that multiple clients may make changes to the shared
candidate prior to the configuration being committed. This behaviour may be
undesirable as one client may unwittingly commit the configuration changes made
by another client. <br/><br/>
NETCONF provides a way to mitigate this behaviour by allowing clients
to place a lock on the shared candidate. The placing of this lock means that
no other client may make any changes until that lock is released. This behaviour
is, in many situations, also undesirable. <br/><br/>
Many network devices support candidate configurations within the CLI interface,
where a user (machine or otherwise) is able to edit a self-contained copy of a device's
configuration without blocking other users from doing so.<br/><br/>
This document specifies the extensions to the NETCONF protocol in order to support
the use of private candidates. It also describes how the RESTCONF protocol can be
used on a system that implements private candidates.</t>
<section>
<name>Requirements Language</name>
<t>The key words "MUST", "MUST NOT", "REQUIRED", "SHALL",
"SHALL NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED", "NOT
RECOMMENDED", "MAY", and "OPTIONAL" in this document are to be
interpreted as described in BCP 14 <xref target="RFC2119"/>
<xref target="RFC8174"/> when, and only when, they appear in
all capitals, as shown here.</t>
</section>
<section>
<name>Updates to RFC 6241 and RFC 8526</name>
<t>This document updates <xref target="RFC6241"/> to describe how
the <edit-config>, <copy-config>, <get>,
<get-config>, <commit>, <cancel-commit>,
<delete-config>, <discard-changes>, <lock>
and <unlock> operations work with a private
candidate datastore. These updates are described in
<xref target="section_updated_netconf_operations"/>. This
document also adds a new <update> operation, described in
<xref target="section_new_netconf_operations"/>.</t>
<t>This document also updates <xref target="RFC8526"/> to describe
how the <edit-data> and <get-data> operations work
with a private candidate datastore. These updates are described in
<xref target="section_updated_netconf_operations"/>.</t>
</section>
<section>
<name>Updates to RFC 9144</name>
<t>This document updates <xref target="RFC9144"/> to augment the
<compare> operation to describe how it works with the
private candidate datastore. These updates are described in
<xref target="section_updates_to_compare"/>.</t>
</section>
</section>
<section>
<name>Definitions and terminology</name>
<section>
<name>Session specific datastore</name>
<t>A session specific datastore is a configuration datastore that,
unlike the candidate and running configuration datastores which
have only one per system, is bound to the specific NETCONF session.
</t>
</section>
<section>
<name>Shared candidate configuration</name>
<t>The candidate configuration datastore defined in
<xref target="RFC6241"/> is referenced as the shared candidate
configuration in this document.</t>
</section>
<section>
<name>Private candidate configuration</name>
<t>A private candidate configuration is a session specific candidate
configuration datastore.</t>
<t>When a private candidate is used by NETCONF, the specific session
(and user) that created the private
candidate configuration is the only session (user) that has access
to it over NETCONF. Devices may expose this to other users through
other interfaces but this is out of scope for this document.</t>
<t>When a private candidate is used by RESTCONF, the client that created
the private candidate configuration is the only client that has access
to it over RESTCONF.</t>
<t>The private candidate configuration contains a full copy of the running
configuration when it is created (in the same way as a branch does in
a source control management system and in the same way as the candidate
configuration datastore as defined in <xref target="RFC6241"/>).
Any changes made to it, for example, through the use of operations such
as <edit-config> and <edit-data>, are made in this private
candidate configuration.</t>
<t>Obtaining this private candidate over NETCONF or RESTCONF will display the entire
configuration, including all changes made to it. Performing a <commit>
operation will merge the changes from the private candidate into the running
configuration (the same as a merge in source code management systems). This
merge is performed in two steps and is described further in
<xref target="section_updates_to_commit"/>.
A <discard-changes> operation will revert the private candidate to
the branch's initial state or it's state at the last <update>
(whichever is most recent).</t>
<t>All changes made to this private candidate configuration are held
separately from any other candidate configuration changes, whether
made by other users to the shared candidate or any other private candidate,
and are not visible to or accessible by anyone else.</t>
</section>
</section>
<section>
<name>Limitations using the shared candidate configuration for multiple clients</name>
<t>The following sections describe some limitations and mitigation factors in
more detail for the use of the shared candidate configuration during multi-client
configuration over NETCONF or RESTCONF.</t>
<section>
<name>Issues</name>
<section>
<name>Unintended deployment of alternate users configuration changes</name>
<t>Consider the following scenario:</t>
<ol>
<li>Client 1 modifies item A in the shared candidate configuration</li>
<li>Client 2 then modifies item B in the shared candidate configuration</li>
<li>Client 2 then issues a <commit> RPC</li>
</ol>
<t>In this situation, both client 1 and client 2 configurations will be committed by
client 2. In a machine-to-machine environment client 2 may not have been aware of
the change to item A and, if they had been aware, may have decided not to proceed.
</t>
</section>
</section>
<section>
<name>Current mitigation strategies</name>
<section>
<name>Locking the shared candidate configuration datastore</name>
<t>
In order to resolve unintended deployment of alternate users configuration changes
as described above NETCONF provides the ability to lock a datastore in order to
restrict other users from editing and committed changes.
</t>
<t>This does resolve the specific issue above, however, it introduces another issue.
Whilst one of the clients holds a lock, no other client may edit the configuration.
This will result in the client failing and having to retry. Whilst this may be a
desirable consequence when two clients are editing the same section of the configuration,
where they are editing different sections this behaviour may hold up valid operational
activity.</t>
<t>Additionally, a lock placed on the shared candidate configuration must also lock the
running configuration, otherwise changes committed directly into the running datastore
may conflict.</t>
<t>Finally, this locking mechanism isn't available to RESTCONF clients.</t>
</section>
<section>
<name>Always use the running configuration datastore</name>
<t>The use of the running configuration datastore as the target for all configuration
changes does not resolve any issues regarding blocking of system access in the case a
lock is taken, nor does it provide a solution for multiple NETCONF and RESTCONF clients as each
configuration change is applied immediately and the client has no knowledge of the
current configuration at the point in time that they commenced the editing activity nor
at the point they commit the activity.</t>
</section>
<section>
<name>Fine-grained locking</name>
<t><xref target="RFC5717"/> describes a partial lock mechanism that
can be used on specific portions of the shared candidate datastore.</t>
<t>Partial locking does not solve the issues of staging a set of
configuration changes such that only those changes get committed in a
commit operation, nor does it solve the issue of multiple clients
editing the same parts of the configuration at the same time.</t>
<t>Partial locking additionally requires that the client is aware of
any interdependencies within the servers YANG models in order to lock all
parts of the tree.</t>
</section>
</section>
</section>
<section>
<name>Private candidates solution</name>
<t>The use of private candidates resolves the issues
detailed earlier in this document.</t>
<t>NETCONF sessions and RESTCONF clients are able to utilize private candidates
to streamline network operations, particularly for
machine-to-machine communication.</t>
<t>Using this approach, clients may improve their performance and reduce the
likelihood of blocking other clients from continuing with valid operational
activities.</t>
<t>One or more private candidates may exist at any one time, however, a
private candidate SHOULD:</t>
<ul>
<li>Be accessible by one client only</li>
<li>Be visible by one client only</li>
</ul>
<t>Additionally, the choice of using a shared candidate configuration
datastore or a private candidate configuration datastore MUST be for
the entire duration of the NETCONF session.</t>
<section>
<name>What is a private candidate</name>
<t>A private candidate is defined earlier in the definitions and terminology
section of this document.</t>
</section>
<section anchor="section_when_created">
<name>When is a private candidate created</name>
<t>A private candidate datastore is created when the first RPC that requires access
to it is sent to the server. This could be, for example, an <edit-config>.</t>
<t>When the private candidate is created a copy of the running configuration is
made and stored in it. This can be considered the same as creating a branch in a
source code repository.</t>
<artwork>
+----------------------------> private candidate
/
/
+------+-------------------------------> running configuration
^
Private candidate created
</artwork>
</section>
<section>
<name>When is a private candidate destroyed</name>
<t>A private candidate is valid for the duration of the NETCONF session,
or the duration of the RESTCONF request. Issuing
a <commit> operation will not close the private candidate but will issue an
implicit <update> operation resyncing changes from the running configuration.
More details on this later in this document.</t>
<t>A NETCONF session that is operating using a private candidate will
discard all uncommitted changes in that session's private candidate and destroy
the private candidate if the session is closed through a deliberate user action or
disconnected for any other reason (such as a loss of network connectivity).</t>
</section>
<section>
<name>How to signal the use of private candidates</name>
<section>
<name>Server</name>
<t>The server MUST signal its support for private candidates. The server
does this by advertising a new :private-candidate capability:</t>
<sourcecode>
urn:ietf:params:netconf:capability:private-candidate:1.0
</sourcecode>
<t>As support for the shared candidate configuration datastore is a
pre-requisite for the private candidate functionlity, a server MUST also
advertise the :candidate capability as defined in <xref target="RFC6241"/>.</t>
</section>
<section>
<name>NETCONF client</name>
<t>In order to utilise a private candidate configuration within a NETCONF
session, the client must inform the server that it wishes to do this.</t>
<t>When a NETCONF client connects with a server it sends a list of client
capabilities including one of the :base NETCONF version capabilties.</t>
<t>In order to enable private candidate mode for the duration of the NETCONF
client session the NETCONF client sends the following capability:</t>
<sourcecode>
urn:ietf:params:netconf:capability:private-candidate:1.0
</sourcecode>
<t>In order for the use of private candidates to be established using this
approach both the NETCONF server and the NETCONF client MUST advertise
this capability.</t>
<t>If a client sends the capability and the server does not support private
candidates, the server MUST choose one of the following options:</t>
<ul>
<li>Ignore the capability and continue with the session without the use of
private candidates (this ensures backwards compatibility with older servers).</li>
<li>Close the session as the requested functionality cannot be provided.</li>
</ul>
<t>When a server receives the client capability its mode of operation
will be set to private candidate mode for the duration of the NETCONF
session.</t>
<t>All RPC requests that target or impact the shared candidate configuration
datastore will implicitly target or impact the session's private candidate
configuration datastore instead, and operate in exactly the same way.</t>
<t>Using this method, the use of private candidates can be made available
to NMDA and non-NMDA capable servers.</t>
</section>
<section>
<name>RESTCONF client</name>
<t>RESTCONF does not provide a mechanism for the client to advertise a capability.
Therefore when a RESTCONF server advertises the :private-candidate capability, all
client requests will use a private candidate when the client references
the "{+restconf}/data" resource described in
<xref target="RFC8040" sectionFormat="of" section="3.3.1" />.
All edits are made to the client's private candidate, and the private candidate
is automatically committed.</t>
<t>This ensures backwards compatibility with RESTCONF clients that are not aware of
private candidates, because those clients will expect their changes to be
committed immediately.</t>
</section>
</section>
<section>
<name>Interaction between running and private-candidate(s)</name>
<t>Multiple operations may be performed on the private candidate in order
to stage changes ready for a commit.</t>
<t>In the simplest example, a session may create a private candidate configuration,
perform multiple operations (such as <edit-config>) on it and then
perform a <commit> operation to merge the private candidate configuration
into the running configuration in line with semantics in <xref target="RFC6241"/>.
</t>
<artwork>
commit
+--------------------------+--------> private candidate
/ ^ ^ \
/ edit-config edit-config ⌄
+---+-------------------------------+------> running configuration
^
edit-config
(Private candidate created)
</artwork>
<t>More complex scenarios need to be considered, when multiple private candidate
sessions are working on their own configuration (branches) and they make commits
into the running configuration.</t>
<artwork>
commit
+---------------------+----------------> private candidate 1
/ \
/ edit-config ⌄
+---+------------+-------------+--------------> running configuration
edit-config \
\
+-------------------------> private candidate 2
</artwork>
<t>In this situation, if, how and when private candidate 2 is updated with the
information that the running configuration has changed must be considered.</t>
<t>As described earlier, the client MUST be aware of changes to it's private candidate
configuration so it can be assured that it is only committing its own modifications.
It should also be aware of any changes to the current running configuration.</t>
<t>It is possible, during an update, for conflicts to occur and the detection and
resolution of these is discussed later in this document.</t>
<t>A good way to understand the interaction between candidates is to consider them as
branches such as you might find in a source code management system.</t>
<t>Each private candidate is treated as a separate branch and changes made to the
running configuration are not placed into a private candidate datastore except in one
of the following situations:</t>
<ul>
<li>The client requests that the private candidate be refreshed using a new <update>
operation</li>
<li><commit> is issued (which MUST automatically issue an <update> operation
immediately prior to committing the configuration)</li>
<li>An implementation chooses to perform an <update> operation after a change to
the running configuration by any other client</li>
</ul>
<t>It is possible for a private candidate configuration to become significantly out of
sync with the running configuration should the private candidate be open for a long time,
however, most NETCONF configuration activities (between the first
<edit-config>/<edit-data> and a <commit>) are short-lived.</t>
<t>An implementation may choose, optionally, to automatically perform an <update>
operation automatically on each private candidate configuration datastore after a
change to the running configuration from another client. However, this choice should
be made with caution as it will replace, overwrite, or otherwise alter (depending on
the servers system resolution mode, discussed later) the private candidate configuration
without notifying the client.</t>
<t>A <xref target="RFC9144"><compare></xref> operation MAY be performed against:</t>
<ul>
<li>The initial creation point of the private candidate's branch</li>
<li>Against the last update point of the private candidate's branch</li>
<li>Against the running configuration</li>
</ul>
</section>
<section>
<name>Detecting and resolving conflicts</name>
<section>
<name>What is a conflict?</name>
<t>A conflict is when the intent of the client may have
been different had it had a different starting point. In configuration
terms, a conflict occurs when the same set of nodes in a configuration being
altered by one user are changed between the start of the configuration
preparation (the first <edit-config>/<edit-data> operation)
and the conclusion of this configuration activity (terminated by a
<commit> operation).</t>
<t>The situation where conflicts have the potential of occurring are when
multiple configuration sessions are in progress and one session commits
changes into the running configuration after the private candidate
(branch) was created. </t>
<t>When this happens a conflict occurs for each node modified in the running
configuration that is also modified in the private candidate
configuration.</t>
<t>A node is considered modified if:</t>
<ul>
<li>There is a change of any value</li>
<li>There is a change of existence (or otherwise) of any list entry</li>
<li>There is a change to the order of any list items in a list configured as
"ordered-by user"</li>
<li>There is a change of existence (or otherwise) of a presence container</li>
<li>There is a change of any component member of a leaf-list</li>
<li>There is a change to the order of any items in a leaf-list configured as
"ordered-by user"</li>
<li>There is a change of existance (or otherwise) of a leaf with an Empty type
definition</li>
<li>There is a change to any YANG metadata associated with the node</li>
</ul>
<t>A server MAY choose to add additional checks over and above the above
list.</t>
<t>If a server implements the transaction ID feature then this MAY be considered
as part of detecting a conflict.</t>
<t>Examples of conflicts include:</t>
<ul>
<li>An interface has been deleted in the running configuration that existed
when the private candidate was created. A change to a child node of this specific
interface is made in the private candidate using the default merge operation
would, instead of changing the child node, both recreate the interface and then
set the child node.</li>
<li>A leaf has been modified in the running configuration from the value that
it had when the private candidate was created. The private candidate configuration
changes that leaf to another value.</li>
</ul>
</section>
<section>
<name>Detecting and reporting conflicts</name>
<t>A conflict can occur when an <update> operation is triggered. This
can occur in a number of ways:</t>
<ul>
<li>Manually triggered by the <update> NETCONF operation</li>
<li>Automatically triggered by the server running an <update>
operation, such as when a <commit> operation is performed by the
client in the private candidate session.</li>
</ul>
<t>When a conflict is identified that node is marked by the server as "in conflict"
in the private candidate. This "in conflict" status does not propagate back up
the tree to the parent node(s). Each node in the ancestral tree is evaluated
as in conflict or otherwise on its own merits. The "in conflict" marker
remains until the conflict is resolved on that node.</t>
<t>When a conflict occurs:</t>
<ul>
<li>The client MUST be given the opportunity to re-evaluate its intent based
on the new information. The resolution of the conflict may be manual or
automatic depending on the server and client decision (discussed later in
this document).</li>
<li>A <commit> operation (that MUST trigger an automatic <update>
operation immediately before) MUST fail irrespective of any system-wide
default resolution-mode. It MUST inform the client of the
conflict and SHOULD detail the location of the conflict(s).</li>
<li>An <update> operation triggered by a client (excluding
updates triggered by the <commit> operation) MUST fail unless the
server has explicitly configured a system-wide resolution-mode of ignore
or overwrite (discussed later in this document)</li>
</ul>
<t>The location of the conflict(s) should be reported as a list of
xpaths and values.</t>
<t>Note: If a server implementation has chosen to automatically issue an
<update> operation every time a change is made to the running configuration,
the server will use the system-wide system resolution mode. If this resolution
mode is ignore or overwrite the conflicts will be resolved using those rules. If
the resolution mode is set to revert-on-conflict the semantics are the same as
the ignore method, however, all changes, whether in conflict or otherwise will
be marked in the private candidate as "in-conflict". This means that any subsequent
<commit> will fail until the client makes a conscious choice to resolve them.</t>
</section>
<section anchor="conflict_resolution">
<name>Conflict resolution</name>
<t>Conflict resolution defines which configuration elements are retained
when a conflict is resolved; those from the running configuration or
those from the private candidate configuration.</t>
<t>When a conflict is detected in any client-triggered activity, the client
MUST be informed. The client then has a number of options available to
resolve the conflict:</t>
<ul>
<li>Edit the candidate configuration nodes marked as "in conflict". When a node
marked as "in conflict" is subsequently edited the "in conflict" marker on that
node is removed.</li>
<li>Issue an <update> operation with a specific resolution-mode.</li>
</ul>
<t>The <update> operation uses the resolution-mode specified in the
request, or the system resolution mode in specific circumstances, to resolve
the conflicts. The <update> operation is discussed later in this document.</t>
<t>The following configuration data is used below to illustrate the behaviour
of each resolution method:</t>
<sourcecode type="xml">
<configure>
<interfaces>
<interface>
<name>intf_one</name>
<description>Link to London<description>
</interface>
<interface>
<name>intf_two</name>
<description>Link to Tokyo<description>
</interface>
</interfaces>
</configure>
</sourcecode>
<t>The example workflow is shown in this diagram and is used for the purpose
of the examples below. In these examples the reader should assume that the
<update> operation is manually provided by a client working in
private candidate 1. The update operation triggered by a system upon
commit is not shown.</t>
<artwork>
update commit
+--------------------+---+------> private candidate 1
/ ^ \
/ edit-config / ⌄
+---+--------+--------+---+-------+----> running configuration
edit-config \ ^
\ /
+---+------------------> private candidate 2
commit
</artwork>
<t>There are three defined resolution methods:</t>
<section>
<name>Ignore</name>
<t>Reminder: The starting configuration and workflow used to illustrate this
resolution method is detailed in <xref target="conflict_resolution"/>.</t>
<t>When using the ignore resolution method, items in the running
configuration that are not in conflict with the private candidate
configuration are merged from the running configuration
into the private candidate configuration. Nodes that are in conflict
are ignored and not merged. The outcome of this is that the private
candidate configuration reflects changes in the running that were not
being worked on and those that are being worked on in the private
candidate remain in the private candidate. Issuing a <commit>
operation at this point will overwrite the running configuration with
the conflicted items from the private candidate configuration.</t>
<t>Example:</t>
<t>Session 1 edits the configuration by submitting the following</t>
<sourcecode type="xml">
<rpc message-id="config"
xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
<edit-config>
<target><candidate/><target>
<config>
<configure>
<interfaces>
<interface>
<name>intf_one</name>
<description>Link to San Francisco<description>
</interface>
</interfaces>
</configure>
</config>
</edit-config>
</rpc>
</sourcecode>
<t>Session 2 then edits the configuration deleting the
interface intf_one, updating the description on interface
intf_two and commits the configuration to the running
configuration datastore.</t>
<sourcecode type="xml">
<rpc message-id="config"
xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
<edit-config>
<target><candidate/><target>
<config>
<configure>
<interfaces>
<interface>
<name operation="delete">intf_one</name>
</interface>
<interface>
<name>intf_two</name>
<description>Link moved to Paris</description>
</interface>
</interfaces>
</configure>
</config>
</edit-config>
</rpc>
</sourcecode>
<t>Session 1 then sends an <update> NETCONF operation.</t>
<sourcecode type="xml">
<rpc message-id="update"
xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
<update>
<resolution-mode>ignore</resolution-mode>
</update>
</rpc>
</sourcecode>
<t>The un-conflicting changes are merged and the conflicting
ones are ignored (and not merged from the running into
private candidate 1).</t>
<t>The resulting data in private candidate 1 is:</t>
<sourcecode type="xml">
<configure>
<interfaces>
<interface>
<name>intf_one</name>
<description>Link to San Francisco<description>
</interface>
<interface>
<name>intf_two</name>
<description>Link moved to Paris<description>
</interface>
</interfaces>
</configure>
</sourcecode>
</section>
<section>
<name>Overwrite</name>
<t>Reminder: The starting configuration and workflow used to illustrate this
resolution method is detailed in <xref target="conflict_resolution"/>.</t>
<t>When using the overwrite resolution method, items in the running
configuration that are not in conflict with the private candidate
configuration are merged from the running configuration into the
private candidate configuration. Nodes that are in conflict are
pushed from the running configuration into the private candidate
configuration, overwriting any previous changes in the private
candidate configuration. The outcome of this is that the private
candidate configuration reflects the changes in the running
configuration that were not being worked on as well as changing
those being worked on in the private candidate to new values.</t>
<t>Example:</t>
<t>Session 1 edits the configuration by submitting the following</t>
<sourcecode type="xml">
<rpc message-id="config"
xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
<edit-config>
<target><candidate/><target>
<config>
<configure>
<interfaces>
<interface>
<name>intf_one</name>
<description>Link to San Francisco<description>
</interface>
</interfaces>
</configure>
</config>
</edit-config>
</rpc>
</sourcecode>
<t>Session 2 then edits the configuration deleting the
interface intf_one, updating the description on interface
intf_two and commits the configuration to the running
configuration datastore.</t>
<sourcecode type="xml">
<rpc message-id="config"
xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
<edit-config>
<target><candidate/><target>
<config>
<configure>
<interfaces>
<interface>
<name operation="delete">intf_one</name>
</interface>
<interface>
<name>intf_two</name>
<description>Link moved to Paris</description>
</interface>
</interfaces>
</configure>
</config>
</edit-config>
</rpc>
</sourcecode>
<t>Session 1 then sends an <update> NETCONF operation.</t>
<sourcecode type="xml">
<rpc message-id="update"
xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
<update>
<resolution-mode>overwrite</resolution-mode>
</update>
</rpc>
</sourcecode>
<t>The un-conflicting changes are merged and the conflicting
ones are pushed into the private candidate 1 overwriting the
existing changes.</t>
<t>The resulting data in private candidate 1 is:</t>
<sourcecode type="xml">
<configure>
<interfaces>
<interface>
<name>intf_two</name>
<description>Link moved to Paris<description>
</interface>
</interfaces>
</configure>
</sourcecode>
</section>
<section>
<name>Revert-on-conflict</name>
<t>Reminder: The starting configuration and workflow used to illustrate this
resolution method is detailed in <xref target="conflict_resolution"/>.</t>
<t>When using the revert-on-conflict resolution method, an update
will fail to complete when any conflicting node is found. The
session issuing the update will be informed of the failure.</t>
<t>No changes, whether conflicting or un-conflicting are merged into
the private candidate configuration.</t>
<t>The owner of the private candidate session must then take deliberate
and specific action to adjust the private candidate configuration to
rectify the conflict. This may be by issuing further <edit-config>
or <edit-data> operations, by issuing a <discard-changes>
operation or by issuing an <update> operation with a
different resolution method.</t>
<t>This resolution method MUST be the default resolution method as it
provides for the highest level of visibility and control to ensure
operational stability.</t>
<t>This resolution method MUST be supported by a server.</t>
<t>Example:</t>
<t>Session 1 edits the configuration by submitting the following:</t>
<sourcecode type="xml">
<rpc message-id="config"
xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
<edit-config>
<target><candidate/><target>
<config>
<configure>
<interfaces>
<interface>
<name>intf_one</name>
<description>Link to San Francisco<description>
</interface>
</interfaces>
</configure>
</config>
</edit-config>
</rpc>
</sourcecode>
<t>Session 2 then edits the configuration deleting the
interface intf_one, updating the description on interface
intf_two and commits the configuration to the running
configuration datastore.</t>
<sourcecode type="xml">
<rpc message-id="config"
xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
<edit-config>
<target><candidate/><target>
<config>
<configure>
<interfaces>
<interface>
<name operation="delete">intf_one</name>
</interface>
<interface>
<name>intf_two</name>
<description>Link moved to Paris</description>
</interface>
</interfaces>
</configure>
</config>
</edit-config>
</rpc>
</sourcecode>
<t>Session 1 then sends an <update> NETCONF operation.</t>
<sourcecode type="xml">
<rpc message-id="update"
xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
<update>
<resolution-mode>revert-on-conflict</resolution-mode>
</update>
</rpc>
</sourcecode>
<t>A conflict is detected, the update fails with an <rpc-error>
and no merges/overwrite operations happen.</t>
<t>The resulting data in private candidate 1 is:</t>
<sourcecode type="xml">
<configure>
<interfaces>
<interface>
<name>intf_one</name>
<description>Link to San Francisco<description>
</interface>
<interface>
<name>intf_two</name>
<description>Link to Tokyo<description>
</interface>
</interfaces>
</configure>
</sourcecode>
</section>
</section>
<section>
<name>System resolution mode and advertisement of this mode</name>
<t>The system resolution mode is revert-on-conflict. However, a system MAY
choose to select a different system resolution mode.</t>
<t>The system resolution mode only takes effect if a server implementation
performs an automatic update to all private candidate configurations
following a commit to running.</t>
<t>The system resolution mode MUST be advertised in the :private-candidate
capability by adding the default-resolution-mode parameter if the system default
is anything other than revert-on-conflict. If the system default resolution
mode is revert-on-conflict then advertising this in the :private-candidate
capability is optional.</t>
<t>In this example, a server has configured a default system-wide resolution mode
of overwrite which MUST be signalled with the :private-candidate capability as
follows:</t>
<sourcecode>
urn:ietf:params:netconf:capability:private-candidate:1.0
?default-resolution-mode=overwrite
</sourcecode>
</section>
<section>
<name>Supported resolution modes</name>
<t>A server SHOULD support all three resolution modes. However, if the server
does not support all three modes, the server MUST report the supported modes
in the :private-candidate capability using the supported-resolution-modes,
for example:</t>
<sourcecode>
urn:ietf:params:netconf:capability:private-candidate:1.0
?supported-resolution-modes=revert-on-conflict,ignore
</sourcecode>
</section>
</section>
<section>
<name>NETCONF operations</name>
<section anchor="section_new_netconf_operations">
<name>New NETCONF operations</name>
<section>
<name><update></name>
<t>The <update> operation triggers a rebase of the
private candidate configuration against the running configuration.</t>
<t>The <update> operation may be triggered manually by the
client or automatically by the server.</t>
<t>The <update> operation is atomic. This means that the entire <update>
operation succeeeds or the entire <update> operation MUST fail.</t>
<t>The <update> operation MUST be implicitly triggered by a specific
NETCONF session issuing a <commit> operation when using private
candidates. This implicit <update> operation always has a resolution
mode of revert-on-conflict. The actual order of operations in the server
MUST be to issue the implicit <update> operation first and then the
<commit> operation.</t>
<t>A <commit> operation that fails the implicit <update> operation
MUST fail. The client is then required to make a specific decision to rectify
the issue prior to committing. This may be to edit the private candidate
configuration or to issue a manual <update> operation with a specific
resolution mode selected.</t>
<section>
<name><resolution-mode> parameter</name>
<t>The <update> operation takes the optional
<resolution-mode> parameter</t>
<t>The resolution modes are described earlier in this document
and the accepted inputs are:</t>
<ul>
<li>revert-on-conflict (default)</li>
<li>ignore</li>
<li>overwrite</li>
</ul>
</section>
</section>
</section>
<section anchor="section_updated_netconf_operations">
<name>Updated NETCONF operations</name>
<t>Specific NETCONF operations altered by this document are listed in this
section.</t>
<section anchor="section_updates_to_commit">
<name><commit></name>
<t>The behaviour of the <commit> operation is updated such that
the issuing a <commit> MUST follow a two step process in order to
copy the proposed private configuration into the running configuration.
These steps are:</t>
<ol>
<li>An implicit update operation MUST be performed by the server using the
resolution-mode revert-on-conflict (described later in this document).</li>
<li>On successful completion of step 1, the private candidate configuration
is copied into the running configuration replacing the current contents.</li>
</ol>
<section anchor="section_updates_to_commit_confirmed">
<name>Interactions with commit confirmed operations and private candidates</name>
<t>Nothing in this document alters the behaviour of the <confirmed>,
<persist> or <persist-id> parameters and these MUST work when using the
a private candidate configuration if the :confirmed-commit capability is
advertised.</t>
<t>When a private candidate is committed using the <confirmed/> parameter and
the commit operation disconnects the client's session, the configuration in the
running configuration is immediately reverted and the proposed client changes
are discarded.</t>
<t>When a private candidate is committed using the <confirmed/> parameter and
the commit operation does not disconnect the client's session, and subsequently, the
commit operation is either cancelled using the <cancel-commit> operation or
the timeout expires, the running configuration is reverted and the proposed
client changes are returned to the client's private candidate.</t>
<t>If a private candidate is committed using the <confirmed/> parameter
and the <persist> parameter is provided, and the client subsequently
disconnects its session for any reason whilst the timer is running, upon
cancellation using the <cancel-commit> operation or on the expiry of
the timer, the running configuration will be reverted, and the proposed client
changes are discarded.</t>
</section>
</section>
<section anchor="section_updates_to_get_config">
<name><get-config></name>
<t>Performing a <get-config> operation with the candidate configuration datastore
as the source, the configuration from the private candidate will be returned. If no
private candidate configuration has been created, one will be created at this point.</t>
</section>
<section anchor="section_updates_to_edit_config">
<name><edit-config></name>
<t>Performing an <edit-config> operation with the candidate configuration datastore
as the target, the changes will be placed into the private candidate configuration
datastore. If no private candidate configuration has been created, one will be
created at this point.</t>
</section>
<section>
<name><copy-config></name>
<t>When performing a <copy-config> operation with the candidate configuration datastore
as the source or target, the private candidate will be used. If no private candidate
configuration has been created, one will be created at this point.</t>
</section>
<section anchor="section_updates_to_get_data">
<name><get-data></name>
<t>Performing a <get-data> operation with the candidate configuration datastore
as the datastore, the configuration from the private candidate will be returned. If no
private candidate configuration has been created, one will be created at this point.</t>
</section>
<section anchor="section_updates_to_edit_data">
<name><edit-data></name>
<t>Performing an <edit-data> operation with the candidate configuration datastore
as the datastore, the changes will be placed into the private candidate configuration
datastore. If no private candidate configuration has been created, one will be
created at this point.</t>
</section>
<section anchor="section_updates_to_compare">
<name><compare></name>
<t>Performing a <xref target="RFC9144"><compare></xref> operation
with the candidate datastore, operating as a private candidate, as
either the <source> or <target> is a valid operation.</t>
<t>If <compare> is performed prior to a private candidate configuration
being created, one will be created at that point.</t>
<t>The <compare> operation is extended by this document to allow the ability to
compare the private candidate (at its current point in time) with the
same private candidate at an earlier point in time, or with another datastore.</t>
<section>
<name><reference-point> parameter</name>
<t>This document adds the optional <reference-point> node to the input of
the <compare> operation that accepts the following values:</t>
<ul>
<li>last-update</li>
<li>creation-point</li>
</ul>
<t>Servers MAY support this functionality but are not required to by this document.</t>
<t>The last-update selection of <reference-point> will provide an output
comparing the current private candidate configuration with the same
private candidate configuration at the time it was last updated using the <update>
NETCONF operation described in this document (whether automatically or manually triggered).</t>
<t>The creation-point selection of <reference-point> will provide an output
comparing the current private candidate configuration datastore with the same
private candidate configuration datastore at it was first created.</t>
</section>
</section>
<section>
<name><lock></name>
<t>The behaviour of the <lock> operation is updated such that
locking the candidate configuration datastore will lock that session's private
candidate configuration datastore only.</t>
</section>
<section>
<name><unlock></name>