X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Ftest-multipath.c;h=50747d9b6bba4ba5b1c60e441b02e4cb4c4658f1;hb=0ef165ecb57943e17a8ee8270df68ffb8d032e29;hp=03a666f40aa57d54e98acac0afedb728261fcd6f;hpb=53ddd40ab56b6c31a2ced6b984c33ae27f458101;p=sliver-openvswitch.git

diff --git a/tests/test-multipath.c b/tests/test-multipath.c
index 03a666f40..50747d9b6 100644
--- a/tests/test-multipath.c
+++ b/tests/test-multipath.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Nicira Networks.
+ * Copyright (c) 2010, 2012, 2013, 2014 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,25 +25,30 @@
 #include <stdlib.h>
 
 #include "flow.h"
-#include "random.h"
+#include "ofp-actions.h"
 #include "util.h"
+#include "ovstest.h"
 
-int
-main(int argc, char *argv[])
+static void
+test_multipath_main(int argc, char *argv[])
 {
     enum { MP_MAX_LINKS = 63 };
-    struct nx_action_multipath mp;
+    struct ofpact_multipath mp;
     bool ok = true;
+    char *error;
     int n;
 
     set_program_name(argv[0]);
-    random_init();
 
     if (argc != 2) {
         ovs_fatal(0, "usage: %s multipath_action", program_name);
     }
 
-    multipath_parse(&mp, argv[1]);
+    error = multipath_parse(&mp, argv[1]);
+    if (error) {
+        ovs_fatal(0, "%s", error);
+    }
+
     for (n = 1; n <= MP_MAX_LINKS; n++) {
         enum { N_FLOWS = 65536 };
         double disruption, perfect, distribution;
@@ -56,16 +61,17 @@ main(int argc, char *argv[])
         memset(histogram, 0, sizeof histogram);
         for (i = 0; i < N_FLOWS; i++) {
             int old_link, new_link;
+            struct flow_wildcards wc;
             struct flow flow;
 
-            random_bytes(&flow, sizeof flow);
+            flow_random_hash_fields(&flow);
 
-            mp.max_link = htons(n - 1);
-            multipath_execute(&mp, &flow);
+            mp.max_link = n - 1;
+            multipath_execute(&mp, &flow, &wc);
             old_link = flow.regs[0];
 
-            mp.max_link = htons(n);
-            multipath_execute(&mp, &flow);
+            mp.max_link = n;
+            multipath_execute(&mp, &flow, &wc);
             new_link = flow.regs[0];
 
             assert(old_link >= 0 && old_link < n);
@@ -91,7 +97,7 @@ main(int argc, char *argv[])
                "stddev/expected=%.4f\n",
                n, n + 1, disruption, perfect, distribution);
 
-        switch (ntohs(mp.algorithm)) {
+        switch (mp.algorithm) {
         case NX_MP_ALG_MODULO_N:
             if (disruption < (n < 2 ? .25 : .5)) {
                 fprintf(stderr, "%d -> %d: disruption=%.2f < .5\n",
@@ -123,9 +129,11 @@ main(int argc, char *argv[])
             break;
 
         default:
-            NOT_REACHED();
+            OVS_NOT_REACHED();
         }
     }
 
-    return ok ? 0 : 1;
+    exit(ok ? 0 : 1);
 }
+
+OVSTEST_REGISTER("test-multipath", test_multipath_main);