Fixed DummyHypervisor port mapping for Windows

golem/docker/hypervisor/dummy.py

@@ -1,7 +1,9 @@
 from typing import Optional, Dict, Tuple
 
-from golem.core.common import is_osx
+from golem.core.common import is_osx, is_windows
 from golem.docker.client import local_client
+from golem.docker.commands.docker_machine import DockerMachineCommandHandler
+from golem.docker.config import DOCKER_VM_NAME
 from golem.docker.hypervisor import Hypervisor
 
 
@@ -45,8 +47,14 @@ def get_port_mapping(self, container_id: str, port: int) -> Tuple[str, int]:
         config = api_client.inspect_container(container_id)
         net_config = config['NetworkSettings']
 
+        # TODO: Remove if-s when NonHypervisedDockerCPUEnvironment is removed
         if is_osx():
             ip_address = '127.0.0.1'
+        elif is_windows():
+            vm_ip = DockerMachineCommandHandler.run('ip', DOCKER_VM_NAME)
+            if vm_ip is None:
+                raise RuntimeError('Cannot retrieve Docker VM IP address')
+            ip_address = vm_ip
         else:
             ip_address = net_config['Networks']['bridge']['IPAddress']
 

tests/golem/docker/test_hypervisor.py

@@ -7,7 +7,7 @@
 from typing import Optional, Dict
 from unittest import mock, TestCase
 
-from golem.core.common import is_osx
+from golem.core.common import is_osx, is_windows
 from golem.docker.commands.docker_machine import DockerMachineCommandHandler
 from golem.docker.config import DOCKER_VM_NAME as VM_NAME, DEFAULTS
 from golem.docker.hypervisor.docker_for_mac import DockerForMac
@@ -483,9 +483,10 @@ def test_get_port_mapping(self, local_client):
 
 class TestDummyHypervisor(TestCase):
 
+    @mock.patch('golem.docker.hypervisor.dummy.DockerMachineCommandHandler')
     @mock.patch('golem.docker.hypervisor.dummy.local_client')
-    def test_get_port_mapping(self, local_client):
-        container_ip = '127.0.0.1' if is_osx() else '172.17.0.2'
+    def test_get_port_mapping(self, local_client, command_handler):
+        container_ip = '172.17.0.2'
         local_client().inspect_container.return_value = {
             'NetworkSettings': {
                 'Networks': {
@@ -500,7 +501,17 @@ def test_get_port_mapping(self, local_client):
                 }
             }
         }
+        vm_ip = '10.0.0.3'
+        command_handler.run.return_value = vm_ip
+
         hypervisor = DummyHypervisor(mock.Mock())
         host, port = hypervisor.get_port_mapping('container_id', 12345)
-        self.assertEqual(host, container_ip)
+
         self.assertEqual(port, 12345)
+        if is_osx():
+            self.assertEqual(host, '127.0.0.1')
+        elif is_windows():
+            self.assertEqual(host, vm_ip)
+            command_handler.run.assert_called_once_with('ip', VM_NAME)
+        else:
+            self.assertEqual(host, container_ip)