[nozzle] decouple running pre-up.d/up.d/down.d/post-down.d from interface status...

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>

diff --git a/libnozzle/libnozzle.c b/libnozzle/libnozzle.c
index 95ab11329f8dae4541085aa300929e4491391588..0b583d905b29c7da1853978023f9eb40360d47b2 100644 (file)
--- a/libnozzle/libnozzle.c
+++ b/libnozzle/libnozzle.c
@@ -491,7 +491,7 @@ out_error:
        return NULL;
 }
 
-int nozzle_close(nozzle_t nozzle,  char **error_down, char **error_postdown)
+int nozzle_close(nozzle_t nozzle)
 {
        int err = 0, savederrno = 0;
        nozzle_t temp = lib_cfg.head;

diff --git a/libnozzle/libnozzle.h b/libnozzle/libnozzle.h
index ce3b66a8151204d64f1bb800d0d689de31b82ce6..562d37675d5a43ab3265e5c88ffddf379c83bfef 100644 (file)
--- a/libnozzle/libnozzle.h
+++ b/libnozzle/libnozzle.h
@@ -59,23 +59,12 @@ nozzle_t nozzle_open(char *devname, size_t devname_size, const char *updownpath)
  *
  * nozzle - pointer to the nozzle struct to destroy
  *
- * error_down - pointers to string to record errors from executing down.d
- *              when configured. The string is malloc'ed, the caller needs to free those
- *              buffers.
- *
- * error_postdown - pointers to string to record errors from executing post-down.d
- *                  when configured. The string is malloc'ed, the caller needs to free
- *                  those buffers.
- *
  * @return
  * 0 on success
  * -1 on error and errno is set.
- * error_down / error_postdown are set to NULL if execution of external scripts
- * is sucessful
- * error_down / error_postdown will contain strings recording the execution error.
  */
 
-int nozzle_close(nozzle_t nozzle, char **error_down, char **error_postdown);
+int nozzle_close(nozzle_t nozzle);
 
 
 #define NOZZLE_PREUP    0

diff --git a/libnozzle/tests/nozzle_test.c b/libnozzle/tests/nozzle_test.c
index b1cb72a3ff169135c834724ce35a284e3307adb4..c79a1090bcfd849138de670a4c8dbb1987899d95 100644 (file)
--- a/libnozzle/tests/nozzle_test.c
+++ b/libnozzle/tests/nozzle_test.c
@@ -67,7 +67,6 @@ static int is_if_in_system(char *name)
 static int test_iface(char *name, size_t size, const char *updownpath)
 {
        nozzle_t nozzle;
-       char *error_down = NULL, *error_postdown = NULL;
 
        nozzle=nozzle_open(name, size, updownpath);
        if (!nozzle) {
@@ -88,17 +87,7 @@ static int test_iface(char *name, size_t size, const char *updownpath)
                printf("Found interface %s in nozzle db\n", name);
        }
 
-       nozzle_close(nozzle, &error_down, &error_postdown);
-
-       if (error_down) {
-               printf("Error from error_down: %s\n", error_down);
-               free(error_down);
-       }
-
-       if (error_postdown) {
-               printf("Error from error_down: %s\n", error_postdown);
-               free(error_postdown);
-       }
+       nozzle_close(nozzle);
 
        if (is_if_in_system(name) == 0)
                printf("Successfully removed interface %s from the system\n", name);
@@ -200,7 +189,6 @@ static int check_knet_multi_eth(void)
        int err=0;
        nozzle_t nozzle1 = NULL;
        nozzle_t nozzle2 = NULL;
-       char *error_down = NULL, *error_postdown = NULL;
 
        printf("Testing multiple knet interface instances\n");
 
@@ -234,27 +222,11 @@ static int check_knet_multi_eth(void)
        }
 
        if (nozzle1) {
-               nozzle_close(nozzle1, &error_down, &error_postdown);
-               if (error_down) {
-                       printf("Error from error_down: %s\n", error_down);
-                       free(error_down);
-               }
-               if (error_postdown) {
-                       printf("Error from error_down: %s\n", error_postdown);
-                       free(error_postdown);
-               }
+               nozzle_close(nozzle1);
        }
 
        if (nozzle2) {
-               nozzle_close(nozzle2, &error_down, &error_postdown);
-               if (error_down) {
-                       printf("Error from error_down: %s\n", error_down);
-                       free(error_down);
-               }
-               if (error_postdown) {
-                       printf("Error from error_down: %s\n", error_postdown);
-                       free(error_postdown);
-               }
+               nozzle_close(nozzle2);
        }
 
        printf("Testing error conditions\n");
@@ -285,27 +257,11 @@ static int check_knet_multi_eth(void)
 
 out_clean:
        if (nozzle1) {
-               nozzle_close(nozzle1, &error_down, &error_postdown);
-               if (error_down) {
-                       printf("Error from error_down: %s\n", error_down);
-                       free(error_down);
-               }
-               if (error_postdown) {
-                       printf("Error from error_down: %s\n", error_postdown);
-                       free(error_postdown);
-               }
+               nozzle_close(nozzle1);
        }
 
        if (nozzle2) {
-               nozzle_close(nozzle2, &error_down, &error_postdown);
-               if (error_down) {
-                       printf("Error from error_down: %s\n", error_down);
-                       free(error_down);
-               }
-               if (error_postdown) {
-                       printf("Error from error_down: %s\n", error_postdown);
-                       free(error_postdown);
-               }
+               nozzle_close(nozzle2);
        }
 
        return err;
@@ -317,7 +273,6 @@ static int check_knet_mtu(void)
        size_t size = IFNAMSIZ;
        int err=0;
        nozzle_t nozzle;
-       char *error_down = NULL, *error_postdown = NULL;
        char *error_string = NULL;
 
        int current_mtu = 0;
@@ -391,15 +346,7 @@ static int check_knet_mtu(void)
 
 out_clean:
        if (nozzle) {
-               nozzle_close(nozzle, &error_down, &error_postdown);
-               if (error_down) {
-                       printf("Error from error_down: %s\n", error_down);
-                       free(error_down);
-               }
-               if (error_postdown) {
-                       printf("Error from error_down: %s\n", error_postdown);
-                       free(error_postdown);
-               }
+               nozzle_close(nozzle);
        }
 
        return err;
@@ -413,7 +360,6 @@ static int check_knet_mtu_ipv6(void)
        int err=0;
        nozzle_t nozzle;
        char *error_string = NULL;
-       char *error_down = NULL, *error_postdown = NULL;
 
        printf("Testing get/set MTU with IPv6 address\n");
 
@@ -574,15 +520,7 @@ static int check_knet_mtu_ipv6(void)
 
 out_clean:
        if (nozzle) {
-               nozzle_close(nozzle, &error_down, &error_postdown);
-               if (error_down) {
-                       printf("Error from error_down: %s\n", error_down);
-                       free(error_down);
-               }
-               if (error_postdown) {
-                       printf("Error from error_down: %s\n", error_postdown);
-                       free(error_postdown);
-               }
+               nozzle_close(nozzle);
        }
 
        return err;
@@ -596,7 +534,6 @@ static int check_knet_mac(void)
        nozzle_t nozzle;
        char *current_mac = NULL, *temp_mac = NULL, *err_mac = NULL;
        struct ether_addr *cur_mac, *tmp_mac;
-       char *error_down = NULL, *error_postdown = NULL;
 
        printf("Testing get/set MAC\n");
 
@@ -691,15 +628,7 @@ out_clean:
                free(temp_mac);
 
        if (nozzle) {
-               nozzle_close(nozzle, &error_down, &error_postdown);
-               if (error_down) {
-                       printf("Error from error_down: %s\n", error_down);
-                       free(error_down);
-               }
-               if (error_postdown) {
-                       printf("Error from error_down: %s\n", error_postdown);
-                       free(error_postdown);
-               }
+               nozzle_close(nozzle);
        }
 
        return err;
@@ -905,17 +834,7 @@ static int check_knet_up_down(void)
                goto out_clean;
        }
 
-       nozzle_close(nozzle, &error_down, &error_postdown);
-       if (error_down) {
-               printf("down output: %s\n", error_down);
-               free(error_down);
-               error_down = NULL;
-       }
-       if (error_postdown) {
-               printf("postdown output: %s\n", error_down);
-               free(error_down);
-               error_down = NULL;
-       }
+       nozzle_close(nozzle);
 
        printf("Testing interface pre-up/up/down/post-down (exec errors)\n");
 
@@ -972,17 +891,7 @@ static int check_knet_up_down(void)
                error_down = NULL;
        }
 
-       nozzle_close(nozzle, &error_down, &error_postdown);
-       if (error_down) {
-               printf("down output: %s\n", error_down);
-               free(error_down);
-               error_down = NULL;
-       }
-       if (error_postdown) {
-               printf("postdown output: %s\n", error_down);
-               free(error_down);
-               error_down = NULL;
-       }
+       nozzle_close(nozzle);
 
        printf("Testing interface pre-up/up/down/post-down\n");
 
@@ -1040,17 +949,7 @@ static int check_knet_up_down(void)
                error_down = NULL;
        }
 
-       nozzle_close(nozzle, &error_down, &error_postdown);
-       if (error_down) {
-               printf("down output: %s\n", error_down);
-               free(error_down);
-               error_down = NULL;
-       }
-       if (error_postdown) {
-               printf("postdown output: %s\n", error_down);
-               free(error_down);
-               error_down = NULL;
-       }
+       nozzle_close(nozzle);
 
        printf("Test ERROR conditions\n");
 
@@ -1088,17 +987,7 @@ static int check_knet_up_down(void)
        }
 
 out_clean:
-       nozzle_close(nozzle, &error_down, &error_postdown);
-       if (error_down) {
-               printf("down output: %s\n", error_down);
-               free(error_down);
-               error_down = NULL;
-       }
-       if (error_postdown) {
-               printf("postdown output: %s\n", error_down);
-               free(error_down);
-               error_down = NULL;
-       }
+       nozzle_close(nozzle);
 
        return err;
 }
@@ -1110,7 +999,6 @@ static int check_knet_close_leak(void)
        int err=0;
        nozzle_t nozzle;
        char *error_string = NULL;
-       char *error_down = NULL, *error_postdown = NULL;
 
        printf("Testing close leak (needs valgrind)\n");
 
@@ -1151,17 +1039,7 @@ static int check_knet_close_leak(void)
        }
 
 out_clean:
-       nozzle_close(nozzle, &error_down, &error_postdown);
-       if (error_down) {
-               printf("down output: %s\n", error_down);
-               free(error_down);
-               error_down = NULL;
-       }
-       if (error_postdown) {
-               printf("postdown output: %s\n", error_down);
-               free(error_down);
-               error_down = NULL;
-       }
+       nozzle_close(nozzle);
 
        return err;
 }
@@ -1176,7 +1054,6 @@ static int check_knet_set_del_ip(void)
        char *ip_list = NULL;
        int ip_list_entries = 0, i, offset = 0;
        char *error_string = NULL;
-       char *error_down = NULL, *error_postdown = NULL;
 
        printf("Testing interface add/remove ip\n");
 
@@ -1405,17 +1282,7 @@ static int check_knet_set_del_ip(void)
        }
 
 out_clean:
-       nozzle_close(nozzle, &error_down, &error_postdown);
-       if (error_down) {
-               printf("down output: %s\n", error_down);
-               free(error_down);
-               error_down = NULL;
-       }
-       if (error_postdown) {
-               printf("postdown output: %s\n", error_down);
-               free(error_down);
-               error_down = NULL;
-       }
+       nozzle_close(nozzle);
 
        return err;
 }