From 0040105e803c4cb7e1da3def99fc8f2db7039fe7 Mon Sep 17 00:00:00 2001
From: Max Neunhoeffer <max@arangodb.com>
Date: Mon, 13 Jun 2016 14:37:15 +0200
Subject: [PATCH] Finish transformation to three digit numbers in server IDs.

---
 js/actions/api-cluster.js                         |  8 ++++----
 .../aardvark/APP/frontend/js/views/nodeView.js    |  2 +-
 js/client/tests/agency/agency-test.js             |  4 ++--
 .../tests/resilience/moving-shards-cluster.js     | 15 +++++++++++----
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/js/actions/api-cluster.js b/js/actions/api-cluster.js
index a56cbc99f4..6ab61b660e 100644
--- a/js/actions/api-cluster.js
+++ b/js/actions/api-cluster.js
@@ -1291,10 +1291,10 @@ actions.defineHttp({
 /// The attribute name is the collection name. Each value is an object
 /// of the following form:
 /// 
-///     { "collection1": { "Plan": { "s100001": ["DBServer1", "DBServer2"],
-///                                  "s100002": ["DBServer3", "DBServer4"] },
-///                        "Current": { "s100001": ["DBServer1", "DBServer2"],
-///                                     "s100002": ["DBServer3"] } },
+///     { "collection1": { "Plan": { "s100001": ["DBServer001", "DBServer002"],
+///                                  "s100002": ["DBServer003", "DBServer004"] },
+///                        "Current": { "s100001": ["DBServer001", "DBServer002"],
+///                                     "s100002": ["DBServer003"] } },
 ///       "collection2": ...
 ///     }
 ///
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/nodeView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/nodeView.js
index ad4c04d153..bf24a33b5c 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/nodeView.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/nodeView.js
@@ -111,7 +111,7 @@
           self.dbServer = self.dbServers[0];
 
           self.dbServer.each(function(model) {
-            if (model.get("name") === 'DBServer1') {
+            if (model.get("name") === 'DBServer001') {
               self.dbServer = model;
             }
           });
diff --git a/js/client/tests/agency/agency-test.js b/js/client/tests/agency/agency-test.js
index 920d73ccf8..cc839cede3 100644
--- a/js/client/tests/agency/agency-test.js
+++ b/js/client/tests/agency/agency-test.js
@@ -362,7 +362,7 @@ function agencyTestSuite () {
       }
 
       var requests = [
-        ["/_api/agency/write", [[{"/arango/Plan/DBServers/DBServer1":{"new":"none","op":"set"}}]]],
+        ["/_api/agency/write", [[{"/arango/Plan/DBServers/DBServer001":{"new":"none","op":"set"}}]]],
         ["/_api/agency/read", [["/arango/Plan/DBServers"]]],
       ];
       
@@ -371,7 +371,7 @@ function agencyTestSuite () {
         assertEqual(res.statusCode, 200);
       });
 
-      assertEqual(res.body, JSON.stringify([{"arango":{"Plan":{"DBServers":{"DBServer1":"none"}}}}]));
+      assertEqual(res.body, JSON.stringify([{"arango":{"Plan":{"DBServers":{"DBServer001":"none"}}}}]));
     }
   };
 }
diff --git a/js/server/tests/resilience/moving-shards-cluster.js b/js/server/tests/resilience/moving-shards-cluster.js
index e367873e0e..a4d9c5c417 100644
--- a/js/server/tests/resilience/moving-shards-cluster.js
+++ b/js/server/tests/resilience/moving-shards-cluster.js
@@ -140,7 +140,7 @@ function MovingShardsSuite () {
 ////////////////////////////////////////////////////////////////////////////////
 
   function cleanOutServer(id) {
-    var coordEndpoint = global.ArangoClusterInfo.getServerEndpoint("Coordinator1");
+    var coordEndpoint = global.ArangoClusterInfo.getServerEndpoint("Coordinator001");
     var request = require("@arangodb/request");
     var endpointToURL = require("@arangodb/cluster").endpointToURL;
     var url = endpointToURL(coordEndpoint);
@@ -155,7 +155,7 @@ function MovingShardsSuite () {
 ////////////////////////////////////////////////////////////////////////////////
 
   function moveShard(database, collection, shard, fromServer, toServer) {
-    var coordEndpoint = global.ArangoClusterInfo.getServerEndpoint("Coordinator1");
+    var coordEndpoint = global.ArangoClusterInfo.getServerEndpoint("Coordinator001");
     var request = require("@arangodb/request");
     var endpointToURL = require("@arangodb/cluster").endpointToURL;
     var url = endpointToURL(coordEndpoint);
@@ -197,10 +197,17 @@ function MovingShardsSuite () {
 
   function findServerNotOnList(list) {
     var count = 1;
-    var name = "DBServer" + count;
+    var str = "" + count;
+    var pad = "000";
+    var ans = pad.substring(0, pad.length - str.length) + str;
+
+    var name = "DBServer" + ans;
     while (list.indexOf(name) >= 0) {
+      require("internal").print(list, name);
       count += 1;
-      name = "DBServer" + count;
+      str = "" + count;
+      ans = pad.substring(0, pad.length - str.length) + str;
+      name = "DBServer" + ans;
     }
     return name;
   }