hrr_rb_netconf 0.1.1 → 0.2.0

data/lib/hrr_rb_netconf/server/capability/base_1_1.rb

@@ -2,7 +2,7 @@
 # vim: et ts=2 sw=2
 
 require 'rexml/document'
-require 'hrr_rb_netconf/logger'
+require 'hrr_rb_netconf/loggable'
 
 module HrrRbNetconf
   class Server
@@ -12,92 +12,96 @@ module HrrRbNetconf
         DEPENDENCIES = []
         IF_FEATURES  = []
 
-        oper_proc('get'){ |session, datastore, input_e|
-          datastore.run 'get', input_e
-        }
-
-        oper_proc('get-config'){ |session, datastore, input_e|
-          datastore.run 'get-config', input_e
-        }
-
-        oper_proc('edit-config'){ |session, datastore, input_e|
-          datastore.run 'edit-config', input_e
-          '<ok />'
-        }
-
-        oper_proc('copy-config'){ |session, datastore, input_e|
-          datastore.run 'copy-config', input_e
-          '<ok />'
-        }
-
-        oper_proc('delete-config'){ |session, datastore, input_e|
-          datastore.run 'delete-config', input_e
-          '<ok />'
-        }
-
-        oper_proc('lock'){ |session, datastore, input_e|
-          target = input_e.elements['target'].elements[1].name
-          session.lock target
-          begin
-            datastore.run 'lock', input_e
+        def define_capability
+          oper_proc('get'){ |session, datastore, input_e|
+            datastore.run 'get', input_e
+          }
+
+          oper_proc('get-config'){ |session, datastore, input_e|
+            datastore.run 'get-config', input_e
+          }
+
+          oper_proc('edit-config'){ |session, datastore, input_e|
+            datastore.run 'edit-config', input_e
+            '<ok />'
+          }
+
+          oper_proc('copy-config'){ |session, datastore, input_e|
+            datastore.run 'copy-config', input_e
+            '<ok />'
+          }
+
+          oper_proc('delete-config'){ |session, datastore, input_e|
+            datastore.run 'delete-config', input_e
             '<ok />'
-          rescue
+          }
+
+          oper_proc('lock'){ |session, datastore, input_e|
+            target = input_e.elements['target'].elements[1].name
+            session.lock target
+            begin
+              datastore.run 'lock', input_e
+              '<ok />'
+            rescue
+              session.unlock target
+              raise
+            end
+          }
+
+          oper_proc('unlock'){ |session, datastore, input_e|
+            datastore.run 'unlock', input_e
+            target = input_e.elements['target'].elements[1].name
             session.unlock target
-            raise
-          end
-        }
-
-        oper_proc('unlock'){ |session, datastore, input_e|
-          datastore.run 'unlock', input_e
-          target = input_e.elements['target'].elements[1].name
-          session.unlock target
-          '<ok />'
-        }
-
-        oper_proc('close-session'){ |session, datastore, input_e|
-          datastore.run 'close-session', input_e
-          session.close
-          '<ok />'
-        }
-
-        oper_proc('kill-session'){ |session, datastore, input_e|
-          session.close_other Integer(input_e.elements['session-id'].text)
-          '<ok />'
-        }
-
-        model 'get',           ['filter'],                             'leaf',     'type' => 'anyxml'
-        model 'get-config',    ['source'],                             'container'
-        model 'get-config',    ['source', 'config-source'],            'choice',   'mandatory' => true
-        model 'get-config',    ['source', 'config-source', 'running'], 'leaf',     'type' => 'empty'
-        model 'get-config',    ['filter'],                             'leaf',     'type' => 'anyxml'
-        model 'edit-config',   ['target'],                             'container'
-        model 'edit-config',   ['target', 'config-target'],            'choice',   'mandatory' => true
-        model 'edit-config',   ['default-operation'],                  'leaf',     'type' => 'enumeration', 'enum' => ['merge', 'replace', 'none'], 'default' => 'merge'
-        model 'edit-config',   ['error-option'],                       'leaf',     'type' => 'enumeration', 'enum' => ['stop-on-error', 'continue-on-error', 'rollback-on-error'], 'default' => 'stop-on-error'
-        model 'edit-config',   ['edit-content'],                       'choice',   'mandatory' => true
-        model 'edit-config',   ['edit-content', 'config'],             'leaf',     'type' => 'anyxml'
-        model 'copy-config',   ['target'],                             'container'
-        model 'copy-config',   ['target', 'config-target'],            'choice',   'mandatory' => true
-        model 'copy-config',   ['source'],                             'container'
-        model 'copy-config',   ['source', 'config-source'],            'choice',   'mandatory' => true
-        model 'copy-config',   ['source', 'config-source', 'running'], 'leaf',     'type' => 'empty'
-        model 'copy-config',   ['source', 'config-source', 'config'],  'leaf',     'type' => 'anyxml'
-        model 'delete-config', ['target'],                             'container'
-        model 'delete-config', ['target', 'config-target'],            'choice',   'mandatory' => true
-        model 'lock',          ['target'],                             'container'
-        model 'lock',          ['target', 'config-target'],            'choice',   'mandatory' => true
-        model 'lock',          ['target', 'config-target', 'running'], 'leaf',     'type' => 'empty'
-        model 'unlock',        ['target'],                             'container'
-        model 'unlock',        ['target', 'config-target'],            'choice',   'mandatory' => true
-        model 'unlock',        ['target', 'config-target', 'running'], 'leaf',     'type' => 'empty'
-        model 'close-session', []
-        model 'kill-session',  ['session-id'],                         'leaf',     'type' => 'integer', 'range' => [1, 2**32-1]
+            '<ok />'
+          }
+
+          oper_proc('close-session'){ |session, datastore, input_e|
+            datastore.run 'close-session', input_e
+            session.close
+            '<ok />'
+          }
+
+          oper_proc('kill-session'){ |session, datastore, input_e|
+            session.close_other Integer(input_e.elements['session-id'].text)
+            '<ok />'
+          }
+
+          model 'get',           ['filter'],                             'leaf',     'type' => 'anyxml'
+          model 'get-config',    ['source'],                             'container'
+          model 'get-config',    ['source', 'config-source'],            'choice',   'mandatory' => true
+          model 'get-config',    ['source', 'config-source', 'running'], 'leaf',     'type' => 'empty'
+          model 'get-config',    ['filter'],                             'leaf',     'type' => 'anyxml'
+          model 'edit-config',   ['target'],                             'container'
+          model 'edit-config',   ['target', 'config-target'],            'choice',   'mandatory' => true
+          model 'edit-config',   ['default-operation'],                  'leaf',     'type' => 'enumeration', 'enum' => ['merge', 'replace', 'none'], 'default' => 'merge'
+          model 'edit-config',   ['error-option'],                       'leaf',     'type' => 'enumeration', 'enum' => ['stop-on-error', 'continue-on-error', 'rollback-on-error'], 'default' => 'stop-on-error'
+          model 'edit-config',   ['edit-content'],                       'choice',   'mandatory' => true
+          model 'edit-config',   ['edit-content', 'config'],             'leaf',     'type' => 'anyxml'
+          model 'copy-config',   ['target'],                             'container'
+          model 'copy-config',   ['target', 'config-target'],            'choice',   'mandatory' => true
+          model 'copy-config',   ['source'],                             'container'
+          model 'copy-config',   ['source', 'config-source'],            'choice',   'mandatory' => true
+          model 'copy-config',   ['source', 'config-source', 'running'], 'leaf',     'type' => 'empty'
+          model 'copy-config',   ['source', 'config-source', 'config'],  'leaf',     'type' => 'anyxml'
+          model 'delete-config', ['target'],                             'container'
+          model 'delete-config', ['target', 'config-target'],            'choice',   'mandatory' => true
+          model 'lock',          ['target'],                             'container'
+          model 'lock',          ['target', 'config-target'],            'choice',   'mandatory' => true
+          model 'lock',          ['target', 'config-target', 'running'], 'leaf',     'type' => 'empty'
+          model 'unlock',        ['target'],                             'container'
+          model 'unlock',        ['target', 'config-target'],            'choice',   'mandatory' => true
+          model 'unlock',        ['target', 'config-target', 'running'], 'leaf',     'type' => 'empty'
+          model 'close-session', []
+          model 'kill-session',  ['session-id'],                         'leaf',     'type' => 'integer', 'range' => [1, 2**32-1]
+        end
 
         class Sender
