Revision 69ab2e12 lib/hypervisor/hv_base.py

b/lib/hypervisor/hv_base.py
133 133
  """
134 134
  PARAMETERS = {}
135 135
  ANCILLARY_FILES = []
136
  ANCILLARY_FILES_OPT = []
136 137
  CAN_MIGRATE = False
137 138

  
138 139
  def __init__(self):
......
221 222
    """Return a list of ancillary files to be copied to all nodes as ancillary
222 223
    configuration files.
223 224

  
224
    @rtype: list of strings
225
    @return: list of absolute paths of files to ship cluster-wide
225
    @rtype: (list of absolute paths, list of absolute paths)
226
    @return: (all files, optional files)
226 227

  
227 228
    """
228 229
    # By default we return a member variable, so that if an hypervisor has just
229 230
    # a static list of files it doesn't have to override this function.
230
    return cls.ANCILLARY_FILES
231
    assert set(cls.ANCILLARY_FILES).issuperset(cls.ANCILLARY_FILES_OPT), \
232
      "Optional ancillary files must be a subset of ancillary files"
233

  
234
    return (cls.ANCILLARY_FILES, cls.ANCILLARY_FILES_OPT)
231 235

  
232 236
  def Verify(self):
233 237
    """Verify the hypervisor.

Also available in: Unified diff