from nepi.execution.ec import ExperimentController
-from optparse import OptionParser, SUPPRESS_HELP
+from optparse import OptionParser
import os
-usage = ("usage: %prog -a <hostanme1> -b <hostname2> -u <username> -i <ssh-key>")
+usage = ("usage: %prog -a <hostname1> -b <hostname2> -u <username> -i <ssh-key>")
parser = OptionParser(usage = usage)
parser.add_option("-a", "--hostname1", dest="hostname1",
##### CONFIGURING NODE 1
## Register node 1
-node1 = ec.register_resource("LinuxNode")
+node1 = ec.register_resource("linux::Node")
# Set the hostname of the first node to use for the experiment
ec.set(node1, "hostname", hostname1)
# username should be your SSH user
ec.set(node1, "cleanProcesses", True)
## Register a CCN daemon in node 1
-ccnd1 = ec.register_resource("LinuxCCND")
+ccnd1 = ec.register_resource("linux::CCND")
# Set ccnd log level to 7
ec.set(ccnd1, "debug", 7)
ec.register_connection(ccnd1, node1)
## Register a repository in node 1
-ccnr1 = ec.register_resource("LinuxCCNR")
+ccnr1 = ec.register_resource("linux::CCNR")
ec.register_connection(ccnr1, ccnd1)
## Push the file into the repository
content_name = "ccnx:/test/FILE"
# Add a content to the repository
-co = ec.register_resource("LinuxCCNContent")
+co = ec.register_resource("linux::CCNContent")
ec.set(co, "contentName", content_name)
# NEPI will upload the specified file to the remote node and write it
# into the CCN repository
##### CONFIGURING NODE 2
## Register node 2
-node2 = ec.register_resource("LinuxNode")
+node2 = ec.register_resource("linux::Node")
# Set the hostname of the first node to use for the experiment
ec.set(node2, "hostname", hostname2)
# username should be your SSH user
ec.set(node2, "cleanProcesses", True)
## Register a CCN daemon in node 2
-ccnd2 = ec.register_resource("LinuxCCND")
+ccnd2 = ec.register_resource("linux::CCND")
# Set ccnd log level to 7
ec.set(ccnd2, "debug", 7)
ec.register_connection(ccnd2, node2)
## Retrieve the file stored in node 1 from node 2
-ccncat = ec.register_resource("LinuxCCNCat")
+ccncat = ec.register_resource("linux::CCNCat")
ec.set(ccncat, "contentName", content_name)
ec.register_connection(ccncat, ccnd2)
##### INTERCONNECTING CCN NODES ...
# Register a FIB entry from node 1 to node 2
-entry1 = ec.register_resource("LinuxFIBEntry")
+entry1 = ec.register_resource("linux::FIBEntry")
ec.set(entry1, "host", hostname2)
ec.register_connection(entry1, ccnd1)
# Register a FIB entry from node 2 to node 1
-entry2 = ec.register_resource("LinuxFIBEntry")
+entry2 = ec.register_resource("linux::FIBEntry")
ec.set(entry2, "host", hostname1)
ec.register_connection(entry2, ccnd2)