openstack/fuel-qa
Code Issues Proposed changes

Improve sequence of reinstalling, one by one instead all.

Browse Source 
Fix smiles_count of service in custom_hostname because nova-network is not
used anymore.
Change-Id: I467beb00dccca4296ca91efc5c3e1ed4cb389beb
Closes-Bug: #1486371
This commit is contained in:
Veronica Krayneva 2015-08-26 11:09:32 +03:00
parent 157ec75330
commit 763308a901
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuelweb_test/tests/test_custom_hostname.py
View File

@ -162,7 +162,7 @@ class CustomHostname(TestBasic):
os_conn = os_actions.OpenStackActions( os_conn = os_actions.OpenStackActions(
self.fuel_web.get_public_vip(cluster_id)) self.fuel_web.get_public_vip(cluster_id))
self.fuel_web.assert_cluster_ready( self.fuel_web.assert_cluster_ready(
os_conn, smiles_count=14, networks_count=1, timeout=300) os_conn, smiles_count=13, networks_count=1, timeout=300)
# Verify that new hostnames are applied on the nodes # Verify that new hostnames are applied on the nodes
for node, custom_hostname in zip( for node, custom_hostname in zip(

10
fuelweb_test/tests/test_node_reinstallation.py
View File

@ -12,17 +12,16 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import yaml
from cinderclient.exceptions import NotFound from cinderclient.exceptions import NotFound
from devops.helpers import helpers as devops_helpers from devops.helpers import helpers as devops_helpers
from proboscis.asserts import assert_equal from proboscis.asserts import assert_equal
from proboscis.asserts import assert_true from proboscis.asserts import assert_true
from proboscis import test from proboscis import test
import yaml
from fuelweb_test.helpers.decorators import log_snapshot_after_test from fuelweb_test.helpers.decorators import log_snapshot_after_test
from fuelweb_test import ostf_test_mapping as map_ostf
from fuelweb_test.helpers import os_actions from fuelweb_test.helpers import os_actions
from fuelweb_test import ostf_test_mapping as map_ostf
from fuelweb_test.settings import DEPLOYMENT_MODE from fuelweb_test.settings import DEPLOYMENT_MODE
from fuelweb_test.settings import NEUTRON_SEGMENT_TYPE from fuelweb_test.settings import NEUTRON_SEGMENT_TYPE
from fuelweb_test.tests.base_test_case import SetupEnvironment from fuelweb_test.tests.base_test_case import SetupEnvironment
@ -349,8 +348,9 @@ class FullClusterReinstallation(TestBasic):
for slave in self.env.d_env.nodes().slaves[0:5]: for slave in self.env.d_env.nodes().slaves[0:5]:
with self.fuel_web.get_ssh_for_node(slave.name) as remote: with self.fuel_web.get_ssh_for_node(slave.name) as remote:
remote.execute("touch {0}".format(file_name)) remote.execute("touch {0}".format(file_name))
node = self.fuel_web.get_nailgun_node_by_name(slave.name)
NodeReinstallationEnv._reinstall_nodes(self.fuel_web, cluster_id) NodeReinstallationEnv._reinstall_nodes(
self.fuel_web, cluster_id, [str(node['id'])])
# Verify that all node are reinstalled (not just rebooted), # Verify that all node are reinstalled (not just rebooted),
# i.e. there is no sample file on a node # i.e. there is no sample file on a node