1
0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-23 22:50:09 +03:00

M #-: Add EXTERNAL NIC attribute to short_body

This commit is contained in:
Ruben S. Montero 2021-01-25 17:52:00 +01:00
parent b626e5e126
commit 9bd36d803c
No known key found for this signature in database
GPG Key ID: A0CEA6FA880A1D87

View File

@ -167,9 +167,10 @@ void VirtualMachineNic::to_xml_short(std::ostringstream& oss) const
std::string ip = vector_value("IP");
std::string ip6 = vector_value("IP6");
std::string ip6_ula = vector_value("IP6_ULA");
std::string ip6_link = vector_value("IP6_LINK");
std::string ip6_global = vector_value("IP6_GLOBAL");
std::string ip6_link = vector_value("IP6_LINK");
std::string ip6_global = vector_value("IP6_GLOBAL");
std::string ip_external = vector_value("EXTERNAL"); /* PROVISION AWS_IPAM */
std::string reqs = vector_value("SCHED_REQUIREMENTS");
std::string rank = vector_value("SCHED_RANK");
@ -182,6 +183,11 @@ void VirtualMachineNic::to_xml_short(std::ostringstream& oss) const
oss << "<IP>" << one_util::escape_xml(ip) << "</IP>";
}
if (!ip_external.empty())
{
oss << "<EXTERNAL>" << one_util::escape_xml(ip_external) << "</EXTERNAL>";
}
if (!ip6.empty())
{
oss << "<IP6>" << one_util::escape_xml(ip6) << "</IP6>";