shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-01-28 17:47:03 +03:00
Code Releases Wiki Activity

feature #2160: Generate NETWORK context in OpenNebula core

Browse Source
This commit is contained in:
Ruben S. Montero 2013-07-08 18:13:16 +02:00
parent ee9ed1187a
commit ba27ad005b
2 changed files with 88 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/cli/one_helper.rb
View File

@ -760,26 +760,8 @@ EOT
end
end
if options[:net_context] && options[:nic]
nets=options[:nic].map {|n| parse_user_object(n).last }
if nets!=nets.uniq
STDERR.puts "Network context generation from command "<<
"line is not supported for VMs with\n"<<
"more than one network with the same name."
exit(-1)
end
nets.each_with_index do |name, index|
lines<<"ETH#{index}_IP = \"$NIC[IP, NETWORK=\\\"#{name}\\\"]\""
lines<<"ETH#{index}_NETWORK = \"$NETWORK[NETWORK_ADDRESS, NETWORK=\\\"#{name}\\\"]\""
lines<<"ETH#{index}_MASK = \"$NETWORK[NETWORK_MASK, NETWORK=\\\"#{name}\\\"]\""
lines<<"ETH#{index}_GATEWAY = \"$NETWORK[GATEWAY, NETWORK=\\\"#{name}\\\"]\""
lines<<"ETH#{index}_DNS = \"$NETWORK[DNS, NETWORK=\\\"#{name}\\\"]\""
lines<<"ETH#{index}_IPV6 = \"$NIC[IP6_GLOBAL, NETWORK=\\\"#{name}\\\"]\""
lines<<"ETH#{index}_GATEWAY6 = \"$NETWORK[GATEWAY6, NETWORK=\\\"#{name}\\\"]\""
lines<<"ETH#{index}_CONTEXT_FORCE_IPV4 = \"$NETWORK[CONTEXT_FORCE_IPV4, NETWORK=\\\"#{name}\\\"]\""
end
if options[:net_context]
lines << "NETWORK = \"YES\""
end
lines+=options[:context] if options[:context]

87
src/vm/VirtualMachine.cc
View File

@ -642,6 +642,90 @@ int VirtualMachine::parse_context(string& error_str)
context->remove("FILES_DS");
// ----------- Inject Network context in marshalled string ----------------
bool net_context;
context->vector_value("NETWORK", net_context);
if (net_context)
{
vector<Attribute * > v_attributes;
VectorAttribute * vatt;
int num_vatts = obj_template->get("NIC", v_attributes);
for(int i=0; i<num_vatts; i++)
{
vatt = dynamic_cast<VectorAttribute * >(v_attributes[i]);
if ( vatt == 0 )
{
continue;
}
string name = vatt->vector_value("NETWORK");
string ip = vatt->vector_value("IP");
string ip6 = vatt->vector_value("IP6_GLOBAL");
string nic_id = vatt->vector_value("NIC_ID");
ostringstream var;
ostringstream val;
var << "ETH" << nic_id << "_IP";
context->replace(var.str(), ip);
var.str(""); val.str("");
var << "ETH" << nic_id << "_NETWORK";
val << "$NETWORK[NETWORK_ADDRESS, NETWORK=\"" << name << "\"]";
context->replace(var.str(), val.str());
var.str(""); val.str("");
var << "ETH" << nic_id << "_MASK";
val << "$NETWORK[NETWORK_MASK, NETWORK=\"" << name << "\"]";
context->replace(var.str(), val.str());
var.str(""); val.str("");
var << "ETH" << nic_id << "_GATEWAY";
val << "$NETWORK[GATEWAY, NETWORK=\"" << name << "\"]";
context->replace(var.str(), val.str());
var.str(""); val.str("");
var << "ETH" << nic_id << "_GATEWAY";
val << "$NETWORK[GATEWAY, NETWORK=\"" << name << "\"]";
context->replace(var.str(), val.str());
var.str(""); val.str("");
var << "ETH" << nic_id << "_DNS";
val << "$NETWORK[DNS, NETWORK=\"" << name << "\"]";
context->replace(var.str(), val.str());
if (!ip6.empty())
{
var.str(""); val.str("");
var << "ETH" << nic_id << "_IP6";
context->replace(var.str(), ip6);
var.str(""); val.str("");
var << "ETH" << nic_id << "_GATEWAY6";
val << "$NETWORK[GATEWAY6, NETWORK=\"" << name << "\"]";
context->replace(var.str(), val.str());
var.str(""); val.str("");
var << "ETH" << nic_id << "_CONTEXT_FORCE_IPV4";
val << "$NETWORK[CONTEXT_FORCE_IPV4, NETWORK=\"" << name << "\"]";
context->replace(var.str(), val.str());
}
}
}
// -------------------------------------------------------------------------
// Parse CONTEXT variables & free vector attributes
// -------------------------------------------------------------------------
@ -754,7 +838,8 @@ int VirtualMachine::parse_context(string& error_str)
if ( endpoint.empty() )
{
error_str = "CONTEXT/TOKEN set, but OneGate endpoint was not defined in oned.conf or CONTEXT.";
error_str = "CONTEXT/TOKEN set, but OneGate endpoint was not "
"defined in oned.conf or CONTEXT.";
return -1;
}
else