Remove the product_brand from the database manifest because it wasn't used.

Signed-off-by: David Scott <dave.scott@eu.citrix.com>

diff --git a/ocaml/database/db_cache_types.ml b/ocaml/database/db_cache_types.ml
index 139076da3189f08b232afe5c6aabd3aec641aac5..f3a84f90dcdcee5ab0cb0f8563737683970a70ab 100644 (file)
--- a/ocaml/database/db_cache_types.ml
+++ b/ocaml/database/db_cache_types.ml
@@ -30,7 +30,6 @@ type db_dump_manifest =
     {
       schema_major_vsn : int;
       schema_minor_vsn : int;
-      product_brand : string;
       build_number : string;
       xapi_major_vsn : int;
       xapi_minor_vsn : int;
@@ -41,7 +40,6 @@ let gen_manifest gen_count =
   {
     schema_major_vsn = Datamodel.schema_major_vsn;
     schema_minor_vsn = Datamodel.schema_minor_vsn;
-    product_brand = Version.product_brand;
     build_number = Version.build_number;
     xapi_major_vsn = Xapi_globs.version_major;
     xapi_minor_vsn = Xapi_globs.version_minor;

diff --git a/ocaml/database/db_cache_types.mli b/ocaml/database/db_cache_types.mli
index 83c182b8b256f648837bd5a8efd7f36762ec385d..3163b05f693efa8facc41cdf0fd4455af12c53ad 100644 (file)
--- a/ocaml/database/db_cache_types.mli
+++ b/ocaml/database/db_cache_types.mli
@@ -25,7 +25,6 @@ type structured_op_t = AddSet | RemoveSet | AddMap | RemoveMap
 type db_dump_manifest = {
   schema_major_vsn : int;
   schema_minor_vsn : int;
-  product_brand : string;
   build_number : string;
   xapi_major_vsn : int;
   xapi_minor_vsn : int;

diff --git a/ocaml/database/db_xml.ml b/ocaml/database/db_xml.ml
index 18d996d4d6b6be6eac4157b87bc2db6364403457..63a5b75375e187331446728acefabf3ad76d55d0 100644 (file)
--- a/ocaml/database/db_xml.ml
+++ b/ocaml/database/db_xml.ml
@@ -24,7 +24,6 @@ let make_tag n attrs : Xmlm.tag = (name n), List.map (fun (k, v) -> name k, v) a
 
 let _schema_major_vsn = "schema_major_vsn"
 let _schema_minor_vsn = "schema_minor_vsn"
-let _product_brand = "product_brand"
 let _build_number = "build_number"
 let _xapi_major_vsn = "xapi_major_vsn"
 let _xapi_minor_vsn = "xapi_minor_vsn"
@@ -63,7 +62,6 @@ module To = struct
     Xmlm.output output (`El_start (make_tag "manifest" []));
     int    output _schema_major_vsn manifest.schema_major_vsn;
     int    output _schema_minor_vsn manifest.schema_minor_vsn;
-    string output _product_brand manifest.product_brand;
     string output _build_number manifest.build_number;
     int    output _xapi_major_vsn manifest.xapi_major_vsn;
     int    output _xapi_minor_vsn manifest.xapi_minor_vsn;
@@ -136,7 +134,6 @@ module From = struct
     let manifest = { 
       schema_major_vsn = int_of_string (List.assoc _schema_major_vsn manifest);
       schema_minor_vsn = int_of_string (List.assoc _schema_minor_vsn manifest);
-      product_brand = List.assoc _product_brand manifest;
       build_number = List.assoc _build_number manifest;
       xapi_major_vsn = int_of_string (List.assoc _xapi_major_vsn manifest);
       xapi_minor_vsn = int_of_string (List.assoc _xapi_minor_vsn manifest);

diff --git a/ocaml/xapi/pool_db_backup.ml b/ocaml/xapi/pool_db_backup.ml
index 100ac2df622487aeb643a914355105e5b55c409e..9dd33a7637e4295dc74dcae2bb4ffb49bb39cb71 100644 (file)
--- a/ocaml/xapi/pool_db_backup.ml
+++ b/ocaml/xapi/pool_db_backup.ml
@@ -29,7 +29,7 @@ let octet_stream = "Content-Type: application/octet-stream"
 
 (* CA-18377: The smallest database that is compatible with the Miami database schema. *)
 let minimally_compliant_miami_database =
-       "<database><manifest><pair key=\"schema_major_vsn\" value=\"5\"/><pair key=\"schema_minor_vsn\" value=\"35\"/><pair key=\"product_brand\" value=\"XenServer\"/><pair key=\"build_number\" value=\"7843c\"/><pair key=\"xapi_major_vsn\" value=\"1\"/><pair key=\"xapi_minor_vsn\" value=\"1\"/><pair key=\"generation_count\" value=\"103\"/></manifest><table name=\"SR\" /><table name=\"pool\" /><table name=\"VBD_metrics\"/><table name=\"console\" /><table name=\"host\" /><table name=\"VIF_metrics\"/><table name=\"user\" /><table name=\"PBD\" /><table name=\"pool_patch\" /><table name=\"host_metrics\" /><table name=\"VLAN\" /><table name=\"Bond\" /><table name=\"VTPM\" /><table name=\"event\"/><table name=\"VBD\" /><table name=\"VM_guest_metrics\" /><table name=\"VDI\" /><table name=\"VM_metrics\"/><table name=\"task\"/><table name=\"VM\" /><table name=\"crashdump\"/><table name=\"network\" /><table name=\"PIF\" /><table name=\"host_patch\"/><table name=\"host_crashdump\"/><table name=\"SM\" /><table name=\"host_cpu\" /><table name=\"VIF\" /><table name=\"session\" /><table name=\"PIF_metrics\" /></database>"
+       "<database><manifest><pair key=\"schema_major_vsn\" value=\"5\"/><pair key=\"schema_minor_vsn\" value=\"35\"/><pair key=\"build_number\" value=\"7843c\"/><pair key=\"xapi_major_vsn\" value=\"1\"/><pair key=\"xapi_minor_vsn\" value=\"1\"/><pair key=\"generation_count\" value=\"103\"/></manifest><table name=\"SR\" /><table name=\"pool\" /><table name=\"VBD_metrics\"/><table name=\"console\" /><table name=\"host\" /><table name=\"VIF_metrics\"/><table name=\"user\" /><table name=\"PBD\" /><table name=\"pool_patch\" /><table name=\"host_metrics\" /><table name=\"VLAN\" /><table name=\"Bond\" /><table name=\"VTPM\" /><table name=\"event\"/><table name=\"VBD\" /><table name=\"VM_guest_metrics\" /><table name=\"VDI\" /><table name=\"VM_metrics\"/><table name=\"task\"/><table name=\"VM\" /><table name=\"crashdump\"/><table name=\"network\" /><table name=\"PIF\" /><table name=\"host_patch\"/><table name=\"host_crashdump\"/><table name=\"SM\" /><table name=\"host_cpu\" /><table name=\"VIF\" /><table name=\"session\" /><table name=\"PIF_metrics\" /></database>"
 
 (** Write the database dump out to a file/socket *)
 let write_database (s: Unix.file_descr) ~__context =