Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • TST/ATS
1 result
Show changes
Commits on Source (18)
Hide whitespace changes
Inline Side-by-side
Showing
with 324 additions and 90 deletions
LibOneM2M/OneM2M_Functions.ttcn
View file @ 11ec4e97
......@@ -941,20 +941,27 @@ module OneM2M_Functions {
* @desc Connection of InfoPort of two components
* @param p_tester PTC where InfoPort is to be connected
*/
function f_connectInfoPort(in Tester p_tester) runs on Tester {
function f_connectInfoPort(in Tester p_tester) runs on Tester return boolean {
var boolean connectionState := false;
// Connect
if (infoPort.checkstate("Connected")) {
connectionState := true;
}
connect(self:infoPort, p_tester:infoPort);
log(__SCOPE__&": INFO: infoPort connected");
log(__SCOPE__&": INFO: infoPort connected");
return connectionState;
}
/**
* @desc Disconnection of InfoPort of two components
* @param p_tester PTC where InfoPort is to be connected
*/
function f_disconnectInfoPort(in Tester p_tester) runs on Tester {
function f_disconnectInfoPort(in Tester p_tester, in boolean connectionState := false) runs on Tester {
// Disconnect
disconnect(self:infoPort, p_tester:infoPort);
log(__SCOPE__&": INFO: infoPort disconnected");
if (not connectionState) {
disconnect(self:infoPort, p_tester:infoPort);
log(__SCOPE__&": INFO: infoPort disconnected");
}
}
group getFunctions {
......@@ -987,8 +994,9 @@ module OneM2M_Functions {
*/
function f_getRequestPrimitive(in Tester p_component) runs on Tester return RequestPrimitive {
var RequestPrimitive v_request;
f_connectInfoPort(p_component);
var boolean previousConnectionState := false;
previousConnectionState := f_connectInfoPort(p_component);
p_component.start(f_sendRequestPrimitive());
alt {
......@@ -998,7 +1006,7 @@ module OneM2M_Functions {
p_component.done;
f_disconnectInfoPort(p_component);
f_disconnectInfoPort(p_component, previousConnectionState);
return v_request;
......
LibOneM2M/OneM2M_Templates.ttcn
View file @ 11ec4e97
......@@ -2020,6 +2020,15 @@ module OneM2M_Templates {
resourceType := int10018,
primitiveContent := {scheduleAnnc := m_contentCreateScheduleAnnc (omit, {{"* * * * * * *"}})}
};
/**
* @desc Base CREATE request primitive for Schedule resource
*/
template (value) RequestPrimitive m_createScheduleBase_subscription modifies m_create := {
requestIdentifier := testcasename() & "-m_createSchedule",
resourceType := int18,
primitiveContent := {schedule := m_contentCreateSchedule ({{"* * * * * * *"}}, "notificationSchedule")}
};
template (value) RequestPrimitive m_createSchedule(XSD.ID p_parentResourceAddress, in template (omit) ResourceName p_name, in template (value) ScheduleEntries p_scheduleElement ) modifies m_create := {
to_ := p_parentResourceAddress,
......@@ -2078,7 +2087,7 @@ module OneM2M_Templates {
primitiveContent := {subscription := m_contentCreateSubscription ({"NotInitialized"})}
};
template (value) RequestPrimitive m_createSubscription(template (omit) XSD.ID p_to := omit, in template (omit) ResourceName p_name, in template (value) ListOfURIs p_notificationURI := {"NotInitialized"}) modifies m_create := {
template (value) RequestPrimitive m_createSubscription(template (omit) XSD.ID p_to := omit, in template (omit) ResourceName p_name := c_defaultSubscriptionResourceName, in template (value) ListOfURIs p_notificationURI := {"NotInitialized"}) modifies m_create := {
to_ := p_to,
requestIdentifier := testcasename() & "-m_createSubscription",
resourceType := int23,
......@@ -3221,6 +3230,7 @@ module OneM2M_Templates {
expirationTime := "20301231T012345",//MA
link := p_link,//M
dynamicAuthorizationConsultationIDs := omit, //OA
announceSyncType := omit, //OA
location := omit,//OA
appName := omit,//OA
app_ID := p_appId,//OA
......@@ -3260,6 +3270,7 @@ module OneM2M_Templates {
expirationTime := ?,//MA M
link := p_link,//M
dynamicAuthorizationConsultationIDs := *, //OA O
announceSyncType := *, //OA
location := *,//OA O
appName := *,//OA O
app_ID := *,//OA M
......@@ -3299,6 +3310,7 @@ module OneM2M_Templates {
expirationTime := ?,//MA M
link := p_link,//M
dynamicAuthorizationConsultationIDs := omit, //OA O
announceSyncType := *,//OA
location := *,//OA O
cseType := *,//OA O
pointOfAccess := *,//OA O
......@@ -3355,7 +3367,7 @@ module OneM2M_Templates {
triggerEnable := omit, //O
activityPatternElements := omit, //O
enableTimeCompensation := omit,//O
Trigger_Recipient_ID := omit,//O
trigger_Recipient_ID := omit,//O
triggerReferenceNumber := omit,//O
externalGroupID := omit,//O
choice := omit//NP
......@@ -3398,7 +3410,7 @@ module OneM2M_Templates {
triggerEnable := *, //O
activityPatternElements := *, //O
enableTimeCompensation := *,//O
Trigger_Recipient_ID := *,//O
trigger_Recipient_ID := *,//O
triggerReferenceNumber := *,//O
externalGroupID := *,//O
choice := *//NP
......@@ -3450,6 +3462,7 @@ module OneM2M_Templates {
labels := omit,//O
expirationTime := omit,//O
link := omit,//M TODO Put the right value
announceSyncType := omit, //O
privileges := {
accessControlRule_list := {valueof(m_createAcr(p_acor, p_allowedOperations))}
},//M
......@@ -3476,6 +3489,7 @@ module OneM2M_Templates {
labels := p_labels,//MA O
expirationTime := ?,//MA M
link := ?,//M
announceSyncType := *, //O
privileges := ?,//MA M
selfPrivileges := ?,//MA M
authorizationDecisionResourceIDs := *,//MA O
......@@ -3585,6 +3599,7 @@ module OneM2M_Templates {
expirationTime := "29991231T235959",//MA M
link := p_link,//M
dynamicAuthorizationConsultationIDs := omit,//OA O
announceSyncType := omit,//OA O
e2eSecInfo := omit,//OA O
supportedReleaseVersions := {"1", "2", "2a", "3"}, //MA M Mandatory for RemoteCSE from Release 2
choice := omit//NA
......@@ -3606,6 +3621,7 @@ module OneM2M_Templates {
expirationTime := ?,//MA M
link := p_link,//M
dynamicAuthorizationConsultationIDs := *,//OA O
announceSyncType := *, //OA
e2eSecInfo := ?,//OA O
supportedReleaseVersions := ?, //MA M Mandatory for RemoteCSE from Release 2
choice := omit//NA
......@@ -3788,6 +3804,7 @@ module OneM2M_Templates {
expirationTime := omit,//O
link := omit,//M TODO Put the right value
dynamicAuthorizationConsultationIDs := omit, //O
announceSyncType := omit, //O
memberType := p_memberType,//O
specializationType := omit,//O
currentNrOfMembers := omit,//NP
......@@ -3819,6 +3836,7 @@ module OneM2M_Templates {
expirationTime := ?,//MA M
link := ?,//M
dynamicAuthorizationConsultationIDs := *, //OA O
announceSyncType := *, //OA O
memberType := *, //OA M
specializationType := *,//O O
currentNrOfMembers := *,//OA M
......@@ -3906,6 +3924,7 @@ module OneM2M_Templates {
expirationTime := ?,//MA M
link := ?,
dynamicAuthorizationConsultationIDs := *, //OA
announceSyncType := *, //OA
mgmtDefinition := ?, //MA
objectIDs := *, //OA
objectPaths := *, //OA
......@@ -3994,6 +4013,7 @@ module OneM2M_Templates {
expirationTime := ?,//M
link := ?,//M
dynamicAuthorizationConsultationIDs := *, //O
announceSyncType := *,//O
nodeID := ?,//M
hostedCSELink := *,//O
hostedAELinks := *,//O
......@@ -4600,6 +4620,7 @@ module OneM2M_Templates {
expirationTime := "29991231T235959",//MA M
link := "NotInitialized",//M
dynamicAuthorizationConsultationIDs := omit,//NA O
announceSyncType := omit, //OA O
scheduleElement := p_scheduleEntries,//OA M
networkCoordinated := omit,//OA O
choice := omit//NP
......@@ -4620,6 +4641,7 @@ module OneM2M_Templates {
expirationTime := ?,//MA M
link := ?,//M
dynamicAuthorizationConsultationIDs := omit,//NA O
announceSyncType := *,//OA O
scheduleElement := * ,//OA M
networkCoordinated := *,//OA O
choice := omit//NP
......@@ -5126,6 +5148,7 @@ module OneM2M_Templates {
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
location := omit,//O
stateTag := omit,//NP
creator := omit,//O
contentInfo := "application/text:1",//O
......@@ -5153,6 +5176,7 @@ module OneM2M_Templates {
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := omit,//O
location := *,//O
stateTag := omit,//NP
creator := *,//O
contentInfo := *,//O
......@@ -5177,6 +5201,8 @@ module OneM2M_Templates {
labels := omit,//MA O
expirationTime := "29991231T235959",//NA M
link := "NotInitialized", //M
announceSyncType := omit, //OA O
location := omit,//O
stateTag := omit,//OA M
contentInfo := omit,//OA O
contentSize := omit,//OA M
......@@ -5198,6 +5224,8 @@ module OneM2M_Templates {
labels := *,//MA O
expirationTime := ?,//NA M
link := ?, //M
announceSyncType := *,//OA O
location := *,//O
stateTag := *,//OA M
contentInfo := *,//OA O
contentSize := *,//OA M
......@@ -5297,6 +5325,7 @@ module OneM2M_Templates {
expirationTime := omit,//O
link := "NotInitialized",//M
dynamicAuthorizationConsultationIDs := omit, //O
announceSyncType := omit,//O
stateTag := omit,//NP
location := omit, //O
maxNrOfInstances := omit,//O
......@@ -5515,6 +5544,7 @@ module OneM2M_Templates {
expirationTime := "29991231T235959",//MA M
link := "NotInitialized",//M
dynamicAuthorizationConsultationIDs := omit,//OA O
announceSyncType := omit,//OA O
location := omit,//O
cseType := omit,//OA O
pointOfAccess := omit,//OA O
......@@ -5548,6 +5578,7 @@ module OneM2M_Templates {
expirationTime := ?,//MA M
link := ?, //M
dynamicAuthorizationConsultationIDs := *,//OA O
announceSyncType := *,//OA O
stateTag := *,//OA M
location := *,//O
maxNrOfInstances := *,//OA O
......@@ -5639,6 +5670,7 @@ module OneM2M_Templates {
expirationTime := ?,//MA M
link := ?,
dynamicAuthorizationConsultationIDs := *, //OA
announceSyncType := *,//OA O
locationSource := *, //OA
locationInformationType := *,//OA
locationUpdatePeriod := *, //OA
......@@ -5686,7 +5718,7 @@ module OneM2M_Templates {
notificationEvent := omit,
verificationRequest := omit,
subscriptionDeletion := omit,
subscriptionReference := omit,
subscriptionReference := "NotInitialized",
creator := omit,
notificationForwardingURI := omit,
notificationTarget := omit,
......@@ -5883,7 +5915,7 @@ module OneM2M_Templates {
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
m2M_Sub_ID := PX_M2M_SUB_ID, //M
m2M_SS_ID := PX_M2M_SS_ID, //O
m2M_SS_ID := PX_M2M_SS_ID, //M
status := omit, //NP default INACTIVE
activate_ := omit, //NP default false
activationTime := omit, //NP
......@@ -5925,7 +5957,7 @@ module OneM2M_Templates {
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
m2M_Sub_ID := PX_M2M_SUB_ID, //M
m2M_SS_ID := PX_M2M_SS_ID, //O
m2M_SS_ID := PX_M2M_SS_ID, //M
status := omit, //NP default INACTIVE
activate_ := omit, //NP default false
activationTime := omit, //NP
......@@ -5967,7 +5999,7 @@ module OneM2M_Templates {
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
m2M_Sub_ID := PX_M2M_SUB_ID, //M
m2M_SS_ID := PX_M2M_SS_ID, //O
m2M_SS_ID := PX_M2M_SS_ID, //M
status := omit, //NP
activate_ := omit, //NP
activationTime := omit, //NP
......@@ -6009,7 +6041,7 @@ module OneM2M_Templates {
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
m2M_Sub_ID := PX_M2M_SUB_ID, //M
m2M_SS_ID := PX_M2M_SS_ID, //O
m2M_SS_ID := PX_M2M_SS_ID, //M
status := omit, //NP
activate_ := omit, //NP default false
activationTime := omit, //NP
......@@ -6051,7 +6083,7 @@ module OneM2M_Templates {
dynamicAuthorizationConsultationIDs := omit, //O
custodian := omit,//O
m2M_Sub_ID := PX_M2M_SUB_ID, //M
m2M_SS_ID := PX_M2M_SS_ID, //O
m2M_SS_ID := PX_M2M_SS_ID, //M
status := omit, //NP
activate_ := omit, //NP default false
activationTime := omit, //NP
......@@ -6309,6 +6341,7 @@ module OneM2M_Templates {
expirationTime := omit,//O
link := "NotInitialized",//M
dynamicAuthorizationConsultationIDs := omit, //O
announceSyncType := omit,//OA O
location := omit,//O
maxNrOfInstances := omit,//O
maxByteSize := omit,//O
......@@ -6342,6 +6375,7 @@ module OneM2M_Templates {
expirationTime := ?,//MA M
link := ?, //M NA
dynamicAuthorizationConsultationIDs := *, //OA
announceSyncType := *,//OA O
location := *,//O
maxNrOfInstances := *,//O OA
maxByteSize := *,//O OA
......@@ -6373,6 +6407,8 @@ module OneM2M_Templates {
labels := *,//MA
expirationTime := ?,//MA M To be double checked SDS-2019-0668R01
link := ?, //M NA
announceSyncType := *,//OA O
location := *,//O
dataGenerationTime := *,//M OA
content := *,//M OA
sequenceNr := *,//O OA
......@@ -6451,6 +6487,7 @@ module OneM2M_Templates {
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
location := omit,//O
dataGenerationTime := {alt_ := "00000101T000000"},//M
content := "AnyValue",//M
sequenceNr := omit,//O
......@@ -6474,6 +6511,7 @@ module OneM2M_Templates {
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
location := *,//O
dataGenerationTime := ?,//M
content := ?,//M
sequenceNr := *,//O
......@@ -6495,6 +6533,8 @@ module OneM2M_Templates {
labels := omit,//MA O
expirationTime := omit,//NA M
link := "NotInitialized", //M
announceSyncType := omit,//OA O
location := omit,//O
dataGenerationTime := omit,//OA M
content := omit,//OA M
sequenceNr := omit,//OA O
......@@ -7387,7 +7427,7 @@ module OneM2M_Templates {
triggerEnable := omit, //O
activityPatternElements := omit, //O
enableTimeCompensation := omit,//O
Trigger_Recipient_ID := omit,//O
trigger_Recipient_ID := omit,//O
triggerReferenceNumber := omit,//O
externalGroupID := omit,//O
choice := omit //NP
......@@ -7730,6 +7770,7 @@ module OneM2M_Templates {
announceTo := omit,
announcedAttribute := omit,
announceSyncType := omit,//O
location := omit,//O
stateTag := omit,
creator := omit,
contentInfo := omit,
......@@ -7892,6 +7933,7 @@ module OneM2M_Templates {
expirationTime := omit,
link := omit,
dynamicAuthorizationConsultationIDs := omit,
announceSyncType := omit,//O
location := omit,//O
appName := omit,
app_ID := omit,
......@@ -7924,6 +7966,7 @@ module OneM2M_Templates {
expirationTime := omit,
link := omit,
dynamicAuthorizationConsultationIDs := omit,
announceSyncType := omit,//O
stateTag := omit,
location := omit,//O
maxNrOfInstances := omit,
......@@ -7949,7 +7992,8 @@ module OneM2M_Templates {
expirationTime := omit,
link := omit,
dynamicAuthorizationConsultationIDs := omit,
memberType := omit,
announceSyncType := omit,//O
memberType := omit,
specializationType := omit,
currentNrOfMembers := omit,
maxNrOfMembers := omit,
......@@ -8047,6 +8091,7 @@ module OneM2M_Templates {
announceTo := omit,
announcedAttribute := omit,
announceSyncType := omit,//O
location := omit,//O
dataGenerationTime := omit,
content := omit,
sequenceNr := omit,
......@@ -8055,7 +8100,7 @@ module OneM2M_Templates {
};
/**
* @desc Base primitiveContent for UPDATE operation for TimeSeriesInstance resource
* @desc Base primitiveContent for UPDATE operation for Role resource
*/
template (value) Role_optional m_contentUpdateRole := {
resourceName := omit,
......@@ -8689,7 +8734,7 @@ module OneM2M_Templates {
triggerEnable := *, //O
activityPatternElements := *, //O
enableTimeCompensation := *,//O
Trigger_Recipient_ID := *,//O
trigger_Recipient_ID := *,//O
triggerReferenceNumber := *,//O
externalGroupID := *,//O
choice := *//O
......@@ -8728,7 +8773,7 @@ module OneM2M_Templates {
triggerEnable := omit,//O
activityPatternElements := omit,//O
enableTimeCompensation := omit,//O
Trigger_Recipient_ID := omit,//O
trigger_Recipient_ID := omit,//O
triggerReferenceNumber := omit,//O
externalGroupID := omit,//O
choice := omit//O
......@@ -8767,7 +8812,7 @@ module OneM2M_Templates {
triggerEnable := *, //O
activityPatternElements := *, //O
enableTimeCompensation := *,//O
Trigger_Recipient_ID := *,//O
trigger_Recipient_ID := *,//O
triggerReferenceNumber := *,//O
externalGroupID := *,//O
choice := *//O
......@@ -8785,6 +8830,7 @@ module OneM2M_Templates {
expirationTime := ?,//M MA
link := ?,//M,
dynamicAuthorizationConsultationIDs := *, //O OA
announceSyncType := *,//O
location := omit,//O
appName := *,//O OA
app_ID := *,//M OA
......@@ -8818,6 +8864,7 @@ module OneM2M_Templates {
expirationTime := *,//M
link := *,//M,
dynamicAuthorizationConsultationIDs := *, //O
announceSyncType := *,//O
location := *,//O
appName := *,//O
app_ID := *,//M
......@@ -8968,6 +9015,7 @@ module OneM2M_Templates {
labels := *,//O
expirationTime := ?,//M
link := ?,//M
announceSyncType := *,//O
privileges := ?,//M
selfPrivileges := ?,//M
authorizationDecisionResourceIDs := *,//O
......@@ -9113,6 +9161,7 @@ module OneM2M_Templates {
expirationTime := ?,//M
link := ?,//M
dynamicAuthorizationConsultationIDs := *, //O
announceSyncType := *,//O
memberType := *,//O
specializationType := *,//O
currentNrOfMembers := *,//O
......@@ -9657,6 +9706,7 @@ module OneM2M_Templates {
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
location := *,//O
stateTag := ?,//M
creator := *,//O
contentInfo := *,//O
......@@ -9685,6 +9735,7 @@ module OneM2M_Templates {
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
location := omit,//O
stateTag := omit,//M
creator := omit,//O
contentInfo := omit,//O
......@@ -9706,6 +9757,8 @@ module OneM2M_Templates {
labels := *,//O
expirationTime := ?,//M
link := ?,//M
announceSyncType := *,//O
location := *,//O
stateTag := *,//O
contentInfo := *,//O
contentSize := *,//O
......@@ -9871,6 +9924,7 @@ module OneM2M_Templates {
expirationTime := ?,//M
link := ?,//M
dynamicAuthorizationConsultationIDs := *, //O
announceSyncType := *,//O
stateTag := *,//O
location := *,//O
maxNrOfInstances := *,//O
......@@ -9888,7 +9942,7 @@ module OneM2M_Templates {
notificationEvent:= omit,
verificationRequest := omit,
subscriptionDeletion := omit,
subscriptionReference := omit,
subscriptionReference := "NotInitialized",
creator := omit,
notificationForwardingURI := omit,
notificationTarget := omit,
......@@ -9911,7 +9965,7 @@ module OneM2M_Templates {
notificationEvent := *,
verificationRequest := *,
subscriptionDeletion := *,
subscriptionReference := *,
subscriptionReference := ?,
creator := *,
notificationForwardingURI := *,
notificationTarget := *,
......@@ -10129,6 +10183,7 @@ module OneM2M_Templates {
expirationTime := ?,//M
link := ?,//M
dynamicAuthorizationConsultationIDs := *,//O
announceSyncType := *,//O
location := *,//O
maxNrOfInstances := *,//O
maxByteSize := *,//O
......@@ -10158,6 +10213,7 @@ module OneM2M_Templates {
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
location := *,//O
dataGenerationTime := ?,//M
content := ?,//M
sequenceNr := *,//O
......@@ -10175,6 +10231,8 @@ module OneM2M_Templates {
labels := *,//O
expirationTime := ?,//M
link := ?,//M
announceSyncType := *,//O
location := *,//O
dataGenerationTime := *,//O
content := *,//O
sequenceNr := *,//O
......@@ -10671,7 +10729,7 @@ module OneM2M_Templates {
dynamicAuthorizationConsultationIDs := *, //O
custodian := *,//O
m2M_Sub_ID := ?, //M
m2M_SS_ID := *, //O
m2M_SS_ID := ?, //M
status := ?, //M
activate_ := ?, //M
activationTime := *, //O
......
LibOneM2M/OneM2M_TypesAndValues.ttcn
View file @ 11ec4e97
......@@ -319,7 +319,7 @@ group OptionalResourceTypes {
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
DependencyAnnc dependencyAnnc,
Dependency dependency,
Subscription subscription,
Transaction transaction
} choice_list
......@@ -348,6 +348,7 @@ group OptionalResourceTypes {
Labels labels optional,
Timestamp expirationTime optional,
XSD.AnyURI link optional,
AnnounceSyncType announceSyncType optional,
SetOfAcrs privileges optional,
SetOfAcrs selfPrivileges optional,
ListOfURIs authorizationDecisionResourceIDs optional,
......@@ -406,7 +407,7 @@ group OptionalResourceTypes {
XSD.Boolean triggerEnable optional,
ActivityPatternElements activityPatternElements optional,
XSD.Boolean enableTimeCompensation optional,
TriggerRecipientID Trigger_Recipient_ID optional,
TriggerRecipientID trigger_Recipient_ID optional,
XSD.UnsignedInt triggerReferenceNumber optional,
ExternalID externalGroupID optional,
union {
......@@ -449,12 +450,14 @@ group OptionalResourceTypes {
//variant (triggerEnable) "text 'false' as '0'";
//variant (enableTimeCompensation) "text 'true' as '1'";
//variant (enableTimeCompensation) "text 'false' as '0'";
variant (trigger_Recipient_ID) "name as 'Trigger-Recipient-ID'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
variant (choice.choice_list[-].group_) "name as 'group'";
variant (choice.choice_list[-].action_) "name as 'action'";
};
type record AEAnnc_optional
......@@ -470,6 +473,7 @@ group OptionalResourceTypes {
Timestamp expirationTime optional,
XSD.AnyURI link optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
GeoCoordinates location optional,
XSD.String appName optional,
XSD.String app_ID optional,
......@@ -622,6 +626,7 @@ group OptionalResourceTypes {
Timestamp expirationTime optional,
XSD.AnyURI link optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
MgmtDefinition mgmtDefinition optional,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
......@@ -650,8 +655,8 @@ group OptionalResourceTypes {
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
XSD.ID custodian optional,
GeoCoordinates location optional,
XSD.ID custodian optional,
XSD.AnyURI containerDefinition optional,
XSD.AnyURI ontologyRef optional,
XSD.NonNegativeInteger contentSize optional,
......@@ -766,6 +771,7 @@ group OptionalResourceTypes {
Timestamp expirationTime optional,
XSD.AnyURI link optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
GeoCoordinates location optional,
XSD.NonNegativeInteger maxNrOfInstances optional,
......@@ -823,6 +829,7 @@ group OptionalResourceTypes {
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
GeoCoordinates location optional,
ContentInfo contentInfo optional,
XSD.NonNegativeInteger contentSize optional,
ContentRef contentRef optional,
......@@ -860,7 +867,9 @@ group OptionalResourceTypes {
Labels labels optional,
Timestamp expirationTime optional,
XSD.AnyURI link optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
GeoCoordinates location optional,
ContentInfo contentInfo optional,
XSD.NonNegativeInteger contentSize optional,
XSD.AnyURI ontologyRef optional,
......@@ -977,6 +986,7 @@ group OptionalResourceTypes {
Timestamp expirationTime optional,
XSD.AnyURI link optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
E2eSecInfo e2eSecInfo optional,
SupportedReleaseVersions supportedReleaseVersions optional,
union {
......@@ -1207,6 +1217,7 @@ group OptionalResourceTypes {
Timestamp expirationTime optional,
XSD.AnyURI link optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
MemberType memberType optional,
SpecializationType specializationType optional,
XSD.NonNegativeInteger currentNrOfMembers optional,
......@@ -1313,6 +1324,7 @@ group OptionalResourceTypes {
Timestamp expirationTime optional,
XSD.AnyURI link optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
LocationSource locationSource optional,
LocationInformationType locationInformationType optional,
ListOfDuration locationUpdatePeriod optional,
......@@ -1482,6 +1494,7 @@ group OptionalResourceTypes {
Timestamp expirationTime optional,
XSD.AnyURI link optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
NodeID nodeID optional,
XSD.ID hostedCSELink optional,
ListOfM2MID hostedAELinks optional,
......@@ -1875,7 +1888,8 @@ group OptionalResourceTypes {
NwMonitoringReq nwMonitoringReq,
PrimitiveProfile primitiveProfile,
PrimitiveProfileAnnc primitiveProfileAnnc,
Action action_
Action action_,
ActionAnnc actionAnnc
} choice_list
} choice optional
}
......@@ -1916,6 +1930,7 @@ group OptionalResourceTypes {
Timestamp expirationTime optional,
XSD.AnyURI link optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
GeoCoordinates location optional,
CseTypeID cseType optional,
PoaList pointOfAccess optional,
......@@ -2076,6 +2091,7 @@ group OptionalResourceTypes {
Timestamp expirationTime optional,
XSD.AnyURI link optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
ScheduleEntries scheduleElement optional,
XSD.Boolean networkCoordinated optional,
union {
......@@ -2159,6 +2175,7 @@ group OptionalResourceTypes {
Timestamp expirationTime optional,
XSD.AnyURI link optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
SemanticFormat descriptorRepresentation optional,
Sparql semanticOpExec optional,
XSD.Base64Binary descriptor optional,
......@@ -2470,7 +2487,7 @@ type record TriggerRequest_optional
XSD.NonNegativeInteger maxNotificationRate optional,
XSD.NonNegativeInteger maxNumFlexContainers optional,
XSD.NonNegativeInteger maxNumInstancesPerFlexContainer optional,
SetOfAcrs defaultAccessControlPrivileges optional,
AcpType defaultAccessControlPrivileges optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
......@@ -2787,6 +2804,7 @@ type record TriggerRequest_optional
Timestamp expirationTime optional,
XSD.AnyURI link optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
GeoCoordinates location optional,
XSD.NonNegativeInteger maxNrOfInstances optional,
XSD.NonNegativeInteger maxByteSize optional,
......@@ -2838,6 +2856,7 @@ type record TriggerRequest_optional
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
GeoCoordinates location optional,
AbsRelTimestamp dataGenerationTime optional,
XSD.AnySimpleType content optional,
XSD.NonNegativeInteger sequenceNr optional,
......@@ -2874,6 +2893,8 @@ type record TriggerRequest_optional
Labels labels optional,
Timestamp expirationTime optional,
XSD.AnyURI link optional,
AnnounceSyncType announceSyncType optional,
GeoCoordinates location optional,
AbsRelTimestamp dataGenerationTime optional,
XSD.AnySimpleType content optional,
XSD.NonNegativeInteger sequenceNr optional,
......@@ -5599,7 +5620,7 @@ group Values {
group PatternValues {
const universal charstring c_point := "(\[[-+]#(0,1)(180(.0#(1,))#(0,1)|((1[0-7]\d)|([1-9]#(0,1)\d))(.\d#(1,))#(0,1))[,][\q{0,0,0,32}\t]#(0,)[-+]#(0,1)([1-8]#(0,1)\d(.\d#(1,))#(0,1)|90(.0#(1,))#(0,1))([,]\d#(1,))#(0,1)\])";
template universal charstring c_point := pattern "(\[[-+]#(0,1)(180(.0#(1,))#(0,1)|((1[0-7]\d)|([1-9]#(0,1)\d))(.\d#(1,))#(0,1))[,][\q{0,0,0,32}\t]#(0,)[-+]#(0,1)([1-8]#(0,1)\d(.\d#(1,))#(0,1)|90(.0#(1,))#(0,1))([,]\d#(1,))#(0,1)\])";
template universal charstring c_multipoint := pattern "^\[{c_point}([,][\q{0,0,0,32}\t]#(0,){c_point})#(0,)\]$";
template universal charstring c_lineStringOrMultipoint:= pattern "\[{c_point}([,][\q{0,0,0,32}\t]#(0,){c_point})#(1,)\]";
template universal charstring c_multiLineString := pattern "^\[{c_lineStringOrMultipoint}([,][\q{0,0,0,32}\t]#(0,){c_lineStringOrMultipoint})#(0,)\]$";
......
oneM2M_Types @ 3295ee7d
Compare 5ef46b0b...3295ee7d
Subproject commit 5ef46b0b7c963ae2cc4ab3db94ff36509349d4da
Subproject commit 3295ee7d836392a8ad585ce5faf2e4d2e93894d0
OneM2M_PermutationFunctions.ttcn
View file @ 11ec4e97
......@@ -3176,7 +3176,7 @@ module OneM2M_PermutationFunctions {
}
}
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
f_checkAeSimuStatus();
//Check to see if the resource is present or not
if (f_cse_isResourcePresent(v_resourceIndex)){
......@@ -3324,7 +3324,7 @@ module OneM2M_PermutationFunctions {
}
}
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
f_checkAeSimuStatus();
//Check to see if the resource is present or not
if(f_cse_isResourcePresent(v_resourceIndex)){
......@@ -3368,6 +3368,10 @@ module OneM2M_PermutationFunctions {
v_parentIndex := v_aeIndex;//For resources that can have AE resource as parent
}
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_parentIndex);
if(vc_ae2.running) {
vc_ae2.stop;
};
if(p_resourceType == int15) {
v_request := f_getCreateRequestPrimitive(int3, m_createContainerBase, v_aeIndex);
......@@ -3805,7 +3809,7 @@ module OneM2M_PermutationFunctions {
}
}
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
f_checkAeSimuStatus();
//Check to see if the resource is present or not
if(f_cse_isResourcePresent(v_resourceIndex)) {
......@@ -4569,7 +4573,7 @@ module OneM2M_PermutationFunctions {
}
}
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
f_checkAeSimuStatus();
// Postamble
f_cse_postamble_deleteResources();
......@@ -6073,6 +6077,10 @@ module OneM2M_PermutationFunctions {
v_parentIndex := v_aeIndex;//For resources that can have AE resource as parent
}
v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, v_parentIndex);
if (vc_ae2.running) {
vc_ae2.stop;
};
// Test Body
v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
......@@ -6598,6 +6606,8 @@ module OneM2M_PermutationFunctions {
setverdict(fail, __SCOPE__ & ": No answer while retrieving resource attributes");
}
}
f_checkAeSimuStatus();
vc_primitiveContentRetrievedResource := f_cse_retrieveResource(v_resourceIndex);
......@@ -6653,6 +6663,8 @@ module OneM2M_PermutationFunctions {
setverdict(fail, __SCOPE__ & ": No answer while updating resource " & int2str(enum2int(p_resourceTypeChild)));
}
}
f_checkAeSimuStatus();
vc_primitiveContentRetrievedResource := f_cse_retrieveResource(v_childIndex);
......@@ -6693,7 +6705,7 @@ module OneM2M_PermutationFunctions {
p_createRequestPrimitive := f_setAcpId(p_createRequestPrimitive,{f_getResourceAddress(v_acp1Index)});
p_updateRequestPrimitive := f_setAcpId(p_updateRequestPrimitive,{f_getResourceAddress(v_acp2Index)});
infoPort.send(f_getResourceAddress(lengthof(vc_resourcesList)-1, e_nonHierarchical)) to mtc;
//infoPort.send(f_getResourceAddress(lengthof(vc_resourcesList)-1, e_nonHierarchical)) to mtc;
}
v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, vc_aeIndex);
......@@ -7641,6 +7653,8 @@ module OneM2M_PermutationFunctions {
}
}
f_checkAeSimuStatus();
vc_primitiveContentRetrievedResource := f_cse_retrieveResource(v_resourceIndex);
// Postamble
......@@ -9640,8 +9654,8 @@ module OneM2M_PermutationFunctions {
var integer v_childResourceIndex_1 := -1;
var integer v_childResourceIndex_2 := -1;
var Labels v_labels := {"VALUE_1"};
var ListOfCoordinates v_location_1 := "[2.3514616,48.8566969]";
var ListOfCoordinates v_location_2 := "[-4.4216366,36.7213028]";
var GeoJsonCoordinates v_location_1 := "[2.3514616,48.8566969]";
var GeoJsonCoordinates v_location_2 := "[-4.4216366,36.7213028]";
var template RequestPrimitive v_createRequest := m_createContainerBase;
const ResourceType c_containerResourceType := int3;
......@@ -9719,8 +9733,8 @@ module OneM2M_PermutationFunctions {
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var integer v_childResourceIndex_1 := -1;
var ListOfCoordinates v_location_1 := "[2.3514616,48.8566969]";
var ListOfCoordinates v_location_2 := "[-4.4216366,36.7213028]";
var GeoJsonCoordinates v_location_1 := "[2.3514616,48.8566969]";
var GeoJsonCoordinates v_location_2 := "[-4.4216366,36.7213028]";
var template RequestPrimitive v_createRequest := m_createContainerBase;
const ResourceType c_containerResourceType := int3;
......@@ -9789,7 +9803,7 @@ module OneM2M_PermutationFunctions {
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var integer v_childResourceIndex := -1;
var ListOfCoordinates v_location_1 := "[2.3514616,48.8566969]";
var GeoJsonCoordinates v_location_1 := "[2.3514616,48.8566969]";
var template RequestPrimitive v_createRequest := m_createContainerBase;
const ResourceType c_containerResourceType := int3;
var AttributeAux v_invalidAttribute;
......@@ -9856,7 +9870,7 @@ module OneM2M_PermutationFunctions {
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var integer v_childResourceIndex_1 := -1;
var ListOfCoordinates v_location_1 := "[2.3514616,48.8566969]";
var GeoJsonCoordinates v_location_1 := "[2.3514616,48.8566969]";
const ResourceType c_containerResourceType := int3;
......@@ -10072,8 +10086,8 @@ module OneM2M_PermutationFunctions {
var integer v_childResourceIndex_1 := -1;
var integer v_childResourceIndex_2 := -1;
var Labels v_labels := {"VALUE_0"};
var ListOfCoordinates v_location_1 := "[2.3514616,48.8566969]";
var ListOfCoordinates v_location_2 := "[-4.4216366,36.7213028]";
var GeoJsonCoordinates v_location_1 := "[2.3514616,48.8566969]";
var GeoJsonCoordinates v_location_2 := "[-4.4216366,36.7213028]";
var integer i;
 
// Test control
......@@ -10156,7 +10170,7 @@ module OneM2M_PermutationFunctions {
var template RequestPrimitive v_createRequest := m_createContainerBase;
var integer v_childResourceIndex := -1;
var Labels v_labels := {"VALUE_0"};
var ListOfCoordinates v_location := "[2.3514616,48.8566969]";
var GeoJsonCoordinates v_location := "[2.3514616,48.8566969]";
 
// Test control
if(not(PICS_ACP_SUPPORT)) {
......@@ -10233,7 +10247,7 @@ module OneM2M_PermutationFunctions {
var template RequestPrimitive v_createRequest := m_createContainerBase;
var integer v_childResourceIndex := -1;
var Labels v_labels := {"VALUE_0"};
var ListOfCoordinates v_location := "[2.3514616, 48.8566969]";
var GeoJsonCoordinates v_location := "[2.3514616, 48.8566969]";
 
// Test control
if(not(PICS_ACP_SUPPORT)) {
......@@ -10897,7 +10911,7 @@ module OneM2M_PermutationFunctions {
t_notificationTimer.start;
v_elapsedTime := t_notificationTimer.read;
//v_myAbsRelTimestamp = 2.0 seconds
while (v_elapsedTime < 2.0){ // Wait until window size expires
while (v_elapsedTime < 4.0){ // Wait until window size expires
v_elapsedTime := t_notificationTimer.read;
}
t_notificationTimer.stop;
......@@ -11097,7 +11111,7 @@ module OneM2M_PermutationFunctions {
t_notificationTimer.start;
v_elapsedTime := t_notificationTimer.read;
//v_myAbsRelTimestamp = 2.0 seconds
while (v_elapsedTime < 2.0){ // Wait until window size expires
while (v_elapsedTime < 4.0){ // Wait until window size expires
v_elapsedTime := t_notificationTimer.read;
}
t_notificationTimer.stop;
......@@ -15604,4 +15618,4 @@ module OneM2M_PermutationFunctions {
}//end group CSE
 
}
\ No newline at end of file
}
OneM2M_Testcases_CSE_Release_1.ttcn
View file @ 11ec4e97
......@@ -2071,7 +2071,7 @@ module OneM2M_Testcases_CSE_Release_1 {
[] mccPort.receive(mw_response(mw_responsePrimitive(int2001, v_primitiveContent))) -> value v_response {
tc_ac.stop;
f_checkAttributesToBeSaved(int10002, v_request, v_response.primitive.responsePrimitive);
v_aeAnncIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int10002);
v_aeAnncIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int10002, vc_remoteCseIndex);
setverdict(pass, __SCOPE__ & ": AEAnnc successfully created.");
if(v_response.primitive.responsePrimitive.primitiveContent.aEAnnc.link != vc_cseSimuDesc.cseId & "/" & PX_ALLOWED_S_AE_IDS[0]) {
......@@ -8528,7 +8528,9 @@ module OneM2M_Testcases_CSE_Release_1 {
v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
if(vc_ae2.running) {
vc_ae2.stop;
};
// Test Body
v_request:= f_getCreateRequestPrimitive(int3, m_createContainerBase, v_aeIndex);
......@@ -8554,6 +8556,8 @@ module OneM2M_Testcases_CSE_Release_1 {
setverdict(fail, __SCOPE__ & ": No answer while creating resource type int3 (Container)");
}
}
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
//Postamble
f_cse_postamble_deleteResources();
......@@ -8606,7 +8610,9 @@ module OneM2M_Testcases_CSE_Release_1 {
v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
if(vc_ae2.running) {
vc_ae2.stop;
};
// Test Body
v_contentResponse.aE := mw_contentAeBase; // all attributes expected
......@@ -8636,6 +8642,8 @@ module OneM2M_Testcases_CSE_Release_1 {
}
};
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
//Postamble
f_cse_postamble_deleteResources();
......@@ -8691,7 +8699,9 @@ module OneM2M_Testcases_CSE_Release_1 {
v_request := valueof(m_delete(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))); // Subscription resource deletion request
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
if(vc_ae2.running) {
vc_ae2.stop;
};
// Test Body
v_notificationContent.subscriptionReference := ?;
......
OneM2M_Testcases_CSE_Release_2.ttcn
View file @ 11ec4e97
......@@ -1133,7 +1133,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template PrimitiveContent v_contentResponse;
v_contentResponse.subscription := mw_contentSubscription_rc1;
v_ae1.start(f_CSE_DMR_RET_021(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription
v_ae1.start(f_CSE_DMR_RET_021(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase_subscription));//Subscription
v_ae1.done;
}
......
OneM2M_Testcases_CSE_Release_3.ttcn
View file @ 11ec4e97
......@@ -8745,6 +8745,10 @@ module OneM2M_Testcases_CSE_Release_3 {
}
}
 
if(vc_ae2.running) {
vc_ae2.stop;
};
// Test Body
v_contentResponse.notification.notificationForwardingURI := v_fanoutPointAddress;
vc_ae2.start(f_cse_notifyProcedure_aggregatedNoficationHandler(v_contentResponse, 1)); // check if the Rx. of notification and match contents
......
OneM2M_Testcases_CSE_Release_4.ttcn
View file @ 11ec4e97
......@@ -572,7 +572,7 @@ module OneM2M_Testcases_CSE_Release_4 {
function f_CSE_SCH_001() runs on AeSimu system CseSystem {
// Local variables
var integer v_aeIndex, v_resourceIndex := -1;
var template RequestPrimitive v_createRequestSchedule := m_createScheduleBase;
var template RequestPrimitive v_createRequestSchedule := m_createScheduleBase_subscription;
var RequestPrimitive v_request;
// Test component configuration
......@@ -645,11 +645,11 @@ module OneM2M_Testcases_CSE_Release_4 {
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
v_resourceIndex := f_cse_createResource(int23, m_createSubscriptionBase, v_aeIndex);//Subscription
 
v_childscheduleResourceIndex := f_cse_createResource(v_scheduleresourceType, m_updateScheduleBase, v_resourceIndex);
v_childscheduleResourceIndex := f_cse_createResource(v_scheduleresourceType, m_createScheduleBase_subscription, v_resourceIndex);
 
v_contentUpdateSchedule.primitiveContent.schedule.networkCoordinated := true;
// Test Body
v_request := f_getUpdateRequestPrimitive(v_scheduleresourceType, v_resourceIndex, v_contentUpdateSchedule);
v_request := f_getUpdateRequestPrimitive(v_scheduleresourceType, v_childscheduleResourceIndex, v_contentUpdateSchedule);
f_send(e_mcaPort, m_request(valueof(v_request)));
tc_ac.start;
alt {
......@@ -696,18 +696,21 @@ module OneM2M_Testcases_CSE_Release_4 {
timer t_batchNotificationTimer := PX_TAC * 2.0; //just gives enough time to execute
const ResourceType c_containerResourceType := int3;
var float v_elapsedTime;
var integer v_ae1Index, v_ae2Index, v_containerResourceIndex, v_childScheduleIndex := -1;
var template RequestPrimitive v_updateRequestPrimitive := m_updateContainerBase;
var template RequestPrimitive v_updateRequest;
var template RequestPrimitive v_createRequestSubscription;
var template RequestPrimitive v_createRequest := m_createScheduleBase;
var integer v_ae1Index, v_ae2LocalIndex, v_ae2Index, v_containerResourceIndex, v_subscriptionResourceIndex, v_childScheduleIndex := -1;
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var template RequestPrimitive v_createRequest := m_createScheduleBase_subscription;
var ResponsePrimitive v_responsePrimitive;
var integer v_actualYear;
var XSD.ID v_containerResourceAddress;
var template PrimitiveContent v_contentResponse := {container := mw_contentContainerBase};// all attributes expected
v_contentResponse.container.labels := ?;
// Test control
if(PX_TAC < 10.0) {
setverdict(inconc, __SCOPE__ & ": PX_TAC is required to be bigger than 10 seconds to run this test case");
stop;
}
// Test component configuration
f_cf01Up(true);
 
......@@ -716,39 +719,123 @@ module OneM2M_Testcases_CSE_Release_4 {
// 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_getLocalPoA(vc_aeSimuDesc.mcaPortIn, "")}), -1);
// AE1 is registered
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 registered
v_ae1Index := f_cse_createResource_withAcpAux(int2, m_createAe(vc_aeSimuDesc.appId, -, vc_aeSimuDesc.aeIdStem, c_defaultAe1ResourceName, {f_getLocalPoA(vc_aeSimuDesc.mcaPortIn, "")}), -1); // now AE1 is registered
vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_TS_AE2.appId, -, PX_TS_AE2.aeIdStem, c_defaultAe2ResourceName, omit), -1)); // AE2 is registered
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
v_ae2LocalIndex := f_getResourceFromAeSimu(vc_ae2);
v_ae2Index := f_getLatestResourceIndex(vc_ae2);
vc_ae2.start(f_cse_createResource(c_containerResourceType, m_createContainerBase, v_ae2Index));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
v_ae2Index := f_getResourceFromAeSimu(vc_ae2);
v_containerResourceIndex := f_getLatestResourceIndex(vc_ae2);
v_containerResourceAddress := f_getLatestResourceAddress(vc_ae2);
v_containerResourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_ae1Index);
vc_ae2.start(f_cse_createResource(int23, m_createSubscription(v_containerResourceAddress, -, {f_getResourceAddress(v_ae1Index)}), v_containerResourceIndex));
tc_ac.start;
alt {
[] mcaPortIn.receive(mw_request(mw_notifyNotification(mw_contentNotificationVerification))) -> value vc_request {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ":INFO: Notification received");
v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
f_send(e_mcaPortIn, m_response(v_responsePrimitive));
}
[] mcaPortIn.receive(mw_request(mw_notifyNotification(mw_contentNotification(?)))) -> value vc_request {
tc_ac.stop;
setverdict(inconc, __SCOPE__ & ":ERROR: Notification received but verificationRequest isn't set to TRUE");
v_responsePrimitive := valueof(m_responseNotification(int4000, omit));
v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
f_send(e_mcaPortIn, m_response(v_responsePrimitive));
}
[] tc_ac.timeout {
if (not(vc_ae2.running)){
setverdict(pass, __SCOPE__ & ":INFO: No subscription verification received but subscription resource was created");
}
}
}
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
v_subscriptionResourceIndex := f_getLatestResourceIndex(vc_ae2);
v_actualYear := f_getYear(fx_generateTimestamp());
v_createRequest.primitiveContent.schedule.scheduleElement := {{"* * * * * * " & int2str(v_actualYear)}};//scheduled for this year
vc_ae2.start(f_cse_createResource(int18, v_createRequest, v_subscriptionResourceIndex));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
// Test Body
v_updateRequest.primitiveContent.container.labels := {"LABEL_1"};
vc_ae2.start(f_cse_updateResource(int3, v_containerResourceIndex, v_updateRequest)); // Update request 1
tc_ac.start;
alt {
[] mcaPortIn.receive(mw_request(mw_notifyNotification(mw_contentNotification(?)))) -> value vc_request {
tc_ac.stop;
if(f_check_notificationContent(vc_request.primitive.requestPrimitive, v_contentResponse)){
setverdict(pass, __SCOPE__ & ":INFO: Notification received");
}
else{
setverdict(fail, __SCOPE__ & ":ERROR: Notification received but the content doesn't match");
}
//Send response in any case
v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
f_send(e_mcaPortIn, m_response(v_responsePrimitive));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
setverdict(pass, __SCOPE__ & ": Notifications sent on scheduled time");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No notification received");
}
}
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
//Postamble
f_cse_postamble_deleteResources();
//Tear down
f_cf01Down();
/*
// Test component configuration
f_cf01Up();
// Test adapter configuration
 
v_createRequestSubscription := m_createSubscription(f_getResourceAddress(v_ae2Index), omit, {f_getResourceAddress(v_ae1Index)});
// Preamble
v_aeIndex := f_cse_preamble_registerAe(-, {f_getLocalPoA(vc_aeSimuDesc.mcaPortIn, "")});
// AE1 is registered
 
vc_ae2.start(f_cse_createResource(int23, v_createRequestSubscription, v_containerResourceIndex));//Subscription
v_containerResourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_ae1Index);
 
v_createRequest.primitiveContent.schedule.scheduleElement := {{"*/5 0 0 * * * *"}};//scheduled every 5 seconds
v_childScheduleIndex := f_cse_createResource(int18, v_createRequest, v_containerResourceIndex); //schedule resource child
v_subscriptionResourceIndex := f_cse_createResource(int23, m_createSubscriptionBase(), v_containerResourceIndex);//Subscription
 
v_updateRequest := f_getUpdateRequestPrimitive(c_containerResourceType, v_containerResourceIndex, v_updateRequestPrimitive);
v_createRequest.primitiveContent.schedule.scheduleElement := {{"*//*5 0 0 * * * *"}};//scheduled every 5 seconds
v_childScheduleIndex := f_cse_createResource(int18, v_createRequest, v_subscriptionResourceIndex); //schedule resource child
 
v_updateRequest := f_getUpdateRequestPrimitive(c_containerResourceType, v_containerResourceIndex, v_updateRequest);
v_updateRequest.primitiveContent.container.labels := {"LABEL_1"};
// Test Body
t_batchNotificationTimer.start;
f_send(e_mcaPort, m_request(valueof(v_updateRequest)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response {
tc_ac.stop;
setverdict(pass, __SCOPE__&":INFO: Attribute of resource updated successfuly");
v_elapsedTime := t_batchNotificationTimer.read;
t_batchNotificationTimer.stop;
if(float2int(v_elapsedTime) mod 5 != 0) {
setverdict(fail, __SCOPE__ & ": Notifications sent before SCHEDULE_TIME is reached");
}
if (v_firstNotification) {
}
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
tc_ac.stop;
......@@ -758,6 +845,38 @@ module OneM2M_Testcases_CSE_Release_4 {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error while updating scheduling resource ");
}
[] mcaPortIn.receive(mw_request(mw_notifyNotification(mw_contentNotification(?)))) -> value vc_request {
tc_ac.stop;
if(f_check_notificationContent(vc_request.primitive.requestPrimitive, v_contentNotification)){
setverdict(pass, __SCOPE__ & ":INFO: Notification received");
}
else{
setverdict(fail, __SCOPE__ & ":ERROR: Notification received but the content doesn't match");
}
//Send response in any case
v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
f_send(e_mcaPortIn, m_response(v_responsePrimitive));
if (v_firstNotification){
t_batchNotificationTimer.start;
v_updateRequest := f_getUpdateRequestPrimitive(c_containerResourceType, v_containerResourceIndex, v_updateRequest);
v_updateRequest.primitiveContent.container.labels := {"LABEL_2"};
f_send(e_mcaPort, m_request(valueof(v_updateRequest)));
repeat;
} else {
v_elapsedTime := t_batchNotificationTimer.read;
t_batchNotificationTimer.stop;
if(v_elapsedTime < 5.0) {
setverdict(fail, __SCOPE__ & ": Notifications sent before SCHEDULE_TIME is reached");
} else {
setverdict(pass, __SCOPE__ & ": Notifications sent on scheduled time");
}
}
}
[] mcaPortIn.receive(mw_request(mw_notifyNotification(?))) -> value vc_request {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ":ERROR: Notification received but the content doesn't match");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while updating scheduling resource ");
}
......@@ -769,7 +888,7 @@ module OneM2M_Testcases_CSE_Release_4 {
f_cse_postamble_deleteResources();
 
// Tear down
f_cf01Down();
f_cf01Down();*/
} // f_CSE_SCH_003
 
}//end group Schedule_functionality
......@@ -5878,7 +5997,7 @@ module OneM2M_Testcases_CSE_Release_4 {
var integer v_resourceIndex := -1;
var integer v_childResourceIndex := -1;
var template RequestPrimitive v_requestretrievePrimitive;// m_retrieveFilterUsageOption
var ListOfCoordinates v_location := "[2.3514616, 48.8566969]";
var GeoJsonCoordinates v_location := "[2.3514616, 48.8566969]";
var template RequestPrimitive v_createRequest := m_createContainerBase;
 
// Test control
......@@ -5948,8 +6067,8 @@ module OneM2M_Testcases_CSE_Release_4 {
var integer v_resourceIndex := -1;
var integer v_childResourceIndex := -1;
var template RequestPrimitive v_requestretrievePrimitive;// m_retrieveFilterUsageOption
var ListOfCoordinates v_location := "[-4.4216366, 36.7213028]";
var ListOfCoordinates v_location_1 := "[2.3514616, 48.8566969]";
var GeoJsonCoordinates v_location := "[-4.4216366, 36.7213028]";
var GeoJsonCoordinates v_location_1 := "[2.3514616, 48.8566969]";
var template RequestPrimitive v_createRequest := m_createContainerBase;
var template (omit) ListOfURIs uRIList := {"NotInitialized"};
var MsgIn v_response;
......@@ -6027,7 +6146,7 @@ module OneM2M_Testcases_CSE_Release_4 {
var integer v_resourceIndex := -1;
var integer v_childResourceIndex := -1;
var template RequestPrimitive v_requestretrievePrimitive;// m_retrieveFilterUsageOption
var ListOfCoordinates v_location := "[2.3514616, 48.8566969]";
var GeoJsonCoordinates v_location := "[2.3514616, 48.8566969]";
var template RequestPrimitive v_createRequest := m_createContainerBase;
var Labels v_labels := {"VALUE_1"};
var template (omit) ListOfURIs uRIList := {"NotInitialized"};
......