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

M #-: Improve error message in VNET creation

Browse Source 
(cherry picked from commit 50ee33410b165b07b76b11904d4a7a59a8492ad4)
This commit is contained in:
Tino Vazquez 2019-06-24 17:53:24 +02:00
parent a8bd219442
commit eea1ac18bd
No known key found for this signature in database
GPG Key ID: 2FE9C32E94AEABBE
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/vnm/VirtualNetwork.cc
View File

@ -124,7 +124,7 @@ void VirtualNetwork::parse_vlan_id(const char * id_name, const char * auto_name,
//-------------------------------------------------------------------------------
//-------------------------------------------------------------------------------
/*
/*
LIST OF MANDATORY ARGUMENTS FOR NETWORK DEFINITION
+----------------+---------+--------+--------------------------+----------------+
@ -141,8 +141,8 @@ LIST OF MANDATORY ARGUMENTS FOR NETWORK DEFINITION
| ovswitch_vxlan | yes | no | OUTER or AUTOMATIC_OUTER | |
+----------------+---------+--------+--------------------------+----------------+
*/
int VirtualNetwork::parse_phydev_vlans(const Template* tmpl, const string& vn_mad, const string& phydev,
const string& bridge, const bool auto_id, const string& vlan_id,
int VirtualNetwork::parse_phydev_vlans(const Template* tmpl, const string& vn_mad, const string& phydev,
const string& bridge, const bool auto_id, const string& vlan_id,
const bool auto_outer, const string& outer_id, string& estr)
{
bool check_phydev = false;
@ -190,7 +190,7 @@ int VirtualNetwork::parse_phydev_vlans(const Template* tmpl, const string& vn_ma
if ( check_vlan && !auto_id && vlan_id.empty() )
{
estr = "VLAN_ID (or AUTOMATIC) is mandatory for driver " + vn_mad;
estr = "VLAN_ID (or AUTOMATIC_VLAN_ID) is mandatory for driver " + vn_mad;
return -1;
}
@ -212,12 +212,12 @@ int VirtualNetwork::insert(SqlDB * db, string& error_str)
ostringstream ose;
string sg_str, vis;
string value;
string name;
string prefix;
int rc, num_ars;
ostringstream oss;
@ -233,7 +233,7 @@ int VirtualNetwork::insert(SqlDB * db, string& error_str)
{
obj_template->add("TEMPLATE_ID", value);
}
obj_template->get("NAME",name);
obj_template->erase("NAME");
@ -294,7 +294,7 @@ int VirtualNetwork::insert(SqlDB * db, string& error_str)
// -------------------------------------------------------------------------
// Check consistency for PHYDEV, BRIDGE and VLAN_IDs based on the driver
// -------------------------------------------------------------------------
rc = parse_phydev_vlans(obj_template, vn_mad, phydev, bridge, vlan_id_automatic, vlan_id,
rc = parse_phydev_vlans(obj_template, vn_mad, phydev, bridge, vlan_id_automatic, vlan_id,
outer_vlan_id_automatic, outer_vlan_id, error_str);
if (rc != 0)