tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-27 07:34:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cli: Add repository add --{zone,template} support for repo objects

Browse Source 
refs #7255
This commit is contained in:
Michael Friedrich 2014-10-23 19:06:02 +02:00
parent 7f0ced592c
commit 27b15a5714
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/cli/repositoryobjectcommand.cpp
View File

@ -120,7 +120,15 @@ void RepositoryObjectCommand::InitParameters(boost::program_options::options_des
boost::program_options::options_description& hiddenDesc) const boost::program_options::options_description& hiddenDesc) const
{ {
visibleDesc.add_options() visibleDesc.add_options()
("name", po::value<std::string>(), "The name of the object")
("zone", po::value<std::string>(), "The name of the zone, e.g. the agent where this object is bound to")
("template", po::value<std::string>(), "Import the defined template into the object. This template must be defined and included separately in Icinga 2")
("name", po::value<std::string>(), "The name of the object"); ("name", po::value<std::string>(), "The name of the object");
if (m_Type == "Service") {
visibleDesc.add_options()
("host", po::value<std::string>(), "The host name related to this service object");
}
} }
std::vector<String> RepositoryObjectCommand::GetPositionalSuggestions(const String& word) const std::vector<String> RepositoryObjectCommand::GetPositionalSuggestions(const String& word) const
@ -164,6 +172,12 @@ int RepositoryObjectCommand::Run(const boost::program_options::variables_map& vm
<< "Cannot parse passed attributes for object '" << name << "': " << boost::algorithm::join(tokens, "="); << "Cannot parse passed attributes for object '" << name << "': " << boost::algorithm::join(tokens, "=");
} }
if (vm.count("zone"))
attr->Set("zone", String(vm["zone"].as<std::string>()));
if (vm.count("template"))
attr->Set("templates", String(vm["template"].as<std::string>()));
if (m_Command == RepositoryCommandList) { if (m_Command == RepositoryCommandList) {
RepositoryUtility::PrintObjects(std::cout, m_Type); RepositoryUtility::PrintObjects(std::cout, m_Type);
} }

12
lib/cli/repositoryutility.cpp
View File

@ -370,9 +370,17 @@ void RepositoryUtility::CollectChange(const Dictionary::Ptr& change, Array::Ptr&
void RepositoryUtility::SerializeObject(std::ostream& fp, const String& name, const String& type, const Dictionary::Ptr& object) void RepositoryUtility::SerializeObject(std::ostream& fp, const String& name, const String& type, const Dictionary::Ptr& object)
{ {
fp << "object " << type << " \"" << name << "\" {\n"; fp << "object " << type << " \"" << name << "\" {\n";
if (object->Contains("templates"))
fp << "\t" << "import \"" << object->Get("templates") << "\"\n";
BOOST_FOREACH(const Dictionary::Pair& kv, object) { BOOST_FOREACH(const Dictionary::Pair& kv, object) {
fp << "\t" << kv.first << " = "; if (kv.first == "templates") {
FormatValue(fp, kv.second); continue;
} else {
fp << "\t" << kv.first << " = ";
FormatValue(fp, kv.second);
}
fp << "\n"; fp << "\n";
} }
fp << "}\n"; fp << "}\n";