openstack/manila
Code Issues Proposed changes

Merge "Add support of 'network_type' to standalone network plugin"

Browse Source
This commit is contained in:
Jenkins 2015-11-26 00:10:37 +00:00 committed by Gerrit Code Review
commit 28fb0443f7
2 changed files with 66 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manila/network/standalone_network_plugin.py
View File

@ -34,6 +34,15 @@ standalone_network_plugin_opts = [
help="Network mask that will be used. Can be either decimal "
"like '24' or binary like '255.255.255.0'. Required.",
deprecated_group='DEFAULT'),
cfg.StrOpt(
'standalone_network_plugin_network_type',
help="Network type, such as 'flat', 'vlan', 'vxlan' or 'gre'. "
"Empty value is alias for 'flat'. "
"It will be assigned to share-network and share drivers will be "
"able to use this for network interfaces within provisioned "
"share servers. Optional.",
choices=['flat', 'vlan', 'vxlan', 'gre'],
deprecated_group='DEFAULT'),
cfg.StrOpt(
'standalone_network_plugin_segmentation_id',
help="Set it if network has segmentation (VLAN, VXLAN, etc...). "
@ -87,6 +96,7 @@ class StandaloneNetworkPlugin(network.NetworkBaseAPI):
"IP version - %(ip_version)s\n"
"Used network - %(net)s\n"
"Used gateway - %(gateway)s\n"
"Used network type - %(network_type)s\n"
"Used segmentation ID - %(segmentation_id)s\n"
"Allowed CIDRs - %(cidrs)s\n"
"Original allowed IP ranges - %(ip_ranges)s\n"
@ -96,6 +106,7 @@ class StandaloneNetworkPlugin(network.NetworkBaseAPI):
ip_version=self.ip_version,
net=six.text_type(self.net),
gateway=self.gateway,
network_type=self.network_type,
segmentation_id=self.segmentation_id,
cidrs=self.allowed_cidrs,
ip_ranges=self.allowed_ip_ranges,
@ -103,6 +114,8 @@ class StandaloneNetworkPlugin(network.NetworkBaseAPI):
def _set_persistent_network_data(self):
"""Sets persistent data for whole plugin."""
self.network_type = (
self.configuration.standalone_network_plugin_network_type)
self.segmentation_id = (
self.configuration.standalone_network_plugin_segmentation_id)
self.gateway = self.configuration.standalone_network_plugin_gateway
@ -228,6 +241,7 @@ class StandaloneNetworkPlugin(network.NetworkBaseAPI):
def _save_network_info(self, context, share_network):
"""Update share-network with plugin specific data."""
data = dict(
network_type=self.network_type,
segmentation_id=self.segmentation_id,
cidr=self.net.cidr,
ip_version=self.ip_version)

57
manila/tests/network/test_standalone_network_plugin.py
View File

@ -65,6 +65,7 @@ class StandaloneNetworkPluginTest(test.TestCase):
group_name: {
'standalone_network_plugin_gateway': '10.0.0.1',
'standalone_network_plugin_mask': '255.255.0.0',
'standalone_network_plugin_network_type': 'vlan',
'standalone_network_plugin_segmentation_id': '1001',
'standalone_network_plugin_allowed_ip_ranges': (
'10.0.0.3-10.0.0.7,10.0.0.69-10.0.0.157,10.0.0.213'),
@ -83,6 +84,7 @@ class StandaloneNetworkPluginTest(test.TestCase):
self.assertEqual(4, instance.ip_version)
self.assertEqual('10.0.0.1', instance.gateway)
self.assertEqual('255.255.0.0', instance.mask)
self.assertEqual('vlan', instance.network_type)
self.assertEqual('1001', instance.segmentation_id)
self.assertEqual(allowed_cidrs, instance.allowed_cidrs)
self.assertEqual(
@ -130,6 +132,7 @@ class StandaloneNetworkPluginTest(test.TestCase):
group_name: {
'standalone_network_plugin_gateway': '2001:db8::0001',
'standalone_network_plugin_mask': '88',
'standalone_network_plugin_network_type': 'vlan',
'standalone_network_plugin_segmentation_id': '3999',
'standalone_network_plugin_allowed_ip_ranges': (
'2001:db8::-2001:db8:0000:0000:0000:007f:ffff:ffff'),
@ -143,6 +146,7 @@ class StandaloneNetworkPluginTest(test.TestCase):
self.assertEqual(6, instance.ip_version)
self.assertEqual('2001:db8::0001', instance.gateway)
self.assertEqual('88', instance.mask)
self.assertEqual('vlan', instance.network_type)
self.assertEqual('3999', instance.segmentation_id)
self.assertEqual(['2001:db8::/89'], instance.allowed_cidrs)
self.assertEqual(
@ -154,6 +158,42 @@ class StandaloneNetworkPluginTest(test.TestCase):
('2001:db8::', '2001:db8::0001', '2001:db8::ff:ffff:ffff'),
instance.reserved_addresses)
@ddt.data('flat', 'vlan', 'vxlan', 'gre')
def test_init_with_valid_network_types_v4(self, network_type):
data = {
'DEFAULT': {
'standalone_network_plugin_gateway': '10.0.0.1',
'standalone_network_plugin_mask': '255.255.0.0',
'standalone_network_plugin_network_type': network_type,
'standalone_network_plugin_segmentation_id': '1001',
'standalone_network_plugin_ip_version': 4,
},
}
with test_utils.create_temp_config_with_opts(data):
instance = plugin.StandaloneNetworkPlugin(
config_group_name='DEFAULT')
self.assertEqual(instance.network_type, network_type)
@ddt.data(
'foo', 'foovlan', 'vlanfoo', 'foovlanbar', 'None', 'Vlan', 'vlaN')
def test_init_with_fake_network_types_v4(self, fake_network_type):
data = {
'DEFAULT': {
'standalone_network_plugin_gateway': '10.0.0.1',
'standalone_network_plugin_mask': '255.255.0.0',
'standalone_network_plugin_network_type': fake_network_type,
'standalone_network_plugin_segmentation_id': '1001',
'standalone_network_plugin_ip_version': 4,
},
}
with test_utils.create_temp_config_with_opts(data):
self.assertRaises(
cfg.ConfigFileValueError,
plugin.StandaloneNetworkPlugin,
config_group_name='DEFAULT',
)
@ddt.data('custom_config_group_name', 'DEFAULT')
def test_invalid_init_without_any_config_definitions(self, group_name):
self.assertRaises(
@ -266,7 +306,8 @@ class StandaloneNetworkPluginTest(test.TestCase):
self.assertEqual([], allocations)
instance.db.share_network_update.assert_called_once_with(
fake_context, fake_share_network['id'],
dict(segmentation_id=None, cidr=instance.net.cidr, ip_version=4))
dict(network_type=None, segmentation_id=None,
cidr=instance.net.cidr, ip_version=4))
def test_allocate_network_zero_addresses_ipv6(self):
data = {
@ -286,11 +327,14 @@ class StandaloneNetworkPluginTest(test.TestCase):
self.assertEqual([], allocations)
instance.db.share_network_update.assert_called_once_with(
fake_context, fake_share_network['id'],
dict(segmentation_id=None, cidr=instance.net.cidr, ip_version=6))
dict(network_type=None, segmentation_id=None,
cidr=instance.net.cidr, ip_version=6))
def test_allocate_network_one_ip_address_ipv4_no_usages_exist(self):
data = {
'DEFAULT': {
'standalone_network_plugin_network_type': 'vlan',
'standalone_network_plugin_segmentation_id': '1003',
'standalone_network_plugin_gateway': '10.0.0.1',
'standalone_network_plugin_mask': '24',
},
@ -309,7 +353,8 @@ class StandaloneNetworkPluginTest(test.TestCase):
self.assertEqual(1, len(allocations))
instance.db.share_network_update.assert_called_once_with(
fake_context, fake_share_network['id'],
dict(segmentation_id=None, cidr=instance.net.cidr, ip_version=4))
dict(network_type='vlan', segmentation_id='1003',
cidr=instance.net.cidr, ip_version=4))
instance.db.network_allocations_get_by_ip_address.assert_has_calls(
[mock.call(fake_context, '10.0.0.2')])
instance.db.network_allocation_create.assert_called_once_with(
@ -347,7 +392,8 @@ class StandaloneNetworkPluginTest(test.TestCase):
self.assertEqual(2, len(allocations))
instance.db.share_network_update.assert_called_once_with(
ctxt, fake_share_network['id'],
dict(segmentation_id=None, cidr=instance.net.cidr, ip_version=4))
dict(network_type=None, segmentation_id=None,
cidr=instance.net.cidr, ip_version=4))
instance.db.network_allocations_get_by_ip_address.assert_has_calls(
[mock.call(ctxt, '10.0.0.2'), mock.call(ctxt, '10.0.0.3'),
mock.call(ctxt, '10.0.0.4'), mock.call(ctxt, '10.0.0.5')])
@ -384,6 +430,7 @@ class StandaloneNetworkPluginTest(test.TestCase):
instance.db.share_network_update.assert_called_once_with(
fake_context, fake_share_network['id'],
dict(segmentation_id=None, cidr=instance.net.cidr, ip_version=4))
dict(network_type=None, segmentation_id=None,
cidr=instance.net.cidr, ip_version=4))
instance.db.network_allocations_get_by_ip_address.assert_has_calls(
[mock.call(fake_context, '10.0.0.2')])