From 8047c1fba3979ce7fd0e8620b684be0a8db30db7 Mon Sep 17 00:00:00 2001
From: Yichen Wang <yicwang@cisco.com>
Date: Tue, 15 Aug 2017 16:06:51 -0700
Subject: [PATCH] Multiple small fixes

1. Update document to have the missing package;
2. Add +x attribute for script;
3. Fix stage info for progression runs;
4. Support infinity quota for disk sizes;

Change-Id: Ia60c1c457b02c18932e4e11225541cf100a1b899
---
 doc/source/quickstart_git.rst |  4 ++--
 kb_extract_img_from_docker.sh |  0
 kloudbuster/kloudbuster.py    | 15 ++++++++-------
 3 files changed, 10 insertions(+), 9 deletions(-)
 mode change 100644 => 100755 kb_extract_img_from_docker.sh

diff --git a/doc/source/quickstart_git.rst b/doc/source/quickstart_git.rst
index 03ab113..a3cc7bd 100644
--- a/doc/source/quickstart_git.rst
+++ b/doc/source/quickstart_git.rst
@@ -16,7 +16,7 @@ Quick installation on Ubuntu/Debian
 
 .. code-block:: bash
 
-    $ sudo apt-get install python-dev python-virtualenv git git-review qemu-utils
+    $ sudo apt-get install build-essential python-dev python-virtualenv git git-review qemu-utils
     $ # create a virtual environment
     $ virtualenv ./vkb
     $ source ./vkb/bin/activate
@@ -30,7 +30,7 @@ Quick installation on RHEL/Fedora/CentOS
 
 .. code-block:: bash
 
-    $ sudo yum install python-devel python-virtualenv git qemu-img
+    $ sudo yum install gcc python-devel python-virtualenv git qemu-img
     $ # create a virtual environment
     $ virtualenv ./vkb
     $ source ./vkb/bin/activate
diff --git a/kb_extract_img_from_docker.sh b/kb_extract_img_from_docker.sh
old mode 100644
new mode 100755
diff --git a/kloudbuster/kloudbuster.py b/kloudbuster/kloudbuster.py
index 87f8b37..059bf7f 100755
--- a/kloudbuster/kloudbuster.py
+++ b/kloudbuster/kloudbuster.py
@@ -557,7 +557,8 @@ class KloudBuster(object):
             start = self.client_cfg.progression.vm_start
             multiple = self.client_cfg.progression.vm_multiple
             cur_vm_count = 1 if start else multiple
-            total_vm = self.get_tenant_vm_count(self.client_cfg)
+            # Minus 1 for KB-Proxy
+            total_vm = self.get_tenant_vm_count(self.client_cfg) - 1
             while (cur_vm_count <= total_vm):
                 log_info += "\n" + self.kb_runner.header_formatter(stage, cur_vm_count)
                 cur_vm_count = (stage + 1 - start) * multiple
@@ -737,17 +738,17 @@ class KloudBuster(object):
 
     def calc_cinder_quota(self):
         total_vm = self.get_tenant_vm_count(self.server_cfg)
-        svr_disk = self.server_cfg['flavor']['disk']\
-            if self.server_cfg['flavor']['disk'] != 0 else 20
+        svr_disk = self.server_cfg['flavor']['disk']
         server_quota = {}
-        server_quota['gigabytes'] = total_vm * svr_disk
+        server_quota['gigabytes'] = total_vm * svr_disk \
+            if svr_disk != 0 else -1
         server_quota['volumes'] = total_vm
 
         total_vm = self.get_tenant_vm_count(self.client_cfg)
-        clt_disk = self.client_cfg['flavor']['disk']\
-            if self.client_cfg['flavor']['disk'] != 0 else 20
+        clt_disk = self.client_cfg['flavor']['disk']
         client_quota = {}
-        client_quota['gigabytes'] = total_vm * clt_disk + 20
+        client_quota['gigabytes'] = total_vm * clt_disk + 20 \
+            if clt_disk != 0 else -1
         client_quota['volumes'] = total_vm
 
         return [server_quota, client_quota]