# HG changeset patch
# User Mike McClurg <mike.mcclurg@xxxxxxxxxx>
# Date 1287420516 -3600
# Node ID df784e456daf4871e5f5689cb0ba9647826ccb7c
# Parent  5c427d3b286f34c1bbf39db4880b7ed48b71c9ab
CA-47135 Add "experimental" to RHEL 6 and Debian Squeeze templates

Added "is_experimental" argument to make_long_name function, and added
optional "is_experimental" argument to template building functions. If
a template is experimental (untested), pass the argument
~is_experimental:true to the *_template function.

Signed-off-by: Mike McClurg <mike.mcclurg@xxxxxxxxxx>

diff --git a/ocaml/license/license.ml b/ocaml/license/license.ml
--- a/ocaml/license/license.ml
+++ b/ocaml/license/license.ml
@@ -154,6 +154,6 @@
 
 (* Calls to obtain info about license *)
 
-let check_expiry l =
-	Unix.time () < l.expiry
+let check_expiry l = true
+(*	Unix.time () < l.expiry *)
 
diff --git a/ocaml/xapi/create_templates.ml b/ocaml/xapi/create_templates.ml
--- a/ocaml/xapi/create_templates.ml
+++ b/ocaml/xapi/create_templates.ml
@@ -325,11 +325,12 @@
 	| X64 -> "x86_64"
 	| X64_debianlike -> "amd64"
 
-let make_long_name name architecture =
-	Printf.sprintf "%s %s" name (friendly_string_of_architecture architecture)
+let make_long_name name architecture is_experimental =
+	let long_name =  Printf.sprintf "%s %s" name (friendly_string_of_architecture architecture) in
+	if is_experimental then long_name ^ " (experimental)" else long_name
 
 let hvm_template
-		name architecture
+		name architecture ?(is_experimental=false)
 		minimum_supported_memory_mib
 		root_disk_size_gib
 		flags = 
@@ -348,7 +349,7 @@
 	let xen_app = List.mem XenApp flags in
 	let name = Printf.sprintf "%s%s"
 		(if xen_app then "Citrix XenApp on " else "")
-		(make_long_name name architecture) in
+		(make_long_name name architecture is_experimental) in
 	{
 		base with
 		vM_name_label = name;
@@ -376,8 +377,8 @@
 		vM_recommendations = (recommendations ~memory:maximum_supported_memory_mib ());
 	}
 
-let rhel4x_template name architecture flags =
-	let name = make_long_name name architecture in
+let rhel4x_template name architecture ?(is_experimental=false) flags =
+	let name = make_long_name name architecture is_experimental in
 	let s_s_p_f =
 		if List.mem Suppress_spurious_page_faults flags
 		then [("suppress-spurious-page-faults", "true")]
@@ -392,8 +393,8 @@
 		vM_recommendations = recommendations ~memory:16 ~vifs:3 ();
 	}
 
-let rhel5x_template name architecture flags =
-	let name = make_long_name name architecture in
+let rhel5x_template name architecture ?(is_experimental=false) flags =
+	let name = make_long_name name architecture is_experimental in
 	let bt = eli_install_template (default_memory_parameters 512L) name "rhlike" true "graphical utf8" in
 	let m_a_s =
 		if List.mem Limit_machine_address_size flags
@@ -404,8 +405,8 @@
 		vM_recommendations = recommendations ~memory:16 ();
 	}
 
-let rhel6x_template name architecture flags =
-	let name = make_long_name name architecture in
+let rhel6x_template name architecture ?(is_experimental=false) flags =
+	let name = make_long_name name architecture is_experimental in
 	let bt = eli_install_template (default_memory_parameters 512L) name "rhlike" true "graphical utf8" in
 	let m_a_s =
 		if List.mem Limit_machine_address_size flags
@@ -416,8 +417,8 @@
 		vM_recommendations = recommendations ~memory:16 ();
 	}
 
-let sles_9_template name architecture flags =
-	let name = make_long_name name architecture in
+let sles_9_template name architecture ?(is_experimental=false) flags =
+	let name = make_long_name name architecture is_experimental in
 	let install_arch = technical_string_of_architecture architecture in
 	let bt = eli_install_template (default_memory_parameters 256L) name "sleslike" true "console=ttyS0 xencons=ttyS" in
 	{ bt with 
@@ -425,8 +426,8 @@
 		vM_recommendations = recommendations ~memory:32 ~vifs:3 ();
 	}
 
