Commit 51e1cc57 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega

Merge branch 'Release2-onwards' into Release3-onwards

Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parents 687d5fc0 4f431fdf
......@@ -1357,7 +1357,7 @@ module OneM2M_Functions {
vc_ae2.start(f_cse_createAccessControlPolicyAux("SubscriptionVerificationAcp",{"all"}, int63));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
vc_ae2.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_TS_AE2.appId, -, PX_TS_AE2.aeIdStem, c_defaultAe2ResourceName, {f_getCompletePoA(PX_TS_AE2.mcaPortIn, "")}), -1)); // AE2 is registred
vc_ae2.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_TS_AE2.appId, -, PX_TS_AE2.aeIdStem, c_defaultAe2ResourceName, {f_getLocalPoA(PX_TS_AE2.mcaPortIn, "")}), -1)); // AE2 is registred
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
p_ae2Index := f_getResourceFromAeSimu(vc_ae2);
......@@ -3234,7 +3234,7 @@ module OneM2M_Functions {
v_response.primitiveContent.remoteCSE := vc_localResourcesList[vc_localRemoteCseIndex].resource.remoteCSE;
f_send(e_mccPortIn, m_response(v_response));
vc_remoteCseIndex := f_setResource(valueof(m_primitiveContentRemoteCSE(m_contentMyRemoteCSEResource(f_getCompletePoA(vc_cseSimuDesc.mcaPortIn, "")))), int16, -1, true);
vc_remoteCseIndex := f_setResource(valueof(m_primitiveContentRemoteCSE(m_contentMyRemoteCSEResource(f_getLocalPoA(vc_cseSimuDesc.mcaPortIn, "")))), int16, -1, true);
v_resourceIndex := vc_remoteCseIndex;
v_remoteCSERegistered:=true;
tc_ac.start(10.0);
......@@ -5273,44 +5273,79 @@ module OneM2M_Functions {
}
/**
* @desc Resolution of the announcement target CSE PoA
* @param p_protocolBinding Protocol Binding
* @param p_announcementTargetAddress Announcement Target Address
* @param p_announcementTargetResource Announcement Target Resource
* @return p_annoucementTargetPoA Announcemenet Target PoA
* @desc Resolution of the test system PoA for a given port
* @param p_portDesc Description of port from where PoA will be built
* @param p_additionalContext Additional context
* @return PoA for the given port
*/
function f_getCompletePoA(in PortDesc p_portDesc := PX_TS_CSE1.mccPortIn, charstring p_announcementTargetResource := "") return charstring {
var charstring v_poa;
log(">>> f_getCompletePoA: ", p_portDesc);
function f_getLocalPoA(in PortDesc p_portDesc := PX_TS_CSE1.mccPortIn, charstring p_additionalContext := "") return charstring {
var charstring v_poa;
log(">>> f_getLocalPoA: ", p_portDesc);
if (ischosen(p_portDesc.binding.httpBindingDesc)) {
v_poa := "http://" & p_portDesc.binding.httpBindingDesc.bindingDesc.tsAddress;
if (ispresent(p_portDesc.binding.httpBindingDesc.bindingDesc.localPort)) {
v_poa := v_poa & ":" & int2str(p_portDesc.binding.httpBindingDesc.bindingDesc.localPort);
}
} else if (ischosen(p_portDesc.binding.coapBindingDesc)) {
v_poa := "coap://" & p_portDesc.binding.coapBindingDesc.bindingDesc.tsAddress;
if (ispresent(p_portDesc.binding.coapBindingDesc.bindingDesc.localPort)) {
v_poa := v_poa & ":" & int2str(p_portDesc.binding.coapBindingDesc.bindingDesc.localPort);
}
} else if (ischosen(p_portDesc.binding.mqttBindingDesc)) {
v_poa := "mqtt://" & p_portDesc.binding.mqttBindingDesc.bindingDesc.tsAddress;
if (ispresent(p_portDesc.binding.mqttBindingDesc.bindingDesc.localPort)) {
v_poa := v_poa & ":" & int2str(p_portDesc.binding.mqttBindingDesc.bindingDesc.localPort);
}
} else {
v_poa := "ws://" & p_portDesc.binding.wsBindingDesc.bindingDesc.tsAddress;
if (ispresent(p_portDesc.binding.wsBindingDesc.bindingDesc.localPort)) {
v_poa := v_poa & ":" & int2str(p_portDesc.binding.wsBindingDesc.bindingDesc.localPort);
}
}
v_poa := v_poa & "/" & p_additionalContext;
if (ischosen(p_portDesc.binding.httpBindingDesc)) {
v_poa := "http://" & p_portDesc.binding.httpBindingDesc.bindingDesc.tsAddress;
if (ispresent(p_portDesc.binding.httpBindingDesc.bindingDesc.localPort)) {
v_poa := v_poa & ":" & int2str(p_portDesc.binding.httpBindingDesc.bindingDesc.localPort);
}
} else if (ischosen(p_portDesc.binding.coapBindingDesc)) {
v_poa := "coap://" & p_portDesc.binding.coapBindingDesc.bindingDesc.tsAddress;
if (ispresent(p_portDesc.binding.coapBindingDesc.bindingDesc.localPort)) {
v_poa := v_poa & ":" & int2str(p_portDesc.binding.coapBindingDesc.bindingDesc.localPort);
}
} else if (ischosen(p_portDesc.binding.mqttBindingDesc)) {
v_poa := "mqtt://" & p_portDesc.binding.mqttBindingDesc.bindingDesc.tsAddress;
if (ispresent(p_portDesc.binding.mqttBindingDesc.bindingDesc.localPort)) {
v_poa := v_poa & ":" & int2str(p_portDesc.binding.mqttBindingDesc.bindingDesc.localPort);
}
} else {
v_poa := "ws://" & p_portDesc.binding.wsBindingDesc.bindingDesc.tsAddress;
if (ispresent(p_portDesc.binding.wsBindingDesc.bindingDesc.localPort)) {
v_poa := v_poa & ":" & int2str(p_portDesc.binding.wsBindingDesc.bindingDesc.localPort);
}
}
if(p_announcementTargetResource != "") {
v_poa := v_poa & "/" & p_announcementTargetResource;
}
return v_poa;
return v_poa;
}
/**
* @desc Resolution of the IUT PoA for a given port
* @param p_portDesc Description of port from where PoA will be built
* @param p_additionalContext Additional context
* @return PoA for the given port
*/
function f_getPoA(in PortDesc p_portDesc := PX_TS_AE1.mcaPort, charstring p_additionalContext := "") return charstring {
var charstring v_poa;
log(">>> f_getPoA: ", p_portDesc);
if (ischosen(p_portDesc.binding.httpBindingDesc)) {
v_poa := "http://" & p_portDesc.binding.httpBindingDesc.bindingDesc.sutAddress;
if (ispresent(p_portDesc.binding.httpBindingDesc.bindingDesc.remotePort)) {
v_poa := v_poa & ":" & int2str(p_portDesc.binding.httpBindingDesc.bindingDesc.remotePort);
}
} else if (ischosen(p_portDesc.binding.coapBindingDesc)) {
v_poa := "coap://" & p_portDesc.binding.coapBindingDesc.bindingDesc.sutAddress;
if (ispresent(p_portDesc.binding.coapBindingDesc.bindingDesc.remotePort)) {
v_poa := v_poa & ":" & int2str(p_portDesc.binding.coapBindingDesc.bindingDesc.remotePort);
}
} else if (ischosen(p_portDesc.binding.mqttBindingDesc)) {
v_poa := "mqtt://" & p_portDesc.binding.mqttBindingDesc.bindingDesc.sutAddress;
if (ispresent(p_portDesc.binding.mqttBindingDesc.bindingDesc.remotePort)) {
v_poa := v_poa & ":" & int2str(p_portDesc.binding.mqttBindingDesc.bindingDesc.remotePort);
}
} else {
v_poa := "ws://" & p_portDesc.binding.wsBindingDesc.bindingDesc.sutAddress;
if (ispresent(p_portDesc.binding.wsBindingDesc.bindingDesc.remotePort)) {
v_poa := v_poa & ":" & int2str(p_portDesc.binding.wsBindingDesc.bindingDesc.remotePort);
}
}
v_poa := v_poa & "/" & p_additionalContext;
return v_poa;
}
/**
* @desc Resolution of the local resource index for a given resource address (URI)
* @param p_address Resource URI (can be structured/unstructured cseRelative/spRelative/absolute)
......
......@@ -43,17 +43,17 @@ module OneM2M_Pixits {
/**
* @desc IUT CSE Name
*/
modulepar XSD.ID PX_CSE_NAME := "cse-in";
modulepar XSD.ID PX_CSE_NAME := "CSE-NAME";
/**
* @desc IUT CSE-ID with SP-relative-CSE-ID format (relative) according to TS-0001-7.2-1
*/
modulepar XSD.ID PX_CSE_ID := "/id-in";
modulepar XSD.ID PX_CSE_ID := "/CSE-ID";
/**
* @desc IUT CSE resource ID with Unstructured-CSE-relative-Resource-ID (relative) format according to TS-0001-7.2-1
*/
modulepar XSD.ID PX_CSE_RESOURCE_ID := "id-in";
modulepar XSD.ID PX_CSE_RESOURCE_ID := "CSE-ID";
/**
* @desc IUT M2M-SP-ID with M2M-SP-ID format (absolute) according to TS-0001-7.2-1 Unstructured-CSE-relative -Resource-ID
......@@ -63,7 +63,7 @@ module OneM2M_Pixits {
/**
* @desc AE-ID with privileges to CREATE at the IUT CSEBase with AE-ID-Stem format (relative) according to TS-0001-7.2-1
*/
modulepar XSD.ID PX_SUPER_AE_ID := "CAdmin";
modulepar XSD.ID PX_SUPER_AE_ID := "admin:admin";
/**
* @desc CSE-ID with privileges to CREATE at the IUT CSEBase with SP-relative-CSE-ID format (relative) according to TS-0001-7.2-1
......@@ -133,6 +133,13 @@ module OneM2M_Pixits {
*/
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 := "3";
modulepar ResourceTypeList_1 PX_SRT := {int1, int2, int3, int4};
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
......@@ -170,7 +177,7 @@ module OneM2M_Pixits {
}
}
},
serialization := "json"
serialization := "xml"
},
mcaPortIn := {
binding := {
......@@ -184,7 +191,7 @@ module OneM2M_Pixits {
}
}
},
serialization := "json"
serialization := "xml"
}
};
modulepar AeSimuComponentDesc PX_TS_AE2 := { // AE2 component settings
......@@ -202,7 +209,7 @@ module OneM2M_Pixits {
}
}
},
serialization := "json"
serialization := "xml"
},
mcaPortIn := {
binding := {
......@@ -216,7 +223,7 @@ module OneM2M_Pixits {
}
}
},
serialization := "json"
serialization := "xml"
}
};
modulepar CseSimuComponentDesc PX_TS_CSE1 := { // CSE1 component settings
......@@ -237,7 +244,7 @@ module OneM2M_Pixits {
}
}
},
serialization := "json"
serialization := "xml"
},
mcaPortIn := {
binding := {
......@@ -251,7 +258,7 @@ module OneM2M_Pixits {
}
}
},
serialization := "json"
serialization := "xml"
},
mccPort := {
binding := {
......@@ -265,7 +272,7 @@ module OneM2M_Pixits {
}
}
},
serialization := "json"
serialization := "xml"
},
mccPortIn := {
binding := {
......@@ -279,7 +286,7 @@ module OneM2M_Pixits {
}
}
},
serialization := "json"
serialization := "xml"
}
};
modulepar CseSimuComponentDesc PX_TS_CSE2 := { // CSE2 component settings
......@@ -416,8 +423,6 @@ module OneM2M_Pixits {
modulepar Labels PX_LABELS := {"VALUE_1"};
modulepar boolean PX_IS_LOC_CONTAINER := false;//default //set it to true when the container is created to store location information
modulepar PoaList PX_POA := {""};
modulepar ResourceTypeList_1 PX_SRT := {int1, int2, int3, int4};
} // end of module
This diff is collapsed.
......@@ -1923,13 +1923,13 @@ with {
};
type XSD.String ReleaseVersion (pattern "3")
type XSD.String ReleaseVersion (pattern "(2a|3)") //FIXME All available releases backwards till 2a. XSD will define it as this
with {
variant "name as uncapitalized";
};
type XSD.String ApplicableReleaseVersion (pattern "3")
type XSD.String ApplicableReleaseVersion (pattern "(1|2|2a|3)") //FIXME All available release backwards. XSD will define it as this
with {
variant "name as uncapitalized";
};
......
This diff is collapsed.
......@@ -648,7 +648,7 @@ module OneM2M_Testcases_AE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
var template RequestPrimitive v_createAe := mw_createAe;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute SupportedReleaseVersions";
v_utRequest.requestPrimitive.primitiveContent.aE.supportedReleaseVersions := {"3"};
v_utRequest.requestPrimitive.primitiveContent.aE.supportedReleaseVersions := {"1", "2", "2a", "3"};
v_utRequest.forcedFields := {{name := "supportedReleaseVersions", value_ := "UNINITIALIZED"}};
v_createAe.primitiveContent.aE.supportedReleaseVersions := ?;//Check value other than UNINITIALIZED, done by typing
v_cse1.start(f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action));
......@@ -1049,7 +1049,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_utRequest.requestPrimitive.primitiveContent.aE.expirationTime := "20301231T012345";
v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentUpdateAe;
v_expectedUpdateRequestAe.primitiveContent.aE.expirationTime := ?;
v_cse1.start(f_AE_DMR_UPD_001(v_utRequest, v_action, v_expectedUpdateRequestAe));
......@@ -1065,7 +1065,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_utRequest.requestPrimitive.primitiveContent.aE.labels := {"UNINITIALIZED"};
v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentUpdateAe;
v_expectedUpdateRequestAe.primitiveContent.aE.labels := complement({*,"UNINITIALIZED",*});
......@@ -1083,7 +1083,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_utRequest.requestPrimitive.primitiveContent.aE.appName := "UNINITIALIZED";
v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentUpdateAe;
v_expectedUpdateRequestAe.primitiveContent.aE.appName := complement("UNINITIALIZED");
v_cse1.start(f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe));
......@@ -1100,7 +1100,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_utRequest.requestPrimitive.primitiveContent.aE.pointOfAccess := {"UNINITIALIZED"};
v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentUpdateAe;
v_expectedUpdateRequestAe.primitiveContent.aE.pointOfAccess := complement({*,"UNINITIALIZED", *});
v_cse1.start(f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe));
......@@ -1116,7 +1116,7 @@ module OneM2M_Testcases_AE_Release_1 {
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute ontologyRef to ";
v_utRequest.requestPrimitive.primitiveContent.aE.ontologyRef := "UNINITIALIZED";
v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentUpdateAe;
v_expectedUpdateRequestAe.primitiveContent.aE.ontologyRef := complement("UNINITIALIZED");
v_cse1.start(f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe));
......@@ -1132,7 +1132,7 @@ module OneM2M_Testcases_AE_Release_1 {
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute nodeLink to ";
v_utRequest.requestPrimitive.primitiveContent.aE.nodeLink := "UNINITIALIZED";
v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentUpdateAe;
v_expectedUpdateRequestAe.primitiveContent.aE.nodeLink := complement("UNINITIALIZED");
v_cse1.start(f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe));
......@@ -1148,7 +1148,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_utRequest.requestPrimitive.primitiveContent.aE.requestReachability := true;
v_utRequest.forcedFields := {{name := "requestReachability", value_ := "UNINITIALIZED"}};
v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentUpdateAe;
v_expectedUpdateRequestAe.primitiveContent.aE.requestReachability := ?;//Check value other than "UNINITIALIZED", done by typing
v_cse1.start(f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe));
......@@ -1164,7 +1164,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_utRequest.requestPrimitive.primitiveContent.aE.contentSerialization := {applicationxml};
v_utRequest.forcedFields := {{name := "contentSerialization", value_ := "UNINITIALIZED"}};
v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentUpdateAe;
v_expectedUpdateRequestAe.primitiveContent.aE.contentSerialization := ?;//Check value other than "UNINITIALIZED", done by typing
v_cse1.start(f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe));
......
......@@ -1171,7 +1171,7 @@ module OneM2M_Testcases_AE_Release_3 {
//Creating resource in Hosting CSE
var E2eSecInfo v_myE2eSecInfo := {{int11},omit,omit}; //sharedReceiverESPrimRandObject not present
v_poa:= f_getCompletePoA(PX_TS_CSE2.mccPortIn, "");
v_poa:= f_getLocalPoA(PX_TS_CSE2.mccPortIn, "");
v_receiverRemoteCSE := m_primitiveContentRemoteCSE(m_contentRemoteCSE_e2eSecInfo(v_myE2eSecInfo, v_poa, PX_TS_CSE2));
vc_cse2.start(f_generateAndSetLocalResource(valueof(v_receiverRemoteCSE), -, int16));
......@@ -1259,7 +1259,7 @@ module OneM2M_Testcases_AE_Release_3 {
var AbsRelTimestamp myAbsRelTimestamp;
myAbsRelTimestamp.alt_ := "20181231T012345";
var E2eSecInfo v_myE2eSecInfo := {{int11},omit,{"1","24",myAbsRelTimestamp,{int1},{int10}}}; //expired sharedReceiverESPrimRandObject
v_poa:= f_getCompletePoA(PX_TS_CSE2.mccPortIn, "");
v_poa:= f_getLocalPoA(PX_TS_CSE2.mccPortIn, "");
v_receiverRemoteCSE := m_primitiveContentRemoteCSE(m_contentRemoteCSE_e2eSecInfo(v_myE2eSecInfo, v_poa, PX_TS_CSE2));
vc_cse2.start(f_generateAndSetLocalResource(valueof(v_receiverRemoteCSE), -, int16));
......@@ -1426,7 +1426,7 @@ module OneM2M_Testcases_AE_Release_3 {
var AbsRelTimestamp myAbsRelTimestamp;
myAbsRelTimestamp.alt_ := "20331231T012345";
var E2eSecInfo v_myE2eSecInfo := {{int11},omit,{"1","24",myAbsRelTimestamp,{int1},{int10}}}; //expired sharedReceiverESPrimRandObject
v_poa:= f_getCompletePoA(vc_cseSimuDesc.mccPortIn, "");
v_poa:= f_getLocalPoA(vc_cseSimuDesc.mccPortIn, "");
v_receiverRemoteCseResource := m_primitiveContentRemoteCSE(m_contentRemoteCSE_e2eSecInfo(v_myE2eSecInfo, v_poa, vc_cseSimuDesc));
v_receiverRemoteCseIndex := f_generateAndSetLocalResource(valueof(v_receiverRemoteCseResource), -, int16);
......@@ -1520,7 +1520,7 @@ module OneM2M_Testcases_AE_Release_3 {
//Creating resource in Hosting CSE
var E2eSecInfo v_myE2eSecInfo := {{int11},omit,omit}; //sharedReceiverESPrimRandObject not present
v_poa:= f_getCompletePoA(PX_TS_CSE2.mccPortIn, "");
v_poa:= f_getLocalPoA(PX_TS_CSE2.mccPortIn, "");
v_receiverRemoteCseResource := m_primitiveContentRemoteCSE(m_contentRemoteCSE_e2eSecInfo(v_myE2eSecInfo, v_poa, PX_TS_CSE2));
vc_cse2.start(f_generateAndSetLocalResource(valueof(v_receiverRemoteCseResource), -, int16));
......@@ -1610,7 +1610,7 @@ module OneM2M_Testcases_AE_Release_3 {
var AbsRelTimestamp myAbsRelTimestamp;
myAbsRelTimestamp.alt_ := "20181231T012345";
var E2eSecInfo v_myE2eSecInfo := {{int11},omit,{"1","24",myAbsRelTimestamp,{int1},{int10}}}; //expired sharedReceiverESPrimRandObject
v_poa:= f_getCompletePoA(PX_TS_CSE2.mccPortIn, "");
v_poa:= f_getLocalPoA(PX_TS_CSE2.mccPortIn, "");
v_receiverRemoteCseResource := m_primitiveContentRemoteCSE(m_contentRemoteCSE_e2eSecInfo(v_myE2eSecInfo, v_poa, PX_TS_CSE2));
vc_cse2.start(f_generateAndSetLocalResource(valueof(v_receiverRemoteCseResource), -, int16));
......
......@@ -1123,7 +1123,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_REG_CRE_012_AE_POA() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_create := m_createAe(PX_TS_AE1.appId, omit, PX_TS_AE1.aeIdStem);
v_create.primitiveContent.aE.pointOfAccess := {f_getCompletePoA(PX_TS_AE1.mcaPortIn)};
v_create.primitiveContent.aE.pointOfAccess := {f_getLocalPoA(PX_TS_AE1.mcaPortIn)};
v_ae1.start(f_CSE_REG_CRE_012(v_create));
v_ae1.done;
}
......@@ -1183,7 +1183,7 @@ module OneM2M_Testcases_CSE_Release_1 {
const AttributeAux c_optionalAttribute := {"pointOfAccess", omit};
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
v_createRequest.primitiveContent.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_CSE1.mccPortIn)};
v_createRequest.primitiveContent.remoteCSE.pointOfAccess := {f_getLocalPoA(PX_TS_CSE1.mccPortIn)};
v_cse1.start(f_CSE_REG_CRE_013(v_createRequest, c_optionalAttribute));
v_cse1.done;
......@@ -1993,11 +1993,11 @@ module OneM2M_Testcases_CSE_Release_1 {
v_request := valueof(m_createRemoteCSEBase);
v_request.primitiveContent.remoteCSE.cseType := int2; //MN_CSE
v_request.primitiveContent.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_CSE1.mccPortIn)};
v_request.primitiveContent.remoteCSE.pointOfAccess := {f_getLocalPoA(PX_TS_CSE1.mccPortIn)};
v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
v_contentResponse.remoteCSE.cseType := int2; //MN_CSE
v_contentResponse.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_CSE1.mccPortIn)};
v_contentResponse.remoteCSE.pointOfAccess := {f_getLocalPoA(PX_TS_CSE1.mccPortIn)};
v_cse1.start(f_CSE_REG_CRE_028(v_request, v_contentResponse));
v_cse1.done;
......@@ -2525,7 +2525,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var template RequestPrimitive v_createRequest := m_createAe(PX_TS_AE1.appId, -, PX_TS_AE1.aeIdStem);
var template PrimitiveContent v_contentResponse;
v_createRequest.primitiveContent.aE.pointOfAccess := {f_getCompletePoA(PX_TS_AE1.mcaPortIn)};
v_createRequest.primitiveContent.aE.pointOfAccess := {f_getLocalPoA(PX_TS_AE1.mcaPortIn)};
v_contentResponse.aE := mw_contentAeBase;
v_contentResponse.aE.pointOfAccess := ?;
......@@ -2731,7 +2731,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;
var template PrimitiveContent v_contentResponse;
v_createRequest.primitiveContent.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_CSE1.mccPortIn)};
v_createRequest.primitiveContent.remoteCSE.pointOfAccess := {f_getLocalPoA(PX_TS_CSE1.mccPortIn)};
v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
v_contentResponse.remoteCSE.pointOfAccess := ?;
......@@ -2801,14 +2801,14 @@ module OneM2M_Testcases_CSE_Release_1 {
if (v_response.primitive.responsePrimitive.primitiveContent.cSEBase.supportedResourceType == PX_SRT) {
setverdict(pass, __SCOPE__ & ": supportedResourceTypes attribute is set according to PX_SRT");
}else{
} else {
setverdict(fail, __SCOPE__ & ": supportedResourceTypes attribute is not set according to PX_SRT");
}
if (v_response.primitive.responsePrimitive.primitiveContent.cSEBase.pointOfAccess==PX_POA){
setverdict(pass, __SCOPE__ & ": supportedResourceTypes attribute is set according to PX_POA");
}else{
setverdict(fail, __SCOPE__ & ": supportedResourceTypes attribute is not set according to PX_POA");
if (match(v_response.primitive.responsePrimitive.primitiveContent.cSEBase.pointOfAccess, {*, f_getPoA(), *})) {
setverdict(pass, __SCOPE__ & ": pointOfAccess attribute is set according settings");
} else {
setverdict(fail, __SCOPE__ & ": pointOfAccess attribute is not set according settings");
}
}
......@@ -3066,7 +3066,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
v_updateRequest.primitiveContent.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_CSE1.mccPortIn)};
v_updateRequest.primitiveContent.remoteCSE.pointOfAccess := {f_getLocalPoA(PX_TS_CSE1.mccPortIn)};
v_cse1.start(f_CSE_REG_UPD_002(v_updateRequest));
v_cse1.done;
......@@ -3113,7 +3113,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var AttributeList c_optionalAttribute;
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
v_updateRequest.primitiveContent.remoteCSE.pointOfAccess := {f_getCompletePoA(PX_TS_CSE1.mccPortIn)};
v_updateRequest.primitiveContent.remoteCSE.pointOfAccess := {f_getLocalPoA(PX_TS_CSE1.mccPortIn)};
c_optionalAttribute := {"pointofAccess"};
v_cse1.start(f_CSE_REG_UPD_003(v_updateRequest, c_optionalAttribute));
......@@ -6809,7 +6809,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_UPD_015_CSR_POA() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var PoaList v_poaList := {f_getCompletePoA(PX_TS_AE2.mcaPortIn)};
var PoaList v_poaList := {f_getLocalPoA(PX_TS_AE2.mcaPortIn)};
var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
......@@ -6973,7 +6973,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_UPD_015_AE_POA() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var PoaList v_poaList := {f_getCompletePoA(PX_TS_AE2.mcaPortIn)};
var PoaList v_poaList := {f_getLocalPoA(PX_TS_AE2.mcaPortIn)};
var template RequestPrimitive v_updateRequest := m_updateAeBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
......@@ -10623,7 +10623,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_cseBaseIndex := f_getLatestLocalResourceIndex(vc_cse1);
vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSE_poa(-, -, -, -, -, {f_getCompletePoA()})));
vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSE_poa(-, -, -, -, -, {f_getLocalPoA()})));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
v_aeIndex := f_cse_preamble_registerAe();
......@@ -11188,7 +11188,7 @@ module OneM2M_Testcases_CSE_Release_1 {
// Preamble
vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSE_poa(-, -, -, -, -, {f_getCompletePoA()})));
vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSE_poa(-, -, -, -, -, {f_getLocalPoA()})));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
v_aeIndex := f_cse_preamble_registerAe();
......
......@@ -2380,7 +2380,7 @@ module OneM2M_Testcases_CSE_Release_2 {
// Preamble
f_cse_createAccessControlPolicyAux("SubscriptionVerificationAcp",{"all"}, int63);
v_ae1Index := f_cse_createResource_withAcpAux(int2, m_createAe(vc_aeSimuDesc.appId, -, vc_aeSimuDesc.aeIdStem, c_defaultAe1ResourceName, {f_getCompletePoA(vc_aeSimuDesc.mcaPortIn, "")}), -1); // AE1 is registred
v_ae1Index := f_cse_createResource_withAcpAux(int2, m_createAe(vc_aeSimuDesc.appId, -, vc_aeSimuDesc.aeIdStem, c_defaultAe1ResourceName, {f_getLocalPoA(vc_aeSimuDesc.mcaPortIn, "")}), -1); // AE1 is registred
vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_TS_AE2.appId, -, PX_TS_AE2.aeIdStem, c_defaultAe2ResourceName, omit), -1)); // AE2 is registred
......
......@@ -1530,7 +1530,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
v_createRequest.primitiveContent.timeSeries.announceTo := {f_getCompletePoA()};
v_createRequest.primitiveContent.timeSeries.announceTo := {f_getLocalPoA()};
v_ae1.start(f_CSE_DMR_CRE_022(int29, v_createRequest, mw_createTimeSeriesAnnc));//TimeSeries
v_ae1.done;
......@@ -1542,7 +1542,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {f_getCompletePoA()};
v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {f_getLocalPoA()};
v_ae1.start(f_CSE_DMR_CRE_022(int30, v_createRequest, mw_createTimeSeriesInstanceAnnc));//TimeSeriesInstance
v_ae1.done;
......@@ -3782,7 +3782,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var PrimitiveContent v_primitiveContentRetrieveResource;
v_createRequest.primitiveContent.accessControlPolicy.labels := v_labels_1;//Attribute 3
v_updateRequest.primitiveContent.accessControlPolicy.privileges := v_privileges_2; //Attribute 1
v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {f_getCompletePoA()};//Attribute 2
v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {f_getLocalPoA()};//Attribute 2
v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels_2;//Attribute 3
v_nullFields := {{"labels", omit}};
......@@ -3843,7 +3843,7 @@ module OneM2M_Testcases_CSE_Release_3 {
v_createRequest.primitiveContent.schedule.scheduleElement := {{"0 0 0,1,2 1 1 * *"}};//Attribute 1
v_updateRequest.primitiveContent.schedule.scheduleElement := {{"1 1 1,2 1 1 * *"}}; //Attribute 1
v_updateRequest.primitiveContent.schedule.announceTo := {f_getCompletePoA()};//Attribute 2
v_updateRequest.primitiveContent.schedule.announceTo := {f_getLocalPoA()};//Attribute 2
v_updateRequest.primitiveContent.schedule.labels := v_labels_1;//Attribute 3
v_nullFields := {{"labels", omit}};
......@@ -8350,7 +8350,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var AbsRelTimestamp myAbsRelTimestamp;
myAbsRelTimestamp.alt_ := "20331231T012345";
var E2eSecInfo v_myE2eSecInfo := {{int11},omit,{"1","24",myAbsRelTimestamp,{int1},{int10}}}; //expired sharedReceiverESPrimRandObject
v_poa:= f_getCompletePoA(PX_TS_CSE2.mccPortIn, "");
v_poa:= f_getLocalPoA(PX_TS_CSE2.mccPortIn, "");
v_receiverRemoteCseResource := m_primitiveContentRemoteCSE(m_contentRemoteCSE_e2eSecInfo(v_myE2eSecInfo, v_poa, PX_TS_CSE2));
v_receiverRemoteCseIndex := f_generateAndSetLocalResource(valueof(v_receiverRemoteCseResource), -, int16);
......@@ -8442,7 +8442,7 @@ module OneM2M_Testcases_CSE_Release_3 {
//Creating resource in Hosting CSE
var E2eSecInfo v_myE2eSecInfo := {{int11},omit,omit}; //sharedReceiverESPrimRandObject not present
v_poa:= f_getCompletePoA(PX_TS_CSE2.mccPortIn, "");
v_poa:= f_getLocalPoA(PX_TS_CSE2.mccPortIn, "");
v_receiverRemoteCseResource := m_primitiveContentRemoteCSE(m_contentRemoteCSE_e2eSecInfo(v_myE2eSecInfo, v_poa, PX_TS_CSE2));
vc_cse2.start(f_generateAndSetLocalResource(valueof(v_receiverRemoteCseResource), -, int16));
......@@ -8532,7 +8532,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var AbsRelTimestamp myAbsRelTimestamp;
myAbsRelTimestamp.alt_ := "20181231T012345";
var E2eSecInfo v_myE2eSecInfo := {{int11},omit,{"1","24",myAbsRelTimestamp,{int1},{int10}}}; //expired sharedReceiverESPrimRandObject
v_poa:= f_getCompletePoA(PX_TS_CSE2.mccPortIn, "");
v_poa:= f_getLocalPoA(PX_TS_CSE2.mccPortIn, "");
v_receiverRemoteCseResource := m_primitiveContentRemoteCSE(m_contentRemoteCSE_e2eSecInfo(v_myE2eSecInfo, v_poa, PX_TS_CSE2));
vc_cse2.start(f_generateAndSetLocalResource(valueof(v_receiverRemoteCseResource), -, int16));
......@@ -10203,7 +10203,7 @@ module OneM2M_Testcases_CSE_Release_3 {
// Test adapter configuration
//Register the CSE
vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSE_poa(-, -, -, -, -, {f_getCompletePoA()})));
vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSE_poa(-, -, -, -, -, {f_getLocalPoA()})));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
......@@ -13799,7 +13799,7 @@ module OneM2M_Testcases_CSE_Release_3 {
v_aeIndex := f_getLatestResource(vc_ae1);
f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
// CSE registraion
f_cse_registerRemoteCse(m_createRemoteCSE_poa(vc_cseSimuDesc.cseId, -, -, -, -, {f_getCompletePoA()}));
f_cse_registerRemoteCse(m_createRemoteCSE_poa(vc_cseSimuDesc.cseId, -, -, -, -, {f_getLocalPoA()}));
// Create ontology resource at CSE1
v_ontologyRepResourceIndex := f_generateAndSetLocalResource(valueof(m_primitiveContentOntologyRepository(m_contentCreateOntologyRepository)), vc_cSEBaseIndex, int38);
......@@ -13874,7 +13874,7 @@ module OneM2M_Testcases_CSE_Release_3 {
v_aeIndex := f_cse_preamble_registerAe();
v_cseBaseIndex := f_getLatestLocalResourceIndex(vc_cse1);
vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSE_poa(-, -, -, -, -, {f_getCompletePoA()})));
vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSE_poa(-, -, -, -, -, {f_getLocalPoA()})));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
vc_cse1.start(f_generateAndSetLocalResource(valueof(m_primitiveContentOntologyRepository(m_contentCreateOntologyRepository)), v_cseBaseIndex, int38));
......@@ -14912,7 +14912,7 @@ module OneM2M_Testcases_CSE_Release_3 {
vc_ae1.start(f_cse_preamble_registerAe());
vc_ae1.done;
f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
v_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSE_poa(vc_cseSimuDesc.cseId, -, -, -, -, {f_getCompletePoA()}));
v_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSE_poa(vc_cseSimuDesc.cseId, -, -, -, -, {f_getLocalPoA()}));
// Test Body
v_aeIndex := f_getLatestResource(vc_ae1);
......@@ -14992,7 +14992,7 @@ module OneM2M_Testcases_CSE_Release_3 {
v_aeIndex := f_cse_preamble_registerAe();
v_cseBaseIndex := f_getLatestLocalResourceIndex(vc_cse1);
vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSE_poa(-, -, -, -, -, {f_getCompletePoA()})));
vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSE_poa(-, -, -, -, -, {f_getLocalPoA()})));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
vc_cse1.start(f_generateAndSetLocalResource(valueof(m_primitiveContentOntologyRepository(m_contentCreateOntologyRepository)), v_cseBaseIndex, int38));
......@@ -15086,7 +15086,7 @@ module OneM2M_Testcases_CSE_Release_3 {
vc_ae1.start(f_cse_preamble_registerAe());
vc_ae1.done;
f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
v_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSE_poa(-, -, -, -, -, {f_getCompletePoA()}));
v_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSE_poa(-, -, -, -, -, {f_getLocalPoA()}));
// Test Body
v_aeIndex := f_getLatestResource(vc_ae1);
......@@ -15169,7 +15169,7 @@ module OneM2M_Testcases_CSE_Release_3 {
v_aeIndex := f_cse_preamble_registerAe();
// Preamble - register remoteCSE
vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSE_poa(-, -, -, -, -, {f_getCompletePoA()})));
vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSE_poa(-, -, -, -, -, {f_getLocalPoA()})));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
//Create ontology Repository and ontology resource in CSE
......@@ -16040,7 +16040,7 @@ module OneM2M_Testcases_CSE_Release_3 {
vc_ae1.start(f_cse_preamble_registerAe());
vc_ae1.done;
f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
v_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSE_poa(vc_cseSimuDesc.cseId, -, -, -, -, {f_getCompletePoA()}));
v_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSE_poa(vc_cseSimuDesc.cseId, -, -, -, -, {f_getLocalPoA()}));
// Test Body
v_aeIndex := f_getLatestResource(vc_ae1);
......@@ -16694,7 +16694,7 @@ module OneM2M_Testcases_CSE_Release_3 {
vc_ae1.start(f_cse_preamble_registerAe());
vc_ae1.done;
f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
v_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSE_poa(vc_cseSimuDesc.cseId, -, -, -, -, {f_getCompletePoA()}));
v_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSE_poa(vc_cseSimuDesc.cseId, -, -, -, -, {f_getLocalPoA()}));
// Create local <semanticMashupInstance> in remote CSE
v_semanticDescriptorCse1Index := f_generateAndSetLocalResource(valueof(m_primitiveContentSemanticMashupInstance(m_contentSemanticMashupInstance)), -, int24);
......
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