Clean the glance v1 code in tempest plugin
Since the glance v1 will not be maintained any more, it is better to clean
che glance v1 code in tempest plugin.
Change-Id: I3ec3eff7515ce806ed6b288c9541bb05875da5e5
diff --git a/ceilometer/tests/tempest/api/base.py b/ceilometer/tests/tempest/api/base.py
index 81c53d6..10eea60 100644
--- a/ceilometer/tests/tempest/api/base.py
+++ b/ceilometer/tests/tempest/api/base.py
@@ -33,7 +33,6 @@
'compute_networks_client',
'compute_floating_ips_client',
'flavors_client',
- 'image_client',
'image_client_v2',
'telemetry_client',
]
@@ -63,7 +62,6 @@
cls.telemetry_client = cls.os_primary.telemetry_client
cls.servers_client = cls.os_primary.servers_client
cls.flavors_client = cls.os_primary.flavors_client
- cls.image_client = cls.os_primary.image_client
cls.image_client_v2 = cls.os_primary.image_client_v2
@classmethod
@@ -72,8 +70,6 @@
cls.nova_notifications = ['memory', 'vcpus', 'disk.root.size',
'disk.ephemeral.size']
- cls.glance_notifications = ['image.size']
-
cls.glance_v2_notifications = ['image.download', 'image.serve']
cls.server_ids = []
@@ -115,7 +111,7 @@
@classmethod
def resource_cleanup(cls):
cls.cleanup_resources(cls.servers_client.delete_server, cls.server_ids)
- cls.cleanup_resources(cls.image_client.delete_image, cls.image_ids)
+ cls.cleanup_resources(cls.image_client_v2.delete_image, cls.image_ids)
super(BaseTelemetryTest, cls).resource_cleanup()
def await_samples(self, metric, query):
diff --git a/ceilometer/tests/tempest/api/test_telemetry_notification_api.py b/ceilometer/tests/tempest/api/test_telemetry_notification_api.py
index d723b55..91271b0 100644
--- a/ceilometer/tests/tempest/api/test_telemetry_notification_api.py
+++ b/ceilometer/tests/tempest/api/test_telemetry_notification_api.py
@@ -37,22 +37,6 @@
self.await_samples(metric, query)
@test.attr(type="smoke")
- @test.idempotent_id('04b10bfe-a5dc-47af-b22f-0460426bf499')
- @test.services("image")
- @testtools.skipIf(not CONF.image_feature_enabled.api_v1,
- "Glance api v1 is disabled")
- def test_check_glance_v1_notifications(self):
- body = self.create_image(self.image_client, is_public=False)
- self.image_client.update_image(body['id'], data='data')
-
- query = 'resource', 'eq', body['id']
-
- self.image_client.delete_image(body['id'])
-
- for metric in self.glance_notifications:
- self.await_samples(metric, query)
-
- @test.attr(type="smoke")
@test.idempotent_id('c240457d-d943-439b-8aea-85e26d64fe8f')
@test.services("image")
@testtools.skipIf(not CONF.image_feature_enabled.api_v2,