})
+def _ConvertUsbDevices(data):
+ """Convert in place the usb_devices string to the proper format.
+
+ In Ganeti 2.8.4 the separator for the usb_devices hvparam was changed from
+ comma to space because commas cannot be accepted on the command line
+ (they already act as the separator between different hvparams). RAPI
+ should be able to accept commas for backwards compatibility, but we want
+ it to also accept the new space separator. Therefore, we convert
+ spaces into commas here and keep the old parsing logic elsewhere.
+
+ """
+ try:
+ hvparams = data["hvparams"]
+ usb_devices = hvparams[constants.HV_USB_DEVICES]
+ hvparams[constants.HV_USB_DEVICES] = usb_devices.replace(" ", ",")
+ data["hvparams"] = hvparams
+ except KeyError:
+ #No usb_devices, no modification required
+ pass
+
+
class R_2_instances(baserlib.OpcodeResource):
"""/2/instances resource.
# Remove "__version__"
data.pop(_REQ_DATA_VERSION, None)
+ _ConvertUsbDevices(data)
+
return (data, {
"dry_run": self.dryRun(),
})
raise http.HttpBadRequest("Request is missing required 'instances' field"
" in body")
- op_id = {
- "OP_ID": self.POST_OPCODE.OP_ID, # pylint: disable=E1101
- }
+ # Unlike most other RAPI calls, this one is composed of individual opcodes,
+ # and we have to do the filling ourselves
+ OPCODE_RENAME = {
+ "os": "os_type",
+ "name": "instance_name",
+ }
+
body = objects.FillDict(self.request_body, {
- "instances": [objects.FillDict(inst, op_id)
- for inst in self.request_body["instances"]],
+ "instances": [
+ baserlib.FillOpcode(opcodes.OpInstanceCreate, inst, {},
+ rename=OPCODE_RENAME)
+ for inst in self.request_body["instances"]
+ ],
})
return (body, {
"""Changes parameters of an instance.
"""
- return (self.request_body, {
+ data = self.request_body.copy()
+ _ConvertUsbDevices(data)
+
+ return (data, {
"instance_name": self.items[0],
})
if kind in (constants.TAG_INSTANCE,
constants.TAG_NODEGROUP,
- constants.TAG_NODE):
+ constants.TAG_NODE,
+ constants.TAG_NETWORK):
if not self.name:
raise http.HttpBadRequest("Missing name on tag request")
ssc = ssconf.SimpleStore()
tags = ssc.GetClusterTags()
+ else:
+ raise http.HttpBadRequest("Unhandled tag type!")
+
return list(tags)
def GetPutOpInput(self):