Commit bfc30ec0 authored by Iustin Pop's avatar Iustin Pop
Browse files

Some small improvements to the fake hypervisor

This patch modifies the fake hypervisor to substract the memory “used”
by “running” instances from the free memory, so the actual node
information changes based on the running instances.

Also some style changes and fixes are added.

Reviewed-by: ultrotter
parent c0e4a2c3
...@@ -65,11 +65,11 @@ class FakeHypervisor(hv_base.BaseHypervisor): ...@@ -65,11 +65,11 @@ class FakeHypervisor(hv_base.BaseHypervisor):
if not os.path.exists(file_name): if not os.path.exists(file_name):
return None return None
try: try:
fh = file(file_name, "r") fh = open(file_name, "r")
try: try:
inst_id = fh.readline().strip() inst_id = fh.readline().strip()
memory = fh.readline().strip() memory = utils.TryConvert(int, fh.readline().strip())
vcpus = fh.readline().strip() vcpus = utils.TryConvert(fh.readline().strip())
stat = "---b-" stat = "---b-"
times = "0" times = "0"
return (instance_name, inst_id, memory, vcpus, stat, times) return (instance_name, inst_id, memory, vcpus, stat, times)
...@@ -88,15 +88,16 @@ class FakeHypervisor(hv_base.BaseHypervisor): ...@@ -88,15 +88,16 @@ class FakeHypervisor(hv_base.BaseHypervisor):
data = [] data = []
for file_name in os.listdir(self._ROOT_DIR): for file_name in os.listdir(self._ROOT_DIR):
try: try:
fh = file(self._ROOT_DIR+"/"+file_name, "r") fh = open(self._ROOT_DIR+"/"+file_name, "r")
inst_id = "-1" inst_id = "-1"
memory = "0" memory = 0
vcpus = 1
stat = "-----" stat = "-----"
times = "-1" times = "-1"
try: try:
inst_id = fh.readline().strip() inst_id = fh.readline().strip()
memory = fh.readline().strip() memory = utils.TryConvert(int, fh.readline().strip())
vcpus = fh.readline().strip() vcpus = utils.TryConvert(int, fh.readline().strip())
stat = "---b-" stat = "---b-"
times = "0" times = "0"
finally: finally:
...@@ -189,6 +190,11 @@ class FakeHypervisor(hv_base.BaseHypervisor): ...@@ -189,6 +190,11 @@ class FakeHypervisor(hv_base.BaseHypervisor):
result['memory_dom0'] = int(val.split()[0])/1024 result['memory_dom0'] = int(val.split()[0])/1024
result['memory_free'] = sum_free result['memory_free'] = sum_free
# substract running instances
all_instances = self.GetAllInstancesInfo()
result['memory_free'] -= min(result['memory_free'],
sum([row[2] for row in all_instances]))
cpu_total = 0 cpu_total = 0
try: try:
fh = open("/proc/cpuinfo") fh = open("/proc/cpuinfo")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment