| commit | 58fc59702c267c9630c7a15c6c0bf966a1ca0f1e | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Sat Sep 06 21:43:21 2014 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Sat Sep 06 21:43:21 2014 +0000 |
| tree | 74ccefe16083836c4a1c0d5f01addad6b3920c63 | |
| parent | 3453e8f7ca94246bf5149f5c4a8de120898e6851 [diff] | |
| parent | 82e667ef4eaa79c20bbb7a528abda358edfb6a83 [diff] |
Merge "Move cli tests into service subdirectories"
diff --git a/tempest/cli/simple_read_only/test_nova.py b/tempest/cli/simple_read_only/compute/test_nova.py similarity index 100% rename from tempest/cli/simple_read_only/test_nova.py rename to tempest/cli/simple_read_only/compute/test_nova.py
diff --git a/tempest/cli/simple_read_only/test_nova_manage.py b/tempest/cli/simple_read_only/compute/test_nova_manage.py similarity index 100% rename from tempest/cli/simple_read_only/test_nova_manage.py rename to tempest/cli/simple_read_only/compute/test_nova_manage.py
diff --git a/tempest/cli/simple_read_only/test_sahara.py b/tempest/cli/simple_read_only/data_processing/test_sahara.py similarity index 100% rename from tempest/cli/simple_read_only/test_sahara.py rename to tempest/cli/simple_read_only/data_processing/test_sahara.py
diff --git a/tempest/cli/simple_read_only/test_keystone.py b/tempest/cli/simple_read_only/identity/test_keystone.py similarity index 100% rename from tempest/cli/simple_read_only/test_keystone.py rename to tempest/cli/simple_read_only/identity/test_keystone.py
diff --git a/tempest/cli/simple_read_only/test_glance.py b/tempest/cli/simple_read_only/image/test_glance.py similarity index 100% rename from tempest/cli/simple_read_only/test_glance.py rename to tempest/cli/simple_read_only/image/test_glance.py
diff --git a/tempest/cli/simple_read_only/test_neutron.py b/tempest/cli/simple_read_only/network/test_neutron.py similarity index 100% rename from tempest/cli/simple_read_only/test_neutron.py rename to tempest/cli/simple_read_only/network/test_neutron.py
diff --git a/tempest/cli/simple_read_only/test_swift.py b/tempest/cli/simple_read_only/object_storage/test_swift.py similarity index 100% rename from tempest/cli/simple_read_only/test_swift.py rename to tempest/cli/simple_read_only/object_storage/test_swift.py
diff --git a/tempest/cli/simple_read_only/test_heat.py b/tempest/cli/simple_read_only/orchestration/test_heat.py similarity index 100% rename from tempest/cli/simple_read_only/test_heat.py rename to tempest/cli/simple_read_only/orchestration/test_heat.py
diff --git a/tempest/cli/simple_read_only/test_ceilometer.py b/tempest/cli/simple_read_only/telemetry/test_ceilometer.py similarity index 93% rename from tempest/cli/simple_read_only/test_ceilometer.py rename to tempest/cli/simple_read_only/telemetry/test_ceilometer.py index b622dd4..1d2822d 100644 --- a/tempest/cli/simple_read_only/test_ceilometer.py +++ b/tempest/cli/simple_read_only/telemetry/test_ceilometer.py
@@ -39,19 +39,15 @@ raise cls.skipException(msg) super(SimpleReadOnlyCeilometerClientTest, cls).setUpClass() - @test.services('telemetry') def test_ceilometer_meter_list(self): self.ceilometer('meter-list') @test.attr(type='slow') - @test.services('telemetry') def test_ceilometer_resource_list(self): self.ceilometer('resource-list') - @test.services('telemetry') def test_ceilometermeter_alarm_list(self): self.ceilometer('alarm-list') - @test.services('telemetry') def test_ceilometer_version(self): self.ceilometer('', flags='--version')
diff --git a/tempest/cli/simple_read_only/test_cinder.py b/tempest/cli/simple_read_only/volume/test_cinder.py similarity index 100% rename from tempest/cli/simple_read_only/test_cinder.py rename to tempest/cli/simple_read_only/volume/test_cinder.py