Revision 7d4ae909 lib/hypervisor/hv_xen.py
| b/lib/hypervisor/hv_xen.py | ||
|---|---|---|
| 388 | 388 |
return utils.PathJoin(self._cfgdir, instance_name) |
| 389 | 389 |
|
| 390 | 390 |
@classmethod |
| 391 |
def _WriteNICInfoFile(cls, instance_name, idx, nic):
|
|
| 391 |
def _WriteNICInfoFile(cls, instance, idx, nic): |
|
| 392 | 392 |
"""Write the Xen config file for the instance. |
| 393 | 393 |
|
| 394 | 394 |
This version of the function just writes the config file from static data. |
| 395 | 395 |
|
| 396 | 396 |
""" |
| 397 |
instance_name = instance.name |
|
| 397 | 398 |
dirs = [(dname, constants.RUN_DIRS_MODE) |
| 398 | 399 |
for dname in cls._DIRS + [cls._InstanceNICDir(instance_name)]] |
| 399 | 400 |
utils.EnsureDirs(dirs) |
| ... | ... | |
| 401 | 402 |
cfg_file = cls._InstanceNICFile(instance_name, idx) |
| 402 | 403 |
data = StringIO() |
| 403 | 404 |
|
| 405 |
data.write("TAGS=%s\n" % "\ ".join(instance.GetTags()))
|
|
| 404 | 406 |
if nic.netinfo: |
| 405 | 407 |
netinfo = objects.Network.FromDict(nic.netinfo) |
| 406 | 408 |
data.write("NETWORK_NAME=%s\n" % netinfo.name)
|
| ... | ... | |
| 982 | 984 |
if hvp[constants.HV_VIF_SCRIPT]: |
| 983 | 985 |
nic_str += ", script=%s" % hvp[constants.HV_VIF_SCRIPT] |
| 984 | 986 |
vif_data.append("'%s'" % nic_str)
|
| 985 |
self._WriteNICInfoFile(instance.name, idx, nic)
|
|
| 987 |
self._WriteNICInfoFile(instance, idx, nic) |
|
| 986 | 988 |
|
| 987 | 989 |
disk_data = \ |
| 988 | 990 |
_GetConfigFileDiskData(block_devices, hvp[constants.HV_BLOCKDEV_PREFIX]) |
| ... | ... | |
| 1151 | 1153 |
if hvp[constants.HV_VIF_SCRIPT]: |
| 1152 | 1154 |
nic_str += ", script=%s" % hvp[constants.HV_VIF_SCRIPT] |
| 1153 | 1155 |
vif_data.append("'%s'" % nic_str)
|
| 1154 |
self._WriteNICInfoFile(instance.name, idx, nic)
|
|
| 1156 |
self._WriteNICInfoFile(instance, idx, nic) |
|
| 1155 | 1157 |
|
| 1156 | 1158 |
config.write("vif = [%s]\n" % ",".join(vif_data))
|
| 1157 | 1159 |
|
Also available in: Unified diff