testbed_api_hosts test cases

diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am
index 75ca9d567cdf7ae5ca44f119941a5175b7b2b780..96f3544746fa6c3e795bf54c8e1cbbc63b867b8e 100644 (file)
--- a/src/testbed/Makefile.am
+++ b/src/testbed/Makefile.am
@@ -50,3 +50,15 @@ libgnunettestbed_la_LDFLAGS = \
  $(GN_LIB_LDFLAGS) \
  -version-info 0:0:0
 
+check_PROGRAMS = \
+ test_testbed_api_hosts
+
+if ENABLE_TEST_RUN
+  TESTS = $(check_PROGRAMS)
+endif
+
+test_testbed_api_hosts_SOURCES = \
+ test_testbed_api_hosts.c
+test_testbed_api_hosts_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunettestbed.la
\ No newline at end of file

diff --git a/src/testbed/test_testbed_api.conf b/src/testbed/test_testbed_api.conf
new file mode 100644 (file)
index 0000000..c41ee95
--- /dev/null
+++ b/src/testbed/test_testbed_api.conf
@@ -0,0 +1,67 @@
+[lockmanager]
+AUTOSTART = NO 
+
+[fs]
+AUTOSTART = NO
+
+[resolver]
+AUTOSTART = NO
+
+[mesh]
+AUTOSTART = NO
+
+[dht]
+AUTOSTART = NO
+
+[block]
+plugins = dht test
+
+[dhtcache]
+QUOTA = 1 MB
+DATABASE = sqlite
+
+[transport]
+PLUGINS = tcp
+DEBUG = NO
+ACCEPT_FROM6 = ::1;
+ACCEPT_FROM = 127.0.0.1;
+NEIGHBOUR_LIMIT = 50
+PORT = 12365
+
+[ats]
+WAN_QUOTA_OUT = 3932160
+WAN_QUOTA_IN = 3932160
+
+[core]
+PORT = 12092
+
+[arm]
+DEFAULTSERVICES =
+PORT = 12366
+DEBUG = NO
+
+[transport-tcp]
+TIMEOUT = 300 s
+PORT = 12368
+
+[TESTING]
+NUM_PEERS = 5
+WEAKRANDOM = YES
+DEBUG = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+MAX_CONCURRENT_SSH = 10
+USE_PROGRESSBARS = YES
+PEERGROUP_TIMEOUT = 2400 s
+
+[gnunetd]
+HOSTKEY = $SERVICEHOME/.hostkey
+
+[PATHS]
+DEFAULTCONFIG = test_testbed_api.conf
+SERVICEHOME = /tmp/test-testbed/
+
+[dns]
+AUTOSTART = NO
+
+[nse]
+AUTOSTART = NO

diff --git a/src/testbed/test_testbed_api_hosts.c b/src/testbed/test_testbed_api_hosts.c
new file mode 100644 (file)
index 0000000..91002f1
--- /dev/null
+++ b/src/testbed/test_testbed_api_hosts.c
@@ -0,0 +1,105 @@
+/*
+      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 testbed/test_testbed_api_hosts.c
+ * @brief tests cases for testbed_api_hosts.c
+ * @author Sree Harsha Totakura
+ */
+
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_testbed_service.h"
+#include "testbed_api_hosts.h"
+
+
+#define TIME_REL_SECS(sec)                                             \
+  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, sec)
+
+/**
+ * Host we are creating and using
+ */
+static struct GNUNET_TESTBED_Host *host;
+
+/**
+ * The host helper handle
+ */
+static struct GNUNET_TESTBED_HelperHandle *helper_handle;
+
+
+/**
+ * The shutdown task
+ *
+ * @param cls NULL
+ * @param tc the task context
+ */
+static void
+do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  GNUNET_TESTBED_host_stop_ (helper_handle);
+  GNUNET_TESTBED_host_destroy (host);
+}
+
+
+/**
+ * Main run function. 
+ *
+ * @param cls NULL
+ * @param args arguments passed to GNUNET_PROGRAM_run
+ * @param cfgfile the path to configuration file
+ * @param cfg the configuration file handle
+ */
+static void
+run (void *cls, char *const *args, const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+  char *const binary_args[] = {NULL};
+
+  host = GNUNET_TESTBED_host_create ("localhost", NULL, 0);
+  GNUNET_assert (NULL != host);
+  GNUNET_assert (0 != GNUNET_TESTBED_host_get_id_ (host));
+  GNUNET_TESTBED_host_destroy (host);
+  host = GNUNET_TESTBED_host_create (NULL, NULL, 0);
+  GNUNET_assert (NULL != host);
+  GNUNET_assert (0 == GNUNET_TESTBED_host_get_id_ (host));
+  GNUNET_assert (host == GNUNET_TESTBED_host_lookup_by_id_ (0));
+  helper_handle = GNUNET_TESTBED_host_run_ (host, binary_args);
+  GNUNET_assert (NULL != helper_handle);
+  GNUNET_SCHEDULER_add_delayed (TIME_REL_SECS (2), &do_shutdown, NULL);
+}
+
+
+int main (int argc, char **argv)
+{
+  int ret;
+
+  char *const argv2[] = { "test_lockmanager_api_hosts",
+                          "-c", "test_testbed_api.conf",
+                          NULL
+  };
+  struct GNUNET_GETOPT_CommandLineOption options[] = {
+    GNUNET_GETOPT_OPTION_END
+  };
+
+  ret = GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2,
+                           "test_testbed_api_hosts", "nohelp", options, &run, NULL);
+
+  return GNUNET_OK == ret ? 0 : 1;
+}

diff --git a/src/testbed/testbed_api_hosts.c b/src/testbed/testbed_api_hosts.c
index c4dfcf3c9e586ce27a139575ff08ffcc73d39a96..ca3afb29ad8ef4494a1cca003662acfd7e7eb6ee 100644 (file)
--- a/src/testbed/testbed_api_hosts.c
+++ b/src/testbed/testbed_api_hosts.c
@@ -117,8 +117,11 @@ GNUNET_TESTBED_host_lookup_by_id_ (uint32_t id)
 struct GNUNET_TESTBED_Host *
 GNUNET_TESTBED_host_create_by_id_ (uint32_t id)
 {
-  GNUNET_break (0);
-  return NULL;
+  struct GNUNET_TESTBED_Host *host;
+  
+  host = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_Host));
+  host->unique_id = id;
+  return host;
 }
 
 
@@ -280,7 +283,10 @@ GNUNET_TESTBED_host_run_ (const struct GNUNET_TESTBED_Host *host,
     unsigned int argp;
 
     GNUNET_asprintf (&h->port, "%d", host->port);
-    GNUNET_asprintf (&h->dst, "%s@%s", host->hostname, host->username);
+    if (NULL == host->username)
+      GNUNET_asprintf (&h->dst, "%s", host->hostname);
+    else 
+      GNUNET_asprintf (&h->dst, "%s@%s", host->hostname, host->username);
     argp = 0;
     remote_args[argp++] = "ssh";
     remote_args[argp++] = "-p";