Merge branch 'devel-server'

Author: michalvasko

modules/ietf-netconf@2011-06-01.h

@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module name="ietf-netconf"
         xmlns="urn:ietf:params:xml:ns:yang:yin:1"
-        xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0">
+        xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0"
+        xmlns:inet="urn:ietf:params:xml:ns:yang:ietf-inet-types"
+        xmlns:nacm="urn:ietf:params:xml:ns:yang:ietf-netconf-acm">
+  <yang-version value="1"/>
   <namespace uri="urn:ietf:params:xml:ns:netconf:base:1.0"/>
   <prefix value="nc"/>
   <import module="ietf-inet-types">
     <prefix value="inet"/>
   </import>
+  <import module="ietf-netconf-acm">
+    <prefix value="nacm"/>
+  </import>
   <organization>
     <text>IETF NETCONF (Network Configuration) Working Group</text>
   </organization>
@@ -15,19 +21,19 @@
 WG List:  &lt;netconf@ietf.org&gt;
 
 WG Chair: Bert Wijnen
-          &lt;bertietf@bwijnen.net&gt;
+        &lt;bertietf@bwijnen.net&gt;
 
 WG Chair: Mehmet Ersue
-          &lt;mehmet.ersue@nsn.com&gt;
+        &lt;mehmet.ersue@nsn.com&gt;
 
 Editor:   Martin Bjorklund
-          &lt;mbj@tail-f.com&gt;
+        &lt;mbj@tail-f.com&gt;
 
 Editor:   Juergen Schoenwaelder
-          &lt;j.schoenwaelder@jacobs-university.de&gt;
+        &lt;j.schoenwaelder@jacobs-university.de&gt;
 
 Editor:   Andy Bierman
-          &lt;andy.bierman@brocade.com&gt;</text>
+        &lt;andy.bierman@brocade.com&gt;</text>
   </contact>
   <description>
     <text>NETCONF Protocol Data Types and Protocol Operations.
@@ -47,7 +53,9 @@ the RFC itself for full legal notices.</text>
   </description>
   <revision date="2011-06-01">
     <description>
-      <text>Initial revision</text>
+      <text>Initial revision;
+2013-09-29: Updated to include NACM attributes,
+as specified in RFC 6536: sec 3.2.5 and 3.2.8</text>
     </description>
     <reference>
       <text>RFC 6241: Network Configuration Protocol</text>
@@ -63,18 +71,18 @@ following unqualified XML attribute is supported
 within the &lt;filter&gt; element, within a &lt;get&gt; or
 &lt;get-config&gt; protocol operation:
 
-  type : optional attribute with allowed
-         value strings 'subtree' and 'xpath'.
-         If missing, the default value is 'subtree'.
+type : optional attribute with allowed
+       value strings 'subtree' and 'xpath'.
+       If missing, the default value is 'subtree'.
 
 If the 'xpath' feature is supported, then the
 following unqualified XML attribute is
 also supported:
 
-  select: optional attribute containing a
-          string representing an XPath expression.
-          The 'type' attribute must be equal to 'xpath'
-          if this attribute is present.</text>
+select: optional attribute containing a
+        string representing an XPath expression.
+        The 'type' attribute must be equal to 'xpath'
+        if this attribute is present.</text>
     </description>
   </extension>
   <feature name="writable-running">
@@ -191,86 +199,101 @@ this feature must not be enabled.</text>
   <typedef name="error-tag-type">
     <type name="enumeration">
       <enum name="in-use">
+        <value value="0"/>
         <description>
           <text>The request requires a resource that
 already is in use.</text>
         </description>
       </enum>
       <enum name="invalid-value">
+        <value value="1"/>
         <description>
           <text>The request specifies an unacceptable value for one
 or more parameters.</text>
         </description>
       </enum>
       <enum name="too-big">
+        <value value="2"/>
         <description>
           <text>The request or response (that would be generated) is
 too large for the implementation to handle.</text>
         </description>
       </enum>
       <enum name="missing-attribute">
+        <value value="3"/>
         <description>
           <text>An expected attribute is missing.</text>
         </description>
       </enum>
       <enum name="bad-attribute">
