Revision bb3011ad lib/objects.py
| b/lib/objects.py | ||
|---|---|---|
| 438 | 438 |
@return: boolean indicating if a disk of the given type was found or not |
| 439 | 439 |
|
| 440 | 440 |
""" |
| 441 |
for instance in self.instances.values(): |
|
| 442 |
for disk in instance.disks: |
|
| 443 |
if disk.IsBasedOnDiskType(dev_type): |
|
| 444 |
return True |
|
| 441 |
for disk in self.disks.values(): |
|
| 442 |
if disk.IsBasedOnDiskType(dev_type): |
|
| 443 |
return True |
|
| 445 | 444 |
return False |
| 446 | 445 |
|
| 447 | 446 |
def UpgradeConfig(self): |
| ... | ... | |
| 1116 | 1115 |
|
| 1117 | 1116 |
@type idx: int |
| 1118 | 1117 |
@param idx: the disk index |
| 1119 |
@rtype: L{Disk}
|
|
| 1120 |
@return: the corresponding disk |
|
| 1118 |
@rtype: string
|
|
| 1119 |
@return: the corresponding disk's uuid
|
|
| 1121 | 1120 |
@raise errors.OpPrereqError: when the given index is not valid |
| 1122 | 1121 |
|
| 1123 | 1122 |
""" |
| ... | ... | |
| 1144 | 1143 |
if _with_private: |
| 1145 | 1144 |
bo["osparams_private"] = self.osparams_private.Unprivate() |
| 1146 | 1145 |
|
| 1147 |
for attr in "nics", "disks", "disks_info":
|
|
| 1146 |
for attr in "nics", "disks_info": |
|
| 1148 | 1147 |
alist = bo.get(attr, None) |
| 1149 | 1148 |
if alist: |
| 1150 | 1149 |
nlist = outils.ContainerToDicts(alist) |
| ... | ... | |
| 1167 | 1166 |
del val["admin_up"] |
| 1168 | 1167 |
obj = super(Instance, cls).FromDict(val) |
| 1169 | 1168 |
obj.nics = outils.ContainerFromDicts(obj.nics, list, NIC) |
| 1170 |
obj.disks = outils.ContainerFromDicts(obj.disks, list, Disk) |
|
| 1171 | 1169 |
obj.disks_info = outils.ContainerFromDicts(obj.disks_info, list, Disk) |
| 1172 | 1170 |
return obj |
| 1173 | 1171 |
|
| ... | ... | |
| 1177 | 1175 |
""" |
| 1178 | 1176 |
for nic in self.nics: |
| 1179 | 1177 |
nic.UpgradeConfig() |
| 1180 |
for disk in self.disks: |
|
| 1181 |
disk.UpgradeConfig() |
|
| 1182 | 1178 |
if self.hvparams: |
| 1183 | 1179 |
for key in constants.HVC_GLOBALS: |
| 1184 | 1180 |
try: |
Also available in: Unified diff