# HG changeset patch # User Rok Strnisa # Date 1286976012 -3600 # Node ID 76fa16903bf4f441c54905c83d3cf8a580319a6e # Parent c48a4cdcfeb4f2f8a06bef8704d08c42ac0d2375 imported patch CA-41976-Field-type-error---create-template diff --git a/ocaml/idl/datamodel.ml b/ocaml/idl/datamodel.ml --- a/ocaml/idl/datamodel.ml +++ b/ocaml/idl/datamodel.ml @@ -5745,7 +5745,7 @@ let vm_power_state = let vm_operations = Enum ("vm_operations", List.map operation_enum - [ vm_snapshot; vm_clone; vm_copy; vm_revert; vm_checkpoint; vm_snapshot_with_quiesce; + [ vm_snapshot; vm_clone; vm_copy; vm_create_template; vm_revert; vm_checkpoint; vm_snapshot_with_quiesce; vm_provision; vm_start; vm_start_on; vm_pause; vm_unpause; vm_cleanShutdown; vm_cleanReboot; vm_hardShutdown; vm_stateReset; vm_hardReboot; vm_suspend; csvm; vm_resume; vm_resume_on; diff --git a/ocaml/xapi/xapi_vm_lifecycle.ml b/ocaml/xapi/xapi_vm_lifecycle.ml --- a/ocaml/xapi/xapi_vm_lifecycle.ml +++ b/ocaml/xapi/xapi_vm_lifecycle.ml @@ -65,6 +65,7 @@ let allowed_power_states ~(op:API.vm_ope -> [`Halted; `Running] | `clone | `copy + | `create_template (* Don't touch until XMLRPC unmarshal code is able to pre-blank fields on input. *) | `export -> [`Halted; `Suspended] | `hard_reboot