+        <value value="4"/>
         <description>
           <text>An attribute value is not correct; e.g., wrong type,
 out of range, pattern mismatch.</text>
         </description>
       </enum>
       <enum name="unknown-attribute">
+        <value value="5"/>
         <description>
           <text>An unexpected attribute is present.</text>
         </description>
       </enum>
       <enum name="missing-element">
+        <value value="6"/>
         <description>
           <text>An expected element is missing.</text>
         </description>
       </enum>
       <enum name="bad-element">
+        <value value="7"/>
         <description>
           <text>An element value is not correct; e.g., wrong type,
 out of range, pattern mismatch.</text>
         </description>
       </enum>
       <enum name="unknown-element">
+        <value value="8"/>
         <description>
           <text>An unexpected element is present.</text>
         </description>
       </enum>
       <enum name="unknown-namespace">
+        <value value="9"/>
         <description>
           <text>An unexpected namespace is present.</text>
         </description>
       </enum>
       <enum name="access-denied">
+        <value value="10"/>
         <description>
           <text>Access to the requested protocol operation or
 data model is denied because authorization failed.</text>
         </description>
       </enum>
       <enum name="lock-denied">
+        <value value="11"/>
         <description>
           <text>Access to the requested lock is denied because the
 lock is currently held by another entity.</text>
         </description>
       </enum>
       <enum name="resource-denied">
+        <value value="12"/>
         <description>
           <text>Request could not be completed because of
 insufficient resources.</text>
         </description>
       </enum>
       <enum name="rollback-failed">
+        <value value="13"/>
         <description>
           <text>Request to roll back some configuration change (via
 rollback-on-error or &lt;discard-changes&gt; operations)
 was not completed for some reason.</text>
         </description>
       </enum>
       <enum name="data-exists">
+        <value value="14"/>
         <description>
           <text>Request could not be completed because the relevant
 data model content already exists.  For example,
@@ -279,6 +302,7 @@ already exists.</text>
         </description>
       </enum>
       <enum name="data-missing">
+        <value value="15"/>
         <description>
           <text>Request could not be completed because the relevant
 data model content does not exist.  For example,
@@ -287,25 +311,29 @@ data that does not exist.</text>
         </description>
       </enum>
       <enum name="operation-not-supported">
+        <value value="16"/>
         <description>
           <text>Request could not be completed because the requested
 operation is not supported by this implementation.</text>
         </description>
       </enum>
       <enum name="operation-failed">
+        <value value="17"/>
         <description>
           <text>Request could not be completed because the requested
 operation failed for some reason not covered by
 any other error condition.</text>
         </description>
       </enum>
       <enum name="partial-operation">
+        <value value="18"/>
         <description>
           <text>This error-tag is obsolete, and SHOULD NOT be sent
 by servers conforming to this document.</text>
         </description>
       </enum>
       <enum name="malformed-message">
+        <value value="19"/>
         <description>
           <text>A message could not be handled because it failed to
 be parsed correctly.  For example, the message is not
@@ -323,11 +351,13 @@ well-formed XML or it uses an invalid character set.</text>
   <typedef name="error-severity-type">
     <type name="enumeration">
       <enum name="error">
+        <value value="0"/>
         <description>
           <text>Error severity</text>
         </description>
       </enum>
       <enum name="warning">
+        <value value="1"/>
         <description>
           <text>Warning severity</text>
         </description>
@@ -343,6 +373,7 @@ well-formed XML or it uses an invalid character set.</text>
   <typedef name="edit-operation-type">
     <type name="enumeration">
       <enum name="merge">
+        <value value="0"/>
         <description>
           <text>The configuration data identified by the
 element containing this attribute is merged
@@ -352,6 +383,7 @@ by the target parameter.</text>
         </description>
       </enum>
       <enum name="replace">
+        <value value="1"/>
         <description>
           <text>The configuration data identified by the element
 containing this attribute replaces any related
@@ -365,6 +397,7 @@ actually present in the config parameter is affected.</text>
         </description>
       </enum>
       <enum name="create">