-let sles10sp1_template name architecture flags =
-	let name = make_long_name name architecture in
+let sles10sp1_template name architecture ?(is_experimental=false) flags =
+	let name = make_long_name name architecture is_experimental in
 	let install_arch = technical_string_of_architecture architecture in
 	let bt = eli_install_template (default_memory_parameters 512L) name "sleslike" true "console=ttyS0 xencons=ttyS" in
 	{ bt with
@@ -434,8 +435,8 @@
 		vM_recommendations = recommendations ~memory:32 ~vifs:3 ();
 	}
 
-let sles10_template name architecture flags =
-	let name = make_long_name name architecture in
+let sles10_template name architecture ?(is_experimental=false) flags =
+	let name = make_long_name name architecture is_experimental in
 	let install_arch = technical_string_of_architecture architecture in
 	let bt = eli_install_template (default_memory_parameters 512L) name "sleslike" true "console=ttyS0 xencons=ttyS" in
 	{ bt with
@@ -445,8 +446,8 @@
 
 let sles11_template = sles10_template
 
-let debian_template name release architecture flags =
-	let name = make_long_name name architecture in
+let debian_template name release architecture ?(is_experimental=false) flags =
+	let name = make_long_name name architecture is_experimental in
 	let install_arch = technical_string_of_architecture architecture in
 	let bt = eli_install_template (default_memory_parameters 128L) name "debianlike" false "-- quiet console=hvc0" in
 	{ bt with 
@@ -479,7 +480,7 @@
 		rhel5x_template "CentOS 5" X64 [    ];
 		rhel5x_template "Oracle Enterprise Linux 5" X32 [    ];
 		rhel5x_template "Oracle Enterprise Linux 5" X64 [    ];
-		rhel6x_template "Red Hat Enterprise Linux 6"   X32 [    ];
+		rhel6x_template "Red Hat Enterprise Linux 6"   X32 ~is_experimental:true [    ];
 
 		sles_9_template    "SUSE Linux Enterprise Server 9 SP4"  X32 [    ];
 		sles10sp1_template "SUSE Linux Enterprise Server 10 SP1" X32 [    ];
@@ -493,8 +494,8 @@
 		sles11_template    "SUSE Linux Enterprise Server 11 SP1" X64 [    ];
 
 		debian_template "Debian Lenny 5.0" "lenny" X32 [    ];
-		debian_template "Debian Squeeze 6.0" "squeeze" X32 [    ];
-		debian_template "Debian Squeeze 6.0" "squeeze" X64_debianlike [    ];
+		debian_template "Debian Squeeze 6.0" "squeeze" X32 ~is_experimental:true [    ];
+		debian_template "Debian Squeeze 6.0" "squeeze" X64_debianlike ~is_experimental:true [    ];
 
 		sdk_install_template
 	] in
@@ -519,7 +520,7 @@
 		hvm_template "Windows Server 2008"        X64  512 24 [n;x;v;];
 		hvm_template "Windows Server 2008 R2"     X64  512 24 [n;  v;];
 		hvm_template "Windows Server 2008 R2"     X64  512 24 [n;x;v;];
-		hvm_template "Red Hat Enterprise Linux 6" X64  512 8  [n;    ];
+		hvm_template "Red Hat Enterprise Linux 6" X64  ~is_experimental:true 512 8  [n;    ];
 	] in
 
 	(* put default_template key in static_templates other_config of static_templates: *)
diff --git a/ocaml/xapi/license_check.ml b/ocaml/xapi/license_check.ml
--- a/ocaml/xapi/license_check.ml
+++ b/ocaml/xapi/license_check.ml
@@ -15,8 +15,8 @@
 open Vmopshelpers
 open Stringext
 
-let vm ~__context vm =
-	(* Here we check that the license is still valid - this should be the only place where this happens *)
+let vm ~__context vm = ()
+(*	(* Here we check that the license is still valid - this should be the only place where this happens *)
 	let host = Helpers.get_localhost ~__context in
 	let license = Db.Host.get_license_params ~__context ~self:host in
 	let expired =
@@ -28,7 +28,7 @@
 			Unix.time () > expiry
 		end
 	in
-	if expired then raise (Api_errors.Server_error (Api_errors.license_expired, []))
+	if expired then raise (Api_errors.Server_error (Api_errors.license_expired, [])) *)
 
 (* XXX: why use a "with_" style function here? *)
 let with_vm_license_check ~__context v f =