Revision 7c670076 lib/query.py
b/lib/query.py | ||
---|---|---|
1259 | 1259 |
# Used for individual rows |
1260 | 1260 |
self.inst_hvparams = None |
1261 | 1261 |
self.inst_beparams = None |
1262 |
self.inst_osparams = None |
|
1262 | 1263 |
self.inst_nicparams = None |
1263 | 1264 |
|
1264 | 1265 |
def __iter__(self): |
... | ... | |
1271 | 1272 |
for inst in self.instances: |
1272 | 1273 |
self.inst_hvparams = self.cluster.FillHV(inst, skip_globals=True) |
1273 | 1274 |
self.inst_beparams = self.cluster.FillBE(inst) |
1275 |
self.inst_osparams = self.cluster.SimpleFillOS(inst.os, inst.osparams) |
|
1274 | 1276 |
self.inst_nicparams = [self.cluster.SimpleFillNIC(nic.nicparams) |
1275 | 1277 |
for nic in inst.nics] |
1276 | 1278 |
|
... | ... | |
1636 | 1638 |
fields = [ |
1637 | 1639 |
# Filled parameters |
1638 | 1640 |
(_MakeField("hvparams", "HypervisorParameters", QFT_OTHER, |
1639 |
"Hypervisor parameters"), |
|
1641 |
"Hypervisor parameters (merged)"),
|
|
1640 | 1642 |
IQ_CONFIG, 0, lambda ctx, _: ctx.inst_hvparams), |
1641 | 1643 |
(_MakeField("beparams", "BackendParameters", QFT_OTHER, |
1642 |
"Backend parameters"), |
|
1644 |
"Backend parameters (merged)"),
|
|
1643 | 1645 |
IQ_CONFIG, 0, lambda ctx, _: ctx.inst_beparams), |
1646 |
(_MakeField("osparams", "OpSysParameters", QFT_OTHER, |
|
1647 |
"Operating system parameters (merged)"), |
|
1648 |
IQ_CONFIG, 0, lambda ctx, _: ctx.inst_osparams), |
|
1644 | 1649 |
|
1645 | 1650 |
# Unfilled parameters |
1646 | 1651 |
(_MakeField("custom_hvparams", "CustomHypervisorParameters", QFT_OTHER, |
... | ... | |
1649 | 1654 |
(_MakeField("custom_beparams", "CustomBackendParameters", QFT_OTHER, |
1650 | 1655 |
"Custom backend parameters",), |
1651 | 1656 |
IQ_CONFIG, 0, _GetItemAttr("beparams")), |
1657 |
(_MakeField("custom_osparams", "CustomOpSysParameters", QFT_OTHER, |
|
1658 |
"Custom operating system parameters",), |
|
1659 |
IQ_CONFIG, 0, _GetItemAttr("osparams")), |
|
1652 | 1660 |
(_MakeField("custom_nicparams", "CustomNicParameters", QFT_OTHER, |
1653 | 1661 |
"Custom network interface parameters"), |
1654 | 1662 |
IQ_CONFIG, 0, lambda ctx, inst: [nic.nicparams for nic in inst.nics]), |
Also available in: Unified diff