x
/
fuel-plugin-contrail
Code Issues Proposed changes

Remove contrail-config, contraol-db roles. 

-test_suite_integration
-test_suite_multiple_networks
-test_suite_tsn
-test_contrail_check
-test_system

Change-Id: I4fb20260600f6fcaa4b650bfac47c0a84fb6462c
This commit is contained in:
otsvigun 2016-10-04 11:24:43 +03:00
parent afc0b2317f
commit de58f4e21b
8 changed files with 481 additions and 601 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

179
doc/testing/test_suite_integration.rst
View File

@ -30,11 +30,11 @@ Steps
1. Create an environment with "Neutron with tunneling segmentation" as a network configuration and CEPH storage
2. Enable and configure Contrail plugin
3. Enable dedicated analytics DB
4. Add 3 nodes with controller role
5. Add 3 nodes with "compute" and "Ceph-OSD" roles
6. Add a node with contrail-config, contrail-control and contrail-db roles
7. Add a node with contrail-analytics-db and contrail-analytics roles
3. Add 3 nodes with controller role
4. Add 3 nodes with "compute" and "Ceph-OSD" roles
5. Add a node with contrail-controller role
6. Add a node with contrail-analytics role
7. Add a node with contrail-analytics-db role
8. Deploy cluster with plugin
9. Run contrail health check tests
10. Run OSTF tests
@ -74,16 +74,14 @@ Steps
1. Create an environment with "Neutron with tunneling
segmentation" as a network configuration
2. Enable and configure Contrail plugin
3. Enable dedicated analytics DB
4. Add a node with controller role
5. Add 2 nodes with "compute" and "Storage-cinder" roles
6. Add a node with Base-OS role
7. Add 3 nodes with "contrail-config", "contrail-control",
"contrail-db" and "contrail-analytics" roles
8. Add a node with 'contrail-analytics-db' role
9. Deploy cluster with plugin
10. Run contrail health check tests
11. Run OSTF tests
3. Add a node with controller role
4. Add 2 nodes with "compute" and "Storage-cinder" roles
5. Add a node with Base-OS role
6. Add a node with "contrail-controller", "contrail-analytics" roles
7. Add a node with "contrail-analytics","contrail-analytics-db" role
8. Deploy cluster with plugin
9. Run contrail health check tests
10. Run OSTF tests
@ -121,19 +119,18 @@ Steps
1. Create an environment with "Neutron with tunneling
segmentation" as a network configuration and CEPH storage
2. Enable and configure Contrail plugin
3. Enable dedicated analytics DB
4. Add a node with "controller" role
5. Add a node with "controller" + "MongoDB" multirole
6. Add a node with "controller"+ "ceph-OSD" multiroles
7. Add a node with "compute" + "ceph-OSD" + "cinder" multiroles
8. Add a node with "compute" + "ceph-OSD" multiroles
9. Add a node with "MongoDB" role
10. Add a node with "contrail-config", "contrail-control",
"contrail-db" and "contrail-analytics" roles
11. Add a node with "contrail-analytics-db" role
12. Deploy cluster with plugin
13. Run contrail health check tests
14. Run OSTF tests
3. Add a node with "controller" role
4. Add a node with "controller" + "MongoDB" multirole
5. Add a node with "controller"+ "ceph-OSD" multiroles
6. Add a node with "compute" + "ceph-OSD" + "cinder" multiroles
7. Add a node with "compute" + "ceph-OSD" multiroles
8. Add a node with "MongoDB" role
9. Add a node with "contrail-controller" role
10. Add a node with "contrail-analytics-db" and
"contrail-analytics" roles
11. Deploy cluster with plugin
12. Run contrail health check tests
13. Run OSTF tests
Expected results
@ -170,18 +167,15 @@ Steps
1. Create an environment with "Neutron with tunneling
segmentation" as a network configuration
2. Enable and configure Contrail plugin
3. Enable dedicated analytics DB
4. Add a node with "controller" and "Ceph OSD" roles
5. Add 2 nodes with "compute" and "Storage-Ceph OSD" roles
6. Add a node with "contrail-config", "contrail-control",
"contrail-db" roles
7. Add 2 nodes with "contrail-config", "contrail-control" roles
8. Add node with "contrail-analytics" and
"contrail-analytics-db" roles
9. Configure MTU on network interfaces (Jumbo-frames)
10. Deploy cluster with plugin
11. Run contrail health check tests
12. Run OSTF tests
3. Add a node with "controller" and "Ceph OSD" roles
4. Add 2 nodes with "compute" and "Storage-Ceph OSD" roles
5. Add a node with "contrail-analytics", "contrail-controller" roles
6. Add node with "contrail-analytics-db" role
7. Configure MTU on network interfaces (Jumbo-frames)
8. Deploy cluster with plugin
9. Run contrail health check tests
10. Run OSTF tests
Expected results
@ -218,17 +212,15 @@ Steps
1. Create an environment with "Neutron with tunneling
segmentation" as a network configuration
2. Enable and configure Contrail plugin
3. Enable dedicated analytics DB
3. Configure VLAN on network interfaces
4. Add 3 nodes with controller role
5. Add 2 nodes with "compute" and "Storage-cinder" roles
6. Add a node with "contrail-config", and "contrail-db" roles
7. Add a node with "contrail-db", "contrail-control" roles
8. Add a node with "contrail-db", "contrail-analytics" roles
9. Add a node with 'contrail-analytics-db' roles
10. Configure VLAN on network interfaces
11. Deploy cluster with plugin
12. Run contrail health check tests
13. Run OSTF tests
6. Add 2 nodes with "contrail-controller" role
7. Add a node with "contrail-analytics" role
8. Add a node with 'contrail-analytics-db' role
9. Deploy cluster with plugin
10. Run contrail health check tests
11. Run OSTF tests
Expected results
@ -265,12 +257,11 @@ Steps
1. Create an environment with "Neutron with tunneling
segmentation" as a network configuration
2. Enable and configure Contrail plugin
3. Enable dedicated analytics DB
4. Add 3 nodes with controller role
5. Add 2 nodes with "compute" roles
6. Add 3 nodes with "contrail-config", "contrail-control".
"contrail-db" and "contrail-analytics" roles
7. Add a node with "contrail-analytics-db" role
3. Add 3 nodes with controller role
4. Add 2 nodes with "compute" roles
5. Add a node with "contrail-controller" role
6. Add a node with "contrail-analytics" role
7. Add 2 nodes with "contrail-analytics-db" role
8. Bond network interfaces with balance-rr mode
9. Deploy cluster with plugin
10. Run contrail health check tests
@ -312,10 +303,11 @@ Steps
2. Enable and configure Contrail plugin
3. Add 3 nodes with "controller" + "storage-cinder" multirole
4. Add 2 nodes with "compute" role
5. Add 1 node with "contrail-config", "contrail-control", "contrail-db" and "contrail-analytics" roles
6. Deploy cluster with plugin
7. Run contrail health check tests
8. Run OSTF tests
5. Add 2 node with "contrail-controller", "contrail-analytics" roles
6. Add a node with 'contrail-analytics-db' role
7. Deploy cluster with plugin
8. Run contrail health check tests
9. Run OSTF tests
Expected results
@ -353,10 +345,13 @@ Steps
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", "contrail-db" and "contrail-analytics" roles
6. Deploy cluster with plugin
7. Run contrail health check tests
8. Run OSTF tests
5. Add a node with "contrail-controller" role
6. Add 2 nodes with 'contrail-analytics-db',
"contrail-analytics" roles
7. Add a node with 'contrail-analytics-db' role
8. Deploy cluster with plugin
9. Run contrail health check tests
10. Run OSTF tests
Expected results
@ -393,16 +388,16 @@ Steps
1. Create an environment with "Neutron with tunneling
segmentation" as a network configuration and CEPH storage
2. Enable and configure Contrail plugin
3. Enable dedicated analytics DB
4. Add 1 node with "controller", "storage-cinder",
3. Add 1 node with "controller", "storage-cinder",
and "Ceph-OSD" roles
5. Add 1 node with "controller" + "storage-cinder" and 1 node
4. Add 1 node with "controller" + "storage-cinder" and 1 node
with "controller" + "Ceph-OSD" multiroles
6. Add 1 nodes with "compute", "cinder", "ceph-osd" roles
7. Add 1 nodes with "compute" role
8. Add 3 nodes with "contrail-config", "contrail-control",
"contrail-db" and "contrail-analytics" roles
9. Add a node with 'contrail-analytics-db' roles
5. Add 1 nodes with "compute", "cinder", "ceph-osd" roles
6. Add 1 nodes with "compute" role
7. Add a node with "contrail-controller" role
8. Add 2 node with 'contrail-analytics-db',
"contrail-analytics" roles
9. Add a node with 'contrail-analytics-db' role
10. Deploy cluster with plugin
11. Run contrail health check tests
12. Run OSTF tests
@ -442,7 +437,8 @@ Steps
1. Deploy cluster with Contrail plugin
2. Run 'fuel-mirror create -P ubuntu -G mos ubuntu' on the master node
3. Run 'fuel-mirror apply -P ubuntu -G mos ubuntu --env <env_id> --replace' on the master node
4. Update repos for all deployed nodes with command "fuel --env <env_id> node --node-id 1,2,3,4,5,6,7,9,10 --tasks setup_repositories" on the master node
4. Update repos for all deployed nodes with command
"fuel --env <env_id> node --node-id 1,2,3,4,5,6,7,9,10 --tasks setup_repositories" on the master node
5. Run OSTF and check Contrail node status.
@ -481,17 +477,14 @@ Steps
segmentation" as a network configuration and CEPH storage
2. Enable sahara
3. Enable and configure Contrail plugin
4. Enable dedicated analytics DB
5. Add a node with controller role
6. Add 3 nodes with "compute" and "Ceph-OSD" roles
7. Add a node with contrail-config, contrail-control,
contrail-db and contrail-analytics roles
8. Add a node with 'contrail-analytics'+'contrail-analytics-db'
roles
9. Add a node with 'contrail-analytics-db' role
10. Deploy cluster with plugin
11. Run contrail health check tests
12. Run OSTF tests
4. Add a node with controller role
5. Add 3 nodes with "compute" and "Ceph-OSD" roles
6. Add a node with contrail-controller role
7. Add a node with 'contrail-analytics' role
8. Add a node with 'contrail-analytics-db' role
9. Deploy cluster with plugin
10. Run contrail health check tests
11. Run OSTF tests
Expected results
################
@ -528,16 +521,14 @@ Steps
segmentation" as a network configuration
2. Enable murano
3. Enable and configure Contrail plugin
4. Enable dedicated analytics DB
5. Add a node with controller role
6. Add a node with "compute" and "Storage-cinder" roles
7. Add a node with "contrail-config" and "contrail-db" roles
8. Add a node with "contrail-db", "contrail-control" roles
9. Add a node with "contrail-analytics",
"contrail-analytics-db" roles
10. Deploy cluster with plugin
11. Run contrail health check tests
12. Run OSTF tests
4. Add a node with controller role
5. Add a node with "compute" and "Storage-cinder" roles
6. Add a node with "contrail-controller" role
7. Add a node with "contrail-analytics" role
8. Add a node with "contrail-analytics-db" role
9. Deploy cluster with plugin
10. Run contrail health check tests
11. Run OSTF tests
Expected results
@ -593,7 +584,7 @@ Steps
* 3 Compute + ceph-osd
* ComputeVMWare
* 2 contrail-vmware
* Contrail-config + contrail-control + contrail-db
* Contrail-analytics + contrail-controller
* Contrail-analytics + contrail-analytics-db
6. Configure interfaces on nodes.
7. Configure network settings.

