WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-api

[Xen-API] [PATCH] CA-39705: Throw grace_license alert for upgrade grace

To: xen-api <xen-api@xxxxxxxxxxxxxxxxxxx>
Subject: [Xen-API] [PATCH] CA-39705: Throw grace_license alert for upgrade grace licenses
From: Rob Hoes <rob.hoes@xxxxxxxxxx>
Date: Tue, 30 Mar 2010 16:04:56 +0100
Delivery-date: Tue, 30 Mar 2010 08:04:58 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-api-request@lists.xensource.com?subject=help>
List-id: Discussion of API issues surrounding Xen <xen-api.lists.xensource.com>
List-post: <mailto:xen-api@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-api>, <mailto:xen-api-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-api>, <mailto:xen-api-request@lists.xensource.com?subject=unsubscribe>
Sender: xen-api-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User Rob Hoes <rob.hoes@xxxxxxxxxx>
CA-39705: Throw grace_license alert for upgrade grace licenses

Signed-off-by: Rob Hoes <rob.hoes@xxxxxxxxxx>

diff -r 83abaa3f4ab5 ocaml/license/license.ml
--- a/ocaml/license/license.ml  Mon Mar 29 10:11:36 2010 +0100
+++ b/ocaml/license/license.ml  Tue Mar 30 16:04:13 2010 +0100
@@ -373,6 +373,7 @@
                                let expiry = upgrade_grace_expiry () in
                                write_grace_to_file expiry;
                                Unixext.unlink_safe !filename;
+                               V6alert.send_v6_upgrade_grace_license ();
                                let sku, name = sku_and_name_of_edition 
"enterprise" in
                                {default with sku = sku; expiry = expiry; grace 
= "upgrade grace"; sku_marketing_name = name}
                        end
diff -r 83abaa3f4ab5 ocaml/license/v6alert.ml
--- a/ocaml/license/v6alert.ml  Mon Mar 29 10:11:36 2010 +0100
+++ b/ocaml/license/v6alert.ml  Tue Mar 30 16:04:13 2010 +0100
@@ -26,6 +26,9 @@
 let send_v6_grace_license () =
        ignore (send_alert Api_messages.v6_grace_license "The license server is 
unreachable. However, a grace license is given, as a similar license was 
successfully checked out recently.")
 
+let send_v6_upgrade_grace_license () =
+       ignore (send_alert Api_messages.v6_grace_license "An upgrade grace 
license is given, which allows 30 days to connect to a license server holding a 
valid license.")
+       
 let send_v6_rejected () =
        ignore (send_alert Api_messages.v6_rejected "The requested license is 
not available at the license server.")
 
diff -r 83abaa3f4ab5 ocaml/license/v6alert.mli
--- a/ocaml/license/v6alert.mli Mon Mar 29 10:11:36 2010 +0100
+++ b/ocaml/license/v6alert.mli Tue Mar 30 16:04:13 2010 +0100
@@ -18,6 +18,8 @@
 
 val send_v6_grace_license : unit -> unit
 
+val send_v6_upgrade_grace_license : unit -> unit
+
 val send_v6_rejected : unit -> unit
 
 val send_v6_comm_error : unit -> unit
diff -r 83abaa3f4ab5 ocaml/xapi/OMakefile
--- a/ocaml/xapi/OMakefile      Mon Mar 29 10:11:36 2010 +0100
+++ b/ocaml/xapi/OMakefile      Tue Mar 30 16:04:13 2010 +0100
@@ -231,7 +231,8 @@
        ../license/v6client \
        bios_strings \
        xapi_config \
-       ../license/grace_retry
+       ../license/grace_retry \
+       ../license/v6alert
 
 OCamlProgram(xapi, $(XAPI_MODULES))
 OCamlDocProgram(xapi, $(XAPI_MODULES))

Attachment: v6-upgrade-grace-alert
Description: Text document

_______________________________________________
xen-api mailing list
xen-api@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/mailman/listinfo/xen-api
<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-API] [PATCH] CA-39705: Throw grace_license alert for upgrade grace licenses, Rob Hoes <=