Revision 8a23d2d3 lib/cmdlib.py

b/lib/cmdlib.py
2138 2138 
        elif field == "pnode":
2139 2139 
          val = instance.primary_node
2140 2140 
        elif field == "snodes":
2141 
          val = ",".join(instance.secondary_nodes) or "-"
2141 
          val = list(instance.secondary_nodes)
2142 2142 
        elif field == "admin_state":
2143 
          if instance.status == "down":
2144 
            val = "no"
2145 
          else:
2146 
            val = "yes"
2143 
          val = (instance.status != "down")
2147 2144 
        elif field == "oper_state":
2148 2145 
          if instance.primary_node in bad_nodes:
2149 
            val = "(node down)"
2146 
            val = None
2150 2147 
          else:
2151 
            if live_data.get(instance.name):
2152 
              val = "running"
2153 
            else:
2154 
              val = "stopped"
2148 
            val = bool(live_data.get(instance.name))
2155 2149 
        elif field == "admin_ram":
2156 2150 
          val = instance.memory
2157 2151 
        elif field == "oper_ram":
2158 2152 
          if instance.primary_node in bad_nodes:
2159 
            val = "(node down)"
2153 
            val = None
2160 2154 
          elif instance.name in live_data:
2161 2155 
            val = live_data[instance.name].get("memory", "?")
2162 2156 
          else:
......
2172 2166 
        elif field == "sda_size" or field == "sdb_size":
2173 2167 
          disk = instance.FindDisk(field[:3])
2174 2168 
          if disk is None:
2175 
            val = "N/A"
2169 
            val = None
2176 2170 
          else:
2177 2171 
            val = disk.size
2178 2172 
        else:
2179 2173 
          raise errors.ParameterError(field)
2180 
        val = str(val)
2181 2174 
        iout.append(val)
2182 2175 
      output.append(iout)
2183 2176 

  		












Also available in:
  Unified diff