PR-1126: add support for secret.other_config

as requested by storage backend.

Signed-off-by: Marcus Granado <marcus.granado@eu.citrix.com>

diff --git a/ocaml/database/db_hiupgrade.ml b/ocaml/database/db_hiupgrade.ml
index 3a20b0866cd6ea1a5b61c9335ae1f130e084da5a..95e1ba654ac071eb796b1a3795479802b9d54e2b 100644 (file)
--- a/ocaml/database/db_hiupgrade.ml
+++ b/ocaml/database/db_hiupgrade.ml
@@ -39,7 +39,7 @@ let upgrade_wlb_configuration ~__context () =
                        then Ref.null
                        else if String.startswith "OpaqueRef:" old_wlb_pwd
                                then Db.Pool.get_wlb_password ~__context ~self:pool
-                               else Xapi_secret.create ~__context ~value:old_wlb_pwd
+                               else Xapi_secret.create ~__context ~value:old_wlb_pwd ~other_config:[]
        in
        Db.Pool.set_wlb_password ~__context ~self:pool ~value:wlb_passwd_ref
 

diff --git a/ocaml/idl/datamodel.ml b/ocaml/idl/datamodel.ml
index a1d2b504cbdfbfd640e200e61908c95971fcfd6b..401ad04e914ebb893b3d9f9ac50db2476b1f71ba 100644 (file)
--- a/ocaml/idl/datamodel.ml
+++ b/ocaml/idl/datamodel.ml
@@ -6515,7 +6515,7 @@ let secret =
        let introduce = call
                ~name:"introduce"
                ~in_product_since:rel_midnight_ride
