x/fuel-plugin-contrail
Code Issues Proposed changes

Fixed tests.

Browse Source 
-fixed install_contrail
-fixed contrail_delete_analytics
-fixed contrail_add_config
-update ping_instance_from_instance
 according to fuel-qa changes
-update methods create_network
 and add_router_interface in contrail_client

Change-Id: I211d3399ccf0be015a0c79c1da1a29830d0cc9cd
This commit is contained in:
otsvigun 2016-09-12 10:40:35 +03:00
parent 3f532e7999
commit 7c9bd5a03b
4 changed files with 24 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugin_test/helpers/contrail_client.py
View File

@ -80,7 +80,7 @@ class ContrailClient(object):
"parent_type": "project",
"fq_name": net_name,
"network_ipam_refs": net_attr}}
return self._post('/virtual-networks', data)
return self._post('/virtual-networks', json=data)
def add_router_interface(self, network, route_table, attr=None):
"""Add router interface to network.
@ -92,7 +92,8 @@ class ContrailClient(object):
data = {"virtual-network": {'fq_name': network['fq_name'],
'route_table_refs': [{
'to': route_table['fq_name'], "attr":attr}]}}
return self._put('/virtual-network/{0}'.format(network['uuid']), data)
return self._put(
'/virtual-network/{0}'.format(network['uuid']), json=data)
def get_route_tables(self):
"""Get router."""

9
plugin_test/tests/test_functional.py
View File

@ -340,7 +340,7 @@ class FunctionalTests(TestBasic):
openstack.update_deploy_check(self, conf_control,
is_vsrx=vsrx_setup_result)
@test(depends_on=[SetupEnvironment.prepare_slaves_5],
@test(depends_on=[SetupEnvironment.prepare_slaves_9],
groups=["contrail_add_config"])
@log_snapshot_after_test
def contrail_add_config(self):
@ -364,7 +364,7 @@ class FunctionalTests(TestBasic):
"""
conf_contrail = {"dedicated_analytics_db": True}
self.show_step(1)
plugin.prepare_contrail_plugin(self, slaves=5)
plugin.prepare_contrail_plugin(self, slaves=9)
plugin.show_range(self, 2, 4)
plugin.activate_plugin(self, **conf_contrail)
@ -382,7 +382,7 @@ class FunctionalTests(TestBasic):
'contrail-analytics'],
'slave-05': ['contrail-analytics-db']
}
conf_config = {'slave-05': ['contrail-config']}
conf_config = {'slave-06': ['contrail-config']}
plugin.show_range(self, 8, 10)
openstack.update_deploy_check(self, conf_nodes,
@ -824,8 +824,7 @@ class FunctionalTests(TestBasic):
'slave-03': ['contrail-control',
'contrail-config',
'contrail-db',
'contrail-analytics',
'contrail-analytics-db'],
'contrail-analytics'],
# Here slave-4
'slave-05': ['contrail-analytics-db'],
}

23
plugin_test/tests/test_smoke_bvt.py
View File

@ -79,7 +79,6 @@ class ContrailPlugin(TestBasic):
hugepages_amount = '60'
hugepages_size = '2'
vrouter_core_mask = '0x3'
sriov_physnet = 'physnet1'
plugin.show_range(self, 1, 7)
plugin.prepare_contrail_plugin(self, slaves=3)
@ -103,8 +102,7 @@ class ContrailPlugin(TestBasic):
self.show_step(7)
plugin.activate_plugin(
self, contrail_global_dpdk=True, contrail_global_sriov=True,
dpdk_on_vf=True)
self, contrail_global_dpdk=True, dpdk_on_vf=True)
self.show_step(8)
attr = self.fuel_web.client.get_cluster_attributes(
@ -117,17 +115,13 @@ class ContrailPlugin(TestBasic):
vers = attr['metadata']['plugin_version']
assert_equal(
CONTRAIL_PLUGIN_VERSION, vers,
"Invali version.".format(vers))
"Invalid version.".format(vers))
assert_equal(
contrail_api_port, attr['contrail_api_public_port']['value'],
"Invalid contrail api port {0}.".format(
attr['contrail_api_public_port']['value']))
assert_equal(
True, attr['contrail_global_sriov']['value'],
"Contrail global sriov is disabled.")
assert_equal(
True, attr['dpdk_on_vf']['value'],
"Dpdk on vf is disabled.")
@ -150,14 +144,9 @@ class ContrailPlugin(TestBasic):
True, attr['patch_nova']['value'],
"Patch_nova is not enabled by default.")
assert_equal(
sriov_physnet, attr['sriov_physnet']['value'],
"Invalid default sriov physnet {0}.".format(
attr['sriov_physnet']['value']))
assert_equal(
vrouter_core_mask, attr['vrouter_core_mask']['value'],
"Invalid default sriov physnet {0}.".format(
"Invalid default vrouter_core_mask {0}.".format(
attr['vrouter_core_mask']['value']))
assert_equal(
@ -195,7 +184,7 @@ class ContrailPlugin(TestBasic):
"""
self.show_step(1)
plugin.prepare_contrail_plugin(self, slaves=3)
plugin.prepare_contrail_plugin(slaves=3)
self.show_step(2)
plugin.activate_plugin(self)
@ -245,13 +234,11 @@ class ContrailPlugin(TestBasic):
Duration 110 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)
plugin.activate_plugin(self, dedicated_analytics_db=True)
# activate vSRX image
vsrx_setup_result = vsrx.activate()

21
plugin_test/tests/test_system.py
View File

@ -21,6 +21,7 @@ from random import choice
from devops.helpers.helpers import tcp_ping
from devops.helpers.helpers import wait
from devops.helpers.ssh_client import SSHAuth
from fuelweb_test import logger
from fuelweb_test.helpers import os_actions
@ -32,6 +33,7 @@ from fuelweb_test.settings import SERVTEST_PASSWORD
from fuelweb_test.settings import SERVTEST_TENANT
from fuelweb_test.settings import SERVTEST_USERNAME
from fuelweb_test.settings import DISABLE_SSL
from fuelweb_test.settings import SSH_IMAGE_CREDENTIALS
from proboscis import test
from proboscis.asserts import assert_true
@ -64,6 +66,7 @@ class SystemTests(TestBasic):
cluster_id = ''
pack_path = CONTRAIL_PLUGIN_PACK_UB_PATH
CONTRAIL_DISTRIBUTION = os.environ.get('CONTRAIL_DISTRIBUTION')
cirros_auth = SSHAuth(**SSH_IMAGE_CREDENTIALS)
def ping_instance_from_instance(self, os_conn, node_name,
ip_pair, ping_result=0):
@ -74,7 +77,6 @@ class SystemTests(TestBasic):
:param ping_result: type interger, exite code of command execution
by default is 0
"""
creds = ("cirros", "cubswin:)")
for ip_from in ip_pair:
with self.fuel_web.get_ssh_for_node(node_name) as remote:
for ip_to in ip_pair[ip_from]:
@ -83,9 +85,11 @@ class SystemTests(TestBasic):
"Check connectin from {0} to {1}.".format(
ip_from, ip_to))
assert_true(
os_conn.execute_through_host(
remote, ip_from, command,
creds)['exit_code'] == ping_result,
remote.execute_through_host(
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):
@ -132,7 +136,6 @@ class SystemTests(TestBasic):
Duration 90 min
"""
conf_contrail = {"dedicated_analytics_db": True}
self.show_step(1)
plugin.prepare_contrail_plugin(
self, slaves=5, options={'ceilometer': True})
@ -141,7 +144,7 @@ class SystemTests(TestBasic):
vsrx.activate()
plugin.show_range(self, 2, 4)
plugin.activate_plugin(self, **conf_contrail)
plugin.activate_plugin(self, dedicated_analytics_db=True)
plugin.show_range(self, 4, 8)
self.fuel_web.update_nodes(
@ -723,6 +726,6 @@ class SystemTests(TestBasic):
self.show_step(4)
for instance in [access_point, instance]:
os_conn.delete_instance(instance)
assert_true(
os_conn.verify_srv_deleted(instance),
"Instance was not deleted.")
wait(
lambda: self.os_conn.is_srv_deleted(instance),
timeout=200, timeout_msg="Instance was not deleted.")