155
doc/testing/test_suite_multiple_networks.rst
View File

@ -30,27 +30,25 @@ Steps
1. Revert snapshot with ready master node
2. Install contrail plugin
3. Enable dedicated analytics DB
4. Bootstrap slaves from default nodegroup
5. Create cluster with Neutron GRE and custom nodegroups
6. Activate plugin and configure plugins setings
7. Remove 2nd custom nodegroup which is added automatically
8. Bootstrap slave nodes from custom nodegroup
9. Download network configuration
10. Update network.json with customized ip ranges
11. Put new json on master node and update network data
12. Verify that new IP ranges are applied for network config
13. Add following nodes to default nodegroup:
3. Bootstrap slaves from default nodegroup
4. Create cluster with Neutron GRE and custom nodegroups
5. Activate plugin and configure plugins setings
6. Remove 2nd custom nodegroup which is added automatically
7. Bootstrap slave nodes from custom nodegroup
8. Download network configuration
9. Update network.json with customized ip ranges
10. Put new json on master node and update network data
11. Verify that new IP ranges are applied for network config
12. Add following nodes to default nodegroup:
* 3 controller+ceph
* 1 compute
14. Add following nodes to custom nodegroup:
* 1 contrail-config+contrail-control+contrail-db+
contrail-analytics+contrail-analytics-db
* 1 contrail-analytics+contrail-analytics-db
15. Deploy cluster
16. Run network verification
17. Verify that excluded ip is not used for nodes or VIP
18. Run health checks (OSTF)
13. Add following nodes to custom nodegroup:
* 1 contrail-controller
* 1 contrail-analytics-db+contrail-analytics
14. Deploy cluster
15. Run network verification
16. Verify that excluded ip is not used for nodes or VIP
17. Run health checks (OSTF)
Expected results
################
@ -95,11 +93,12 @@ Steps
11. Verify that new IP ranges are applied for network config
12. Add following nodes to default nodegroup:
* 1 controller+cinder
* 2 controller
* 1 controller
13. Add following nodes to custom nodegroup:
* 1 compute
* 1 contrail-config+contrail-control+contrail-db
* 1 contrail-controller
* 1 contrail-analytics
* 1 contrail-analytics-db
14. Deploy cluster
15. Run health checks (OSTF)
16. Remove 1 controller node
@ -139,28 +138,27 @@ Steps
1. Revert snapshot with ready master node
2. Install contrail plugin
3. Enable dedicated analytics DB
4. Bootstrap slaves from default nodegroup
5. Create cluster with Neutron GRE and custom nodegroups
6. Activate plugin and configure plugins setings
7. Remove 2nd custom nodegroup which is added automatically
8. Bootstrap slave nodes from custom nodegroup
9. Download network configuration
10. Update network.json with customized ip ranges
11. Put new json on master node and update network data
12. Verify that new IP ranges are applied for network config
13. Add following nodes to custom nodegroup:
3. Bootstrap slaves from default nodegroup
4. Create cluster with Neutron GRE and custom nodegroups
5. Activate plugin and configure plugins setings
6. Remove 2nd custom nodegroup which is added automatically
7. Bootstrap slave nodes from custom nodegroup
8. Download network configuration
9. Update network.json with customized ip ranges
10. Put new json on master node and update network data
11. Verify that new IP ranges are applied for network config
12. Add following nodes to custom nodegroup:
* 1 controller+mongo
14. Add following nodes to default nodegroup:
13. Add following nodes to default nodegroup:
* 1 compute
* 1 contrail-config+contrail-control+contrail-db+contrail-analytics
* 1 contrail-controller+contrail-analytics
* 1 contrail-analytics-db
* 1 cinder
15. Deploy cluster
16. Run health checks (OSTF)
17. Add 1 controller node
18. Redeploy cluster
19. Run health checks (OSTF)
14. Deploy cluster
15. Run health checks (OSTF)
16. Add 1 controller node
17. Redeploy cluster
18. Run health checks (OSTF)
Expected results
@ -205,10 +203,12 @@ Steps
10. Put new json on master node and update network data
11. Verify that new IP ranges are applied for network config
12. Add following nodes to default nodegroup:
* 3 controller
13. Add following nodes to custom nodegroup:
* 1 controller
* 2 compute
* 1 contrail-config+contrail-control+contrail-db+contrail-analytics
13. Add following nodes to custom nodegroup:
* 1 contrail-controller
* 1 contrail-analytics
* 1 contrail-analytics-db
14. Deploy cluster
15. Run health checks (OSTF)
16. Remove 1 compute node
@ -248,28 +248,26 @@ Steps
1. Revert snapshot with ready master node
2. Install contrail plugin
3. Enable dedicated analytics DB
4. Bootstrap slaves from default nodegroup
5. Create cluster with Neutron GRE and custom nodegroups
6. Activate plugin and configure plugins setings
7. Remove 2nd custom nodegroup which is added automatically
8. Bootstrap slave nodes from custom nodegroup
9. Download network configuration
10. Update network.json with customized ip ranges
11. Put new json on master node and update network data
12. Verify that new IP ranges are applied for network config
13. Add following nodes to default nodegroup:
* 3 controller
14. Add following nodes to custom nodegroup:
3. Bootstrap slaves from default nodegroup
4. Create cluster with Neutron GRE and custom nodegroups
5. Activate plugin and configure plugins setings
6. Remove 2nd custom nodegroup which is added automatically
7. Bootstrap slave nodes from custom nodegroup
8. Download network configuration
9. Update network.json with customized ip ranges
10. Put new json on master node and update network data
11. Verify that new IP ranges are applied for network config
12. Add following nodes to default nodegroup:
* 1 controller
13. Add following nodes to custom nodegroup:
* 1 compute+ceph-osd
* 1 contrail-config+contrail-control+contrail-db+
contrail-analytics
* 1 contrail-controller+contrail-analytics
* 1 contrail-analytics-db
15. Deploy cluster
16. Run health checks (OSTF)
17. Add 1 compute node
18. Redeploy cluster
19. Run health checks (OSTF)
14. Deploy cluster
15. Run health checks (OSTF)
16. Add 1 compute node
17. Redeploy cluster
18. Run health checks (OSTF)
Expected results
@ -303,27 +301,24 @@ Steps
1. Revert snapshot with ready master node
2. Install contrail plugin
3. Enable dedicated analytics DB
4. Bootstrap slaves from default nodegroup
5. Create cluster with Neutron GRE and custom nodegroups
6. Activate plugin and configure plugins setings
7. Remove 2nd custom nodegroup which is added automatically
8. Bootstrap slave nodes from custom nodegroup
9. Download network configuration
10. Update network.json with customized ip ranges
11. Put new json on master node and update network data
12. Verify that new IP ranges are applied for network config
13. Add following nodes to default nodegroup:
3. Bootstrap slaves from default nodegroup
4. Create cluster with Neutron GRE and custom nodegroups
5. Activate plugin and configure plugins setings
6. Remove 2nd custom nodegroup which is added automatically
7. Bootstrap slave nodes from custom nodegroup
8. Download network configuration
9. Update network.json with customized ip ranges
10. Put new json on master node and update network data
11. Verify that new IP ranges are applied for network config
12. Add following nodes to default nodegroup:
* 1 controller
* 2 contrail-config+contrail-control+contrail-db+
contrail-analytics
14. Add following nodes to custom nodegroup:
* 2 contrail-controller+contrail-analytics
13. Add following nodes to custom nodegroup:
* 1 cinder
* 1 contrail-config+contrail-control+contrail-db+
contrail-analytics
* 1 ccontrail-controller+ contrail-analytics
* 1 contrail-analytics-db
15. Deploy cluster
16. Run health checks (OSTF)
14. Deploy cluster
15. Run health checks (OSTF)
Expected results
################

