Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
CIRCLE
/
vmdriver
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
2
Merge Requests
0
Wiki
Members
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
e8f0b363
authored
Jun 06, 2014
by
Guba Sándor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
netdriver: removed bridge_add and set_vlan when native_ovs enabled
parent
6fbd63b8
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
7 deletions
+9
-7
netdriver.py
+9
-7
No files found.
netdriver.py
View file @
e8f0b363
...
@@ -5,7 +5,7 @@ import logging
...
@@ -5,7 +5,7 @@ import logging
from
netcelery
import
celery
from
netcelery
import
celery
from
os
import
getenv
from
os
import
getenv
from
vm
import
VMNetwork
from
vm
import
VMNetwork
from
vmcelery
import
native_ovs
driver
=
getenv
(
"HYPERVISOR_TYPE"
,
"test"
)
driver
=
getenv
(
"HYPERVISOR_TYPE"
,
"test"
)
...
@@ -212,10 +212,11 @@ def port_create(network):
...
@@ -212,10 +212,11 @@ def port_create(network):
if
driver
==
"test"
:
if
driver
==
"test"
:
add_tuntap_interface
(
network
.
name
)
add_tuntap_interface
(
network
.
name
)
# Create the port for virtual network
if
not
native_ovs
:
add_port_to_bridge
(
network
.
name
,
network
.
bridge
)
# Create the port for virtual network
# Set VLAN parameter for tap interface
add_port_to_bridge
(
network
.
name
,
network
.
bridge
)
set_port_vlan
(
network
.
name
,
network
.
vlan
)
# Set VLAN parameter for tap interface
set_port_vlan
(
network
.
name
,
network
.
vlan
)
# Clear all old rules
# Clear all old rules
clear_port_rules
(
network
)
clear_port_rules
(
network
)
...
@@ -246,8 +247,9 @@ def port_delete(network):
...
@@ -246,8 +247,9 @@ def port_delete(network):
# Clear all port rules
# Clear all port rules
clear_port_rules
(
network
)
clear_port_rules
(
network
)
# Delete port
if
not
native_ovs
:
del_port_from_bridge
(
network
.
name
)
# Delete port
del_port_from_bridge
(
network
.
name
)
# For testing purpose dele tuntap iface
# For testing purpose dele tuntap iface
if
driver
==
"test"
:
if
driver
==
"test"
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment