renamed xxxservice to service

3 files changed, 14 insertions, 14 deletions

diff --git a/nova/tests/cloud_unittest.py b/nova/tests/cloud_unittest.py
index 38f4de8d9..128188b0d 100644
--- a/nova/tests/cloud_unittest.py
+++ b/nova/tests/cloud_unittest.py
@@ -28,7 +28,7 @@ from nova import flags
 from nova import rpc
 from nova import test
 from nova.auth import users
-from nova.compute import computeservice
+from nova.compute import service
 from nova.endpoint import api
 from nova.endpoint import cloud
 
@@ -54,7 +54,7 @@ class CloudTestCase(test.BaseTestCase):
         self.injected.append(self.cloud_consumer.attach_to_tornado(self.ioloop))
 
         # set up a service
-        self.compute = computeservice.ComputeService()
+        self.compute = service.ComputeService()
         self.compute_consumer = rpc.AdapterConsumer(connection=self.conn,
                                                      topic=FLAGS.compute_topic,
                                                      proxy=self.compute)
diff --git a/nova/tests/compute_unittest.py b/nova/tests/compute_unittest.py
index db08308bb..b70260c25 100644
--- a/nova/tests/compute_unittest.py
+++ b/nova/tests/compute_unittest.py
@@ -26,7 +26,7 @@ from nova import flags
 from nova import test
 from nova import utils
 from nova.compute import model
-from nova.compute import computeservice
+from nova.compute import service
 
 
 FLAGS = flags.FLAGS
@@ -60,7 +60,7 @@ class ComputeConnectionTestCase(test.TrialTestCase):
         self.flags(fake_libvirt=True,
                    fake_storage=True,
                    fake_users=True)
-        self.compute = computeservice.ComputeService()
+        self.compute = service.ComputeService()
 
     def create_instance(self):
         instdir = model.InstanceDirectory()
diff --git a/nova/tests/volume_unittest.py b/nova/tests/volume_unittest.py
index 568b199a0..62144269c 100644
--- a/nova/tests/volume_unittest.py
+++ b/nova/tests/volume_unittest.py
@@ -18,11 +18,11 @@
 
 import logging
 
+from nova import compute
 from nova import exception
 from nova import flags
 from nova import test
-from nova.compute import computeservice
-from nova.volume import volumeservice
+from nova.volume import service as volume_service
 
 
 FLAGS = flags.FLAGS
@@ -32,11 +32,11 @@ class VolumeTestCase(test.TrialTestCase):
     def setUp(self):
         logging.getLogger().setLevel(logging.DEBUG)
         super(VolumeTestCase, self).setUp()
-        self.compute = computeservice.ComputeService()
+        self.compute = compute.service.ComputeService()
         self.volume = None
         self.flags(fake_libvirt=True,
                    fake_storage=True)
-        self.volume = volumeservice.VolumeService()
+        self.volume = volume_service.VolumeService()
 
     def test_run_create_volume(self):
         vol_size = '0'
@@ -45,11 +45,11 @@ class VolumeTestCase(test.TrialTestCase):
         volume_id = self.volume.create_volume(vol_size, user_id, project_id)
         # TODO(termie): get_volume returns differently than create_volume
         self.assertEqual(volume_id,
-                         volumeservice.get_volume(volume_id)['volume_id'])
+                         volume_service.get_volume(volume_id)['volume_id'])
 
         rv = self.volume.delete_volume(volume_id)
         self.assertRaises(exception.Error,
-                          volumeservice.get_volume,
+                          volume_service.get_volume,
                           volume_id)
 
     def test_too_big_volume(self):
@@ -70,7 +70,7 @@ class VolumeTestCase(test.TrialTestCase):
         for i in xrange(total_slots):
             vid = self.volume.create_volume(vol_size, user_id, project_id)
             vols.append(vid)
-        self.assertRaises(volumeservice.NoMoreVolumes,
+        self.assertRaises(volume_service.NoMoreVolumes,
                           self.volume.create_volume,
                           vol_size, user_id, project_id)
         for id in vols:
@@ -85,7 +85,7 @@ class VolumeTestCase(test.TrialTestCase):
         mountpoint = "/dev/sdf"
         volume_id = self.volume.create_volume(vol_size, user_id, project_id)
 
-        volume_obj = volumeservice.get_volume(volume_id)
+        volume_obj = volume_service.get_volume(volume_id)
         volume_obj.start_attach(instance_id, mountpoint)
         rv = yield self.compute.attach_volume(volume_id,
                                           instance_id,
@@ -100,12 +100,12 @@ class VolumeTestCase(test.TrialTestCase):
                           volume_id)
 
         rv = yield self.volume.detach_volume(volume_id)
-        volume_obj = volumeservice.get_volume(volume_id)
+        volume_obj = volume_service.get_volume(volume_id)
         self.assertEqual(volume_obj['status'], "available")
 
         rv = self.volume.delete_volume(volume_id)
         self.assertRaises(exception.Error,
-                          volumeservice.get_volume,
+                          volume_service.get_volume,
                           volume_id)
 
     def test_multi_node(self):