testenv: using override instead complete config

Makefile

@@ -54,7 +54,8 @@ tox: testenv
 		-it $(TESTENV_IMAGE) bash -c " \
 			cp /usr/share/kvmd/configs.default/kvmd/*.yaml /etc/kvmd \
 			&& cp /usr/share/kvmd/configs.default/kvmd/*passwd /etc/kvmd \
-			&& cp /src/testenv/main.yaml /etc/kvmd \
+			&& cp /usr/share/kvmd/configs.default/kvmd/main/v1-vga.yaml /etc/kvmd/main.yaml \
+			&& cp /src/testenv/v1-vga.override.yaml /etc/kvmd/override.yaml \
 			&& cd /src \
 			&& tox -c testenv/tox.ini $(if $(E),-e $(E),-p auto) \
 		"
@@ -77,7 +78,8 @@ run: testenv
 			&& cp -r /usr/share/kvmd/configs.default/nginx/* /etc/kvmd/nginx \
 			&& cp /usr/share/kvmd/configs.default/kvmd/*.yaml /etc/kvmd \
 			&& cp /usr/share/kvmd/configs.default/kvmd/*passwd /etc/kvmd \
-			&& cp /testenv/main.yaml /etc/kvmd \
+			&& cp /usr/share/kvmd/configs.default/kvmd/main/v1-vga.yaml /etc/kvmd/main.yaml \
+			&& cp /testenv/v1-vga.override.yaml /etc/kvmd/override.yaml \
 			&& nginx -c /etc/kvmd/nginx/nginx.conf -g 'user http; error_log stderr;' \
 			&& ln -s $(TESTENV_VIDEO) /dev/kvmd-video \
 			&& (losetup -d /dev/kvmd-msd || true) \
@@ -92,12 +94,14 @@ run-ipmi: testenv
 			--volume `pwd`/testenv/run:/run/kvmd:rw \
 			--volume `pwd`/testenv:/testenv:ro \
 			--volume `pwd`/kvmd:/kvmd:ro \
+			--volume `pwd`/extras:/usr/share/kvmd/extras:ro \
 			--volume `pwd`/configs:/usr/share/kvmd/configs.default:ro \
 			--publish 6230:623/udp \
 		-it $(TESTENV_IMAGE) /bin/bash -c " \
 			cp /usr/share/kvmd/configs.default/kvmd/*.yaml /etc/kvmd \
 			&& cp /usr/share/kvmd/configs.default/kvmd/*passwd /etc/kvmd \
-			&& cp /testenv/main.yaml /etc/kvmd \
+			&& cp /usr/share/kvmd/configs.default/kvmd/main/v1-vga.yaml /etc/kvmd/main.yaml \
+			&& cp /testenv/v1-vga.override.yaml /etc/kvmd/override.yaml \
 			&& $(if $(CMD),$(CMD),python -m kvmd.apps.ipmi) \
 		"
 

testenv/main.yaml

@@ -1,51 +0,0 @@
-kvmd:
-    server:
-        unix: /run/kvmd/kvmd.sock
-        unix_rm: true
-        unix_mode: 0666
-
-    auth: !include auth.yaml
-
-    hid:
-        reset_pin: 4
-        device: /dev/ttyS10
-        noop: true
-
-    atx:
-        power_led_pin: 24
-        hdd_led_pin: 22
-        power_switch_pin: 23
-        reset_switch_pin: 27
-
-    msd:
-        target_pin: 12
-        reset_pin: 13
-        device: /dev/kvmd-msd
-
-    streamer:
-        cap_pin: 17
-        conv_pin: 18
-        sync_delay: 0
-        init_delay: 1
-        init_restart_after: 1
-        desired_fps: 30
-        max_fps: 40
-        unix: /run/kvmd/ustreamer.sock
-        cmd:
-            - "/usr/bin/ustreamer"
-            - "--device=/dev/kvmd-video"
-            - "--quality={quality}"
-            - "--desired-fps={desired_fps}"
-            - "--resolution=800x600"
-            - "--last-as-blank=0"
-            - "--unix={unix}"
-            - "--unix-rm"
-            - "--unix-mode=0666"
-            - "--no-log-colors"
-
-ipmi:
-    kvmd:
-        unix: /run/kvmd/kvmd.sock
-
-logging: !include logging.yaml
-override: !include override.yaml

testenv/v1-vga.override.yaml

@@ -0,0 +1,22 @@
+kvmd:
+    server:
+        unix_mode: 0666
+
+    hid:
+        device: /dev/ttyS10
+        noop: true
+
+    streamer:
+        desired_fps: 30
+        max_fps: 40
+        cmd:
+            - "/usr/bin/ustreamer"
+            - "--device=/dev/kvmd-video"
+            - "--quality={quality}"
+            - "--desired-fps={desired_fps}"
+            - "--resolution=800x600"
+            - "--last-as-blank=0"
+            - "--unix={unix}"
+            - "--unix-rm"
+            - "--unix-mode=0666"
+            - "--no-log-colors"