CP-311541: Expose the PS cmdlets so that they can be called without importing the module.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>

Author: kc284

ocaml/sdk-gen/powershell/gen_powershell_binding.ml

@@ -17,11 +17,15 @@ module TypeSet = Set.Make (struct
   let compare = compare
 end)
 
-let destdir = "autogen-out/src"
+let destdir = "autogen-out"
+
+let srcdir = "autogen-out/src"
 
 let templdir = "templates"
 
-type cmdlet = {filename: string; content: string}
+type cmdlet = {cmdletname: string; content: string}
+
+let cmdlets_to_export = ref []
 
 let api =
   Datamodel_utils.named_self := true ;
@@ -68,6 +72,21 @@ let maps = ref TypeSet.empty
 let generated x =
   not (List.mem x.name ["blob"; "session"; "debug"; "event"; "vtpm"])
 
+let rec is_last x list =
+  match list with
+  | [] ->
+      false
+  | hd :: [] ->
+      if hd = x then
+        true
+      else
+        false
+  | hd :: tl ->
+      if hd = x then
+        false
+      else
+        is_last x tl
+
 let rec main () =
   let json =
     `O
@@ -91,7 +110,7 @@ let rec main () =
   in
   render_file
     ("ConvertTo-XenRef.mustache", "ConvertTo-XenRef.cs")
-    json templdir destdir ;
+    json templdir srcdir ;
 
   http_actions
   |> List.filter (fun (_, (_, _, sdk, _, _, _)) -> sdk)
@@ -100,9 +119,45 @@ let rec main () =
   let filtered_classes = List.filter generated classes in
   let cmdlets = List.concat_map gen_cmdlets filtered_classes in
 
-  List.iter (fun x -> write_file x.filename x.content) cmdlets ;
+  List.iter (fun x -> write_file x.cmdletname x.content) cmdlets ;
 
-  filtered_classes |> List.iter gen_destructor
+  filtered_classes |> List.iter gen_destructor ;
+
+  cmdlets_to_export :=
+    [
+      "Connect-XenServer"
+    ; "Disconnect-XenServer"
+    ; "Get-XenSession"
+    ; "Receive-XenPoolPatch"
+    ; "Send-XenOemPatchStream"
+    ; "Wait-XenTask"
+    ; "ConvertTo-XenRef"
+    ]
+    @ !cmdlets_to_export ;
+
+  cmdlets_to_export := List.sort String.compare !cmdlets_to_export ;
+
+  let module_json =
+    `O
+      [
+        ( "cmdlets_to_export"
+        , `A
+            (List.map
+               (fun x ->
+                 `O
+                   [
+                     ("cmdlet_to_export", `String x)
+                   ; ("is_last", `Bool (is_last x !cmdlets_to_export))
+                   ]
+               )
+               !cmdlets_to_export
+            )
+        )
+      ]
+  in
+  render_file
+    ("XenServerPSModule.mustache", "XenServerPSModule.psd1")
+    module_json templdir destdir
 
 (****************)
 (* Http actions *)
@@ -161,9 +216,11 @@ and gen_http_action action =
         )
       ]
   in
+  let cmdlet_name = sprintf "%s-Xen%s" commonVerb stem in
   render_file
-    ("HttpAction.mustache", sprintf "%s-Xen%s.cs" commonVerb stem)
-    json templdir destdir
+    ("HttpAction.mustache", sprintf "%s.cs" cmdlet_name)
+    json templdir srcdir ;
+  cmdlets_to_export := cmdlet_name :: !cmdlets_to_export
 
 (*************************)
 (* Autogenerated cmdlets *)
@@ -174,39 +231,41 @@ and gen_cmdlets obj =
 
   let cmdlets =
     [
-      {filename= sprintf "Get-Xen%s.cs" stem; content= gen_class obj classname}
+      {cmdletname= sprintf "Get-Xen%s" stem; content= gen_class obj classname}
     ; {
-        filename= sprintf "New-Xen%s.cs" stem
+        cmdletname= sprintf "New-Xen%s" stem
       ; content=
           gen_constructor obj classname (List.filter is_constructor messages)
       }
     ; {
-        filename= sprintf "Remove-Xen%sProperty.cs" stem
+        cmdletname= sprintf "Remove-Xen%sProperty" stem
       ; content= gen_remover obj classname (List.filter is_remover messages)
       }
     ; {
-        filename= sprintf "Add-Xen%s.cs" stem
+        cmdletname= sprintf "Add-Xen%s" stem
       ; content= gen_adder obj classname (List.filter is_adder messages)
       }
     ; {
-        filename= sprintf "Set-Xen%s.cs" stem
+        cmdletname= sprintf "Set-Xen%s" stem
       ; content= gen_setter obj classname (List.filter is_setter messages)
       }
     ; {
-        filename= sprintf "Get-Xen%sProperty.cs" stem
+        cmdletname= sprintf "Get-Xen%sProperty" stem
       ; content= gen_getter obj classname (List.filter is_getter messages)
       }
     ; {
-        filename= sprintf "Invoke-Xen%s.cs" stem
+        cmdletname= sprintf "Invoke-Xen%s" stem
       ; content= gen_invoker obj classname (List.filter is_invoke messages)
       }
     ]
   in
 
   cmdlets |> List.filter (fun x -> x.content <> "")
 
-and write_file filename content =
-  let fn = Filename.concat destdir filename in
+and write_file cmdletname content =
+  let filename = sprintf "%s.cs" cmdletname in
+  let fn = Filename.concat srcdir filename in
+  cmdlets_to_export := cmdletname :: !cmdlets_to_export ;
   with_output fn (fun x -> output_string x content)
 
 (*********************************)
@@ -617,11 +676,13 @@ and gen_destructor obj =
           ; ("has_name", `Bool (has_name obj))
           ]
       in
+      let cmdlet_name =
+        sprintf "Remove-Xen%s" (ocaml_class_to_csharp_class classname)
+      in
       render_file
-        ( "Remove-XenObject.mustache"
-        , sprintf "Remove-Xen%s.cs" (ocaml_class_to_csharp_class classname)
-        )
-        json templdir destdir
+        ("Remove-XenObject.mustache", sprintf "%s.cs" cmdlet_name)
+        json templdir srcdir ;
+      cmdlets_to_export := cmdlet_name :: !cmdlets_to_export
   | _ ->
       assert false
 

…owershell/autogen/XenServerPSModule.psd1 …ell/templates/XenServerPSModule.mustacheocaml/sdk-gen/powershell/autogen/XenServerPSModule.psd1 renamed to ocaml/sdk-gen/powershell/templates/XenServerPSModule.mustache ocaml/sdk-gen/powershell/autogen/XenServerPSModule.psd1 renamed to ocaml/sdk-gen/powershell/templates/XenServerPSModule.mustache

@@ -67,7 +67,11 @@ FileList = @('about_XenServer.help.txt',
 
 #Public interface
 FunctionsToExport = ''
-CmdletsToExport = '*'
+CmdletsToExport = @(
+{{#cmdlets_to_export}}
+    '{{cmdlet_to_export}}'{{^is_last}},{{/is_last}}
+{{/cmdlets_to_export}}
+)
 VariablesToExport = @('Citrix.XenServer.Sessions','XenServer_Default_Session')
 AliasesToExport = '*'