Fix metadata bug: tun_cipher should also be flagged as META, make tun_cipher in ns3...

diff --git a/src/nepi/core/metadata.py b/src/nepi/core/metadata.py
index db1b004..05d36f4 100644 (file)
--- a/src/nepi/core/metadata.py
+++ b/src/nepi/core/metadata.py
@@ -466,7 +466,8 @@ class Metadata(object):
                 "DES",
                 "PLAIN",
             ],
-            "flags" : Attribute.ExecImmutable,
+            "flags" : Attribute.ExecImmutable | \
+                      Attribute.Metadata,
             "validation_function" : validation.is_enum,
             }),
         ATTR_NEPI_TESTBED_ENVIRONMENT_SETUP : dict({

diff --git a/src/nepi/testbeds/ns3/attributes_metadata.py b/src/nepi/testbeds/ns3/attributes_metadata.py
index 0ef4e71..386b2d0 100644 (file)
--- a/src/nepi/testbeds/ns3/attributes_metadata.py
+++ b/src/nepi/testbeds/ns3/attributes_metadata.py
@@ -2544,4 +2544,15 @@ attributes = dict({
         "type": Attribute.STRING,
         "help": "Comma separated list of waypoints in format t:x:y:z. Ex: 0s:0:0:0, 1s:1:0:0"
     }),
+    "tun_cipher_fdnd" : dict({
+        "name" : "tun_cipher", 
+        "help" : "Tunnel cryptography not supported",
+        "type" : Attribute.ENUM,
+        "value" : "PLAIN",
+        "allowed" : [
+            "PLAIN",
+        ],
+        "flags" : Attribute.ExecImmutable | Attribute.Metadata,
+        "validation_function" : validation.is_enum,
+        }),
 })

diff --git a/src/nepi/testbeds/ns3/factories_metadata.py b/src/nepi/testbeds/ns3/factories_metadata.py
index f45dca4..38af010 100644 (file)
--- a/src/nepi/testbeds/ns3/factories_metadata.py
+++ b/src/nepi/testbeds/ns3/factories_metadata.py
@@ -1048,7 +1048,7 @@ factories_info = dict({
         "help": "Network interface associated to a file descriptor",
         "connector_types": ["node", "->fd"],
         "box_attributes": ["Address", 
-            "tun_proto", "tun_addr", "tun_port", "tun_key"],
+            "tun_proto", "tun_addr", "tun_port", "tun_key", "tun_cipher_fdnd"],
         "traces": ["fdpcap", "fdascii"],
         "tags": [tags.INTERFACE, tags.ALLOW_ADDRESSES],
     }),

diff --git a/test/testbeds/planetlab/integration_ns3.py b/test/testbeds/planetlab/integration_ns3.py
index 13cc41c..9513a1a 100755 (executable)
--- a/test/testbeds/planetlab/integration_ns3.py
+++ b/test/testbeds/planetlab/integration_ns3.py
@@ -59,6 +59,7 @@ class PlanetLabCrossIntegrationTestCase(unittest.TestCase):
         pl_desc.set_attribute_value("tapPortBase", self.port_base)
         pl_desc.set_attribute_value("p2pDeployment", False) # it's interactive, we don't want it in tests
         pl_desc.set_attribute_value("dedicatedSlice", True)
+        #pl_desc.set_attribute_value("plLogLevel", "DEBUG")
         
         return pl_desc, exp_desc