* New yang changelog experimental feature for automatic upgrade
* Added modules-state diff parameter to xmldb_get datastore function for startup scenarios. * Allowed Yang extended Xpath functions (syntax only): * re-match, deref, derived-from, derived-from-or-self, enum-value, bit-is-set * XSD regular expression handling of dash(`-`) *: Translate XDS `[xxx\-yyy]` to POSIX `[xxxyyy-]`. * YANG Anydata treated same as Anyxml
This commit is contained in:
Olof hagsand
parent
434f0b930e
commit
3f68cca06c
37 changed files with 1475 additions and 351 deletions
|
|
@ -43,6 +43,7 @@ CLIXON_DATADIR = @CLIXON_DATADIR@
|
|||
YANGSPECS = clixon-config@2019-03-05.yang
|
||||
YANGSPECS += clixon-lib@2019-01-02.yang
|
||||
YANGSPECS += clixon-rfc5277@2008-07-01.yang
|
||||
YANGSPECS += clixon-yang-changelog@2019-03-21.yang
|
||||
|
||||
APPNAME = clixon # subdir ehere these files are installed
|
||||
|
||||
|
|
|
|||
|
|
@ -428,6 +428,18 @@ module clixon-config {
|
|||
data. If enabled, module info will appear when doing
|
||||
netconf get or restconf GET";
|
||||
}
|
||||
leaf CLICON_YANG_CHANGELOG {
|
||||
type boolean;
|
||||
default false;
|
||||
description "If true enable automatic upgrade using yang clixon
|
||||
changelog.";
|
||||
}
|
||||
leaf CLICON_YANG_CHANGELOG_FILE {
|
||||
type string;
|
||||
description "Name of file with module revision changelog.
|
||||
If CLICON_YANG_CHANGELOG is true, Clixon
|
||||
reads the module changelog from this file.";
|
||||
}
|
||||
leaf CLICON_MODULE_SET_ID {
|
||||
type string;
|
||||
default "0";
|
||||
|
|
|
|||
326
yang/clixon/clixon-yang-changelog@2019-03-21.yang
Normal file
326
yang/clixon/clixon-yang-changelog@2019-03-21.yang
Normal file
|
|
@ -0,0 +1,326 @@
|
|||
module clixon-yang-changelog {
|
||||
yang-version 1.1;
|
||||
namespace "http://clicon.org/yang-changelog";
|
||||
prefix ml;
|
||||
|
||||
import ietf-yang-library {
|
||||
prefix yanglib;
|
||||
}
|
||||
import ietf-yang-types {
|
||||
prefix yang;
|
||||
}
|
||||
|
||||
organization "Clixon";
|
||||
contact
|
||||
"Olof Hagsand <olof@hagsand.se>";
|
||||
description
|
||||
"This is experimentalYANG changelog derived from:
|
||||
draft-wang-netmod-module-revision-management-01
|
||||
with the following contacts and references:
|
||||
WG Web: <https://datatracker.ietf.org/wg/netmod/>
|
||||
|
||||
WG List: <mailto:netmod@ietf.org>
|
||||
|
||||
Author: Qin Wu
|
||||
<mailto:bill.wu@huawei.com>
|
||||
Zitao Wang
|
||||
<mailto:wangzitao@huawei.com>";
|
||||
reference "draft-wang-netmod-module-revision-management-01";
|
||||
revision 2019-03-21 {
|
||||
description
|
||||
"Initial Clixon derived version";
|
||||
}
|
||||
|
||||
identity operation-type {
|
||||
description
|
||||
"Abstract base identity for the operation type ";
|
||||
}
|
||||
|
||||
identity create {
|
||||
base operation-type;
|
||||
description
|
||||
"Denotes create new data nodes";
|
||||
}
|
||||
|
||||
identity delete {
|
||||
base operation-type;
|
||||
description
|
||||
"Denotes delete the target node";
|
||||
}
|
||||
|
||||
identity move {
|
||||
base operation-type;
|
||||
description
|
||||
"Denote move the target node.";
|
||||
}
|
||||
|
||||
identity modify {
|
||||
base operation-type;
|
||||
description
|
||||
"Denote modify the target data node.";
|
||||
}
|
||||
|
||||
identity statement-type {
|
||||
description
|
||||
"Base identity for statement type";
|
||||
}
|
||||
|
||||
identity feature-statement {
|
||||
base statement-type;
|
||||
description
|
||||
"feature statement, if this type be chose, it means that the
|
||||
feature or if-feature statement been modified";
|
||||
}
|
||||
identity identity-statement {
|
||||
base statement-type;
|
||||
description
|
||||
"identity statement, if this type be chose, it means that the
|
||||
identity statement been modified, for example, add new identity, etc.";
|
||||
}
|
||||
|
||||
identity grouping-statement {
|
||||
base statement-type;
|
||||
description
|
||||
"grouping statement, if this type be chose, it means that the grouping
|
||||
statement been modified.";
|
||||
}
|
||||
|
||||
identity typedef-statement {
|
||||
base statement-type;
|
||||
description
|
||||
"typedef statement, if this type be chose, it means that the typedef
|
||||
statement been modified.";
|
||||
}
|
||||
|
||||
identity augment-statement {
|
||||
base statement-type;
|
||||
description
|
||||
"augment statement, if this type be chose, it means that the augment
|
||||
statement been modified.";
|
||||
}
|
||||
|
||||
identity rpc-statement {
|
||||
base statement-type;
|
||||
description
|
||||
"rpc statement, if this type be chose, it means that the rpc
|
||||
statement been modified.";
|
||||
}
|
||||
|
||||
identity notification-statement {
|
||||
base statement-type;
|
||||
description
|
||||
"notification statement, if this type be chose, it means that the notification
|
||||
statement been modified.";
|
||||
}
|
||||
|
||||
extension purpose {
|
||||
argument name;
|
||||
description
|
||||
"The purpose can be used to mark the data nodes change purpose.
|
||||
The name argument can be specified in the following recommended mode
|
||||
- bug-fix, which can help user to understand the data nodes' changes present bug fix,
|
||||
- new-function, which can help user to understand the data nodes' changes present new function,
|
||||
- nmda-conform, which can help user to understand the data nodes' changes conform to NMDA,
|
||||
|
||||
and note that the user can argument the purpose name according to their sepcific requirements.";
|
||||
}
|
||||
|
||||
grouping data-definition {
|
||||
container data-definition {
|
||||
leaf target-node {
|
||||
type yang:xpath1.0;
|
||||
mandatory true;
|
||||
description
|
||||
"Identifies the target data node for update.
|
||||
Notice that, if the update-type equal to move or delete,
|
||||
this target-node must point to the data node of old version.
|
||||
\t
|
||||
For example, suppose the target node is a YANG leaf named a,
|
||||
and the previous version is:
|
||||
\t
|
||||
container foo {
|
||||
leaf a { type string; }
|
||||
leaf b { type int32; }
|
||||
}
|
||||
\t
|
||||
the new version is:
|
||||
container foo {
|
||||
leaf b {type int32;}
|
||||
}
|
||||
\t
|
||||
Therefore, the targe-node should be /foo/a.";
|
||||
}
|
||||
leaf location-point {
|
||||
type yang:xpath1.0;
|
||||
description
|
||||
"Identifies the location point where the updates happened.";
|
||||
}
|
||||
leaf where {
|
||||
when "derived-from-or-self(../../change-operation, 'move')" {
|
||||
description
|
||||
"This leaf only applies for 'move'
|
||||
updates.";
|
||||
}
|
||||
type enumeration {
|
||||
enum "before" {
|
||||
description
|
||||
"Insert or move a data node before the data resource
|
||||
identified by the 'point' parameter.";
|
||||
}
|
||||
enum "after" {
|
||||
description
|
||||
"Insert or move a data node after the data resource
|
||||
identified by the 'point' parameter.";
|
||||
}
|
||||
enum "first" {
|
||||
description
|
||||
"Insert or move a data node so it becomes ordered
|
||||
as the first entry.";
|
||||
}
|
||||
enum "last" {
|
||||
description
|
||||
"Insert or move a data node so it becomes ordered
|
||||
as the last entry.";
|
||||
}
|
||||
}
|
||||
default "last";
|
||||
description
|
||||
"Identifies where a data resource will be inserted
|
||||
or moved.";
|
||||
}
|
||||
anydata data-definition {
|
||||
when "derived-from-or-self(../../change-operation, 'modify')" {
|
||||
description
|
||||
"This nodes only be present when
|
||||
the 'change-operation' equal to 'modify'.";
|
||||
}
|
||||
description
|
||||
"This nodes used for present the definitions before updated.
|
||||
And this nodes only be present when
|
||||
the 'change-operation' equal to 'modify'.";
|
||||
}
|
||||
description
|
||||
"Container for data statement";
|
||||
}
|
||||
description
|
||||
"Grouping for data definition";
|
||||
}
|
||||
|
||||
grouping other-statement {
|
||||
container other-statement {
|
||||
leaf statement-name {
|
||||
type identityref {
|
||||
base statement-type;
|
||||
}
|
||||
description
|
||||
"Statement name, for example, identity, feature, typedef, etc.";
|
||||
}
|
||||
anydata statement-definition {
|
||||
description
|
||||
"This nodes used for present new the definitions.";
|
||||
}
|
||||
list substatements {
|
||||
key "statement-name";
|
||||
leaf statement-name {
|
||||
type identityref {
|
||||
base statement-type;
|
||||
}
|
||||
description
|
||||
"Statement name, for example, identity, feature, typedef, etc.";
|
||||
}
|
||||
anydata substatement-definition {
|
||||
description
|
||||
"This nodes used for present new the definitions.";
|
||||
}
|
||||
description
|
||||
"List for substatements updates";
|
||||
}
|
||||
description
|
||||
"Container for header statement updates";
|
||||
}
|
||||
description
|
||||
"Grouping for header statement";
|
||||
}
|
||||
|
||||
grouping change-log {
|
||||
list revision-change-log {
|
||||
key "index";
|
||||
leaf index {
|
||||
type uint32;
|
||||
description
|
||||
"Index for module change log";
|
||||
}
|
||||
leaf change-operation {
|
||||
type identityref {
|
||||
base operation-type;
|
||||
}
|
||||
mandatory true;
|
||||
description
|
||||
"This leaf indicate the change operation, such as create, move, delete, modify, etc.";
|
||||
}
|
||||
choice yang-statements {
|
||||
description
|
||||
"Choice for various YANG statements that have been impacted.";
|
||||
case data-definition-statement {
|
||||
uses data-definition;
|
||||
}
|
||||
case other-statement {
|
||||
uses other-statement;
|
||||
}
|
||||
}
|
||||
description
|
||||
"List for module revision change log";
|
||||
}
|
||||
description
|
||||
"Grouping for module revision change log";
|
||||
}
|
||||
|
||||
container yang-modules {
|
||||
config false;
|
||||
list module {
|
||||
key "name revision";
|
||||
leaf name {
|
||||
type yang:yang-identifier;
|
||||
description
|
||||
"The YANG module or submodule name.";
|
||||
}
|
||||
leaf revision {
|
||||
type yanglib:revision-identifier;
|
||||
description
|
||||
"The YANG module or submodule revision date. If no revision
|
||||
statement is present in the YANG module or submodule, this
|
||||
leaf is not instantiated.";
|
||||
}
|
||||
leaf backward-compatible {
|
||||
type boolean;
|
||||
description
|
||||
"Indicates whether it is a backward compatible version.
|
||||
If this parameter is set to true, it means that this version is
|
||||
a backwards compatible version";
|
||||
}
|
||||
uses change-log;
|
||||
description
|
||||
"List for module updated log";
|
||||
}
|
||||
description
|
||||
"This container present the modules updated log.";
|
||||
}
|
||||
augment "/yanglib:yang-library/yanglib:module-set/yanglib:module" {
|
||||
description
|
||||
"Augment the yang library with backward compatibility indication.";
|
||||
leaf backward-compatible {
|
||||
type boolean;
|
||||
description
|
||||
"backward compatibility indication.";
|
||||
}
|
||||
}
|
||||
augment "/yanglib:yang-library/yanglib:module-set/yanglib:module/yanglib:submodule" {
|
||||
description
|
||||
"Augment the yang library with backward compatibility indication.";
|
||||
leaf backward-compatible {
|
||||
type boolean;
|
||||
description
|
||||
"backward compatibility indication.";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -52,7 +52,6 @@ YANGSPECS += ietf-netconf@2011-06-01.yang
|
|||
YANGSPECS += ietf-netconf-acm@2018-02-14.yang
|
||||
YANGSPECS += ietf-restconf-monitoring@2017-01-26.yang
|
||||
YANGSPECS += ietf-netconf-monitoring@2010-10-04.yang
|
||||
YANGSPECS += ietf-module-revision@2018-08-08.yang
|
||||
|
||||
all:
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue