x/fuel-plugin-contrail
Code Issues Proposed changes

Fix for the cinder storage

Browse Source 
Change-Id: If2b53cf09224f2ec2cf7ad92a42d96c42774005b
This commit is contained in:
Iryna Vovk
2016-02-04 12:37:29 +02:00
parent c250052761
commit 00302e08d6
3 changed files with 77 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
plugin_test/helpers/openstack.py
View File

@@ -22,10 +22,12 @@ from fuelweb_test.helpers.checkers import check_repo_managment
def assign_net_provider(obj, **options):
"""Assign neutron with tunneling segmentation"""
available_params = [
'assign_to_all_nodes', 'images_ceph', 'volumes_ceph', 'ephemeral_ceph', 'objects_ceph', 'volumes_lvm'
'assign_to_all_nodes', 'images_ceph', 'volumes_ceph',
'ephemeral_ceph', 'objects_ceph', 'volumes_lvm'
]
assert all(p in available_params for p in options), 'Invalid params for func %s' % options
settings = {
assert all(p in available_params for p in options), \
'Invalid params for func %s' % options
default_settings = {
"net_provider": 'neutron',
"net_segment_type": 'tun',
"assign_to_all_nodes": False,
@@ -33,13 +35,13 @@ def assign_net_provider(obj, **options):
"volumes_ceph": False,
"ephemeral_ceph": False,
"objects_ceph": False,
"volumes_lvm": False
"volumes_lvm": True
}
settings.update(options)
default_settings.update(options)
obj.cluster_id = obj.fuel_web.create_cluster(
name=obj.__class__.__name__,
mode=DEPLOYMENT_MODE,
settings=settings)
settings=default_settings)
return obj.cluster_id

2
plugin_test/helpers/plugin.py
View File

@@ -126,7 +126,7 @@ def activate_vsrx():
command = 'sudo /sbin/iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE'
subprocess.call(command, shell=True)
if VSRX_TEMPLATE_PATH:
if not VSRX_TEMPLATE_PATH:
logger.info("#" * 10 + 'VSRX_TEMPLATE_PATH is not defined, '
'OSTF will not be running' + "#" * 10)
return False

107
plugin_test/tests/test_integration.py
View File

