Commit 19ae8ab6 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Parametrization of releaseVersion related attributes/parameters to enable the...


Parametrization of releaseVersion related attributes/parameters to enable the use of the ATS on IUTs of a different release version
Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parent 16962d12
...@@ -2899,7 +2899,7 @@ module OneM2M_Functions { ...@@ -2899,7 +2899,7 @@ module OneM2M_Functions {
v_myResource.cSEBase.supportedResourceType := PX_TS_CSE1.supportedResourceType; v_myResource.cSEBase.supportedResourceType := PX_TS_CSE1.supportedResourceType;
v_myResource.cSEBase.pointOfAccess := {f_getCompletePoA(PX_TS_CSE1.mccPortIn, "")}; v_myResource.cSEBase.pointOfAccess := {f_getCompletePoA(PX_TS_CSE1.mccPortIn, "")};
v_myResource.cSEBase.cseType := vc_cseType; v_myResource.cSEBase.cseType := vc_cseType;
v_myResource.cSEBase.supportedReleaseVersions := {"2a"}; v_myResource.cSEBase.supportedReleaseVersions := {"1", "2", "2a"};
}else if(p_resourceType == int16 and ispresent(p_resource)) { //RemoteCSE }else if(p_resourceType == int16 and ispresent(p_resource)) { //RemoteCSE
if(ischosen(p_resource.remoteCSE)){ if(ischosen(p_resource.remoteCSE)){
......
...@@ -127,6 +127,12 @@ module OneM2M_Pixits { ...@@ -127,6 +127,12 @@ module OneM2M_Pixits {
*/ */
modulepar float PX_TCONFIG_IUT := 10.0; modulepar float PX_TCONFIG_IUT := 10.0;
/**
* @desc Release version of IUT to be used. Any available release backwards from actual ATS release till 2a
*/
modulepar ReleaseVersion PX_RELEASE_VERSION := "2a";
group flexContainerContainerDefinitions { group flexContainerContainerDefinitions {
/** /**
* @desc These contain the identifier reference (URI) to the <flexContainer> schema definition which is used by the CSE to validate the syntax of the <flexContainer> resource * @desc These contain the identifier reference (URI) to the <flexContainer> schema definition which is used by the CSE to validate the syntax of the <flexContainer> resource
......
...@@ -122,7 +122,7 @@ module OneM2M_Templates { ...@@ -122,7 +122,7 @@ module OneM2M_Templates {
tokenIDs := omit, tokenIDs := omit,
localTokenIDs := omit, localTokenIDs := omit,
tokenRequestIndicator := omit, tokenRequestIndicator := omit,
releaseVersionIndicator := "2a", releaseVersionIndicator := PX_RELEASE_VERSION,
vendorInformation := omit vendorInformation := omit
}; };
...@@ -219,7 +219,7 @@ module OneM2M_Templates { ...@@ -219,7 +219,7 @@ module OneM2M_Templates {
tokenIDs := omit, tokenIDs := omit,
localTokenIDs := omit, localTokenIDs := omit,
tokenRequestIndicator := omit, tokenRequestIndicator := omit,
releaseVersionIndicator := "2a", releaseVersionIndicator := PX_RELEASE_VERSION,
vendorInformation := omit vendorInformation := omit
}; };
...@@ -253,7 +253,7 @@ module OneM2M_Templates { ...@@ -253,7 +253,7 @@ module OneM2M_Templates {
tokenIDs := omit, tokenIDs := omit,
localTokenIDs := omit, localTokenIDs := omit,
tokenRequestIndicator := omit, tokenRequestIndicator := omit,
releaseVersionIndicator := "2a", releaseVersionIndicator := PX_RELEASE_VERSION,
vendorInformation := omit vendorInformation := omit
}; };
...@@ -473,7 +473,7 @@ module OneM2M_Templates { ...@@ -473,7 +473,7 @@ module OneM2M_Templates {
tokenIDs := omit, tokenIDs := omit,
localTokenIDs := omit, localTokenIDs := omit,
tokenRequestIndicator := omit, tokenRequestIndicator := omit,
releaseVersionIndicator := "2a", releaseVersionIndicator := PX_RELEASE_VERSION,
vendorInformation := omit vendorInformation := omit
}; };
...@@ -722,7 +722,7 @@ module OneM2M_Templates { ...@@ -722,7 +722,7 @@ module OneM2M_Templates {
tokenIDs := omit, tokenIDs := omit,
localTokenIDs := omit, localTokenIDs := omit,
tokenRequestIndicator := omit, tokenRequestIndicator := omit,
releaseVersionIndicator := "2a", releaseVersionIndicator := PX_RELEASE_VERSION,
vendorInformation := omit vendorInformation := omit
}; };
...@@ -1418,7 +1418,7 @@ module OneM2M_Templates { ...@@ -1418,7 +1418,7 @@ module OneM2M_Templates {
tokenIDs := omit, tokenIDs := omit,
localTokenIDs := omit, localTokenIDs := omit,
tokenRequestIndicator := omit, tokenRequestIndicator := omit,
releaseVersionIndicator := "2a", releaseVersionIndicator := PX_RELEASE_VERSION,
vendorInformation := omit vendorInformation := omit
}; };
...@@ -1489,7 +1489,7 @@ module OneM2M_Templates { ...@@ -1489,7 +1489,7 @@ module OneM2M_Templates {
tokenIDs := omit, tokenIDs := omit,
localTokenIDs := omit, localTokenIDs := omit,
tokenRequestIndicator := omit, tokenRequestIndicator := omit,
releaseVersionIndicator := "2a", releaseVersionIndicator := PX_RELEASE_VERSION,
vendorInformation := omit vendorInformation := omit
}; };
...@@ -1536,7 +1536,7 @@ module OneM2M_Templates { ...@@ -1536,7 +1536,7 @@ module OneM2M_Templates {
tokenIDs := omit, tokenIDs := omit,
localTokenIDs := omit, localTokenIDs := omit,
tokenRequestIndicator := omit, tokenRequestIndicator := omit,
releaseVersionIndicator := "2a", releaseVersionIndicator := PX_RELEASE_VERSION,
vendorInformation := omit vendorInformation := omit
}; };
...@@ -1758,7 +1758,7 @@ module OneM2M_Templates { ...@@ -1758,7 +1758,7 @@ module OneM2M_Templates {
requestReachability := false,//M requestReachability := false,//M
contentSerialization := omit,//O contentSerialization := omit,//O
e2eSecInfo := omit, //O e2eSecInfo := omit, //O
supportedReleaseVersions := {"2a"}, //M supportedReleaseVersions := {"1", "2", "2a"}, //M
choice := omit//NP choice := omit//NP
}; };
...@@ -1912,7 +1912,7 @@ module OneM2M_Templates { ...@@ -1912,7 +1912,7 @@ module OneM2M_Templates {
nodeLink := omit, nodeLink := omit,
dynamicAuthorizationConsultationIDs := omit, dynamicAuthorizationConsultationIDs := omit,
e2eSecInfo := omit, e2eSecInfo := omit,
supportedReleaseVersions := {"2a"}, supportedReleaseVersions := {"1", "2", "2a"},
choice := omit choice := omit
}; };
...@@ -2705,7 +2705,7 @@ module OneM2M_Templates { ...@@ -2705,7 +2705,7 @@ module OneM2M_Templates {
nodeLink := omit,//O nodeLink := omit,//O
triggerReferenceNumber := omit,//O triggerReferenceNumber := omit,//O
e2eSecInfo := omit,//O e2eSecInfo := omit,//O
supportedReleaseVersions := {"2a"}, //M supportedReleaseVersions := {"1", "2", "2a"}, //M
choice := omit//O choice := omit//O
}; };
...@@ -2736,7 +2736,7 @@ module OneM2M_Templates { ...@@ -2736,7 +2736,7 @@ module OneM2M_Templates {
nodeLink := omit,//O nodeLink := omit,//O
triggerReferenceNumber := omit,//O triggerReferenceNumber := omit,//O
e2eSecInfo := omit,//O e2eSecInfo := omit,//O
supportedReleaseVersions := {"2a"}, //M supportedReleaseVersions := {"1", "2", "2a"}, //M
choice := omit//O choice := omit//O
}; };
...@@ -2766,7 +2766,7 @@ module OneM2M_Templates { ...@@ -2766,7 +2766,7 @@ module OneM2M_Templates {
nodeLink := *,//O nodeLink := *,//O
triggerReferenceNumber := *,//O triggerReferenceNumber := *,//O
e2eSecInfo := *,//O e2eSecInfo := *,//O
supportedReleaseVersions := {"2a"}, //M supportedReleaseVersions := ?, //M
choice := *//O choice := *//O
}; };
...@@ -5109,7 +5109,7 @@ module OneM2M_Templates { ...@@ -5109,7 +5109,7 @@ module OneM2M_Templates {
requestReachability := omit,//M requestReachability := omit,//M
contentSerialization := omit,//O contentSerialization := omit,//O
e2eSecInfo:= omit, //O e2eSecInfo:= omit, //O
supportedReleaseVersions := {"2a"},//M supportedReleaseVersions := {"1", "2", "2a"},//M
choice := omit//O choice := omit//O
}; };
...@@ -5135,7 +5135,7 @@ module OneM2M_Templates { ...@@ -5135,7 +5135,7 @@ module OneM2M_Templates {
requestReachability := omit,//M requestReachability := omit,//M
contentSerialization := *,//O contentSerialization := *,//O
e2eSecInfo:= *, //O e2eSecInfo:= *, //O
supportedReleaseVersions := {"2a"},//M supportedReleaseVersions := ?,//M
choice := *//O choice := *//O
}; };
...@@ -5381,7 +5381,7 @@ module OneM2M_Templates { ...@@ -5381,7 +5381,7 @@ module OneM2M_Templates {
contentOffset := omit, contentOffset := omit,
assignedTokenIdentifiers := omit, assignedTokenIdentifiers := omit,
tokenRequestInformation := omit, tokenRequestInformation := omit,
releaseVersionIndicator := "2a", releaseVersionIndicator := PX_RELEASE_VERSION,
vendorInformation := omit vendorInformation := omit
}; };
...@@ -5515,7 +5515,7 @@ module OneM2M_Templates { ...@@ -5515,7 +5515,7 @@ module OneM2M_Templates {
contentOffset := omit, contentOffset := omit,
assignedTokenIdentifiers := omit, assignedTokenIdentifiers := omit,
tokenRequestInformation := omit, tokenRequestInformation := omit,
releaseVersionIndicator := "2a", releaseVersionIndicator := PX_RELEASE_VERSION,
vendorInformation := omit vendorInformation := omit
}; };
...@@ -5572,7 +5572,7 @@ module OneM2M_Templates { ...@@ -5572,7 +5572,7 @@ module OneM2M_Templates {
tokenIDs := omit, tokenIDs := omit,
localTokenIDs := omit, localTokenIDs := omit,
tokenRequestIndicator := omit, tokenRequestIndicator := omit,
releaseVersionIndicator := "2a",//FIXME releaseVersionIndicator := PX_RELEASE_VERSION,
vendorInformation := omit vendorInformation := omit
}, },
forcedFields := omit forcedFields := omit
...@@ -5651,7 +5651,7 @@ module OneM2M_Templates { ...@@ -5651,7 +5651,7 @@ module OneM2M_Templates {
tokenIDs := omit, tokenIDs := omit,
localTokenIDs := omit, localTokenIDs := omit,
tokenRequestIndicator := omit, tokenRequestIndicator := omit,
releaseVersionIndicator := "2a",//FIXME releaseVersionIndicator := PX_RELEASE_VERSION,
vendorInformation := omit vendorInformation := omit
}, },
forcedFields := omit forcedFields := omit
...@@ -5690,7 +5690,7 @@ module OneM2M_Templates { ...@@ -5690,7 +5690,7 @@ module OneM2M_Templates {
tokenIDs := omit, tokenIDs := omit,
localTokenIDs := omit, localTokenIDs := omit,
tokenRequestIndicator := omit, tokenRequestIndicator := omit,
releaseVersionIndicator := "2a",//FIXME releaseVersionIndicator := PX_RELEASE_VERSION,
vendorInformation := omit vendorInformation := omit
}, },
forcedFields := omit forcedFields := omit
...@@ -5737,7 +5737,7 @@ module OneM2M_Templates { ...@@ -5737,7 +5737,7 @@ module OneM2M_Templates {
tokenIDs := omit, tokenIDs := omit,
localTokenIDs := omit, localTokenIDs := omit,
tokenRequestIndicator := omit, tokenRequestIndicator := omit,
releaseVersionIndicator := "2a",//FIXME releaseVersionIndicator := PX_RELEASE_VERSION,
vendorInformation := omit vendorInformation := omit
}, },
forcedFields := omit forcedFields := omit
......
...@@ -1601,13 +1601,13 @@ with { ...@@ -1601,13 +1601,13 @@ with {
}; };
type XSD.String ReleaseVersion (pattern "2a") type XSD.String ReleaseVersion (pattern "2a") //FIXME All available releases backwards till 2a. XSD will define it as this
with { with {
variant "name as uncapitalized"; variant "name as uncapitalized";
}; };
type XSD.String ApplicableReleaseVersion (pattern "2a") type XSD.String ApplicableReleaseVersion (pattern "(1|2|2a)") //FIXME All available release backwards. XSD will define it as this
with { with {
variant "name as uncapitalized"; variant "name as uncapitalized";
}; };
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment