Merge "Add "host_name_separator" variable to Context class" into stable/fraser

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

diff --cc yardstick/common/exceptions.py
index 2b72d7f,55bcfdb..6a5b09e
--- 1/yardstick/common/exceptions.py
--- 2/yardstick/common/exceptions.py
+++ b/yardstick/common/exceptions.py
@@@ -122,28 -112,8 +122,28 @@@ class LibvirtCreateError(YardstickExcep
      message = 'Error creating the virtual machine. 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):