Revision bfc30ec0 lib/hypervisor/hv_fake.py

b/lib/hypervisor/hv_fake.py
65 65 
    if not os.path.exists(file_name):
66 66 
      return None
67 67 
    try:
68 
      fh = file(file_name, "r")
68 
      fh = open(file_name, "r")
69 69 
      try:
70 70 
        inst_id = fh.readline().strip()
71 
        memory = fh.readline().strip()
72 
        vcpus = fh.readline().strip()
71 
        memory = utils.TryConvert(int, fh.readline().strip())
72 
        vcpus = utils.TryConvert(fh.readline().strip())
73 73 
        stat = "---b-"
74 74 
        times = "0"
75 75 
        return (instance_name, inst_id, memory, vcpus, stat, times)
......
88 88 
    data = []
89 89 
    for file_name in os.listdir(self._ROOT_DIR):
90 90 
      try:
91 
        fh = file(self._ROOT_DIR+"/"+file_name, "r")
91 
        fh = open(self._ROOT_DIR+"/"+file_name, "r")
92 92 
        inst_id = "-1"
93 
        memory = "0"
93 
        memory = 0
94 
        vcpus = 1
94 95 
        stat = "-----"
95 96 
        times = "-1"
96 97 
        try:
97 98 
          inst_id = fh.readline().strip()
98 
          memory = fh.readline().strip()
99 
          vcpus = fh.readline().strip()
99 
          memory = utils.TryConvert(int, fh.readline().strip())
100 
          vcpus = utils.TryConvert(int, fh.readline().strip())
100 101 
          stat = "---b-"
101 102 
          times = "0"
102 103 
        finally:
......
189 190 
          result['memory_dom0'] = int(val.split()[0])/1024
190 191 
    result['memory_free'] = sum_free
191 192 

  		





  
  193
  
    
    # substract running instances


  		





  
  194
  
    
    all_instances = self.GetAllInstancesInfo()


  		





  
  195
  
    
    result['memory_free'] -= min(result['memory_free'],


  		





  
  196
  
    
                                 sum([row[2] for row in all_instances]))


  		





  
  197
  
    

  		





  192
  198
  
    
    cpu_total = 0


  		





  193
  199
  
    
    try:


  		





  194
  200
  
    
      fh = open("/proc/cpuinfo")


  		












Also available in:
  Unified diff