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

F #1807: Changed error message

Browse Source
This commit is contained in:
juanmont 2018-04-27 16:02:49 +02:00 committed by Ruben S. Montero
parent 39e55e86f6
commit c903345806
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/VirtualNetwork.h
View File

@ -580,7 +580,7 @@ private:
string& id, bool& auto_id);
/**
* Check consistency of PHY_DEV, BRIDGE and VLAN attributes depending on
* Check consistency of PHYDEV, BRIDGE and VLAN attributes depending on
* the network driver
* @param error_str describing the error
* @return 0 on success -1 otherwise
@ -676,7 +676,7 @@ private:
int from_xml(const string &xml_str);
/**
* Updates the BRIDGE, PHY_DEV, and VLAN_ID attributes.
* Updates the BRIDGE, PHYDEV, and VLAN_ID attributes.
* @param error string describing the error if any
* @return 0 on success
*/

4
src/vnm/VirtualNetwork.cc
View File

@ -124,7 +124,7 @@ void VirtualNetwork::parse_vlan_id(const char * id_name, const char * auto_name,
//-------------------------------------------------------------------------------
/*
+----------------+---------+--------+--------------------------+----------------+
| Driver | PHY_DEV | BRIDGE | VLAN_ID | OTHER |
| Driver | PHYDEV | BRIDGE | VLAN_ID | OTHER |
+----------------+---------+--------+--------------------------+----------------+
| vcenter | no | yes | no | VCENTER_NET_REF|
| dummy | no | yes | no | |
@ -176,7 +176,7 @@ int VirtualNetwork::parse_phydev_vlans(string& estr)
if ( check_phydev && phydev.empty())
{
estr = "PHY_DEV is mandatory for driver " + vn_mad;
estr = "PHYDEV is mandatory for driver " + vn_mad;
return -1;
}