Normalized hostname by concatenating scenarioName with index number

Author: zrlw

test/dubbo-scenario-builder/src/main/java/org/apache/dubbo/scenario/builder/ConfigurationImpl.java

@@ -125,7 +125,7 @@ public ConfigurationImpl() throws IOException, ConfigureFileNotFoundException {
             }
         }
 
-        this.configuration = loadCaseConfiguration(configureFile);
+        this.configuration = loadCaseConfiguration(configureFile, scenarioName);
 
         //set scenario timeout
         if (this.configuration.getTimeout() > 0) {
@@ -163,7 +163,7 @@ private boolean isDebug() {
         return debugPatterns != null && debugPatterns.size() > 0;
     }
 
-    private CaseConfiguration loadCaseConfiguration(String configureFile) throws IOException {
+    private CaseConfiguration loadCaseConfiguration(String configureFile, String scenarioName) throws IOException {
         // read 'props'
         String configYaml = FileUtil.readFully(configureFile);
         CaseConfiguration tmpConfiguration = parseConfiguration(configYaml);
@@ -210,7 +210,7 @@ private CaseConfiguration loadCaseConfiguration(String configureFile) throws IOE
             caseConfiguration.setServices(newServices);
         }
 
-        fillupServices(caseConfiguration);
+        fillupServices(caseConfiguration, scenarioName);
         return caseConfiguration;
     }
 
@@ -252,9 +252,15 @@ private CaseConfiguration parseConfiguration(String configYaml) {
         return new Yaml().loadAs(configYaml, CaseConfiguration.class);
     }
 
-    private void fillupServices(CaseConfiguration caseConfiguration) throws IOException {
+    private void fillupServices(CaseConfiguration caseConfiguration, String scenarioName) throws IOException {
         List<String> caseSystemProps = caseConfiguration.getSystemProps();
         int index = 0;
+        //normalize hostname by concatenating scenarioName with index number, hostname length should less than 64.
+        Map<String, String> hostnameMap = new HashMap<>();
+        for (String serviceName : caseConfiguration.getServices().keySet()) {            
+            hostnameMap.put(serviceName, scenarioName + index++);
+        }
+        index = 0;
         for (Map.Entry<String, ServiceComponent> entry : caseConfiguration.getServices().entrySet()) {
             String serviceName = entry.getKey();
             ServiceComponent service = entry.getValue();
@@ -280,7 +286,7 @@ private void fillupServices(CaseConfiguration caseConfiguration) throws IOExcept
 
                 //set wait ports
                 if (isNotEmpty(service.getWaitPortsBeforeRun())) {
-                    String str = convertAddrPortsToString(service.getWaitPortsBeforeRun());
+                    String str = convertAddrPortsToString(service.getWaitPortsBeforeRun(), hostnameMap);
                     setEnv(service, ENV_WAIT_PORTS_BEFORE_RUN, str);
                 }
 
@@ -351,7 +357,7 @@ private void fillupServices(CaseConfiguration caseConfiguration) throws IOExcept
                     //set check ports
                     if (isNotEmpty(service.getCheckPorts())) {
                         addHealthcheck = true;
-                        String str = convertAddrPortsToString(service.getCheckPorts());
+                        String str = convertAddrPortsToString(service.getCheckPorts(), hostnameMap);
                         setEnv(service, ENV_CHECK_PORTS, str);
                     }
 
@@ -395,7 +401,7 @@ private void fillupServices(CaseConfiguration caseConfiguration) throws IOExcept
 
                 //set wait ports
                 if (isNotEmpty(service.getWaitPortsBeforeRun())) {
-                    String str = convertAddrPortsToString(service.getWaitPortsBeforeRun());
+                    String str = convertAddrPortsToString(service.getWaitPortsBeforeRun(), hostnameMap);
                     setEnv(service, ENV_WAIT_PORTS_BEFORE_RUN, str);
                 }
 
@@ -423,7 +429,7 @@ private void fillupServices(CaseConfiguration caseConfiguration) throws IOExcept
                     //set check ports
                     if (isNotEmpty(service.getCheckPorts())) {
                         addHealthcheck = true;
-                        String str = convertAddrPortsToString(service.getCheckPorts());
+                        String str = convertAddrPortsToString(service.getCheckPorts(), hostnameMap);
                         setEnv(service, ENV_CHECK_PORTS, str);
                     }
 
@@ -436,7 +442,8 @@ private void fillupServices(CaseConfiguration caseConfiguration) throws IOExcept
 
             // set hostname to serviceId if absent
             if (StringUtils.isBlank(service.getHostname())) {
-                service.setHostname(serviceName);
+                //use normalized hostname.
+                service.setHostname(hostnameMap.get(serviceName));
             }
 
             //set jvmFlags
@@ -445,6 +452,27 @@ private void fillupServices(CaseConfiguration caseConfiguration) throws IOExcept
                 appendEnv(service, ENV_JAVA_OPTS, str);
             }
 
+            //revise hostname properties of service
+            List<String> serviceSystemProps = service.getSystemProps();
+            if (serviceSystemProps != null) {
+                List<String> revisedServiceSystemProps = new ArrayList<>();
+                serviceSystemProps.forEach(serviceProp -> {
+                    String[] strs = serviceProp.split("=");
+                    if (strs.length == 2) {
+                        String hostname = hostnameMap.get(strs[1]);
+                        if (null != hostname) {
+                            //use normalized hostname.
+                            revisedServiceSystemProps.add(strs[0] + "=" + hostname);
+                        } else {
+                            revisedServiceSystemProps.add(serviceProp);
+                        }
+                    } else {
+                        revisedServiceSystemProps.add(serviceProp);
+                    }
+                });
+                service.setSystemProps(revisedServiceSystemProps);
+            }
+
             //set systemProps
             List<String> systemProps = mergeSystemProps(caseSystemProps, service.getSystemProps());
             if (isNotEmpty(systemProps)) {
@@ -526,13 +554,23 @@ private boolean isNotEmpty(List<String> list) {
         return list != null && list.size() > 0;
     }
 
-    private String convertAddrPortsToString(List<String> addrPorts) {
+    private String convertAddrPortsToString(List<String> addrPorts, Map<String, String> hostnameMap) {
         StringBuilder sb = new StringBuilder();
         for (String addrPort : addrPorts) {
-            if (!addrPort.contains(":")) {
+            int idx = addrPort.indexOf(":");
+            if (idx > 0) {
+                String hostname = hostnameMap.get(addrPort.substring(0, idx));
+                if (null != hostname) {
+                    // use normalized hostname.
+                    sb.append(hostname).append(addrPort.substring(idx));
+                } else {
+                    sb.append(addrPort);
+                }
+            } else {
                 addrPort = "127.0.0.1" + ":" + addrPort;
+                sb.append(addrPort);
             }
-            sb.append(addrPort).append(";");
+            sb.append(";");
         }
         return sb.toString();
     }