Get rid of libvirt configs 56/29256/2
authorPiotr Bartosiewicz <p.bartosiewi@partner.samsung.com>
Thu, 23 Oct 2014 11:56:44 +0000 (13:56 +0200)
committerPiotr Bartosiewicz <p.bartosiewi@partner.samsung.com>
Thu, 23 Oct 2014 12:40:26 +0000 (14:40 +0200)
[Bug/Feature]   N/A
[Cause]         N/A
[Solution]      N/A
[Verification]  N/A

Change-Id: Ibefee41db18ace8e000671f7bedd6a075e9ce8db

99 files changed:
CMakeLists.txt
cli/CMakeLists.txt
client/CMakeLists.txt
container-daemon/CMakeLists.txt
container-support/CMakeLists.txt
packaging/security-containers.spec
server/CMakeLists.txt
server/configs/CMakeLists.txt
server/configs/containers/business.conf
server/configs/containers/private.conf
server/configs/libvirt-config/business-network.xml [deleted file]
server/configs/libvirt-config/business-nwfilter.xml [deleted file]
server/configs/libvirt-config/business.xml [deleted file]
server/configs/libvirt-config/private-network.xml [deleted file]
server/configs/libvirt-config/private-nwfilter.xml [deleted file]
server/configs/libvirt-config/private.xml [deleted file]
server/configs/systemd/security-containers.service.in
server/configs/templates/template-network.xml [deleted file]
server/configs/templates/template-nwfilter.xml [deleted file]
server/configs/templates/template.conf
server/configs/templates/template.xml [deleted file]
server/container-config.hpp
server/container.cpp
server/containers-manager.cpp
server/server.cpp
tests/integration_tests/CMakeLists.txt
tests/unit_tests/CMakeLists.txt
tests/unit_tests/client/configs/CMakeLists.txt
tests/unit_tests/client/configs/ut-client/containers/console1-dbus.conf
tests/unit_tests/client/configs/ut-client/containers/console2-dbus.conf
tests/unit_tests/client/configs/ut-client/containers/console3-dbus.conf
tests/unit_tests/client/configs/ut-client/libvirt-config/console1-dbus.xml.in [deleted file]
tests/unit_tests/client/configs/ut-client/libvirt-config/console2-dbus.xml.in [deleted file]
tests/unit_tests/client/configs/ut-client/libvirt-config/console3-dbus.xml.in [deleted file]
tests/unit_tests/client/configs/ut-client/libvirt-config/network1-filter.xml [deleted file]
tests/unit_tests/client/configs/ut-client/libvirt-config/network1.xml [deleted file]
tests/unit_tests/client/configs/ut-client/libvirt-config/network2-filter.xml [deleted file]
tests/unit_tests/client/configs/ut-client/libvirt-config/network2.xml [deleted file]
tests/unit_tests/client/configs/ut-client/libvirt-config/network3-filter.xml [deleted file]
tests/unit_tests/client/configs/ut-client/libvirt-config/network3.xml [deleted file]
tests/unit_tests/dbus/configs/CMakeLists.txt
tests/unit_tests/server/configs/CMakeLists.txt
tests/unit_tests/server/configs/ut-container-admin/containers/buggy.conf.in
tests/unit_tests/server/configs/ut-container-admin/containers/missing.conf
tests/unit_tests/server/configs/ut-container-admin/containers/test-no-shutdown.conf.in
tests/unit_tests/server/configs/ut-container-admin/containers/test.conf.in
tests/unit_tests/server/configs/ut-container-admin/libvirt-config/buggy.xml [deleted file]
tests/unit_tests/server/configs/ut-container-admin/libvirt-config/test-no-shutdown.xml [deleted file]
tests/unit_tests/server/configs/ut-container-admin/libvirt-config/test.xml [deleted file]
tests/unit_tests/server/configs/ut-container/containers/buggy.conf
tests/unit_tests/server/configs/ut-container/containers/test-dbus.conf
tests/unit_tests/server/configs/ut-container/containers/test.conf
tests/unit_tests/server/configs/ut-container/libvirt-config/network-filter.xml [deleted file]
tests/unit_tests/server/configs/ut-container/libvirt-config/network.xml [deleted file]
tests/unit_tests/server/configs/ut-container/libvirt-config/test-dbus.xml.in [deleted file]
tests/unit_tests/server/configs/ut-container/libvirt-config/test.xml [deleted file]
tests/unit_tests/server/configs/ut-containers-manager/containers/console1-dbus.conf
tests/unit_tests/server/configs/ut-containers-manager/containers/console1.conf
tests/unit_tests/server/configs/ut-containers-manager/containers/console2-dbus.conf
tests/unit_tests/server/configs/ut-containers-manager/containers/console2.conf
tests/unit_tests/server/configs/ut-containers-manager/containers/console3-dbus.conf
tests/unit_tests/server/configs/ut-containers-manager/containers/console3.conf
tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console1-dbus.xml.in [deleted file]
tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console1.xml [deleted file]
tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console2-dbus.xml.in [deleted file]
tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console2.xml [deleted file]
tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console3-dbus.xml.in [deleted file]
tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console3.xml [deleted file]
tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/network1-filter.xml [deleted file]
tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/network1.xml [deleted file]
tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/network2-filter.xml [deleted file]
tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/network2.xml [deleted file]
tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/network3-filter.xml [deleted file]
tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/network3.xml [deleted file]
tests/unit_tests/server/configs/ut-containers-manager/templates/template-network.xml [deleted file]
tests/unit_tests/server/configs/ut-containers-manager/templates/template-nwfilter.xml [deleted file]
tests/unit_tests/server/configs/ut-containers-manager/templates/template.conf
tests/unit_tests/server/configs/ut-containers-manager/templates/template.xml.in [deleted file]
tests/unit_tests/server/configs/ut-network-admin/containers/buggy.conf.in
tests/unit_tests/server/configs/ut-network-admin/containers/missing.conf
tests/unit_tests/server/configs/ut-network-admin/containers/test.conf.in
tests/unit_tests/server/configs/ut-network-admin/libvirt-config/buggy-network-filter.xml [deleted file]
tests/unit_tests/server/configs/ut-network-admin/libvirt-config/buggy-network.xml [deleted file]
tests/unit_tests/server/configs/ut-network-admin/libvirt-config/network-filter.xml [deleted file]
tests/unit_tests/server/configs/ut-network-admin/libvirt-config/network.xml [deleted file]
tests/unit_tests/server/configs/ut-server/containers/container1.conf
tests/unit_tests/server/configs/ut-server/containers/container2.conf
tests/unit_tests/server/configs/ut-server/containers/container3.conf
tests/unit_tests/server/configs/ut-server/libvirt-config/container1.xml [deleted file]
tests/unit_tests/server/configs/ut-server/libvirt-config/container2.xml [deleted file]
tests/unit_tests/server/configs/ut-server/libvirt-config/container3.xml [deleted file]
tests/unit_tests/server/configs/ut-server/libvirt-config/network1-filter.xml [deleted file]
tests/unit_tests/server/configs/ut-server/libvirt-config/network1.xml [deleted file]
tests/unit_tests/server/configs/ut-server/libvirt-config/network2-filter.xml [deleted file]
tests/unit_tests/server/configs/ut-server/libvirt-config/network2.xml [deleted file]
tests/unit_tests/server/configs/ut-server/libvirt-config/network3-filter.xml [deleted file]
tests/unit_tests/server/configs/ut-server/libvirt-config/network3.xml [deleted file]
tests/unit_tests/server/ut-containers-manager.cpp
tests/unit_tests/utils/configs/CMakeLists.txt

index f824f8f..b998b20 100644 (file)
@@ -63,9 +63,6 @@ ADD_DEFINITIONS(-DPROJECT_SOURCE_DIR="${PROJECT_SOURCE_DIR}")
 IF(NOT DEFINED SECURITY_CONTAINERS_USER)
     SET(SECURITY_CONTAINERS_USER "security-containers")
 ENDIF(NOT DEFINED SECURITY_CONTAINERS_USER)
-IF(NOT DEFINED LIBVIRT_GROUP)
-    SET(LIBVIRT_GROUP "libvirt")
-ENDIF(NOT DEFINED LIBVIRT_GROUP)
 IF(NOT DEFINED INPUT_EVENT_GROUP)
     SET(INPUT_EVENT_GROUP "input")
 ENDIF(NOT DEFINED INPUT_EVENT_GROUP)
@@ -77,7 +74,6 @@ IF(NOT DEFINED TTY_GROUP)
 ENDIF(NOT DEFINED TTY_GROUP)
 
 ADD_DEFINITIONS(-DSECURITY_CONTAINERS_USER="${SECURITY_CONTAINERS_USER}")
-ADD_DEFINITIONS(-DLIBVIRT_GROUP="${LIBVIRT_GROUP}")
 ADD_DEFINITIONS(-DINPUT_EVENT_GROUP="${INPUT_EVENT_GROUP}")
 ADD_DEFINITIONS(-DDISK_GROUP="${DISK_GROUP}")
 ADD_DEFINITIONS(-DTTY_GROUP="${TTY_GROUP}")
index 076dd94..ff1075b 100644 (file)
@@ -17,6 +17,7 @@
 # @author Mateusz Malicki (m.malicki2@samsung.com)
 #
 
+MESSAGE(STATUS "")
 MESSAGE(STATUS "Generating makefile for the command line interface...")
 FILE(GLOB cli_SRCS *.cpp *.hpp)
 
index 48cefea..3d8eb5d 100644 (file)
@@ -17,6 +17,7 @@
 # @author Mateusz Malicki (m.malicki2@samsung.com)
 #
 
