Update code to latest changes in olso.messaging and tempest
See 94c818dc98 (diff-60d9d920c907281c0886983986a46a84)
Change-Id: I9483c15fb4fdf2763e9c891162713a5465fea020
This commit is contained in:
parent
262586195d
commit
4429e77ad3
|
@ -41,7 +41,7 @@ class MessagingFactory(object):
|
|||
def get_notifier(self):
|
||||
transport = self._get_transport(self.config.collector.transport_url[0])
|
||||
return oslo_messaging.Notifier(transport, publisher_id='almanach.collector',
|
||||
topic=self.config.collector.topic, driver='messagingv2')
|
||||
topics=[self.config.collector.topic], driver='messagingv2')
|
||||
|
||||
def _get_transport(self, url):
|
||||
return oslo_messaging.get_notification_transport(self.config, url=url)
|
||||
|
|
|
@ -72,8 +72,8 @@ class BaseAlmanachScenarioTest(manager.ScenarioTest):
|
|||
}
|
||||
|
||||
volume = self.volumes_client.create_volume(**kwargs)['volume']
|
||||
waiters.wait_for_volume_status(self.volumes_client,
|
||||
volume['id'], 'available')
|
||||
waiters.wait_for_volume_resource_status(self.volumes_client,
|
||||
volume['id'], 'available')
|
||||
|
||||
return self.volumes_client.show_volume(volume['id'])['volume']
|
||||
|
||||
|
|
|
@ -67,10 +67,10 @@ class TestVolumeAttachmentScenario(base.BaseAlmanachScenarioTest):
|
|||
instance_uuid=self._server['id'],
|
||||
mountpoint='/dev/vdc')
|
||||
|
||||
waiters.wait_for_volume_status(self.volumes_client,
|
||||
self._volume['id'], 'in-use')
|
||||
waiters.wait_for_volume_resource_status(self.volumes_client,
|
||||
self._volume['id'], 'in-use')
|
||||
|
||||
def _detach_volume_from_server(self):
|
||||
self.volumes_client.detach_volume(self._volume['id'])
|
||||
waiters.wait_for_volume_status(self.volumes_client,
|
||||
self._volume['id'], 'available')
|
||||
waiters.wait_for_volume_resource_status(self.volumes_client,
|
||||
self._volume['id'], 'available')
|
||||
|
|
|
@ -42,8 +42,8 @@ class TestVolumeResizeScenario(base.BaseAlmanachScenarioTest):
|
|||
volume = self.create_test_volume(size=1)
|
||||
self.volumes_client.extend_volume(volume['id'], new_size=2)
|
||||
|
||||
waiters.wait_for_volume_status(self.volumes_client,
|
||||
volume['id'], 'available')
|
||||
waiters.wait_for_volume_resource_status(self.volumes_client,
|
||||
volume['id'], 'available')
|
||||
|
||||
self.addCleanup(self.volumes_client.wait_for_resource_deletion,
|
||||
volume['id'])
|
||||
|
|
Loading…
Reference in New Issue