+          include Loggable
+
           MAX_CHUNK_SIZE = 2**32 - 1
 
-          def initialize io_w
-            @logger = Logger.new self.class.name
+          def initialize io_w, logger: nil
+            self.logger = logger
             @io_w = io_w
             @formatter = REXML::Formatters::Pretty.new(2)
             @formatter.compact = true
@@ -110,7 +114,7 @@ module HrrRbNetconf
               begin
                 @formatter.write(REXML::Document.new(msg, {:ignore_whitespace_nodes => :all}).root, raw_msg)
               rescue => e
-                @logger.error { "Invalid sending message: #{msg.inspect}: #{e.message}" }
+                log_error { "Invalid sending message: #{msg.inspect}: #{e.message}" }
                 raise "Invalid sending message: #{msg.inspect}: #{e.message}"
               end
             when REXML::Document
@@ -118,10 +122,10 @@ module HrrRbNetconf
             when REXML::Element
               @formatter.write(msg, raw_msg)
             else
-              @logger.error { "Unexpected sending message: #{msg.inspect}" }
+              log_error { "Unexpected sending message: #{msg.inspect}" }
               raise ArgumentError, "Unexpected sending message: #{msg.inspect}"
             end
-            @logger.debug { "Sending message: #{raw_msg.string.inspect}" }
+            log_debug { "Sending message: #{raw_msg.string.inspect}" }
             raw_msg.rewind
             encoded_msg = StringIO.new
             until raw_msg.eof?
