Commit 1be03976 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

UpperTester primitives improvements


Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parent feec7fe3
...@@ -5385,7 +5385,7 @@ module OneM2M_Functions { ...@@ -5385,7 +5385,7 @@ module OneM2M_Functions {
* @param p_action Description of the given action to be performed by the IUT * @param p_action Description of the given action to be performed by the IUT
* @verdict * @verdict
*/ */
function f_sendUtPrimitive(template UtTriggerPrimitive p_utRequest, in universal charstring p_action) runs on Tester { function f_sendUtPrimitive(template UtTriggerPrimitive p_utRequest, in universal charstring p_action) runs on CseSimu {
if (PX_UT_IMPLEMENTED){ if (PX_UT_IMPLEMENTED){
...@@ -5409,8 +5409,11 @@ module OneM2M_Functions { ...@@ -5409,8 +5409,11 @@ module OneM2M_Functions {
} }
} }
f_checkCseSimuStatus();
activate(a_default()); activate(a_default());
if(vc_config == e_cf01) { //In case UtPrimitive is used from AeSimu
/*if(vc_config == e_cf01) {
vc_aeSimu := activate(a_cse_cf01()); vc_aeSimu := activate(a_cse_cf01());
} else if ((vc_config == e_cf02) or (vc_config == e_cf02CseSimuMaster)) { } else if ((vc_config == e_cf02) or (vc_config == e_cf02CseSimuMaster)) {
if(vc_testSystemRole == e_ae) { if(vc_testSystemRole == e_ae) {
...@@ -5418,7 +5421,8 @@ module OneM2M_Functions { ...@@ -5418,7 +5421,8 @@ module OneM2M_Functions {
} else if (vc_testSystemRole == e_cse) { } else if (vc_testSystemRole == e_cse) {
vc_cseSimu := activate(a_cse_cf02_cse1()); vc_cseSimu := activate(a_cse_cf02_cse1());
} }
} else if (vc_config == e_cf03) { } else */
if (vc_config == e_cf03) {
vc_cseSimu := activate(a_ae_cf03()); vc_cseSimu := activate(a_ae_cf03());
} else if (vc_config == e_cf04) { } else if (vc_config == e_cf04) {
vc_cseSimu := activate(a_cse_cf04()); vc_cseSimu := activate(a_cse_cf04());
......
...@@ -5709,7 +5709,7 @@ module OneM2M_Templates { ...@@ -5709,7 +5709,7 @@ module OneM2M_Templates {
contentOffset := *, contentOffset := *,
assignedTokenIdentifiers := *, assignedTokenIdentifiers := *,
tokenRequestInformation := *, tokenRequestInformation := *,
releaseVersionIndicator := ?,//FIXME releaseVersionIndicator := *,
vendorInformation := * vendorInformation := *
} }
...@@ -5727,7 +5727,7 @@ module OneM2M_Templates { ...@@ -5727,7 +5727,7 @@ module OneM2M_Templates {
contentOffset := *, contentOffset := *,
assignedTokenIdentifiers := *, assignedTokenIdentifiers := *,
tokenRequestInformation := *, tokenRequestInformation := *,
releaseVersionIndicator := ?,//FIXME releaseVersionIndicator := *,
vendorInformation := * vendorInformation := *
} }
......
...@@ -6672,11 +6672,36 @@ with { ...@@ -6672,11 +6672,36 @@ with {
encode "UpperTester" encode "UpperTester"
} }
type ResponsePrimitive UtTriggerAckPrimitive type UtResponsePrimitive UtTriggerAckPrimitive
with { with {
encode "UpperTester" encode "UpperTester"
} }
type record UtResponsePrimitive
{
ResponseStatusCode responseStatusCode,
RequestID requestIdentifier,
PrimitiveContent primitiveContent optional,
XSD.ID to_ optional,
XSD.ID from_ optional,
Timestamp originatingTimestamp optional,
AbsRelTimestamp resultExpirationTimestamp optional,
EventCat eventCategory optional,
ContentStatus contentStatus optional,
XSD.PositiveInteger contentOffset optional,
DynAuthLocalTokenIdAssignments assignedTokenIdentifiers optional,
DynAuthTokenReqInfo tokenRequestInformation optional,
ReleaseVersion releaseVersionIndicator optional,
XSD.String vendorInformation optional
}
with {
variant "name as uncapitalized";
variant "element";
variant (to_) "name as 'to'";
variant (from_) "name as 'from'";
};
type record AttributeAux { type record AttributeAux {
XSD.NCName name, XSD.NCName name,
charstring value_ optional charstring value_ optional
......
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