Revision a0dcf7c2 lib/rapi/rlib2.py

b/lib/rapi/rlib2.py
128 128
    ]
129 129

  
130 130
    """
131
    op = ganeti.opcodes.OpQueryNodes(output_fields=["name"], names=[])
132
    nodeslist = baserlib.ExtractField(ganeti.cli.SubmitOpCode(op), 0)
131
    client = luxi.Client()
132
    nodesdata = client.QueryNodes([], ["name"])
133
    nodeslist = [row[0] for row in nodesdata]
133 134

  
134 135
    if 'bulk' in self.queryargs:
135
      op = ganeti.opcodes.OpQueryNodes(output_fields=N_FIELDS,
136
                                       names=nodeslist)
137
      result = ganeti.cli.SubmitOpCode(op)
138
      return baserlib.MapBulkFields(result, N_FIELDS)
136
      bulkdata = client.QueryNodes(nodeslist, N_FIELDS)
137
      return baserlib.MapBulkFields(bulkdata, N_FIELDS)
139 138

  
140 139
    return baserlib.BuildUriList(nodeslist, "/2/nodes/%s",
141 140
                                 uri_fields=("id", "uri"))
......
190 189
    ]
191 190

  
192 191
    """
193
    op = ganeti.opcodes.OpQueryInstances(output_fields=["name"], names=[])
194
    instanceslist = baserlib.ExtractField(ganeti.cli.SubmitOpCode(op), 0)
192
    client = luxi.Client()
193
    instancesdata = client.QueryInstances([], ["name"])
194
    instanceslist = [row[0] for row in instancesdata]
195 195

  
196
    if 'bulk' in self.queryargs:
197
      op = ganeti.opcodes.OpQueryInstances(output_fields=I_FIELDS,
198
                                           names=instanceslist)
199
      result = ganeti.cli.SubmitOpCode(op)
200
      return baserlib.MapBulkFields(result, I_FIELDS)
201 196

  
197
    if 'bulk' in self.queryargs:
198
      bulkdata = client.QueryInstances(instanceslist, I_FIELDS)
199
      return baserlib.MapBulkFields(bulkdata, I_FIELDS)
202 200

  
203 201
    else:
204 202
      return baserlib.BuildUriList(instanceslist, "/2/instances/%s",

Also available in: Unified diff