Rename port2 to software_access_port

erp5/tests/testERP5TestNode.py

@@ -80,7 +80,7 @@ class ERP5TestNode(TestCase):
     config["computer_id"] = "COMP-TEST"
     config["server_url"] = "http://foo.bar"
     config["httpd_ip"] = "[1234:5678:9101:1121:3141:5161:7181:9202]"
-    config["httpd_port2"] = "9080"
+    config["httpd_software_access_port"] = "9080"
     
     return TestNode(self.log, config)
 

erp5/util/testnode/ScalabilityTestRunner.py

@@ -195,7 +195,7 @@ class ScalabilityTestRunner():
       software_path_list = []
       # Construct the ipv6 obfuscated url of the software profile reachable from outside
       self.reachable_profile = os.path.join(
-        "https://","["+self.testnode.config['httpd_ip']+"]"+":"+self.testnode.config['httpd_port2'],
+        "https://","["+self.testnode.config['httpd_ip']+"]"+":"+self.testnode.config['httpd_software_access_port'],
         self.random_path, "software.cfg")
       self.testnode.log("Software reachable profile path is : %s "
                               %(self.reachable_profile,))

erp5/util/testnode/__init__.py

@@ -79,7 +79,7 @@ def main(*args):
               'proxy_port', 'git_binary','zip_binary','node_quantity',
               'test_node_title', 'ipv4_address','ipv6_address','test_suite_master_url',
               'slapgrid_partition_binary','slapgrid_software_binary',
-              'slapproxy_binary', 'httpd_ip', 'httpd_port', 'httpd_port2', 'computer_id',
+              'slapproxy_binary', 'httpd_ip', 'httpd_port', 'httpd_software_access_port', 'computer_id',
               'server_url'):
     CONFIG[key] = config.get('testnode',key)