Merge pull request xapi-project#1735 from simonjbeaumont/creedence-versioning

Fix up release versions in master branch

Author: johnelse

ocaml/idl/datamodel.ml

@@ -57,6 +57,9 @@ let vgpu_productisation_release_schema_minor_vsn = 69
 let clearwater_felton_release_schema_major_vsn = 5
 let clearwater_felton_release_schema_minor_vsn = 70
 
+let creedence_release_schema_major_vsn = 5
+let creedence_release_schema_minor_vsn = 71
+
 let augusta_release_schema_major_vsn = 5
 let augusta_release_schema_minor_vsn = 81
 
@@ -186,6 +189,12 @@ let augusta_release =
 	; internal_deprecated_since=None
 	}
 
+let creedence_release =
+	{ internal = get_product_releases rel_creedence
+	; opensource=get_oss_releases None
+	; internal_deprecated_since=None
+	}
+
 let clearwater_felton_release =
 	{ internal=get_product_releases rel_clearwater_felton
 	; opensource=get_oss_releases None
@@ -4682,7 +4691,7 @@ let pif_pool_introduce_params first_rel =
     {param_type=String; param_name="ipv6_gateway"; param_doc=""; param_release=boston_release; param_default=Some (VString "")};
     {param_type=pif_primary_address_type; param_name="primary_address_type"; param_doc=""; param_release=boston_release; param_default=Some (VEnum "IPv4")};
     {param_type=Bool; param_name="managed"; param_doc=""; param_release=vgpu_productisation_release; param_default=Some (VBool true)};
-    {param_type=Map(String, String); param_name="properties"; param_doc=""; param_release=augusta_release; param_default=Some (VMap [])};
+    {param_type=Map(String, String); param_name="properties"; param_doc=""; param_release=creedence_release; param_default=Some (VMap [])};
   ]
 
 (* PIF pool introduce is used to copy PIF records on pool join -- it's the PIF analogue of VDI.pool_introduce *)
@@ -4726,7 +4735,7 @@ let pif_set_property = call
 		String, "name", "The property name";
 		String, "value", "The property value";
 	]
-	~lifecycle:[Published, rel_augusta, ""]
+	~lifecycle:[Published, rel_creedence, ""]
 	~allowed_roles:_R_POOL_OP
 	()
 
@@ -4775,7 +4784,7 @@ let pif =
 	field ~in_oss_since:None ~ty:Bool ~lifecycle:[Published, rel_vgpu_productisation, ""] ~qualifier:StaticRO "managed" "Indicates whether the interface \
 		is managed by xapi. If it is not, then xapi will not configure the interface, the commands PIF.plug/unplug/reconfigure_ip(v6) \
 		can not be used, nor can the interface be bonded or have VLANs based on top through xapi." ~default_value:(Some (VBool true));
-	field ~lifecycle:[Published, rel_augusta, ""] ~qualifier:DynamicRO ~ty:(Map(String, String)) ~default_value:(Some (VMap [])) "properties" "Additional configuration properties for the interface.";
+	field ~lifecycle:[Published, rel_creedence, ""] ~qualifier:DynamicRO ~ty:(Map(String, String)) ~default_value:(Some (VMap [])) "properties" "Additional configuration properties for the interface.";
       ]
 	()
 

ocaml/idl/datamodel_types.ml

@@ -48,6 +48,7 @@ let rel_clearwater = "clearwater"
 let rel_vgpu_tech_preview = "vgpu-tech-preview"
 let rel_vgpu_productisation = "vgpu-productisation"
 let rel_clearwater_felton = "clearwater-felton"
+let rel_creedence = "creedence"
 let rel_augusta = "augusta"
 
 let release_order =
@@ -65,6 +66,7 @@ let release_order =
 	; rel_vgpu_tech_preview
 	; rel_vgpu_productisation
 	; rel_clearwater_felton
+	; rel_creedence
 	; rel_augusta
 	]
 

ocaml/xapi/xapi_db_upgrade.ml

@@ -48,7 +48,7 @@ let cowley = Datamodel.cowley_release_schema_major_vsn, Datamodel.cowley_release
 let boston = Datamodel.boston_release_schema_major_vsn, Datamodel.boston_release_schema_minor_vsn
 let tampa = Datamodel.tampa_release_schema_major_vsn, Datamodel.tampa_release_schema_minor_vsn
 let clearwater = Datamodel.clearwater_release_schema_major_vsn, Datamodel.clearwater_release_schema_minor_vsn
-let augusta = Datamodel.augusta_release_schema_major_vsn, Datamodel.augusta_release_schema_minor_vsn
+let creedence = Datamodel.creedence_release_schema_major_vsn, Datamodel.creedence_release_schema_minor_vsn
 
 let upgrade_alert_priority = {
 	description = "Upgrade alert priority";
@@ -406,7 +406,7 @@ let remove_wlb = {
 
 let add_default_pif_properties = {
 	description = "Adding default PIF properties";
-	version = (fun x -> x < augusta);
+	version = (fun x -> x < creedence);
 	fn = fun ~__context ->
 		List.iter
 			(fun self -> Xapi_pif.set_default_properties ~__context ~self)