Page MenuHomeClusterLabs Projects
Files F1842267

No OneTemporary
Actions

View Options

diff --git a/libnozzle/tests/Makefile.am b/libnozzle/tests/Makefile.am
index ba050002..7c8b256e 100644
--- a/libnozzle/tests/Makefile.am
+++ b/libnozzle/tests/Makefile.am
@@ -1,122 +1,127 @@
#
# Copyright (C) 2017-2018 Red Hat, Inc. All rights reserved.
#
# Author: Fabio M. Di Nitto <fabbione@kronosnet.org>
#
# This software licensed under GPL-2.0+, LGPL-2.0+
#
MAINTAINERCLEANFILES = Makefile.in
include $(top_srcdir)/build-aux/check.mk
EXTRA_DIST = \
nozzle_run_updown_exit_true \
nozzle_run_updown_exit_false \
api-test-coverage
noinst_HEADERS = \
test-common.h
if BUILD_LIBNOZZLE
api_checks = \
api_nozzle_open_test \
api_nozzle_close_test \
api_nozzle_set_up_test \
api_nozzle_set_down_test \
api_nozzle_get_mtu_test \
api_nozzle_set_mtu_test \
api_nozzle_get_mac_test \
api_nozzle_set_mac_test \
api_nozzle_get_handle_by_name_test \
api_nozzle_get_name_by_handle_test \
api_nozzle_get_fd_test \
api_nozzle_run_updown_test \
- api_nozzle_add_ip_test
+ api_nozzle_add_ip_test \
+ api_nozzle_del_ip_test
int_checks = \
int_execute_bin_sh_command_test \
nozzle_test
fun_checks =
benchmarks =
check_PROGRAMS = \
$(api_checks) \
$(int_checks) \
$(fun_checks)
noinst_PROGRAMS = \
$(benchmarks) \
$(check_PROGRAMS)
noinst_SCRIPTS = \
api-test-coverage
TESTS = $(check_PROGRAMS)
check-local: check-api-test-coverage
check-api-test-coverage:
chmod u+x $(top_srcdir)/libnozzle/tests/api-test-coverage
$(top_srcdir)/libnozzle/tests/api-test-coverage $(top_srcdir) $(top_builddir)
AM_CPPFLAGS = -I$(top_srcdir)/libnozzle -DABSBUILDDIR=\"$(abs_builddir)\" -DABSSRCDIR=\"$(abs_srcdir)\"
AM_CFLAGS += $(PTHREAD_CFLAGS) $(libnl_CFLAGS)
LIBS += $(top_builddir)/libnozzle/libnozzle.la $(PTHREAD_LIBS) $(libnl_LIBS)
api_nozzle_open_test_SOURCES = api_nozzle_open.c \
test-common.c
api_nozzle_close_test_SOURCES = api_nozzle_close.c \
test-common.c
api_nozzle_set_up_test_SOURCES = api_nozzle_set_up.c \
test-common.c \
../internals.c
api_nozzle_set_down_test_SOURCES = api_nozzle_set_down.c \
test-common.c \
../internals.c
api_nozzle_get_mtu_test_SOURCES = api_nozzle_get_mtu.c \
test-common.c
api_nozzle_set_mtu_test_SOURCES = api_nozzle_set_mtu.c \
test-common.c \
../internals.c
api_nozzle_get_mac_test_SOURCES = api_nozzle_get_mac.c \
test-common.c
api_nozzle_set_mac_test_SOURCES = api_nozzle_set_mac.c \
test-common.c
api_nozzle_get_handle_by_name_test_SOURCES = api_nozzle_get_handle_by_name.c \
test-common.c
api_nozzle_get_name_by_handle_test_SOURCES = api_nozzle_get_name_by_handle.c \
test-common.c
api_nozzle_get_fd_test_SOURCES = api_nozzle_get_fd.c \
test-common.c
api_nozzle_run_updown_test_SOURCES = api_nozzle_run_updown.c \
test-common.c \
../internals.c
api_nozzle_add_ip_test_SOURCES = api_nozzle_add_ip.c \
test-common.c \
../internals.c
+api_nozzle_del_ip_test_SOURCES = api_nozzle_del_ip.c \
+ test-common.c \
+ ../internals.c
+
int_execute_bin_sh_command_test_SOURCES = int_execute_bin_sh_command.c \
test-common.c \
../internals.c
nozzle_test_SOURCES = nozzle_test.c \
test-common.c \
../internals.c
endif
diff --git a/libnozzle/tests/api_nozzle_del_ip.c b/libnozzle/tests/api_nozzle_del_ip.c
new file mode 100644
index 00000000..31e26c22
--- /dev/null
+++ b/libnozzle/tests/api_nozzle_del_ip.c
@@ -0,0 +1,266 @@
+/*
+ * Copyright (C) 2010-2018 Red Hat, Inc. All rights reserved.
+ *
+ * Author: Fabio M. Di Nitto <fabbione@kronosnet.org>
+ *
+ * This software licensed under GPL-2.0+, LGPL-2.0+
+ */
+
+#include "config.h"
+
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include <stdint.h>
+#include <limits.h>
+#include <sys/socket.h>
+
+#include "test-common.h"
+
+char testipv4_1[IPBUFSIZE];
+char testipv4_2[IPBUFSIZE];
+char testipv6_1[IPBUFSIZE];
+char testipv6_2[IPBUFSIZE];
+
+static int test(void)
+{
+ char device_name[IFNAMSIZ];
+ size_t size = IFNAMSIZ;
+ char verifycmd[2048];
+ int err = 0;
+ nozzle_t nozzle;
+ char *error_string = NULL;
+
+ printf("Testing interface del ip\n");
+
+ memset(device_name, 0, size);
+
+ nozzle = nozzle_open(device_name, size, NULL);
+ if (!nozzle) {
+ printf("Unable to init %s\n", device_name);
+ return -1;
+ }
+
+ printf("Testing error conditions\n");
+
+ printf("Testing invalid nozzle handle\n");
+ err = nozzle_del_ip(NULL, testipv4_1, "24");
+ if ((!err) || (errno != EINVAL)) {
+ printf("nozzle_del_ip accepted invalid nozzle handle\n");
+ err = -1;
+ goto out_clean;
+ }
+
+ printf("Testing empty ip address\n");
+ err = nozzle_del_ip(nozzle, NULL, "24");
+ if ((!err) || (errno != EINVAL)) {
+ printf("nozzle_del_ip accepted invalid ip address\n");
+ err = -1;
+ goto out_clean;
+ }
+
+
+ printf("Testing empty netmask\n");
+ err = nozzle_del_ip(nozzle, testipv4_1, NULL);
+ if ((!err) || (errno != EINVAL)) {
+ printf("nozzle_del_ip accepted invalid netmask\n");
+ err = -1;
+ goto out_clean;
+ }
+
+ printf("Adding ip: %s/24\n", testipv4_1);
+
+ err = nozzle_add_ip(nozzle, testipv4_1, "24");
+ if (err < 0) {
+ printf("Unable to assign IP address\n");
+ err = -1;
+ goto out_clean;
+ }
+
+ printf("Checking ip: %s/24\n", testipv4_1);
+
+ memset(verifycmd, 0, sizeof(verifycmd));
+ snprintf(verifycmd, sizeof(verifycmd)-1,
+#ifdef KNET_LINUX
+ "ip addr show dev %s | grep -q %s/24", nozzle->name, testipv4_1);
+#endif
+#ifdef KNET_BSD
+ "ifconfig %s | grep -q %s", nozzle->name, testipv4_1);
+#endif
+ err = execute_bin_sh_command(verifycmd, &error_string);
+ if (error_string) {
+ printf("Error string: %s\n", error_string);
+ free(error_string);
+ error_string = NULL;
+ }
+ if (err) {
+ printf("Unable to verify IP address\n");
+ err = -1;
+ goto out_clean;
+ }
+
+ printf("Deleting ip: %s/24\n", testipv4_1);
+
+ err = nozzle_del_ip(nozzle, testipv4_1, "24");
+ if (err < 0) {
+ printf("Unable to delete IP address\n");
+ err = -1;
+ goto out_clean;
+ }
+
+ printf("Checking ip: %s/24\n", testipv4_1);
+
+ memset(verifycmd, 0, sizeof(verifycmd));
+ snprintf(verifycmd, sizeof(verifycmd)-1,
+#ifdef KNET_LINUX
+ "ip addr show dev %s | grep -q %s/24", nozzle->name, testipv4_1);
+#endif
+#ifdef KNET_BSD
+ "ifconfig %s | grep -q %s", nozzle->name, testipv4_1);
+#endif
+ err = execute_bin_sh_command(verifycmd, &error_string);
+ if (error_string) {
+ printf("Error string: %s\n", error_string);
+ free(error_string);
+ error_string = NULL;
+ }
+ if (!err) {
+ printf("Unable to verify IP address\n");
+ err = -1;
+ goto out_clean;
+ }
+
+ printf("Deleting ip: %s/24 again\n", testipv4_1);
+
+ err = nozzle_del_ip(nozzle, testipv4_1, "24");
+ if (err < 0) {
+ printf("Unable to delete IP address\n");
+ err = -1;
+ goto out_clean;
+ }
+
+ printf("Adding ip: %s/64\n", testipv6_1);
+
+ err = nozzle_add_ip(nozzle, testipv6_1, "64");
+ if (err < 0) {
+ printf("Unable to assign IP address\n");
+ err = -1;
+ goto out_clean;
+ }
+
+ memset(verifycmd, 0, sizeof(verifycmd));
+ snprintf(verifycmd, sizeof(verifycmd)-1,
+#ifdef KNET_LINUX
+ "ip addr show dev %s | grep -q %s/64", nozzle->name, testipv6_1);
+#endif
+#ifdef KNET_BSD
+ "ifconfig %s | grep -q %s", nozzle->name, testipv6_1);
+#endif
+ err = execute_bin_sh_command(verifycmd, &error_string);
+ if (error_string) {
+ printf("Error string: %s\n", error_string);
+ free(error_string);
+ error_string = NULL;
+ }
+ if (err) {
+ printf("Unable to verify IP address\n");
+ err = -1;
+ goto out_clean;
+ }
+
+ printf("Deleting ip: %s/64\n", testipv6_1);
+
+ err = nozzle_del_ip(nozzle, testipv6_1, "64");
+ if (err) {
+ printf("Unable to delete IP address\n");
+ err = -1;
+ goto out_clean;
+ }
+
+ memset(verifycmd, 0, sizeof(verifycmd));
+ snprintf(verifycmd, sizeof(verifycmd)-1,
+#ifdef KNET_LINUX
+ "ip addr show dev %s | grep -q %s/64", nozzle->name, testipv6_1);
+#endif
+#ifdef KNET_BSD
+ "ifconfig %s | grep -q %s", nozzle->name, testipv6_1);
+#endif
+ err = execute_bin_sh_command(verifycmd, &error_string);
+ if (error_string) {
+ printf("Error string: %s\n", error_string);
+ free(error_string);
+ error_string = NULL;
+ }
+ if (!err) {
+ printf("Unable to verify IP address\n");
+ err = -1;
+ goto out_clean;
+ }
+
+ printf("Testing deleting an IPv6 address with mtu < 1280 (in db, not on interface)\n");
+ printf("Lowering interface MTU\n");
+
+ err = nozzle_set_mtu(nozzle, 1200);
+ if (err) {
+ printf("Unable to set MTU to 1200\n");
+ err = -1;
+ goto out_clean;
+ }
+
+ printf("Adding ip: %s/64\n", testipv6_1);
+
+ err = nozzle_add_ip(nozzle, testipv6_1, "64");
+ if (err < 0) {
+ printf("Unable to assign IP address\n");
+ err = -1;
+ goto out_clean;
+ }
+
+ memset(verifycmd, 0, sizeof(verifycmd));
+ snprintf(verifycmd, sizeof(verifycmd)-1,
+#ifdef KNET_LINUX
+ "ip addr show dev %s | grep -q %s/64", nozzle->name, testipv6_1);
+#endif
+#ifdef KNET_BSD
+ "ifconfig %s | grep -q %s", nozzle->name, testipv6_1);
+#endif
+ err = execute_bin_sh_command(verifycmd, &error_string);
+ if (error_string) {
+ printf("Error string: %s\n", error_string);
+ free(error_string);
+ error_string = NULL;
+ }
+ if (!err) {
+ printf("Unable to verify IP address\n");
+ err = -1;
+ goto out_clean;
+ }
+
+ printf("Deleting ip: %s/64 with low mtu\n", testipv6_1);
+
+ err = nozzle_del_ip(nozzle, testipv6_1, "64");
+ if (err) {
+ printf("Unable to delete IP address\n");
+ err = -1;
+ goto out_clean;
+ }
+
+out_clean:
+ nozzle_close(nozzle);
+
+ return err;
+}
+
+int main(void)
+{
+ need_root();
+
+ make_local_ips(testipv4_1, testipv4_2, testipv6_1, testipv6_2);
+
+ if (test() < 0)
+ return FAIL;
+
+ return PASS;
+}

File Metadata

Mime Type
text/x-diff
Expires
Sat, Nov 23, 2:52 PM (19 h, 26 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1018818
Default Alt Text
(9 KB)

Event Timeline