CP-1704: vmpp.archive-now

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

diff --git a/ocaml/idl/datamodel.ml b/ocaml/idl/datamodel.ml
index 82b934e0fdd44a87439256ffa7639488c623518c..6013e187e5e4ee19ec84442215cb536c86891421 100644 (file)
--- a/ocaml/idl/datamodel.ml
+++ b/ocaml/idl/datamodel.ml
@@ -5894,6 +5894,12 @@ let vmpp_archive_target_type = Enum ("vmpp_archive_target_type",
     "cifs", "CIFS target config";
     "nfs", "NFS target config";
   ])
+let vmpp_schedule_min = "min"
+let vmpp_schedule_hour = "hour"
+let vmpp_schedule_days = "days"
+let vmpp_archive_target_config_location = "location"
+let vmpp_archive_target_config_username = "username"
+let vmpp_archive_target_config_password = "password"
 let vmpp_set_is_backup_running = call ~flags:[`Session]
   ~name:"set_is_backup_running"
   ~in_oss_since:None

diff --git a/ocaml/xapi/xapi_vmpp.ml b/ocaml/xapi/xapi_vmpp.ml
index 448e0a0b84f570dee25ff36f0f49a9884cab9923..dc25f2792adef41a51172ab1ad72db5c78d51799 100644 (file)
--- a/ocaml/xapi/xapi_vmpp.ml
+++ b/ocaml/xapi/xapi_vmpp.ml
@@ -69,22 +69,15 @@ let protect_now ~__context ~vmpp =
     "protect_now"
     args
 
-let archive_now ~__context ~snapshot = ""
-(*
-  let archive_target_config 
+let archive_now ~__context ~snapshot = 
+  let snapshot_uuid = Db.VM.get_uuid ~__context ~self:snapshot in
+  let args = [ "snapshot_uuid", snapshot_uuid ] in
   Xapi_plugins.call_plugin
     (Context.get_session_id __context)
     vmpr_plugin
-    "mount_archive_target"
+    "archive_now"
     args
 
-  Xapi_plugins.call_plugin
-    (Context.get_session_id __context)
-    vmpr_plugin
-    "unmount_archive_target"
-    args
-*)
-
 let set_is_backup_running ~__context ~self ~value =
   Db.VMPP.set_is_backup_running ~__context ~self ~value
 let set_is_archive_running ~__context ~self ~value =