25
doc/testing/test_suite_system.rst
View File

@ -301,19 +301,10 @@ Core
Steps
#####
1. Install contrail plugin.
2. Create an environment with "Neutron with tunneling
segmentation" as a network configuration.
3. Enable and configure Contrail plugin.
4. Add a node with "controller" + "MongoDB" multirole.
5. Add a node with "compute".
6. Add a node with "contrail-config", "contrail-control" and
"contrail-db" roles.
7. Deploy cluster with plugin.
8. Run OSTF tests.
9. Create 2 instances in the default network.
10. Send icpm packets from one instance to another.
11. Check contrail ceilometer metrics:
1. Deploy Contrail cluster with ceilometer.
2. Create 2 instances in the default network.
3. Send icpm packets from one instance to another.
4. Check contrail ceilometer metrics:
"\*ip.floating.receive.bytes",
"\*ip.floating.receive.packets",
"\*ip.floating.transmit.bytes",
@ -534,8 +525,8 @@ Steps
11. Verify that icmp ping is not enabled between instances from SG1 and VMs from SG2.
Expected result
###############
Expected results
################
Network traffic is allowed/prohibited to instances according security groups
rules.
@ -573,8 +564,8 @@ Steps
4. Delete all instances from horizon simultaneously.
Expected result
###############
Expected results
################
All instances should be created and deleted without any error.

15
doc/testing/test_suite_tsn.rst
View File

@ -35,15 +35,13 @@ Steps
* Storage: Ceph
* Additional services: ceilometer
3. Configure Contrail plugin settings:
* enable dedicated analytics DB
* enable and configure ToR agents
4. Add nodes with following roles:
* 3 Controller
* 1 TSN
* 2 Compute + Ceph
* 1 Contrail-config + contrail-control + contrail-db
* 1 contrail-analytics
* 1 contrail-analytics-db
* 1 contrail-controller
* 1 contrail-analytics + contrail-analytics-db
5. Configure interfaces on nodes.
6. Configure network settings.
7. Deploy the cluster.
@ -92,7 +90,8 @@ Steps
* 1 Controller
* 2 TSN
* 1 Compute
* 1 Contrail-config + contrail-control + contrail-db + contrail-analytics
* 1 contrail-controller + contrail-analytics
* 1 contrail-analytics + contrail-analytics-db
5. Configure interfaces on nodes.
6. Configure network settings.
7. Deploy the cluster.
@ -184,7 +183,8 @@ Steps
* 1 Controller
* 1 TSN
* 1 Compute
* 1 contrail-control+contrail-config+contrail-db+contrail-analytics
* 1 contrail-config + contrail-analytics
* 1 contrail-analytics + contrail-analytics-db
5. Configure interfaces on nodes.
6. Configure network settings.
7. Deploy the cluster.
@ -232,13 +232,12 @@ Steps
* Storage: Ceph
* Additional services: default
3. Configure Contrail plugin settings:
* enable dedicated analytics DB
* enable and configure ToR agents
4. Add nodes with following roles:
* 1 Controller + ceph-osd
* 2 TSN
* 1 Compute + cinder
* 1 contrail-control+contrail-config+contrail-db+contrail-analytics
* 1 contrail-controller + contrail-analytics
* 1 contrail-analytics-db
5. Configure interfaces on nodes.
6. Configure network settings.

4
plugin_test/tests/test_contrail_check.py
View File

@ -620,9 +620,7 @@ class TestContrailCheck(object):
cluster_id = self.obj.fuel_web.get_last_created_cluster()
logger.info('Check contrail node for cluster {}'.format(cluster_id))
contrail_node_roles = {
'contrail-config',
'contrail-control',
'contrail-db',
'contrail-controller',
'contrail-analytics'
'contrail-analytics-db'
}

246
plugin_test/tests/test_contrail_multiple_networks.py
View File

