topology test case

4 files changed, 161 insertions, 4 deletions

diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am
index 5c42ec8e8..7889346f2 100644
--- a/src/testbed/Makefile.am
+++ b/src/testbed/Makefile.am
@@ -77,7 +77,8 @@ check_PROGRAMS = \
  test_testbed_api_operations \
  test_testbed_api_testbed_run \
  test_testbed_api_test \
- test_gnunet_helper_testbed
+ test_gnunet_helper_testbed \
+ test_testbed_api_topology
 
 if ENABLE_TEST_RUN
  TESTS = \
@@ -89,7 +90,8 @@ if ENABLE_TEST_RUN
   test_gnunet_helper_testbed \
   test_testbed_api_controllerlink \
   test_testbed_api_testbed_run \
-  test_testbed_api_test
+  test_testbed_api_test \
+  test_testbed_api_topology
 endif
 
 test_testbed_api_hosts_SOURCES = \
@@ -144,6 +146,12 @@ test_testbed_api_test_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  libgnunettestbed.la
 
+test_testbed_api_topology_SOURCES = \
+ test_testbed_api_topology.c
+test_testbed_api_topology_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunettestbed.la
+
 test_gnunet_helper_testbed_SOURCES = \
  test_gnunet_helper_testbed.c
 test_gnunet_helper_testbed_LDADD = \
diff --git a/src/testbed/test_testbed_api_topology.c b/src/testbed/test_testbed_api_topology.c
new file mode 100644
index 000000000..10be26887
--- /dev/null
+++ b/src/testbed/test_testbed_api_topology.c
@@ -0,0 +1,146 @@
+/*
+  This file is part of GNUnet
+  (C) 2008--2012 Christian Grothoff (and other contributing authors)
+
+  GNUnet is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published
+  by the Free Software Foundation; either version 3, or (at your
+  option) any later version.
+
+  GNUnet is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with GNUnet; see the file COPYING.  If not, write to the
+  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+  Boston, MA 02111-1307, USA.
+*/
+
+/**
+ * @file src/testbed/test_testbed_api_topology.c
+ * @brief testing cases for testing high level testbed api helper functions
+ * @author Sree Harsha Totakura <sreeharsha@totakura.in>
+ */
+
+#include "platform.h"
+#include "gnunet_common.h"
+#include "gnunet_testbed_service.h"
+
+/**
+ * Number of peers we want to start
+ */
+#define NUM_PEERS 5
+
+/**
+ * Array of peers
+ */
+static struct GNUNET_TESTBED_Peer **peers;
+
+/**
+ * Operation handle
+ */
+static struct GNUNET_TESTBED_Operation *op;
+
+/**
+ * Testing result
+ */
+static int result;
+
+/**
+ * Counter for counting overlay connections
+ */
+static unsigned int overlay_connects;
+
+
+/**
+ * Shutdown nicely
+ *
+ * @param cls NULL
+ * @param tc the task context
+ */
+static void
+do_shutdown (void *cls, const const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  if (NULL != op)
+  {
+    GNUNET_TESTBED_operation_done (op);
+    op = NULL;
+  }
+  GNUNET_SCHEDULER_shutdown ();
+}
+
+/**
+ * Controller event callback
+ *
+ * @param cls NULL
+ * @param event the controller event
+ */
+static void
+controller_event_cb (void *cls,
+                     const struct GNUNET_TESTBED_EventInformation *event)
+{
+  switch (event->type)
+  {
+  case GNUNET_TESTBED_ET_CONNECT:
+    overlay_connects++;
+    if ((NUM_PEERS - 1) == overlay_connects)
+    {
+      result = GNUNET_OK;
+      GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+    }
+    break;
+  default:
+    GNUNET_assert (0);
+  }  
+}
+
+
+/**
+ * Signature of a main function for a testcase.
+ *
+ * @param cls closure
+ * @param num_peers number of peers in 'peers'
+ * @param peers handle to peers run in the testbed
+ */
+static void
+test_master (void *cls, unsigned int num_peers,
+             struct GNUNET_TESTBED_Peer **peers_)
+{
+  unsigned int peer;
+
+  GNUNET_assert (NULL == cls);
+  GNUNET_assert (NUM_PEERS == num_peers);
+  GNUNET_assert (NULL != peers_);
+  for (peer = 0; peer < num_peers; peer++)
+    GNUNET_assert (NULL != peers_[peer]);
+  peers = peers_;
+  overlay_connects = 0;
+  op = GNUNET_TESTBED_overlay_configure_topology (NULL, NUM_PEERS, peers,
+                                                  GNUNET_TESTBED_TOPOLOGY_LINE);
+  GNUNET_assert (NULL != op);
+}
+
+
+/**
+ * Main function
+ */
+int
+main (int argc, char **argv)
+{
+  uint64_t event_mask;
+
+  result = GNUNET_SYSERR;
+  event_mask = 0;
+  event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT);
+  event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED);
+  GNUNET_TESTBED_test_run ("test_testbed_api_test", "test_testbed_api.conf",
+                           NUM_PEERS, event_mask, &controller_event_cb, NULL,
+                           &test_master, NULL);
+  if (GNUNET_OK != result)
+    return 1;
+  return 0;
+}
+
+/* end of test_testbed_api_topology.c */
diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c
index be8c68fce..c16ac0168 100644
--- a/src/testbed/testbed_api.c
+++ b/src/testbed/testbed_api.c
@@ -1431,6 +1431,8 @@ GNUNET_TESTBED_controller_disconnect (struct GNUNET_TESTBED_Controller
   GNUNET_TESTBED_operation_queue_destroy_ (controller->opq_parallel_operations);
   GNUNET_TESTBED_operation_queue_destroy_
       (controller->opq_parallel_service_connections);
+  GNUNET_TESTBED_operation_queue_destroy_
+      (controller->opq_parallel_topology_config_operations);
   GNUNET_free (controller);
 }
 
diff --git a/src/testbed/testbed_api_topology.c b/src/testbed/testbed_api_topology.c
index 04fea74b3..f7aa2ed5b 100644
--- a/src/testbed/testbed_api_topology.c
+++ b/src/testbed/testbed_api_topology.c
@@ -145,8 +145,8 @@ oprelease_overlay_configure_topology (void *cls)
   {
     for (p = 0; p < tc->link_array_size; p++)
       if (NULL != tc->link_ops[p])
-        GNUNET_TESTBED_operation_cancel (tc->link_ops[p]);
-    GNUNET_free (tc->link_ops);
+        GNUNET_TESTBED_operation_cancel (tc->link_ops[p]);      
+    GNUNET_free (tc->link_ops);    
   }
   GNUNET_free_non_null (tc->link_array);
   GNUNET_free (tc);
@@ -231,6 +231,7 @@ GNUNET_TESTBED_overlay_configure_topology_va (void *op_cls,
     return NULL;
   c = peers[0]->controller;
   tc = GNUNET_malloc (sizeof (struct TopologyContext));
+  tc->peers = peers;
   switch (topo)
   {
   case GNUNET_TESTBED_TOPOLOGY_LINE: