admin/one
1
0 Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2026-11-15 01:03:14 +09:00
Code Issues Packages Projects Releases Wiki Activity

B #2241: Change PHY_DEV mandatory'ness for ovswitch. Do not require bridge when

Browse Source 
it is generated.
This commit is contained in:
Ruben S. Montero committed 2018-07-04 11:07:23 +02:00
1 parent e651040137
commit b5443ed18d
1 file changed
+13 -12
Download Patch File Download Diff File Expand all files Collapse all files
src/vnm/VirtualNetwork.cc
+13 -12
View File
@@ -122,19 +122,21 @@ void VirtualNetwork::parse_vlan_id(const char * id_name, const char * auto_name,
//-------------------------------------------------------------------------------
//-------------------------------------------------------------------------------
/*
/*
LIST OF MANDAROTY ARGUMENTS FOR NETWORK DEFINITION
+----------------+---------+--------+--------------------------+----------------+
| Driver | PHYDEV | BRIDGE | VLAN_ID | OTHER |
+----------------+---------+--------+--------------------------+----------------+
| vcenter | no | yes | no | VCENTER_NET_REF|
| dummy | no | yes | no | |
| bridge | no | yes | no | |
| ebtables | no | yes | no | |
| fw | no | yes | no | |
| 802.1q | yes | opt | yes or AUTOMATIC | |
| vxlan | yes | opt | yes or AUTOMATIC | |
| ovswitch | yes | opt | yes or AUTOMATIC | |
| ovswitch_vxlan | yes | opt | OUTER or AUTOMATIC_OUTER | |
| bridge | no | no | no | |
| ebtables | no | no | no | |
| fw | no | no | no | |
| 802.1q | yes | no | yes or AUTOMATIC | |
| vxlan | yes | no | yes or AUTOMATIC | |
| ovswitch | no | no | yes or AUTOMATIC | |
| ovswitch_vxlan | yes | no | OUTER or AUTOMATIC_OUTER | |
+----------------+---------+--------+--------------------------+----------------+
*/
int VirtualNetwork::parse_phydev_vlans(string& estr)
@@ -153,9 +155,6 @@ int VirtualNetwork::parse_phydev_vlans(string& estr)
other.push_back("VCENTER_NET_REF");
case VirtualNetwork::DUMMY:
case VirtualNetwork::BRIDGE:
case VirtualNetwork::EBTABLES:
case VirtualNetwork::FW:
check_bridge = true;
break;
@@ -168,8 +167,10 @@ int VirtualNetwork::parse_phydev_vlans(string& estr)
case VirtualNetwork::OVSWITCH_VXLAN:
check_outer = true;
case VirtualNetwork::BRIDGE:
case VirtualNetwork::OVSWITCH:
check_phydev = true;
case VirtualNetwork::EBTABLES:
case VirtualNetwork::FW:
break;
case VirtualNetwork::NONE: