Commit 3437f2a7 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Merge branch 'Release2-onwards' into Release2

parents 000ac3bb 4f431fdf
......@@ -1160,7 +1160,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);
......@@ -2774,7 +2774,7 @@ module OneM2M_Functions {
setverdict(pass, __SCOPE__&":INFO: Resource type remoteCSE created successfuly");
f_checkAttributesToBeSaved(int16, v_request, v_response.primitive.responsePrimitive);
vc_remoteCseIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int16, -1);
v_localRemoteCSEResource := f_generateLocalResource(valueof(m_primitiveContentRemoteCSE(m_contentLocalRemoteCSEResource(f_getCompletePoA(PX_TS_CSE1.mccPortIn, "")))), vc_cSEBaseIndex, int16); // FIXME To be review not sure we have to use CSE1
v_localRemoteCSEResource := f_generateLocalResource(valueof(m_primitiveContentRemoteCSE(m_contentLocalRemoteCSEResource(f_getLocalPoA(PX_TS_CSE1.mccPortIn, "")))), vc_cSEBaseIndex, int16); // FIXME To be review not sure we have to use CSE1
vc_localRemoteCseIndex := f_setLocalResource(v_localRemoteCSEResource, int16, vc_cSEBaseIndex);
}
[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) {
......@@ -2828,7 +2828,7 @@ module OneM2M_Functions {
v_response.primitiveContent.remoteCSE := vc_localResourcesList[vc_localRemoteCseIndex].resource.remoteCSE;
f_send(e_mcc_in_port, m_response(v_response));
vc_remoteCseIndex := f_setResource(valueof(m_primitiveContentRemoteCSE(m_contentMyRemoteCSEResource(f_getCompletePoA(PX_TS_CSE1.mcaPortIn, "")))), int16, -1, true);
vc_remoteCseIndex := f_setResource(valueof(m_primitiveContentRemoteCSE(m_contentMyRemoteCSEResource(f_getLocalPoA(PX_TS_CSE1.mcaPortIn, "")))), int16, -1, true);
v_resourceIndex := vc_remoteCseIndex;
v_remoteCSERegistered:=true;
tc_ac.start(10.0);
......@@ -2926,9 +2926,9 @@ module OneM2M_Functions {
v_myResource.cSEBase.lastModifiedTime := v_myResource.cSEBase.creationTime;
v_myResource.cSEBase.cSE_ID := PX_TS_CSE1.cseId;
v_myResource.cSEBase.supportedResourceType := PX_TS_CSE1.supportedResourceType;
v_myResource.cSEBase.pointOfAccess := {f_getCompletePoA(PX_TS_CSE1.mccPortIn, "")};
v_myResource.cSEBase.pointOfAccess := {f_getLocalPoA(PX_TS_CSE1.mccPortIn, "")};
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
if(ischosen(p_resource.remoteCSE)){
......@@ -4568,43 +4568,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);
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_announcementTargetResource;
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;
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)
......
......@@ -127,6 +127,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 := "2a";
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
......@@ -298,8 +305,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
......@@ -15,8 +15,7 @@ module OneM2M_Templates {
import from OneM2M_Types all;
import from OneM2M_TypesAndValues all;
import from OneM2M_Pixits all;
import from OneM2M_Functions all;
import from OneM2M_Functions all;
/**
* @desc Get a converted to string random number
......@@ -122,7 +121,7 @@ module OneM2M_Templates {
tokenIDs := omit,
localTokenIDs := omit,
tokenRequestIndicator := omit,
releaseVersionIndicator := "2a",
releaseVersionIndicator := PX_RELEASE_VERSION,
vendorInformation := omit
};
......@@ -219,7 +218,7 @@ module OneM2M_Templates {
tokenIDs := omit,
localTokenIDs := omit,
tokenRequestIndicator := omit,
releaseVersionIndicator := "2a",
releaseVersionIndicator := PX_RELEASE_VERSION,
vendorInformation := omit
};
......@@ -253,7 +252,7 @@ module OneM2M_Templates {
tokenIDs := omit,
localTokenIDs := omit,
tokenRequestIndicator := omit,
releaseVersionIndicator := "2a",
releaseVersionIndicator := PX_RELEASE_VERSION,
vendorInformation := omit
};
......@@ -473,7 +472,7 @@ module OneM2M_Templates {
tokenIDs := omit,
localTokenIDs := omit,
tokenRequestIndicator := omit,
releaseVersionIndicator := "2a",
releaseVersionIndicator := PX_RELEASE_VERSION,
vendorInformation := omit
};
......@@ -722,7 +721,7 @@ module OneM2M_Templates {
tokenIDs := omit,
localTokenIDs := omit,
tokenRequestIndicator := omit,
releaseVersionIndicator := "2a",
releaseVersionIndicator := PX_RELEASE_VERSION,
vendorInformation := omit
};
......@@ -1418,7 +1417,7 @@ module OneM2M_Templates {
tokenIDs := omit,
localTokenIDs := omit,
tokenRequestIndicator := omit,
releaseVersionIndicator := "2a",
releaseVersionIndicator := PX_RELEASE_VERSION,
vendorInformation := omit
};
......@@ -1489,7 +1488,7 @@ module OneM2M_Templates {
tokenIDs := omit,
localTokenIDs := omit,
tokenRequestIndicator := omit,
releaseVersionIndicator := "2a",
releaseVersionIndicator := PX_RELEASE_VERSION,
vendorInformation := omit
};
......@@ -1536,7 +1535,7 @@ module OneM2M_Templates {
tokenIDs := omit,
localTokenIDs := omit,
tokenRequestIndicator := omit,
releaseVersionIndicator := "2a",
releaseVersionIndicator := PX_RELEASE_VERSION,
vendorInformation := omit
};
......@@ -1758,7 +1757,7 @@ module OneM2M_Templates {
requestReachability := false,//M
contentSerialization := omit,//O
e2eSecInfo := omit, //O
supportedReleaseVersions := {"2a"}, //M
supportedReleaseVersions := {"1", "2", "2a"}, //M
choice := omit//NP
};
......@@ -1912,7 +1911,7 @@ module OneM2M_Templates {
nodeLink := omit,
dynamicAuthorizationConsultationIDs := omit,
e2eSecInfo := omit,
supportedReleaseVersions := {"2a"},
supportedReleaseVersions := {"1", "2", "2a"},
choice := omit
};
......@@ -2705,7 +2704,7 @@ module OneM2M_Templates {
nodeLink := omit,//O
triggerReferenceNumber := omit,//O
e2eSecInfo := omit,//O
supportedReleaseVersions := {"2a"}, //M
supportedReleaseVersions := {"1", "2", "2a"}, //M
choice := omit//O
};
......@@ -2736,7 +2735,7 @@ module OneM2M_Templates {
nodeLink := omit,//O
triggerReferenceNumber := omit,//O
e2eSecInfo := omit,//O
supportedReleaseVersions := {"2a"}, //M
supportedReleaseVersions := {"1", "2", "2a"}, //M
choice := omit//O
};
......@@ -2766,7 +2765,7 @@ module OneM2M_Templates {
nodeLink := *,//O
triggerReferenceNumber := *,//O
e2eSecInfo := *,//O
supportedReleaseVersions := {"2a"}, //M
supportedReleaseVersions := ?, //M
choice := *//O
};
......@@ -3313,6 +3312,20 @@ module OneM2M_Templates {
choice := omit//NP
};
/**
* @desc Base reception primitiveContent for UPDATE operation for AE resource
*/
template AE_optional mw_contentUpdateAe modifies mw_contentAe_any := {
resourceName := omit,//NP
resourceType := omit,//NP
resourceID := omit,//NP
parentID := omit,//NP
creationTime := omit,//NP
lastModifiedTime := omit,//NP
app_ID := omit,//NP
aE_ID := omit//NP
};
/**
* @desc Base primitiveContent for UPDATE operation for AccessControlPolicy resource
*/
......@@ -3799,38 +3812,6 @@ module OneM2M_Templates {
} //end group ContentDelete
group RequestContent {
group CreateRequest {
}
group UpdateRequest {
template AE_optional mw_contentAeUpdateRequest modifies mw_contentAe_any := {
resourceName := omit,//NP
resourceType := omit,//NP
resourceID := omit,//NP
parentID := omit,//NP
creationTime := omit,//NP
lastModifiedTime := omit,//NP
app_ID := omit,//NP
aE_ID := omit//NP
};
template Container_optional mw_contentContainerUpdateRequest modifies mw_contentContainer_any := {
resourceName := omit,//NP
resourceType := omit,//NP
resourceID := omit,//NP
parentID := omit,//NP
creationTime := omit,//NP
lastModifiedTime := omit//NP
};
}//End of group UpdateRequest
}//end of group RequestContent
group ResponseContent {
template AE_optional mw_contentAeBase := {
......@@ -5087,58 +5068,6 @@ module OneM2M_Templates {
group SpecialContents {
template (value) AE_optional m_contentCreateAe_Invalid := {
resourceName := omit,//O
resourceType := omit,//NP
resourceID := omit,//NP
parentID := omit,//NP
creationTime := omit,//NP
lastModifiedTime := omit,//NP
labels := omit,//O
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
announceTo := omit,//O
announcedAttribute := omit,//O
appName := omit,//O
app_ID := omit,//M
aE_ID := omit,//NP
pointOfAccess := omit, //O
ontologyRef := omit,//O
nodeLink := omit,//NP
requestReachability := omit,//M
contentSerialization := omit,//O
e2eSecInfo:= omit, //O
supportedReleaseVersions := {"2a"},//M
choice := omit//O
};
template AE_optional mw_contentCreateAe_invalid := {
resourceName := *,//O
resourceType := *,//NP
resourceID := *,//NP
parentID := *,//NP
creationTime := *,//NP
lastModifiedTime := *,//NP
labels := *,//O
accessControlPolicyIDs := *,//O
expirationTime := *,//O
dynamicAuthorizationConsultationIDs := *, //O
announceTo := *,//O
announcedAttribute := *,//O
appName := *,//O
app_ID := omit,//M
aE_ID := *,//NP
pointOfAccess := *, //O
ontologyRef := *,//O
nodeLink := *,//NP
requestReachability := omit,//M
contentSerialization := *,//O
e2eSecInfo:= *, //O
supportedReleaseVersions := {"2a"},//M
choice := *//O
};
/**
* @desc Base primitiveContent for CREATE operation for GenericInterworkingService resource
* @param p_accessControlPolicyIds ACP IDs for the PollingChannel
......@@ -5381,7 +5310,7 @@ module OneM2M_Templates {
contentOffset := omit,
assignedTokenIdentifiers := omit,
tokenRequestInformation := omit,
releaseVersionIndicator := "2a",
releaseVersionIndicator := PX_RELEASE_VERSION,
vendorInformation := omit
};
......@@ -5515,7 +5444,7 @@ module OneM2M_Templates {
contentOffset := omit,
assignedTokenIdentifiers := omit,
tokenRequestInformation := omit,
releaseVersionIndicator := "2a",
releaseVersionIndicator := PX_RELEASE_VERSION,
vendorInformation := omit
};
......@@ -5572,7 +5501,7 @@ module OneM2M_Templates {
tokenIDs := omit,
localTokenIDs := omit,
tokenRequestIndicator := omit,
releaseVersionIndicator := "2a",//FIXME
releaseVersionIndicator := PX_RELEASE_VERSION,
vendorInformation := omit
},
forcedFields := omit
......@@ -5651,7 +5580,7 @@ module OneM2M_Templates {
tokenIDs := omit,
localTokenIDs := omit,
tokenRequestIndicator := omit,
releaseVersionIndicator := "2a",//FIXME
releaseVersionIndicator := PX_RELEASE_VERSION,
vendorInformation := omit
},
forcedFields := omit
......@@ -5690,7 +5619,7 @@ module OneM2M_Templates {
tokenIDs := omit,
localTokenIDs := omit,
tokenRequestIndicator := omit,
releaseVersionIndicator := "2a",//FIXME
releaseVersionIndicator := PX_RELEASE_VERSION,
vendorInformation := omit
},
forcedFields := omit
......@@ -5737,7 +5666,7 @@ module OneM2M_Templates {
tokenIDs := omit,
localTokenIDs := omit,
tokenRequestIndicator := omit,
releaseVersionIndicator := "2a",//FIXME
releaseVersionIndicator := PX_RELEASE_VERSION,
vendorInformation := omit
},
forcedFields := omit
......
......@@ -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 {
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 {
variant "name as uncapitalized";
};
......
......@@ -2349,7 +2349,7 @@ module OneM2M_PermutationFunctions {
// Preamble
v_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSE_poa(-, -, -, -, {f_getCompletePoA()}));
v_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSE_poa(-, -, -, -, {f_getLocalPoA()}));
vc_ae1.start(f_cse_preamble_registerAe());
f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
......@@ -2439,7 +2439,7 @@ module OneM2M_PermutationFunctions {
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();
......@@ -2608,7 +2608,7 @@ module OneM2M_PermutationFunctions {
var integer v_parentIndex := -1;
var integer v_resourceIndex := -1;
var integer v_ae1Index := -1;
var PoaList v_poaList := { f_getCompletePoA(PX_TS_AE1.mcaPortIn) };
var PoaList v_poaList := { f_getLocalPoA(PX_TS_AE1.mcaPortIn) };
// Test control
......@@ -5966,7 +5966,7 @@ module OneM2M_PermutationFunctions {
// Preamble
if(p_resourceType != int2) {
v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA(PX_TS_AE1.mcaPortIn, "")});//c_CRUDNDi);
v_aeIndex := f_cse_preamble_registerAe(-, {f_getLocalPoA(PX_TS_AE1.mcaPortIn, "")});//c_CRUDNDi);
}
if(p_resourceType != int1) {
......@@ -5999,7 +5999,7 @@ module OneM2M_PermutationFunctions {
}
if(p_resourceType == int9) {
vc_ae2.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_TS_AE2.appId, {vc_resourcesList[vc_acpIndex].resource.accessControlPolicy.resourceID}, 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, {vc_resourcesList[vc_acpIndex].resource.accessControlPolicy.resourceID}, PX_TS_AE2.aeIdStem, c_defaultAe2ResourceName, {f_getLocalPoA(PX_TS_AE2.mcaPortIn, "")}), -1)); // AE2 is registred
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
v_ae2Index := f_getResourceFromAeSimu(vc_ae2);
......@@ -8196,7 +8196,7 @@ module OneM2M_PermutationFunctions {
v_createRequest.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {v_accessControlRule};
vc_acpIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, {f_getCompletePoA(PX_TS_AE1.mcaPortIn)});
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, {f_getLocalPoA(PX_TS_AE1.mcaPortIn)});
// Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
......@@ -8257,7 +8257,7 @@ module OneM2M_PermutationFunctions {
v_createRequest.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {v_accessControlRule};
vc_acpIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, {f_getCompletePoA(PX_TS_AE1.mcaPortIn)});
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, {f_getLocalPoA(PX_TS_AE1.mcaPortIn)});
// Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
......@@ -8995,7 +8995,7 @@ module OneM2M_PermutationFunctions {
v_contentResponse.uRI := ?;
v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA(PX_TS_AE1.mcaPortIn, "")});//c_CRUDNDi);
v_aeIndex := f_cse_preamble_registerAe(-, {f_getLocalPoA(PX_TS_AE1.mcaPortIn, "")});//c_CRUDNDi);
if(ispresent(p_parentRequestPrimitive)) {
v_resourceIndex := f_cse_createResource(valueof(p_parentRequestPrimitive.resourceType), p_parentRequestPrimitive, v_aeIndex);
p_requestPrimitive.to_ := f_getResourceAddress(v_resourceIndex);
......@@ -9068,7 +9068,7 @@ module OneM2M_PermutationFunctions {
v_contentResponse.uRI := ?;
v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA(PX_TS_AE1.mcaPortIn, "")});//c_CRUDNDi);
v_aeIndex := f_cse_preamble_registerAe(-, {f_getLocalPoA(PX_TS_AE1.mcaPortIn, "")});//c_CRUDNDi);
if(ispresent(p_parentRequestPrimitive)) {
v_resourceIndex := f_cse_createResource(valueof(p_parentRequestPrimitive.resourceType), p_parentRequestPrimitive, v_aeIndex);
......@@ -9144,11 +9144,11 @@ module OneM2M_PermutationFunctions {
v_contentResponse.uRI := ?;
v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA(PX_TS_AE1.mcaPortIn, "")});//c_CRUDNDi);
v_aeIndex := f_cse_preamble_registerAe(-, {f_getLocalPoA(PX_TS_AE1.mcaPortIn, "")});//c_CRUDNDi);
f_checkAeSimuStatus();
vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_TS_AE2.appId, -, PX_TS_AE2.aeIdStem, c_defaultAe2ResourceName, {f_getCompletePoA(PX_TS_AE2.mcaPortIn, "")}))); // AE2 is registred
vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_TS_AE2.appId, -, PX_TS_AE2.aeIdStem, c_defaultAe2ResourceName, {f_getLocalPoA(PX_TS_AE2.mcaPortIn, "")}))); // AE2 is registred
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
......
......@@ -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", *