Revision c2be2532
| b/lib/hypervisor/hv_xen.py | ||
|---|---|---|
| 50 | 50 |
"/etc/xen/scripts/vif-bridge", |
| 51 | 51 |
] |
| 52 | 52 |
|
| 53 |
@staticmethod |
|
| 54 |
def _ConfigFileName(instance_name): |
|
| 55 |
"""Get the config file name for an instance. |
|
| 56 |
|
|
| 57 |
@param instance_name: instance name |
|
| 58 |
@type instance_name: str |
|
| 59 |
@return: fully qualified path to instance config file |
|
| 60 |
@rtype: str |
|
| 61 |
|
|
| 62 |
""" |
|
| 63 |
return "/etc/xen/%s" % instance_name |
|
| 64 |
|
|
| 53 | 65 |
@classmethod |
| 54 | 66 |
def _WriteConfigFile(cls, instance, block_devices): |
| 55 | 67 |
"""Write the Xen config file for the instance. |
| ... | ... | |
| 64 | 76 |
This version of the function just writes the config file from static data. |
| 65 | 77 |
|
| 66 | 78 |
""" |
| 67 |
utils.WriteFile("/etc/xen/%s" % instance_name, data=data)
|
|
| 79 |
utils.WriteFile(XenHypervisor._ConfigFileName(instance_name), data=data)
|
|
| 68 | 80 |
|
| 69 | 81 |
@staticmethod |
| 70 | 82 |
def _ReadConfigFile(instance_name): |
| ... | ... | |
| 72 | 84 |
|
| 73 | 85 |
""" |
| 74 | 86 |
try: |
| 75 |
file_content = utils.ReadFile("/etc/xen/%s" % instance_name)
|
|
| 87 |
file_content = utils.ReadFile( |
|
| 88 |
XenHypervisor._ConfigFileName(instance_name)) |
|
| 76 | 89 |
except EnvironmentError, err: |
| 77 | 90 |
raise errors.HypervisorError("Failed to load Xen config file: %s" % err)
|
| 78 | 91 |
return file_content |
| ... | ... | |
| 82 | 95 |
"""Remove the xen configuration file. |
| 83 | 96 |
|
| 84 | 97 |
""" |
| 85 |
utils.RemoveFile("/etc/xen/%s" % instance_name)
|
|
| 98 |
utils.RemoveFile(XenHypervisor._ConfigFileName(instance_name))
|
|
| 86 | 99 |
|
| 87 | 100 |
@staticmethod |
| 88 | 101 |
def _RunXmList(xmlist_errors): |
| ... | ... | |
| 549 | 562 |
# just in case it exists |
| 550 | 563 |
utils.RemoveFile("/etc/xen/auto/%s" % instance.name)
|
| 551 | 564 |
try: |
| 552 |
utils.WriteFile("/etc/xen/%s" % instance.name, data=config.getvalue())
|
|
| 565 |
utils.WriteFile(cls._ConfigFileName(instance.name), |
|
| 566 |
data=config.getvalue()) |
|
| 553 | 567 |
except EnvironmentError, err: |
| 554 | 568 |
raise errors.HypervisorError("Cannot write Xen instance confile"
|
| 555 |
" file /etc/xen/%s: %s" %
|
|
| 556 |
(instance.name, err))
|
|
| 569 |
" file %s: %s" % |
|
| 570 |
(cls._ConfigFileName(instance.name), err))
|
|
| 557 | 571 |
|
| 558 | 572 |
return True |
| 559 | 573 |
|
| ... | ... | |
| 690 | 704 |
# just in case it exists |
| 691 | 705 |
utils.RemoveFile("/etc/xen/auto/%s" % instance.name)
|
| 692 | 706 |
try: |
| 693 |
utils.WriteFile("/etc/xen/%s" % instance.name,
|
|
| 707 |
utils.WriteFile(cls._ConfigFileName(instance.name),
|
|
| 694 | 708 |
data=config.getvalue()) |
| 695 | 709 |
except EnvironmentError, err: |
| 696 | 710 |
raise errors.HypervisorError("Cannot write Xen instance confile"
|
| 697 |
" file /etc/xen/%s: %s" %
|
|
| 698 |
(instance.name, err))
|
|
| 711 |
" file %s: %s" % |
|
| 712 |
(cls._ConfigFileName(instance.name), err))
|
|
| 699 | 713 |
|
| 700 | 714 |
return True |
Also available in: Unified diff