@@ -130,19 +134,21 @@ module HrrRbNetconf
               encoded_msg.write "\n##{chunk_data.size}\n#{chunk_data}"
             end
             encoded_msg.write "\n##\n"
-            @logger.debug { "Sending encoded message: #{encoded_msg.string.inspect}" }
+            log_debug { "Sending encoded message: #{encoded_msg.string.inspect}" }
             begin
               @io_w.write encoded_msg.string
             rescue => e
-              @logger.info { "Sender IO closed: #{e.class}: #{e.message}" }
+              log_info { "Sender IO closed: #{e.class}: #{e.message}" }
               raise IOError, "Sender IO closed: #{e.class}: #{e.message}"
             end
           end
         end
 
         class Receiver
-          def initialize io_r
-            @logger = Logger.new self.class.name
+          include Loggable
+
+          def initialize io_r, logger: nil
+            self.logger = logger
             @io_r = io_r
           end
 
@@ -156,11 +162,11 @@ module HrrRbNetconf
               begin
                 buf = @io_r.read(read_len)
               rescue => e
-                @logger.info { "Receiver IO closed: #{e.class}: #{e.message}" }
+                log_info { "Receiver IO closed: #{e.class}: #{e.message}" }
                 return nil
               end
               if buf.nil?
-                @logger.info { "Receiver IO closed" }
+                log_info { "Receiver IO closed" }
                 return nil
               end
               chunked_msg.write buf
@@ -170,16 +176,16 @@ module HrrRbNetconf
                   state = :before_chunk_size
                 else
                   info = "In beginning_of_msg: expected #{"\n".inspect}, but got #{buf.inspect}: #{chunked_msg.string.inspect}"
-                  @logger.info { info }
-                  raise Error['malformed-message'].new("rpc", "error")
+                  log_info { info }
+                  raise Error['malformed-message'].new("rpc", "error", logger: logger)
                 end
               when :before_chunk_size
                 if buf == "#"
                   state = :in_chunk_size
                 else
                   info = "In before_chunk_size: expected #{"#".inspect}, but got #{buf.inspect}: #{chunked_msg.string.inspect}"
-                  @logger.info { info }
-                  raise Error['malformed-message'].new("rpc", "error")
+                  log_info { info }
+                  raise Error['malformed-message'].new("rpc", "error", logger: logger)
                 end
               when :in_chunk_size
                 if buf =~ /[0-9]/
@@ -191,8 +197,8 @@ module HrrRbNetconf
                   state = :ending_msg
                 else
                   info = "In in_chunk_size: expected #{"/[0-9]/".inspect}, #{"\n".inspect}, or #{"#".inspect}, but got #{buf.inspect}: #{chunked_msg.string.inspect}"
