Fixing CCNx on PlanetLab to accept a user defined bind port.

[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 39f506d..e69f3e7 100644 (file)
--- a/src/nepi/testbeds/planetlab/metadata.py
+++ b/src/nepi/testbeds/planetlab/metadata.py
@@ -1127,7 +1127,7 @@ attributes = dict({
                 "validation_function": validation.is_string
             }),
     "ccnroutes": dict({
-                "name": "ccnroutes",
+                "name": "ccnRoutes",
                 "help": "Route can be static (e.g. udp ip) or multicast (e.g. udp 224.0.0.204 2869). To separate different route use '|' ",
                 "type": Attribute.STRING,
                 "flags": Attribute.ExecReadOnly | Attribute.ExecImmutable,
@@ -1179,16 +1179,8 @@ attributes = dict({
                 "flags": Attribute.ExecReadOnly | Attribute.ExecImmutable,
                 "validation_function": validation.is_string
             }),
-    "ccnsources": dict({
-                "name": "ccnsources",
-                "help": "Path to local tar with ccnx sources."
-                        "Default source is http://www.ccnx.org/releases/ccnx-0.5.1.tar.gz",
-                "type": Attribute.STRING,
-                "flags": Attribute.ExecReadOnly | Attribute.ExecImmutable,
-                "validation_function": validation.is_string
-            }),
     "ccnxversion": dict({      
-                "name": "ccnxversion",
+                "name": "ccnxVersion",
                 "help": "Version of ccnx source code to install in the node.",
                 "type": Attribute.ENUM, 
                 "value": "ccnx-0.6.0",
@@ -1197,6 +1189,16 @@ attributes = dict({
                             "ccnx-0.5.1"],
                 "validation_function": validation.is_enum,
             }),
+     "ccnlocalport" : dict({
+            "name" : "ccnLocalPort", 
+            "help" : "Local port to bind the ccn daemon. (i.e. CCN_LOCAL_PORT=)",
+            "type" : Attribute.INTEGER,
+            "flags" : Attribute.DesignInvisible | \
+                    Attribute.ExecInvisible | \
+                    Attribute.ExecImmutable | \
+                    Attribute.Metadata,
+            "validation_function" : validation.is_integer,
+            }),
     "build": dict({
                 "name": "build",
                 "help": "Build commands to execute after deploying the sources. "
@@ -1583,7 +1585,7 @@ factories_info = dict({
             "status_function": status_application,
             "stop_function": stop_application,
             "configure_function": configure_application,
-            "box_attributes": ["ccnroutes", "ccnsources", "build", 
+            "box_attributes": ["ccnroutes", "build", "ccnlocalport",
                 "install", "ccnxversion", "sources"],
             "connector_types": ["node"],
             "traces": ["stdout", "stderr", "buildlog", "output"],