+        <value value="2"/>
         <description>
           <text>The configuration data identified by the element
 containing this attribute is added to the
@@ -376,6 +409,7 @@ datastore.  If the configuration data exists, an
         </description>
       </enum>
       <enum name="delete">
+        <value value="3"/>
         <description>
           <text>The configuration data identified by the element
 containing this attribute is deleted from the
@@ -387,6 +421,7 @@ an &lt;error-tag&gt; value of 'data-missing'.</text>
         </description>
       </enum>
       <enum name="remove">
+        <value value="4"/>
         <description>
           <text>The configuration data identified by the element
 containing this attribute is deleted from the
@@ -449,10 +484,10 @@ datastore.</text>
         </choice>
       </container>
       <anyxml name="filter">
+        <nc:get-filter-element-attributes/>
         <description>
           <text>Subtree or XPath filter to use.</text>
         </description>
-        <nc:get-filter-element-attributes/>
       </anyxml>
     </input>
     <output>
@@ -502,16 +537,19 @@ configuration to the specified target configuration.</text>
       <leaf name="default-operation">
         <type name="enumeration">
           <enum name="merge">
+            <value value="0"/>
             <description>
               <text>The default operation is merge.</text>
             </description>
           </enum>
           <enum name="replace">
+            <value value="1"/>
             <description>
               <text>The default operation is replace.</text>
             </description>
           </enum>
           <enum name="none">
+            <value value="2"/>
             <description>
               <text>There is no default operation.</text>
             </description>
@@ -526,16 +564,19 @@ configuration to the specified target configuration.</text>
         <if-feature name="validate"/>
         <type name="enumeration">
           <enum name="test-then-set">
+            <value value="0"/>
             <description>
               <text>The server will test and then set if no errors.</text>
             </description>
           </enum>
           <enum name="set">
+            <value value="1"/>
             <description>
               <text>The server will set without a test first.</text>
             </description>
           </enum>
           <enum name="test-only">
+            <value value="2"/>
             <description>
               <text>The server will only test and not set, even
 if there are no errors.</text>
@@ -550,16 +591,19 @@ if there are no errors.</text>
       <leaf name="error-option">
         <type name="enumeration">
           <enum name="stop-on-error">
+            <value value="0"/>
             <description>
               <text>The server will stop on errors.</text>
             </description>
           </enum>
           <enum name="continue-on-error">
+            <value value="1"/>
             <description>
               <text>The server may continue on errors.</text>
             </description>
           </enum>
           <enum name="rollback-on-error">
+            <value value="2"/>
             <description>
               <text>The server will roll back on errors.
 This value can only be used if the 'rollback-on-error'
@@ -689,6 +733,7 @@ a subset of the running datastore.</text>
     </input>
   </rpc>
   <rpc name="delete-config">
+    <nacm:default-deny-all/>
     <description>
       <text>Delete a configuration datastore.</text>
     </description>
@@ -816,11 +861,11 @@ previously obtained with the 'lock' operation.</text>
     </reference>
     <input>
       <anyxml name="filter">
+        <nc:get-filter-element-attributes/>
         <description>
           <text>This parameter specifies the portion of the system
 configuration and state data to retrieve.</text>
         </description>
-        <nc:get-filter-element-attributes/>
       </anyxml>
     </input>
     <output>
@@ -843,6 +888,7 @@ produce any results.</text>
     </reference>
   </rpc>
   <rpc name="kill-session">
+    <nacm:default-deny-all/>
     <description>
       <text>Force the termination of a NETCONF session.</text>
     </description>

modules/ietf-netconf@2011-06-01.yang

@@ -13,7 +13,7 @@ if(NOT UNIX)
 endif()
 
 # set version
-set(NP2SRV_VERSION 0.3.76)
+set(NP2SRV_VERSION 0.3.84)
 
 # set default build type if not specified by user
 if(NOT CMAKE_BUILD_TYPE)
@@ -105,6 +105,7 @@ set(srcs
     op_un_lock.c
     op_generic.c
     op_notifications.c
+    op_kill.c
     log.c)
 
 # object library to build source codes only once for the main binary