@@ -51,8 +51,8 @@ class IntegrationTests(TestBasic):
"""Check Contrail deploy on HA environment
Scenario:
1. Create an environment with "Neutron with tunneling segmentation"
as a network configuration and CEPH storage
1. Create an environment with "Neutron with tunneling
segmentation" as a network configuration and CEPH storage
2. Enable and configure Contrail plugin
3. Add 3 nodes with controller role
4. Add 2 nodes with "compute" and "Ceph-OSD" roles
@@ -65,9 +65,10 @@ class IntegrationTests(TestBasic):
Duration 120 min
"""
options = {'images_ceph': True}
plugin.prepare_contrail_plugin(self, slaves=9, options=options)
plugin.prepare_contrail_plugin(
self, slaves=9, options={'images_ceph': True}
)
# enable plugin in contrail settings
plugin.activate_plugin(self)
@@ -100,8 +101,8 @@ class IntegrationTests(TestBasic):
"""Check deploy HA-contrail on an environment with a base-os node
Scenario:
1. Create an environment with "Neutron with tunneling segmentation"
as a network configuration
1. Create an environment with "Neutron with tunneling
segmentation" as a network configuration
2. Enable and configure Contrail plugin
3. Add a node with controller role
4. Add 2 nodes with "compute" and "Storage-cinder" roles
@@ -160,8 +161,8 @@ class IntegrationTests(TestBasic):
"""Check deploy environment with Contrail and Ceilometer
Scenario:
1. Create an environment with "Neutron with tunneling segmentation"
as a network configuration and CEPH storage
1. Create an environment with "Neutron with tunneling
segmentation" as a network configuration and CEPH storage
2. Enable and configure Contrail plugin
3. Add 2 nodes with "controller" role and 1 node with
"controller" + "MongoDB" multirole
@@ -176,9 +177,10 @@ class IntegrationTests(TestBasic):
Duration 120 min
"""
options = {'images_ceph': True}
plugin.prepare_contrail_plugin(self, slaves=9, options=options)
plugin.prepare_contrail_plugin(
self, slaves=9, options={'images_ceph': True}
)
# enable plugin in contrail settings
plugin.activate_plugin(self)
@@ -211,8 +213,8 @@ class IntegrationTests(TestBasic):
"""Check deploy contrail on an environment with jumbo-frames support
Scenario:
1. Create an environment with "Neutron with tunneling segmentation"
as a network configuration
1. Create an environment with "Neutron with tunneling
segmentation" as a network configuration
2. Enable and configure Contrail plugin
3. Add a node with controller role
4. Add 2 nodes with "compute" and "Storage-Ceph OSD" roles
@@ -227,9 +229,9 @@ class IntegrationTests(TestBasic):
"""
options = {'images_ceph': True}
plugin.prepare_contrail_plugin(self, slaves=9, options=options)
plugin.prepare_contrail_plugin(
self, slaves=9, options={'images_ceph': True}
)
jumbo = TestJumboFrames()
@@ -316,8 +318,8 @@ class IntegrationTests(TestBasic):
"""Check deploy contrail with aggregation of network interfaces
Scenario:
1. Create an environment with "Neutron with tunneling segmentation"
as a network configuration
1. Create an environment with "Neutron with tunneling
segmentation" as a network configuration
2. Enable and configure Contrail plugin
3. Add 3 nodes with controller role
4. Add 2 nodes with "compute" roles
@@ -391,8 +393,8 @@ class IntegrationTests(TestBasic):
"""Check deploy contrail on an environment with vlan-tagging
Scenario:
1. Create an environment with "Neutron with tunneling segmentation"
as a network configuration
1. Create an environment with "Neutron with tunneling
segmentation" as a network configuration
2. Enable and configure Contrail plugin
3. Add 3 nodes with controller role
4. Add 2 nodes with "compute" and "Storage-cinder" roles
@@ -461,20 +463,27 @@ class IntegrationTests(TestBasic):
"""Check deploy contrail with Controller + Ceph multirole
Scenario:
1. Create an environment with "Neutron with tunneling segmentation"
as a network configuration and CEPH storage
1. Create an environment with "Neutron with tunneling
segmentation" as a network configuration and CEPH storage
2. Enable and configure Contrail plugin
3. Add 3 nodes with "controller" + "Ceph-OSD" multirole
4. Add 2 nodes with "compute" role
5. Add 1 node with "contrail-config", "contrail-control" and "contrail-db" roles
5. Add 1 node with "contrail-config", "contrail-control" and
"contrail-db" roles
6. Deploy cluster with plugin
8. Run OSTF tests
7. Run OSTF tests
"""
options = {'images_ceph': True, 'volumes_ceph': True, 'ephemeral_ceph': True, 'objects_ceph': True}
plugin.prepare_contrail_plugin(self, slaves=9, options=options)
plugin.prepare_contrail_plugin(
self, slaves=9,
options={
'images_ceph': True,
'volumes_ceph': True,
'ephemeral_ceph': True,
'objects_ceph': True,
"volumes_lvm": False
})
# enable plugin in contrail settings
plugin.activate_plugin(self)
@@ -490,7 +499,9 @@ class IntegrationTests(TestBasic):
'slave-03': ['controller', 'ceph-osd'],
'slave-04': ['compute'],
'slave-05': ['compute'],
'slave-06': ['contrail-config', 'contrail-control', 'contrail-db'],
'slave-06': ['contrail-config',
'contrail-control',
'contrail-db'],
})
# deploy cluster
@@ -510,11 +521,13 @@ class IntegrationTests(TestBasic):
"""Check deploy contrail with Controller + Cinder multirole
Scenario:
1. Create an environment with "Neutron with tunneling segmentation" as a network configuration
1. Create an environment with "Neutron with tunneling
segmentation" as a network configuration
2. Enable and configure Contrail plugin
3. Add 3 nodes with "controller" + "storage-cinder" multirole
4. Add 1 node with "compute" role
5. Add 2 nodes with "contrail-config", "contrail-control" and "contrail-db" roles
5. Add 2 nodes with "contrail-config", "contrail-control" and
"contrail-db" roles
6. Deploy cluster with plugin
8. Run OSTF tests
@@ -535,8 +548,12 @@ class IntegrationTests(TestBasic):
'slave-02': ['controller', 'cinder'],
'slave-03': ['controller', 'cinder'],
'slave-04': ['compute'],
'slave-05': ['contrail-config', 'contrail-control', 'contrail-db'],
'slave-06': ['contrail-config', 'contrail-control', 'contrail-db'],
'slave-05': ['contrail-config',
'contrail-control',
'contrail-db'],
'slave-06': ['contrail-config',
'contrail-control',
'contrail-db'],
})
# deploy cluster
@@ -556,22 +573,24 @@ class IntegrationTests(TestBasic):
"""Check deploy contrail with Controller + Cinder + Ceph multirole
Scenario:
1. Create an environment with "Neutron with tunneling segmentation"
as a network configuration and CEPH storage
1. Create an environment with "Neutron with tunneling
segmentation" as a network configuration and CEPH storage
2. Enable and configure Contrail plugin
3. Add 1 node with "controller" + "storage-cinder" + "Ceph-OSD" multirole
3. Add 1 node with "controller" + "storage-cinder" +
"Ceph-OSD" multirole
4. Add 1 node with "controller" + "storage-cinder" and 1 node
with "controller" + "Ceph-OSD" multiroles
5. Add 2 nodes with "compute" role
6. Add 3 nodes with "contrail-config", "contrail-control" and "contrail-db" roles
6. Add 3 nodes with "contrail-config", "contrail-control" and
"contrail-db" roles
7. Deploy cluster with plugin
8. Run OSTF tests
"""
options = {'images_ceph': True}
plugin.prepare_contrail_plugin(self, slaves=9, options=options)
plugin.prepare_contrail_plugin(
self, slaves=9, options={'images_ceph': True}
)
# enable plugin in contrail settings
plugin.activate_plugin(self)
@@ -587,9 +606,15 @@ class IntegrationTests(TestBasic):
'slave-03': ['controller', 'ceph-osd'],
'slave-04': ['compute'],
'slave-05': ['compute'],
'slave-06': ['contrail-config', 'contrail-control', 'contrail-db'],
'slave-07': ['contrail-config', 'contrail-control', 'contrail-db'],
'slave-08': ['contrail-config', 'contrail-control', 'contrail-db']
'slave-06': ['contrail-config',
'contrail-control',
'contrail-db'],
'slave-07': ['contrail-config',
'contrail-control',
'contrail-db'],
'slave-08': ['contrail-config',
'contrail-control',
'contrail-db']
})
# deploy cluster