openstack
/
congress
Code Issues Proposed changes

Remove use of deprecated network_resources module 

tempest has removed the network_resources module in the recent
commit causing gate to fail. This commit fixes the same.

Change-Id: I582ddb06464ef7290b1595ac59b8ffdfdf7bade4
This commit is contained in:
Anusha Ramineni 2016-06-16 14:30:10 +05:30
parent 00f8968d25
commit 88f4a87f48
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
congress_tempest_tests/tests/scenario/congress_ha/test_ha.py
View File

@ -53,8 +53,8 @@ class TestHA(manager_congress.ScenarioPolicyBase):
description='policy ha service') description='policy ha service')
self.replica_service_id = resp['OS-KSADM:service']['id'] self.replica_service_id = resp['OS-KSADM:service']['id']
resp = self.endpoints_client.create_endpoint( resp = self.endpoints_client.create_endpoint(
self.replica_service_id, service_id=self.replica_service_id,
CONF.identity.region, region=CONF.identity.region,
publicurl=replica_url, publicurl=replica_url,
adminurl=replica_url, adminurl=replica_url,
internalurl=replica_url) internalurl=replica_url)

21
congress_tempest_tests/tests/scenario/manager_congress.py
View File

@ -23,7 +23,6 @@ from tempest.lib.common.utils import data_utils
from tempest.lib import exceptions from tempest.lib import exceptions
from tempest import manager as tempestmanager from tempest import manager as tempestmanager
from tempest.scenario import manager from tempest.scenario import manager
from tempest.scenario import network_resources
from tempest import test from tempest import test
from congress_tempest_tests.services.policy import policy_client from congress_tempest_tests.services.policy import policy_client
@ -86,23 +85,23 @@ class ScenarioPolicyBase(manager.NetworkScenarioTest):
seen_nets = self._list_networks() seen_nets = self._list_networks()
seen_names = [n['name'] for n in seen_nets] seen_names = [n['name'] for n in seen_nets]
seen_ids = [n['id'] for n in seen_nets] seen_ids = [n['id'] for n in seen_nets]
self.assertIn(self.network.name, seen_names) self.assertIn(self.network['name'], seen_names)
self.assertIn(self.network.id, seen_ids) self.assertIn(self.network['id'], seen_ids)
if self.subnet: if self.subnet:
seen_subnets = self._list_subnets() seen_subnets = self._list_subnets()
seen_net_ids = [n['network_id'] for n in seen_subnets] seen_net_ids = [n['network_id'] for n in seen_subnets]
seen_subnet_ids = [n['id'] for n in seen_subnets] seen_subnet_ids = [n['id'] for n in seen_subnets]
self.assertIn(self.network.id, seen_net_ids) self.assertIn(self.network['id'], seen_net_ids)
self.assertIn(self.subnet.id, seen_subnet_ids) self.assertIn(self.subnet['id'], seen_subnet_ids)
if self.router: if self.router:
seen_routers = self._list_routers() seen_routers = self._list_routers()
seen_router_ids = [n['id'] for n in seen_routers] seen_router_ids = [n['id'] for n in seen_routers]
seen_router_names = [n['name'] for n in seen_routers] seen_router_names = [n['name'] for n in seen_routers]
self.assertIn(self.router.name, self.assertIn(self.router['name'],
seen_router_names) seen_router_names)
self.assertIn(self.router.id, self.assertIn(self.router['id'],
seen_router_ids) seen_router_ids)
def _create_server(self, name, network): def _create_server(self, name, network):
@ -111,7 +110,7 @@ class ScenarioPolicyBase(manager.NetworkScenarioTest):
security_groups = [{'name': self.security_group['name']}] security_groups = [{'name': self.security_group['name']}]
create_kwargs = { create_kwargs = {
'networks': [ 'networks': [
{'uuid': network.id}, {'uuid': network['id']},
], ],
'key_name': keypair['name'], 'key_name': keypair['name'],
'security_groups': security_groups, 'security_groups': security_groups,
@ -185,8 +184,7 @@ class ScenarioPolicyBase(manager.NetworkScenarioTest):
_, interface = self.interface_client.create_interface( _, interface = self.interface_client.create_interface(
server=server['id'], server=server['id'],
network_id=self.new_net.id) network_id=self.new_net.id)
self.addCleanup(self.network_client.wait_for_resource_deletion, self.addCleanup(self.ports_client.wait_for_resource_deletion,
'port',
interface['port_id']) interface['port_id'])
self.addCleanup(self.delete_wrapper, self.addCleanup(self.delete_wrapper,
self.interface_client.delete_interface, self.interface_client.delete_interface,
@ -203,8 +201,7 @@ class ScenarioPolicyBase(manager.NetworkScenarioTest):
raise exceptions.TimeoutException("No new port attached to the " raise exceptions.TimeoutException("No new port attached to the "
"server in time (%s sec) !" "server in time (%s sec) !"
% CONF.network.build_timeout) % CONF.network.build_timeout)
new_port = network_resources.DeletablePort(client=self.network_client, new_port = self.ports_client.delete_port(self.new_port_list[0])
**self.new_port_list[0])
def check_new_nic(): def check_new_nic():
new_nic_list = self._get_server_nics(ssh_client) new_nic_list = self._get_server_nics(ssh_client)

6
congress_tempest_tests/tests/scenario/test_congress_basic_ops.py
View File

@ -193,9 +193,10 @@ class TestCongressDataSources(manager_congress.ScenarioPolicyBase):
raise cls.skipException(msg) raise cls.skipException(msg)
def test_all_loaded_datasources_are_initialized(self): def test_all_loaded_datasources_are_initialized(self):
datasources = self.admin_manager.congress_client.list_datasources()
@helper.retry_on_exception
def _check_all_datasources_are_initialized(): def _check_all_datasources_are_initialized():
datasources = self.admin_manager.congress_client.list_datasources()
for datasource in datasources['results']: for datasource in datasources['results']:
results = ( results = (
self.admin_manager.congress_client.list_datasource_status( self.admin_manager.congress_client.list_datasource_status(
@ -211,9 +212,10 @@ class TestCongressDataSources(manager_congress.ScenarioPolicyBase):
"or failure in server") "or failure in server")
def test_all_datasources_have_tables(self): def test_all_datasources_have_tables(self):
datasources = self.admin_manager.congress_client.list_datasources()
@helper.retry_on_exception
def check_data(): def check_data():
datasources = self.admin_manager.congress_client.list_datasources()
for datasource in datasources['results']: for datasource in datasources['results']:
results = ( results = (
self.admin_manager.congress_client.list_datasource_tables( self.admin_manager.congress_client.list_datasource_tables(