mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-30 21:45:37 +00:00
Code Issues Releases Wiki Activity

[65-libyang-option-data] Added Unexpected for impossible conditions and @throw for BadValue

Browse Source
This commit is contained in:
Francis Dupont
2018-09-22 12:17:42 +02:00
parent 7a36a3b36e
commit 47fb8c4e7b
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/lib/yang/translator_option_data.cc
View File

@@ -43,7 +43,9 @@ TranslatorOptionData::getOptionDataKea(const string& xpath) {
ConstElementPtr code = getItem(xpath + "/code"); ConstElementPtr code = getItem(xpath + "/code");
ConstElementPtr space = getItem(xpath + "/space"); ConstElementPtr space = getItem(xpath + "/space");
if (!code || !space) { if (!code || !space) {
return (ElementPtr()); // Can't happen as code and space are the keys.
isc_throw(Unexpected, "getOptionDataKea requires code and space: "
<< xpath);
} }
ElementPtr result = Element::createMap(); ElementPtr result = Element::createMap();
result->set("code", code); result->set("code", code);
@@ -93,6 +95,7 @@ TranslatorOptionData::setOptionData(const string& xpath,
void void
TranslatorOptionData::setOptionDataKea(const string& xpath, TranslatorOptionData::setOptionDataKea(const string& xpath,
ConstElementPtr elem) { ConstElementPtr elem) {
// Skip keys code and space.
ConstElementPtr name = elem->get("name"); ConstElementPtr name = elem->get("name");
if (name) { if (name) {
setItem(xpath + "/name", name, SR_STRING_T); setItem(xpath + "/name", name, SR_STRING_T);
@@ -146,7 +149,9 @@ TranslatorOptionDataList::getOptionDataListKea(const string& xpath) {
ElementPtr result = Element::createList(); ElementPtr result = Element::createList();
S_Iter_Value iter = getIter(xpath + "/*"); S_Iter_Value iter = getIter(xpath + "/*");
if (!iter) { if (!iter) {
return (ConstElementPtr()); // Can't happen.
isc_throw(Unexpected, "getOptionDataListKea: can't get iterator: "
<< xpath);
} }
for (;;) { for (;;) {
const string& option = getNext(iter); const string& option = getNext(iter);
@@ -187,7 +192,7 @@ TranslatorOptionDataList::setOptionDataListKea(const string& xpath,
} }
unsigned code = static_cast<unsigned>(option->get("code")->intValue()); unsigned code = static_cast<unsigned>(option->get("code")->intValue());
if (!option->contains("space")) { if (!option->contains("space")) {
isc_throw(BadValue,"option data without space: " <<option->str()); isc_throw(BadValue, "option data without space: " <<option->str());
} }
string space = option->get("space")->stringValue(); string space = option->get("space")->stringValue();
ostringstream keys; ostringstream keys;

1
src/lib/yang/translator_option_data.h
View File

@@ -131,6 +131,7 @@ protected:
/// ///
/// @param xpath The xpath of the option data list. /// @param xpath The xpath of the option data list.
/// @param elem The JSON element. /// @param elem The JSON element.
/// @throw BadValue on option data without code or space.
void setOptionDataListKea(const std::string& xpath, void setOptionDataListKea(const std::string& xpath,
isc::data::ConstElementPtr elem); isc::data::ConstElementPtr elem);