Merge "Add "host_name_separator" variable to Context class"

diff --cc yardstick/benchmark/contexts/standalone/sriov.py
Simple merge

diff --cc yardstick/common/exceptions.py
index 966b15c,3ae49d8..18bb4aa
--- 1/yardstick/common/exceptions.py
--- 2/yardstick/common/exceptions.py
+++ b/yardstick/common/exceptions.py
@@@ -147,28 -137,8 +147,28 @@@ class LibvirtQemuImageCreateError(Yards
                 '%(base_image)s. Error: %(error)s.')
  
  
 +class SSHError(YardstickException):
 +    message = '%(error_msg)s'
 +
 +
 +class SSHTimeout(SSHError):
 +    pass
 +
 +
 +class IncorrectConfig(YardstickException):
 +    message = '%(error_msg)s'
 +
 +
 +class IncorrectSetup(YardstickException):
 +    message = '%(error_msg)s'
 +
 +
 +class IncorrectNodeSetup(IncorrectSetup):
 +    pass
 +
 +
  class ScenarioConfigContextNameNotFound(YardstickException):
-     message = 'Context name "%(context_name)s" not found'
+     message = 'Context for host name "%(host_name)s" not found'
  
  
  class StackCreationInterrupt(YardstickException):