Isolate Windows dockerd subnet; move tests

Author: intisy

src/main/java/io/github/intisy/docker/WindowsDockerProvider.java

@@ -741,8 +741,9 @@ private void startWsl2Docker() throws IOException, InterruptedException {
 
         String isolationFlags = "";
         if (otherDockerdRunning) {
-            log.info("Another Docker daemon detected, using isolation flags to avoid conflicts");
-            isolationFlags = " --iptables=false";
+            int subnetId = 18 + Math.abs(instanceId.hashCode() % 14);
+            log.info("Another Docker daemon detected, using isolated subnet 172.{}.0.0/16", subnetId);
+            isolationFlags = " --bip=172." + subnetId + ".0.1/16";
         }
 
         log.debug("Starting dockerd directly...");

…/github/intisy/docker/ContainerTest.java …sy/docker/integration/ContainerTest.javasrc/test/java/io/github/intisy/docker/ContainerTest.java renamed to src/test/java/io/github/intisy/docker/integration/ContainerTest.java src/test/java/io/github/intisy/docker/ContainerTest.java renamed to src/test/java/io/github/intisy/docker/integration/ContainerTest.java

@@ -1,5 +1,7 @@
-package io.github.intisy.docker;
+package io.github.intisy.docker.integration;
 
+import io.github.intisy.docker.DockerClient;
+import io.github.intisy.docker.DockerProvider;
 import io.github.intisy.docker.command.network.CreateNetworkCmd;
 import io.github.intisy.docker.command.volume.ListVolumesCmd;
 import io.github.intisy.docker.WindowsDockerProvider;

…hub/intisy/docker/MultiInstanceTest.java …ocker/integration/MultiInstanceTest.javasrc/test/java/io/github/intisy/docker/MultiInstanceTest.java renamed to src/test/java/io/github/intisy/docker/integration/MultiInstanceTest.java src/test/java/io/github/intisy/docker/MultiInstanceTest.java renamed to src/test/java/io/github/intisy/docker/integration/MultiInstanceTest.java

@@ -1,5 +1,7 @@
-package io.github.intisy.docker;
+package io.github.intisy.docker.integration;
 
+import io.github.intisy.docker.DockerClient;
+import io.github.intisy.docker.DockerProvider;
 import io.github.intisy.docker.model.CreateContainerResponse;
 import org.junit.jupiter.api.*;
 import org.junit.jupiter.api.Tag;

…hub/intisy/docker/NvidiaToolkitTest.java …ocker/integration/NvidiaToolkitTest.javasrc/test/java/io/github/intisy/docker/NvidiaToolkitTest.java renamed to src/test/java/io/github/intisy/docker/integration/NvidiaToolkitTest.java src/test/java/io/github/intisy/docker/NvidiaToolkitTest.java renamed to src/test/java/io/github/intisy/docker/integration/NvidiaToolkitTest.java

@@ -1,5 +1,7 @@
-package io.github.intisy.docker;
+package io.github.intisy.docker.integration;
 
+import io.github.intisy.docker.DockerClient;
+import io.github.intisy.docker.WindowsDockerProvider;
 import io.github.intisy.docker.model.CreateContainerResponse;
 import org.junit.jupiter.api.*;
 import org.junit.jupiter.api.Tag;

…tisy/docker/DockerClientBuilderTest.java …docker/unit/DockerClientBuilderTest.javasrc/test/java/io/github/intisy/docker/DockerClientBuilderTest.java renamed to src/test/java/io/github/intisy/docker/unit/DockerClientBuilderTest.java src/test/java/io/github/intisy/docker/DockerClientBuilderTest.java renamed to src/test/java/io/github/intisy/docker/unit/DockerClientBuilderTest.java

@@ -1,5 +1,6 @@
-package io.github.intisy.docker;
+package io.github.intisy.docker.unit;
 
+import io.github.intisy.docker.DockerClient;
 import org.junit.jupiter.api.*;
 import org.junit.jupiter.api.Tag;
 

…ub/intisy/docker/DockerProviderTest.java …tisy/docker/unit/DockerProviderTest.javasrc/test/java/io/github/intisy/docker/DockerProviderTest.java renamed to src/test/java/io/github/intisy/docker/unit/DockerProviderTest.java src/test/java/io/github/intisy/docker/DockerProviderTest.java renamed to src/test/java/io/github/intisy/docker/unit/DockerProviderTest.java

@@ -1,5 +1,9 @@
-package io.github.intisy.docker;
+package io.github.intisy.docker.unit;
 
+import io.github.intisy.docker.DockerProvider;
+import io.github.intisy.docker.LinuxDockerProvider;
+import io.github.intisy.docker.MacDockerProvider;
+import io.github.intisy.docker.WindowsDockerProvider;
 import org.junit.jupiter.api.*;
 import org.junit.jupiter.api.Tag;
 

…a/io/github/intisy/docker/ModelTest.java …github/intisy/docker/unit/ModelTest.javasrc/test/java/io/github/intisy/docker/ModelTest.java renamed to src/test/java/io/github/intisy/docker/unit/ModelTest.java src/test/java/io/github/intisy/docker/ModelTest.java renamed to src/test/java/io/github/intisy/docker/unit/ModelTest.java

@@ -1,4 +1,4 @@
-package io.github.intisy.docker;
+package io.github.intisy.docker.unit;
 
 import io.github.intisy.docker.model.*;
 import org.junit.jupiter.api.*;