Repository: googlecloudplatform/perfkitbenchmarker
Issue: Unresolved dependency: requests.packages

After CloudStack provider merge, I have the following traceback right after running any benchmark:

```
Traceback (most recent call last):
  File "pkb.py", line 19, in <module>
    from perfkitbenchmarker.pkb import Main
  File "/root/mateuszb/perfkit_ww43_2/PerfKitBenchmarker/perfkitbenchmarker/pkb.py", line 63, in <module>
    from perfkitbenchmarker import benchmarks
  File "/root/mateuszb/perfkit_ww43_2/PerfKitBenchmarker/perfkitbenchmarker/benchmarks/__init__.py", line 26, in <module>
    BENCHMARKS = _LoadBenchmarks()
  File "/root/mateuszb/perfkit_ww43_2/PerfKitBenchmarker/perfkitbenchmarker/benchmarks/__init__.py", line 24, in _LoadBenchmarks
    return list(import_util.LoadModulesForPath(__path__, __name__))
  File "/root/mateuszb/perfkit_ww43_2/PerfKitBenchmarker/perfkitbenchmarker/import_util.py", line 40, in LoadModulesForPath
    yield importlib.import_module(modname)
  File "/usr/lib/python2.7/importlib/__init__.py", line 37, in import_module
    __import__(name)
  File "/root/mateuszb/perfkit_ww43_2/PerfKitBenchmarker/perfkitbenchmarker/benchmarks/mysql_service_benchmark.py", line 35, in <module>
    from perfkitbenchmarker import benchmark_spec as benchmark_spec_class
  File "/root/mateuszb/perfkit_ww43_2/PerfKitBenchmarker/perfkitbenchmarker/benchmark_spec.py", line 36, in <module>
    from perfkitbenchmarker.cloudstack import cloudstack_network as cs_nw
  File "/root/mateuszb/perfkit_ww43_2/PerfKitBenchmarker/perfkitbenchmarker/cloudstack/cloudstack_network.py", line 18, in <module>
    from perfkitbenchmarker.cloudstack import util
  File "/root/mateuszb/perfkit_ww43_2/PerfKitBenchmarker/perfkitbenchmarker/cloudstack/util.py", line 21, in <module>
    from requests.packages import urllib3
ImportError: No module named packages
```

Adding `requests>=2.5.1` to `requirements.txt` solves the issue, but I'm not sure if that's the way you want to fix this.


Changed files:
perfkitbenchmarker/cloudstack/cloudstack_virtual_machine.py, perfkitbenchmarker/cloudstack/util.py

diff --git a/perfkitbenchmarker/cloudstack/cloudstack_virtual_machine.py b/perfkitbenchmarker/cloudstack/cloudstack_virtual_machine.py
index 52d3246a..3d28447c 100644
--- a/perfkitbenchmarker/cloudstack/cloudstack_virtual_machine.py
+++ b/perfkitbenchmarker/cloudstack/cloudstack_virtual_machine.py
@@ -68,6 +68,7 @@ class CloudStackVirtualMachine(virtual_machine.BaseVirtualMachine):
     self.zone_id = zone['id']
     self.user_name = self.DEFAULT_USER_NAME
     self.image = self.image or self.DEFAULT_IMAGE
+    self.disk_counter = 0
 
 
   @vm_util.Retry(max_retries=3)
@@ -188,13 +189,14 @@ class CloudStackVirtualMachine(virtual_machine.BaseVirtualMachine):
 
     for i in xrange(disk_spec.num_striped_disks):
 
-        name = 'disk-%s-%s' % (self.name, i + 1)
+        name = 'disk-%s-%d-%d' % (self.name, i + 1, self.disk_counter)
         scratch_disk = cloudstack_disk.CloudStackDisk(disk_spec,
                                                       name,
                                                       self.zone_id,
                                                       self.project_id)
 
         self.disks.append(scratch_disk)
+        self.disk_counter += 1
 
     self._CreateScratchDiskFromDisks(disk_spec, self.disks)
 
diff --git a/perfkitbenchmarker/cloudstack/util.py b/perfkitbenchmarker/cloudstack/util.py
index 6b149dec..51ec95e0 100644
--- a/perfkitbenchmarker/cloudstack/util.py
+++ b/perfkitbenchmarker/cloudstack/util.py
@@ -18,8 +18,11 @@ import os
 from csapi import API
 from perfkitbenchmarker import flags
 
-from requests.packages import urllib3
-urllib3.disable_warnings()
+try:
+    from requests.packages import urllib3
+    urllib3.disable_warnings()
+except ImportError:
+    pass
 
 flags.DEFINE_string('CS_API_URL',
                     os.environ.get('CS_API_URL'),