+MESSAGE(STATUS "")
 MESSAGE(STATUS "Generating makefile for the Client...")
 FILE(GLOB project_SRCS *.cpp *.hpp *.h)
 FILE(GLOB common_SRCS ${COMMON_FOLDER}/utils/callback-guard.hpp
index c264a38..769eb7f 100644 (file)
@@ -17,6 +17,7 @@
 # @author Jan Olszak (j.olszak@samsung.com)
 #
 
+MESSAGE(STATUS "")
 MESSAGE(STATUS "Generating makefile for the Container Daemon...")
 FILE(GLOB project_SRCS *.cpp *.hpp)
 FILE(GLOB common_SRCS ${COMMON_FOLDER}/dbus/*.cpp  ${COMMON_FOLDER}/dbus/*.hpp
index 8d9c159..3b26157 100644 (file)
@@ -17,6 +17,7 @@
 # @author Piotr Bartosiewicz (p.bartosiewi@partner.samsung.com)
 #
 
+MESSAGE(STATUS "")
 MESSAGE(STATUS "Generating makefile for the Container Support...")
 
 
index 1ef5da4..e73694c 100644 (file)
@@ -1,7 +1,6 @@
 %define script_dir %{_sbindir}
 # Security Containers Server's user info - it should already exist in the system
 %define scs_user          security-containers
-%define libvirt_group     libvirt
 # The group that has read and write access to /dev/input/event* devices.
 # It may vary between platforms.
 %define input_event_group input
@@ -41,13 +40,8 @@ between them. A process from inside a container can request a switch of context
 %attr(755,root,root) %{_bindir}/security-containers-server
 %dir /etc/security-containers
 %dir /etc/security-containers/containers
-%dir /etc/security-containers/libvirt-config
-%dir /etc/security-containers/templates
 %config /etc/security-containers/daemon.conf
 %config /etc/security-containers/containers/*.conf
-%config /etc/security-containers/libvirt-config/*.xml
-%config /etc/security-containers/templates/*.conf
-%config /etc/security-containers/templates/*.xml
 %{_unitdir}/security-containers.service
 %{_unitdir}/multi-user.target.wants/security-containers.service
 /etc/dbus-1/system.d/org.tizen.containers.host.conf
@@ -69,7 +63,6 @@ between them. A process from inside a container can request a switch of context
          -DSYSTEMD_UNIT_DIR=%{_unitdir} \
          -DPYTHON_SITELIB=%{python_sitelib} \
          -DSECURITY_CONTAINERS_USER=%{scs_user} \
-         -DLIBVIRT_GROUP=%{libvirt_group} \
          -DINPUT_EVENT_GROUP=%{input_event_group} \
          -DDISK_GROUP=%{disk_group} \
          -DTTY_GROUP=%{tty_group}
index 0eab83b..3c1d89c 100644 (file)
@@ -17,6 +17,7 @@
 # @author Jan Olszak (j.olszak@samsung.com)
 #
 
+MESSAGE(STATUS "")
 MESSAGE(STATUS "Generating makefile for the Server...")
 FILE(GLOB         project_SRCS *.cpp *.hpp)
 FILE(GLOB_RECURSE common_SRCS ${COMMON_FOLDER}/*.cpp ${COMMON_FOLDER}/*.hpp)
index 81859c1..310f407 100644 (file)
@@ -20,8 +20,6 @@
 MESSAGE(STATUS "Installing configs to " ${SC_CONFIG_INSTALL_DIR})
 
 FILE(GLOB container_CONF     containers/*.conf)
-FILE(GLOB admin_CONF         libvirt-config/*.xml)
-FILE(GLOB template_CONF      templates/*.conf templates/*.xml)
 
 ## Generate ####################################################################
 CONFIGURE_FILE(systemd/security-containers.service.in
@@ -42,11 +40,5 @@ INSTALL(FILES       ${CMAKE_BINARY_DIR}/dbus-1/system.d/org.tizen.containers.hos
 INSTALL(FILES       ${container_CONF}
         DESTINATION ${SC_CONFIG_INSTALL_DIR}/containers)
 
-INSTALL(FILES       ${admin_CONF}
-        DESTINATION ${SC_CONFIG_INSTALL_DIR}/libvirt-config)
-
-INSTALL(FILES       ${template_CONF}
-        DESTINATION ${SC_CONFIG_INSTALL_DIR}/templates)
-
 INSTALL(FILES       ${CMAKE_BINARY_DIR}/systemd/security-containers.service
         DESTINATION ${SYSTEMD_UNIT_DIR})
index 600edb1..c7b1fb4 100644 (file)
@@ -5,9 +5,6 @@
     "privilege" : 1,
     "vt" : 3,
     "switchToDefaultAfterTimeout" : true,
-    "config" : "../libvirt-config/business.xml",
-    "networkConfig" : "../libvirt-config/business-network.xml",
-    "networkFilterConfig" : "../libvirt-config/business-nwfilter.xml",
     "runMountPoint" : "business/run",
     "permittedToSend" : [ "/tmp/.*" ],
     "permittedToRecv" : [ "/tmp/.*" ]
index 71d4bcb..a741c64 100644 (file)
@@ -5,9 +5,6 @@
     "privilege" : 10,
     "vt" : 2,
     "switchToDefaultAfterTimeout" : true,
-    "config" : "../libvirt-config/private.xml",
-    "networkConfig" : "../libvirt-config/private-network.xml",
-    "networkFilterConfig" : "../libvirt-config/private-nwfilter.xml",
     "runMountPoint" : "private/run",
     "permittedToSend" : [ "/tmp/.*" ],
     "permittedToRecv" : [ "/tmp/.*" ]
diff --git a/server/configs/libvirt-config/business-network.xml b/server/configs/libvirt-config/business-network.xml
deleted file mode 100644 (file)
index dbfc6c4..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-<network>
-    <name>business</name>
-    <uuid>cc0951f9-3397-4272-ae05-66c19229accf</uuid>
-    <bridge name="virbr-business"/>
-    <forward/>
-    <dns forwardPlainNames="yes"/>
-    <ip address="10.0.102.1" netmask="255.255.255.0">
-        <dhcp>
-            <range start="10.0.102.2" end="10.0.102.2"/>
-        </dhcp>
-    </ip>
-</network>
diff --git a/server/configs/libvirt-config/business-nwfilter.xml b/server/configs/libvirt-config/business-nwfilter.xml
deleted file mode 100644 (file)
index 6548f58..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<filter name='nwfilter-business' chain='root'>
-    <rule action='reject' direction='in' priority='100'>
-        <ip srcipaddr='10.0.102.0' srcipmask='255.255.255.0'/>
-    </rule>
-    <rule action='reject' direction='out' priority='100'>
-        <ip dstipaddr='10.0.102.0' srcipmask='255.255.255.0'/>
-    </rule>
-</filter>
diff --git a/server/configs/libvirt-config/business.xml b/server/configs/libvirt-config/business.xml
deleted file mode 100644 (file)
index 7564d8b..0000000
+++ /dev/null
@@ -1,123 +0,0 @@
-<domain type='lxc'>
-  <name>business</name>
-  <uuid>df00c906-c223-46bd-a49e-b573f694c3a5</uuid>
-  <memory>102400</memory>
-  <os>
-    <type>exe</type>
-    <init>/usr/lib/systemd/systemd</init>
-  </os>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <console type='pty'/>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/fb0</char>
-      </source>
-    </hostdev>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/tty2</char>
-      </source>
-    </hostdev>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/tty3</char>
-      </source>
-    </hostdev>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/tty4</char>
-      </source>
-    </hostdev>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/tty5</char>
-      </source>
-    </hostdev>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/input/event0</char>
-      </source>
-    </hostdev>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/input/event1</char>
-      </source>
-    </hostdev>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/input/event2</char>
-      </source>
-    </hostdev>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/input/event3</char>
-      </source>
-    </hostdev>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/input/event4</char>
-      </source>
-    </hostdev>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/input/mice</char>
-      </source>
-    </hostdev>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/input/mouse0</char>
-      </source>
-    </hostdev>
-
-    <!--
-        DLOG devices
-        TODO: remove when dlogutil disappears
-    -->
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/log_events</char>
-      </source>
-    </hostdev>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/log_main</char>
-      </source>
-    </hostdev>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/log_radio</char>
-      </source>
-    </hostdev>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/log_system</char>
-      </source>
-    </hostdev>
-
-    <interface type='network'>
-      <source network='business'/>
-      <filterref filter='nwfilter-business'/>
-    </interface>
-    <filesystem type='mount'>
-      <!-- TODO: this directory could be generated from .conf files-->
-      <source dir='/opt/usr/containers/business'/>
-      <target dir='/'/>
-    </filesystem>
-    <!-- Enable access to the containers dbus -->
-    <filesystem type='mount'>
-      <!-- TODO: this directory could be generated from .conf files-->
-      <source dir='/var/run/containers/business/run'/>
-      <target dir='/var/run'/>
-    </filesystem>
-    <!-- Enable access to the SMACK labels -->
-    <!-- TODO: This only helps investigating smack problems,
-               and should be removed eventually -->
-    <filesystem type='mount'>
-      <source dir='/sys/fs/smackfs'/>
-      <target dir='/sys/fs/smackfs'/>
-    </filesystem>
-  </devices>
-</domain>
diff --git a/server/configs/libvirt-config/private-network.xml b/server/configs/libvirt-config/private-network.xml
deleted file mode 100644 (file)
index 7dec5a9..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-<network>
-    <name>private</name>
-    <uuid>5b25f83d-ccb6-45f0-9d5c-c05199c261bd</uuid>
-    <bridge name="virbr-private"/>
-    <forward/>
-    <dns forwardPlainNames="yes"/>
-    <ip address="10.0.101.1" netmask="255.255.255.0">
-        <dhcp>
-            <range start="10.0.101.2" end="10.0.101.2"/>
-        </dhcp>
-    </ip>
-</network>
diff --git a/server/configs/libvirt-config/private-nwfilter.xml b/server/configs/libvirt-config/private-nwfilter.xml
deleted file mode 100644 (file)
index 12dc793..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<filter name='nwfilter-private' chain='root'>
-    <rule action='reject' direction='in' priority='100'>
-        <ip srcipaddr='10.0.101.0' srcipmask='255.255.255.0'/>
-    </rule>
-    <rule action='reject' direction='out' priority='100'>
-        <ip dstipaddr='10.0.101.0' srcipmask='255.255.255.0'/>
-    </rule>
-</filter>
diff --git a/server/configs/libvirt-config/private.xml b/server/configs/libvirt-config/private.xml
deleted file mode 100644 (file)
index b665a80..0000000
+++ /dev/null
@@ -1,123 +0,0 @@
-<domain type='lxc'>
-  <name>private</name>
-  <uuid>5890186c-0a85-4b27-bd0f-b3505c3bbea8</uuid>
-  <memory>102400</memory>
-  <os>
-    <type>exe</type>
-    <init>/usr/lib/systemd/systemd</init>
-  </os>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <console type='pty'/>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/fb0</char>
-      </source>
-    </hostdev>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/tty2</char>
-      </source>
-    </hostdev>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/tty3</char>
-      </source>
-    </hostdev>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/tty4</char>
-      </source>
-    </hostdev>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/tty5</char>
-      </source>
-    </hostdev>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/input/event0</char>
-      </source>
-    </hostdev>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/input/event1</char>
-      </source>
-    </hostdev>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/input/event2</char>
-      </source>
-    </hostdev>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/input/event3</char>
-      </source>
-    </hostdev>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/input/event4</char>
-      </source>
-    </hostdev>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/input/mice</char>
-      </source>
-    </hostdev>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/input/mouse0</char>
-      </source>
-    </hostdev>
-
-    <!--
-        DLOG devices
-        TODO: remove when dlogutil disappears
-    -->
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/log_events</char>
-      </source>
-    </hostdev>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/log_main</char>
-      </source>
-    </hostdev>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/log_radio</char>
-      </source>
-    </hostdev>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/log_system</char>
-      </source>
-    </hostdev>
-
-    <interface type='network'>
-      <source network='private'/>
-      <filterref filter='nwfilter-private'/>
-    </interface>
-    <filesystem type='mount'>
-      <!-- TODO: this directory could be generated from .conf files-->
-      <source dir='/opt/usr/containers/private'/>
-      <target dir='/'/>
-    </filesystem>
-    <!-- Enable access to the containers dbus -->
-    <filesystem type='mount'>
-      <!-- TODO: this directory could be generated from .conf files-->
-      <source dir='/var/run/containers/private/run'/>
-      <target dir='/var/run'/>
-    </filesystem>
-    <!-- Enable access to the SMACK labels -->
-    <!-- TODO: This only helps investigating smack problems,
-               and should be removed eventually -->
-    <filesystem type='mount'>
-      <source dir='/sys/fs/smackfs'/>
-      <target dir='/sys/fs/smackfs'/>
-    </filesystem>
-  </devices>
-</domain>
index c271341..a1b8af0 100644 (file)
@@ -1,7 +1,5 @@
 [Unit]
 Description=Security Containers Server
-After=libvirtd.service
-Requires=libvirtd.service
 ConditionVirtualization=no
 
 [Service]
diff --git a/server/configs/templates/template-network.xml b/server/configs/templates/template-network.xml
deleted file mode 100644 (file)
index f5ec171..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-<network>
-    <name>~NAME~</name>
-    <uuid>~UUID~</uuid>
-    <bridge name="virbr-~NAME~"/>
-    <forward/>
-    <dns forwardPlainNames="yes"/>
-    <ip address="10.0.~IP~.1" netmask="255.255.255.0">
-        <dhcp>
-            <range start="10.0.~IP~.2" end="10.0.~IP~.2"/>
-        </dhcp>
-    </ip>
-</network>
diff --git a/server/configs/templates/template-nwfilter.xml b/server/configs/templates/template-nwfilter.xml
deleted file mode 100644 (file)
index 82ea8cc..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<filter name='nwfilter-~NAME~' chain='root'>
-    <uuid>~UUID~</uuid>
-    <rule action='reject' direction='in' priority='100'>
-        <ip srcipaddr='10.0.~IP~.0' srcipmask='255.255.255.0'/>
-    </rule>
-    <rule action='reject' direction='out' priority='100'>
-        <ip dstipaddr='10.0.~IP~.0' srcipmask='255.255.255.0'/>
-    </rule>
-</filter>
index b054fb1..a8f47fc 100644 (file)
@@ -5,9 +5,6 @@
     "vt" : -1,
     "switchToDefaultAfterTimeout" : true,
     "enableDbusIntegration" : true,
-    "config" : "../libvirt-config/~NAME~.xml",
-    "networkConfig" : "../libvirt-config/~NAME~-network.xml",
-    "networkFilterConfig" : "../libvirt-config/~NAME~-nwfilter.xml",
     "runMountPoint" : "~NAME~/run",
     "permittedToSend" : [ "/tmp/.*" ],
     "permittedToRecv" : [ "/tmp/.*" ]
diff --git a/server/configs/templates/template.xml b/server/configs/templates/template.xml
deleted file mode 100644 (file)
index bdb452d..0000000
+++ /dev/null
@@ -1,123 +0,0 @@
-<domain type='lxc'>
-  <name>~NAME~</name>
-  <uuid>~UUID~</uuid>
-  <memory>102400</memory>
-  <os>
-    <type>exe</type>
-    <init>/usr/lib/systemd/systemd</init>
-  </os>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <console type='pty'/>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/fb0</char>
-      </source>
-    </hostdev>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/tty2</char>
-      </source>
-    </hostdev>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/tty3</char>
-      </source>
-    </hostdev>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/tty4</char>
-      </source>
-    </hostdev>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/tty5</char>
-      </source>
-    </hostdev>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/input/event0</char>
-      </source>
-    </hostdev>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/input/event1</char>
-      </source>
-    </hostdev>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/input/event2</char>
-      </source>
-    </hostdev>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/input/event3</char>
-      </source>
-    </hostdev>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/input/event4</char>
-      </source>
-    </hostdev>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/input/mice</char>
-      </source>
-    </hostdev>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/input/mouse0</char>
-      </source>
-    </hostdev>
-
-    <!--
-        DLOG devices
-        TODO: remove when dlogutil disappears
-    -->
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/log_events</char>
-      </source>
-    </hostdev>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/log_main</char>
-      </source>
-    </hostdev>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/log_radio</char>
-      </source>
-    </hostdev>
-    <hostdev mode='capabilities' type='misc'>
-      <source>
-        <char>/dev/log_system</char>
-      </source>
-    </hostdev>
-
-    <interface type='network'>
-      <source network='~NAME~'/>
-      <filterref filter='nwfilter-~NAME~'/>
-    </interface>
-    <filesystem type='mount'>
-      <!-- TODO: this directory could be generated from .conf files-->
-      <source dir='/opt/usr/containers/~NAME~'/>
-      <target dir='/'/>
-    </filesystem>
-    <!-- Enable access to the containers dbus -->
-    <filesystem type='mount'>
-      <!-- TODO: this directory could be generated from .conf files-->
-      <source dir='/var/run/containers/~NAME~/run'/>
-      <target dir='/var/run'/>
-    </filesystem>
-    <!-- Enable access to the SMACK labels -->
-    <!-- TODO: This only helps investigating smack problems,
-               and should be removed eventually -->
-    <filesystem type='mount'>
-      <source dir='/sys/fs/smackfs'/>
-      <target dir='/sys/fs/smackfs'/>
-    </filesystem>
-  </devices>
-</domain>
index e0c6760..e8d44c1 100644 (file)
@@ -60,23 +60,6 @@ struct ContainerConfig {
     bool enableDbusIntegration;
 
     /**
-     * Container's libvirt (XML) config file.
-     * Location can be relative to the Container's config file.
-     */
-    std::string config;
-
-    /**
-     * Container's libvirt (XML) network config file.
-     */
-    std::string networkConfig;
-
-    /**
-     *
-     * Container's libvirt (XML) network filter config file.
-     */
-    std::string networkFilterConfig;
-
-    /**
      * Container's CFS quota in us when it's in the foreground
      */
     std::int64_t cpuQuotaForeground;
@@ -109,9 +92,6 @@ struct ContainerConfig {
         vt,
         switchToDefaultAfterTimeout,
         enableDbusIntegration,
-        config,
-        networkConfig,
-        networkFilterConfig,
         cpuQuotaForeground,
         cpuQuotaBackground,
         runMountPoint,
index 59328db..c69cd46 100644 (file)
@@ -65,17 +65,17 @@ Container::Container(const std::string& containerConfigPath,
     }
 
     const std::string baseConfigPath = utils::dirName(containerConfigPath);
-    mConfig.config = fs::absolute(mConfig.config, baseConfigPath).string();
-    mConfig.networkConfig = fs::absolute(mConfig.networkConfig, baseConfigPath).string();
-    mConfig.networkFilterConfig = fs::absolute(mConfig.networkFilterConfig,
-                                               baseConfigPath).string();
+    //mConfig.config = fs::absolute(mConfig.config, baseConfigPath).string();
+    //mConfig.networkConfig = fs::absolute(mConfig.networkConfig, baseConfigPath).string();
+    //mConfig.networkFilterConfig = fs::absolute(mConfig.networkFilterConfig,
+    //                                           baseConfigPath).string();
     if (!mConfig.runMountPoint.empty()) {
         mRunMountPoint = fs::absolute(mConfig.runMountPoint, baseRunMountPointPath).string();
     }
 
-    LOGT("Creating Network Admin " << mConfig.networkConfig);
+    //LOGT("Creating Network Admin " << mConfig.networkConfig);
     mNetworkAdmin.reset(new NetworkAdmin(mConfig));
-    LOGT("Creating Container Admin " << mConfig.config);
+    //LOGT("Creating Container Admin " << mConfig.config);
     mAdmin.reset(new ContainerAdmin(mConfig));
 }
 
index c9c7ff8..321bec0 100644 (file)
@@ -67,9 +67,6 @@ bool regexMatchVector(const std::string& str, const std::vector<boost::regex>& v
 
 const std::string HOST_ID = "host";
 const std::string CONTAINER_TEMPLATE_CONFIG_PATH = "template.conf";
-const std::string CONTAINER_TEMPLATE_LIBVIRT_CONFIG_PATH = "template.xml";
-const std::string CONTAINER_TEMPLATE_LIBVIRT_NETWORK_PATH = "template-network.xml";
-const std::string CONTAINER_TEMPLATE_LIBVIRT_NETWORK_FILTER_PATH = "template-nwfilter.xml";
 
 const boost::regex CONTAINER_NAME_REGEX("~NAME~");
 const boost::regex CONTAINER_UUID_REGEX("~UUID~");
@@ -606,12 +603,6 @@ void ContainersManager::handleAddContainerCall(const std::string& id,
 
     std::string configPath = utils::createFilePath(templateDir, "/", CONTAINER_TEMPLATE_CONFIG_PATH);
     std::string newConfigPath = utils::createFilePath(configDir, "/containers/", id + ".conf");
-    std::string libvirtConfigPath = utils::createFilePath(templateDir, "/", CONTAINER_TEMPLATE_LIBVIRT_CONFIG_PATH);
-    std::string newLibvirtConfigPath = utils::createFilePath(configDir, "/libvirt-config/", id + ".xml");
-    std::string libvirtNetworkPath = utils::createFilePath(templateDir, "/", CONTAINER_TEMPLATE_LIBVIRT_NETWORK_PATH);
-    std::string newLibvirtNetworkPath = utils::createFilePath(configDir, "/libvirt-config/", id + "-network.xml");
-    std::string libvirtNetworkFilterPath = utils::createFilePath(templateDir, "/", CONTAINER_TEMPLATE_LIBVIRT_NETWORK_FILTER_PATH);
-    std::string newLibvirtNetworkFilterPath = utils::createFilePath(configDir, "/libvirt-config/", id + "-nwfilter.xml");
 
     auto removeAllWrapper = [](const std::string& path) {
         try {
@@ -626,14 +617,6 @@ void ContainersManager::handleAddContainerCall(const std::string& id,
         LOGI("Generating config from " << configPath << " to " << newConfigPath);
         generateNewConfig(id, configPath, newConfigPath);
 
-        LOGI("Generating config from " << libvirtConfigPath << " to " << newLibvirtConfigPath);
-        generateNewConfig(id, libvirtConfigPath, newLibvirtConfigPath);
-
-        LOGI("Generating config from " << libvirtNetworkPath << " to " << newLibvirtNetworkPath);
-        generateNewConfig(id, libvirtNetworkPath, newLibvirtNetworkPath);
-
-        LOGI("Generating config from " << libvirtNetworkFilterPath << " to " << newLibvirtNetworkFilterPath);
-        generateNewConfig(id, libvirtNetworkFilterPath, newLibvirtNetworkFilterPath);
     } catch (SecurityContainersException& e) {
         LOGE(e.what());
         removeAllWrapper(containerPathStr);
index a9ad444..8fb6b57 100644 (file)
 #error "INPUT_EVENT_GROUP must be defined!"
 #endif
 
-#ifndef LIBVIRT_GROUP
-#error "LIBVIRT_GROUP must be defined!"
-#endif
-
 #ifndef DISK_GROUP
 #error "DISK_GROUP must be defined!"
 #endif
@@ -189,11 +185,10 @@ bool Server::prepareEnvironment(const std::string& configPath, bool runAsRoot)
         return true;
     }
 
-    // LIBVIRT_GROUP provides access to libvirt's daemon socket.
     // INPUT_EVENT_GROUP provides access to /dev/input/event* devices used by InputMonitor.
     // DISK_GROUP provides access to /dev/loop* devices, needed when adding new container to copy
     //            containers image
-    if (!utils::setSuppGroups({LIBVIRT_GROUP, INPUT_EVENT_GROUP, DISK_GROUP, TTY_GROUP})) {
+    if (!utils::setSuppGroups({INPUT_EVENT_GROUP, DISK_GROUP, TTY_GROUP})) {
         return false;
     }
 
index c0289c3..7330049 100644 (file)
@@ -17,6 +17,7 @@
 # @author Lukasz Kostyra (l.kostyra@samsung.com)
 #
 
+MESSAGE(STATUS "")
 MESSAGE(STATUS "Generating makefile for Integration Tests...")
 
 
index 38d268a..ec795db 100644 (file)
@@ -17,6 +17,7 @@
 # @author Jan Olszak (j.olszak@samsung.com)
 #
 
+MESSAGE(STATUS "")
 MESSAGE(STATUS "Generating makefile for the Unit Tests...")
 FILE(GLOB_RECURSE project_SRCS *.cpp *.hpp)
 FILE(GLOB_RECURSE common_SRCS ${COMMON_FOLDER}/*.cpp ${COMMON_FOLDER}/*.hpp)
index 112d979..c6f67a7 100644 (file)
 # @author Mateusz Malicki (m.malicki2@samsung.com)
 #
 
-MESSAGE(STATUS "Installing configs for the Client Unit Tests to " ${SC_CONFIG_INSTALL_DIR})
+MESSAGE(STATUS "Installing configs for the Client Unit Tests to " ${SC_TEST_CONFIG_INSTALL_DIR})
 
 FILE(GLOB client_manager_CONF       ut-client/*.conf)
 FILE(GLOB client_container_CONF     ut-client/containers/*.conf)
-FILE(GLOB client_admin_CONF         ut-client/libvirt-config/*.xml)
 
 ## Generate ####################################################################
-CONFIGURE_FILE(ut-client/libvirt-config/console1-dbus.xml.in
-               ${CMAKE_BINARY_DIR}/ut-client/libvirt-config/console1-dbus.xml @ONLY)
-CONFIGURE_FILE(ut-client/libvirt-config/console2-dbus.xml.in
-               ${CMAKE_BINARY_DIR}/ut-client/libvirt-config/console2-dbus.xml @ONLY)
-CONFIGURE_FILE(ut-client/libvirt-config/console3-dbus.xml.in
-               ${CMAKE_BINARY_DIR}/ut-client/libvirt-config/console3-dbus.xml @ONLY)
-FILE(GLOB client_admin_CONF_GEN ${CMAKE_BINARY_DIR}/ut-client/libvirt-config/*.xml)
-
 
 ## Install #####################################################################
 INSTALL(FILES        ${client_manager_CONF}
         DESTINATION  ${SC_TEST_CONFIG_INSTALL_DIR}/client/ut-client)
 INSTALL(FILES        ${client_container_CONF}
         DESTINATION  ${SC_TEST_CONFIG_INSTALL_DIR}/client/ut-client/containers)
-INSTALL(FILES        ${client_admin_CONF}
-        DESTINATION  ${SC_TEST_CONFIG_INSTALL_DIR}/client/ut-client/libvirt-config)
-INSTALL(FILES        ${client_admin_CONF_GEN}
-        DESTINATION  ${SC_TEST_CONFIG_INSTALL_DIR}/client/ut-client/libvirt-config)
index b32dd81..8f6f37d 100644 (file)
@@ -3,9 +3,6 @@
     "vt" : -1,
     "switchToDefaultAfterTimeout" : true,
     "enableDbusIntegration" : true,
-    "config" : "../libvirt-config/console1-dbus.xml",
-    "networkConfig" : "../libvirt-config/network1.xml",
-    "networkFilterConfig" : "../libvirt-config/network1-filter.xml",
     "cpuQuotaForeground" : -1,
     "cpuQuotaBackground" : 1000,
     "runMountPoint" : "/tmp/ut-containers-manager/console1-dbus",
index 3dda658..f62fac0 100644 (file)
@@ -3,9 +3,6 @@
     "vt" : -1,
     "switchToDefaultAfterTimeout" : false,
     "enableDbusIntegration" : true,
-    "config" : "../libvirt-config/console2-dbus.xml",
-    "networkConfig" : "../libvirt-config/network2.xml",
-    "networkFilterConfig" : "../libvirt-config/network2-filter.xml",
     "cpuQuotaForeground" : -1,
     "cpuQuotaBackground" : 1000,
     "runMountPoint" : "/tmp/ut-containers-manager/console2-dbus",
index 0128c09..e91ecd9 100644 (file)
@@ -3,9 +3,6 @@
     "vt" : -1,
     "switchToDefaultAfterTimeout" : true,
     "enableDbusIntegration" : true,
-    "config" : "../libvirt-config/console3-dbus.xml",
-    "networkConfig" : "../libvirt-config/network3.xml",
-    "networkFilterConfig" : "../libvirt-config/network3-filter.xml",
     "cpuQuotaForeground" : -1,
     "cpuQuotaBackground" : 1000,
     "runMountPoint" : "/tmp/ut-containers-manager/console3-dbus",
diff --git a/tests/unit_tests/client/configs/ut-client/libvirt-config/console1-dbus.xml.in b/tests/unit_tests/client/configs/ut-client/libvirt-config/console1-dbus.xml.in
deleted file mode 100644 (file)
index 3bce659..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<domain type="lxc">
-    <name>ut-containers-manager-console1-dbus</name>
-    <uuid>58184009-b278-4d01-975d-708393690084</uuid>
-    <memory>102400</memory>
-    <os>
-        <type>exe</type>
-        <init>/usr/bin/dbus-daemon</init>
-        <initarg>--nofork</initarg>
-        <initarg>--config-file=@SC_TEST_CONFIG_INSTALL_DIR@/server/ut-containers-manager/ut-dbus.conf</initarg>
-        <initarg>--address=unix:path=/tmp/ut-containers-manager/console1-dbus/dbus/system_bus_socket</initarg>
-    </os>
-    <devices>
-        <console type="pty"/>
-    </devices>
-</domain>
diff --git a/tests/unit_tests/client/configs/ut-client/libvirt-config/console2-dbus.xml.in b/tests/unit_tests/client/configs/ut-client/libvirt-config/console2-dbus.xml.in
deleted file mode 100644 (file)
index f98c9bd..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<domain type="lxc">
-    <name>ut-containers-manager-console2-dbus</name>
-    <uuid>3d18323e-4ada-4a1b-a907-836701891306</uuid>
-    <memory>102400</memory>
-    <os>
-        <type>exe</type>
-        <init>/usr/bin/dbus-daemon</init>
-        <initarg>--nofork</initarg>
-        <initarg>--config-file=@SC_TEST_CONFIG_INSTALL_DIR@/server/ut-containers-manager/ut-dbus.conf</initarg>
-        <initarg>--address=unix:path=/tmp/ut-containers-manager/console2-dbus/dbus/system_bus_socket</initarg>
-    </os>
-    <devices>
-        <console type="pty"/>
-    </devices>
-</domain>
diff --git a/tests/unit_tests/client/configs/ut-client/libvirt-config/console3-dbus.xml.in b/tests/unit_tests/client/configs/ut-client/libvirt-config/console3-dbus.xml.in
deleted file mode 100644 (file)
index 8175bcf..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<domain type="lxc">
-    <name>ut-containers-manager-console3-dbus</name>
-    <uuid>71cb8511-7474-4e90-865a-3360b7f77254</uuid>
-    <memory>102400</memory>
-    <os>
-        <type>exe</type>
-        <init>/usr/bin/dbus-daemon</init>
-        <initarg>--nofork</initarg>
-        <initarg>--config-file=@SC_TEST_CONFIG_INSTALL_DIR@/server/ut-containers-manager/ut-dbus.conf</initarg>
-        <initarg>--address=unix:path=/tmp/ut-containers-manager/console3-dbus/dbus/system_bus_socket</initarg>
-    </os>
-    <devices>
-        <console type="pty"/>
-    </devices>
-</domain>
diff --git a/tests/unit_tests/client/configs/ut-client/libvirt-config/network1-filter.xml b/tests/unit_tests/client/configs/ut-client/libvirt-config/network1-filter.xml
deleted file mode 100644 (file)
index bf39965..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<filter name='test-network-1-filter' chain='root'>
-    <uuid>abc79a77-0209-41a2-ab82-f767dfa5897e</uuid>
-</filter>
diff --git a/tests/unit_tests/client/configs/ut-client/libvirt-config/network1.xml b/tests/unit_tests/client/configs/ut-client/libvirt-config/network1.xml
deleted file mode 100644 (file)
index 23a5edd..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<network>
-    <name>test-network-1</name>
-    <uuid>372720ef-258b-4b27-baf6-d08341b15353</uuid>
-</network>
diff --git a/tests/unit_tests/client/configs/ut-client/libvirt-config/network2-filter.xml b/tests/unit_tests/client/configs/ut-client/libvirt-config/network2-filter.xml
deleted file mode 100644 (file)
index f33c816..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<filter name='test-network-2-filter' chain='root'>
-    <uuid>703f53eb-c602-4383-9de9-62bbe843ba31</uuid>
-</filter>
diff --git a/tests/unit_tests/client/configs/ut-client/libvirt-config/network2.xml b/tests/unit_tests/client/configs/ut-client/libvirt-config/network2.xml
deleted file mode 100644 (file)
index c3b4f04..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<network>
-    <name>test-network-2</name>
-    <uuid>95b9c647-ed3f-4586-886e-0a7b24e683a8</uuid>
-</network>
diff --git a/tests/unit_tests/client/configs/ut-client/libvirt-config/network3-filter.xml b/tests/unit_tests/client/configs/ut-client/libvirt-config/network3-filter.xml
deleted file mode 100644 (file)
index 04310bd..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<filter name='test-network-3-filter' chain='root'>
-    <uuid>40943fcc-faec-4bfe-9e89-104945164d35</uuid>
-</filter>
diff --git a/tests/unit_tests/client/configs/ut-client/libvirt-config/network3.xml b/tests/unit_tests/client/configs/ut-client/libvirt-config/network3.xml
deleted file mode 100644 (file)
index 7b3f730..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<network>
-    <name>test-network-3</name>
-    <uuid>962b061d-7f3e-410b-8990-3f1267d77656</uuid>
-</network>
index 9db7753..99daa2f 100644 (file)
@@ -17,7 +17,7 @@
 # @author Lukasz Pawelczyk (l.pawelczyk@partner.samsung.com)
 #
 
-MESSAGE(STATUS "Installing configs for the DBus Unit Tests to " ${SC_CONFIG_INSTALL_DIR})
+MESSAGE(STATUS "Installing configs for the DBus Unit Tests to " ${SC_TEST_CONFIG_INSTALL_DIR})
 FILE(GLOB dbus_CONF                 ut-connection/*.conf)
 
 
index ee1c7d9..a8bad91 100644 (file)
 # @author Jan Olszak (j.olszak@samsung.com)
 #
 
-MESSAGE(STATUS "Installing configs for the Server Unit Tests to " ${SC_CONFIG_INSTALL_DIR})
+MESSAGE(STATUS "Installing configs for the Server Unit Tests to " ${SC_TEST_CONFIG_INSTALL_DIR})
 
 FILE(GLOB server_manager_CONF       ut-server/*.conf)
 FILE(GLOB server_container_CONF     ut-server/containers/*.conf)
-FILE(GLOB server_admin_CONF         ut-server/libvirt-config/*.xml)
 
 FILE(GLOB manager_manager_CONF      ut-containers-manager/*.conf)
 FILE(GLOB manager_container_CONF    ut-containers-manager/containers/*.conf)
-FILE(GLOB manager_admin_CONF        ut-containers-manager/libvirt-config/*.xml)
-FILE(GLOB manager_admin_TEMPLATE    ut-containers-manager/templates/*.conf
-                                    ut-containers-manager/templates/*.xml)
+FILE(GLOB manager_admin_TEMPLATE    ut-containers-manager/templates/*.conf)
 
 FILE(GLOB container_CONF            ut-container/*.conf)
 FILE(GLOB container_container_CONF  ut-container/containers/*.conf)
-FILE(GLOB container_admin_CONF      ut-container/libvirt-config/*.xml)
 
 FILE(GLOB admin_container_CONF      ut-container-admin/containers/*.conf)
-FILE(GLOB admin_admin_CONF          ut-container-admin/libvirt-config/*.xml)
 
 FILE(GLOB network_container_CONF    ut-network-admin/containers/*.conf)
-FILE(GLOB network_admin_CONF        ut-network-admin/libvirt-config/*.xml)
 
 FILE(GLOB connection_CONF           ut-container-connection/*.conf)
 
@@ -57,65 +51,34 @@ CONFIGURE_FILE(ut-network-admin/containers/buggy.conf.in
                ${CMAKE_BINARY_DIR}/ut-network-admin/containers/buggy.conf @ONLY)
 FILE(GLOB network_container_CONF_GEN ${CMAKE_BINARY_DIR}/ut-network-admin/containers/*.conf)
 
-CONFIGURE_FILE(ut-containers-manager/libvirt-config/console1-dbus.xml.in
-               ${CMAKE_BINARY_DIR}/ut-containers-manager/libvirt-config/console1-dbus.xml @ONLY)
-CONFIGURE_FILE(ut-containers-manager/libvirt-config/console2-dbus.xml.in
-               ${CMAKE_BINARY_DIR}/ut-containers-manager/libvirt-config/console2-dbus.xml @ONLY)
-CONFIGURE_FILE(ut-containers-manager/libvirt-config/console3-dbus.xml.in
-               ${CMAKE_BINARY_DIR}/ut-containers-manager/libvirt-config/console3-dbus.xml @ONLY)
-CONFIGURE_FILE(ut-containers-manager/templates/template.xml.in
-               ${CMAKE_BINARY_DIR}/ut-containers-manager/templates/template.xml @ONLY)
-FILE(GLOB manager_admin_CONF_GEN ${CMAKE_BINARY_DIR}/ut-containers-manager/libvirt-config/*.xml)
-FILE(GLOB manager_admin_TEMPLATE_GEN ${CMAKE_BINARY_DIR}/ut-containers-manager/templates/*.xml)
-
-CONFIGURE_FILE(ut-container/libvirt-config/test-dbus.xml.in
-               ${CMAKE_BINARY_DIR}/ut-container/libvirt-config/test-dbus.xml @ONLY)
-FILE(GLOB container_admin_CONF_GEN ${CMAKE_BINARY_DIR}/ut-container/libvirt-config/*.xml)
-
 
 ## Install #####################################################################
 INSTALL(FILES        ${server_manager_CONF}
         DESTINATION  ${SC_TEST_CONFIG_INSTALL_DIR}/server/ut-server)
 INSTALL(FILES        ${server_container_CONF}
         DESTINATION  ${SC_TEST_CONFIG_INSTALL_DIR}/server/ut-server/containers)
-INSTALL(FILES        ${server_admin_CONF}
-        DESTINATION  ${SC_TEST_CONFIG_INSTALL_DIR}/server/ut-server/libvirt-config)
 
 INSTALL(FILES        ${manager_manager_CONF}
         DESTINATION  ${SC_TEST_CONFIG_INSTALL_DIR}/server/ut-containers-manager)
 INSTALL(FILES        ${manager_container_CONF}
         DESTINATION  ${SC_TEST_CONFIG_INSTALL_DIR}/server/ut-containers-manager/containers)
-INSTALL(FILES        ${manager_admin_CONF}
-        DESTINATION  ${SC_TEST_CONFIG_INSTALL_DIR}/server/ut-containers-manager/libvirt-config)
-INSTALL(FILES        ${manager_admin_CONF_GEN}
-        DESTINATION  ${SC_TEST_CONFIG_INSTALL_DIR}/server/ut-containers-manager/libvirt-config)
 INSTALL(FILES        ${manager_admin_TEMPLATE}
         DESTINATION  ${SC_TEST_CONFIG_INSTALL_DIR}/server/ut-containers-manager/templates)
-INSTALL(FILES        ${manager_admin_TEMPLATE_GEN}
-        DESTINATION  ${SC_TEST_CONFIG_INSTALL_DIR}/server/ut-containers-manager/templates)
 
 INSTALL(FILES        ${container_CONF}
         DESTINATION  ${SC_TEST_CONFIG_INSTALL_DIR}/server/ut-container)
 INSTALL(FILES        ${container_container_CONF}
         DESTINATION  ${SC_TEST_CONFIG_INSTALL_DIR}/server/ut-container/containers)
-INSTALL(FILES        ${container_admin_CONF}
-        DESTINATION  ${SC_TEST_CONFIG_INSTALL_DIR}/server/ut-container/libvirt-config)
-INSTALL(FILES        ${container_admin_CONF_GEN}
-        DESTINATION  ${SC_TEST_CONFIG_INSTALL_DIR}/server/ut-container/libvirt-config)
 
 INSTALL(FILES        ${admin_container_CONF}
         DESTINATION  ${SC_TEST_CONFIG_INSTALL_DIR}/server/ut-container-admin/containers)
 INSTALL(FILES        ${admin_container_CONF_GEN}
         DESTINATION  ${SC_TEST_CONFIG_INSTALL_DIR}/server/ut-container-admin/containers)
-INSTALL(FILES        ${admin_admin_CONF}
-        DESTINATION  ${SC_TEST_CONFIG_INSTALL_DIR}/server/ut-container-admin/libvirt-config)
 
 INSTALL(FILES        ${network_container_CONF}
         DESTINATION  ${SC_TEST_CONFIG_INSTALL_DIR}/server/ut-network-admin/containers)
 INSTALL(FILES        ${network_container_CONF_GEN}
         DESTINATION  ${SC_TEST_CONFIG_INSTALL_DIR}/server/ut-network-admin/containers)
-INSTALL(FILES        ${network_admin_CONF}
-        DESTINATION  ${SC_TEST_CONFIG_INSTALL_DIR}/server/ut-network-admin/libvirt-config)
 
 INSTALL(FILES        ${connection_CONF}
         DESTINATION  ${SC_TEST_CONFIG_INSTALL_DIR}/server/ut-container-connection)
index f9f553e..f4be18d 100644 (file)
@@ -3,9 +3,6 @@
     "vt" : -1,
     "switchToDefaultAfterTimeout" : true,
     "enableDbusIntegration" : false,
-    "config" : "@SC_TEST_CONFIG_INSTALL_DIR@/server/ut-container-admin/libvirt-config/buggy.xml",
-    "networkConfig" : "",
-    "networkFilterConfig" : "",
     "cpuQuotaForeground" : -1,
     "cpuQuotaBackground" : 1000,
     "runMountPoint" : "",
index 8312204..f4be18d 100644 (file)
@@ -3,9 +3,6 @@
     "vt" : -1,
     "switchToDefaultAfterTimeout" : true,
     "enableDbusIntegration" : false,
-    "config" : "/this/is/a/missing/file/path/missing.xml",
-    "networkConfig" : "",
-    "networkFilterConfig" : "",
     "cpuQuotaForeground" : -1,
     "cpuQuotaBackground" : 1000,
     "runMountPoint" : "",
index 135654c..f4be18d 100644 (file)
@@ -3,9 +3,6 @@
     "vt" : -1,
     "switchToDefaultAfterTimeout" : true,
     "enableDbusIntegration" : false,
-    "config" : "@SC_TEST_CONFIG_INSTALL_DIR@/server/ut-container-admin/libvirt-config/test-no-shutdown.xml",
-    "networkConfig" : "",
-    "networkFilterConfig" : "",
     "cpuQuotaForeground" : -1,
     "cpuQuotaBackground" : 1000,
     "runMountPoint" : "",
index de566ea..f4be18d 100644 (file)
@@ -3,9 +3,6 @@
     "vt" : -1,
     "switchToDefaultAfterTimeout" : true,
     "enableDbusIntegration" : false,
-    "config" : "@SC_TEST_CONFIG_INSTALL_DIR@/server/ut-container-admin/libvirt-config/test.xml",
-    "networkConfig" : "",
-    "networkFilterConfig" : "",
     "cpuQuotaForeground" : -1,
     "cpuQuotaBackground" : 1000,
     "runMountPoint" : "",
diff --git a/tests/unit_tests/server/configs/ut-container-admin/libvirt-config/buggy.xml b/tests/unit_tests/server/configs/ut-container-admin/libvirt-config/buggy.xml
deleted file mode 100644 (file)
index de0f81e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<><TRASHXML>
diff --git a/tests/unit_tests/server/configs/ut-container-admin/libvirt-config/test-no-shutdown.xml b/tests/unit_tests/server/configs/ut-container-admin/libvirt-config/test-no-shutdown.xml
deleted file mode 100644 (file)
index 609e155..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-<domain type="lxc">
-    <name>ut-container-admin-test</name>
-    <uuid>f6924d8d-faa4-4cd3-8b47-383f45a4c0c8</uuid>
-    <memory>102400</memory>
-    <os>
-        <type>exe</type>
-        <init>/bin/sh</init>
-    </os>
-    <devices>
-        <console type="pty"/>
-    </devices>
-</domain>
diff --git a/tests/unit_tests/server/configs/ut-container-admin/libvirt-config/test.xml b/tests/unit_tests/server/configs/ut-container-admin/libvirt-config/test.xml
deleted file mode 100644 (file)
index ac9916d..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-<domain type="lxc">
-    <name>ut-container-admin-test</name>
-    <uuid>a1299273-bce2-4d1f-8369-54b75a791279</uuid>
-    <memory>102400</memory>
-    <os>
-        <type>exe</type>
-        <init>/bin/sh</init>
-        <initarg>-c</initarg>
-        <initarg>trap exit SIGTERM; read</initarg>
-    </os>
-    <devices>
-        <console type="pty"/>
-    </devices>
-</domain>
index d0a307e..f4be18d 100644 (file)
@@ -3,9 +3,6 @@
     "vt" : -1,
     "switchToDefaultAfterTimeout" : true,
     "enableDbusIntegration" : false,
-    "config" : "/missing/file/path/libvirt.xml",
-    "networkConfig" : "../libvirt-config/network.xml",
-    "networkFilterConfig" : "../libvirt-config/network-filter.xml",
     "cpuQuotaForeground" : -1,
     "cpuQuotaBackground" : 1000,
     "runMountPoint" : "",
index a272aa1..d745818 100644 (file)
@@ -3,9 +3,6 @@
     "vt" : -1,
     "switchToDefaultAfterTimeout" : true,
     "enableDbusIntegration" : true,
-    "config" : "../libvirt-config/test-dbus.xml",
-    "networkConfig" : "../libvirt-config/network.xml",
-    "networkFilterConfig" : "../libvirt-config/network-filter.xml",
     "cpuQuotaForeground" : -1,
     "cpuQuotaBackground" : 1000,
     "runMountPoint" : "/tmp/ut-container",
index bed56de..f4be18d 100644 (file)
@@ -3,9 +3,6 @@
     "vt" : -1,
     "switchToDefaultAfterTimeout" : true,
     "enableDbusIntegration" : false,
-    "config" : "../libvirt-config/test.xml",
-    "networkConfig" : "../libvirt-config/network.xml",
-    "networkFilterConfig" : "../libvirt-config/network-filter.xml",
     "cpuQuotaForeground" : -1,
     "cpuQuotaBackground" : 1000,
     "runMountPoint" : "",
diff --git a/tests/unit_tests/server/configs/ut-container/libvirt-config/network-filter.xml b/tests/unit_tests/server/configs/ut-container/libvirt-config/network-filter.xml
deleted file mode 100644 (file)
index fa1490e..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<filter name='test_network_filter' chain='root'>
-    <uuid>37ec6a98-a8f2-4033-8146-a71deb1f0008</uuid>
-</filter>
-
diff --git a/tests/unit_tests/server/configs/ut-container/libvirt-config/network.xml b/tests/unit_tests/server/configs/ut-container/libvirt-config/network.xml
deleted file mode 100644 (file)
index 42eed9c..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<network>
-    <name>test_network</name>
-    <uuid>6c4977c0-90f3-46eb-98ec-0bcf95619e67</uuid>
-</network>
diff --git a/tests/unit_tests/server/configs/ut-container/libvirt-config/test-dbus.xml.in b/tests/unit_tests/server/configs/ut-container/libvirt-config/test-dbus.xml.in
deleted file mode 100644 (file)
index d927f11..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<domain type="lxc">
-    <name>ut-container-test-dbus</name>
-    <uuid>35bb7989-f222-4b63-b0b1-facbdb05b495</uuid>
-    <memory>102400</memory>
-    <os>
-        <type>exe</type>
-        <init>/bin/sh</init>
-        <initarg>-c</initarg>
-        <initarg>trap exit SIGTERM; /usr/bin/dbus-daemon --config-file=@SC_TEST_CONFIG_INSTALL_DIR@/server/ut-container/ut-dbus.conf --fork; read</initarg>
-    </os>
-    <devices>
-        <console type="pty"/>
-        <filesystem type='mount'>
-            <source dir='/tmp/ut-container'/>
-            <target dir='/var/run'/>
-        </filesystem>
-        <interface type='network'>
-            <source network='test_network'/>
-            <filterref filter='test_network_filter'/>
-        </interface>
-    </devices>
-</domain>
diff --git a/tests/unit_tests/server/configs/ut-container/libvirt-config/test.xml b/tests/unit_tests/server/configs/ut-container/libvirt-config/test.xml
deleted file mode 100644 (file)
index a6bab81..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<domain type="lxc">
-    <name>ut-container-test</name>
-    <uuid>be2e7a5e-c59f-4264-aeab-390cedf47922</uuid>
-    <memory>102400</memory>
-    <os>
-        <type>exe</type>
-        <init>/bin/sh</init>
-        <initarg>-c</initarg>
-        <initarg>trap exit SIGTERM; read</initarg>
-    </os>
-    <devices>
-        <console type="pty"/>
-        <interface type='network'>
-            <source network='test_network'/>
-            <filterref filter='test_network_filter'/>
-        </interface>
-    </devices>
-</domain>
index b32dd81..8f6f37d 100644 (file)
@@ -3,9 +3,6 @@
     "vt" : -1,
     "switchToDefaultAfterTimeout" : true,
     "enableDbusIntegration" : true,
-    "config" : "../libvirt-config/console1-dbus.xml",
-    "networkConfig" : "../libvirt-config/network1.xml",
-    "networkFilterConfig" : "../libvirt-config/network1-filter.xml",
     "cpuQuotaForeground" : -1,
     "cpuQuotaBackground" : 1000,
     "runMountPoint" : "/tmp/ut-containers-manager/console1-dbus",
index 884e56d..02ecd65 100644 (file)
@@ -3,9 +3,6 @@
     "vt" : -1,
     "switchToDefaultAfterTimeout" : true,
     "enableDbusIntegration" : false,
-    "config" : "../libvirt-config/console1.xml",
-    "networkConfig" : "../libvirt-config/network1.xml",
-    "networkFilterConfig" : "../libvirt-config/network1-filter.xml",
     "cpuQuotaForeground" : -1,
     "cpuQuotaBackground" : 1000,
     "runMountPoint" : "",
index 3dda658..f62fac0 100644 (file)
@@ -3,9 +3,6 @@
     "vt" : -1,
     "switchToDefaultAfterTimeout" : false,
     "enableDbusIntegration" : true,
-    "config" : "../libvirt-config/console2-dbus.xml",
-    "networkConfig" : "../libvirt-config/network2.xml",
-    "networkFilterConfig" : "../libvirt-config/network2-filter.xml",
     "cpuQuotaForeground" : -1,
     "cpuQuotaBackground" : 1000,
     "runMountPoint" : "/tmp/ut-containers-manager/console2-dbus",
index 9928914..bbd1cb5 100644 (file)
@@ -3,9 +3,6 @@
     "vt" : -1,
     "switchToDefaultAfterTimeout" : true,
     "enableDbusIntegration" : false,
-    "config" : "../libvirt-config/console2.xml",
-    "networkConfig" : "../libvirt-config/network2.xml",
-    "networkFilterConfig" : "../libvirt-config/network2-filter.xml",
     "cpuQuotaForeground" : -1,
     "cpuQuotaBackground" : 1000,
     "runMountPoint" : "",
index 0128c09..e91ecd9 100644 (file)
@@ -3,9 +3,6 @@
     "vt" : -1,
     "switchToDefaultAfterTimeout" : true,
     "enableDbusIntegration" : true,
-    "config" : "../libvirt-config/console3-dbus.xml",
-    "networkConfig" : "../libvirt-config/network3.xml",
-    "networkFilterConfig" : "../libvirt-config/network3-filter.xml",
     "cpuQuotaForeground" : -1,
     "cpuQuotaBackground" : 1000,
     "runMountPoint" : "/tmp/ut-containers-manager/console3-dbus",
index 8a31b50..cdba7db 100644 (file)
@@ -3,9 +3,6 @@
     "vt" : -1,
     "switchToDefaultAfterTimeout" : true,
     "enableDbusIntegration" : false,
-    "config" : "../libvirt-config/console3.xml",
-    "networkConfig" : "../libvirt-config/network3.xml",
-    "networkFilterConfig" : "../libvirt-config/network3-filter.xml",
     "cpuQuotaForeground" : -1,
     "cpuQuotaBackground" : 1000,
     "runMountPoint" : "",
diff --git a/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console1-dbus.xml.in b/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console1-dbus.xml.in
deleted file mode 100644 (file)
index 3bce659..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<domain type="lxc">
-    <name>ut-containers-manager-console1-dbus</name>
-    <uuid>58184009-b278-4d01-975d-708393690084</uuid>
-    <memory>102400</memory>
-    <os>
-        <type>exe</type>
-        <init>/usr/bin/dbus-daemon</init>
-        <initarg>--nofork</initarg>
-        <initarg>--config-file=@SC_TEST_CONFIG_INSTALL_DIR@/server/ut-containers-manager/ut-dbus.conf</initarg>
-        <initarg>--address=unix:path=/tmp/ut-containers-manager/console1-dbus/dbus/system_bus_socket</initarg>
-    </os>
-    <devices>
-        <console type="pty"/>
-    </devices>
-</domain>
diff --git a/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console1.xml b/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console1.xml
deleted file mode 100644 (file)
index 81ded84..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<domain type="lxc">
-    <name>ut-containers-manager-console1</name>
-    <uuid>d0404a44-426b-40ea-af79-dec41400596f</uuid>
-    <memory>102400</memory>
-    <os>
-        <type>exe</type>
-        <init>/bin/sh</init>
-        <initarg>-c</initarg>
-        <initarg>trap exit SIGTERM; read</initarg>
-    </os>
-    <devices>
-        <console type="pty"/>
-        <interface type='network'>
-            <source network='test-network-1'/>
-            <filterref filter='test-network-1-filter'/>
-        </interface>
-    </devices>
-</domain>
diff --git a/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console2-dbus.xml.in b/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console2-dbus.xml.in
deleted file mode 100644 (file)
index f98c9bd..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<domain type="lxc">
-    <name>ut-containers-manager-console2-dbus</name>
-    <uuid>3d18323e-4ada-4a1b-a907-836701891306</uuid>
-    <memory>102400</memory>
-    <os>
-        <type>exe</type>
-        <init>/usr/bin/dbus-daemon</init>
-        <initarg>--nofork</initarg>
-        <initarg>--config-file=@SC_TEST_CONFIG_INSTALL_DIR@/server/ut-containers-manager/ut-dbus.conf</initarg>
-        <initarg>--address=unix:path=/tmp/ut-containers-manager/console2-dbus/dbus/system_bus_socket</initarg>
-    </os>
-    <devices>
-        <console type="pty"/>
-    </devices>
-</domain>
diff --git a/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console2.xml b/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console2.xml
deleted file mode 100644 (file)
index 90abf67..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<domain type="lxc">
-    <name>ut-containers-manager-console2</name>
-    <uuid>a51ff2fa-cad1-47f8-adbc-09fa5700817a</uuid>
-    <memory>102400</memory>
-    <os>
-        <type>exe</type>
-        <init>/bin/sh</init>
-        <initarg>-c</initarg>
-        <initarg>trap exit SIGTERM; read</initarg>
-    </os>
-    <devices>
-        <console type="pty"/>
-        <interface type='network'>
-            <source network='test-network-2'/>
-            <filterref filter='test-network-2-filter'/>
-        </interface>
-    </devices>
-</domain>
diff --git a/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console3-dbus.xml.in b/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console3-dbus.xml.in
deleted file mode 100644 (file)
index 8175bcf..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<domain type="lxc">
-    <name>ut-containers-manager-console3-dbus</name>
-    <uuid>71cb8511-7474-4e90-865a-3360b7f77254</uuid>
-    <memory>102400</memory>
-    <os>
-        <type>exe</type>
-        <init>/usr/bin/dbus-daemon</init>
-        <initarg>--nofork</initarg>
-        <initarg>--config-file=@SC_TEST_CONFIG_INSTALL_DIR@/server/ut-containers-manager/ut-dbus.conf</initarg>
-        <initarg>--address=unix:path=/tmp/ut-containers-manager/console3-dbus/dbus/system_bus_socket</initarg>
-    </os>
-    <devices>
-        <console type="pty"/>
-    </devices>
-</domain>
diff --git a/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console3.xml b/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console3.xml
deleted file mode 100644 (file)
index 3c08bb2..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<domain type="lxc">
-    <name>ut-containers-manager-console3</name>
-    <uuid>a36f0f39-097e-49fa-a4c9-124b622fba8d</uuid>
-    <memory>102400</memory>
-    <os>
-        <type>exe</type>
-        <init>/bin/sh</init>
-        <initarg>-c</initarg>
-        <initarg>trap exit SIGTERM; read</initarg>
-    </os>
-    <devices>
-        <console type="pty"/>
-        <interface type='network'>
-            <source network='test-network-3'/>
-            <filterref filter='test-network-3-filter'/>
-        </interface>
-    </devices>
-</domain>
diff --git a/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/network1-filter.xml b/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/network1-filter.xml
deleted file mode 100644 (file)
index df0befd..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<filter name='test-network-1-filter' chain='root'>
-    <uuid>37ec6a98-a8f2-4033-8146-a71deb1f0003</uuid>
-</filter>
diff --git a/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/network1.xml b/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/network1.xml
deleted file mode 100644 (file)
index 23a5edd..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<network>
-    <name>test-network-1</name>
-    <uuid>372720ef-258b-4b27-baf6-d08341b15353</uuid>
-</network>
diff --git a/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/network2-filter.xml b/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/network2-filter.xml
deleted file mode 100644 (file)
index 68d7dab..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<filter name='test-network-2-filter' chain='root'>
-    <uuid>37ec6a98-a8f2-4033-8146-a71deb1f0002</uuid>
-</filter>
diff --git a/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/network2.xml b/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/network2.xml
deleted file mode 100644 (file)
index c3b4f04..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<network>
-    <name>test-network-2</name>
-    <uuid>95b9c647-ed3f-4586-886e-0a7b24e683a8</uuid>
-</network>
diff --git a/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/network3-filter.xml b/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/network3-filter.xml
deleted file mode 100644 (file)
index 5e44805..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<filter name='test-network-3-filter' chain='root'>
-    <uuid>37ec6a98-a8f2-4033-8146-a71deb1f0004</uuid>
-</filter>
diff --git a/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/network3.xml b/tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/network3.xml
deleted file mode 100644 (file)
index 7b3f730..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<network>
-    <name>test-network-3</name>
-    <uuid>962b061d-7f3e-410b-8990-3f1267d77656</uuid>
-</network>
diff --git a/tests/unit_tests/server/configs/ut-containers-manager/templates/template-network.xml b/tests/unit_tests/server/configs/ut-containers-manager/templates/template-network.xml
deleted file mode 100644 (file)
index b357c0e..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<network>
-    <name>~NAME~-network</name>
-    <uuid>~UUID~</uuid>
-</network>
diff --git a/tests/unit_tests/server/configs/ut-containers-manager/templates/template-nwfilter.xml b/tests/unit_tests/server/configs/ut-containers-manager/templates/template-nwfilter.xml
deleted file mode 100644 (file)
index b96197b..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<filter name='nwfilter-~NAME~' chain='root'>
-    <uuid>~UUID~</uuid>
-</filter>
index aeed716..1229c12 100644 (file)
@@ -2,9 +2,6 @@
     "privilege" : 20,
     "vt" : -1,
     "switchToDefaultAfterTimeout" : true,
-    "config" : "../libvirt-config/~NAME~.xml",
-    "networkConfig" : "../libvirt-config/~NAME~-network.xml",
-    "networkFilterConfig" : "../libvirt-config/~NAME~-nwfilter.xml",
     "cpuQuotaForeground" : -1,
     "cpuQuotaBackground" : 1000,
     "runMountPoint" : "/tmp/ut-containers-manager/~NAME~-dbus",
diff --git a/tests/unit_tests/server/configs/ut-containers-manager/templates/template.xml.in b/tests/unit_tests/server/configs/ut-containers-manager/templates/template.xml.in
deleted file mode 100644 (file)
index fbb12a5..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<domain type="lxc">
-    <name>~NAME~</name>
-    <uuid>~UUID~</uuid>
-    <memory>102400</memory>
-    <os>
-        <type>exe</type>
-        <init>/usr/bin/dbus-daemon</init>
-        <initarg>--nofork</initarg>
-        <initarg>--config-file=@SC_TEST_CONFIG_INSTALL_DIR@/server/ut-containers-manager/ut-dbus.conf</initarg>
-        <initarg>--address=unix:path=/tmp/ut-containers-manager/~NAME~-dbus/dbus/system_bus_socket</initarg>
-    </os>
-    <devices>
-        <console type="pty"/>
-    </devices>
-</domain>
index 695ed15..f4be18d 100644 (file)
@@ -3,9 +3,6 @@
     "vt" : -1,
     "switchToDefaultAfterTimeout" : true,
     "enableDbusIntegration" : false,
-    "config" : "",
-    "networkConfig" : "@SC_TEST_CONFIG_INSTALL_DIR@/server/ut-network-admin/libvirt-config/buggy-network.xml",
-    "networkFilterConfig" : "@SC_TEST_CONFIG_INSTALL_DIR@/server/ut-network-admin/libvirt-config/buggy-network-filter.xml",
     "cpuQuotaForeground" : -1,
     "cpuQuotaBackground" : 1000,
     "runMountPoint" : "",
index 76492bb..f4be18d 100644 (file)
@@ -3,9 +3,6 @@
     "vt" : -1,
     "switchToDefaultAfterTimeout" : true,
     "enableDbusIntegration" : false,
-    "config" : "",
-    "networkConfig" : "",
-    "networkFilterConfig" : "",
     "cpuQuotaForeground" : -1,
     "cpuQuotaBackground" : 1000,
     "runMountPoint" : "",
index 990da9a..f4be18d 100644 (file)
@@ -3,9 +3,6 @@
     "vt" : -1,
     "switchToDefaultAfterTimeout" : true,
     "enableDbusIntegration" : false,
-    "config" : "",
-    "networkConfig" : "@SC_TEST_CONFIG_INSTALL_DIR@/server/ut-network-admin/libvirt-config/network.xml",
-    "networkFilterConfig" : "@SC_TEST_CONFIG_INSTALL_DIR@/server/ut-network-admin/libvirt-config/network-filter.xml",
     "cpuQuotaForeground" : -1,
     "cpuQuotaBackground" : 1000,
     "runMountPoint" : "",
diff --git a/tests/unit_tests/server/configs/ut-network-admin/libvirt-config/buggy-network-filter.xml b/tests/unit_tests/server/configs/ut-network-admin/libvirt-config/buggy-network-filter.xml
deleted file mode 100644 (file)
index de0f81e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<><TRASHXML>
diff --git a/tests/unit_tests/server/configs/ut-network-admin/libvirt-config/buggy-network.xml b/tests/unit_tests/server/configs/ut-network-admin/libvirt-config/buggy-network.xml
deleted file mode 100644 (file)
index de0f81e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<><TRASHXML>
diff --git a/tests/unit_tests/server/configs/ut-network-admin/libvirt-config/network-filter.xml b/tests/unit_tests/server/configs/ut-network-admin/libvirt-config/network-filter.xml
deleted file mode 100644 (file)
index 658c129..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<filter name='test_network_filter' chain='root'>
-    <uuid>37ec6a98-a8f2-4033-8146-a71deb1f0001</uuid>
-</filter>
-
diff --git a/tests/unit_tests/server/configs/ut-network-admin/libvirt-config/network.xml b/tests/unit_tests/server/configs/ut-network-admin/libvirt-config/network.xml
deleted file mode 100644 (file)
index 573b489..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<network>
-    <name>test_network</name>
-    <uuid>e377280a-06b0-40ee-8042-707481af34de</uuid>
-</network>
index 984e973..dfe7855 100644 (file)
@@ -3,9 +3,6 @@
     "vt" : -1,
     "switchToDefaultAfterTimeout" : true,
     "enableDbusIntegration" : false,
-    "config" : "../libvirt-config/container1.xml",
-    "networkConfig" : "../libvirt-config/network1.xml",
-    "networkFilterConfig" : "../libvirt-config/network1-filter.xml",
     "cpuQuotaForeground" : -1,
     "cpuQuotaBackground" : 1000,
     "runMountPoint" : "",
index d340530..f4be18d 100644 (file)
@@ -3,9 +3,6 @@
     "vt" : -1,
     "switchToDefaultAfterTimeout" : true,
     "enableDbusIntegration" : false,
-    "config" : "../libvirt-config/container2.xml",
-    "networkConfig" : "../libvirt-config/network2.xml",
-    "networkFilterConfig" : "../libvirt-config/network2-filter.xml",
     "cpuQuotaForeground" : -1,
     "cpuQuotaBackground" : 1000,
     "runMountPoint" : "",
index a9d9e97..c52e57d 100644 (file)
@@ -3,9 +3,6 @@
     "vt" : -1,
     "switchToDefaultAfterTimeout" : true,
     "enableDbusIntegration" : false,
-    "config" : "../libvirt-config/container3.xml",
-    "networkConfig" : "../libvirt-config/network3.xml",
-    "networkFilterConfig" : "../libvirt-config/network3-filter.xml",
     "cpuQuotaForeground" : -1,
     "cpuQuotaBackground" : 1000,
     "runMountPoint" : "",
diff --git a/tests/unit_tests/server/configs/ut-server/libvirt-config/container1.xml b/tests/unit_tests/server/configs/ut-server/libvirt-config/container1.xml
deleted file mode 100644 (file)
index 913168b..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<domain type="lxc">
-    <name>ut-server-container1</name>
-    <uuid>ad0785fb-33d7-468d-83a3-948e57418f95</uuid>
-    <memory>102400</memory>
-    <os>
-        <type>exe</type>
-        <init>/bin/sh</init>
-        <initarg>-c</initarg>
-        <initarg>trap exit SIGTERM; read</initarg>
-    </os>
-    <devices>
-        <console type="pty"/>
-        <interface type='network'>
-            <source network='test-network-1'/>
-            <filterref filter='test-network-1-filter'/>
-        </interface>
-    </devices>
-</domain>
diff --git a/tests/unit_tests/server/configs/ut-server/libvirt-config/container2.xml b/tests/unit_tests/server/configs/ut-server/libvirt-config/container2.xml
deleted file mode 100644 (file)
index 904765e..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<domain type="lxc">
-    <name>ut-server-container2</name>
-    <uuid>1f8ddc96-511f-476c-8491-141ba6dfdfab</uuid>
-    <memory>102400</memory>
-    <os>
-        <type>exe</type>
-        <init>/bin/sh</init>
-        <initarg>-c</initarg>
-        <initarg>trap exit SIGTERM; read</initarg>
-    </os>
-    <devices>
-        <console type="pty"/>
-        <interface type='network'>
-            <source network='test-network-2'/>
-            <filterref filter='test-network-2-filter'/>
-        </interface>
-    </devices>
-</domain>
diff --git a/tests/unit_tests/server/configs/ut-server/libvirt-config/container3.xml b/tests/unit_tests/server/configs/ut-server/libvirt-config/container3.xml
deleted file mode 100644 (file)
index 569c592..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<domain type="lxc">
-    <name>ut-server-container3</name>
-    <uuid>42b4984e-a3f3-4c25-add0-21786594d1e9</uuid>
-    <memory>102400</memory>
-    <os>
-        <type>exe</type>
-        <init>/bin/sh</init>
-        <initarg>-c</initarg>
-        <initarg>trap exit SIGTERM; read</initarg>
-    </os>
-    <devices>
-        <console type="pty"/>
-        <interface type='network'>
-            <source network='test-network-3'/>
-            <filterref filter='test-network-3-filter'/>
-        </interface>
-    </devices>
-</domain>
diff --git a/tests/unit_tests/server/configs/ut-server/libvirt-config/network1-filter.xml b/tests/unit_tests/server/configs/ut-server/libvirt-config/network1-filter.xml
deleted file mode 100644 (file)
index b1dc861..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<filter name='test-network-1-filter' chain='root'>
-    <uuid>37ec6a98-a8f2-4033-8146-a71deb1f0006</uuid>
-</filter>
diff --git a/tests/unit_tests/server/configs/ut-server/libvirt-config/network1.xml b/tests/unit_tests/server/configs/ut-server/libvirt-config/network1.xml
deleted file mode 100644 (file)
index 8be267d..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<network>
-    <name>test-network-1</name>
-    <uuid>9df94a88-ab94-4750-98f6-54befefc9ebb</uuid>
-</network>
diff --git a/tests/unit_tests/server/configs/ut-server/libvirt-config/network2-filter.xml b/tests/unit_tests/server/configs/ut-server/libvirt-config/network2-filter.xml
deleted file mode 100644 (file)
index 45911ce..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<filter name='test-network-2-filter' chain='root'>
-    <uuid>37ec6a98-a8f2-4033-8146-a71deb1f0005</uuid>
-</filter>
diff --git a/tests/unit_tests/server/configs/ut-server/libvirt-config/network2.xml b/tests/unit_tests/server/configs/ut-server/libvirt-config/network2.xml
deleted file mode 100644 (file)
index e061d01..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<network>
-    <name>test-network-2</name>
-    <uuid>e471be8c-7687-4e19-8bb0-c0a448e1e975</uuid>
-</network>
diff --git a/tests/unit_tests/server/configs/ut-server/libvirt-config/network3-filter.xml b/tests/unit_tests/server/configs/ut-server/libvirt-config/network3-filter.xml
deleted file mode 100644 (file)
index 84416fb..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<filter name='test-network-3-filter' chain='root'>
-    <uuid>37ec6a98-a8f2-4033-8146-a71deb1f0007</uuid>
-</filter>
diff --git a/tests/unit_tests/server/configs/ut-server/libvirt-config/network3.xml b/tests/unit_tests/server/configs/ut-server/libvirt-config/network3.xml
deleted file mode 100644 (file)
index aa20c71..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<network>
-    <name>test-network-3</name>
-    <uuid>188e15f0-4176-4f93-a113-1a9640de6b66</uuid>
-</network>
index 528d744..40281b8 100644 (file)
@@ -65,7 +65,6 @@ const std::string BUGGY_CONFIG_PATH = SC_TEST_CONFIG_INSTALL_DIR "/server/ut-con
 const std::string BUGGY_FOREGROUND_CONFIG_PATH = SC_TEST_CONFIG_INSTALL_DIR "/server/ut-containers-manager/buggy-foreground-daemon.conf";
 const std::string BUGGY_DEFAULTID_CONFIG_PATH = SC_TEST_CONFIG_INSTALL_DIR "/server/ut-containers-manager/buggy-default-daemon.conf";
 const std::string TEST_CONTAINER_CONF_PATH = SC_TEST_CONFIG_INSTALL_DIR "/server/ut-containers-manager/containers/";
-const std::string TEST_CONTAINER_LIBVIRT_CONF_PATH = SC_TEST_CONFIG_INSTALL_DIR "/server/ut-containers-manager/libvirt-config/";
 const std::string MISSING_CONFIG_PATH = "/this/is/a/missing/file/path/missing-daemon.conf";
 const int EVENT_TIMEOUT = 5000;
 const int TEST_DBUS_CONNECTION_CONTAINERS_COUNT = 3;
@@ -930,9 +929,6 @@ BOOST_AUTO_TEST_CASE(AddContainerTest)
     const std::string newContainerId = "test1234";
     const std::vector<std::string> newContainerConfigs = {
         TEST_CONTAINER_CONF_PATH + newContainerId + ".conf",
-        TEST_CONTAINER_LIBVIRT_CONF_PATH + newContainerId + ".xml",
-        TEST_CONTAINER_LIBVIRT_CONF_PATH + newContainerId + "-network.xml",
-        TEST_CONTAINER_LIBVIRT_CONF_PATH + newContainerId + "-nwfilter.xml",
     };
     FileCleanerRAII cleaner(newContainerConfigs);
 
index 5914cc7..a752d77 100644 (file)
@@ -17,7 +17,7 @@
 # @author Lukasz Pawelczyk (l.pawelczyk@partner.samsung.com)
 #
 
-MESSAGE(STATUS "Installing configs for the Utils Unit Tests to " ${SC_CONFIG_INSTALL_DIR})
+MESSAGE(STATUS "Installing configs for the Utils Unit Tests to " ${SC_TEST_CONFIG_INSTALL_DIR})
 FILE(GLOB fs_CONF ut-fs/*.txt)