Merge pull request #452 from openweave/feature/add_siac_support_in_weave_service_test

Add support for a standalone test service instance (SiaC) in OpenWeave service tests.

Author: robszewczyk

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

@@ -2,7 +2,8 @@
 
 
 #
-#    Copyright (c) 2016-2017 Nest Labs, Inc.
+#    Copyright (c) 2016-2018 Nest Labs, Inc.
+#    Copyright (c) 2019 Google, LLC.
 #    All rights reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
@@ -158,7 +159,11 @@ def __pre_check(self):
             else:
                 if "weave_service_address" in os.environ.keys():
                     self.skip_service_end = True
-                    self.service_dir_server = os.environ['weave_service_address']
+                    if "unstable" not in os.environ["weave_service_address"]:
+                        self.service_dir_server = os.environ["weave_service_address"]
+                    else:
+                        self.customized_tunnel_port = 20895
+                        self.service_dir_server = os.environ["weave_service_address"] + ":%d" % self.customized_tunnel_port
                     self.logger.debug("[localhost] WeaveTunnelStart against tier %s." % self.service_dir_server)
                 else:
                     # Check if service node was given
@@ -318,9 +323,6 @@ def __start_tunnel_at_gateway(self):
                 self.key_file = self.case_key_path if self.case_key_path else os.path.join(self.main_conf['log_directory'], self.gateway_weave_id.upper() + '-key.weave-b64')
                 cmd += ' --node-cert ' + self.cert_file + ' --node-key ' + self.key_file
 
-            if self.customized_tunnel_port:
-                self.service_dir_server = self.service_dir_server + ":%d" % self.customized_tunnel_port
-
             if self.service_dir:
                 cmd += " --service-dir " + str(self.service_weave_id) + ' --service-dir-server ' + self.service_dir_server
             else:

src/test-apps/happy/tests/service/pairing/test_weave_pairing_01.py

@@ -57,11 +57,9 @@ def setUp(self):
             if "unstable" not in os.environ["weave_service_address"]:
                 found = re.search('.(\w+).nestlabs.com', os.environ["weave_service_address"])
                 self.tier = found.group(1)
-                self.customized_tunnel_port = None
             else:
                 found = re.search('(\w+.unstable).nestlabs.com', os.environ["weave_service_address"])
                 self.tier = found.group(1)
-                self.customized_tunnel_port = 20895
 
         self.topology_setup_required = int(os.environ.get("TOPOLOGY", "1")) == 1
 
@@ -157,9 +155,6 @@ def __start_tunnel_from(self, gateway):
         options["case"] = self.case
         options["service_dir"] = self.use_service_dir
 
-        if self.customized_tunnel_port:
-            options["customized_tunnel_port"] = self.customized_tunnel_port
-
         weave_tunnel = WeaveTunnelStart.WeaveTunnelStart(options)
         ret = weave_tunnel.run()
 

src/test-apps/happy/tests/service/run_single_weave_service_test.sh

@@ -2,7 +2,8 @@
 
 
 #
-#    Copyright (c) 2016-2017 Nest Labs, Inc.
+#    Copyright (c) 2016-2018 Nest Labs, Inc.
+#    Copyright (c) 2019 Google, LLC.
 #    All rights reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,23 +29,19 @@
 
 export CASE=1
 export USE_SERVICE_DIR=1
-export weave_service_address='frontdoor.lt3.nestlabs.com'
+export weave_service_address='frontdoor.qa.nestlabs.com'
 export happy_dns='8.8.8.8 172.16.255.1 172.16.255.153 172.16.255.53'
-# export RESOURCE_IDS='gsrbr1'
+export RESOURCE_IDS='thd1'
+export FABRIC_SEED='00001'
+export DEVICE_NUMBERS=1
+
 # exit if something fails
 set -e
 
-# By default, run a mutual subscription test. If tests have been
-# listed as arguments, run those instead
-
-# pairing/test_weave_pairing_01.py
-# echo/test_weave_echo_02.py
-# wdmNext/test_weave_wdm_next_service_mutual_subscribe_01.py
-# wdmNext/test_weave_wdm_next_service_update_*
-
 if [[ $# -eq 0 ]]
 then
-    #wdmNext/test_weave_wdm_next_service_mutual_subscribe_01.py
+    pairing/test_weave_pairing_01.py
+    wdmNext/test_weave_wdm_next_service_mutual_subscribe_01.py
 else
     for test_to_run in $* ; do python $test_to_run ;  done
 fi