7167: replace keep_existing with num_keep_servers and use it create all required...

diff --git a/sdk/go/arvadostest/run_servers.go b/sdk/go/arvadostest/run_servers.go
index 1b7a5e02ca5c47ee016cd2f1b31e4830553faf00..0d6c3b393753ef3eae9ec68c6a047072df1626fa 100644 (file)
--- a/sdk/go/arvadostest/run_servers.go
+++ b/sdk/go/arvadostest/run_servers.go
@@ -9,6 +9,7 @@ import (
        "log"
        "os"
        "os/exec"
+       "strconv"
        "strings"
 )
 
@@ -101,19 +102,19 @@ func StopAPI() {
 // StartKeep is used to start keep servers
 // with needMore = false and enforcePermissions = false
 func StartKeep() {
-       StartKeepWithParams(false, false)
+       StartKeepWithParams(2, false)
 }
 
 // StartKeepWithParams is used to start keep servers while specifying
-// needMore and enforcePermissions parameters.
-func StartKeepWithParams(needMore bool, enforcePermissions bool) {
+// numKeepServers and enforcePermissions parameters.
+func StartKeepWithParams(numKeepServers int, enforcePermissions bool) {
        cwd, _ := os.Getwd()
        defer os.Chdir(cwd)
        chdirToPythonTests()
 
        cmdArgs := []string{"run_test_server.py", "start_keep"}
-       if needMore {
-               cmdArgs = append(cmdArgs, "--need-more")
+       if numKeepServers != 2 {
+               cmdArgs = append(cmdArgs, "--num-keep-servers", strconv.Itoa(numKeepServers))
        }
        if enforcePermissions {
                cmdArgs = append(cmdArgs, "--keep-enforce-permissions")

diff --git a/sdk/python/tests/run_test_server.py b/sdk/python/tests/run_test_server.py
index 5bda58bb3f60e452c7b15d3f5735dd13743761d5..f8a60a7e7469b407ae502fe5259c648f4695719e 100644 (file)
--- a/sdk/python/tests/run_test_server.py
+++ b/sdk/python/tests/run_test_server.py
@@ -323,7 +323,7 @@ def _start_keep(n, keep_args):
 
     return port
 
-def run_keep(blob_signing_key=None, enforce_permissions=False, num_keep_servers=2):
+def run_keep(blob_signing_key=None, enforce_permissions=False, num_servers=2):
     stop_keep()
 
     keep_args = {}
@@ -350,7 +350,7 @@ def run_keep(blob_signing_key=None, enforce_permissions=False, num_keep_servers=
     for d in api.keep_disks().list().execute()['items']:
         api.keep_disks().delete(uuid=d['uuid']).execute()
 
-    for d in range(0, num_keep_servers):
+    for d in range(0, num_servers):
         port = _start_keep(d, keep_args)
         svc = api.keep_services().create(body={'keep_service': {
             'uuid': 'zzzzz-bi6l4-keepdisk{:07d}'.format(d),
@@ -598,14 +598,14 @@ if __name__ == "__main__":
     parser = argparse.ArgumentParser()
     parser.add_argument('action', type=str, help="one of {}".format(actions))
     parser.add_argument('--auth', type=str, metavar='FIXTURE_NAME', help='Print authorization info for given api_client_authorizations fixture')
-    parser.add_argument('--need-more', action="store_true", help="Used to indicate need one more than the default 2 keep servers")
+    parser.add_argument('--num-keep-servers', metavar='int', type=int, help="Number of keep servers desired; default is 2 keep servers")
     parser.add_argument('--keep-enforce-permissions', action="store_true", help="Enforce keep permissions")
 
     args = parser.parse_args()
 
-    num_keep_servers = 2
-    if args.need_more:
-        num_keep_servers = 3
+    num_servers = 2
+    if args.num_keep_servers is not None:
+        num_servers = args.num_keep_servers
 
     if args.action not in actions:
         print("Unrecognized action '{}'. Actions are: {}.".format(args.action, actions), file=sys.stderr)
@@ -624,7 +624,7 @@ if __name__ == "__main__":
     elif args.action == 'stop':
         stop(force=('ARVADOS_TEST_API_HOST' not in os.environ))
     elif args.action == 'start_keep':
-        run_keep(enforce_permissions=args.keep_enforce_permissions, num_keep_servers=num_keep_servers)
+        run_keep(enforce_permissions=args.keep_enforce_permissions, num_servers=num_servers)
     elif args.action == 'stop_keep':
         stop_keep()
     elif args.action == 'start_keep_proxy':

diff --git a/tools/keep-rsync/keep-rsync_test.go b/tools/keep-rsync/keep-rsync_test.go
index f722e9af8133b40723461d2331829672b2b02c66..a77ab21afe62209ef3eb255a7abe563a7db8017a 100644 (file)
--- a/tools/keep-rsync/keep-rsync_test.go
+++ b/tools/keep-rsync/keep-rsync_test.go
@@ -73,7 +73,7 @@ func setupRsync(c *C, enforcePermissions, updateDstReplications bool, replicatio
 
        // Start API and Keep servers
        arvadostest.StartAPI()
-       arvadostest.StartKeepWithParams(true, enforcePermissions)
+       arvadostest.StartKeepWithParams(3, enforcePermissions)
 
        // setup keepclients
        var err error