Archipelago: Change sosd to radosd in python

diff --git a/python/archipelago/common.py b/python/archipelago/common.py
index 07af86b..07692e0 100755 (executable)
--- a/python/archipelago/common.py
+++ b/python/archipelago/common.py
@@ -88,7 +88,7 @@ CHARDEV_MINOR = 0
 REQS = 512
 
 FILE_BLOCKER = 'archip-filed'
-RADOS_BLOCKER = 'archip-sosd'
+RADOS_BLOCKER = 'archip-radosd'
 MAPPER = 'archip-mapperd'
 VLMC = 'archip-vlmcd'
 
@@ -287,17 +287,17 @@ class MTpeer(Peer):
         self.cli_opts.append(str(self.nr_threads))
 
 
-class Sosd(MTpeer):
+class Radosd(MTpeer):
     def __init__(self, pool=None, **kwargs):
         self.executable = RADOS_BLOCKER
         self.pool = pool
-        super(Sosd, self).__init__(**kwargs)
+        super(Radosd, self).__init__(**kwargs)
 
         if self.cli_opts is None:
             self.cli_opts = []
-        self.set_sosd_cli_options()
+        self.set_radosd_cli_options()
 
-    def set_sosd_cli_options(self):
+    def set_radosd_cli_options(self):
         if self.pool:
             self.cli_opts.append("--pool")
             self.cli_opts.append(self.pool)
@@ -567,7 +567,7 @@ def check_conf():
             peers[role] = Filed(role=role, spec=segment.get_spec(),
                                  prefix=ARCHIP_PREFIX, **role_config)
         elif role_type == 'rados_blocker':
-            peers[role] = Sosd(role=role, spec=segment.get_spec(),
+            peers[role] = Radosd(role=role, spec=segment.get_spec(),
                                **role_config)
         elif role_type == 'mapperd':
             peers[role] = Mapperd(role=role, spec=segment.get_spec(),

diff --git a/tests/tests.py b/tests/tests.py
index 505c2d9..cd70484 100644 (file)
--- a/tests/tests.py
+++ b/tests/tests.py
@@ -32,7 +32,7 @@
 # or implied, of GRNET S.A.
 
 import archipelago
-from archipelago.common import Xseg_ctx, Request, Filed, Mapperd, Vlmcd, Sosd, \
+from archipelago.common import Xseg_ctx, Request, Filed, Mapperd, Vlmcd, Radosd, \
         Error, Segment
 from archipelago.archipelago import start_peer, stop_peer
 import random as rnd
@@ -422,7 +422,7 @@ class XsegTest(unittest.TestCase):
 
         return Filed(**args)
 
-    def get_sosd(self, args, clean=False):
+    def get_radosd(self, args, clean=False):
         pool = args['pool']
         import rados
         cluster = rados.Rados(conffile='/etc/ceph/ceph.conf')
@@ -432,7 +432,7 @@ class XsegTest(unittest.TestCase):
         cluster.create_pool(pool)
 
         cluster.shutdown()
-        return Sosd(**args)
+        return Radosd(**args)
 
     def get_mapperd(self, args):
         return Mapperd(**args)
@@ -1187,32 +1187,32 @@ class FiledTest(BlockerTest, XsegTest):
         self.send_and_evaluate_release(self.blockerport, target, force=True,
                 expected=True)
 
-class SosdTest(BlockerTest, XsegTest):
+class RadosdTest(BlockerTest, XsegTest):
     filed_args = {
-            'role': 'testsosd',
+            'role': 'testradosd',
             'spec': XsegTest.spec,
             'nr_ops': 16,
             'portno_start': 0,
             'portno_end': 0,
             'daemon': True,
             'log_level': 3,
-            'pool': 'test_sosd',
+            'pool': 'test_radosd',
             'nr_threads': 3,
             }
 
     def setUp(self):
-        super(SosdTest, self).setUp()
+        super(RadosdTest, self).setUp()
         try:
-            self.blocker = self.get_sosd(self.filed_args, clean=True)
+            self.blocker = self.get_radosd(self.filed_args, clean=True)
             self.blockerport = self.blocker.portno_start
             start_peer(self.blocker)
         except Exception as e:
-            super(SosdTest, self).tearDown()
+            super(RadosdTest, self).tearDown()
             raise e
 
     def tearDown(self):
         stop_peer(self.blocker)
-        super(SosdTest, self).tearDown()
+        super(RadosdTest, self).tearDown()
 
 if __name__=='__main__':
     init()