mirror of
https://github.com/GNS3/gns3-server.git
synced 2025-03-01 11:23:47 +02:00
Updated tests for setting docker user
This commit is contained in:
parent
7c3a38d379
commit
6df93d4db0
@ -311,7 +311,6 @@ class DockerVM(BaseNode):
|
|||||||
"Tty": True,
|
"Tty": True,
|
||||||
"OpenStdin": True,
|
"OpenStdin": True,
|
||||||
"StdinOnce": False,
|
"StdinOnce": False,
|
||||||
"User": "root",
|
|
||||||
"HostConfig": {
|
"HostConfig": {
|
||||||
"CapAdd": ["ALL"],
|
"CapAdd": ["ALL"],
|
||||||
"Privileged": True,
|
"Privileged": True,
|
||||||
@ -320,7 +319,7 @@ class DockerVM(BaseNode):
|
|||||||
"Volumes": {},
|
"Volumes": {},
|
||||||
"Env": ["container=docker"], # Systemd compliant: https://github.com/GNS3/gns3-server/issues/573
|
"Env": ["container=docker"], # Systemd compliant: https://github.com/GNS3/gns3-server/issues/573
|
||||||
"Cmd": [],
|
"Cmd": [],
|
||||||
"Entrypoint": image_infos.get("Config", {"Entrypoint": []})["Entrypoint"]
|
"Entrypoint": image_infos.get("Config", {"Entrypoint": []}).get("Entrypoint")
|
||||||
}
|
}
|
||||||
|
|
||||||
if params["Entrypoint"] is None:
|
if params["Entrypoint"] is None:
|
||||||
@ -331,7 +330,7 @@ class DockerVM(BaseNode):
|
|||||||
except ValueError as e:
|
except ValueError as e:
|
||||||
raise DockerError("Invalid start command '{}': {}".format(self._start_command, e))
|
raise DockerError("Invalid start command '{}': {}".format(self._start_command, e))
|
||||||
if len(params["Cmd"]) == 0:
|
if len(params["Cmd"]) == 0:
|
||||||
params["Cmd"] = image_infos.get("Config", {"Cmd": []})["Cmd"]
|
params["Cmd"] = image_infos.get("Config", {"Cmd": []}).get("Cmd")
|
||||||
if params["Cmd"] is None:
|
if params["Cmd"] is None:
|
||||||
params["Cmd"] = []
|
params["Cmd"] = []
|
||||||
if len(params["Cmd"]) == 0 and len(params["Entrypoint"]) == 0:
|
if len(params["Cmd"]) == 0 and len(params["Entrypoint"]) == 0:
|
||||||
@ -344,6 +343,8 @@ class DockerVM(BaseNode):
|
|||||||
params["Env"].append("GNS3_VOLUMES={}".format(":".join(self._volumes)))
|
params["Env"].append("GNS3_VOLUMES={}".format(":".join(self._volumes)))
|
||||||
|
|
||||||
# Pass user configured for image to init script
|
# Pass user configured for image to init script
|
||||||
|
if image_infos.get("Config", {"User": ""}).get("User"):
|
||||||
|
params["User"] = "root"
|
||||||
params["Env"].append("GNS3_USER={}".format(image_infos.get("Config", {"User": ""})["User"]))
|
params["Env"].append("GNS3_USER={}".format(image_infos.get("Config", {"User": ""})["User"]))
|
||||||
|
|
||||||
variables = self.project.variables
|
variables = self.project.variables
|
||||||
|
@ -415,6 +415,48 @@ def test_create_image_not_available(loop, project, manager):
|
|||||||
assert vm._cid == "e90e34656806"
|
assert vm._cid == "e90e34656806"
|
||||||
mock_pull.assert_called_with("ubuntu:latest")
|
mock_pull.assert_called_with("ubuntu:latest")
|
||||||
|
|
||||||
|
def test_create_with_user(loop, project, manager):
|
||||||
|
|
||||||
|
response = {
|
||||||
|
"Id": "e90e34656806",
|
||||||
|
"Warnings": [],
|
||||||
|
"Config" : {
|
||||||
|
"User" : "test",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
with asyncio_patch("gns3server.compute.docker.Docker.list_images", return_value=[{"image": "ubuntu"}]) as mock_list_images:
|
||||||
|
with asyncio_patch("gns3server.compute.docker.Docker.query", return_value=response) as mock:
|
||||||
|
vm = DockerVM("test", str(uuid.uuid4()), project, manager, "ubuntu:latest")
|
||||||
|
loop.run_until_complete(asyncio.ensure_future(vm.create()))
|
||||||
|
mock.assert_called_with("POST", "containers/create", data={
|
||||||
|
"Tty": True,
|
||||||
|
"OpenStdin": True,
|
||||||
|
"StdinOnce": False,
|
||||||
|
"User": "root",
|
||||||
|
"HostConfig":
|
||||||
|
{
|
||||||
|
"CapAdd": ["ALL"],
|
||||||
|
"Binds": [
|
||||||
|
"{}:/gns3:ro".format(get_resource("compute/docker/resources")),
|
||||||
|
"{}:/gns3volumes/etc/network:rw".format(os.path.join(vm.working_dir, "etc", "network"))
|
||||||
|
],
|
||||||
|
"Privileged": True
|
||||||
|
},
|
||||||
|
"Volumes": {},
|
||||||
|
"NetworkDisabled": True,
|
||||||
|
"Name": "test",
|
||||||
|
"Hostname": "test",
|
||||||
|
"Image": "ubuntu:latest",
|
||||||
|
"Env": [
|
||||||
|
"container=docker",
|
||||||
|
"GNS3_MAX_ETHERNET=eth0",
|
||||||
|
"GNS3_VOLUMES=/etc/network",
|
||||||
|
"GNS3_USER=test"
|
||||||
|
],
|
||||||
|
"Entrypoint": ["/gns3/init.sh"],
|
||||||
|
"Cmd": ["/bin/sh"]
|
||||||
|
})
|
||||||
|
assert vm._cid == "e90e34656806"
|
||||||
|
|
||||||
def test_get_container_state(loop, vm):
|
def test_get_container_state(loop, vm):
|
||||||
response = {
|
response = {
|
||||||
|
Loading…
Reference in New Issue
Block a user