2
0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-31 05:55:28 +00:00

[#665,!460] Implemented support in netconf agent

doc/examples/netconf/simple-dhcp4.json
doc/examples/netconf/simple-dhcp6.json

src/bin/netconf/netconf_lexer.ll
src/bin/netconf/netconf_parser.yy

src/bin/netconf/location.hh
src/bin/netconf/netconf_lexer.cc
src/bin/netconf/netconf_parser.cc
src/bin/netconf/netconf_parser.h
src/bin/netconf/position.hh
src/bin/netconf/stack.hh
This commit is contained in:
Thomas Markwalder
2019-08-08 15:10:52 -04:00
committed by Tomek Mrugalski
parent 3bbac71905
commit 293a173751
10 changed files with 2082 additions and 2397 deletions

View File

@@ -102,7 +102,9 @@
// kept.
"flush": true,
"maxsize": 204800,
"maxver": 4
"maxver": 4,
// We use pattern to specify custom log message layout
"pattern": "%d{%y.%m.%d %H:%M:%S.%q} %-5p [%c/%i] %m\n"
}
],
// You can change the severity to DEBUG, INFO, WARN, ERROR or

View File

@@ -103,7 +103,10 @@
// kept.
"flush": true,
"maxsize": 204800,
"maxver": 4
"maxver": 4,
// We use pattern to specify custom log message layout
"pattern": "%d{%y.%m.%d %H:%M:%S.%q} %-5p [%c/%i] %m\n"
}
],
// You can change the severity to DEBUG, INFO, WARN, ERROR or

View File

@@ -1,9 +1,8 @@
// Generated 201906181715
// A Bison parser, made by GNU Bison 3.4.1.
// A Bison parser, made by GNU Bison 3.2.1.
// Locations for Bison parsers in C++
// Copyright (C) 2002-2015, 2018-2019 Free Software Foundation, Inc.
// Copyright (C) 2002-2015, 2018 Free Software Foundation, Inc.
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -55,10 +54,9 @@
# endif
# endif
#line 14 "netconf_parser.yy"
#line 14 "netconf_parser.yy" // location.cc:339
namespace isc { namespace netconf {
#line 60 "location.hh"
#line 60 "location.hh" // location.cc:339
/// A point in a source file.
class position
{
@@ -318,8 +316,7 @@ namespace isc { namespace netconf {
return ostr;
}
#line 14 "netconf_parser.yy"
#line 14 "netconf_parser.yy" // location.cc:339
} } // isc::netconf
#line 323 "location.hh"
#line 322 "location.hh" // location.cc:339
#endif // !YY_NETCONF_LOCATION_HH_INCLUDED

File diff suppressed because it is too large Load Diff

View File

@@ -453,6 +453,15 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence}
}
}
\"pattern\" {
switch(driver.ctx_) {
case ParserContext::OUTPUT_OPTIONS:
return NetconfParser::make_PATTERN(driver.loc_);
default:
return NetconfParser::make_STRING("pattern", driver.loc_);
}
}
\"debuglevel\" {
switch(driver.ctx_) {
case ParserContext::LOGGERS:

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -85,6 +85,7 @@ using namespace std;
FLUSH "flush"
MAXSIZE "maxsize"
MAXVER "maxver"
PATTERN "pattern"
// Not real tokens, just a way to signal what the parser is expected to
// parse. This define the starting point. It either can be full grammar
@@ -673,6 +674,7 @@ output_params: output
| flush
| maxsize
| maxver
| pattern
;
output: OUTPUT {
@@ -698,6 +700,14 @@ maxver: MAXVER COLON INTEGER {
ctx.stack_.back()->set("maxver", maxver);
};
pattern: PATTERN {
ctx.enter(ctx.NO_KEYWORDS);
} COLON STRING {
ElementPtr sev(new StringElement($4, ctx.loc2pos(@4)));
ctx.stack_.back()->set("pattern", sev);
ctx.leave();
};
%%
void

View File

@@ -1,5 +1,4 @@
// Generated 201906181715
// A Bison parser, made by GNU Bison 3.4.1.
// A Bison parser, made by GNU Bison 3.2.1.
// Starting with Bison 3.2, this file is useless: the structure it
// used to define is now defined in "location.hh".

View File

@@ -1,5 +1,4 @@
// Generated 201906181715
// A Bison parser, made by GNU Bison 3.4.1.
// A Bison parser, made by GNU Bison 3.2.1.
// Starting with Bison 3.2, this file is useless: the structure it
// used to define is now defined with the parser itself.