Allow not connecting a router

[nepi.git] / src / nepi / testbeds / planetlab / metadata.py

diff --git a/src/nepi/testbeds/planetlab/metadata.py b/src/nepi/testbeds/planetlab/metadata.py
index b388707..cd01367 100644 (file)
--- a/src/nepi/testbeds/planetlab/metadata.py
+++ b/src/nepi/testbeds/planetlab/metadata.py
@@ -623,7 +623,7 @@ connector_types = dict({
                 "help": "Connector to a routing daemon", 
                 "name": "router",
                 "max": 1, 
-                "min": 1
+                "min": 0
             }),
     "fwd": dict({
                 "help": "Forwarder this routing daemon communicates with", 
@@ -697,10 +697,22 @@ connections = [
     }),
     dict({
         "from": (TESTBED_ID, NODE, "apps"),
-        "to":   (TESTBED_ID, (APPLICATION, DEPENDENCY, NEPIDEPENDENCY, NS3DEPENDENCY, MULTICASTANNOUNCER), "node"),
+        "to":   (TESTBED_ID, (APPLICATION, MULTICASTANNOUNCER), "node"),
         "init_code": connect_dep,
         "can_cross": False
     }),
+    dict({
+        "from": (TESTBED_ID, NODE, "deps"),
+        "to":   (TESTBED_ID, (DEPENDENCY, NEPIDEPENDENCY, NS3DEPENDENCY), "node"),
+        "init_code": connect_dep,
+        "can_cross": False
+    }),
+    dict({
+        "from": (TESTBED_ID, NODE, "pipes"),
+        "to":   (TESTBED_ID, NETPIPE, "node"),
+        "init_code": connect_node_netpipe,
+        "can_cross": False
+    }),
     dict({
         "from": (TESTBED_ID, NODE, "apps"),
         "to":   (TESTBED_ID, MULTICASTFORWARDER, "node"),
@@ -1344,6 +1356,10 @@ factories_info = dict({
                 "max_reliability",
                 "min_bandwidth",
                 "max_bandwidth",
+                "min_load",
+                "max_load",
+                "min_cpu",
+                "max_cpu",
                 
                 # NEPI-in-NEPI attributes
                 ATTR_NEPI_TESTBED_ENVIRONMENT_SETUP,