Merge branch 'feature-413'

This commit is contained in:
Ruben S. Montero committed 2010-11-23 14:15:13 +01:00
commit 834da76d93
1 file changed
+8
+8
View File
@@ -55,6 +55,7 @@ int XenDriver::deployment_description(
const VectorAttribute * nic;
string ip = "";
string mac = "";
string bridge = "";
string model = "";
@@ -346,6 +347,7 @@ int XenDriver::deployment_description(
file << " '";
ip = nic->vector_value("IP");
mac = nic->vector_value("MAC");
bridge = nic->vector_value("BRIDGE");
model = nic->vector_value("MODEL");
@@ -362,6 +364,12 @@ int XenDriver::deployment_description(
pre_char = ',';
}
if( !ip.empty() )
{
file << pre_char << "ip=" << ip;
pre_char = ',';
}
if( !bridge.empty() )
{
file << pre_char << "bridge=" << bridge;