Skip to content

CP-13874: plumb through SR name_label and name_description #41

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
Aug 24, 2015
Merged

CP-13874: plumb through SR name_label and name_description #41

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
6 changes: 5 additions & 1 deletion main.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,9 @@ let process root_dir name x =
fork_exec_rpc root_dir (script root_dir name `Volume "SR.probe") args Storage.Volume.Types.SR.Probe.Out.t_of_rpc
>>= fun response ->
let srs = List.map ~f:(fun sr_stat -> sr_stat.Storage.Volume.Types.sr, {
Storage_interface.total_space = sr_stat.Storage.Volume.Types.total_space;
Storage_interface.name_label = sr_stat.Storage.Volume.Types.name;
name_description = sr_stat.Storage.Volume.Types.description;
total_space = sr_stat.Storage.Volume.Types.total_space;
free_space = sr_stat.Storage.Volume.Types.free_space;
clustered = sr_stat.Storage.Volume.Types.clustered;
health = match sr_stat.Storage.Volume.Types.health with
Expand Down Expand Up @@ -788,6 +790,8 @@ let process root_dir name x =
fork_exec_rpc root_dir (script root_dir name `Volume "SR.stat") args Storage.Volume.Types.SR.Stat.Out.t_of_rpc
>>= fun response ->
let response = {
name_label = response.Storage.Volume.Types.name;
name_description = response.Storage.Volume.Types.description;
total_space = response.Storage.Volume.Types.total_space;
free_space = response.Storage.Volume.Types.free_space;
clustered = response.Storage.Volume.Types.clustered;
Expand Down