mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-01 14:35:29 +00:00
Code Issues Releases Wiki Activity

[#837,!487] all-keys-{current,stable} renamed

Browse Source
This commit is contained in:
Tomek Mrugalski
2019-08-16 12:56:37 +02:00
committed by Tomek Mrugalski
parent ee9fe18ee1
commit cf2967fb8f
9 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
doc/Makefile.am
View File

@@ -11,8 +11,8 @@ nobase_dist_doc_DATA += examples/https/httpd2/kea-httpd2.conf
nobase_dist_doc_DATA += examples/https/nginx/kea-nginx.conf nobase_dist_doc_DATA += examples/https/nginx/kea-nginx.conf
nobase_dist_doc_DATA += examples/https/shell/kea-stunnel.conf nobase_dist_doc_DATA += examples/https/shell/kea-stunnel.conf
nobase_dist_doc_DATA += examples/kea4/advanced.json nobase_dist_doc_DATA += examples/kea4/advanced.json
nobase_dist_doc_DATA += examples/kea4/all-keys-current.json nobase_dist_doc_DATA += examples/kea4/all-keys.json
nobase_dist_doc_DATA += examples/kea4/all-keys-stable.json nobase_dist_doc_DATA += examples/kea4/all-keys-netconf.json
nobase_dist_doc_DATA += examples/kea4/backends.json nobase_dist_doc_DATA += examples/kea4/backends.json
nobase_dist_doc_DATA += examples/kea4/cassandra.json nobase_dist_doc_DATA += examples/kea4/cassandra.json
nobase_dist_doc_DATA += examples/kea4/classify.json nobase_dist_doc_DATA += examples/kea4/classify.json
@@ -34,8 +34,8 @@ nobase_dist_doc_DATA += examples/kea4/shared-network.json
nobase_dist_doc_DATA += examples/kea4/single-subnet.json nobase_dist_doc_DATA += examples/kea4/single-subnet.json
nobase_dist_doc_DATA += examples/kea4/with-ddns.json nobase_dist_doc_DATA += examples/kea4/with-ddns.json
nobase_dist_doc_DATA += examples/kea6/advanced.json nobase_dist_doc_DATA += examples/kea6/advanced.json
nobase_dist_doc_DATA += examples/kea6/all-keys-current.json nobase_dist_doc_DATA += examples/kea6/all-keys.json
nobase_dist_doc_DATA += examples/kea6/all-keys-stable.json nobase_dist_doc_DATA += examples/kea6/all-keys-netconf.json
nobase_dist_doc_DATA += examples/kea6/backends.json nobase_dist_doc_DATA += examples/kea6/backends.json
nobase_dist_doc_DATA += examples/kea6/cassandra.json nobase_dist_doc_DATA += examples/kea6/cassandra.json
nobase_dist_doc_DATA += examples/kea6/classify.json nobase_dist_doc_DATA += examples/kea6/classify.json

0
doc/examples/kea4/all-keys-stable.json → doc/examples/kea4/all-keys-netconf.json
View File

0
doc/examples/kea4/all-keys-current.json → doc/examples/kea4/all-keys.json
View File

0
doc/examples/kea6/all-keys-stable.json → doc/examples/kea6/all-keys-netconf.json
View File

0
doc/examples/kea6/all-keys-current.json → doc/examples/kea6/all-keys.json
View File

4
src/bin/dhcp4/tests/parser_unittest.cc
View File

@@ -264,7 +264,7 @@ void testFile(const std::string& fname) {
// the second time with Parser4. Both JSON trees are then compared. // the second time with Parser4. Both JSON trees are then compared.
TEST(ParserTest, file) { TEST(ParserTest, file) {
vector<string> configs = { "advanced.json" , vector<string> configs = { "advanced.json" ,
"all-keys-current.json", "all-keys.json",
"backends.json", "backends.json",
"cassandra.json", "cassandra.json",
"classify.json", "classify.json",
@@ -292,7 +292,7 @@ TEST(ParserTest, file) {
TEST(ParserTest, globalParameters) { TEST(ParserTest, globalParameters) {
ConstElementPtr json; ConstElementPtr json;
Parser4Context ctx; Parser4Context ctx;
string fname = string(CFG_EXAMPLES) + "/" + "all-keys-current.json"; string fname = string(CFG_EXAMPLES) + "/" + "all-keys.json";
EXPECT_NO_THROW(json = ctx.parseFile(fname, Parser4Context::PARSER_DHCP4)); EXPECT_NO_THROW(json = ctx.parseFile(fname, Parser4Context::PARSER_DHCP4));
EXPECT_NO_THROW(json = json->get("Dhcp4")); EXPECT_NO_THROW(json = json->get("Dhcp4"));
SimpleParser4 parser; SimpleParser4 parser;

4
src/bin/dhcp6/tests/parser_unittest.cc
View File

@@ -270,7 +270,7 @@ void testFile(const std::string& fname) {
TEST(ParserTest, file) { TEST(ParserTest, file) {
vector<string> configs; vector<string> configs;
configs.push_back("advanced.json"); configs.push_back("advanced.json");
configs.push_back("all-keys-current.json"); configs.push_back("all-keys.json");
configs.push_back("backends.json"); configs.push_back("backends.json");
configs.push_back("cassandra.json"); configs.push_back("cassandra.json");
configs.push_back("classify.json"); configs.push_back("classify.json");
@@ -302,7 +302,7 @@ TEST(ParserTest, file) {
TEST(ParserTest, globalParameters) { TEST(ParserTest, globalParameters) {
ConstElementPtr json; ConstElementPtr json;
Parser6Context ctx; Parser6Context ctx;
string fname = string(CFG_EXAMPLES) + "/" + "all-keys-current.json"; string fname = string(CFG_EXAMPLES) + "/" + "all-keys.json";
EXPECT_NO_THROW(json = ctx.parseFile(fname, Parser6Context::PARSER_DHCP6)); EXPECT_NO_THROW(json = ctx.parseFile(fname, Parser6Context::PARSER_DHCP6));
EXPECT_NO_THROW(json = json->get("Dhcp6")); EXPECT_NO_THROW(json = json->get("Dhcp6"));
SimpleParser6 parser; SimpleParser6 parser;

4
src/lib/yang/tests/adaptor_config_unittests.cc
View File

@@ -62,7 +62,7 @@ void testFile(const std::string& fname, bool v6, ElementPtr& result) {
TEST_F(AdaptorConfigTest, loadExamples4) { TEST_F(AdaptorConfigTest, loadExamples4) {
vector<string> configs = { "advanced.json", vector<string> configs = { "advanced.json",
"all-keys-stable.json", "all-keys-netconf.json",
"backends.json", "backends.json",
"cassandra.json", "cassandra.json",
"classify.json", "classify.json",
@@ -95,7 +95,7 @@ TEST_F(AdaptorConfigTest, loadExamples4) {
TEST_F(AdaptorConfigTest, loadExamples6) { TEST_F(AdaptorConfigTest, loadExamples6) {
vector<string> configs = { "advanced.json", vector<string> configs = { "advanced.json",
"all-keys-stable.json", "all-keys-netconf.json",
"backends.json", "backends.json",
"cassandra.json", "cassandra.json",
"classify.json", "classify.json",

4
src/lib/yang/tests/config_unittests.cc
View File

@@ -334,7 +334,7 @@ TEST_F(ConfigTest, examples4) {
vector<string> examples = { vector<string> examples = {
"advanced.json", "advanced.json",
"all-keys-stable.json", "all-keys-netconf.json",
"backends.json", "backends.json",
"cassandra.json", "cassandra.json",
"classify.json", "classify.json",
@@ -375,7 +375,7 @@ TEST_F(ConfigTest, examples6) {
vector<string> examples = { vector<string> examples = {
"advanced.json", "advanced.json",
"all-keys-stable.json", "all-keys-netconf.json",
"backends.json", "backends.json",
"cassandra.json", "cassandra.json",
"classify.json", "classify.json",