diff options
| -rw-r--r-- | doc/Makefile.am | 8 | ||||
| -rw-r--r-- | doc/examples/kea4/all-keys-netconf.json (renamed from doc/examples/kea4/all-keys-stable.json) | 0 | ||||
| -rw-r--r-- | doc/examples/kea4/all-keys.json (renamed from doc/examples/kea4/all-keys-current.json) | 0 | ||||
| -rw-r--r-- | doc/examples/kea6/all-keys-netconf.json (renamed from doc/examples/kea6/all-keys-stable.json) | 0 | ||||
| -rw-r--r-- | doc/examples/kea6/all-keys.json (renamed from doc/examples/kea6/all-keys-current.json) | 0 | ||||
| -rw-r--r-- | src/bin/dhcp4/tests/parser_unittest.cc | 4 | ||||
| -rw-r--r-- | src/bin/dhcp6/tests/parser_unittest.cc | 4 | ||||
| -rw-r--r-- | src/lib/yang/tests/adaptor_config_unittests.cc | 4 | ||||
| -rw-r--r-- | src/lib/yang/tests/config_unittests.cc | 4 |
9 files changed, 12 insertions, 12 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index 64a99fbc16..f15185ac33 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -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/shell/kea-stunnel.conf 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-stable.json +nobase_dist_doc_DATA += examples/kea4/all-keys.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/cassandra.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/with-ddns.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-stable.json +nobase_dist_doc_DATA += examples/kea6/all-keys.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/cassandra.json nobase_dist_doc_DATA += examples/kea6/classify.json diff --git a/doc/examples/kea4/all-keys-stable.json b/doc/examples/kea4/all-keys-netconf.json index 765bf77bd3..765bf77bd3 100644 --- a/doc/examples/kea4/all-keys-stable.json +++ b/doc/examples/kea4/all-keys-netconf.json diff --git a/doc/examples/kea4/all-keys-current.json b/doc/examples/kea4/all-keys.json index ada331388d..ada331388d 100644 --- a/doc/examples/kea4/all-keys-current.json +++ b/doc/examples/kea4/all-keys.json diff --git a/doc/examples/kea6/all-keys-stable.json b/doc/examples/kea6/all-keys-netconf.json index 9162705fea..9162705fea 100644 --- a/doc/examples/kea6/all-keys-stable.json +++ b/doc/examples/kea6/all-keys-netconf.json diff --git a/doc/examples/kea6/all-keys-current.json b/doc/examples/kea6/all-keys.json index acadb2a3e0..acadb2a3e0 100644 --- a/doc/examples/kea6/all-keys-current.json +++ b/doc/examples/kea6/all-keys.json diff --git a/src/bin/dhcp4/tests/parser_unittest.cc b/src/bin/dhcp4/tests/parser_unittest.cc index e66ffbc808..61ff0b1173 100644 --- a/src/bin/dhcp4/tests/parser_unittest.cc +++ b/src/bin/dhcp4/tests/parser_unittest.cc @@ -264,7 +264,7 @@ void testFile(const std::string& fname) { // the second time with Parser4. Both JSON trees are then compared. TEST(ParserTest, file) { vector<string> configs = { "advanced.json" , - "all-keys-current.json", + "all-keys.json", "backends.json", "cassandra.json", "classify.json", @@ -292,7 +292,7 @@ TEST(ParserTest, file) { TEST(ParserTest, globalParameters) { ConstElementPtr json; 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 = json->get("Dhcp4")); SimpleParser4 parser; diff --git a/src/bin/dhcp6/tests/parser_unittest.cc b/src/bin/dhcp6/tests/parser_unittest.cc index 443fd41a33..84ab706ec4 100644 --- a/src/bin/dhcp6/tests/parser_unittest.cc +++ b/src/bin/dhcp6/tests/parser_unittest.cc @@ -270,7 +270,7 @@ void testFile(const std::string& fname) { TEST(ParserTest, file) { vector<string> configs; 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("cassandra.json"); configs.push_back("classify.json"); @@ -302,7 +302,7 @@ TEST(ParserTest, file) { TEST(ParserTest, globalParameters) { ConstElementPtr json; 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 = json->get("Dhcp6")); SimpleParser6 parser; diff --git a/src/lib/yang/tests/adaptor_config_unittests.cc b/src/lib/yang/tests/adaptor_config_unittests.cc index b86a43af87..7e7f7b654b 100644 --- a/src/lib/yang/tests/adaptor_config_unittests.cc +++ b/src/lib/yang/tests/adaptor_config_unittests.cc @@ -62,7 +62,7 @@ void testFile(const std::string& fname, bool v6, ElementPtr& result) { TEST_F(AdaptorConfigTest, loadExamples4) { vector<string> configs = { "advanced.json", - "all-keys-stable.json", + "all-keys-netconf.json", "backends.json", "cassandra.json", "classify.json", @@ -95,7 +95,7 @@ TEST_F(AdaptorConfigTest, loadExamples4) { TEST_F(AdaptorConfigTest, loadExamples6) { vector<string> configs = { "advanced.json", - "all-keys-stable.json", + "all-keys-netconf.json", "backends.json", "cassandra.json", "classify.json", diff --git a/src/lib/yang/tests/config_unittests.cc b/src/lib/yang/tests/config_unittests.cc index 57a2c0d1ee..6fc7e957d8 100644 --- a/src/lib/yang/tests/config_unittests.cc +++ b/src/lib/yang/tests/config_unittests.cc @@ -334,7 +334,7 @@ TEST_F(ConfigTest, examples4) { vector<string> examples = { "advanced.json", - "all-keys-stable.json", + "all-keys-netconf.json", "backends.json", "cassandra.json", "classify.json", @@ -375,7 +375,7 @@ TEST_F(ConfigTest, examples6) { vector<string> examples = { "advanced.json", - "all-keys-stable.json", + "all-keys-netconf.json", "backends.json", "cassandra.json", "classify.json", |