-                  @logger.info { info }
-                  raise Error['malformed-message'].new("rpc", "error")
+                  log_info { info }
+                  raise Error['malformed-message'].new("rpc", "error", logger: logger)
                 end
               when :in_chunk_data
                 chunk_size = StringIO.new
@@ -204,28 +210,28 @@ module HrrRbNetconf
                   state = :before_chunk_size
                 else
                   info = "In after_chunk_data: expected #{"\n".inspect}, but got #{buf.inspect}: #{chunked_msg.string.inspect}"
-                  @logger.info { info }
-                  raise Error['malformed-message'].new("rpc", "error")
+                  log_info { info }
+                  raise Error['malformed-message'].new("rpc", "error", logger: logger)
                 end
               when :ending_msg
                 if buf == "\n"
                   state = :end_of_msg
                 else
                   info = "In ending_msg: expected #{"\n".inspect}, but got #{buf.inspect}: #{chunked_msg.string.inspect}"
-                  @logger.info { info }
-                  raise Error['malformed-message'].new("rpc", "error")
+                  log_info { info }
+                  raise Error['malformed-message'].new("rpc", "error", logger: logger)
                 end
               end
             end
-            @logger.debug { "Received message: #{decoded_msg.string.inspect}" }
+            log_debug { "Received message: #{decoded_msg.string.inspect}" }
             begin
               received_msg = REXML::Document.new(decoded_msg.string, {:ignore_whitespace_nodes => :all}).root
               validate_received_msg received_msg
               received_msg
             rescue => e
               info = "Invalid received message: #{e.message.split("\n").first}: #{decoded_msg.string.inspect}"
-              @logger.info { info }
-              raise Error['malformed-message'].new("rpc", "error")
+              log_info { info }
+              raise Error['malformed-message'].new("rpc", "error", logger: logger)
             end
           end
 

data/lib/hrr_rb_netconf/server/capability/candidate_1_0.rb

@@ -9,25 +9,27 @@ module HrrRbNetconf
         DEPENDENCIES = []
         IF_FEATURES  = ['candidate']
 
-        oper_proc('commit'){ |session, datastore, input_e|
-          datastore.run 'commit', input_e
-          '<ok />'
-        }
+        def define_capability
+          oper_proc('commit'){ |session, datastore, input_e|
+            datastore.run 'commit', input_e
+            '<ok />'
+          }
 
-        oper_proc('discard-changes'){ |session, datastore, input_e|
-          datastore.run 'discard-changes', input_e
-          '<ok />'
-        }
+          oper_proc('discard-changes'){ |session, datastore, input_e|
+            datastore.run 'discard-changes', input_e
+            '<ok />'
+          }
 
-        model 'get-config',      ['source', 'config-source', 'candidate'], 'leaf', 'type' => 'empty'
-        model 'edit-config',     ['target', 'config-target', 'candidate'], 'leaf', 'type' => 'empty'
-        model 'copy-config',     ['source', 'config-source', 'candidate'], 'leaf', 'type' => 'empty'
-        model 'copy-config',     ['target', 'config-target', 'candidate'], 'leaf', 'type' => 'empty'
-        model 'validate',        ['source', 'config-source', 'candidate'], 'leaf', 'type' => 'empty'
-        model 'lock',            ['target', 'config-target', 'candidate'], 'leaf', 'type' => 'empty'
-        model 'unlock',          ['target', 'config-target', 'candidate'], 'leaf', 'type' => 'empty'
-        model 'commit',          []
-        model 'discard-changes', []
+          model 'get-config',      ['source', 'config-source', 'candidate'], 'leaf', 'type' => 'empty'
+          model 'edit-config',     ['target', 'config-target', 'candidate'], 'leaf', 'type' => 'empty'
+          model 'copy-config',     ['source', 'config-source', 'candidate'], 'leaf', 'type' => 'empty'
+          model 'copy-config',     ['target', 'config-target', 'candidate'], 'leaf', 'type' => 'empty'
+          model 'validate',        ['source', 'config-source', 'candidate'], 'leaf', 'type' => 'empty'
+          model 'lock',            ['target', 'config-target', 'candidate'], 'leaf', 'type' => 'empty'
+          model 'unlock',          ['target', 'config-target', 'candidate'], 'leaf', 'type' => 'empty'
+          model 'commit',          []
+          model 'discard-changes', []
+        end
       end
     end
   end

