Merge pull request #295 from openweave/jexie/enable_serviceDir_lwip_tests

enable service-dir lwip tests

Author: robszewczyk

src/test-apps/happy/test-templates/WeaveServiceDir.py

@@ -133,13 +133,14 @@ def __pre_check(self):
         self.client_ip = self.getNodeWeaveIPAddress(self.client)
 
         # Check if all unknowns were found
-
-        if self.service_ip == None:
+        # If device is tap device, IP will be assigned from lwip stack, 
+        # so no need to check IP here for tap devices
+        if self.service_ip == None and not self.use_lwip:
             emsg = "Could not find IP address of the service."
             self.logger.error("[localhost] WeaveServiceDir: %s" % (emsg))
             self.exit()
 
-        if self.client_ip == None:
+        if self.client_ip == None and not self.use_lwip:
             emsg = "Could not find IP address of the client."
             self.logger.error("[localhost] WeaveServiceDir: %s" % (emsg))
             self.exit()
@@ -197,8 +198,8 @@ def __start_client_side(self):
         if not cmd:
             return
 
-        cmd += " --node-addr " + self.client_ip
-        cmd += " --service-dir-url " + self.service_ip
+        self.client_weave_id = self.getWeaveNodeID(self.client)
+        cmd += " --node-id " + str(self.client_weave_id)
         cmd += " --debug-resource-usage"
         cmd += " --print-fault-counters"
 
@@ -207,16 +208,22 @@ def __start_client_side(self):
 
         cmd += " --iterations " + str(self.iterations)
 
-        if self.tap:
-            cmd += " --tap-device " + self.tap
+        # if device is tap device, we need to provide tap interface and ipv4 gateway 
+        if self.use_lwip:
+            cmd += " --tap-device " + self.client_tap
+            cmd += " --ipv4-gateway " + self.client_ipv4_gateway
+            cmd += " --node-addr " + self.client_node_addr
+            cmd += " --service-dir-server " + self.service_node_addr
+        else:
+            cmd += " --node-addr " + self.client_ip
+            cmd += " --service-dir-server " + self.service_ip
 
         custom_env = {}
         if self.use_plaid:
             custom_env = self.plaid.getPlaidClientLibEnv(self.client)
 
         self.start_weave_process(self.client, cmd, self.client_process_tag, strace=self.strace, env=custom_env)
 
-
     def __wait_for_client(self):
         self.wait_for_test_to_end(self.client, self.client_process_tag)
 
@@ -243,8 +250,10 @@ def __start_service_side(self):
         cmd += " --node-id " + str(self.service_weave_id)
         cmd += " --fabric-id " + str(self.fabric_id)
 
-        if self.tap:
-            cmd += " --tap-device " + self.tap
+        if self.use_lwip:
+            cmd += " --tap-device " + self.service_tap
+            cmd += " --ipv4-gateway " + self.service_ipv4_gateway
+            cmd += " --node-addr " + self.service_node_addr
 
         if self.service_faults:
             cmd += " --faults " + self.service_faults

src/test-apps/happy/tests/standalone/servicedir/test_service_directory_01.py

@@ -36,48 +36,36 @@
 import WeaveStateUnload
 import WeaveServiceDir
 import WeaveUtilities
+import subprocess
 
 gFaultopts = WeaveUtilities.FaultInjectionOptions(nodes=["client", "service"])
 gOptions = { "fault-injection": False }
 
 class test_service_directory_01(unittest.TestCase):
     def setUp(self):
-        self.tap = None
-
         if "WEAVE_SYSTEM_CONFIG_USE_LWIP" in os.environ.keys() and os.environ["WEAVE_SYSTEM_CONFIG_USE_LWIP"] == "1":
-            self.topology_file = os.path.dirname(os.path.realpath(__file__)) + \
-                "/../../../topologies/standalone/thread_wifi_on_tap_ap_service.json"
-            self.tap = "wpan0"
+            self.use_lwip = True
+            topology_shell_script = os.path.dirname(os.path.realpath(__file__)) + \
+                "/../../../topologies/standalone/thread_wifi_on_tap_ap_service.sh"
+            # tap interface, ipv4 gateway and node addr should be provided if device is tap device
+            # both BorderRouter and cloud node are tap devices here
+            self.BR_tap = "wlan0"
+            self.BR_ipv4_gateway = "10.0.1.2"
+            self.BR_node_addr = "10.0.1.3"
+            self.cloud_tap = "eth0"
+            self.cloud_ipv4_gateway = "192.168.100.2"
+            self.cloud_node_addr = "192.168.100.3"
         else:
