Fix flake8 issues.
-fix flake8 D100, D102, D103, D202, D205, D210, D400, D401, E123,E221, E226, E302, E501, E731, F401, H101, H201, H405 -remove unnecessary imports -remove unnecessary class variable node_name Change-Id: I39712833b5fe918480b74bd09361db722063fedc
This commit is contained in:
parent
f612200111
commit
1cded89c96
|
@ -1,13 +1,14 @@
|
|||
# Copyright 2015 Mirantis, Inc.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
"""Copyright 2016 Mirantis, Inc.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
not use this file except in compliance with the License. You may obtain
|
||||
copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
License for the specific language governing permissions and limitations
|
||||
under the License.
|
||||
"""
|
||||
|
|
|
@ -67,7 +67,7 @@ def deploy_cluster(obj, wait_for_status='operational'):
|
|||
obj.fuel_web.deploy_cluster_wait(
|
||||
obj.cluster_id, check_services=False,
|
||||
timeout=180 * 60)
|
||||
except:
|
||||
except Exception:
|
||||
nailgun_nodes = obj.env.fuel_web.client.list_cluster_nodes(
|
||||
obj.env.fuel_web.get_last_created_cluster())
|
||||
time.sleep(420)
|
||||
|
|
|
@ -1,16 +1,17 @@
|
|||
# Copyright 2015 Mirantis, Inc.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
"""Copyright 2016 Mirantis, Inc.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
not use this file except in compliance with the License. You may obtain
|
||||
copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
License for the specific language governing permissions and limitations
|
||||
under the License.
|
||||
"""
|
||||
|
||||
import os
|
||||
import time
|
||||
|
@ -48,6 +49,7 @@ INTERFACES = {
|
|||
|
||||
|
||||
def upload_contrail_packages(obj):
|
||||
"""Upload contrail packeges on master node."""
|
||||
node_ssh = obj.env.d_env.get_admin_remote()
|
||||
if os.path.splitext(obj.pack_path)[1] == ".deb":
|
||||
pkg_name = os.path.basename(obj.pack_path)
|
||||
|
@ -59,6 +61,7 @@ def upload_contrail_packages(obj):
|
|||
|
||||
|
||||
def install_packages(obj, remote):
|
||||
"""Install contrail packeges on master node."""
|
||||
command = "cd " + obj.pack_copy_path + " && ./install.sh"
|
||||
logger.info('The command is %s', command)
|
||||
remote.execute_async(command)
|
||||
|
@ -67,8 +70,7 @@ def install_packages(obj, remote):
|
|||
|
||||
|
||||
def prepare_contrail_plugin(obj, slaves=None, options={}):
|
||||
"""Copy necessary packages to the master node and install them"""
|
||||
|
||||
"""Copy necessary packages to the master node and install them."""
|
||||
obj.env.revert_snapshot("ready_with_%d_slaves" % slaves)
|
||||
|
||||
# copy plugin to the master node
|
||||
|
@ -94,7 +96,7 @@ def prepare_contrail_plugin(obj, slaves=None, options={}):
|
|||
|
||||
|
||||
def activate_plugin(obj):
|
||||
"""Enable plugin in contrail settings"""
|
||||
"""Enable plugin in contrail settings."""
|
||||
plugin_name = 'contrail'
|
||||
msg = "Plugin couldn't be enabled. Check plugin version. Test aborted"
|
||||
assert_true(
|
||||
|
@ -118,9 +120,8 @@ def activate_plugin(obj):
|
|||
|
||||
|
||||
def activate_vsrx():
|
||||
"""Activate vSRX1 image"""
|
||||
|
||||
logger.info("#" * 10 + 'Configure iptables and route...' + "#" * 10)
|
||||
"""Activate vSRX1 image."""
|
||||
logger.info("#" * 10 + 'Configure iptables and route...' + "#" * 10)
|
||||
command = 'sudo /sbin/iptables -F'
|
||||
logger.info('The command is %s', command)
|
||||
subprocess.call(command, shell=True)
|
||||
|
@ -136,7 +137,8 @@ def activate_vsrx():
|
|||
'OSTF will not be running' + "#" * 10)
|
||||
return False
|
||||
|
||||
logger.info("#" * 10 + 'Delete previous installation of vSRX...' + "#" * 10)
|
||||
logger.info(
|
||||
"#" * 10 + 'Delete previous installation of vSRX...' + "#" * 10)
|
||||
command = 'virsh destroy vSRX1'
|
||||
logger.info('The command is %s', command)
|
||||
subprocess.call(command, shell=True)
|
||||
|
@ -166,8 +168,7 @@ def activate_vsrx():
|
|||
|
||||
|
||||
def net_group_preparation(obj):
|
||||
"""Prepare network group for network template """
|
||||
|
||||
"""Prepare network group for network template."""
|
||||
node_ssh = obj.env.d_env.get_admin_remote()
|
||||
|
||||
# preparing commands for gateway setting and private interface updating
|
||||
|
@ -186,7 +187,8 @@ def net_group_preparation(obj):
|
|||
node_ssh.execute_async(i)
|
||||
time.sleep(40)
|
||||
|
||||
|
||||
def show_range(obj, start_value, end_value):
|
||||
"""Show several steps"""
|
||||
"""Show several steps."""
|
||||
for i in range(start_value, end_value):
|
||||
obj.show_step(i)
|
||||
|
|
|
@ -1,13 +1,14 @@
|
|||
# Copyright 2015 Mirantis, Inc.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
"""Copyright 2016 Mirantis, Inc.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
not use this file except in compliance with the License. You may obtain
|
||||
copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
License for the specific language governing permissions and limitations
|
||||
under the License.
|
||||
"""
|
||||
|
|
|
@ -1,26 +1,26 @@
|
|||
# Copyright 2016 Mirantis, Inc.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
"""Copyright 2016 Mirantis, Inc.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
not use this file except in compliance with the License. You may obtain
|
||||
copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
License for the specific language governing permissions and limitations
|
||||
under the License.
|
||||
"""
|
||||
|
||||
import os
|
||||
from proboscis.asserts import assert_equal
|
||||
|
||||
from proboscis import test
|
||||
from fuelweb_test.helpers.decorators import log_snapshot_after_test
|
||||
from fuelweb_test.settings import CONTRAIL_PLUGIN_PACK_UB_PATH
|
||||
from fuelweb_test.tests.base_test_case import SetupEnvironment
|
||||
from fuelweb_test.tests.base_test_case import TestBasic
|
||||
from helpers import plugin
|
||||
from helpers import openstack
|
||||
|
||||
|
||||
@test(groups=["plugins"])
|
||||
|
@ -39,7 +39,7 @@ class FailoverTests(TestBasic):
|
|||
groups=["cannot_deploy_only_contrail_db"])
|
||||
@log_snapshot_after_test
|
||||
def cannot_deploy_only_contrail_db(self):
|
||||
"""Check can not deploy Contrail cluster with "contrail_db" only
|
||||
"""Check can not deploy Contrail cluster with "contrail_db" only.
|
||||
|
||||
Scenario:
|
||||
1. Create an environment with
|
||||
|
@ -50,7 +50,6 @@ class FailoverTests(TestBasic):
|
|||
4. Add 1 nodes with "contrail-db" role
|
||||
5. Deploy cluster and verify that it will fail
|
||||
"""
|
||||
|
||||
self.show_step(1)
|
||||
plugin.prepare_contrail_plugin(self, slaves=3)
|
||||
|
||||
|
@ -74,7 +73,7 @@ class FailoverTests(TestBasic):
|
|||
groups=["cannot_deploy_only_contrail_config"])
|
||||
@log_snapshot_after_test
|
||||
def cannot_deploy_only_contrail_config(self):
|
||||
"""Check can not deploy Contrail cluster with "contrail_config" only
|
||||
"""Check can not deploy Contrail cluster with "contrail_config" only.
|
||||
|
||||
Scenario:
|
||||
1. Create an environment with
|
||||
|
@ -85,7 +84,6 @@ class FailoverTests(TestBasic):
|
|||
4. Add 1 nodes with "contrail-config" role
|
||||
5. Deploy cluster and verify that it will fail
|
||||
"""
|
||||
|
||||
self.show_step(1)
|
||||
plugin.prepare_contrail_plugin(self, slaves=3)
|
||||
|
||||
|
@ -109,7 +107,7 @@ class FailoverTests(TestBasic):
|
|||
groups=["cannot_deploy_only_contrail_control"])
|
||||
@log_snapshot_after_test
|
||||
def cannot_deploy_only_contrail_control(self):
|
||||
"""Check can not deploy Contrail cluster with "contrail_control" only
|
||||
"""Check can not deploy Contrail cluster with "contrail_control" only.
|
||||
|
||||
Scenario:
|
||||
1. Create an environment with
|
||||
|
@ -120,7 +118,6 @@ class FailoverTests(TestBasic):
|
|||
4. Add 1 nodes with "contrail-control" role
|
||||
5. Deploy cluster and verify that it will fail
|
||||
"""
|
||||
|
||||
self.show_step(1)
|
||||
plugin.prepare_contrail_plugin(self, slaves=3)
|
||||
|
||||
|
|
|
@ -1,16 +1,17 @@
|
|||
# Copyright 2016 Mirantis, Inc.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
"""Copyright 2016 Mirantis, Inc.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
not use this file except in compliance with the License. You may obtain
|
||||
copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
License for the specific language governing permissions and limitations
|
||||
under the License.
|
||||
"""
|
||||
|
||||
import os
|
||||
from proboscis import test
|
||||
|
@ -41,8 +42,7 @@ class IntegrationTests(TestBasic):
|
|||
groups=["contrail_plugin_add_delete_controller_node"])
|
||||
@log_snapshot_after_test
|
||||
def contrail_plugin_add_delete_controller_node(self):
|
||||
"""Verify that Controller node can be deleted
|
||||
and added after deploying
|
||||
"""Verify that Controller node can be deleted and added after deploying.
|
||||
|
||||
Scenario:
|
||||
1. Create an environment with
|
||||
|
@ -118,7 +118,7 @@ class IntegrationTests(TestBasic):
|
|||
groups=["contrail_plugin_add_delete_compute_node"])
|
||||
@log_snapshot_after_test
|
||||
def contrail_plugin_add_delete_compute_node(self):
|
||||
"""Verify that Compute node can be deleted and added after deploying
|
||||
"""Verify that Compute node can be deleted and added after deploying.
|
||||
|
||||
Scenario:
|
||||
1. Create an environment with
|
||||
|
@ -190,7 +190,7 @@ class IntegrationTests(TestBasic):
|
|||
groups=["contrail_ha_with_shutdown_contrail_node"])
|
||||
@log_snapshot_after_test
|
||||
def contrail_ha_with_shutdown_contrail_node(self):
|
||||
"""Verify HA with deleting Contrail roles
|
||||
"""Verify HA with deleting Contrail roles.
|
||||
|
||||
Scenario:
|
||||
1. Create an environment with
|
||||
|
@ -242,7 +242,7 @@ class IntegrationTests(TestBasic):
|
|||
}
|
||||
|
||||
def check_node_state(cluster_id, node_name, node_state):
|
||||
"""Checks node state by it's name"""
|
||||
"""Check node state by it's name."""
|
||||
for node in self.fuel_web.client.list_cluster_nodes(cluster_id):
|
||||
if node_name in node['name']:
|
||||
assert_equal(node['status'], node_state,
|
||||
|
@ -283,7 +283,7 @@ class IntegrationTests(TestBasic):
|
|||
groups=["contrail_add_control"])
|
||||
@log_snapshot_after_test
|
||||
def contrail_add_control(self):
|
||||
"""Verify that Contrail control role can be added after deploying
|
||||
"""Verify that Contrail control role can be added after deploying.
|
||||
|
||||
Scenario:
|
||||
1. Create an environment with "Neutron with tunneling
|
||||
|
@ -332,7 +332,7 @@ class IntegrationTests(TestBasic):
|
|||
groups=["contrail_add_config"])
|
||||
@log_snapshot_after_test
|
||||
def contrail_add_config(self):
|
||||
"""Verify that Contrail config role can be added after deploying
|
||||
"""Verify that Contrail config role can be added after deploying.
|
||||
|
||||
Scenario:
|
||||
1. Create an environment with "Neutron with tunneling
|
||||
|
@ -381,7 +381,7 @@ class IntegrationTests(TestBasic):
|
|||
groups=["contrail_delete_control"])
|
||||
@log_snapshot_after_test
|
||||
def contrail_delete_control(self):
|
||||
"""Verify that Contrail control role can be deleted after deploying
|
||||
"""Verify that Contrail control role can be deleted after deploying.
|
||||
|
||||
Scenario:
|
||||
1. Create an environment with "Neutron with tunneling
|
||||
|
@ -432,7 +432,7 @@ class IntegrationTests(TestBasic):
|
|||
groups=["contrail_delete_config"])
|
||||
@log_snapshot_after_test
|
||||
def contrail_delete_config(self):
|
||||
"""Verify that Contrail config role can be deleted after deploying
|
||||
"""Verify that Contrail config role can be deleted after deploying.
|
||||
|
||||
Scenario:
|
||||
1. Create an environment with "Neutron with tunneling
|
||||
|
@ -485,8 +485,7 @@ class IntegrationTests(TestBasic):
|
|||
groups=["contrail_add_db"])
|
||||
@log_snapshot_after_test
|
||||
def contrail_add_db(self):
|
||||
"""Verify that Contrail DB role can be added and deleted after
|
||||
deploying
|
||||
"""Verify that Contrail DB role can be added and deleted after deploy.
|
||||
|
||||
Scenario:
|
||||
1. Create an environment with "Neutron with tunneling
|
||||
|
@ -535,7 +534,7 @@ class IntegrationTests(TestBasic):
|
|||
groups=["contrail_plugin_add_delete_compute_ceph"])
|
||||
@log_snapshot_after_test
|
||||
def contrail_plugin_add_delete_compute_ceph(self):
|
||||
"""Verify that compute node can be added and deleted in env with Ceph
|
||||
"""Verify that compute node can be added and deleted in env with Ceph.
|
||||
|
||||
Scenario:
|
||||
1. Create an environment with "Neutron with tunneling
|
||||
|
@ -588,6 +587,7 @@ class IntegrationTests(TestBasic):
|
|||
openstack.update_deploy_check(self, conf_db,
|
||||
is_vsrx=vsrx_setup_result)
|
||||
plugin.show_range(self, 9, 12)
|
||||
openstack.update_deploy_check(self, conf_db, delete=True,
|
||||
is_vsrx=vsrx_setup_result,
|
||||
ostf_fail_tests=['Check that required services are running'])
|
||||
openstack.update_deploy_check(
|
||||
self, conf_db, delete=True,
|
||||
is_vsrx=vsrx_setup_result,
|
||||
ostf_fail_tests=['Check that required services are running'])
|
||||
|
|
|
@ -1,16 +1,17 @@
|
|||
# Copyright 2015 Mirantis, Inc.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
"""Copyright 2016 Mirantis, Inc.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
not use this file except in compliance with the License. You may obtain
|
||||
copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
License for the specific language governing permissions and limitations
|
||||
under the License.
|
||||
"""
|
||||
|
||||
import os
|
||||
import os.path
|
||||
|
@ -47,7 +48,7 @@ class IntegrationTests(TestBasic):
|
|||
groups=["contrail_ha"])
|
||||
@log_snapshot_after_test
|
||||
def contrail_ha(self):
|
||||
"""Check Contrail deploy on HA environment
|
||||
"""Check Contrail deploy on HA environment.
|
||||
|
||||
Scenario:
|
||||
1. Create an environment with "Neutron with tunneling
|
||||
|
@ -103,7 +104,7 @@ class IntegrationTests(TestBasic):
|
|||
groups=["contrail_ha_baseos"])
|
||||
@log_snapshot_after_test
|
||||
def contrail_ha_baseos(self):
|
||||
"""Check deploy HA-contrail on an environment with a base-os node
|
||||
"""Check deploy HA-contrail on an environment with a base-os node.
|
||||
|
||||
Scenario:
|
||||
1. Create an environment with "Neutron with tunneling
|
||||
|
@ -157,7 +158,7 @@ class IntegrationTests(TestBasic):
|
|||
groups=["contrail_ceilometer"])
|
||||
@log_snapshot_after_test
|
||||
def contrail_ceilometer(self):
|
||||
"""Check deploy environment with Contrail and Ceilometer
|
||||
"""Check deploy environment with Contrail and Ceilometer.
|
||||
|
||||
Scenario:
|
||||
1. Create an environment with "Neutron with tunneling
|
||||
|
@ -215,7 +216,7 @@ class IntegrationTests(TestBasic):
|
|||
groups=["contrail_jumbo"])
|
||||
@log_snapshot_after_test
|
||||
def contrail_jumbo(self):
|
||||
"""Check deploy contrail on an environment with jumbo-frames support
|
||||
"""Check deploy contrail on an environment with jumbo-frames support.
|
||||
|
||||
Scenario:
|
||||
1. Create an environment with "Neutron with tunneling
|
||||
|
@ -266,7 +267,7 @@ class IntegrationTests(TestBasic):
|
|||
'enp0s5': ['management'],
|
||||
'enp0s6': ['private'],
|
||||
'enp0s7': ['storage'],
|
||||
}
|
||||
}
|
||||
|
||||
interfaces_update = [{
|
||||
'name': 'enp0s6',
|
||||
|
@ -274,7 +275,7 @@ class IntegrationTests(TestBasic):
|
|||
'mtu': 9000,
|
||||
'disable_offloading': False
|
||||
},
|
||||
}]
|
||||
}]
|
||||
|
||||
# activate vSRX image
|
||||
vsrx_setup_result = plugin.activate_vsrx()
|
||||
|
@ -293,7 +294,8 @@ class IntegrationTests(TestBasic):
|
|||
'contrail-control'],
|
||||
'slave-06': ['contrail-config',
|
||||
'contrail-control'],
|
||||
})
|
||||
}
|
||||
)
|
||||
|
||||
self.show_step(7)
|
||||
slave_nodes = \
|
||||
|
@ -324,7 +326,7 @@ class IntegrationTests(TestBasic):
|
|||
groups=["contrail_bonding"])
|
||||
@log_snapshot_after_test
|
||||
def contrail_bonding(self):
|
||||
"""Check deploy contrail with aggregation of network interfaces
|
||||
"""Check deploy contrail with aggregation of network interfaces.
|
||||
|
||||
Scenario:
|
||||
1. Create an environment with "Neutron with tunneling
|
||||
|
@ -369,9 +371,10 @@ class IntegrationTests(TestBasic):
|
|||
'contrail-control',
|
||||
'contrail-db'],
|
||||
},
|
||||
)
|
||||
)
|
||||
|
||||
cluster_nodes = self.fuel_web.client.list_cluster_nodes(self.cluster_id)
|
||||
cluster_nodes = self.fuel_web.client.list_cluster_nodes(
|
||||
self.cluster_id)
|
||||
|
||||
self.show_step(6)
|
||||
for node in cluster_nodes:
|
||||
|
@ -383,7 +386,7 @@ class IntegrationTests(TestBasic):
|
|||
self.show_step(7)
|
||||
openstack.deploy_cluster(self)
|
||||
|
||||
# TODO
|
||||
# TODO(unknown)
|
||||
# Tests using north-south connectivity are expected to fail because
|
||||
# they require additional gateway nodes, and specific contrail
|
||||
# settings. This mark is a workaround until it's verified
|
||||
|
@ -395,7 +398,7 @@ class IntegrationTests(TestBasic):
|
|||
self.fuel_web.run_ostf(
|
||||
cluster_id=self.cluster_id,
|
||||
test_sets=['smoke', 'sanity', 'ha'],
|
||||
timeout=45*60,
|
||||
timeout=45 * 60,
|
||||
should_fail=2,
|
||||
failed_test_name=[('Check network connectivity '
|
||||
'from instance via floating IP'),
|
||||
|
@ -406,7 +409,7 @@ class IntegrationTests(TestBasic):
|
|||
groups=["contrail_vlan"])
|
||||
@log_snapshot_after_test
|
||||
def contrail_vlan(self):
|
||||
"""Check deploy contrail on an environment with vlan-tagging
|
||||
"""Check deploy contrail on an environment with vlan-tagging.
|
||||
|
||||
Scenario:
|
||||
1. Create an environment with "Neutron with tunneling
|
||||
|
@ -463,7 +466,7 @@ class IntegrationTests(TestBasic):
|
|||
groups=["contrail_ceph_multirole"])
|
||||
@log_snapshot_after_test
|
||||
def contrail_ceph_multirole(self):
|
||||
"""Check deploy contrail with Controller + Ceph multirole
|
||||
"""Check deploy contrail with Controller + Ceph multirole.
|
||||
|
||||
Scenario:
|
||||
1. Create an environment with "Neutron with tunneling
|
||||
|
@ -520,7 +523,7 @@ class IntegrationTests(TestBasic):
|
|||
groups=["contrail_cinder_multirole"])
|
||||
@log_snapshot_after_test
|
||||
def contrail_cinder_multirole(self):
|
||||
"""Check deploy contrail with Controller + Cinder multirole
|
||||
"""Check deploy contrail with Controller + Cinder multirole.
|
||||
|
||||
Scenario:
|
||||
1. Create an environment with "Neutron with tunneling
|
||||
|
@ -571,7 +574,7 @@ class IntegrationTests(TestBasic):
|
|||
groups=["contrail_cinder_ceph_multirole"])
|
||||
@log_snapshot_after_test
|
||||
def contrail_cinder_ceph_multirole(self):
|
||||
"""Check deploy contrail with Controller + Cinder + Ceph multirole
|
||||
"""Check deploy contrail with Controller + Cinder + Ceph multirole.
|
||||
|
||||
Scenario:
|
||||
1. Create an environment with "Neutron with tunneling
|
||||
|
|
|
@ -1,23 +1,22 @@
|
|||
# Copyright 2016 Mirantis, Inc.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
"""Copyright 2016 Mirantis, Inc.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
not use this file except in compliance with the License. You may obtain
|
||||
copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
License for the specific language governing permissions and limitations
|
||||
under the License.
|
||||
"""
|
||||
|
||||
import os
|
||||
import yaml
|
||||
import time
|
||||
from ipaddr import IPNetwork
|
||||
|
||||
from proboscis import test
|
||||
from proboscis.asserts import assert_true
|
||||
from fuelweb_test import logger
|
||||
from fuelweb_test.helpers.decorators import log_snapshot_after_test
|
||||
from fuelweb_test.tests.base_test_case import SetupEnvironment
|
||||
|
@ -37,8 +36,6 @@ class TestNetworkTemplates(TestNetworkTemplatesBase, TestBasic):
|
|||
add_package = \
|
||||
'/var/www/nailgun/plugins/contrail-4.0/' \
|
||||
'repositories/ubuntu/contrail-setup*'
|
||||
node_name = lambda self, name_node: self.fuel_web. \
|
||||
get_nailgun_node_by_name(name_node)['hostname']
|
||||
|
||||
cluster_id = ''
|
||||
|
||||
|
@ -47,6 +44,10 @@ class TestNetworkTemplates(TestNetworkTemplatesBase, TestBasic):
|
|||
CONTRAIL_DISTRIBUTION = os.environ.get('CONTRAIL_DISTRIBUTION')
|
||||
|
||||
def get_network_templ(self, template_name):
|
||||
"""Get netwok template.
|
||||
|
||||
param: template_name: type string, name of file
|
||||
"""
|
||||
template = 'doc/source/examples/{0}.yaml'.format(template_name)
|
||||
logger.info('{0}'.format(template))
|
||||
if os.path.exists(template):
|
||||
|
@ -59,7 +60,7 @@ class TestNetworkTemplates(TestNetworkTemplatesBase, TestBasic):
|
|||
groups=["contrail_net_template"])
|
||||
@log_snapshot_after_test
|
||||
def contrail_net_template(self):
|
||||
"""Deploy cluster with Contrail plugin and network template
|
||||
"""Deploy cluster with Contrail plugin and network template.
|
||||
|
||||
Scenario:
|
||||
1. Configure interfaces
|
||||
|
@ -85,12 +86,10 @@ class TestNetworkTemplates(TestNetworkTemplatesBase, TestBasic):
|
|||
7. Start deploy, pressing "Deploy changes" button.
|
||||
|
||||
"""
|
||||
|
||||
plugin.prepare_contrail_plugin(self, slaves=5)
|
||||
|
||||
# enable plugin in contrail settings
|
||||
plugin.activate_plugin(self)
|
||||
|
||||
# activate vSRX image
|
||||
vsrx_setup_result = plugin.activate_vsrx()
|
||||
|
||||
|
|
|
@ -1,20 +1,21 @@
|
|||
# Copyright 2015 Mirantis, Inc.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
"""Copyright 2016 Mirantis, Inc.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
not use this file except in compliance with the License. You may obtain
|
||||
copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
License for the specific language governing permissions and limitations
|
||||
under the License.
|
||||
"""
|
||||
|
||||
import os
|
||||
import os.path
|
||||
import time
|
||||
|
||||
from proboscis import test
|
||||
from fuelweb_test.helpers.decorators import log_snapshot_after_test
|
||||
from fuelweb_test.settings import CONTRAIL_PLUGIN_PACK_UB_PATH
|
||||
|
@ -26,7 +27,7 @@ from helpers import openstack
|
|||
|
||||
@test(groups=["plugins"])
|
||||
class ContrailPlugin(TestBasic):
|
||||
"""ContrailPlugin.""" # TODO documentation
|
||||
"""ContrailPlugin.""" # TODO(unknown) documentation
|
||||
|
||||
pack_copy_path = '/var/www/nailgun/plugins/contrail-4.0'
|
||||
add_package = \
|
||||
|
@ -44,7 +45,7 @@ class ContrailPlugin(TestBasic):
|
|||
groups=["install_contrail"])
|
||||
@log_snapshot_after_test
|
||||
def install_contrail(self):
|
||||
"""Install Contrail Plugin and create cluster
|
||||
"""Install Contrail Plugin and create cluster.
|
||||
|
||||
Scenario:
|
||||
1. Revert snapshot "ready_with_5_slaves"
|
||||
|
@ -63,7 +64,7 @@ class ContrailPlugin(TestBasic):
|
|||
groups=["contrail_smoke"])
|
||||
@log_snapshot_after_test
|
||||
def contrail_smoke(self):
|
||||
"""Deploy a cluster with Contrail Plugin
|
||||
"""Deploy a cluster with Contrail Plugin.
|
||||
|
||||
Scenario:
|
||||
1. Create an environment with "Neutron with tunneling
|
||||
|
@ -102,7 +103,8 @@ class ContrailPlugin(TestBasic):
|
|||
groups=["contrail_bvt"])
|
||||
@log_snapshot_after_test
|
||||
def contrail_bvt(self):
|
||||
"""BVT test for contrail plugin
|
||||
"""BVT test for contrail plugin.
|
||||
|
||||
Deploy cluster with 1 controller, 1 compute,
|
||||
3 contrail-config, contrail-control, contrail-db roles
|
||||
and install contrail plugin
|
||||
|
|
Loading…
Reference in New Issue