]
self.assertEqual(q.Query(_QueryData(data, mastername="node3")),
- [[(constants.QRFS_NORMAL, "node1")],
- [(constants.QRFS_NORMAL, "node2")],
- [(constants.QRFS_NORMAL, "node3")]])
+ [[(constants.RS_NORMAL, "node1")],
+ [(constants.RS_NORMAL, "node2")],
+ [(constants.RS_NORMAL, "node3")]])
self.assertEqual(q.OldStyleQuery(_QueryData(data, mastername="node3")),
[["node1"], ["node2"], ["node3"]])
self.assertEqual(q.RequestedData(), set([STATIC]))
self.assertEqual(len(q._fields), 2)
self.assertEqual(q.Query(_QueryData(data, mastername="node3")),
- [[(constants.QRFS_NORMAL, "node1"),
- (constants.QRFS_NORMAL, False)],
- [(constants.QRFS_NORMAL, "node2"),
- (constants.QRFS_NORMAL, False)],
- [(constants.QRFS_NORMAL, "node3"),
- (constants.QRFS_NORMAL, True)],
+ [[(constants.RS_NORMAL, "node1"),
+ (constants.RS_NORMAL, False)],
+ [(constants.RS_NORMAL, "node2"),
+ (constants.RS_NORMAL, False)],
+ [(constants.RS_NORMAL, "node3"),
+ (constants.RS_NORMAL, True)],
])
q = query.Query(fielddef, ["name", "master", "disk0.size"])
self.assertEqual(q.RequestedData(), set([STATIC, DISK]))
self.assertEqual(len(q._fields), 3)
self.assertEqual(q.Query(_QueryData(data, mastername="node2")),
- [[(constants.QRFS_NORMAL, "node1"),
- (constants.QRFS_NORMAL, False),
- (constants.QRFS_NORMAL, 0)],
- [(constants.QRFS_NORMAL, "node2"),
- (constants.QRFS_NORMAL, True),
- (constants.QRFS_NORMAL, 3)],
- [(constants.QRFS_NORMAL, "node3"),
- (constants.QRFS_NORMAL, False),
- (constants.QRFS_NORMAL, 5)],
+ [[(constants.RS_NORMAL, "node1"),
+ (constants.RS_NORMAL, False),
+ (constants.RS_NORMAL, 0)],
+ [(constants.RS_NORMAL, "node2"),
+ (constants.RS_NORMAL, True),
+ (constants.RS_NORMAL, 3)],
+ [(constants.RS_NORMAL, "node3"),
+ (constants.RS_NORMAL, False),
+ (constants.RS_NORMAL, 5)],
])
# With unknown column
self.assertEqual(q.RequestedData(), set([DISK]))
self.assertEqual(len(q._fields), 4)
self.assertEqual(q.Query(_QueryData(data, mastername="node2")),
- [[(constants.QRFS_NORMAL, 2),
- (constants.QRFS_NORMAL, 1),
- (constants.QRFS_UNKNOWN, None),
- (constants.QRFS_NORMAL, 0)],
- [(constants.QRFS_UNAVAIL, None),
- (constants.QRFS_NORMAL, 4),
- (constants.QRFS_UNKNOWN, None),
- (constants.QRFS_NORMAL, 3)],
- [(constants.QRFS_NORMAL, 7),
- (constants.QRFS_NORMAL, 6),
- (constants.QRFS_UNKNOWN, None),
- (constants.QRFS_NORMAL, 5)],
+ [[(constants.RS_NORMAL, 2),
+ (constants.RS_NORMAL, 1),
+ (constants.RS_UNKNOWN, None),
+ (constants.RS_NORMAL, 0)],
+ [(constants.RS_UNAVAIL, None),
+ (constants.RS_NORMAL, 4),
+ (constants.RS_UNKNOWN, None),
+ (constants.RS_NORMAL, 3)],
+ [(constants.RS_NORMAL, 7),
+ (constants.RS_NORMAL, 6),
+ (constants.RS_UNKNOWN, None),
+ (constants.RS_NORMAL, 5)],
])
self.assertRaises(errors.OpPrereqError, q.OldStyleQuery,
_QueryData(data, mastername="node2"))
self.assert_(compat.all(len(row) == len(selected)
for row in q.Query(_QueryData(range(1, 10)))))
self.assertEqual(q.Query(_QueryData(range(1, 10))),
- [[(constants.QRFS_UNKNOWN, None)] * len(selected)
+ [[(constants.RS_UNKNOWN, None)] * len(selected)
for i in range(1, 10)])
self.assertEqual([fdef.ToDict() for fdef in q.GetFields()],
[{ "name": name, "title": name,
q = query.Query(fielddef, ["name", "other0", "nodata", "unavail", "unk"])
self.assertEqual(len(q._fields), 5)
self.assertEqual(q.Query(_QueryData(range(1, 10))),
- [[(constants.QRFS_NORMAL, "name%s" % i),
- (constants.QRFS_NORMAL, 1234),
- (constants.QRFS_NODATA, None),
- (constants.QRFS_UNAVAIL, None),
- (constants.QRFS_UNKNOWN, None)]
+ [[(constants.RS_NORMAL, "name%s" % i),
+ (constants.RS_NORMAL, 1234),
+ (constants.RS_NODATA, None),
+ (constants.RS_UNAVAIL, None),
+ (constants.RS_UNKNOWN, None)]
for i in range(1, 10)])
def testAliases(self):
q = self._Create(["name", "drained"])
self.assertEqual(q.RequestedData(), set([query.NQ_CONFIG]))
self.assertEqual(q.Query(nqd),
- [[(constants.QRFS_NORMAL, "node1"),
- (constants.QRFS_NORMAL, False)],
- [(constants.QRFS_NORMAL, "node2"),
- (constants.QRFS_NORMAL, True)],
- [(constants.QRFS_NORMAL, "node3"),
- (constants.QRFS_NORMAL, False)],
+ [[(constants.RS_NORMAL, "node1"),
+ (constants.RS_NORMAL, False)],
+ [(constants.RS_NORMAL, "node2"),
+ (constants.RS_NORMAL, True)],
+ [(constants.RS_NORMAL, "node3"),
+ (constants.RS_NORMAL, False)],
])
self.assertEqual(q.OldStyleQuery(nqd),
[["node1", False],
result = q.Query(nqd)
self.assert_(compat.all(len(row) == len(selected) for row in result))
self.assertEqual([row[field_index["name"]] for row in result],
- [(constants.QRFS_NORMAL, name) for name in node_names])
+ [(constants.RS_NORMAL, name) for name in node_names])
node_to_row = dict((row[field_index["name"]][1], idx)
for idx, row in enumerate(result))
self.assert_(master_row[field_index["master"]])
self.assert_(master_row[field_index["role"]], "M")
self.assertEqual(master_row[field_index["group"]],
- (constants.QRFS_NORMAL, "ng1"))
+ (constants.RS_NORMAL, "ng1"))
self.assertEqual(master_row[field_index["group.uuid"]],
- (constants.QRFS_NORMAL, ng_uuid))
+ (constants.RS_NORMAL, ng_uuid))
self.assertEqual(master_row[field_index["ctime"]],
- (constants.QRFS_UNAVAIL, None))
+ (constants.RS_UNAVAIL, None))
self.assertEqual(master_row[field_index["mtime"]],
- (constants.QRFS_UNAVAIL, None))
+ (constants.RS_UNAVAIL, None))
self.assert_(row[field_index["pip"]] == node.primary_ip and
row[field_index["sip"]] == node.secondary_ip and
(node.name == master_name or
(row[field_index["group"]] == "<unknown>" and
row[field_index["group.uuid"]] is None and
- row[field_index["ctime"]] == (constants.QRFS_NORMAL,
+ row[field_index["ctime"]] == (constants.RS_NORMAL,
node.ctime) and
- row[field_index["mtime"]] == (constants.QRFS_NORMAL,
+ row[field_index["mtime"]] == (constants.RS_NORMAL,
node.mtime)))
for row, node in zip(result, nodes))
for (field, value) in fake_live_data.items():
self.assertEqual(live_data_row[field_index[field]],
- (constants.QRFS_NORMAL, value))
+ (constants.RS_NORMAL, value))
self.assertEqual(master_row[field_index["pinst_cnt"]],
- (constants.QRFS_NORMAL, 2))
+ (constants.RS_NORMAL, 2))
self.assertEqual(live_data_row[field_index["sinst_cnt"]],
- (constants.QRFS_NORMAL, 3))
+ (constants.RS_NORMAL, 3))
self.assertEqual(master_row[field_index["pinst_list"]],
- (constants.QRFS_NORMAL,
+ (constants.RS_NORMAL,
list(node_to_primary[master_name])))
self.assertEqual(live_data_row[field_index["sinst_list"]],
- (constants.QRFS_NORMAL,
+ (constants.RS_NORMAL,
list(node_to_secondary[live_data_name])))
def testGetLiveNodeField(self):
nics=[objects.NIC(ip="192.0.2.99", nicparams={})]),
]
- iqd = query.InstanceQueryData(instances, cluster, None, [], [], {})
+ iqd = query.InstanceQueryData(instances, cluster, None, [], [], {},
+ set(), {})
self.assertEqual(q.Query(iqd),
- [[(constants.QRFS_NORMAL, "inst1"),
- (constants.QRFS_NORMAL, 128),
- (constants.QRFS_UNAVAIL, None),
+ [[(constants.RS_NORMAL, "inst1"),
+ (constants.RS_NORMAL, 128),
+ (constants.RS_UNAVAIL, None),
],
- [(constants.QRFS_NORMAL, "inst2"),
- (constants.QRFS_NORMAL, 512),
- (constants.QRFS_UNAVAIL, None),
+ [(constants.RS_NORMAL, "inst2"),
+ (constants.RS_NORMAL, 512),
+ (constants.RS_UNAVAIL, None),
],
- [(constants.QRFS_NORMAL, "inst3"),
- (constants.QRFS_NORMAL, 128),
- (constants.QRFS_NORMAL, "192.0.2.99"),
+ [(constants.RS_NORMAL, "inst3"),
+ (constants.RS_NORMAL, 128),
+ (constants.RS_NORMAL, "192.0.2.99"),
]])
self.assertEqual(q.OldStyleQuery(iqd),
[["inst1", 128, None],
q = self._Create(selected)
self.assertEqual(q.RequestedData(),
- set([query.IQ_CONFIG, query.IQ_LIVE, query.IQ_DISKUSAGE]))
+ set([query.IQ_CONFIG, query.IQ_LIVE, query.IQ_DISKUSAGE,
+ query.IQ_CONSOLE]))
cluster = objects.Cluster(cluster_name="testcluster",
hvparams=constants.HVC_DEFAULTS,
assert not utils.FindDuplicates(inst.name for inst in instances)
+ instbyname = dict((inst.name, inst) for inst in instances)
+
disk_usage = dict((inst.name,
cmdlib._ComputeDiskSize(inst.disk_template,
[{"size": disk.size}
"memory": 768,
},
}
+ wrongnode_inst = set("inst2")
+
+ consinfo = dict((inst.name, None) for inst in instances)
+ consinfo["inst7"] = \
+ objects.InstanceConsole(instance="inst7", kind=constants.CONS_SSH,
+ host=instbyname["inst7"].primary_node,
+ user=constants.GANETI_RUNAS,
+ command=["hostname"]).ToDict()
iqd = query.InstanceQueryData(instances, cluster, disk_usage,
- offline_nodes, bad_nodes, live_data)
+ offline_nodes, bad_nodes, live_data,
+ wrongnode_inst, consinfo)
result = q.Query(iqd)
self.assertEqual(len(result), len(instances))
self.assert_(compat.all(len(row) == len(selected)
assert inst.primary_node in nodes
self.assertEqual(row[fieldidx["name"]],
- (constants.QRFS_NORMAL, inst.name))
+ (constants.RS_NORMAL, inst.name))
if inst.primary_node in offline_nodes:
exp_status = "ERROR_nodeoffline"
elif inst.primary_node in bad_nodes:
exp_status = "ERROR_nodedown"
elif inst.name in live_data:
- if inst.admin_up:
+ if inst.name in wrongnode_inst:
+ exp_status = "ERROR_wrongnode"
+ elif inst.admin_up:
exp_status = "running"
else:
exp_status = "ERROR_up"
exp_status = "ADMIN_down"
self.assertEqual(row[fieldidx["status"]],
- (constants.QRFS_NORMAL, exp_status))
+ (constants.RS_NORMAL, exp_status))
(_, status) = row[fieldidx["status"]]
tested_status.add(status)
for (field, livefield) in [("oper_ram", "memory"),
("oper_vcpus", "vcpus")]:
if inst.primary_node in bad_nodes:
- exp = (constants.QRFS_NODATA, None)
+ exp = (constants.RS_NODATA, None)
elif inst.name in live_data:
value = live_data[inst.name].get(livefield, None)
if value is None:
- exp = (constants.QRFS_UNAVAIL, None)
+ exp = (constants.RS_UNAVAIL, None)
else:
- exp = (constants.QRFS_NORMAL, value)
+ exp = (constants.RS_NORMAL, value)
else:
- exp = (constants.QRFS_UNAVAIL, None)
+ exp = (constants.RS_UNAVAIL, None)
self.assertEqual(row[fieldidx[field]], exp)
bridges = inst_bridges.get(inst.name, [])
self.assertEqual(row[fieldidx["nic.bridges"]],
- (constants.QRFS_NORMAL, bridges))
+ (constants.RS_NORMAL, bridges))
if bridges:
self.assertEqual(row[fieldidx["bridge"]],
- (constants.QRFS_NORMAL, bridges[0]))
+ (constants.RS_NORMAL, bridges[0]))
else:
self.assertEqual(row[fieldidx["bridge"]],
- (constants.QRFS_UNAVAIL, None))
+ (constants.RS_UNAVAIL, None))
for i in range(constants.MAX_NICS):
if i < len(bridges) and bridges[i] is not None:
- exp = (constants.QRFS_NORMAL, bridges[i])
+ exp = (constants.RS_NORMAL, bridges[i])
else:
- exp = (constants.QRFS_UNAVAIL, None)
+ exp = (constants.RS_UNAVAIL, None)
self.assertEqual(row[fieldidx["nic.bridge/%s" % i]], exp)
if inst.primary_node in bad_nodes:
- exp = (constants.QRFS_NODATA, None)
+ exp = (constants.RS_NODATA, None)
else:
- exp = (constants.QRFS_NORMAL, inst.name in live_data)
+ exp = (constants.RS_NORMAL, inst.name in live_data)
self.assertEqual(row[fieldidx["oper_state"]], exp)
usage = disk_usage[inst.name]
if usage is None:
usage = 0
self.assertEqual(row[fieldidx["disk_usage"]],
- (constants.QRFS_NORMAL, usage))
+ (constants.RS_NORMAL, usage))
self.assertEqual(row[fieldidx["sda_size"]], row[fieldidx["disk.size/0"]])
self.assertEqual(row[fieldidx["sdb_size"]], row[fieldidx["disk.size/1"]])
for field in ["ctime", "mtime"]:
if getattr(inst, field) is None:
# No ctime/mtime
- exp = (constants.QRFS_UNAVAIL, None)
+ exp = (constants.RS_UNAVAIL, None)
else:
- exp = (constants.QRFS_NORMAL, getattr(inst, field))
+ exp = (constants.RS_NORMAL, getattr(inst, field))
self.assertEqual(row[fieldidx[field]], exp)
+ self._CheckInstanceConsole(inst, row[fieldidx["console"]])
+
# Ensure all possible status' have been tested
self.assertEqual(tested_status,
set(["ERROR_nodeoffline", "ERROR_nodedown",
"running", "ERROR_up", "ERROR_down",
"ADMIN_down"]))
+ def _CheckInstanceConsole(self, instance, (status, consdata)):
+ if instance.name == "inst7":
+ self.assertEqual(status, constants.RS_NORMAL)
+ console = objects.InstanceConsole.FromDict(consdata)
+ self.assertTrue(console.Validate())
+ self.assertEqual(console.host, instance.primary_node)
+ else:
+ self.assertEqual(status, constants.RS_UNAVAIL)
+
class TestGroupQuery(unittest.TestCase):
self.assertEqual(q.RequestedData(), set([query.GQ_CONFIG]))
self.assertEqual(q.Query(gqd),
- [[(constants.QRFS_NORMAL, "default"),
- (constants.QRFS_NORMAL, "c0e89160-18e7-11e0-a46e-001d0904baeb"),
- (constants.QRFS_NORMAL, constants.ALLOC_POLICY_PREFERRED)
+ [[(constants.RS_NORMAL, "default"),
+ (constants.RS_NORMAL, "c0e89160-18e7-11e0-a46e-001d0904baeb"),
+ (constants.RS_NORMAL, constants.ALLOC_POLICY_PREFERRED)
],
- [(constants.QRFS_NORMAL, "restricted"),
- (constants.QRFS_NORMAL, "d2a40a74-18e7-11e0-9143-001d0904baeb"),
- (constants.QRFS_NORMAL, constants.ALLOC_POLICY_LAST_RESORT)
+ [(constants.RS_NORMAL, "restricted"),
+ (constants.RS_NORMAL, "d2a40a74-18e7-11e0-9143-001d0904baeb"),
+ (constants.RS_NORMAL, constants.ALLOC_POLICY_LAST_RESORT)
],
])
self.assertEqual(q.RequestedData(), set([query.GQ_CONFIG, query.GQ_NODE]))
self.assertEqual(q.Query(gqd),
- [[(constants.QRFS_NORMAL, "default"),
- (constants.QRFS_NORMAL, 2),
- (constants.QRFS_NORMAL, ["node1", "node2"]),
+ [[(constants.RS_NORMAL, "default"),
+ (constants.RS_NORMAL, 2),
+ (constants.RS_NORMAL, ["node1", "node2"]),
],
- [(constants.QRFS_NORMAL, "restricted"),
- (constants.QRFS_NORMAL, 3),
- (constants.QRFS_NORMAL, ["node1", "node9", "node10"]),
+ [(constants.RS_NORMAL, "restricted"),
+ (constants.RS_NORMAL, 3),
+ (constants.RS_NORMAL, ["node1", "node9", "node10"]),
],
])
self.assertEqual(q.RequestedData(), set([query.GQ_INST]))
self.assertEqual(q.Query(gqd),
- [[(constants.QRFS_NORMAL, 2),
- (constants.QRFS_NORMAL, ["inst1", "inst2"]),
+ [[(constants.RS_NORMAL, 2),
+ (constants.RS_NORMAL, ["inst1", "inst2"]),
],
- [(constants.QRFS_NORMAL, 3),
- (constants.QRFS_NORMAL, ["inst1", "inst9", "inst10"]),
+ [(constants.RS_NORMAL, 3),
+ (constants.RS_NORMAL, ["inst1", "inst9", "inst10"]),
],
])
projects / ganeti-local / blobdiff