Merge "NFVBENCH-5 NFVBENCH-39 Fix long prep time with large number of flows"

diff --combined nfvbench/chain_clients.py
index 01bf435,4277049..ac95247
--- 1/nfvbench/chain_clients.py
--- 2/nfvbench/chain_clients.py
+++ b/nfvbench/chain_clients.py
@@@ -193,6 -193,9 +193,6 @@@ class BasicStageClient(object)
              if name and server.name != name:
                  continue
  
 -            if az and self.__get_server_az(server) != az:
 -                raise StageClientException(error_msg.format('availability zones'))
 -
              if flavor_id and server.flavor['id'] != flavor_id:
                  raise StageClientException(error_msg.format('flavors'))
  
@@@ -310,8 -313,8 +310,8 @@@
          with open(boot_script_file, 'r') as boot_script:
              content = boot_script.read()
  
-         g1cidr = self.config.generator_config.src_device.gateway_ip_list[chain_index] + '/8'
-         g2cidr = self.config.generator_config.dst_device.gateway_ip_list[chain_index] + '/8'
+         g1cidr = self.config.generator_config.src_device.get_gw_ip(chain_index) + '/8'
+         g2cidr = self.config.generator_config.dst_device.get_gw_ip(chain_index) + '/8'
  
          vm_config = {
              'forwarder': self.config.vm_forwarder,