data/lib/hrr_rb_netconf/server/capability/confirmed_commit_1_0.rb

@@ -9,8 +9,10 @@ module HrrRbNetconf
         DEPENDENCIES = ['urn:ietf:params:netconf:capability:candidate:1.0']
         IF_FEATURES  = ['candidate', 'confirmed-commit']
 
-        model 'commit', ['confirmed'],       'leaf', 'type' => 'empty'
-        model 'commit', ['confirm-timeout'], 'leaf', 'type' => 'integer', 'range' => [1, 2**32-1], 'default' => '600'
+        def define_capability
+          model 'commit', ['confirmed'],       'leaf', 'type' => 'empty'
+          model 'commit', ['confirm-timeout'], 'leaf', 'type' => 'integer', 'range' => [1, 2**32-1], 'default' => '600'
+        end
       end
     end
   end

data/lib/hrr_rb_netconf/server/capability/confirmed_commit_1_1.rb

@@ -9,15 +9,17 @@ module HrrRbNetconf
         DEPENDENCIES = ['urn:ietf:params:netconf:capability:candidate:1.0']
         IF_FEATURES  = ['candidate', 'confirmed-commit']
 
-        oper_proc('cancel-commit'){ |session, datastore, input_e|
-          datastore.run 'cancel-commit', input_e
-          '<ok />'
-        }
+        def define_capability
+          oper_proc('cancel-commit'){ |session, datastore, input_e|
+            datastore.run 'cancel-commit', input_e
+            '<ok />'
+          }
 
-        model 'commit', ['confirmed'],       'leaf', 'type' => 'empty'
-        model 'commit', ['confirm-timeout'], 'leaf', 'type' => 'integer', 'range' => [1, 2**32-1], 'default' => '600'
-        model 'commit', ['persist'],         'leaf', 'type' => 'string'
-        model 'commit', ['persist-id'],      'leaf', 'type' => 'string'
+          model 'commit', ['confirmed'],       'leaf', 'type' => 'empty'
+          model 'commit', ['confirm-timeout'], 'leaf', 'type' => 'integer', 'range' => [1, 2**32-1], 'default' => '600'
+          model 'commit', ['persist'],         'leaf', 'type' => 'string'
+          model 'commit', ['persist-id'],      'leaf', 'type' => 'string'
+        end
       end
     end
   end

data/lib/hrr_rb_netconf/server/capability/notification_1_0.rb

@@ -2,7 +2,6 @@
 # vim: et ts=2 sw=2
 
 require 'rexml/document'
-require 'hrr_rb_netconf/logger'
 
 module HrrRbNetconf
   class Server
@@ -12,69 +11,70 @@ module HrrRbNetconf
         DEPENDENCIES = []
         IF_FEATURES  = ['notification']
 