-            self.topology_file = os.path.dirname(os.path.realpath(__file__)) + \
-                "/../../../topologies/standalone/thread_wifi_ap_service.json"
-
-        self.show_strace = False
-
-        # setting Mesh for thread test
-        options = WeaveStateLoad.option()
-        options["quiet"] = True
-        options["json_file"] = self.topology_file
-
-        setup_network = WeaveStateLoad.WeaveStateLoad(options)
-        ret = setup_network.run()
-
+            self.use_lwip = False
+            topology_shell_script = os.path.dirname(os.path.realpath(__file__)) + \
+                "/../../../topologies/standalone/thread_wifi_ap_service.sh"
+        output = subprocess.call([topology_shell_script])
 
     def tearDown(self):
         # cleaning up
-        options = WeaveStateUnload.option()
-        options["quiet"] = True
-        options["json_file"] = self.topology_file
-
-        teardown_network = WeaveStateUnload.WeaveStateUnload(options)
-        teardown_network.run()
-
+        subprocess.call(["happy-state-delete"])
 
     def test_service_directory(self):
-        # TODO: Once LwIP bugs are fix, enable this test on LwIP
-        if "WEAVE_SYSTEM_CONFIG_USE_LWIP" in os.environ.keys() and os.environ["WEAVE_SYSTEM_CONFIG_USE_LWIP"] == "1":
-            print hred("WARNING: Test skipped due to LwIP-based network cofiguration!")            
-            return
 
         num_tests = 0
         num_failed_tests = 0
@@ -125,14 +113,20 @@ def __run_service_directory_test_between(self, nodeA, nodeB, num_iterations=1, f
         options["quiet"] = False
         options["client"] = nodeA
         options["service"] = nodeB
-        options["tap"] = self.tap
+        options["use_lwip"] = self.use_lwip
+        if self.use_lwip:
+            options["client_tap"] = self.BR_tap
+            options["client_ipv4_gateway"] = self.BR_ipv4_gateway
+            options["client_node_addr"] = self.BR_node_addr
+            options["service_tap"] = self.cloud_tap
+            options["service_ipv4_gateway"] = self.cloud_ipv4_gateway
+            options["service_node_addr"] = self.cloud_node_addr
         options["client_faults"] = faults.get("client")
         options["service_faults"] = faults.get("service")
         options["iterations"] = num_iterations
         options["test_tag"] = test_tag
         options["plaid"] = "auto"
 
-
         service_dir = WeaveServiceDir.WeaveServiceDir(options)
         ret = service_dir.run()
 

src/test-apps/happy/topologies/standalone/thread_wifi_ap_service.sh

@@ -23,6 +23,7 @@
 # - one access-point router onhub
 # - one service node instance cloud
 
+export PATH=$PATH:$(dirname $(readlink -f "$0"))/../../bin
 happy-network-add HomeThread thread
 happy-network-address HomeThread 2001:db8:111:1::
 

src/test-apps/happy/topologies/standalone/thread_wifi_on_tap_ap_service.sh

@@ -23,6 +23,9 @@
 # - one access-point router onhub
 # - one service node instance cloud
 
+# There is no need to set IP and Route for tap devices here, since it will be 
+# assigned from lwip stack
+export PATH=$PATH:$(dirname $(readlink -f "$0"))/../../bin
 happy-network-add HomeThread thread
 happy-network-address HomeThread 2001:db8:111:1::
 
@@ -45,13 +48,10 @@ happy-node-join onhub HomeWiFi
 happy-node-join onhub Internet
 
 happy-node-add --service cloud
-happy-node-join cloud Internet
-
-happy-network-route HomeThread BorderRouter
-happy-network-route --prefix 10.0.1.0 HomeWiFi onhub
+happy-node-join --tap cloud Internet
 
 weave-fabric-add fab1
 weave-node-configure
 weave-network-gateway HomeThread BorderRouter
 
-# happy-state -s thread_wifi_on_tap_ap_service.json
+# happy-state -s thread_wifi_on_tap_ap_service.json