Merge "fullstack: Remove ovsdb_interface config opt"
This commit is contained in:
commit
3458173d5f
|
@ -169,7 +169,6 @@ class OVSConfigFixture(ConfigFixture):
|
||||||
'local_ip': local_ip,
|
'local_ip': local_ip,
|
||||||
'integration_bridge': self._generate_integration_bridge(),
|
'integration_bridge': self._generate_integration_bridge(),
|
||||||
'of_interface': host_desc.of_interface,
|
'of_interface': host_desc.of_interface,
|
||||||
'ovsdb_interface': host_desc.ovsdb_interface,
|
|
||||||
},
|
},
|
||||||
'securitygroup': {
|
'securitygroup': {
|
||||||
'firewall_driver': host_desc.firewall_driver,
|
'firewall_driver': host_desc.firewall_driver,
|
||||||
|
|
|
@ -62,7 +62,7 @@ class HostDescription(object):
|
||||||
under?
|
under?
|
||||||
"""
|
"""
|
||||||
def __init__(self, l3_agent=False, dhcp_agent=False,
|
def __init__(self, l3_agent=False, dhcp_agent=False,
|
||||||
of_interface='ovs-ofctl', ovsdb_interface='vsctl',
|
of_interface='ovs-ofctl',
|
||||||
l2_agent_type=constants.AGENT_TYPE_OVS,
|
l2_agent_type=constants.AGENT_TYPE_OVS,
|
||||||
firewall_driver='noop', availability_zone=None,
|
firewall_driver='noop', availability_zone=None,
|
||||||
l3_agent_mode=None):
|
l3_agent_mode=None):
|
||||||
|
@ -70,7 +70,6 @@ class HostDescription(object):
|
||||||
self.l3_agent = l3_agent
|
self.l3_agent = l3_agent
|
||||||
self.dhcp_agent = dhcp_agent
|
self.dhcp_agent = dhcp_agent
|
||||||
self.of_interface = of_interface
|
self.of_interface = of_interface
|
||||||
self.ovsdb_interface = ovsdb_interface
|
|
||||||
self.firewall_driver = firewall_driver
|
self.firewall_driver = firewall_driver
|
||||||
self.availability_zone = availability_zone
|
self.availability_zone = availability_zone
|
||||||
self.l3_agent_mode = l3_agent_mode
|
self.l3_agent_mode = l3_agent_mode
|
||||||
|
|
|
@ -39,7 +39,6 @@ LOG = logging.getLogger(__name__)
|
||||||
class BaseConnectivitySameNetworkTest(base.BaseFullStackTestCase):
|
class BaseConnectivitySameNetworkTest(base.BaseFullStackTestCase):
|
||||||
|
|
||||||
of_interface = None
|
of_interface = None
|
||||||
ovsdb_interface = None
|
|
||||||
arp_responder = False
|
arp_responder = False
|
||||||
use_dhcp = True
|
use_dhcp = True
|
||||||
|
|
||||||
|
@ -53,7 +52,6 @@ class BaseConnectivitySameNetworkTest(base.BaseFullStackTestCase):
|
||||||
environment.HostDescription(
|
environment.HostDescription(
|
||||||
l3_agent=self.l2_pop,
|
l3_agent=self.l2_pop,
|
||||||
of_interface=self.of_interface,
|
of_interface=self.of_interface,
|
||||||
ovsdb_interface=self.ovsdb_interface,
|
|
||||||
l2_agent_type=self.l2_agent_type,
|
l2_agent_type=self.l2_agent_type,
|
||||||
dhcp_agent=self.use_dhcp,
|
dhcp_agent=self.use_dhcp,
|
||||||
)
|
)
|
||||||
|
@ -206,7 +204,6 @@ class TestConnectivitySameNetworkNoDhcp(BaseConnectivitySameNetworkTest):
|
||||||
use_dhcp = False
|
use_dhcp = False
|
||||||
network_type = 'vxlan'
|
network_type = 'vxlan'
|
||||||
l2_pop = False
|
l2_pop = False
|
||||||
ovsdb_interface = 'native'
|
|
||||||
of_interface = 'native'
|
of_interface = 'native'
|
||||||
|
|
||||||
def test_connectivity(self):
|
def test_connectivity(self):
|
||||||
|
|
|
@ -45,7 +45,6 @@ DSCP_MARK = 16
|
||||||
|
|
||||||
class BaseQoSRuleTestCase(object):
|
class BaseQoSRuleTestCase(object):
|
||||||
of_interface = None
|
of_interface = None
|
||||||
ovsdb_interface = None
|
|
||||||
number_of_hosts = 1
|
number_of_hosts = 1
|
||||||
|
|
||||||
@property
|
@property
|
||||||
|
@ -60,7 +59,6 @@ class BaseQoSRuleTestCase(object):
|
||||||
environment.HostDescription(
|
environment.HostDescription(
|
||||||
l3_agent=False,
|
l3_agent=False,
|
||||||
of_interface=self.of_interface,
|
of_interface=self.of_interface,
|
||||||
ovsdb_interface=self.ovsdb_interface,
|
|
||||||
l2_agent_type=self.l2_agent_type
|
l2_agent_type=self.l2_agent_type
|
||||||
) for _ in range(self.number_of_hosts)]
|
) for _ in range(self.number_of_hosts)]
|
||||||
env_desc = environment.EnvironmentDescription(
|
env_desc = environment.EnvironmentDescription(
|
||||||
|
|
|
@ -40,13 +40,11 @@ class OVSVersionChecker(object):
|
||||||
class BaseSecurityGroupsSameNetworkTest(base.BaseFullStackTestCase):
|
class BaseSecurityGroupsSameNetworkTest(base.BaseFullStackTestCase):
|
||||||
|
|
||||||
of_interface = None
|
of_interface = None
|
||||||
ovsdb_interface = None
|
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
host_descriptions = [
|
host_descriptions = [
|
||||||
environment.HostDescription(
|
environment.HostDescription(
|
||||||
of_interface=self.of_interface,
|
of_interface=self.of_interface,
|
||||||
ovsdb_interface=self.ovsdb_interface,
|
|
||||||
l2_agent_type=self.l2_agent_type,
|
l2_agent_type=self.l2_agent_type,
|
||||||
firewall_driver=self.firewall_driver,
|
firewall_driver=self.firewall_driver,
|
||||||
dhcp_agent=True) for _ in range(2)]
|
dhcp_agent=True) for _ in range(2)]
|
||||||
|
@ -83,17 +81,14 @@ class TestSecurityGroupsSameNetwork(BaseSecurityGroupsSameNetworkTest):
|
||||||
('ovs-hybrid', {
|
('ovs-hybrid', {
|
||||||
'firewall_driver': 'iptables_hybrid',
|
'firewall_driver': 'iptables_hybrid',
|
||||||
'of_interface': 'native',
|
'of_interface': 'native',
|
||||||
'ovsdb_interface': 'native',
|
|
||||||
'l2_agent_type': constants.AGENT_TYPE_OVS}),
|
'l2_agent_type': constants.AGENT_TYPE_OVS}),
|
||||||
('ovs-openflow-cli_ovsdb-cli', {
|
('ovs-openflow-cli', {
|
||||||
'firewall_driver': 'openvswitch',
|
'firewall_driver': 'openvswitch',
|
||||||
'of_interface': 'ovs-ofctl',
|
'of_interface': 'ovs-ofctl',
|
||||||
'ovsdb_interface': 'vsctl',
|
|
||||||
'l2_agent_type': constants.AGENT_TYPE_OVS}),
|
'l2_agent_type': constants.AGENT_TYPE_OVS}),
|
||||||
('ovs-openflow-native_ovsdb-native', {
|
('ovs-openflow-native', {
|
||||||
'firewall_driver': 'openvswitch',
|
'firewall_driver': 'openvswitch',
|
||||||
'of_interface': 'native',
|
'of_interface': 'native',
|
||||||
'ovsdb_interface': 'native',
|
|
||||||
'l2_agent_type': constants.AGENT_TYPE_OVS}),
|
'l2_agent_type': constants.AGENT_TYPE_OVS}),
|
||||||
('linuxbridge-iptables', {
|
('linuxbridge-iptables', {
|
||||||
'firewall_driver': 'iptables',
|
'firewall_driver': 'iptables',
|
||||||
|
|
|
@ -13,12 +13,6 @@
|
||||||
|
|
||||||
def get_ovs_interface_scenarios():
|
def get_ovs_interface_scenarios():
|
||||||
return [
|
return [
|
||||||
('openflow-cli_ovsdb-cli', {'of_interface': 'ovs-ofctl',
|
('openflow-cli', {'of_interface': 'ovs-ofctl'}),
|
||||||
'ovsdb_interface': 'vsctl'}),
|
('openflow-native', {'of_interface': 'native'}),
|
||||||
('openflow-native_ovsdb-cli', {'of_interface': 'native',
|
|
||||||
'ovsdb_interface': 'vsctl'}),
|
|
||||||
('openflow-cli_ovsdb-native', {'of_interface': 'ovs-ofctl',
|
|
||||||
'ovsdb_interface': 'native'}),
|
|
||||||
('openflow-native_ovsdb-native', {'of_interface': 'native',
|
|
||||||
'ovsdb_interface': 'native'}),
|
|
||||||
]
|
]
|
||||||
|
|
Loading…
Reference in New Issue