aboutsummaryrefslogtreecommitdiff
path: root/bbot/manifest
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2017-04-10 13:17:22 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2017-04-10 13:17:22 +0200
commitf5a74f868477c484a58f9deb7435afa88efaefa0 (patch)
tree1f48ba750354c6cce0676054da60d6d19ede1f8b /bbot/manifest
parent294058e21e33c7bfbb852f8f1a73b1555aa3eace (diff)
Split machine_manifest into machine_header_manifest and machine_manifest
Diffstat (limited to 'bbot/manifest')
-rw-r--r--bbot/manifest26
1 files changed, 10 insertions, 16 deletions
diff --git a/bbot/manifest b/bbot/manifest
index 4a5d449..c5a321a 100644
--- a/bbot/manifest
+++ b/bbot/manifest
@@ -21,35 +21,29 @@
namespace bbot
{
- enum class machine_type {kvm, nspawn};
-
- class LIBBBOT_EXPORT machine_manifest
+ class LIBBBOT_EXPORT machine_header_manifest
{
public:
- // A "machine header".
- //
std::string id;
std::string name;
std::string summary;
- butl::optional<machine_type> type;
-
- machine_manifest (std::string i, std::string n, std::string s)
+ machine_header_manifest (std::string i, std::string n, std::string s)
: id (std::move (i)), name (std::move (n)), summary (std::move (s)) {}
public:
- machine_manifest () = default; // VC export.
- machine_manifest (butl::manifest_parser&, bool ignore_unknown = false);
- machine_manifest (butl::manifest_parser&,
- butl::manifest_name_value start,
- bool header_only = false,
- bool ignore_unknown = false);
+ machine_header_manifest () = default; // VC export.
+ machine_header_manifest (butl::manifest_parser&,
+ bool ignore_unknown = false);
+ machine_header_manifest (butl::manifest_parser&,
+ butl::manifest_name_value start,
+ bool ignore_unknown = false);
void
serialize (butl::manifest_serializer&) const;
};
- using machine_manifests = std::vector<machine_manifest>;
+ using machine_header_manifests = std::vector<machine_header_manifest>;
class LIBBBOT_EXPORT task_request_manifest
{
@@ -66,7 +60,7 @@ namespace bbot
//
std::string fingerprint;
- machine_manifests machines; // Only machine headers.
+ machine_header_manifests machines;
public:
task_request_manifest () = default; // VC export.