-        oper_proc('create-subscription'){ |session, datastore, input_e|
-          logger = Logger.new HrrRbNetconf::Server::Capability::Notification_1_0
-          stream_e = input_e.elements['stream']
-          unless stream_e
-            logger.debug { "create-subscription doesn't have stream, so use NETCONF stream" }
-            stream_e = input_e.add_element('stream')
-            stream_e.text = 'NETCONF'
-          end
-          stream = stream_e.text
-          start_time_e = input_e.elements['startTime']
-          start_time = unless start_time_e
-                         nil
-                       else
-                         DateTime.rfc3339(start_time_e.text)
-                       end
-          stop_time_e = input_e.elements['stopTime']
-          stop_time = unless stop_time_e
-                        nil
-                      else
-                        DateTime.rfc3339(stop_time_e.text)
-                      end
-          if ! session.subscription_creatable? stream
-            logger.error { "Not available stream: #{stream}" }
-            raise Error['bad-element'].new('protocol', 'error', info: {'bad-element' => 'stream'})
-          end
-          if start_time.nil? && stop_time
-            logger.error { "startTime element doesn't exist, but stopTime does" }
-            raise Error['missing-element'].new('protocol', 'error', info: {'bad-element' => 'startTime'})
-          end
-          if start_time && stop_time && (start_time > stop_time)
-            logger.error { "stopTime is earlier than startTime" }
-            raise Error['bad-element'].new('protocol', 'error', info: {'bad-element' => 'stopTime'})
-          end
-          if start_time && (start_time > DateTime.now)
-            logger.error { "startTime is later than current time" }
-            raise Error['bad-element'].new('protocol', 'error', info: {'bad-element' => 'startTime'})
-          end
-          begin
-            events = datastore.run('create-subscription', input_e)
-          rescue Error
-            raise
-          rescue => e
-            logger.error { "Exception in datastore.run('create-subscription', input_e): #{e.message}" }
-            raise Error['operation-failed'].new('application', 'error')
-          end
-          begin
-            if start_time
-              session.notification_replay stream, start_time, stop_time, events
+        def define_capability
+          oper_proc('create-subscription'){ |session, datastore, input_e|
+            stream_e = input_e.elements['stream']
+            unless stream_e
+              log_debug { "create-subscription doesn't have stream, so use NETCONF stream" }
+              stream_e = input_e.add_element('stream')
+              stream_e.text = 'NETCONF'
             end
-          rescue Error
-            raise
-          rescue => e
-            logger.error { "Exception in session.notification_replay: #{e.message}" }
-            raise Error['operation-failed'].new('protocol', 'error')
-          end
-          session.create_subscription stream, start_time, stop_time
-          '<ok />'
-        }
+            stream = stream_e.text
+            start_time_e = input_e.elements['startTime']
+            start_time = unless start_time_e
+                           nil
+                         else
+                           DateTime.rfc3339(start_time_e.text)
+                         end
+            stop_time_e = input_e.elements['stopTime']
+            stop_time = unless stop_time_e
+                          nil
+                        else
+                          DateTime.rfc3339(stop_time_e.text)
+                        end
+            if ! session.subscription_creatable? stream
+              log_error { "Not available stream: #{stream}" }
+              raise Error['bad-element'].new('protocol', 'error', info: {'bad-element' => 'stream'}, logger: logger)
+            end
+            if start_time.nil? && stop_time
+              log_error { "startTime element doesn't exist, but stopTime does" }
+              raise Error['missing-element'].new('protocol', 'error', info: {'bad-element' => 'startTime'}, logger: logger)
+            end
+            if start_time && stop_time && (start_time > stop_time)
+              log_error { "stopTime is earlier than startTime" }
+              raise Error['bad-element'].new('protocol', 'error', info: {'bad-element' => 'stopTime'}, logger: logger)
+            end
+            if start_time && (start_time > DateTime.now)
+              log_error { "startTime is later than current time" }
+              raise Error['bad-element'].new('protocol', 'error', info: {'bad-element' => 'startTime'}, logger: logger)
+            end
+            begin
+              events = datastore.run('create-subscription', input_e)
+            rescue Error
+              raise
+            rescue => e
+              log_error { "Exception in datastore.run('create-subscription', input_e): #{e.message}" }
+              raise Error['operation-failed'].new('application', 'error', logger: logger)
+            end
+            begin
+              if start_time
+                session.notification_replay stream, start_time, stop_time, events
+              end
+            rescue Error
+              raise
+            rescue => e
+              log_error { "Exception in session.notification_replay: #{e.message}" }
+              raise Error['operation-failed'].new('protocol', 'error', logger: logger)
+            end
+            session.create_subscription stream, start_time, stop_time
+            '<ok />'
+          }
 
-        model 'create-subscription', ['stream'],    'leaf', 'type' => 'string'
-        model 'create-subscription', ['filter'],    'leaf', 'type' => 'anyxml'
-        model 'create-subscription', ['startTime'], 'leaf', 'type' => 'string'
-        model 'create-subscription', ['stopTime'],  'leaf', 'type' => 'string'
+          model 'create-subscription', ['stream'],    'leaf', 'type' => 'string'
+          model 'create-subscription', ['filter'],    'leaf', 'type' => 'anyxml'
+          model 'create-subscription', ['startTime'], 'leaf', 'type' => 'string'
+          model 'create-subscription', ['stopTime'],  'leaf', 'type' => 'string'
+        end
       end
     end
   end

