From 2879d06ece743a69adbadba36a114e31c64983d6 Mon Sep 17 00:00:00 2001
From: Guillaume Bottex <guillaume.bottex@nexedi.com>
Date: Thu, 14 Jul 2011 02:53:28 +0900
Subject: [PATCH] Typo and cosmetics.
---
slapos/recipe/nosqltestbed/__init__.py | 24 ++++++++-----------
.../nosqltestbed/template/kumo_gateway_run.in | 3 ++-
.../nosqltestbed/template/kumo_manager_run.in | 3 ++-
.../nosqltestbed/template/kumo_server_run.in | 4 +++-
.../nosqltestbed/template/nosqltester_run.in | 4 +++-
5 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/slapos/recipe/nosqltestbed/__init__.py b/slapos/recipe/nosqltestbed/__init__.py
index 5f5159d67..94779b348 100644
--- a/slapos/recipe/nosqltestbed/__init__.py
+++ b/slapos/recipe/nosqltestbed/__init__.py
@@ -45,7 +45,7 @@ class NoSQLTestBed(BaseSlapRecipe):
raise NotImplementedError("Do not support %s" % software_type)
def run_kumo_cloud(self):
- """ Deploy kumofs systeom on a cloud. """
+ """ Deploy kumofs system on a cloud. """
kumo_cloud_config = {}
kumo_cloud_config.update(self.options)
@@ -96,7 +96,7 @@ class NoSQLTestBed(BaseSlapRecipe):
return [nosqltester_manager_runner_path]
def run_all(self):
- """ Runs all services on one machine. """
+ """ Run all services on one machine. """
all_config = {}
all_config.update(self.options)
@@ -132,16 +132,12 @@ class NoSQLTestBed(BaseSlapRecipe):
return [manager_runner_path, server_runner_path, gateway_runner_path]
- def run_kumo_manager(self, ipaddress=None):
- """ Runs the kumofs manager. """
+ def run_kumo_manager(self):
+ """ Run the kumofs manager. """
manager_config = {}
manager_config.update(self.options)
- if ipaddress is None:
- manager_config['manager_address'] = "[%s]" % self.getGlobalIPv6Address()
- else:
- manager_config['manager_address'] = ipaddress
-
+ manager_config['manager_address'] = "[%s]" % self.getGlobalIPv6Address()
manager_config['manager_port'] = 19700
manager_config['manager_log'] = os.path.join(self.log_directory, "kumo-manager.log")
@@ -159,7 +155,7 @@ class NoSQLTestBed(BaseSlapRecipe):
return [manager_runner_path]
def run_kumo_server(self):
- """ Runs the kumofs server. """
+ """ Run the kumofs server. """
server_config = {}
server_config.update(self.options)
server_config.update(self.parameter_dict)
@@ -183,7 +179,7 @@ class NoSQLTestBed(BaseSlapRecipe):
return [server_runner_path]
def run_kumo_gateway(self):
- """ Runs the kumofs gateway. """
+ """ Run the kumofs gateway. """
gateway_config = {}
gateway_config.update(self.options)
gateway_config.update(self.parameter_dict)
@@ -206,7 +202,7 @@ class NoSQLTestBed(BaseSlapRecipe):
return [gateway_runner_path]
def run_kumo_tester(self):
- """ Runs the kumofs tester. """
+ """ Run the kumofs tester. """
tester_config = {}
tester_config.update(self.options)
tester_config.update(self.parameter_dict)
@@ -236,7 +232,7 @@ class NoSQLTestBed(BaseSlapRecipe):
return [tester_runner_path]
def run_kumo_tester_and_gateway(self):
- """ Runs the kumofs tester and gateway on the same partition. """
+ """ Run the kumofs tester and gateway on the same partition. """
address = self.getGlobalIPv6Address()
config_dict = {}
@@ -280,7 +276,7 @@ class NoSQLTestBed(BaseSlapRecipe):
return [gateway_runner_path, tester_runner_path]
def run_memstrike_set(self):
- """ Runs memstrike in set mode. """
+ """ Run memstrike in set mode. """
memstrike_config = {}
memstrike_config.update(self.options)
memstrike_config.update(self.parameter_dict)
diff --git a/slapos/recipe/nosqltestbed/template/kumo_gateway_run.in b/slapos/recipe/nosqltestbed/template/kumo_gateway_run.in
index da8c8950d..b7b312884 100644
--- a/slapos/recipe/nosqltestbed/template/kumo_gateway_run.in
+++ b/slapos/recipe/nosqltestbed/template/kumo_gateway_run.in
@@ -1,4 +1,5 @@
#!/bin/sh
# BEWARE: This file is operated by slapgrid
# BEWARE: It will be overwritten automatically
-exec %(gateway_binary)s -F -E -m %(manager_address)s:%(manager_port)s -t %(gateway_address)s:%(gateway_port)s --verbose -o %(gateway_log)s
+exec %(gateway_binary)s -F -E -m %(manager_address)s:%(manager_port)s \
+ -t %(gateway_address)s:%(gateway_port)s --verbose -o %(gateway_log)s
diff --git a/slapos/recipe/nosqltestbed/template/kumo_manager_run.in b/slapos/recipe/nosqltestbed/template/kumo_manager_run.in
index 1a325b6db..ff6ac68f9 100644
--- a/slapos/recipe/nosqltestbed/template/kumo_manager_run.in
+++ b/slapos/recipe/nosqltestbed/template/kumo_manager_run.in
@@ -1,4 +1,5 @@
#!/bin/sh
# BEWARE: This file is operated by slapgrid
# BEWARE: It will be overwritten automatically
-exec %(manager_binary)s -a -l %(manager_address)s:%(manager_port)s --verbose -o %(manager_log)s
+exec %(manager_binary)s -a -l %(manager_address)s:%(manager_port)s \
+ --verbose -o %(manager_log)s
diff --git a/slapos/recipe/nosqltestbed/template/kumo_server_run.in b/slapos/recipe/nosqltestbed/template/kumo_server_run.in
index 008276f63..cb6575b18 100644
--- a/slapos/recipe/nosqltestbed/template/kumo_server_run.in
+++ b/slapos/recipe/nosqltestbed/template/kumo_server_run.in
@@ -1,4 +1,6 @@
#!/bin/sh
# BEWARE: This file is operated by slapgrid
# BEWARE: It will be overwritten automatically
-exec %(server_binary)s -l %(server_address)s:%(server_port)s -L %(server_listen_port)s -m %(manager_address)s:%(manager_port)s -s %(server_storage)s --verbose -o %(server_log)s
+exec %(server_binary)s -l %(server_address)s:%(server_port)s \
+ -L %(server_listen_port)s -m %(manager_address)s:%(manager_port)s \
+ -s %(server_storage)s --verbose -o %(server_log)s
diff --git a/slapos/recipe/nosqltestbed/template/nosqltester_run.in b/slapos/recipe/nosqltestbed/template/nosqltester_run.in
index 78880c984..2e018cb84 100644
--- a/slapos/recipe/nosqltestbed/template/nosqltester_run.in
+++ b/slapos/recipe/nosqltestbed/template/nosqltester_run.in
@@ -1,4 +1,6 @@
#!/bin/sh
# BEWARE: This file is operated by slapgrid
# BEWARE: It will be overwritten automatically
-exec %(nosqltester_binary)s -m %(host_address)s -a %(tester_address)s -r %(report_path)s -b "%(binary)s" -l %(log_directory)s -c "%(compress_method)s"
+exec %(nosqltester_binary)s -m %(host_address)s -a %(tester_address)s \
+ -r %(report_path)s -b "%(binary)s" -l %(log_directory)s \
+ -c "%(compress_method)s"
--
2.30.9