Revision 4b97458c
| b/lib/objects.py | ||
|---|---|---|
| 97 | 97 |
|
| 98 | 98 |
""" |
| 99 | 99 |
ret_dict = {}
|
| 100 |
for key in defaults_dict.keys():
|
|
| 100 |
for key in defaults_dict: |
|
| 101 | 101 |
ret_dict[key] = FillDict(defaults_dict[key], |
| 102 | 102 |
custom_dict.get(key, {}),
|
| 103 | 103 |
skip_keys=skip_keys) |
| ... | ... | |
| 1299 | 1299 |
if self.alloc_policy is None: |
| 1300 | 1300 |
self.alloc_policy = constants.ALLOC_POLICY_PREFERRED |
| 1301 | 1301 |
|
| 1302 |
# We only update mtime, and not ctime, since we would not be able to provide
|
|
| 1303 |
# a correct value for creation time. |
|
| 1302 |
# We only update mtime, and not ctime, since we would not be able |
|
| 1303 |
# to provide a correct value for creation time.
|
|
| 1304 | 1304 |
if self.mtime is None: |
| 1305 | 1305 |
self.mtime = time.time() |
| 1306 | 1306 |
|
| ... | ... | |
| 1473 | 1473 |
|
| 1474 | 1474 |
# instance policy added before 2.6 |
| 1475 | 1475 |
if self.ipolicy is None: |
| 1476 |
self.ipolicy = MakeEmptyIPolicy()
|
|
| 1476 |
self.ipolicy = FillDictOfDicts(constants.IPOLICY_DEFAULTS, {})
|
|
| 1477 | 1477 |
|
| 1478 | 1478 |
@property |
| 1479 | 1479 |
def primary_hypervisor(self): |
Also available in: Unified diff