Test whether op is "SET" during parsing json file

stephenxs · stephenxs · commit e37a6fb7ba07 · 2020-11-20T09:35:18.000Z
diff --git a/common/json.cpp b/common/json.cpp
@@ -83,6 +83,17 @@ bool JSon::loadJsonFromFile(ifstream &fs, vector<KeyOpFieldsValuesTuple> &db_ite
                         kfvFieldsValues(cur_db_item).push_back(FieldValueTuple(field_str, value_str));
                     }
                 }
+                else
+                {
+                    auto op = cur_obj.get<string>();
+                    if (op != "SET")
+                    {
+                        SWSS_LOG_ERROR("Child elements'op field must be SET, but got %s, ignored", op.c_str());
+                        db_items.pop_back();
+                        break;
+                    }
+                    kfvOp(cur_db_item) = op;
+                }
             }
         }
         else

Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,17 @@ bool JSon::loadJsonFromFile(ifstream &fs, vector<KeyOpFieldsValuesTuple> &db_ite`
`83`	`83`	`kfvFieldsValues(cur_db_item).push_back(FieldValueTuple(field_str, value_str));`
`84`	`84`	`}`
`85`	`85`	`}`
	`86`	`+ else`
	`87`	`+ {`
	`88`	`+ auto op = cur_obj.get<string>();`
	`89`	`+ if (op != "SET")`
	`90`	`+ {`
	`91`	`+ SWSS_LOG_ERROR("Child elements'op field must be SET, but got %s, ignored", op.c_str());`
	`92`	`+ db_items.pop_back();`
	`93`	`+ break;`
	`94`	`+ }`
	`95`	`+ kfvOp(cur_db_item) = op;`
	`96`	`+ }`
`86`	`97`	`}`
`87`	`98`	`}`
`88`	`99`	`else`