Linux/Ns-3/Dce cross experiments

diff --git a/test/resources/linux/ns3/cross_dce_linux_ccn.py b/test/resources/linux/ns3/cross_dce_linux_ccn.py
index c15ef4e..714371c 100755 (executable)
--- a/test/resources/linux/ns3/cross_dce_linux_ccn.py
+++ b/test/resources/linux/ns3/cross_dce_linux_ccn.py
@@ -152,12 +152,115 @@ class LinuxNS3FdNetDeviceTest(unittest.TestCase):
 
         ec.shutdown()
 
+    @skipIfNotAlive
+    def t_cross_ccncat(self, host, user = None, identity = None):
+        ec = ExperimentController(exp_id = "test-linux-ns3-ccnpeek")
+        
+        node = ec.register_resource("linux::Node")
+        if host == "localhost":
+            ec.set(node, "hostname", "localhost")
+        else:
+            ec.set(node, "hostname", host)
+            ec.set(node, "username", user)
+            ec.set(node, "identity", identity)
+        
+        ec.set(node, "cleanProcesses", True)
+        ec.set(node, "cleanExperiment", True)
+
+        simu = ec.register_resource("linux::ns3::Simulation")
+        ec.set(simu, "simulatorImplementationType", "ns3::RealtimeSimulatorImpl")
+        ec.set(simu, "checksumEnabled", True)
+        ec.set(simu, "verbose", True)
+        #ec.set(simu, "buildMode", "debug")
+        #ec.set(simu, "nsLog", "FdNetDevice")
+        ec.register_connection(simu, node)
+
+        nsnode = add_ns3_node(ec, simu)
+
+        fddev = add_fd_device(ec, nsnode, "10.0.0.2", "30")
+        ec.enable_trace(fddev, "pcap")
+        ec.enable_trace(fddev, "promiscPcap")
+        ec.enable_trace(fddev, "ascii")
+
+        tap = add_tap_device(ec, node, "10.0.0.1", "30")
+
+        crosslink = ec.register_resource("linux::ns3::TunTapFdLink")
+        ec.register_connection(crosslink, tap)
+        ec.register_connection(crosslink, fddev)
+
+        ### create DCE applications
+        ccnd1 = ec.register_resource("linux::ns3::dce::CCND")
+        ec.set(ccnd1, "stackSize", 1<<20)
+        ec.set(ccnd1, "StartTime", "1s")
+        ec.register_connection(ccnd1, nsnode)
+
+        repofile = os.path.join(
+            os.path.dirname(os.path.realpath(__file__)),
+            "ccn", 
+            "repoFile1")
+
+        ccnr = ec.register_resource("linux::ns3::dce::CCNR")
+        ec.set (ccnr, "repoFile1", repofile) 
+        ec.set (ccnr, "stackSize", 1<<20)
+        ec.set (ccnr, "StartTime", "2s")
+        ec.set (ccnr, "StopTime", "4s")
+        ec.register_connection(ccnr, nsnode)
+
+        fib1 = ec.register_resource("linux::ns3::dce::FIBEntry")
+        ec.set(fib1, "protocol", "udp") 
+        ec.set(fib1, "uri", "ccnx:/") 
+        ec.set(fib1, "host", "10.0.0.1")
+        ec.set(fib1, "stackSize", 1<<20)
+        ec.set(fib1, "StartTime", "2s")
+        ec.register_connection(fib1, nsnode)
+
+        ### create Linux applications
+        ccnd2 = ec.register_resource("linux::CCND")
+        ec.register_connection(ccnd2, node)
+
+        ccncat = ec.register_resource("linux::CCNCat")
+        ec.set(ccncat, "contentName", "ccnx:/test/bunny.ts")
+        ec.register_connection(ccncat, ccnd2)
+        """
+       
+        peek = ec.register_resource("linux::CCNPeek")
+        ec.set(peek, "contentName", "ccnx:/test/bunny.ts")
+        ec.register_connection(peek, ccnd2)
+        """
+
+        fib2 = ec.register_resource("linux::FIBEntry")
+        ec.set(fib2, "protocol", "udp") 
+        ec.set(fib2, "uri", "ccnx:/") 
+        ec.set(fib2, "host", "10.0.0.2")
+        ec.register_connection(fib2, ccnd2)
+
+        ec.register_condition(ccncat, ResourceAction.START, ccnr,
+            ResourceState.STARTED)
+ 
+        ec.deploy()
+
+        #ec.wait_finished([ccncat])
+        import time
+        time.sleep(60)
+
+        stdout = ec.trace(ccncat, "stdout")
+        f = open("bunny.ts", "w")
+        f.write(stdout)
+        f.close()
+
+        #expected = "DATA"
+        #self.assertTrue(stdout.find(expected) > -1)
+
+        ec.shutdown()
+
     def ztest_cross_ccnpeek_fedora(self):
         self.t_cross_cnnpeek(self.fedora_host, self.fedora_user, self.fedora_identity)
 
     def test_cross_ccnpeek_local(self):
         self.t_cross_ccnpeek("localhost")
 
+    def test_cross_ccncat_local(self):
+        self.t_cross_ccncat("localhost")
 
 if __name__ == '__main__':
     unittest.main()