erp5/util/testnode, scalability_test: Stop using a dummy frontend master and...

erp5/util/testnode, scalability_test: Stop using a dummy frontend master and use host.vifib.net frontend with a valid SSL certificate instead. Always use https.

erp5/util/testnode/SlapOSMasterCommunicator.py

@@ -468,10 +468,8 @@ class SlapOSTester(SlapOSMasterCommunicator):
       information = self.getInformationFromInstance(instance["href"])
       if "frontend-" in instance["title"]:
         try:
-          # TODO: this should get "secure_access" value (https). Until having a
-          # valid certificate, the "site_url" (http) will be used.
           frontend = [instance["title"].replace("frontend-", ""),
-                      information["connection_dict"]["site_url"]]
+                      information["connection_dict"]["secure_access"]]
           frontend_url_list.append(frontend)
         except Exception as e:
           logger.info("Frontend url not generated yet for instance: " + instance["title"])

scalability_test/__init__.py

 import os.path
 import json
-import urlparse
 
 ZOPE_USER_FAMILY = "user"
 ZOPE_ACTIVITIES_FAMILIY = "activities"
@@ -32,8 +31,7 @@ class ERP5_scalability():
       if frontend[0] == ZOPE_USER_FAMILY:
         frontend_address = frontend[1]
         break
-    port = 4443 if urlparse.urlparse(frontend_address).scheme == 'https' else 8080
-    return "%s:%d/erp5" % (frontend_address, port)
+    return "%s/erp5" % (frontend_address)
 
   def getScalabilityTestMetricUrl(self, instance_information_dict, **kw):
     frontend_address = self.getScalabilityTestUrl(instance_information_dict)