change duplicate host definition from error to warning

Author: willr3

qDup-core/src/main/java/io/hyperfoil/tools/qdup/config/RunConfigBuilder.java

@@ -157,7 +157,8 @@ public boolean loadYaml(YamlFile yamlFile) {
       });
       yamlFile.getHostDefinitions().forEach((name, definition) -> {
          if (hostDefinitions.containsKey(name) && !hostDefinitions.get(name).equals(definition)) {
-            addError(String.format("%s tried to load host %s:%s but already defined as %s", yamlFile.getPath(), name, definition, hostDefinitions.get(name)));
+             logger.warnf("%s tried to load host %s:%s but already defined as %s", yamlFile.getPath(), name, definition, hostDefinitions.get(name));
+
          } else {
             hostDefinitions.put(name, definition);
          }

qDup-core/src/test/java/io/hyperfoil/tools/qdup/config/RunConfigTest.java

@@ -2,17 +2,82 @@
 
 import io.hyperfoil.tools.qdup.Host;
 import io.hyperfoil.tools.qdup.SshTestBase;
+import io.hyperfoil.tools.qdup.cmd.Script;
 import io.hyperfoil.tools.qdup.config.yaml.Parser;
 import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 public class RunConfigTest extends SshTestBase {
 
+    @Test
+    public void script_load_order(){
+        Parser parser = Parser.getInstance();
+        RunConfigBuilder builder = getBuilder();
+        builder.loadYaml(parser.loadFile("local",
+                """
+                scripts:
+                  uno:
+                  - sh: echo "hi"
+                """
+        ));
+        builder.loadYaml(parser.loadFile("remote",
+                """
+                scripts:
+                  uno:
+                  - wait-for: bar
+                """
+        ));
+        RunConfig config = builder.buildConfig(parser);
+        assertFalse("runConfig errors:\n" + config.getErrorStrings().stream().collect(Collectors.joining("\n")), config.hasErrors());
+
+        Script uno = config.getScript("uno");
+        assertNotNull("uno", uno);
+        assertTrue(uno.getNext().toString().contains("sh"));
+    }
+
+   @Test
+   public void host_load_order(){
+       Parser parser = Parser.getInstance();
+       RunConfigBuilder builder = getBuilder();
+       builder.loadYaml(parser.loadFile("local",
+               """
+               hosts:
+                 uno: LOCAL//quay.io/fedora/fedora
+               """
+       ));
+       builder.loadYaml(parser.loadFile("remote",
+               """
+               scripts:
+                 foo:
+                 - sh: echo "foo"
+               hosts:
+                 uno: user@localhost:2222
+               roles:
+                 test:
+                   hosts:
+                   - uno
+                   setup-scripts:
+                   - foo
+               """
+       ));
+       RunConfig config = builder.buildConfig(parser);
+       assertFalse("runConfig errors:\n" + config.getErrorStrings().stream().collect(Collectors.joining("\n")), config.hasErrors());
+       Set<Host> hosts = config.getAllHostsInRoles();
+       assertEquals(1, hosts.size());
+       Host first = hosts.iterator().next();
+       assertNotNull(first);
+       assertTrue(first.isLocal());
+       assertTrue(first.isContainer());
+       assertTrue(first.getDefinedContainer().contains("fedora"));
+   }
+
+
    @Test
    public void getAllHostsInRoles_alias_same_host(){
       Parser parser = Parser.getInstance();

qDup-core/src/test/java/io/hyperfoil/tools/qdup/config/yaml/HostDefinitionConstructTest.java

@@ -30,6 +30,14 @@ public static void setupYaml(){
         yaml = new Yaml(constructor);
     }
 
+    @Test
+    public void string_ip_user(){
+        Host loaded = yaml.loadAs("userName@127.0.0.1",HostDefinition.class).toHost(new State(""));
+        assertNotNull("should load from string",loaded);
+        assertEquals("username","userName",loaded.getUserName());
+        assertEquals("hostname","127.0.0.1",loaded.getHostName());
+        assertEquals("port",22,loaded.getPort());
+    }
 
     @Test
     public void string_host_user(){