Skip to content

Hyphenate xe clustering params instead of using underscores #3551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 10, 2018
Merged

Hyphenate xe clustering params instead of using underscores #3551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ocaml/xapi/cli_operations.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,8 +801,8 @@ let gen_cmds rpc session_id =
; Client.USB_group.(mk get_all get_all_records_where get_by_uuid usb_group_record "usb-group" [] ["uuid";"name-label";"name-description"] rpc session_id)
; Client.VUSB.(mk get_all get_all_records_where get_by_uuid vusb_record "vusb" [] ["uuid";"vm-uuid"; "usb-group-uuid"] rpc session_id)
; Client.Network_sriov.(mk get_all get_all_records_where get_by_uuid network_sriov_record "network-sriov" [] ["uuid"; "physical-pif"; "logical-pif"; "requires-reboot"; "configuration-mode"] rpc session_id)
; Client.Cluster.(mk get_all get_all_records_where get_by_uuid cluster_record "cluster" [] ["uuid";"cluster_hosts";"network";"cluster_token";"cluster_stack";"allowed_operations";"current_operations";"pool_auto_join";"cluster_config";"other_config"] rpc session_id)
; Client.Cluster_host.(mk get_all get_all_records_where get_by_uuid cluster_host_record "cluster-host" [] ["uuid";"cluster";"host";"enabled";"allowed_operations";"current_operations";"other_config"] rpc session_id)
; Client.Cluster.(mk get_all get_all_records_where get_by_uuid cluster_record "cluster" [] ["uuid";"cluster-hosts";"network";"cluster-token";"cluster-stack";"allowed-operations";"current-operations";"pool-auto-join";"cluster-config";"other-config"] rpc session_id)
; Client.Cluster_host.(mk get_all get_all_records_where get_by_uuid cluster_host_record "cluster-host" [] ["uuid";"cluster";"host";"enabled";"allowed-operations";"current-operations";"other-config"] rpc session_id)
]

(* NB, might want to put these back in at some point
Expand Down
26 changes: 13 additions & 13 deletions ocaml/xapi/records.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2076,41 +2076,41 @@ let cluster_record rpc session_id cluster =
[ make_field ~name:"uuid"
~get:(fun () -> (x ()).API.cluster_uuid)
()
; make_field ~name:"cluster_hosts"
; make_field ~name:"cluster-hosts"
~get:(fun () -> String.concat "; " (List.map (fun r -> get_uuid_from_ref r) (x ()).API.cluster_cluster_hosts))
~get_set:(fun () -> List.map get_uuid_from_ref (x ()).API.cluster_cluster_hosts)
()
; make_field ~name:"network"
~get:(fun () -> (x ()).API.cluster_network |> get_uuid_from_ref)
()
; make_field ~name:"cluster_token"
; make_field ~name:"cluster-token"
~get:(fun () -> (x ()).API.cluster_cluster_token)
()
; make_field ~name:"cluster_stack"
; make_field ~name:"cluster-stack"
~get:(fun () -> (x ()).API.cluster_cluster_stack)
()
; make_field ~name:"token_timeout"
; make_field ~name:"token-timeout"
~get:(fun () -> Int64.to_string((x ()).API.cluster_token_timeout))
()
; make_field ~name:"token_timeout_coefficient"
; make_field ~name:"token-timeout-coefficient"
~get:(fun () -> Int64.to_string((x ()).API.cluster_token_timeout_coefficient))
()
; make_field ~name:"allowed_operations"
; make_field ~name:"allowed-operations"
~get:(fun () -> String.concat "; " (List.map Record_util.cluster_operation_to_string (x ()).API.cluster_allowed_operations))
~get_set:(fun () -> List.map Record_util.cluster_operation_to_string (x ()).API.cluster_allowed_operations)
()
; make_field ~name:"current_operations"
; make_field ~name:"current-operations"
~get:(fun () -> String.concat "; " (List.map (fun (task,op) -> Record_util.cluster_operation_to_string op) (x ()).API.cluster_current_operations))
~get_set:(fun () -> List.map (fun (task,op) -> Record_util.cluster_operation_to_string op) (x ()).API.cluster_current_operations)
()
; make_field ~name:"pool_auto_join"
; make_field ~name:"pool-auto-join"
~get:(fun () -> (x ()).API.cluster_pool_auto_join |> string_of_bool)
()
; make_field ~name:"cluster_config"
; make_field ~name:"cluster-config"
~get:(fun () -> Record_util.s2sm_to_string "; " (x ()).API.cluster_cluster_config)
~get_map:(fun () -> (x ()).API.cluster_cluster_config)
()
; make_field ~name:"other_config"
; make_field ~name:"other-config"
~get:(fun () -> Record_util.s2sm_to_string "; " (x ()).API.cluster_other_config)
~get_map:(fun () -> (x ()).API.cluster_other_config)
~add_to_map:(fun k v -> Client.Cluster.add_to_other_config rpc session_id cluster k v)
Expand Down Expand Up @@ -2140,15 +2140,15 @@ let cluster_host_record rpc session_id cluster_host =
; make_field ~name:"enabled"
~get:(fun () -> (x ()).API.cluster_host_enabled |> string_of_bool)
()
; make_field ~name:"allowed_operations"
; make_field ~name:"allowed-operations"
~get:(fun () -> String.concat "; " (List.map Record_util.cluster_host_operation_to_string (x ()).API.cluster_host_allowed_operations))
~get_set:(fun () -> List.map Record_util.cluster_host_operation_to_string (x ()).API.cluster_host_allowed_operations)
()
; make_field ~name:"current_operations"
; make_field ~name:"current-operations"
~get:(fun () -> String.concat "; " (List.map (fun (task,op) -> Record_util.cluster_host_operation_to_string op) (x ()).API.cluster_host_current_operations))
~get_set:(fun () -> List.map (fun (task,op) -> Record_util.cluster_host_operation_to_string op) (x ()).API.cluster_host_current_operations)
()
; make_field ~name:"other_config"
; make_field ~name:"other-config"
~get:(fun () -> Record_util.s2sm_to_string "; " (x ()).API.cluster_host_other_config)
~get_map:(fun () -> (x ()).API.cluster_host_other_config)
()
Expand Down