data/lib/hrr_rb_netconf/server/capability/rollback_on_error_1_0.rb

@@ -9,7 +9,9 @@ module HrrRbNetconf
         DEPENDENCIES = []
         IF_FEATURES  = ['rollback-on-error']
 
-        model 'edit-config', ['error-option'], 'leaf', 'type' => 'enumeration', 'enum' => ['stop-on-error', 'continue-on-error', 'rollback-on-error'], 'default' => 'stop-on-error'
+        def define_capability
+          model 'edit-config', ['error-option'], 'leaf', 'type' => 'enumeration', 'enum' => ['stop-on-error', 'continue-on-error', 'rollback-on-error'], 'default' => 'stop-on-error'
+        end
       end
     end
   end

data/lib/hrr_rb_netconf/server/capability/startup_1_0.rb

@@ -9,13 +9,15 @@ module HrrRbNetconf
         DEPENDENCIES = []
         IF_FEATURES  = ['startup']
 
-        model 'get-config',    ['source', 'config-source', 'startup'], 'leaf', 'type' => 'empty'
-        model 'copy-config',   ['source', 'config-source', 'startup'], 'leaf', 'type' => 'empty'
-        model 'copy-config',   ['target', 'config-target', 'startup'], 'leaf', 'type' => 'empty'
-        model 'lock',          ['target', 'config-target', 'startup'], 'leaf', 'type' => 'empty'
-        model 'unlock',        ['target', 'config-target', 'startup'], 'leaf', 'type' => 'empty'
-        model 'validate',      ['source', 'config-source', 'startup'], 'leaf', 'type' => 'empty'
-        model 'delete-config', ['target', 'config-target', 'startup'], 'leaf', 'type' => 'empty'
+        def define_capability
+          model 'get-config',    ['source', 'config-source', 'startup'], 'leaf', 'type' => 'empty'
+          model 'copy-config',   ['source', 'config-source', 'startup'], 'leaf', 'type' => 'empty'
+          model 'copy-config',   ['target', 'config-target', 'startup'], 'leaf', 'type' => 'empty'
+          model 'lock',          ['target', 'config-target', 'startup'], 'leaf', 'type' => 'empty'
+          model 'unlock',        ['target', 'config-target', 'startup'], 'leaf', 'type' => 'empty'
+          model 'validate',      ['source', 'config-source', 'startup'], 'leaf', 'type' => 'empty'
+          model 'delete-config', ['target', 'config-target', 'startup'], 'leaf', 'type' => 'empty'
+        end
       end
     end
   end

data/lib/hrr_rb_netconf/server/capability/url_1_0.rb

@@ -12,11 +12,13 @@ module HrrRbNetconf
         DEPENDENCIES = []
         IF_FEATURES  = []
 
-        model 'edit-config',   ['edit-content', 'url'],            'leaf', 'type' => 'string', 'validation' => proc { |cap, node| cap.queries['scheme'].any?{|s| s == URI.parse(node.text).scheme} }
-        model 'copy-config',   ['target', 'config-target', 'url'], 'leaf', 'type' => 'string'
-        model 'copy-config',   ['source', 'config-source', 'url'], 'leaf', 'type' => 'string'
-        model 'delete-config', ['target', 'config-target', 'url'], 'leaf', 'type' => 'string'
-        model 'validate',      ['source', 'config-source', 'url'], 'leaf', 'type' => 'string'
+        def define_capability
+          model 'edit-config',   ['edit-content', 'url'],            'leaf', 'type' => 'string', 'validation' => proc { |cap, node| cap.queries['scheme'].any?{|s| s == URI.parse(node.text).scheme} }
+          model 'copy-config',   ['target', 'config-target', 'url'], 'leaf', 'type' => 'string'
+          model 'copy-config',   ['source', 'config-source', 'url'], 'leaf', 'type' => 'string'
+          model 'delete-config', ['target', 'config-target', 'url'], 'leaf', 'type' => 'string'
+          model 'validate',      ['source', 'config-source', 'url'], 'leaf', 'type' => 'string'
+        end
       end
     end
   end