Updated ccnx allowed versions to 0.6.0 and 0.7.1 for PlanetLab CCNxDaemon

[nepi.git] / examples / ccnx / planetlab_ccnx_unicast.py

diff --git a/examples/ccnx/planetlab_ccnx_unicast.py b/examples/ccnx/planetlab_ccnx_unicast.py
index 6b8667a..d7f5f83 100644 (file)
--- a/examples/ccnx/planetlab_ccnx_unicast.py
+++ b/examples/ccnx/planetlab_ccnx_unicast.py
@@ -17,8 +17,6 @@
 from nepi.core.design import ExperimentDescription, FactoriesProvider
 from nepi.core.execute import ExperimentController
 from nepi.util.constants import ApplicationStatus as AS
-import ipaddr
-import math
 from optparse import OptionParser, SUPPRESS_HELP
 import os
 import signal
@@ -70,8 +68,7 @@ def create_node(hostname, pl_inet, slice_desc):
 def create_ccnd(pl_node, port, routes, slice_desc):
     pl_app = slice_desc.create("CCNxDaemon")
     
-    # We can specify a default ccnx version to be either ccnx-0.5.1 or ccnx-0.6.0
-    #pl_app.set_attribute_value("ccnxVersion", "ccnx-0.5.1")
+    # We can specify a default ccnx version to be either 0.6.0 or 0.7.1
     # We can also specify a custom local source and build and install directives
     path_to_source = os.path.join(os.path.dirname(os.path.abspath(__file__)),
         "ccnx-0.6.0rc3.tar.gz")
@@ -122,9 +119,14 @@ def exec_ccncatchunks(slicename, port, hostname):
     command += ' ccncatchunks2 ccnx:/VIDEO'
 
     login = "%s@%s" % (slicename, hostname)
-    proc1 = subprocess.Popen(['ssh', login, command], stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell = False)
+    proc1 = subprocess.Popen(['ssh',
+        '-o', 'StrictHostKeyChecking=no',
+        login, 
+        command], 
+        stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell = False)
     
     proc2 = subprocess.Popen(['vlc', 
+        '--ffmpeg-threads=1',
         '--sub-filter', 'marq', 
         '--marq-marquee', 
         '(c) copyright 2008, Blender Foundation / www.bigbuckbunny.org', 
@@ -248,6 +250,7 @@ if __name__ == '__main__':
                  'planetlabpc2.upf.edu',
                  'planet2.elte.hu',
                  'planetlab2.esprit-tn.com' ]
+
     ccn_local_port = os.environ.get('CCN_LOCAL_PORT')
 
     usage = "usage: %prog -s <pl_slice> -H <pl_host> -k <ssh_key> -u <pl_user> -p <pl_password> -v <vsys_vnet> -N <host_names> -c <node_count> -d <delay> -P <ccn-local-port> -x <proxy>"