shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-16 22:50:10 +03:00
Code Releases Wiki Activity

Feature #4620: Minor fixes

Browse Source
This commit is contained in:
Carlos Martín 2016-07-18 18:54:15 +02:00
parent 69ab761fad
commit 73ff900acb
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/VirtualNetwork.h
View File

@ -347,19 +347,6 @@ public:
int vrid,
const vector<string>& inherit_attrs);
/**
* Modifies the given address attribute adding the following attributes:
* * IP: leased from network
* * MAC: leased from network
* * BRIDGE: for this virtual network
* @param address attribute for the VM template
* @param vid of the VM getting the lease
* @return 0 on success
*/
int address_attribute(
VectorAttribute * addr,
int vid);
/**
* From a Security Group rule that uses this vnet, creates a new rule
* copy for each AR.

9
src/vm/VirtualMachine.cc
View File

@ -148,7 +148,7 @@ const char * VirtualMachine::NETWORK_CONTEXT[][2] = {
{"VLAN_ID", "VLAN_ID"},
{"VROUTER_IP", "VROUTER_IP"},
{"VROUTER_MANAGEMENT", "VROUTER_MANAGEMENT"}};
const int VirtualMachine::NUM_NETWORK_CONTEXT = 10;
const int VirtualMachine::NUM_NETWORK_CONTEXT = 11;
const char* VirtualMachine::NETWORK6_CONTEXT[][2] = {
{"IP6", "IP6_GLOBAL"},
@ -1678,13 +1678,14 @@ error_nic:
error_pci:
if (rc == -1)
{
oss << "Incompatible clusters in PCI (TYPE=NIC). It is is not the same"
<< " as the one used by other VM elements (cluster "
oss << "Incompatible clusters in PCI (TYPE=NIC). Network for PCI "<< incomp_id
<< " is not the same as the one used by other VM elements (cluster "
<< one_util::join(cluster_ids, ',') << ")";
}
else
{
oss << "Missing clusters. Network for PCI device of TYPE=NIC";
oss << "Missing clusters. Network for PCI "<< incomp_id
<< " is not in any cluster";
}
goto error_common;