Revision 54082e6a
Added by Vincent MEMBRÉ almost 7 years ago
| inventory-fusion/src/main/scala/com/normation/inventory/provisioning/fusion/FusionReportUnmarshaller.scala | ||
|---|---|---|
|
)
|
||
|
}
|
||
|
|
||
|
|
||
|
(xml \\ "RUDDER").headOption match {
|
||
|
case Some(rudder) =>
|
||
|
// Fetch all the agents configuration
|
||
| ... | ... | |
|
policyServerId <- boxFromOption(optText(agentXML \\ "POLICY_SERVER_UUID") ,"could not parse policy server id (tag POLICY_SERVER_UUID) from specific inventory")
|
||
|
} yield {
|
||
|
//cfkey is not mandatory
|
||
|
val cfKey = optText(agentXML \ "CFENGINE_KEY")
|
||
|
|
||
|
(agentType, rootUser, policyServerId, cfKey)
|
||
|
val agentKey = optText(agentXML \ "AGENT_KEY").orElse(optText(agentXML \ "CFENGINE_KEY"))
|
||
|
(agentType, rootUser, policyServerId, agentKey)
|
||
|
}
|
||
|
agent match {
|
||
|
case eb: EmptyBox =>
|
||
| ... | ... | |
|
}
|
||
|
}
|
||
|
|
||
|
|
||
|
object OptText {
|
||
|
/*
|
||
|
* A method that retrieve the text value of an XML and
|
||
| inventory-fusion/src/test/resources/fusion-report/dsc-agent.ocs | ||
|---|---|---|
|
<RUDDER>
|
||
|
<AGENT>
|
||
|
<AGENT_NAME>windows-dsc</AGENT_NAME>
|
||
|
<CFENGINE_KEY>-----BEGIN RSA PUBLIC KEY-----
|
||
|
<AGENT_KEY>-----BEGIN RSA PUBLIC KEY-----
|
||
|
MIIBCAKCAQEAp8XambRZMLpI9wCqkeZNGQuG02wjjiQD9NIUrESkcfMYZ5qvLhX1
|
||
|
bjufiDTbs1M2ySEGGCDHJN991C67kvPvstFtKx+w8m6DBC9DkpwLR0wGgWN0VCqC
|
||
|
cG8UwJIRz9SrPTQKRLFWI/fl8b92xcZvDPVXv1r0yS75toX3Ja4dBwyOqaiUGLBO
|
||
|
kOpwXSfrmHJ16IDWwLUZlesfomgCyzfZ8AUuTOX7JbvxLI9neXysoueXqDMIXklS
|
||
|
013pCqdZW/kCp3/aPwBjoK5EFnR8XxVLCGSXGXz6JG2Nng7ox8bbjm0VurFQErce
|
||
|
VyodQDN1ecAsViRI1V18Z+PvZll8isonWQIBIw==
|
||
|
-----END RSA PUBLIC KEY-----</CFENGINE_KEY>
|
||
|
-----END RSA PUBLIC KEY-----</AGENT_KEY>
|
||
|
<OWNER>agent1\vagrant</OWNER>
|
||
|
<POLICY_SERVER_HOSTNAME>192.168.42.0</POLICY_SERVER_HOSTNAME>
|
||
|
<POLICY_SERVER_UUID>root</POLICY_SERVER_UUID></AGENT>
|
||
Also available in: Unified diff
Fixes #10824: Parse AGENT_KEY instead of CFENGINE_KEY in inventory