-               ~params:[String, "uuid", ""; String, "value", ""]
+               ~params:[String, "uuid", ""; String, "value", ""; (Map (String,String)), "other_config", ""]
                ~flags:[`Session]
                ~result:(Ref _secret, "")
                ~secret:true
@@ -6540,6 +6540,7 @@ let secret =
                ~contents:
                        [ uid ~reader_roles:_R_POOL_OP _secret
                        ; field ~reader_roles:_R_POOL_OP ~qualifier:RW ~ty:String "value" "the secret"
+                        ; field ~qualifier:RW ~ty:(Map (String,String)) "other_config" "other_config" ~default_value:(Some (VMap []));
                        ]
                ()
 

diff --git a/ocaml/xapi/cli_operations.ml b/ocaml/xapi/cli_operations.ml
index 25c9ef87e022f59c634e072b2f8789a3febd643e..4acb7b28e8bc7329f4ea0f8639b958d0e7d137d1 100644 (file)
--- a/ocaml/xapi/cli_operations.ml
+++ b/ocaml/xapi/cli_operations.ml
@@ -3949,7 +3949,8 @@ let session_subject_identifier_logout_all printer rpc session_id params =
 
 let secret_create printer rpc session_id params =
        let value = List.assoc "value" params in
-       let ref = Client.Secret.create ~rpc ~session_id ~value in
+        let other_config = read_map_params "other-config" params in
+       let ref = Client.Secret.create ~rpc ~session_id ~value ~other_config in
        let uuid = Client.Secret.get_uuid ~rpc ~session_id ~self:ref in
        printer (Cli_printer.PList [uuid])
 

diff --git a/ocaml/xapi/workload_balancing.ml b/ocaml/xapi/workload_balancing.ml
index 9b2f3fed65dc04008cef5028d25a2265a7d7850e..2bd0fcbee9ac30789bd84e62f7aa490c3fb19a6f 100755 (executable)
--- a/ocaml/xapi/workload_balancing.ml
+++ b/ocaml/xapi/workload_balancing.ml
@@ -443,7 +443,7 @@ let init_wlb ~__context ~wlb_url ~wlb_username ~wlb_password ~xenserver_username
                match (data_from_leaf (descend_and_match["Id"] inner_xml)) with 
                | _ ->
                        let old_secret_ref = Db.Pool.get_wlb_password ~__context ~self:pool in
-                       let wlb_secret_ref = Xapi_secret.create ~__context ~value:wlb_password in
+                       let wlb_secret_ref = Xapi_secret.create ~__context ~value:wlb_password ~other_config:[] in
                        Db.Pool.set_wlb_username ~__context ~self:pool ~value:wlb_username;
                        Db.Pool.set_wlb_password ~__context ~self:pool ~value:wlb_secret_ref;
                        Db.Pool.set_wlb_url ~__context ~self:pool ~value:wlb_url;

diff --git a/ocaml/xapi/xapi_pool.ml b/ocaml/xapi/xapi_pool.ml
index b36e8dd533ad34730c7ddf58e16c5b4776ea19f4..ab0051f582ab7d625dd50fd9edcf5cf9ce9d9b6a 100644 (file)
--- a/ocaml/xapi/xapi_pool.ml
+++ b/ocaml/xapi/xapi_pool.ml
@@ -470,7 +470,7 @@ let create_or_get_secret_on_master __context rpc session_id (secret_ref, secret)
                try Client.Secret.get_by_uuid ~rpc ~session_id ~uuid:my_uuid
                with _ ->
                        debug "Found no secret with uuid = '%s' on master, so creating one." my_uuid;
-                       Client.Secret.introduce ~rpc ~session_id ~uuid:my_uuid ~value:my_value
+                       Client.Secret.introduce ~rpc ~session_id ~uuid:my_uuid ~value:my_value ~other_config:[]
        in
        new_secret_ref
 

diff --git a/ocaml/xapi/xapi_secret.ml b/ocaml/xapi/xapi_secret.ml
index 7718bdcbf90cb885848e4043f407b9841794415d..daf6a82c1db11bc153c1648d09f3ee6268529200 100644 (file)
--- a/ocaml/xapi/xapi_secret.ml
+++ b/ocaml/xapi/xapi_secret.ml
@@ -20,14 +20,14 @@ open Stringext
 module D = Debug.Debugger(struct let name = "xapi_secret" end)
 open D
 
-let introduce ~__context ~uuid ~value =
+let introduce ~__context ~uuid ~value ~other_config =
        let ref = Ref.make () in
-       Db.Secret.create ~__context ~ref ~uuid ~value;
+       Db.Secret.create ~__context ~ref ~uuid ~value ~other_config;
        ref
 
-let create ~__context ~value =
+let create ~__context ~value ~other_config=
        let uuid = Uuid.to_string(Uuid.make_uuid()) in
-       let ref = introduce ~__context ~uuid ~value in
+       let ref = introduce ~__context ~uuid ~value ~other_config in
        ref
 
 let destroy ~__context ~self =
@@ -53,7 +53,7 @@ let duplicate_passwds ~__context strmap =
                then 
                        let sr = Db.Secret.get_by_uuid ~__context ~uuid:v in
                        let v = Db.Secret.get_value ~__context ~self:sr in
-                       let new_sr = create ~__context ~value:v in
+                       let new_sr = create ~__context ~value:v ~other_config:[] in
                        let new_uuid = Db.Secret.get_uuid ~__context ~self:new_sr in
                        (k, new_uuid)
                else (k, v)

diff --git a/ocaml/xapi/xapi_vmpp.ml b/ocaml/xapi/xapi_vmpp.ml
index 9ce99ddeb799e877475d4fc3bd3338e60adb09da..e13684b9b8a6016c74cd982efea92d7cea87776e 100644 (file)
--- a/ocaml/xapi/xapi_vmpp.ml
+++ b/ocaml/xapi/xapi_vmpp.ml
@@ -377,7 +377,7 @@ let map_password_to_secret ~__context ~new_password ~db =
     ignore (ExnHelper.string_of_exn e);
     let new_secret_ref = Ref.make() in
     let new_secret_uuid = Uuid.to_string(Uuid.make_uuid()) in
-    Db.Secret.create ~__context ~ref:new_secret_ref ~uuid:new_secret_uuid ~value:new_password;
+    Db.Secret.create ~__context ~ref:new_secret_ref ~uuid:new_secret_uuid ~value:new_password ~other_config:[];
     new_secret_uuid
   )