From 4019fbbe44260e19bd1f335425f5256034cbe350 Mon Sep 17 00:00:00 2001
From: Piotr Bartosiewicz
Date: Wed, 5 Nov 2014 15:00:03 +0100
Subject: [PATCH 01/16] Lxc server configs, missing ContainerAdmin stuff
WORK IN PROGRESS
[Bug/Feature] N/A
[Cause] N/A
[Solution] N/A
[Verification] All tests should pass
Change-Id: I87505823a5b1c543ee495ede010430bb8c745736
---
common/lxc/domain.cpp | 81 ++++-
common/lxc/domain.hpp | 29 +-
packaging/security-containers.spec | 2 +
server/configs/CMakeLists.txt | 4 +
server/configs/containers/business.conf | 2 +-
server/configs/containers/private.conf | 2 +-
server/configs/daemon.conf | 4 +-
server/configs/lxc-templates/business.sh | 38 ++
server/configs/lxc-templates/private.sh | 38 ++
server/container-admin.cpp | 300 +++-------------
server/container-admin.hpp | 92 +----
tests/unit_tests/lxc/ut-domain.cpp | 152 ++++++--
tests/unit_tests/server/configs/CMakeLists.txt | 10 -
.../containers/{buggy.conf.in => buggy.conf} | 3 +
.../ut-container-admin/containers/missing.conf | 3 +
...t-no-shutdown.conf.in => test-no-shutdown.conf} | 3 +
.../containers/{test.conf.in => test.conf} | 3 +
tests/unit_tests/server/ut-container-admin.cpp | 396 +++++++--------------
tests/unit_tests/server/ut-container.cpp | 13 +-
19 files changed, 490 insertions(+), 685 deletions(-)
create mode 100755 server/configs/lxc-templates/business.sh
create mode 100755 server/configs/lxc-templates/private.sh
rename tests/unit_tests/server/configs/ut-container-admin/containers/{buggy.conf.in => buggy.conf} (71%)
rename tests/unit_tests/server/configs/ut-container-admin/containers/{test-no-shutdown.conf.in => test-no-shutdown.conf} (71%)
rename tests/unit_tests/server/configs/ut-container-admin/containers/{test.conf.in => test.conf} (65%)
diff --git a/common/lxc/domain.cpp b/common/lxc/domain.cpp
index 07b7c77..0959959 100644
--- a/common/lxc/domain.cpp
+++ b/common/lxc/domain.cpp
@@ -30,9 +30,23 @@
#include
#include
+#include