3 files changed, 15 insertions, 16 deletions
diff --git a/scripts/scalability/test_controller/client/Blobs.conf b/scripts/scalability/test_controller/client/Blobs.conf
index d5a2761f..eea4b1cd 100644
--- a/scripts/scalability/test_controller/client/Blobs.conf
+++ b/scripts/scalability/test_controller/client/Blobs.conf
@@ -2,7 +2,7 @@
 title=Blobs Scalability Tests
 description=Upload and download blobs
 url=http://giraffe.cdev.bitmask.net:2424/
-size=10
+size=1
 templates_dir=/tmp/templates
 
 [test_upload]
diff --git a/scripts/scalability/test_controller/client/makefile b/scripts/scalability/test_controller/client/makefile
index e0a719a0..97603cc4 100644
--- a/scripts/scalability/test_controller/client/makefile
+++ b/scripts/scalability/test_controller/client/makefile
@@ -25,8 +25,9 @@
 # run `make`.
 
 
-URI    = https://giraffe.cdev.bitmask.net:7001
-CREATE = 5000
+URI   ?= https://giraffe.cdev.bitmask.net:7001
+BLOBS ?= 10000
+SIZE  ?= 10
 
 
 #------------------#
@@ -51,12 +52,10 @@ bench-download: create-users create-blobs
 
 # for quick tests only
 bench-upload-quick: create-users delete-blobs
-	 curl -X POST "$(URI)/blobs?action=delete"
 	 fl-run-bench -c 1 --duration 10 -f test_Blobs.py Blobs.test_upload
 
 # for quick tests only
 bench-download-quick: create-users create-blobs
-	 curl -X POST "$(URI)/blobs?action=create&size=10"
 	 fl-run-bench -c 1 --duration 10 -f test_Blobs.py Blobs.test_download
 
 #---------------------#
@@ -81,10 +80,10 @@ stop-mem:
 #--------------#
 
 create-users:
-	 curl -X POST $(URI)/users?create=$(CREATE)
+	 curl -X POST $(URI)/users?create=1
 
 delete-blobs:
 	 curl -X POST "$(URI)/blobs?action=delete"
 
 create-blobs:
-	 curl -X POST "$(URI)/blobs?action=create&size=10&amount=5000"
+	 curl -X POST "$(URI)/blobs?action=create&size=$(SIZE)&amount=$(BLOBS)"
diff --git a/scripts/scalability/test_controller/client/test_Blobs.py b/scripts/scalability/test_controller/client/test_Blobs.py
index 5f31dbc8..1bcfc74e 100644
--- a/scripts/scalability/test_controller/client/test_Blobs.py
+++ b/scripts/scalability/test_controller/client/test_Blobs.py
@@ -37,21 +37,21 @@ def _ensure_template(templates_dir, size):
 
 class Blobs(FunkLoadTestCase):
 
-    next_user_id = 0
+    next_blob_id = 0
     lock = threading.Lock()
 
-    def _get_next_user_id(self):
+    def _get_next_blob_id(self):
         with Blobs.lock:
-            user_id = Blobs.next_user_id
-            Blobs.next_user_id += 1
-            Blobs.next_user_id %= 5000
-        return user_id
+            blob_id = Blobs.next_blob_id
+            Blobs.next_blob_id += 1
+            Blobs.next_blob_id %= 5000
+        return blob_id
 
     def setUp(self):
-        user_id = self._get_next_user_id()
+        blob_id = self._get_next_blob_id()
         base_url = self.conf_get('main', 'url')
-        self.url = urlparse.urljoin(base_url, 'blobs/%s/0' % user_id)
-        self.setHeader('Authorization', _get_auth_header(user_id))
+        self.url = urlparse.urljoin(base_url, 'blobs/0/%d' % blob_id)
+        self.setHeader('Authorization', _get_auth_header('0'))
         templates_dir = self.conf_get('main', 'templates_dir')
         size = self.conf_getInt('main', 'size')
         fpath = _ensure_template(templates_dir, size)