Skip to content

CA-399187: Allow gencert to be called without groupid #5987

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 2 commits into from
Sep 16, 2024
Merged

CA-399187: Allow gencert to be called without groupid #5987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11c222d
datamodel_lifecycle: bump to latest version
psafont Sep 12, 2024
8c30988
CA-399187: Allow gencert to be called without groupid
psafont Sep 12, 2024
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
33 changes: 24 additions & 9 deletions ocaml/gencert/gencert.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,19 +76,34 @@ let () =
let program_name = Sys.argv.(0) in
let dbg = Printf.sprintf "%s - %f" program_name (Unix.gettimeofday ()) in
(* if necessary use Unix.localtime to debug *)
D.debug "%s" dbg ;
match Sys.argv with
| [|_; path; _; _|] when Sys.file_exists path ->
D.info "file already exists at path (%s) - doing nothing" path ;
exit 0
| [|_; path; cert_gid; sni|] -> (
let sni_or_exit sni =
match SNI.of_string sni with
| Some sni ->
main ~dbg ~path ~cert_gid:(int_of_string cert_gid) ~sni ()
sni
| None ->
D.error "SNI must be default or xapi:pool, but got '%s'" sni ;
exit 1
)
in
let gid_or_exit gid =
match int_of_string_opt gid with
| Some gid ->
gid
| None ->
D.error "GROUPID must be an integer, but got '%s'" gid ;
exit 1
in
D.debug "%s" dbg ;
match Sys.argv with
| ([|_; path; _|] | [|_; path; _; _|]) when Sys.file_exists path ->
D.info "file already exists at path (%s) - doing nothing" path ;
exit 0
| [|_; path; sni|] ->
let sni = sni_or_exit sni in
main ~dbg ~path ~cert_gid:(-1) ~sni ()
| [|_; path; cert_gid; sni|] ->
let sni = sni_or_exit sni in
let cert_gid = gid_or_exit cert_gid in
main ~dbg ~path ~cert_gid ~sni ()
| _ ->
D.error "Usage: %s PATH (default|xapi:pool)" program_name ;
D.error "Usage: %s PATH [GROUPID] (default|xapi:pool)" program_name ;
exit 1
2 changes: 1 addition & 1 deletion ocaml/idl/datamodel_lifecycle.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ let prototyped_of_field = function
| "host", "last_software_update" ->
Some "22.20.0"
| "VM_guest_metrics", "netbios_name" ->
Some "24.27.0-next"
Some "24.28.0"
| "VM", "groups" ->
Some "24.19.1"
| "VM", "pending_guidances_full" ->
Expand Down
Loading