rebase to upstream latest

Signed-off-by: Sheldon Wu <[email protected]>

Author: sheldnwu

generated/nlctrl-user.cpp

@@ -478,7 +478,7 @@ nlctrl_getfamily_dump(ynl_cpp::ynl_socket& ys)
 	yds.yarg.ys = ys;
 	yds.yarg.rsp_policy = &nlctrl_ctrl_attrs_nest;
 	yds.yarg.data = ret.get();
-	yds.alloc_cb = [](void* arg)->void*{return &(static_cast<nlctrl_getfamily_list*>(arg)->objs.emplace_back());};
+	yds.alloc_cb = [](void* arg)->void* {return &(static_cast<nlctrl_getfamily_list*>(arg)->objs.emplace_back());};
 	yds.cb = nlctrl_getfamily_rsp_parse;
 	yds.rsp_cmd = 1;
 
@@ -494,14 +494,14 @@ nlctrl_getfamily_dump(ynl_cpp::ynl_socket& ys)
 
 /* ============== CTRL_CMD_GETPOLICY ============== */
 /* CTRL_CMD_GETPOLICY - dump */
-int nlctrl_getpolicy_rsp_dump_parse(const struct nlmsghdr *nlh,
-				    struct ynl_parse_arg *yarg)
+int nlctrl_getpolicy_rsp_parse(const struct nlmsghdr *nlh,
+			       struct ynl_parse_arg *yarg)
 {
-	nlctrl_getpolicy_rsp_dump *dst;
+	nlctrl_getpolicy_rsp *dst;
 	const struct nlattr *attr;
 	struct ynl_parse_arg parg;
 
-	dst = (nlctrl_getpolicy_rsp_dump*)yarg->data;
+	dst = (nlctrl_getpolicy_rsp*)yarg->data;
 	parg.ys = yarg->ys;
 
 	ynl_attr_for_each(attr, nlh, yarg->ys->family->hdr_len) {
@@ -546,19 +546,19 @@ int nlctrl_getpolicy_rsp_dump_parse(const struct nlmsghdr *nlh,
 	return YNL_PARSE_CB_OK;
 }
 
-std::unique_ptr<nlctrl_getpolicy_rsp_list>
-nlctrl_getpolicy_dump(ynl_cpp::ynl_socket& ys, nlctrl_getpolicy_req_dump& req)
+std::unique_ptr<nlctrl_getpolicy_list>
+nlctrl_getpolicy_dump(ynl_cpp::ynl_socket& ys, nlctrl_getpolicy_req& req)
 {
 	struct ynl_dump_no_alloc_state yds = {};
 	struct nlmsghdr *nlh;
 	int err;
 
-	auto ret = std::make_unique<nlctrl_getpolicy_rsp_list>();
+	auto ret = std::make_unique<nlctrl_getpolicy_list>();
 	yds.yarg.ys = ys;
 	yds.yarg.rsp_policy = &nlctrl_ctrl_attrs_nest;
 	yds.yarg.data = ret.get();
-	yds.alloc_cb = [](void* arg)->void*{return &(static_cast<nlctrl_getpolicy_rsp_list*>(arg)->objs.emplace_back());};
-	yds.cb = nlctrl_getpolicy_rsp_dump_parse;
+	yds.alloc_cb = [](void* arg)->void* {return &(static_cast<nlctrl_getpolicy_list*>(arg)->objs.emplace_back());};
+	yds.cb = nlctrl_getpolicy_rsp_parse;
 	yds.rsp_cmd = CTRL_CMD_GETPOLICY;
 
 	nlh = ynl_gemsg_start_dump(ys, ((struct ynl_sock*)ys)->family_id, CTRL_CMD_GETPOLICY, 1);

generated/nlctrl-user.hpp

@@ -16,6 +16,7 @@
 #include <string>
 #include <string_view>
 #include <vector>
+#include <array>
 
 #include "ynl.hpp"
 
@@ -96,24 +97,24 @@ nlctrl_getfamily_dump(ynl_cpp::ynl_socket& ys);
 
 /* ============== CTRL_CMD_GETPOLICY ============== */
 /* CTRL_CMD_GETPOLICY - dump */
-struct nlctrl_getpolicy_req_dump {
+struct nlctrl_getpolicy_req {
 	std::string family_name;
 	std::optional<__u16> family_id;
 	std::optional<__u32> op;
 };
 
-struct nlctrl_getpolicy_rsp_dump {
+struct nlctrl_getpolicy_rsp {
 	std::optional<__u16> family_id;
 	std::optional<nlctrl_op_policy_attrs> op_policy;
 	std::optional<nlctrl_policy_attrs> policy;
 };
 
-struct nlctrl_getpolicy_rsp_list {
-	std::list<nlctrl_getpolicy_rsp_dump> objs;
+struct nlctrl_getpolicy_list {
+	std::list<nlctrl_getpolicy_rsp> objs;
 };
 
-std::unique_ptr<nlctrl_getpolicy_rsp_list>
-nlctrl_getpolicy_dump(ynl_cpp::ynl_socket& ys, nlctrl_getpolicy_req_dump& req);
+std::unique_ptr<nlctrl_getpolicy_list>
+nlctrl_getpolicy_dump(ynl_cpp::ynl_socket& ys, nlctrl_getpolicy_req& req);
 
 } //namespace ynl_cpp
 #endif /* _LINUX_NLCTRL_GEN_H */

generated/ovs_datapath-user.cpp

@@ -14,8 +14,8 @@
 namespace ynl_cpp {
 
 /* Enums */
-static constexpr std::array<std::string_view, OVS_DP_CMD_DEL + 1> ovs_datapath_op_strmap = []() {
-	std::array<std::string_view, OVS_DP_CMD_DEL + 1> arr{};
+static constexpr std::array<std::string_view, OVS_DP_CMD_GET + 1> ovs_datapath_op_strmap = []() {
+	std::array<std::string_view, OVS_DP_CMD_GET + 1> arr{};
 	arr[OVS_DP_CMD_GET] = "get";
 	arr[OVS_DP_CMD_NEW] = "new";
 	arr[OVS_DP_CMD_DEL] = "del";
@@ -193,7 +193,7 @@ ovs_datapath_get_dump(ynl_cpp::ynl_socket& ys, ovs_datapath_get_req_dump& req)
 	yds.yarg.ys = ys;
 	yds.yarg.rsp_policy = &ovs_datapath_datapath_nest;
 	yds.yarg.data = ret.get();
-	yds.alloc_cb = [](void* arg)->void*{return &(static_cast<ovs_datapath_get_list*>(arg)->objs.emplace_back());};
+	yds.alloc_cb = [](void* arg)->void* {return &(static_cast<ovs_datapath_get_list*>(arg)->objs.emplace_back());};
 	yds.cb = ovs_datapath_get_rsp_parse;
 	yds.rsp_cmd = OVS_DP_CMD_GET;
 

generated/ovs_datapath-user.hpp

@@ -16,6 +16,7 @@
 #include <string>
 #include <string_view>
 #include <vector>
+#include <array>
 
 #include "ynl.hpp"