@ -163,37 +163,34 @@ class TestMultipleNets(TestMultipleClusterNets):
Scenario:
1. Revert snapshot with ready master node
2. Install contrail plugin
3. Enable dedicated analytics DB
4. Bootstrap slaves from default nodegroup
5. Create cluster with Neutron GRE and custom nodegroups
6. Activate plugin and configure plugins setings
7. Remove 2nd custom nodegroup which is added automatically
8. Bootstrap slave nodes from custom nodegroup
9. Download network configuration
10. Update network.json with customized ip ranges
11. Put new json on master node and update network data
12. Verify that new IP ranges are applied for network config
13. Add following nodes to default nodegroup:
3. Bootstrap slaves from default nodegroup
4. Create cluster with Neutron GRE and custom nodegroups
5. Activate plugin and configure plugins setings
6. Remove 2nd custom nodegroup which is added automatically
7. Bootstrap slave nodes from custom nodegroup
8. Download network configuration
9. Update network.json with customized ip ranges
10. Put new json on master node and update network data
11. Verify that new IP ranges are applied for network config
12. Add following nodes to default nodegroup:
* 3 controller+ceph
14. Add following nodes to custom nodegroup:
* 1 compute
* 1 contrail-config+contrail-control+contrail-db+
contrail-analytics+contrail-analytics-db
* 1 contrail-analytics+contrail-analytics-db
15. Deploy cluster
16. Run network verification
17. Verify that excluded ip is not used for nodes or VIP
18. Run health checks (OSTF)
13. Add following nodes to custom nodegroup:
* 1 contrail-controller
* 1 contrail-analytics-db+contrail-analytics
14. Deploy cluster
15. Run network verification
16. Verify that excluded ip is not used for nodes or VIP
17. Run health checks (OSTF)
Duration 2.5 hours
"""
if not MULTIPLE_NETWORKS:
raise SkipTest()
conf_contrail = {"dedicated_analytics_db": True}
self.show_step(1, initialize=True)
self.env.revert_snapshot("ready")
self.show_step(2)
plugin.show_range(self, 2, 6)
plugin.prepare_contrail_plugin(self, snapshot_name="ready",
options={'images_ceph': True,
'volumes_ceph': True,
@ -204,7 +201,7 @@ class TestMultipleNets(TestMultipleClusterNets):
cluster_id = self.fuel_web.get_last_created_cluster()
self.env.bootstrap_nodes(self.env.d_env.nodes().slaves[0:3])
plugin.activate_plugin(self, **conf_contrail)
plugin.activate_plugin(self)
# activate vSRX image
vsrx_setup_result = vsrx.activate(self, vsrx_config=True)
@ -243,12 +240,11 @@ class TestMultipleNets(TestMultipleClusterNets):
'slave-03': [
['controller', 'ceph-osd'], nodegroup_default],
'slave-04': [
['contrail-config', 'contrail-control', 'contrail-db',
'contrail-analytics'], nodegroup_custom1],
['contrail-controller'], nodegroup_custom1],
'slave-05': [['compute'], nodegroup_custom1],
'slave-06': [
['contrail-analytics', 'contrail-analytics-db'],
nodegroup_custom1],
['contrail-analytics-db', 'contrail-analytics'],
nodegroup_custom1],
}
)
self.show_step(14)
@ -329,46 +325,43 @@ class TestMultipleNets(TestMultipleClusterNets):
Scenario:
1. Revert snapshot with ready master node
2. Install contrail plugin
3. Enable dedicated analytics DB
4. Bootstrap slaves from default nodegroup
5. Create cluster with Neutron GRE and custom nodegroups
6. Activate plugin and configure plugins setings
7. Remove 2nd custom nodegroup which is added automatically
8. Bootstrap slave nodes from custom nodegroup
9. Download network configuration
10. Update network.json with customized ip ranges
11. Put new json on master node and update network data
12. Verify that new IP ranges are applied for network config
13. Add following nodes to custom nodegroup:
3. Bootstrap slaves from default nodegroup
4. Create cluster with Neutron GRE and custom nodegroups
5. Activate plugin and configure plugins setings
6. Remove 2nd custom nodegroup which is added automatically
7. Bootstrap slave nodes from custom nodegroup
8. Download network configuration
9. Update network.json with customized ip ranges
10. Put new json on master node and update network data
11. Verify that new IP ranges are applied for network config
12. Add following nodes to custom nodegroup:
* 1 controller+mongo
14. Add following nodes to default nodegroup:
13. Add following nodes to default nodegroup:
* 1 compute
* 1 contrail-config+contrail-control+contrail-db+
contrail-analytics
* 1 contrail-controller+contrail-analytics
* 1 contrail-analytics-db
* 1 cinder
15. Deploy cluster
16. Run health checks (OSTF)
17. Add 1 controller node
18. Redeploy cluster
19. Run health checks (OSTF)
14. Deploy cluster
15. Run health checks (OSTF)
16. Add 1 controller node
17. Redeploy cluster
18. Run health checks (OSTF)
Duration 2.5 hours
"""
if not MULTIPLE_NETWORKS:
raise SkipTest()
conf_contrail = {"dedicated_analytics_db": True}
self.show_step(1, initialize=True)
self.env.revert_snapshot("ready")
self.show_step(2)
plugin.show_range(self, 2, 6)
plugin.prepare_contrail_plugin(self, snapshot_name="ready",
options={'ceilometer': True})
cluster_id = self.fuel_web.get_last_created_cluster()
self.env.bootstrap_nodes(self.env.d_env.nodes().slaves[0:3])
plugin.activate_plugin(self, **conf_contrail)
plugin.activate_plugin(self)
# activate vSRX image
vsrx_setup_result = vsrx.activate(self, vsrx_config=True)
@ -398,8 +391,8 @@ class TestMultipleNets(TestMultipleClusterNets):
cluster_id,
{
'slave-01': [
['contrail-config', 'contrail-control', 'contrail-db',
'contrail-analytics'], nodegroup_default],
['contrail-controller', 'contrail-analytics'],
nodegroup_default],
'slave-02': [['contrail-analytics-db'], nodegroup_default],
'slave-03': [['compute'], nodegroup_default],
'slave-04': [['cinder'], nodegroup_default],
@ -458,11 +451,12 @@ class TestMultipleNets(TestMultipleClusterNets):
11. Verify that new IP ranges are applied for network config
12. Add following nodes to default nodegroup:
* 1 controller+cinder
* 2 controller
* 1 controller
13. Add following nodes to custom nodegroup:
* 1 compute
* 1 contrail-config+contrail-control+contrail-db
* 1 contrail-controller
* 1 contrail-analytics
* 1 contrail-analytics-db
14. Deploy cluster
15. Run health checks (OSTF)
16. Remove 1 controller node
@ -476,11 +470,11 @@ class TestMultipleNets(TestMultipleClusterNets):
raise SkipTest()
self.show_step(1, initialize=True)
self.env.revert_snapshot("ready")
self.show_step(2)
plugin.show_range(self, 2, 6)
plugin.prepare_contrail_plugin(self, snapshot_name="ready")
cluster_id = self.fuel_web.get_last_created_cluster()
self.env.bootstrap_nodes(self.env.d_env.nodes().slaves[0:3])
self.env.bootstrap_nodes(self.env.d_env.nodes().slaves[0:2])
plugin.activate_plugin(self)
# activate vSRX image
@ -497,7 +491,7 @@ class TestMultipleNets(TestMultipleClusterNets):
self.fuel_web.client.delete_nodegroup(custom_group2['id'])
self.show_step(7)
self.env.bootstrap_nodes(self.env.d_env.nodes().slaves[3:6])
self.env.bootstrap_nodes(self.env.d_env.nodes().slaves[2:6])
self.show_step(8)
updated_storage_default, updated_storage_custom, \
@ -513,11 +507,9 @@ class TestMultipleNets(TestMultipleClusterNets):
{
'slave-01': [['controller', 'cinder'], nodegroup_custom1],
'slave-02': [['controller'], nodegroup_custom1],
'slave-03': [['controller'], nodegroup_custom1],
'slave-03': [['contrail-analytics-db'], nodegroup_default],
'slave-04': [['compute', 'cinder'], nodegroup_default],
'slave-05': [
['contrail-config', 'contrail-control', 'contrail-db'],
nodegroup_default],
'slave-05': [['contrail-controller'], nodegroup_default],
'slave-06': [['contrail-analytics'], nodegroup_default],
}
)
@ -536,7 +528,7 @@ class TestMultipleNets(TestMultipleClusterNets):
self.show_step(16)
conf_control = {'slave-03': [['controller'], nodegroup_custom1]}
plugin.show_range(self, 17, 19)
plugin.show_range(self, 17, 18)
openstack.update_deploy_check(
self, conf_control, delete=True,
is_vsrx=vsrx_setup_result,
@ -564,11 +556,12 @@ class TestMultipleNets(TestMultipleClusterNets):
10. Put new json on master node and update network data
11. Verify that new IP ranges are applied for network config
12. Add following nodes to default nodegroup:
* 3 controller
13. Add following nodes to custom nodegroup:
* 1 controller
* 2 compute
* 1 contrail-config+contrail-control+contrail-db+
contrail-analytics
13. Add following nodes to custom nodegroup:
* 1 contrail-controller
* 1 contrail-analytics
* 1 contrail-analytics-db
14. Deploy cluster
15. Run health checks (OSTF)
16. Remove 1 compute node
@ -582,7 +575,7 @@ class TestMultipleNets(TestMultipleClusterNets):
raise SkipTest()
self.show_step(1, initialize=True)
self.env.revert_snapshot("ready")
self.show_step(2)
plugin.show_range(self, 2, 6)
plugin.prepare_contrail_plugin(self, snapshot_name="ready")
cluster_id = self.fuel_web.get_last_created_cluster()
@ -618,13 +611,12 @@ class TestMultipleNets(TestMultipleClusterNets):
cluster_id,
{
'slave-01': [['controller'], nodegroup_default],
'slave-02': [['controller'], nodegroup_default],
'slave-03': [['controller'], nodegroup_default],
'slave-02': [['compute'], nodegroup_default],
'slave-03': [['compute'], nodegroup_default],
'slave-04': [
['contrail-config', 'contrail-control', 'contrail-db',
'contrail-analytics'], nodegroup_custom1],
'slave-05': [['compute'], nodegroup_custom1],
'slave-06': [['compute'], nodegroup_custom1],
['contrail-controller'], nodegroup_custom1],
'slave-05': [['contrail-analytics'], nodegroup_custom1],
'slave-06': [['contrail-analytics-db'], nodegroup_custom1],
}
)
self.show_step(14)
@ -641,7 +633,7 @@ class TestMultipleNets(TestMultipleClusterNets):
self.show_step(16)
conf_compute = {'slave-06': [['compute'], nodegroup_custom1], }
plugin.show_range(self, 17, 19)
plugin.show_range(self, 17, 18)
openstack.update_deploy_check(
self, conf_compute, delete=True,
is_vsrx=vsrx_setup_result,
@ -659,38 +651,35 @@ class TestMultipleNets(TestMultipleClusterNets):
Scenario:
1. Revert snapshot with ready master node
2. Install contrail plugin
3. Enable dedicated analytics DB
4. Bootstrap slaves from default nodegroup
5. Create cluster with Neutron GRE and custom nodegroups
6. Activate plugin and configure plugins setings
7. Remove 2nd custom nodegroup which is added automatically
8. Bootstrap slave nodes from custom nodegroup
9. Download network configuration
10. Update network.json with customized ip ranges
11. Put new json on master node and update network data
12. Verify that new IP ranges are applied for network config
13. Add following nodes to default nodegroup:
3. Bootstrap slaves from default nodegroup
4. Create cluster with Neutron GRE and custom nodegroups
5. Activate plugin and configure plugins setings
6. Remove 2nd custom nodegroup which is added automatically
7. Bootstrap slave nodes from custom nodegroup
8. Download network configuration
9. Update network.json with customized ip ranges
10. Put new json on master node and update network data
11. Verify that new IP ranges are applied for network config
12. Add following nodes to default nodegroup:
* 1 controller
14. Add following nodes to custom nodegroup:
13. Add following nodes to custom nodegroup:
* 1 compute+ceph-osd
* 1 contrail-config+contrail-control+contrail-db+
contrail-analytics
* 1 contrail-controller+contrail-analytics
* 1 contrail-analytics-db
15. Deploy cluster
16. Run health checks (OSTF)
17. Add 1 compute node
18. Redeploy cluster
19. Run health checks (OSTF)
14. Deploy cluster
15. Run health checks (OSTF)
16. Add 1 compute node
17. Redeploy cluster
18. Run health checks (OSTF)
Duration 2.5 hours
"""
if not MULTIPLE_NETWORKS:
raise SkipTest()
conf_contrail = {"dedicated_analytics_db": True}
self.show_step(1, initialize=True)
self.env.revert_snapshot("ready")
self.show_step(2)
plugin.show_range(self, 2, 6)
plugin.prepare_contrail_plugin(
self, snapshot_name="ready",
options={
@ -704,7 +693,7 @@ class TestMultipleNets(TestMultipleClusterNets):
cluster_id = self.fuel_web.get_last_created_cluster()
self.env.bootstrap_nodes(self.env.d_env.nodes().slaves[0:1])
plugin.activate_plugin(self, **conf_contrail)
plugin.activate_plugin(self)
# activate vSRX image
vsrx_setup_result = vsrx.activate(self, vsrx_config=True)
@ -726,8 +715,7 @@ class TestMultipleNets(TestMultipleClusterNets):
updated_mgmt_default, updated_mgmt_custom = \
self.update_network_config(cluster_id)
self.show_step(12)
self.show_step(13)
plugin.show_range(self, 12, 14)
nodegroup_default = NODEGROUPS[0]['name']
nodegroup_custom1 = NODEGROUPS[1]['name']
self.fuel_web.update_nodes(
@ -735,8 +723,8 @@ class TestMultipleNets(TestMultipleClusterNets):
{
'slave-01': [['controller'], nodegroup_default],
'slave-02': [
['contrail-config', 'contrail-control', 'contrail-db',
'contrail-analytics'], nodegroup_custom1],
['contrail-controller', 'contrail-analytics'],
nodegroup_custom1],
'slave-03': [['contrail-analytics-db'], nodegroup_custom1],
'slave-04': [['compute', 'ceph-osd'], nodegroup_custom1],
}
@ -775,47 +763,43 @@ class TestMultipleNets(TestMultipleClusterNets):
Scenario:
1. Revert snapshot with ready master node
2. Install contrail plugin
3. Enable dedicated analytics DB
4. Bootstrap slaves from default nodegroup
5. Create cluster with Neutron GRE and custom nodegroups
6. Activate plugin and configure plugins setings
7. Remove 2nd custom nodegroup which is added automatically
8. Bootstrap slave nodes from custom nodegroup
9. Download network configuration
10. Update network.json with customized ip ranges
11. Put new json on master node and update network data
12. Verify that new IP ranges are applied for network config
13. Add following nodes to default nodegroup:
3. Bootstrap slaves from default nodegroup
4. Create cluster with Neutron GRE and custom nodegroups
5. Activate plugin and configure plugins setings
6. Remove 2nd custom nodegroup which is added automatically
7. Bootstrap slave nodes from custom nodegroup
8. Download network configuration
9. Update network.json with customized ip ranges
10. Put new json on master node and update network data
11. Verify that new IP ranges are applied for network config
12. Add following nodes to default nodegroup:
* 1 controller
* 2 contrail-config+contrail-control+contrail-db+
contrail-analytics
14. Add following nodes to custom nodegroup:
* 2 contrail-controller+contrail-analytics
13. Add following nodes to custom nodegroup:
* 1 cinder
* 1 contrail-config+contrail-control+contrail-db+
contrail-analytics
* 1 ccontrail-controller+ contrail-analytics
* 1 contrail-analytics-db
15. Deploy cluster
16. Run health checks (OSTF)
14. Deploy cluster
15. Run health checks (OSTF)
Duration 2.5 hours
"""
conf_contrail = {"dedicated_analytics_db": True}
if not MULTIPLE_NETWORKS:
raise SkipTest()
self.show_step(1, initialize=True)
self.env.revert_snapshot("ready")
plugin.show_range(self, 2, 7)
plugin.show_range(self, 2, 6)
plugin.prepare_contrail_plugin(self, snapshot_name="ready")
cluster_id = self.fuel_web.get_last_created_cluster()
self.env.bootstrap_nodes(self.env.d_env.nodes().slaves[0:3])
plugin.activate_plugin(self, **conf_contrail)
plugin.activate_plugin(self)
# activate vSRX image
vsrx_setup_result = vsrx.activate(self, vsrx_config=True)
self.show_step(7)
self.show_step(6)
self.netconf_all_groups = self.fuel_web.client.get_networks(cluster_id)
custom_group2 = self.fuel_web.get_nodegroup(
cluster_id, name=NODEGROUPS[2]['name'])
@ -825,15 +809,15 @@ class TestMultipleNets(TestMultipleClusterNets):
"'update_dnsmasq' is finished!")
self.fuel_web.client.delete_nodegroup(custom_group2['id'])
self.show_step(8)
self.show_step(7)
self.env.bootstrap_nodes(self.env.d_env.nodes().slaves[3:6])
self.show_step(9)
self.show_step(8)
updated_storage_default, updated_storage_custom, \
updated_mgmt_default, updated_mgmt_custom = \
self.update_network_config(cluster_id)
plugin.show_range(self, 10, 15)
plugin.show_range(self, 9, 14)
nodegroup_default = NODEGROUPS[0]['name']
nodegroup_custom1 = NODEGROUPS[1]['name']
self.fuel_web.update_nodes(
@ -843,23 +827,23 @@ class TestMultipleNets(TestMultipleClusterNets):
['controller'], nodegroup_default],
'slave-02': [['compute'], nodegroup_default],
'slave-03': [
['contrail-config', 'contrail-control', 'contrail-db',
'contrail-analytics'], nodegroup_default],
['contrail-controller', 'contrail-analytics'],
nodegroup_default],
'slave-04': [
['contrail-config', 'contrail-control', 'contrail-db',
'contrail-analytics'], nodegroup_custom1],
['contrail-controller', 'contrail-analytics'],
nodegroup_custom1],
'slave-05': [
['contrail-config', 'contrail-control', 'contrail-db',
'contrail-analytics'], nodegroup_custom1],
['contrail-controller', 'contrail-analytics'],
nodegroup_custom1],
'slave-06': [
['contrail-analytics-db'], nodegroup_custom1],
}
)
self.show_step(15)
self.show_step(14)
openstack.deploy_cluster(self)
TestContrailCheck(self).cloud_check(['contrail'])
self.show_step(16)
self.show_step(15)
if vsrx_setup_result and settings.VSRX_CONFIG_PATH:
self.fuel_web.run_ostf(
cluster_id=cluster_id,

408
plugin_test/tests/test_integration.py
View File

@ -57,13 +57,11 @@ class IntegrationTests(TestBasic):
1. Create an environment with "Neutron with tunneling
segmentation" as a network configuration and CEPH storage
2. Enable and configure Contrail plugin
3. Enable dedicated analytics DB
4. Add 3 nodes with controller role
5. Add 3 nodes with "compute" and "Ceph-OSD" roles
6. Add a node with contrail-config, contrail-control
and contrail-db roles
7. Add a node with contrail-analytics-db and
contrail-analytics roles
3. Add 3 nodes with controller role
4. Add 3 nodes with "compute" and "Ceph-OSD" roles
5. Add a node with contrail-controller role
6. Add a node with contrail-analytics role
7. Add a node with contrail-analytics-db role
8. Deploy cluster with plugin
9. Run contrail health check tests
10. Run OSTF tests
@ -71,8 +69,6 @@ class IntegrationTests(TestBasic):
Duration 120 min
"""
conf_contrail = {"dedicated_analytics_db": True}
self.show_step(1)
plugin.prepare_contrail_plugin(self, slaves=9,
options={'images_ceph': True,
@ -81,12 +77,12 @@ class IntegrationTests(TestBasic):
'objects_ceph': True,
'volumes_lvm': False})
plugin.show_range(self, 2, 4)
plugin.activate_plugin(self, **conf_contrail)
self.show_step(2)
plugin.activate_plugin(self)
# activate vSRX image
vsrx_setup_result = vsrx.activate()
plugin.show_range(self, 4, 8)
plugin.show_range(self, 3, 8)
self.fuel_web.update_nodes(
self.cluster_id,
{
@ -96,11 +92,9 @@ class IntegrationTests(TestBasic):
'slave-04': ['compute', 'ceph-osd'],
'slave-05': ['compute', 'ceph-osd'],
'slave-06': ['compute', 'ceph-osd'],
'slave-07': ['contrail-config',
'contrail-control',
'contrail-db'],
'slave-08': ['contrail-analytics',
'contrail-analytics-db']
'slave-07': ['contrail-controller'],
'slave-08': ['contrail-analytics'],
'slave-09': ['contrail-analytics-db']
})
self.show_step(8)
@ -122,30 +116,29 @@ class IntegrationTests(TestBasic):
1. Create an environment with "Neutron with tunneling
segmentation" as a network configuration
2. Enable and configure Contrail plugin
3. Enable dedicated analytics DB
4. Add a node with controller role
5. Add 2 nodes with "compute" and "Storage-cinder" roles
6. Add a node with Base-OS role
7. Add 3 nodes with "contrail-config", "contrail-control",
"contrail-db" and "contrail-analytics" roles
8. Add a node with 'contrail-analytics-db' role
9. Deploy cluster with plugin
10. Run contrail health check tests
11. Run OSTF tests
3. Add a node with controller role
4. Add 2 nodes with "compute" and "Storage-cinder" roles
5. Add a node with Base-OS role
6. Add a node with 'contrail-controller',
"contrail-analytics" roles
7. Add a node with "contrail-analytics","contrail-analytics-db"
role
8. Deploy cluster with plugin
9. Run contrail health check tests
10. Run OSTF tests
Duration 120 min
"""
conf_contrail = {"dedicated_analytics_db": True}
self.show_step(1)
plugin.prepare_contrail_plugin(self, slaves=9)
plugin.show_range(self, 2, 4)
plugin.activate_plugin(self, **conf_contrail)
self.show_step(2)
plugin.activate_plugin(self)
# activate vSRX image
vsrx_setup_result = vsrx.activate()
plugin.show_range(self, 4, 9)
plugin.show_range(self, 3, 8)
self.fuel_web.update_nodes(
self.cluster_id,
{
@ -153,26 +146,15 @@ class IntegrationTests(TestBasic):
'slave-02': ['compute', 'cinder'],
'slave-03': ['compute', 'cinder'],
'slave-04': ['base-os'],
'slave-05': ['contrail-config',
'contrail-control',
'contrail-db',
'contrail-analytics'],
'slave-06': ['contrail-config',
'contrail-control',
'contrail-db',
'contrail-analytics'],
'slave-07': ['contrail-config',
'contrail-control',
'contrail-db',
'contrail-analytics'],
'slave-08': ['contrail-analytics-db']
'slave-05': ['contrail-controller', 'contrail-analytics'],
'slave-06': ['contrail-analytics-db', 'contrail-analytics'],
})
self.show_step(9)
self.show_step(8)
openstack.deploy_cluster(self)
self.show_step(10)
self.show_step(9)
TestContrailCheck(self).cloud_check(['contrail'])
self.show_step(11)
self.show_step(10)
if vsrx_setup_result:
self.fuel_web.run_ostf(cluster_id=self.cluster_id)
@ -186,24 +168,22 @@ class IntegrationTests(TestBasic):
1. Create an environment with "Neutron with tunneling
segmentation" as a network configuration and CEPH storage
2. Enable and configure Contrail plugin
3. Enable dedicated analytics DB
4. Add a node with "controller" role
5. Add a node with "controller" + "MongoDB" multirole
6. Add a node with "controller"+ "ceph-OSD" multiroles
7. Add a node with "compute" + "ceph-OSD" + "cinder" multiroles
8. Add a node with "compute" + "ceph-OSD" multiroles
9. Add a node with "MongoDB" role
10. Add a node with "contrail-config", "contrail-control",
"contrail-db" and "contrail-analytics" roles
11. Add a node with "contrail-analytics-db" role
12. Deploy cluster with plugin
13. Run contrail health check tests
14. Run OSTF tests
3. Add a node with "controller" role
4. Add a node with "controller" + "MongoDB" multirole
5. Add a node with "controller"+ "ceph-OSD" multiroles
6. Add a node with "compute" + "ceph-OSD" + "cinder" multiroles
7. Add a node with "compute" + "ceph-OSD" multiroles
8. Add a node with "MongoDB" role
9. Add a node with 'contrail-controller' role
10. Add a node with "contrail-analytics-db" and
"contrail-analytics" roles
11. Deploy cluster with plugin
12. Run contrail health check tests
13. Run OSTF tests
Duration 120 min
"""
conf_contrail = {"dedicated_analytics_db": True}
min_slave_ram = 10000
self.show_step(1)
plugin.prepare_contrail_plugin(
@ -212,12 +192,12 @@ class IntegrationTests(TestBasic):
options={'images_ceph': True,
'ceilometer': True})
plugin.show_range(self, 2, 4)
plugin.activate_plugin(self, **conf_contrail)
self.show_step(2)
plugin.activate_plugin(self)
# activate vSRX image
vsrx_setup_result = vsrx.activate()
plugin.show_range(self, 4, 12)
plugin.show_range(self, 3, 11)
self.fuel_web.update_nodes(
self.cluster_id,
{
@ -227,18 +207,15 @@ class IntegrationTests(TestBasic):
'slave-04': ['compute', 'ceph-osd'],
'slave-05': ['compute', 'ceph-osd', 'cinder'],
'slave-06': ['mongo'],
'slave-07': ['contrail-config',
'contrail-control',
'contrail-db',
'contrail-analytics'],
'slave-08': ['contrail-analytics-db']
'slave-07': ['contrail-controller'],
'slave-08': ['contrail-analytics-db', 'contrail-analytics']
})
self.show_step(12)
self.show_step(11)
openstack.deploy_cluster(self)
self.show_step(13)
self.show_step(12)
TestContrailCheck(self).cloud_check(['contrail'])
self.show_step(14)
self.show_step(13)
check_ram_result = openstack.check_slave_memory(min_slave_ram)
# https://bugs.launchpad.net/fuel/newton/+bug/1584190
# remove should fail, when bug will be fixed
@ -256,7 +233,6 @@ class IntegrationTests(TestBasic):
test_sets=['smoke', 'sanity', 'ha'],
timeout=settings.OSTF_RUN_TIMEOUT)
@test(depends_on=[SetupEnvironment.prepare_slaves_9],
groups=["contrail_jumbo", "contrail_integration_tests"])
@log_snapshot_after_test
@ -267,23 +243,19 @@ class IntegrationTests(TestBasic):
1. Create an environment with "Neutron with tunneling
segmentation" as a network configuration
2. Enable and configure Contrail plugin
3. Enable dedicated analytics DB
4. Add a node with "controller" and "Ceph OSD" roles
5. Add 2 nodes with "compute" and "Storage-Ceph OSD" roles
6. Add a node with "contrail-config", "contrail-control",
"contrail-db" roles
7. Add 2 nodes with "contrail-config", "contrail-control" roles
8. Add node with "contrail-analytics" and
"contrail-analytics-db" roles
9. Configure MTU on network interfaces (Jumbo-frames)
10. Deploy cluster with plugin
11. Run contrail health check tests
12. Run OSTF tests
3. Add a node with "controller" and "Ceph OSD" roles
4. Add 2 nodes with "compute" and "Storage-Ceph OSD" roles
5. Add a node with "contrail-analytics",
'contrail-controller' roles
6. Add node with "contrail-analytics-db" role
7. Configure MTU on network interfaces (Jumbo-frames)
8. Deploy cluster with plugin
9. Run contrail health check tests
10. Run OSTF tests
Duration 120 min
"""
conf_contrail = {"dedicated_analytics_db": True}
self.show_step(1)
plugin.prepare_contrail_plugin(
self, slaves=9, options={'images_ceph': True}
@ -308,8 +280,8 @@ class IntegrationTests(TestBasic):
logger.debug("New {0} interface properties:\n{1}"
.format(iface, jumbo.get_host_iface(iface)))
plugin.show_range(self, 2, 4)
plugin.activate_plugin(self, **conf_contrail)
self.show_step(2)
plugin.activate_plugin(self)
interfaces = {
'enp0s3': ['fuelweb_admin'],
@ -330,26 +302,19 @@ class IntegrationTests(TestBasic):
# activate vSRX image
vsrx_setup_result = vsrx.activate()
plugin.show_range(self, 4, 9)
plugin.show_range(self, 3, 7)
self.fuel_web.update_nodes(
self.cluster_id,
{
'slave-01': ['controller', 'ceph-osd'],
'slave-02': ['compute', 'ceph-osd'],
'slave-03': ['compute', 'ceph-osd'],
'slave-04': ['contrail-config',
'contrail-control',
'contrail-db'],
'slave-05': ['contrail-config',
'contrail-control'],
'slave-06': ['contrail-config',
'contrail-control'],
'slave-07': ['contrail-analytics',
'contrail-analytics-db'],
'slave-04': ['contrail-controller', 'contrail-analytics'],
'slave-05': ['contrail-analytics-db'],
}
)
self.show_step(9)
self.show_step(7)
slave_nodes = \
self.fuel_web.client.list_cluster_nodes(self.cluster_id)
for node in slave_nodes:
@ -357,11 +322,11 @@ class IntegrationTests(TestBasic):
node['id'], interfaces,
override_ifaces_params=interfaces_update)
self.show_step(10)
self.show_step(8)
openstack.deploy_cluster(self)
self.show_step(11)
self.show_step(9)
TestContrailCheck(self).cloud_check(['contrail'])
self.show_step(12)
self.show_step(10)
if vsrx_setup_result:
self.fuel_web.run_ostf(cluster_id=self.cluster_id)
@ -385,12 +350,11 @@ class IntegrationTests(TestBasic):
1. Create an environment with "Neutron with tunneling
segmentation" as a network configuration
2. Enable and configure Contrail plugin
3. Enable dedicated analytics DB
4. Add 3 nodes with controller role
5. Add 2 nodes with "compute" roles
6. Add 3 nodes with "contrail-config", "contrail-control".
"contrail-db" and "contrail-analytics" roles
7. Add a node with "contrail-analytics-db" role
3. Add 3 nodes with controller role
4. Add 2 nodes with "compute" roles
5. Add a node with 'contrail-controller' role
6. Add a node with "contrail-analytics" role
7. Add 2 nodes with "contrail-analytics-db" role
8. Bond network interfaces with balance-rr mode
9. Deploy cluster with plugin
10. Run contrail health check tests
@ -399,17 +363,16 @@ class IntegrationTests(TestBasic):
Duration 120 min
"""
conf_contrail = {"dedicated_analytics_db": True}
self.show_step(1)
plugin.prepare_contrail_plugin(self, slaves=9)
plugin.show_range(self, 2, 4)
plugin.activate_plugin(self, **conf_contrail)
self.show_step(2)
plugin.activate_plugin(self)
# configure vlan on storage and private interfaces
openstack.assign_vlan(self, private=101, storage=102)
plugin.show_range(self, 4, 8)
plugin.show_range(self, 3, 8)
self.fuel_web.update_nodes(
self.cluster_id,
{
@ -418,19 +381,10 @@ class IntegrationTests(TestBasic):
'slave-03': ['controller'],
'slave-04': ['compute'],
'slave-05': ['compute'],
'slave-06': ['contrail-config',
'contrail-control',
'contrail-db',
'contrail-analytics'],
'slave-07': ['contrail-config',
'contrail-control',
'contrail-db',
'contrail-analytics'],
'slave-08': ['contrail-config',
'contrail-control',
'contrail-db',
'contrail-analytics'],
'slave-09': ['contrail-analytics-db'],
'slave-06': ['contrail-controller'],
'slave-07': ['contrail-analytics'],
'slave-08': ['contrail-analytics-db'],
'slave-09': ['contrail-analytics-db'],
},
)
@ -478,35 +432,32 @@ class IntegrationTests(TestBasic):
1. Create an environment with "Neutron with tunneling
segmentation" as a network configuration
2. Enable and configure Contrail plugin
3. Enable dedicated analytics DB
3. Configure VLAN on network interfaces
4. Add 3 nodes with controller role
5. Add 2 nodes with "compute" and "Storage-cinder" roles
6. Add a node with "contrail-config", and "contrail-db" roles
7. Add a node with "contrail-db", "contrail-control" roles
8. Add a node with "contrail-db", "contrail-analytics" roles
9. Add a node with 'contrail-analytics-db' roles
10. Configure VLAN on network interfaces
11. Deploy cluster with plugin
12. Run contrail health check tests
13. Run OSTF tests
6. Add 2 nodes with 'contrail-controller' role
7. Add a node with "contrail-analytics" role
8. Add a node with 'contrail-analytics-db' role
9. Deploy cluster with plugin
10. Run contrail health check tests
11. Run OSTF tests
Duration 120 min
"""
conf_contrail = {"dedicated_analytics_db": True}
self.show_step(1)
plugin.prepare_contrail_plugin(self, slaves=9)
plugin.show_range(self, 2, 4)
plugin.activate_plugin(self, **conf_contrail)
self.show_step(2)
plugin.activate_plugin(self)
self.show_step(4)
self.show_step(3)
openstack.assign_vlan(self, storage=101, management=102)
# activate vSRX image
vsrx_setup_result = vsrx.activate()
plugin.show_range(self, 5, 10)
plugin.show_range(self, 4, 9)
self.fuel_web.update_nodes(
self.cluster_id,
{
@ -515,20 +466,18 @@ class IntegrationTests(TestBasic):
'slave-03': ['controller'],
'slave-04': ['compute', 'cinder'],
'slave-05': ['compute', 'cinder'],
'slave-06': [
'contrail-config', 'contrail-db'],
'slave-07': [
'contrail-control', 'contrail-db'],
'slave-08': ['contrail-db', 'contrail-analytics'],
'slave-06': ['contrail-controller'],
'slave-07': ['contrail-controller'],
'slave-08': ['contrail-analytics'],
'slave-09': ['contrail-analytics-db']
})
self.show_step(11)
self.show_step(9)
openstack.deploy_cluster(self)
self.show_step(12)
self.show_step(10)
TestContrailCheck(self).cloud_check(['contrail'])
self.show_step(13)
self.show_step(11)
if vsrx_setup_result:
self.fuel_web.run_ostf(
cluster_id=self.cluster_id,
@ -546,11 +495,13 @@ class IntegrationTests(TestBasic):
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",
"contrail-db" and "contrail-analytics" roles
6. Deploy cluster with plugin
7. Run contrail health check tests
8. Run OSTF tests
5. Add a node with 'contrail-controller' role
6. Add 2 nodes with 'contrail-analytics-db',
"contrail-analytics" roles
7. Add a node with 'contrail-analytics-db' role
8. Deploy cluster with plugin
9. Run contrail health check tests
10. Run OSTF tests
"""
self.show_step(1)
@ -570,7 +521,7 @@ class IntegrationTests(TestBasic):
# activate vSRX image
vsrx_setup_result = vsrx.activate()
plugin.show_range(self, 3, 6)
plugin.show_range(self, 3, 8)
self.fuel_web.update_nodes(
self.cluster_id,
{
@ -579,18 +530,18 @@ class IntegrationTests(TestBasic):
'slave-03': ['controller', 'ceph-osd'],
'slave-04': ['compute'],
'slave-05': ['compute'],
'slave-06': ['contrail-config',
'contrail-control',
'contrail-db',
'contrail-analytics'],
'slave-06': ['contrail-controller'],
'slave-07': ['contrail-analytics-db', 'contrail-analytics'],
'slave-08': ['contrail-analytics-db', 'contrail-analytics'],
'slave-09': ['contrail-analytics-db']
})
self.show_step(6)
self.show_step(8)
openstack.deploy_cluster(self)
self.show_step(7)
self.show_step(9)
TestContrailCheck(self).cloud_check(['contrail'])
self.show_step(8)
self.show_step(10)
if vsrx_setup_result:
self.fuel_web.run_ostf(cluster_id=self.cluster_id,
test_sets=['smoke', 'sanity', 'ha'])
@ -607,11 +558,12 @@ class IntegrationTests(TestBasic):
2. Enable and configure Contrail plugin
3. Add 3 nodes with "controller" + "storage-cinder" multirole
4. Add 2 nodes with "compute" role
5. Add 1 node with "contrail-config", "contrail-control",
"contrail-db" and "contrail-analytics" roles
6. Deploy cluster with plugin
7. Run contrail health check tests
8. Run OSTF tests
5. Add 2 node with 'contrail-controller',
"contrail-analytics" roles
6. Add a node with 'contrail-analytics-db' role
7. Deploy cluster with plugin
8. Run contrail health check tests
9. Run OSTF tests
"""
self.show_step(1)
@ -623,7 +575,7 @@ class IntegrationTests(TestBasic):
# activate vSRX image
vsrx_setup_result = vsrx.activate()
plugin.show_range(self, 3, 6)
plugin.show_range(self, 3, 7)
self.fuel_web.update_nodes(
self.cluster_id,
{
@ -632,18 +584,17 @@ class IntegrationTests(TestBasic):
'slave-03': ['controller', 'cinder'],
'slave-04': ['compute'],
'slave-05': ['compute'],
'slave-06': ['contrail-config',
'contrail-control',
'contrail-db',
'contrail-analytics'],
'slave-06': ['contrail-controller', 'contrail-analytics'],
'slave-07': ['contrail-analytics', 'contrail-controller'],
'slave-08': ['contrail-analytics-db']
})
self.show_step(6)
openstack.deploy_cluster(self)
self.show_step(7)
openstack.deploy_cluster(self)
self.show_step(8)
TestContrailCheck(self).cloud_check(['contrail'])
self.show_step(8)
self.show_step(9)
if vsrx_setup_result:
self.fuel_web.run_ostf(cluster_id=self.cluster_id,
test_sets=['smoke', 'sanity', 'ha'])
@ -659,34 +610,33 @@ class IntegrationTests(TestBasic):
1. Create an environment with "Neutron with tunneling
segmentation" as a network configuration and CEPH storage
2. Enable and configure Contrail plugin
3. Enable dedicated analytics DB
4. Add 1 node with "controller", "storage-cinder",
3. Add 1 node with "controller", "storage-cinder",
and "Ceph-OSD" roles
5. Add 1 node with "controller" + "storage-cinder" and 1 node
4. Add 1 node with "controller" + "storage-cinder" and 1 node
with "controller" + "Ceph-OSD" multiroles
6. Add 1 nodes with "compute", "cinder", "ceph-osd" roles
7. Add 1 nodes with "compute" role
8. Add 3 nodes with "contrail-config", "contrail-control",
"contrail-db" and "contrail-analytics" roles
9. Add a node with 'contrail-analytics-db' roles
5. Add 1 nodes with "compute", "cinder", "ceph-osd" roles
6. Add 1 nodes with "compute" role
7. Add a node with 'contrail-controller' role
8. Add 2 node with 'contrail-analytics-db',
"contrail-analytics" roles
9. Add a node with 'contrail-analytics-db' role
10. Deploy cluster with plugin
11. Run contrail health check tests
12. Run OSTF tests
"""
conf_contrail = {"dedicated_analytics_db": True}
self.show_step(1)
plugin.prepare_contrail_plugin(
self, slaves=9, options={'images_ceph': True}
)
plugin.show_range(self, 2, 4)
plugin.activate_plugin(self, **conf_contrail)
self.show_step(2)
plugin.activate_plugin(self)
# activate vSRX image
vsrx_setup_result = vsrx.activate()
plugin.show_range(self, 4, 10)
plugin.show_range(self, 3, 10)
self.fuel_web.update_nodes(
self.cluster_id,
{
@ -695,18 +645,9 @@ class IntegrationTests(TestBasic):
'slave-03': ['controller', 'ceph-osd'],
'slave-04': ['compute', 'cinder', 'ceph-osd'],
'slave-05': ['compute'],
'slave-06': ['contrail-config',
'contrail-control',
'contrail-db',
'contrail-analytics'],
'slave-07': ['contrail-config',
'contrail-control',
'contrail-db',
'contrail-analytics'],
'slave-08': ['contrail-config',
'contrail-control',
'contrail-db',
'contrail-analytics'],
'slave-06': ['contrail-controller'],
'slave-07': ['contrail-analytics-db', 'contrail-analytics'],
'slave-08': ['contrail-analytics-db', 'contrail-analytics'],
'slave-09': ['contrail-analytics-db']
})
@ -738,16 +679,15 @@ class IntegrationTests(TestBasic):
5. Run OSTF and check Contrail node status.
"""
conf_contrail = {"dedicated_analytics_db": True}
self.show_step(1)
plugin.prepare_contrail_plugin(self, slaves=5)
plugin.activate_plugin(self, **conf_contrail)
plugin.activate_plugin(self)
vsrx_setup_result = vsrx.activate()
conf_nodes = {
'slave-01': ['controller'],
'slave-02': ['compute', 'cinder'],
'slave-03': ['contrail-config', 'contrail-control'],
'slave-04': ['contrail-db', 'contrail-analytics'],
'slave-03': ['contrail-controller'],
'slave-04': ['contrail-analytics'],
'slave-05': ['contrail-analytics-db']
}
self.fuel_web.update_nodes(self.cluster_id, conf_nodes)
@ -787,14 +727,11 @@ class IntegrationTests(TestBasic):
segmentation" as a network configuration and CEPH storage
2. Enable sahara
3. Enable and configure Contrail plugin
4. Enable dedicated analytics DB
5. Add a node with controller role
6. Add 3 nodes with "compute" and "Ceph-OSD" roles
7. Add a node with contrail-config, contrail-control,
contrail-db and contrail-analytics roles
8. Add a node with 'contrail-analytics'+'contrail-analytics-db'
roles
9. Add a node with 'contrail-analytics-db' role
4. Add a node with controller role
5. Add 3 nodes with "compute" and "Ceph-OSD" roles
6. Add a node with contrail-controller role
7. Add a node with 'contrail-analytics' role
8. Add a node with 'contrail-analytics-db' role
9. Deploy cluster with plugin
10. Run contrail health check tests
11. Run OSTF tests
@ -803,7 +740,6 @@ class IntegrationTests(TestBasic):
"""
min_slave_ram = 8138
conf_contrail = {"dedicated_analytics_db": True}
plugin.show_range(self, 1, 3)
plugin.prepare_contrail_plugin(self, slaves=9,
@ -814,12 +750,12 @@ class IntegrationTests(TestBasic):
'volumes_lvm': False,
'sahara': True})
plugin.show_range(self, 3, 5)
plugin.activate_plugin(self, **conf_contrail)
self.show_step(3)
plugin.activate_plugin(self)
# activate vSRX image
vsrx_setup_result = vsrx.activate()
plugin.show_range(self, 5, 9)
plugin.show_range(self, 4, 9)
self.fuel_web.update_nodes(
self.cluster_id,
{
@ -827,12 +763,9 @@ class IntegrationTests(TestBasic):
'slave-02': ['compute', 'ceph-osd'],
'slave-03': ['compute', 'ceph-osd'],
'slave-04': ['compute', 'ceph-osd'],
'slave-05': ['contrail-config',
'contrail-control',
'contrail-db',
'contrail-analytics'],
'slave-05': ['contrail-controller'],
'slave-06': ['contrail-analytics-db'],
'slave-07': ['contrail-analytics', 'contrail-analytics-db']
'slave-07': ['contrail-analytics']
})
self.show_step(9)
@ -866,52 +799,47 @@ class IntegrationTests(TestBasic):
segmentation" as a network configuration
2. Enable murano
3. Enable and configure Contrail plugin
4. Enable dedicated analytics DB
5. Add a node with controller role
6. Add a node with "compute" and "Storage-cinder" roles
7. Add a node with "contrail-config" and "contrail-db" roles
8. Add a node with "contrail-db", "contrail-control" roles
9. Add a node with "contrail-analytics",
"contrail-analytics-db" roles
10. Deploy cluster with plugin
11. Run contrail health check tests
12. Run OSTF tests
4. Add a node with controller role
5. Add a node with "compute" and "Storage-cinder" roles
6. Add a node with 'contrail-controller' role
7. Add a node with "contrail-analytics" role
8. Add a node with "contrail-analytics-db" role
9. Deploy cluster with plugin
10. Run contrail health check tests
11. Run OSTF tests
Duration 120 min
"""
min_slave_ram = 10000
conf_contrail = {"dedicated_analytics_db": True,
"contrail_api_public_port": "8098"}
plugin.show_range(self, 1, 3)
plugin.prepare_contrail_plugin(self, slaves=5,
options={'murano': True})
plugin.show_range(self, 3, 5)
plugin.activate_plugin(self, **conf_contrail)
self.show_step(3)
plugin.activate_plugin(self, contrail_api_public_port="8098")
# activate vSRX image
vsrx_setup_result = vsrx.activate()
plugin.show_range(self, 5, 10)
plugin.show_range(self, 4, 9)
self.fuel_web.update_nodes(
self.cluster_id,
{
'slave-01': ['controller'],
'slave-02': ['compute', 'cinder'],
'slave-03': ['contrail-config', 'contrail-db'],
'slave-04': ['contrail-control', 'contrail-db'],
'slave-05': ['contrail-analytics',
'contrail-analytics-db'],
'slave-03': ['contrail-controller'],
'slave-04': ['contrail-analytics'],
'slave-05': ['contrail-analytics-db']
})
self.show_step(10)
self.show_step(9)
openstack.deploy_cluster(self)
self.show_step(11)
self.show_step(10)
TestContrailCheck(self).cloud_check(['contrail'])
self.show_step(12)
self.show_step(11)
check_ram_result = openstack.check_slave_memory(min_slave_ram)
if vsrx_setup_result and check_ram_result:
self.fuel_web.run_ostf(

50
plugin_test/tests/test_system.py
View File

@ -86,10 +86,9 @@ class SystemTests(TestBasic):
ip_from, ip_to))
assert_true(
remote.execute_through_host(
hostname=ip_from,
cmd=command,
auth=self.cirros_auth
)['exit_code'] == ping_result,
hostname=ip_from,
cmd=command,
auth=self.cirros_auth)['exit_code'] == ping_result,
'Ping responce is not received.')
def get_role(self, os_conn, role_name):
@ -123,15 +122,12 @@ class SystemTests(TestBasic):
1. Create an environment with "Neutron with tunneling
segmentation" as a network configuration
2. Enable Contrail plugin
3. Enable dedicated analytics DB
4. Add 1 node with contrail-config, contrail-control,
and contrail-db roles
5. Add a node with controller, mongo roles
6. Add a node with compute role
7. Add a node with contrail-analytics and contrail-analytics-db
roles
8. Deploy cluster with plugin
9. Run OSTF.
3. Add 1 node with contrail-controller, contrail-analytic roles
4. Add a node with controller, mongo roles
5. Add a node with compute role
6. Add a node contrail-analytics-db role
7. Deploy cluster with plugin
8. Run OSTF.
Duration 90 min
@ -143,25 +139,23 @@ class SystemTests(TestBasic):
# activate vSRX image
vsrx_setup_result = vsrx.activate()
plugin.show_range(self, 2, 4)
plugin.activate_plugin(self, dedicated_analytics_db=True)
self.show_step(2)
plugin.activate_plugin(self)
plugin.show_range(self, 4, 8)
plugin.show_range(self, 3, 7)
self.fuel_web.update_nodes(
self.cluster_id,
{
'slave-01': ['contrail-config',
'contrail-control',
'contrail-db'],
'slave-01': ['contrail-controller', 'contrail-analytics'],
'slave-02': ['controller', 'mongo'],
'slave-03': ['compute'],
'slave-04': ['compute'],
'slave-05': ['contrail-analytics', 'contrail-analytics-db'],
'slave-05': ['contrail-analytics-db'],
})
self.show_step(8)
self.show_step(7)
openstack.deploy_cluster(self)
self.show_step(9)
self.show_step(8)
if vsrx_setup_result:
self.fuel_web.run_ostf(
cluster_id=self.cluster_id,
@ -567,14 +561,14 @@ class SystemTests(TestBasic):
os_ip = self.fuel_web.get_public_vip(cluster_id)
self.show_step(2)
horizon_cert = ssl.get_server_certificate((os_ip, 443),
ssl_version = ssl.PROTOCOL_TLSv1)
horizon_cert = ssl.get_server_certificate(
(os_ip, 443), ssl_version=ssl.PROTOCOL_TLSv1)
self.show_step(3)
contrail_ui_cert = ssl.get_server_certificate((os_ip, 8143),
ssl_version = ssl.PROTOCOL_TLSv1)
contrail_ui_cert = ssl.get_server_certificate(
(os_ip, 8143), ssl_version=ssl.PROTOCOL_TLSv1)
self.show_step(4)
contrail_api_cert = ssl.get_server_certificate((os_ip, 8082),
ssl_version = ssl.PROTOCOL_TLSv1)
contrail_api_cert = ssl.get_server_certificate(
(os_ip, 8082), ssl_version=ssl.PROTOCOL_TLSv1)
self.show_step(5)
if not horizon_cert == contrail_ui_cert:
raise Exception("ContrailUI certificate is not valid")