renamed xxxnode to xxservice

1 files changed, 7 insertions, 8 deletions

diff --git a/nova/volume/volumenode.py b/nova/volume/volumeservice.py
index 6b4ad0d87..87a47f40a 100644
--- a/nova/volume/volumenode.py
+++ b/nova/volume/volumeservice.py
@@ -29,14 +29,13 @@ import shutil
 import socket
 import tempfile
 
-from twisted.application import service
 from twisted.internet import defer
 
 from nova import datastore
 from nova import exception
 from nova import flags
-from nova import node
 from nova import process
+from nova import service
 from nova import utils
 from nova import validate
 
@@ -50,13 +49,13 @@ flags.DEFINE_string('aoe_eth_dev', 'eth0',
                     'Which device to export the volumes on')
 flags.DEFINE_string('storage_name',
                     socket.gethostname(),
-                    'name of this node')
+                    'name of this service')
 flags.DEFINE_integer('first_shelf_id',
                     utils.last_octet(utils.get_my_ip()) * 10,
-                    'AoE starting shelf_id for this node')
+                    'AoE starting shelf_id for this service')
 flags.DEFINE_integer('last_shelf_id',
                     utils.last_octet(utils.get_my_ip()) * 10 + 9,
-                    'AoE starting shelf_id for this node')
+                    'AoE starting shelf_id for this service')
 flags.DEFINE_string('aoe_export_dir',
                     '/var/lib/vblade-persist/vblades',
                     'AoE directory where exports are created')
@@ -65,7 +64,7 @@ flags.DEFINE_integer('slots_per_shelf',
                     'Number of AoE slots per shelf')
 flags.DEFINE_string('storage_availability_zone',
                     'nova',
-                    'availability zone of this node')
+                    'availability zone of this service')
 flags.DEFINE_boolean('fake_storage', False,
                      'Should we make real storage volumes to attach?')
 
@@ -82,14 +81,14 @@ def get_volume(volume_id):
         return volume_class(volume_id=volume_id)
     raise exception.Error("Volume does not exist")
 
-class VolumeNode(node.Node):
+class VolumeService(service.Service):
     """
     There is one VolumeNode running on each host.
     However, each VolumeNode can report on the state of
     *all* volumes in the cluster.
     """
     def __init__(self):
-        super(VolumeNode, self).__init__()
+        super(VolumeService, self).__init__()
         self.volume_class = Volume
         if FLAGS.fake_storage:
             FLAGS.aoe_export_dir = tempfile.mkdtemp()