packages/clibcni
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update version to v2.0.7

Browse Source 
Signed-off-by: WangFengTu <wangfengtu@huawei.com>
This commit is contained in:
WangFengTu 2022-02-24 19:29:12 +08:00
parent cabed89d46
commit f9eae0aed4
8 changed files with 10 additions and 931 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
0001-improve-code-for-check-ags.patch
View File

@ -1,84 +0,0 @@
From 9911948a5806c6641d8c6a7ffe7cbe82da165917 Mon Sep 17 00:00:00 2001
From: haozi007 <liuhao27@huawei.com>
Date: Mon, 22 Nov 2021 06:27:10 +0000
Subject: [PATCH 1/6] improve code for check ags
Signed-off-by: haozi007 <liuhao27@huawei.com>
---
.gitignore | 2 ++
src/api.c | 9 +++++++--
src/conf.c | 9 +++++----
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/.gitignore b/.gitignore
index c663504..31f4e6f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,5 @@ missing
**/.deps
**/.dirstamp
+
+.vscode
diff --git a/src/api.c b/src/api.c
index 52d193f..13a4ec8 100644
--- a/src/api.c
+++ b/src/api.c
@@ -114,6 +114,10 @@ static int inject_runtime_config_items(const struct network_config *orig, const
int ret = -1;
size_t i = 0;
+ if (orig->network->capabilities == NULL) {
+ return 0;
+ }
+
*rt_config = clibcni_util_common_calloc_s(sizeof(cni_net_conf_runtime_config));
if (*rt_config == NULL) {
*err = clibcni_util_strdup_s("Out of memory");
@@ -182,8 +186,9 @@ static int inject_runtime_config(const struct network_config *orig, const struct
return -1;
}
- if (orig->network == NULL || orig->network->capabilities == NULL) {
- return 0;
+ if (orig->network == NULL) {
+ ERROR("empty network config");
+ return -1;
}
save_conf = orig->network->runtime_config;
diff --git a/src/conf.c b/src/conf.c
index a6f3f04..d1ff3d9 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -37,13 +37,14 @@
static int do_conf_from_bytes(const char *conf_str, struct network_config *config, char **err)
{
int ret = 0;
+ int nret = 0;
parser_error jerr = NULL;
struct parser_context ctx = { OPT_PARSE_FULLKEY | OPT_GEN_SIMPLIFY, 0 };
config->network = cni_net_conf_parse_data(conf_str, &ctx, &jerr);
if (config->network == NULL) {
- ret = asprintf(err, "Error parsing configuration: %s", jerr);
- if (ret < 0) {
+ nret = asprintf(err, "Error parsing configuration: %s", jerr);
+ if (nret < 0) {
*err = clibcni_util_strdup_s("Out of memory");
}
ERROR("Error parsing configuration: %s", jerr);
@@ -51,8 +52,8 @@ static int do_conf_from_bytes(const char *conf_str, struct network_config *confi
goto out;
}
if (config->network->name != NULL && clibcni_util_validate_name(config->network->name) != 0) {
- ret = asprintf(err, "Invalid network name: %s", config->network->name);
- if (ret < 0) {
+ nret = asprintf(err, "Invalid network name: %s", config->network->name);
+ if (nret < 0) {
*err = clibcni_util_strdup_s("Out of memory");
}
ERROR("Invalid network name: %s", config->network->name);
--
2.20.1

697
0002-improve-coverage-of-ut.patch
View File

@ -1,697 +0,0 @@
From 76386373577c70a3a302c6aaa48fd301ffb173b2 Mon Sep 17 00:00:00 2001
From: haozi007 <liuhao27@huawei.com>
Date: Mon, 22 Nov 2021 06:27:29 +0000
Subject: [PATCH 2/6] improve coverage of ut
Signed-off-by: haozi007 <liuhao27@huawei.com>
---
tests/CMakeLists.txt | 11 +
tests/api_llt.cpp | 382 +++++++++++++++++++++++++++++-
tests/confs/default-invalid.conf | 13 +
tests/confs/default.json | 13 +
tests/confs/test-bad.conflist | 12 +
tests/confs/test-invalid.conflist | 12 +
tests/confs/test.conflist | 12 +
tests/utils/bridge | 16 ++
tests/utils/bridge-bad | 8 +
tests/utils/constants.h | 19 ++
tests/utils/host-local | 8 +
tests/utils/loopback | 8 +
tests/utils/portmap | 8 +
13 files changed, 517 insertions(+), 5 deletions(-)
create mode 100644 tests/confs/default-invalid.conf
create mode 100644 tests/confs/default.json
create mode 100644 tests/confs/test-bad.conflist
create mode 100644 tests/confs/test-invalid.conflist
create mode 100644 tests/confs/test.conflist
create mode 100755 tests/utils/bridge
create mode 100755 tests/utils/bridge-bad
create mode 100755 tests/utils/host-local
create mode 100755 tests/utils/loopback
create mode 100755 tests/utils/portmap
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index e2571a0..b1f5c35 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -19,6 +19,17 @@ include_directories(
add_subdirectory(utils)
+file(COPY utils/loopback DESTINATION utils/)
+file(COPY utils/bridge DESTINATION utils/)
+file(COPY utils/portmap DESTINATION utils/)
+file(COPY utils/host-local DESTINATION utils/)
+file(COPY utils/bridge-bad DESTINATION utils/)
+file(COPY confs/default-invalid.conf DESTINATION confs/)
+file(COPY confs/default.json DESTINATION confs/)
+file(COPY confs/test-bad.conflist DESTINATION confs/)
+file(COPY confs/test-invalid.conflist DESTINATION confs/)
+file(COPY confs/test.conflist DESTINATION confs/)
+
macro(_DEFINE_NEW_TEST)
add_executable(${ARGV0}
${TESTS_UTILS_SRCS}
diff --git a/tests/api_llt.cpp b/tests/api_llt.cpp
index d21ec01..186c76b 100644
--- a/tests/api_llt.cpp
+++ b/tests/api_llt.cpp
@@ -18,6 +18,7 @@
#include <string.h>
#include <unistd.h>
+#include <dirent.h>
#include "api.h"
#include "version.h"
@@ -130,9 +131,9 @@ TEST(api_testcases, cni_conflist_from_conf)
struct cni_network_list_conf *new_list = NULL;
char *err = NULL;
struct cni_network_conf test = {
- .name = "default",
- .type = "bridge",
- .bytes = COMMON_CONF,
+ .name = (char *)"default",
+ .type = (char *)"bridge",
+ .bytes = (char *)COMMON_CONF,
};
ret = cni_conflist_from_conf(&test, &new_list, &err);
@@ -150,6 +151,15 @@ TEST(api_testcases, cni_conflist_from_conf)
TEST(api_testcases, get_version_info)
{
+ char pwd_buf[PATH_MAX] = {0X0};
+ char *pwd = nullptr;
+
+ pwd = getcwd(pwd_buf, PATH_MAX);
+ ASSERT_NE(pwd, nullptr);
+
+ pwd = strcat(pwd_buf, "/utils");
+ ASSERT_NE(pwd, nullptr);
+
const std::string CNI_PLUGIN_PATH = "/opt/cni/bin/";
char *err = nullptr;
struct plugin_info *pinfo = nullptr;
@@ -162,14 +172,24 @@ TEST(api_testcases, get_version_info)
if (ret != 0) {
if (strstr(err, "No such file or directory") != nullptr) {
std::cout << "Skip: cni_get_version_info api cause by no bridge plugin found" << std::endl;
- return;
+ ret = 0;
}
std::cout << "Get version failed:" << err << std::endl;
}
ASSERT_EQ(ret, 0);
+ free(err);
+ err = nullptr;
+
+ free(paths[0]);
+ paths[0] = strdup(pwd_buf);
+ ret = cni_get_version_info(bridge_name.c_str(), paths, &pinfo, &err);
+ if (ret != 0) {
+ std::cout << "Get version failed:" << err << std::endl;
+ }
+ ASSERT_EQ(ret, 0);
/* check plugin info */
- EXPECT_STREQ("0.4.0", pinfo->cniversion);
+ EXPECT_STREQ("0.3.1", pinfo->cniversion);
ASSERT_LE(0, pinfo->supported_versions_len);
for (i = 0; i < pinfo->supported_versions_len; i++) {
if (strcmp(pinfo->supported_versions[i], CURRENT_VERSION) == 0) {
@@ -183,3 +203,355 @@ TEST(api_testcases, get_version_info)
paths[0] = nullptr;
}
+TEST(api_testcases, cni_log_ops)
+{
+ int ret = 0;
+
+ ret = cni_log_init("xxx", "/tmp/cni.log", "debug");
+ ASSERT_NE(ret, 0);
+ ret = cni_log_init("file", "xxx", "debug");
+ ASSERT_NE(ret, 0);
+ ret = cni_log_init("file", "/tmp/cni.log", "xxx");
+ ASSERT_NE(ret, 0);
+
+ ret = cni_log_init("stdout", nullptr, "debug");
+ ASSERT_EQ(ret, 0);
+
+ cni_set_log_prefix("xxx");
+
+ cni_free_log_prefix();
+}
+
+TEST(api_testcases, cni_add_network_list)
+{
+ int ret = 0;
+ char pwd_buf[PATH_MAX] = {0X0};
+ char *pwd = nullptr;
+ char *paths[] = {pwd_buf, nullptr};
+ pid_t cpid = getpid();
+ char netns[PATH_MAX] = {0x0};
+ char *err = NULL;
+ struct runtime_conf rc = {
+ .container_id = (char *)"abcd",
+ .netns = netns,
+ .ifname = (char *)"eth0",
+ .p_mapping_len = 1,
+ };
+ struct result *pret = nullptr;
+
+ rc.p_mapping = (struct cni_port_mapping **)calloc(1, sizeof(struct cni_port_mapping *));
+ ASSERT_NE(rc.p_mapping, nullptr);
+ rc.p_mapping[0] = (struct cni_port_mapping *)calloc(1, sizeof(struct cni_port_mapping));
+ ASSERT_NE(rc.p_mapping[0], nullptr);
+ rc.p_mapping[0]->container_port = 80;
+ rc.p_mapping[0]->host_port = 8080;
+
+ (void)sprintf(netns, "/proc/%d/ns/net", cpid);
+
+ pwd = getcwd(pwd_buf, PATH_MAX);
+ ASSERT_NE(pwd, nullptr);
+
+ pwd = strcat(pwd_buf, "/utils");
+ ASSERT_NE(pwd, nullptr);
+
+ std::cout << "cni bin path: " << pwd_buf << std::endl;
+
+ ret = cni_add_network_list(COMMON_CONF_LIST, &rc, paths, &pret, &err);
+ ASSERT_EQ(ret, 0);
+ ASSERT_EQ(err, nullptr);
+ free_result(pret);
+ pret = nullptr;
+
+ std::cout << "cni bin path with cap: " << pwd_buf << std::endl;
+ ret = cni_add_network_list(CONF_LIST_WITH_PORTMAP, &rc, paths, &pret, &err);
+ ASSERT_EQ(ret, 0);
+ ASSERT_EQ(err, nullptr);
+ free_result(pret);
+ pret = nullptr;
+
+ std::cout << "invlaid config list" << std::endl;
+ ret = cni_add_network_list(INVALID_COMMON_CONF_LIST, &rc, paths, &pret, &err);
+ ASSERT_NE(ret, 0);
+ free_result(pret);
+ pret = nullptr;
+ free(err);
+ err = nullptr;
+
+ std::cout << "bad config list" << std::endl;
+ ret = cni_add_network_list(BAD_COMMON_CONF_LIST, &rc, paths, &pret, &err);
+ ASSERT_NE(ret, 0);
+ free_result(pret);
+ pret = nullptr;
+
+ free(err);
+}
+
+TEST(api_testcases, cni_add_network)
+{
+ int ret = 0;
+ char pwd_buf[PATH_MAX] = {0X0};
+ char *pwd = nullptr;
+ char *paths[] = {pwd_buf, nullptr};
+ pid_t cpid = getpid();
+ char netns[PATH_MAX] = {0x0};
+ char *err = NULL;
+ struct runtime_conf rc = {
+ .container_id = (char *)"abcd",
+ .netns = netns,
+ .ifname = (char *)"eth0",
+ .p_mapping_len = 1,
+ };
+ struct result *pret = nullptr;
+
+ rc.p_mapping = (struct cni_port_mapping **)calloc(1, sizeof(struct cni_port_mapping *));
+ ASSERT_NE(rc.p_mapping, nullptr);
+ rc.p_mapping[0] = (struct cni_port_mapping *)calloc(1, sizeof(struct cni_port_mapping));
+ ASSERT_NE(rc.p_mapping[0], nullptr);
+ rc.p_mapping[0]->container_port = 80;
+ rc.p_mapping[0]->host_port = 8080;
+
+ (void)sprintf(netns, "/proc/%d/ns/net", cpid);
+
+ pwd = getcwd(pwd_buf, PATH_MAX);
+ ASSERT_NE(pwd, nullptr);
+
+ pwd = strcat(pwd_buf, "/utils");
+ ASSERT_NE(pwd, nullptr);
+
+ std::cout << "cni bin path: " << pwd_buf << std::endl;
+
+ ret = cni_add_network(COMMON_CONF, &rc, paths, &pret, &err);
+ ASSERT_EQ(ret, 0);
+ free_result(pret);
+ pret = nullptr;
+
+ ret = cni_add_network(INVALID_COMMON_CONF, &rc, paths, &pret, &err);
+ ASSERT_NE(ret, 0);
+ free_result(pret);
+ pret = nullptr;
+
+ free(err);
+}
+
+TEST(api_testcases, cni_delete_network_list)
+{
+ int ret = 0;
+ char pwd_buf[PATH_MAX] = {0X0};
+ char *pwd = nullptr;
+ char *paths[] = {pwd_buf, nullptr};
+ pid_t cpid = getpid();
+ char netns[PATH_MAX] = {0x0};
+ char *err = NULL;
+ struct runtime_conf rc = {
+ .container_id = (char *)"abcd",
+ .netns = netns,
+ .ifname = (char *)"eth0",
+ };
+
+ (void)sprintf(netns, "/proc/%d/ns/net", cpid);
+
+ pwd = getcwd(pwd_buf, PATH_MAX);
+ ASSERT_NE(pwd, nullptr);
+
+ pwd = strcat(pwd_buf, "/utils");
+ ASSERT_NE(pwd, nullptr);
+
+ std::cout << "cni bin path: " << pwd_buf << std::endl;
+
+ ret = cni_del_network_list(COMMON_CONF_LIST, &rc, paths, &err);
+ ASSERT_EQ(ret, 0);
+
+ std::cout << "delete with invlaid config list" << std::endl;
+ ret = cni_del_network_list(INVALID_COMMON_CONF_LIST, &rc, paths, &err);
+ ASSERT_NE(ret, 0);
+ free(err);
+ err = nullptr;
+
+ std::cout << "delete with bad config list" << std::endl;
+ ret = cni_del_network_list(BAD_COMMON_CONF_LIST, &rc, paths, &err);
+ ASSERT_NE(ret, 0);
+
+ free(err);
+}
+
+TEST(api_testcases, cni_delete_network)
+{
+ int ret = 0;
+ char pwd_buf[PATH_MAX] = {0X0};
+ char *pwd = nullptr;
+ char *paths[] = {pwd_buf, nullptr};
+ pid_t cpid = getpid();
+ char netns[PATH_MAX] = {0x0};
+ char *err = NULL;
+ struct runtime_conf rc = {
+ .container_id = (char *)"abcd",
+ .netns = netns,
+ .ifname = (char *)"eth0",
+ };
+
+ (void)sprintf(netns, "/proc/%d/ns/net", cpid);
+
+ pwd = getcwd(pwd_buf, PATH_MAX);
+ ASSERT_NE(pwd, nullptr);
+
+ pwd = strcat(pwd_buf, "/utils");
+ ASSERT_NE(pwd, nullptr);
+
+ std::cout << "cni bin path: " << pwd_buf << std::endl;
+
+ ret = cni_del_network(COMMON_CONF, &rc, paths, &err);
+ ASSERT_EQ(ret, 0);
+
+ ret = cni_del_network(INVALID_COMMON_CONF, &rc, paths, &err);
+ ASSERT_NE(ret, 0);
+
+ free(err);
+}
+
+TEST(api_testcases, cni_conf_files)
+{
+ int ret = 0;
+ char pwd_buf[PATH_MAX] = {0X0};
+ char *pwd = nullptr;
+ char *paths[] = {pwd_buf, nullptr};
+ char *err = NULL;
+ const char *exts[] = {"json", "conf", "conflist"};
+ char **result = nullptr;
+
+ pwd = getcwd(pwd_buf, PATH_MAX);
+ ASSERT_NE(pwd, nullptr);
+
+ pwd = strcat(pwd_buf, "/confs");
+ ASSERT_NE(pwd, nullptr);
+
+ std::cout << "cni conf path: " << pwd_buf << std::endl;
+
+ ret = cni_conf_files(pwd_buf, exts, 3, &result, &err);
+ ASSERT_EQ(ret, 0);
+ free(err);
+ err = nullptr;
+
+ ret = cni_conf_files("xxxx", exts, 3, &result, &err);
+ ASSERT_EQ(ret, 0);
+ free(err);
+ err = nullptr;
+
+ ret = cni_conf_files(pwd_buf, exts, 3, &result, nullptr);
+ ASSERT_NE(ret, 0);
+
+ free(err);
+}
+
+TEST(api_testcases, cni_conf_from_file)
+{
+ int ret = 0;
+ char pwd_buf[PATH_MAX] = {0X0};
+ char *pwd = nullptr;
+ char *err = NULL;
+ struct cni_network_conf *config = nullptr;
+
+ pwd = getcwd(pwd_buf, PATH_MAX);
+ ASSERT_NE(pwd, nullptr);
+ pwd = strcat(pwd_buf, "/confs/default-invalid.conf");
+ ASSERT_NE(pwd, nullptr);
+ std::cout << "cni conf path: " << pwd_buf << std::endl;
+ ret = cni_conf_from_file(pwd_buf, &config, &err);
+ ASSERT_EQ(ret, 0);
+ ASSERT_NE(config, nullptr);
+ free(err);
+ err = nullptr;
+ free_cni_network_conf(config);
+ config = nullptr;
+ memset(pwd_buf, 0, PATH_MAX);
+
+ pwd = getcwd(pwd_buf, PATH_MAX);
+ ASSERT_NE(pwd, nullptr);
+ pwd = strcat(pwd_buf, "/confs/default.json");
+ ASSERT_NE(pwd, nullptr);
+ std::cout << "cni conf path: " << pwd_buf << std::endl;
+ ret = cni_conf_from_file(pwd_buf, &config, &err);
+ ASSERT_EQ(ret, 0);
+ ASSERT_NE(config, nullptr);
+ free(err);
+ err = nullptr;
+ free_cni_network_conf(config);
+ config = nullptr;
+ memset(pwd_buf, 0, PATH_MAX);
+
+ ret = cni_conf_from_file("/tmp/xxx/xxx.json", &config, &err);
+ ASSERT_NE(ret, 0);
+ ASSERT_EQ(config, nullptr);
+ free(err);
+ err = nullptr;
+}
+
+
+TEST(api_testcases, cni_conflist_from_file)
+{
+ int ret = 0;
+ char pwd_buf[PATH_MAX] = {0X0};
+ char *pwd = nullptr;
+ char *err = NULL;
+ struct cni_network_list_conf *list = nullptr;
+
+ pwd = getcwd(pwd_buf, PATH_MAX);
+ ASSERT_NE(pwd, nullptr);
+ pwd = strcat(pwd_buf, "/confs/test-invalid.conflist");
+ ASSERT_NE(pwd, nullptr);
+ std::cout << "cni conflist path: " << pwd_buf << std::endl;
+ ret = cni_conflist_from_file(pwd_buf, &list, &err);
+ ASSERT_EQ(ret, 0);
+ ASSERT_NE(list, nullptr);
+ free(err);
+ err = nullptr;
+ free_cni_network_list_conf(list);
+ list = nullptr;
+ memset(pwd_buf, 0, PATH_MAX);
+
+ pwd = getcwd(pwd_buf, PATH_MAX);
+ ASSERT_NE(pwd, nullptr);
+ pwd = strcat(pwd_buf, "/confs/test.conflist");
+ ASSERT_NE(pwd, nullptr);
+ std::cout << "cni conflist path: " << pwd_buf << std::endl;
+ ret = cni_conflist_from_file(pwd_buf, &list, &err);
+ ASSERT_EQ(ret, 0);
+ ASSERT_NE(list, nullptr);
+ free(err);
+ err = nullptr;
+ free_cni_network_list_conf(list);
+ list = nullptr;
+ memset(pwd_buf, 0, PATH_MAX);
+
+ ret = cni_conflist_from_file("/tmp/xxx/xxx.json", &list, &err);
+ ASSERT_NE(ret, 0);
+ ASSERT_EQ(list, nullptr);
+ free(err);
+ err = nullptr;
+}
+
+TEST(api_testcases, free_cni_port_mapping)
+{
+ int ret = 0;
+ struct cni_port_mapping *cpm = (struct cni_port_mapping *)malloc(sizeof(struct cni_port_mapping));
+
+ cpm->container_port = 80;
+ cpm->host_port = 8080;
+ cpm->protocol = strdup("tcp");
+ cpm->host_ip = nullptr;
+
+ free_cni_port_mapping(cpm);
+}
+
+TEST(api_testcases, free_runtime_conf)
+{
+ int ret = 0;
+ struct runtime_conf *rc = (struct runtime_conf *)calloc(sizeof(struct runtime_conf), 1);
+
+ rc->ifname = strdup("eth0");
+ rc->p_mapping_len = 2;
+ rc->p_mapping = (struct cni_port_mapping **)calloc(sizeof(struct cni_port_mapping *), 2);
+ rc->p_mapping[0] = (struct cni_port_mapping *)calloc(sizeof(struct cni_port_mapping), 1);
+ rc->p_mapping[1] = (struct cni_port_mapping *)calloc(sizeof(struct cni_port_mapping), 1);
+
+ free_runtime_conf(rc);
+}
\ No newline at end of file
diff --git a/tests/confs/default-invalid.conf b/tests/confs/default-invalid.conf
new file mode 100644
index 0000000..75596cb
--- /dev/null
+++ b/tests/confs/default-invalid.conf
@@ -0,0 +1,13 @@
+{
+ "cniVersion": "0.3.1",
+ "name": "invalid-conf",
+ "type": "xxxx",
+ "bridge": "cni0",
+ "isGateway": "true",
+ "ipam": {
+ "type": "host-local",
+ "subnet": "10.1.0.0/16",
+ "gateway": "10.1.0.1"
+ },
+ "dns": {"nameservers": ["10.1.0.1"]}
+}
\ No newline at end of file
diff --git a/tests/confs/default.json b/tests/confs/default.json
new file mode 100644
index 0000000..5ff3def
--- /dev/null
+++ b/tests/confs/default.json
@@ -0,0 +1,13 @@
+{
+ "cniVersion": "0.3.1",
+ "name": "default",
+ "type": "bridge",
+ "bridge": "cni0",
+ "isGateway": "true",
+ "ipam": {
+ "type": "host-local",
+ "subnet": "10.1.0.0/16",
+ "gateway": "10.1.0.1"
+ },
+ "dns": {"nameservers": ["10.1.0.1"]}
+}
\ No newline at end of file
diff --git a/tests/confs/test-bad.conflist b/tests/confs/test-bad.conflist
new file mode 100644
index 0000000..bc6cad7
--- /dev/null
+++ b/tests/confs/test-bad.conflist
@@ -0,0 +1,12 @@
+{
+ "cniVersion": "0.3.1",
+ "name": "test",
+ "plugins": [
+ {
+ "cniVersion": "0.3.1", "name": "test", "type": "bridge-bad"
+ },
+ {
+ "name": "exist", "type": "bridge-bad", "dns": {"nameservers": ["10.1.0.1"]}
+ }
+ ]
+}
\ No newline at end of file
diff --git a/tests/confs/test-invalid.conflist b/tests/confs/test-invalid.conflist
new file mode 100644
index 0000000..544fddd
--- /dev/null
+++ b/tests/confs/test-invalid.conflist
@@ -0,0 +1,12 @@
+{
+ "cniVersion": "0.3.1",
+ "name": "test",
+ "plugins": [
+ {
+ "cniVersion": "0.3.1", "name": "test", "type": "xxxx"
+ },
+ {
+ "name": "exist", "type": "bridge", "dns": {"nameservers": ["10.1.0.1"]}
+ }
+ ]
+}
\ No newline at end of file
diff --git a/tests/confs/test.conflist b/tests/confs/test.conflist
new file mode 100644
index 0000000..7171dcc
--- /dev/null
+++ b/tests/confs/test.conflist
@@ -0,0 +1,12 @@
+{
+ "cniVersion": "0.3.1",
+ "name": "test",
+ "plugins": [
+ {
+ "cniVersion": "0.3.1", "name": "test", "type": "bridge"
+ },
+ {
+ "name": "exist", "type": "bridge", "dns": {"nameservers": ["10.1.0.1"]}
+ }
+ ]
+}
\ No newline at end of file
diff --git a/tests/utils/bridge b/tests/utils/bridge
new file mode 100755
index 0000000..815ba74
--- /dev/null
+++ b/tests/utils/bridge
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+echo "{
+ \"cniVersion\": \"0.3.1\",
+ \"supportedVersions\": [ \"0.1.0\", \"0.2.0\", \"0.3.0\", \"0.3.1\" ],
+ \"routes\": [ {\"dst\": \"192.168.1.0/24\", \"gw\": \"192.168.1.1\"} ],
+ \"interfaces\": [
+ {\"name\": \"eth0\", \"mac\": \"ab:ab:ab:ab:ab:ab\", \"sandbox\": \"/proc/xx/ns/net\"}
+ ],
+ \"ips\": [
+ {\"address\": \"192.168.1.2/24\", \"gateway\": \"192.168.1.1\", \"interface\": 1}
+ ],
+ \"dns\":{\"nameservers\": [\"test.com\"], \"domain\": \"test.com\", \"search\": [\"test\"], \"options\": [\"test\"]}
+}"
+
+exit 0
\ No newline at end of file
diff --git a/tests/utils/bridge-bad b/tests/utils/bridge-bad
new file mode 100755
index 0000000..02a90d4
--- /dev/null
+++ b/tests/utils/bridge-bad
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+echo "{
+ \"cniVersion\": \"0.3.1\",
+ \"dns\": {}
+}"
+
+exit 1
\ No newline at end of file
diff --git a/tests/utils/constants.h b/tests/utils/constants.h
index 1f06bfc..afeaff8 100644
--- a/tests/utils/constants.h
+++ b/tests/utils/constants.h
@@ -25,11 +25,30 @@ extern "C" {
\"plugins\":[{\"cniVersion\":\"0.3.0\", \"name\":\"default\",\"type\":\"bridge\"}, \
{\"name\": \"exist\",\"type\": \"bridge\", \"dns\": {\"nameservers\": [\"10.1.0.1\"]}}]}"
+#define CONF_LIST_WITH_PORTMAP "{\"cniVersion\":\"0.3.0\",\"name\":\"default\", \
+ \"plugins\":[{\"cniVersion\":\"0.3.0\", \"name\":\"default\",\"type\":\"bridge\"}, \
+ {\"type\": \"portmap\", \"capabilities\": { \"portMappings\": true } }]}"
+
#define COMMON_CONF "{\"cniVersion\":\"0.3.0\",\"name\":\"default\", \
\"type\": \"bridge\", \"bridge\": \"cni0\", \"isGateway\": \"true\", \
\"ipam\": {\"type\": \"host-local\", \"subnet\": \"10.1.0.0/16\", \"gateway\": \"10.1.0.1\"},\
\"dns\": {\"nameservers\": [\"10.1.0.1\"]}}"
+
+#define INVALID_COMMON_CONF_LIST "{\"cniVersion\":\"0.3.0\",\"name\":\"default\", \
+ \"plugins\":[{\"cniVersion\":\"0.3.0\", \"name\":\"default\",\"type\":\"bridge\"}, \
+ {\"name\": \"exist\",\"type\": \"xxxx\", \"dns\": {\"nameservers\": [\"10.1.0.1\"]}}]}"
+
+#define INVALID_COMMON_CONF "{\"cniVersion\":\"0.3.0\",\"name\":\"default\", \
+ \"type\": \"xxxx\", \"bridge\": \"cni0\", \"isGateway\": \"true\", \
+ \"ipam\": {\"type\": \"host-local\", \"subnet\": \"10.1.0.0/16\", \"gateway\": \"10.1.0.1\"},\
+ \"dns\": {\"nameservers\": [\"10.1.0.1\"]}}"
+
+
+#define BAD_COMMON_CONF_LIST "{\"cniVersion\":\"0.3.0\",\"name\":\"default\", \
+ \"plugins\":[{\"cniVersion\":\"0.3.0\", \"name\":\"default\",\"type\":\"bridge-bad\"}, \
+ {\"name\": \"exist\",\"type\": \"bridge\", \"dns\": {\"nameservers\": [\"10.1.0.1\"]}}]}"
+
#ifdef __cplusplus
}
#endif
diff --git a/tests/utils/host-local b/tests/utils/host-local
new file mode 100755
index 0000000..1dd4ae5
--- /dev/null
+++ b/tests/utils/host-local
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+echo "{
+ \"cniVersion\": \"0.3.1\",
+ \"dns\": {}
+}"
+
+exit 0
\ No newline at end of file
diff --git a/tests/utils/loopback b/tests/utils/loopback
new file mode 100755
index 0000000..1dd4ae5
--- /dev/null
+++ b/tests/utils/loopback
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+echo "{
+ \"cniVersion\": \"0.3.1\",
+ \"dns\": {}
+}"
+
+exit 0
\ No newline at end of file
diff --git a/tests/utils/portmap b/tests/utils/portmap
new file mode 100755
index 0000000..1dd4ae5
--- /dev/null
+++ b/tests/utils/portmap
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+echo "{
+ \"cniVersion\": \"0.3.1\",
+ \"dns\": {}
+}"
+
+exit 0
\ No newline at end of file
--
2.20.1

77
0003-support-new-cpp-synx-check.patch
View File

@ -1,77 +0,0 @@
From 830b3ce91c04c6d6970e7564834720f3a1d57b80 Mon Sep 17 00:00:00 2001
From: haozi007 <liuhao27@huawei.com>
Date: Mon, 22 Nov 2021 11:32:00 +0000
Subject: [PATCH 3/6] support new cpp synx check
Signed-off-by: haozi007 <liuhao27@huawei.com>
---
tests/api_llt.cpp | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/tests/api_llt.cpp b/tests/api_llt.cpp
index 186c76b..5ea7c09 100644
--- a/tests/api_llt.cpp
+++ b/tests/api_llt.cpp
@@ -232,10 +232,13 @@ TEST(api_testcases, cni_add_network_list)
char netns[PATH_MAX] = {0x0};
char *err = NULL;
struct runtime_conf rc = {
- .container_id = (char *)"abcd",
- .netns = netns,
- .ifname = (char *)"eth0",
- .p_mapping_len = 1,
+ container_id: (char *)"abcd",
+ netns: netns,
+ ifname: (char *)"eth0",
+ args: nullptr,
+ args_len: 0,
+ p_mapping: nullptr,
+ p_mapping_len: 1,
};
struct result *pret = nullptr;
@@ -296,10 +299,13 @@ TEST(api_testcases, cni_add_network)
char netns[PATH_MAX] = {0x0};
char *err = NULL;
struct runtime_conf rc = {
- .container_id = (char *)"abcd",
- .netns = netns,
- .ifname = (char *)"eth0",
- .p_mapping_len = 1,
+ container_id: (char *)"abcd",
+ netns: netns,
+ ifname: (char *)"eth0",
+ args: nullptr,
+ args_len: 0,
+ p_mapping: nullptr,
+ p_mapping_len: 1,
};
struct result *pret = nullptr;
@@ -413,7 +419,6 @@ TEST(api_testcases, cni_conf_files)
int ret = 0;
char pwd_buf[PATH_MAX] = {0X0};
char *pwd = nullptr;
- char *paths[] = {pwd_buf, nullptr};
char *err = NULL;
const char *exts[] = {"json", "conf", "conflist"};
char **result = nullptr;
@@ -531,7 +536,6 @@ TEST(api_testcases, cni_conflist_from_file)
TEST(api_testcases, free_cni_port_mapping)
{
- int ret = 0;
struct cni_port_mapping *cpm = (struct cni_port_mapping *)malloc(sizeof(struct cni_port_mapping));
cpm->container_port = 80;
@@ -544,7 +548,6 @@ TEST(api_testcases, free_cni_port_mapping)
TEST(api_testcases, free_runtime_conf)
{
- int ret = 0;
struct runtime_conf *rc = (struct runtime_conf *)calloc(sizeof(struct runtime_conf), 1);
rc->ifname = strdup("eth0");
--
2.20.1

37
0004-permit-other-read-pc-and-so-of-clibcni.patch
View File

@ -1,37 +0,0 @@
From 2667fdf06d366ec6222302244f1aad078727d6e5 Mon Sep 17 00:00:00 2001
From: haozi007 <liuhao27@huawei.com>
Date: Thu, 2 Dec 2021 11:53:26 +0000
Subject: [PATCH 4/6] permit other read pc and so of clibcni
Signed-off-by: haozi007 <liuhao27@huawei.com>
---
CMakeLists.txt | 2 +-
src/CMakeLists.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f812dde..64193b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,7 +76,7 @@ endif()
# install all files
install(FILES ${CMAKE_BINARY_DIR}/conf/clibcni.pc
- DESTINATION ${LIB_INSTALL_DIR_DEFAULT}/pkgconfig PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ GROUP_WRITE)
+ DESTINATION ${LIB_INSTALL_DIR_DEFAULT}/pkgconfig PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ GROUP_WRITE WORLD_READ WORLD_EXECUTE)
install(FILES src/types/types.h DESTINATION include/clibcni)
install(FILES src/version/version.h DESTINATION include/clibcni)
install(FILES src/api.h DESTINATION include/clibcni)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1fe1b72..6f05299 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -27,4 +27,4 @@ target_link_libraries(clibcni ${ISULA_LIBUTILS_LIBRARY})
# install all files
install(TARGETS clibcni
- LIBRARY DESTINATION ${LIB_INSTALL_DIR_DEFAULT} PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE)
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR_DEFAULT} PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
--
2.20.1

26
0005-fix-the-error-of-gcc-compilation-optimization-level.patch
View File

@ -1,26 +0,0 @@
From e41403afe07661518b0e4a6a509f3ec916c3a83f Mon Sep 17 00:00:00 2001
From: wujing <wujing50@huawei.com>
Date: Thu, 9 Dec 2021 11:01:31 +0800
Subject: [PATCH 5/6] fix the error of gcc compilation optimization level
Signed-off-by: wujing <wujing50@huawei.com>
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 64193b4..09bf3f9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
option(DEBUG "set clibcni gcc option" ON)
if (DEBUG STREQUAL "ON")
- add_definitions("-g -o2")
+ add_definitions("-g -O2")
endif()
option(GCOV "set clibcni gcov option" OFF)
--
2.20.1

20
clibcni.spec
View File

@ -1,5 +1,5 @@
%global _version 2.0.6 %global _version 2.0.7
%global _release 7 %global _release 1
Name: clibcni Name: clibcni
Version: %{_version} Version: %{_version}
Release: %{_release} Release: %{_release}
@ -10,13 +10,7 @@ URL: https://gitee.com/openeuler/clibcni
Source0: https://gitee.com/openeuler/clibcni/repository/archive/v%{version}.tar.gz Source0: https://gitee.com/openeuler/clibcni/repository/archive/v%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version} BuildRoot: %{_tmppath}/%{name}-%{version}
Patch0001: 0001-improve-code-for-check-ags.patch %define lcrver 2.0.7
Patch0002: 0002-improve-coverage-of-ut.patch
Patch0003: 0003-support-new-cpp-synx-check.patch
Patch0004: 0004-permit-other-read-pc-and-so-of-clibcni.patch
Patch0005: 0005-fix-the-error-of-gcc-compilation-optimization-level.patch
%define lcrver 2.0.6
BuildRequires: gcc git gcc-c++ BuildRequires: gcc git gcc-c++
BuildRequires: cmake BuildRequires: cmake
@ -46,7 +40,7 @@ Requires: %{name} = %{version}-%{release}
the %{name}-libs package contains libraries for running %{name} applications. the %{name}-libs package contains libraries for running %{name} applications.
%prep %prep
%autosetup -n %{name} -Sgit -p1 %autosetup -n clibcni-v%{_version} -Sgit -p1
%build %build
mkdir -p build mkdir -p build
@ -97,6 +91,12 @@ rm -rf %{buildroot}
%{_libdir}/pkgconfig/%{name}.pc %{_libdir}/pkgconfig/%{name}.pc
%changelog %changelog
* Thu Feb 24 2022 wangfengtu <wangfengtu@huawei.com> - 2.0.7-1
- Type: enhancement
- ID: NA
- SUG: NA
- DESC: update to version v2.0.7
* Mon Jan 10 2022 haozi007 <liuhao27@huawei.com> - 2.0.6-7 * Mon Jan 10 2022 haozi007 <liuhao27@huawei.com> - 2.0.6-7
- Type: sync patch from upstream - Type: sync patch from upstream
- ID: NA - ID: NA

BIN
v2.0.6.tar.gz
View File

Binary file not shown.

BIN
v2.0.7.tar.gz Normal file
View File

Binary file not shown.