Merge "move external_network auto-assign to Heat context"

diff --cc yardstick/benchmark/contexts/heat.py
Simple merge

diff --cc yardstick/benchmark/core/task.py
index 6bc1005,b81b9be..2794d84
--- 1/yardstick/benchmark/core/task.py
--- 2/yardstick/benchmark/core/task.py
+++ b/yardstick/benchmark/core/task.py
@@@ -367,21 -272,10 +367,11 @@@ class TaskParser(object):       # pragm
                                                    name_suffix)
              except KeyError:
                  pass
+             # default to Heat context because we are testing OpenStack
              context_type = cfg_attrs.get("type", "Heat")
-             if "Heat" == context_type and "networks" in cfg_attrs:
-                 # bugfix: if there are more than one network,
-                 # only add "external_network" on first one.
-                 # the name of netwrok should follow this rule:
-                 # test, test2, test3 ...
-                 # sort network with the length of network's name
-                 sorted_networks = sorted(cfg_attrs["networks"])
-                 # config external_network based on env var
-                 cfg_attrs["networks"][sorted_networks[0]]["external_network"] \
-                     = os.environ.get("EXTERNAL_NETWORK", "net04_ext")
- 
              context = Context.get(context_type)
              context.init(cfg_attrs)
 +            contexts.append(context)
  
          run_in_parallel = cfg.get("run_in_parallel", False)