summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryushangbin <yushb@gohighsec.com>2017-09-04 10:13:28 +0800
committeryushangbin <yushb@gohighsec.com>2017-09-04 10:13:28 +0800
commit078a6c435e3ddb06ab667098135fa8441f5b412a (patch)
tree37b891e017e0361ac340ec72cb7a5d9c9f7307ef
parent95a7322ccdb1ae244093fa38e81c0ad730b69ef0 (diff)
Replace deprecated function in tempest
DeprecationWarning: Function 'tempest.test.services()' has moved to 'tempest.common.utils.services()' in version 'Pike' and will be removed in a future version Change-Id: Icc6409fcd140406b36a6a84dfa16de8a879cc3b2
Notes
Notes (review): Code-Review+2: Kaitlin Farr <kaitlin.farr@jhuapl.edu> Code-Review+2: Ade Lee <alee@redhat.com> Workflow+1: Ade Lee <alee@redhat.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Mon, 11 Sep 2017 23:23:51 +0000 Reviewed-on: https://review.openstack.org/500419 Project: openstack/barbican-tempest-plugin Branch: refs/heads/master
-rw-r--r--barbican_tempest_plugin/tests/scenario/test_ephemeral_disk_encryption.py4
-rw-r--r--barbican_tempest_plugin/tests/scenario/test_image_signing.py6
-rw-r--r--barbican_tempest_plugin/tests/scenario/test_volume_encryption.py6
3 files changed, 8 insertions, 8 deletions
diff --git a/barbican_tempest_plugin/tests/scenario/test_ephemeral_disk_encryption.py b/barbican_tempest_plugin/tests/scenario/test_ephemeral_disk_encryption.py
index 0dc78a9..3734019 100644
--- a/barbican_tempest_plugin/tests/scenario/test_ephemeral_disk_encryption.py
+++ b/barbican_tempest_plugin/tests/scenario/test_ephemeral_disk_encryption.py
@@ -13,9 +13,9 @@
13# under the License. 13# under the License.
14 14
15from oslo_log import log as logging 15from oslo_log import log as logging
16from tempest.common import utils
16from tempest import config 17from tempest import config
17from tempest.lib import decorators 18from tempest.lib import decorators
18from tempest import test
19 19
20from barbican_tempest_plugin.tests.scenario import barbican_manager 20from barbican_tempest_plugin.tests.scenario import barbican_manager
21 21
@@ -42,7 +42,7 @@ class EphemeralStorageEncryptionTest(barbican_manager.BarbicanScenarioTest):
42 'Ephemeral storage encryption is not supported') 42 'Ephemeral storage encryption is not supported')
43 43
44 @decorators.idempotent_id('afe720b9-8b35-4a3c-8ff3-15841c2d3148') 44 @decorators.idempotent_id('afe720b9-8b35-4a3c-8ff3-15841c2d3148')
45 @test.services('compute', 'image') 45 @utils.services('compute', 'image')
46 def test_encrypted_ephemeral_lvm_storage(self): 46 def test_encrypted_ephemeral_lvm_storage(self):
47 test_string = 'Once upon a time ...' 47 test_string = 'Once upon a time ...'
48 client_test_path = '/tmp/ephemeral_disk_encryption_test' 48 client_test_path = '/tmp/ephemeral_disk_encryption_test'
diff --git a/barbican_tempest_plugin/tests/scenario/test_image_signing.py b/barbican_tempest_plugin/tests/scenario/test_image_signing.py
index 9070578..d641f28 100644
--- a/barbican_tempest_plugin/tests/scenario/test_image_signing.py
+++ b/barbican_tempest_plugin/tests/scenario/test_image_signing.py
@@ -13,10 +13,10 @@
13# under the License. 13# under the License.
14 14
15from oslo_log import log as logging 15from oslo_log import log as logging
16from tempest.common import utils
16from tempest import config 17from tempest import config
17from tempest import exceptions 18from tempest import exceptions
18from tempest.lib import decorators 19from tempest.lib import decorators
19from tempest import test
20 20
21from barbican_tempest_plugin.tests.scenario import barbican_manager 21from barbican_tempest_plugin.tests.scenario import barbican_manager
22 22
@@ -27,7 +27,7 @@ LOG = logging.getLogger(__name__)
27class ImageSigningTest(barbican_manager.BarbicanScenarioTest): 27class ImageSigningTest(barbican_manager.BarbicanScenarioTest):
28 28
29 @decorators.idempotent_id('4343df3c-5553-40ea-8705-0cce73b297a9') 29 @decorators.idempotent_id('4343df3c-5553-40ea-8705-0cce73b297a9')
30 @test.services('compute', 'image') 30 @utils.services('compute', 'image')
31 def test_signed_image_upload_and_boot(self): 31 def test_signed_image_upload_and_boot(self):
32 """Test that Nova boots a signed image. 32 """Test that Nova boots a signed image.
33 33
@@ -49,7 +49,7 @@ class ImageSigningTest(barbican_manager.BarbicanScenarioTest):
49 self.servers_client.delete_server(instance['id']) 49 self.servers_client.delete_server(instance['id'])
50 50
51 @decorators.idempotent_id('74f022d6-a6ef-4458-96b7-541deadacf99') 51 @decorators.idempotent_id('74f022d6-a6ef-4458-96b7-541deadacf99')
52 @test.services('compute', 'image') 52 @utils.services('compute', 'image')
53 def test_signed_image_upload_boot_failure(self): 53 def test_signed_image_upload_boot_failure(self):
54 """Test that Nova refuses to boot an incorrectly signed image. 54 """Test that Nova refuses to boot an incorrectly signed image.
55 55
diff --git a/barbican_tempest_plugin/tests/scenario/test_volume_encryption.py b/barbican_tempest_plugin/tests/scenario/test_volume_encryption.py
index 9c42694..2d86621 100644
--- a/barbican_tempest_plugin/tests/scenario/test_volume_encryption.py
+++ b/barbican_tempest_plugin/tests/scenario/test_volume_encryption.py
@@ -13,9 +13,9 @@
13# under the License. 13# under the License.
14 14
15from oslo_log import log as logging 15from oslo_log import log as logging
16from tempest.common import utils
16from tempest import config 17from tempest import config
17from tempest.lib import decorators 18from tempest.lib import decorators
18from tempest import test
19 19
20from barbican_tempest_plugin.tests.scenario import barbican_manager 20from barbican_tempest_plugin.tests.scenario import barbican_manager
21 21
@@ -76,7 +76,7 @@ class VolumeEncryptionTest(barbican_manager.BarbicanScenarioTest):
76 self.nova_volume_detach(server, attached_volume) 76 self.nova_volume_detach(server, attached_volume)
77 77
78 @decorators.idempotent_id('89165fb4-5534-4b9d-8429-97ccffb8f86f') 78 @decorators.idempotent_id('89165fb4-5534-4b9d-8429-97ccffb8f86f')
79 @test.services('compute', 'volume', 'image') 79 @utils.services('compute', 'volume', 'image')
80 def test_encrypted_cinder_volumes_luks(self): 80 def test_encrypted_cinder_volumes_luks(self):
81 img_uuid = self.sign_and_upload_image() 81 img_uuid = self.sign_and_upload_image()
82 LOG.info("Creating keypair and security group") 82 LOG.info("Creating keypair and security group")
@@ -95,7 +95,7 @@ class VolumeEncryptionTest(barbican_manager.BarbicanScenarioTest):
95 self.attach_detach_volume(server, volume, keypair) 95 self.attach_detach_volume(server, volume, keypair)
96 96
97 @decorators.idempotent_id('cbc752ed-b716-4727-910f-956ccf965723') 97 @decorators.idempotent_id('cbc752ed-b716-4727-910f-956ccf965723')
98 @test.services('compute', 'volume', 'image') 98 @utils.services('compute', 'volume', 'image')
99 def test_encrypted_cinder_volumes_cryptsetup(self): 99 def test_encrypted_cinder_volumes_cryptsetup(self):
100 img_uuid = self.sign_and_upload_image() 100 img_uuid = self.sign_and_upload_image()
101 LOG.info("Creating keypair and security group") 101 LOG.info("Creating keypair and security group")