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

development: Fix bug at parse_phydev_vlans

Browse Source
This commit is contained in:
Christian González 2018-11-22 10:33:37 +01:00 committed by Ruben S. Montero
parent d777060a1b
commit 400a6d92d9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/VirtualNetwork.h
View File

@ -173,7 +173,7 @@ public:
* @param error_str describing the error
* @return 0 on success -1 otherwise
*/
static int parse_phydev_vlans(const Template& tmpl, const string& vn_mad, const string& phydev,
static int 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);

4
src/vnm/VirtualNetwork.cc
View File

@ -141,7 +141,7 @@ 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,
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)
{
@ -213,7 +213,7 @@ int VirtualNetwork::parse_phydev_vlans(const Template& tmpl, const string& vn_ma
for ( it = other.begin(); it != other.end() ; ++it)
{
if (!tmpl.get((*it).c_str(), value))
if (!tmpl->get((*it).c_str(), value))
{
estr = *it + " is mandatory for driver " + vn_mad;
return -1;