testnode: scalability test runner update - requestUrl script

- requests to bootstrap and site availability urls using a script run with userhosts
- hardcoded parameters removed
- try-exception controls in communication with master
- general refactoring and cleanup

erp5/util/scalability/requestUrl.py

+#!/usr/bin/env python
+
+import sys
+import requests
+
+class Connection(object):
+  def get(self, url):
+    error_message_set = set()
+    result = None
+    try:
+      response = requests.get(url, timeout=300)
+      if response.status_code != 200:
+        raise ValueError("response status %d" % response.status_code)
+      result = response.text
+    except Exception as e:
+      error_message_set.add("Error: %s" % str(e))
+      return result, error_message_set
+    return result, error_message_set
+
+def main():
+  exit_status = 0
+  error_message_set = set()
+  if len(sys.argv) != 2:
+    error_message_set.add("Error: wrong parameters")
+  else:
+    result, error_message_set = Connection().get(sys.argv[1])
+  if error_message_set:
+    exit_status = 1
+    for error in error_message_set:
+      print error
+  elif result:
+    print result
+  sys.exit(exit_status)

erp5/util/testnode/SlapOSMasterCommunicator.py

@@ -494,7 +494,7 @@ class SlapOSTester(SlapOSMasterCommunicator):
           self._request(INSTANCE_STATE_DESTROYED, instance["title"])
         else:
           root_instance = instance
-      self._request(INSTANCE_STATE_DESTROYED, instance_title)
+      self._request(INSTANCE_STATE_DESTROYED, root_instance["title"])
     else:
       logger.info("Instance not found")
 

setup.py

@@ -71,6 +71,8 @@ setup(name=name,
             'erp5.util.benchmark.scalability_tester:main [scalability_tester]',
           'runScalabilityTestSuite = '\
             'erp5.util.scalability.runScalabilityTestSuite:main',
+          'requestUrl = '\
+            'erp5.util.scalability.requestUrl:main',
           'generate_erp5_tester_report = '\
             'erp5.util.benchmark.report:generateReport [benchmark-report]',
           'web_checker_utility = erp5.util.webchecker:web_checker_utility'