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 (11)
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 4858 additions and 1741 deletions
LibOneM2M/OneM2M_Functions.ttcn
View file @ 24aa5a3a
......@@ -42,6 +42,7 @@ module OneM2M_Functions {
map(self:mcaPort, system:mcaPort) param (vc_aeSimuDesc.mcaPort);
map(self:mcaPortIn, system:mcaPortIn) param (vc_aeSimuDesc.mcaPortIn);
map(self:acPort, system:acPort);
connect(self:infoPort, mtc:infoPort);
f_setProtocolBinding(vc_aeSimuDesc.mcaPort, vc_aeSimuDesc.mcaPortIn, v_binding, v_host, v_binding_in);
......@@ -904,7 +905,8 @@ module OneM2M_Functions {
*/
function f_connectInfoPort(in Tester p_tester) runs on Tester {
// Connect
connect(self:infoPort, p_tester:infoPort);
connect(self:infoPort, p_tester:infoPort);
log(__SCOPE__&": INFO: infoPort connected");
}
/**
......@@ -913,7 +915,8 @@ module OneM2M_Functions {
*/
function f_disconnectInfoPort(in Tester p_tester) runs on Tester {
// Disconnect
disconnect(self:infoPort, p_tester:infoPort);
disconnect(self:infoPort, p_tester:infoPort);
log(__SCOPE__&": INFO: infoPort disconnected");
}
group getFunctions {
......@@ -947,8 +950,6 @@ module OneM2M_Functions {
function f_getRequestPrimitive(in Tester p_component) runs on Tester return RequestPrimitive {
var RequestPrimitive v_request;
f_connectInfoPort(p_component);
p_component.start(f_sendRequestPrimitive());
alt {
[]infoPort.receive(mw_requestPrimitiveforInfoPort) -> value v_request {
......@@ -957,8 +958,6 @@ module OneM2M_Functions {
p_component.done;
f_disconnectInfoPort(p_component);
return v_request;
}
......@@ -1589,7 +1588,7 @@ module OneM2M_Functions {
v_subscribedProfileIndex := f_cse_createResource(int52, p_createServiceSubscribedUserProfile, v_subscriptionProfileIndex);
if (p_allowedUsers == true) {
v_allowedUsers := {p_createServiceSubscribedUserProfile.primitiveContent.serviceSubscribedUserProfile.M2M_User_ID};
v_allowedUsers := {p_createServiceSubscribedUserProfile.primitiveContent.serviceSubscribedUserProfile.m2M_User_ID};
}
v_createServiceSubscribedAppRule := m_createServiceSubscribedAppRule({"None"}, {vc_aeSimuDesc.appId}, p_allowedAEs, valueof(v_allowedUsers));
......@@ -2568,8 +2567,6 @@ module OneM2M_Functions {
v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
f_send(e_mcaPortIn, m_response(v_responsePrimitive));
tc_ac.start;
repeat;
}
[] mcaPortIn.receive(mw_request(mw_notifyNotification(mw_contentNotificationBase))) -> value vc_request {
tc_ac.stop;
......@@ -2580,8 +2577,9 @@ module OneM2M_Functions {
v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
f_send(e_mcaPortIn, m_response(v_responsePrimitive));
tc_ac.start;
repeat;
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ":ERROR: No notification received");
}
}
......@@ -2760,7 +2758,7 @@ module OneM2M_Functions {
} //end f_cse_notifyProcedure_aggregatedNotificationHandler
/**
* @desc Handling message exchange for the notification procedure (deletion of subscription resource)
* @desc Handling message exchange for the notification procedure (deletion of subscription/crossResourceSubscription resource)
* @param p_notification Expected notification
* @verdict
*/
......@@ -2804,7 +2802,15 @@ module OneM2M_Functions {
alt {
[] mcaPortIn.receive(mw_request(mw_notifyNotification(mw_contentNotification(?)))) -> value vc_request {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error, Non expected notification received");
setverdict(fail, __SCOPE__ & ": ERROR: Non expected notification received");
//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));
}
[] mcaPortIn.receive(mw_request(mw_notifyNotification(mw_contentNotificationBase))) -> value vc_request {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ":ERROR: Non expected notification received");
//Send response in any case
v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
......@@ -2812,14 +2818,14 @@ module OneM2M_Functions {
}
[] mcaPortIn.receive(mw_request(mw_notifyResponsePrimitive(?))) -> value vc_request {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error, Non expected notification received");
setverdict(fail, __SCOPE__ & ": ERROR: Non expected notification received");
//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));
}
[] tc_ac.timeout {
setverdict(pass, __SCOPE__ & ": No notification received");
setverdict(pass, __SCOPE__ & ":INFO: No notification received");
}
}
......@@ -4261,6 +4267,12 @@ module OneM2M_Functions {
if(ispresent(p_resource.subscription.dynamicAuthorizationConsultationIDs)) {
vc_localResourcesList[p_localResourceIndex].resource.subscription.dynamicAuthorizationConsultationIDs := p_resource.subscription.dynamicAuthorizationConsultationIDs;
}
if(ispresent(p_resource.subscription.notificationURI)) {
vc_localResourcesList[p_localResourceIndex].resource.subscription.notificationURI := p_resource.subscription.notificationURI;
}
if(ispresent(p_resource.subscription.associatedCrossResourceSub)) {
vc_localResourcesList[p_localResourceIndex].resource.subscription.associatedCrossResourceSub := p_resource.subscription.associatedCrossResourceSub;
}
} else if(ischosen(vc_localResourcesList[p_localResourceIndex].resource.pollingChannel) and (ischosen(p_resource.pollingChannel))) {//pollingChannel
if(ispresent(p_resource.pollingChannel.expirationTime)) {
vc_localResourcesList[p_localResourceIndex].resource.pollingChannel.expirationTime := p_resource.pollingChannel.expirationTime;
......@@ -5602,9 +5614,9 @@ module OneM2M_Functions {
}
}
//creator
if(match(valueof(p_request.primitiveContent.crossResourceSubscription.creator), "NotInitialized" )){
p_request.primitiveContent.crossResourceSubscription.creator := valueof(p_request.from_);
}
//if(match(valueof(p_request.primitiveContent.crossResourceSubscription.creator), "NotInitialized" )){
// p_request.primitiveContent.crossResourceSubscription.creator := valueof(p_request.from_);
//}
}
return valueof(p_request);
......@@ -5778,6 +5790,9 @@ module OneM2M_Functions {
if(ischosen(p_contentResource.semanticMashupJobProfile)) {
return p_contentResource.semanticMashupJobProfile.resourceID;
}
if(ischosen(p_contentResource.crossResourceSubscription)) {
return p_contentResource.crossResourceSubscription.resourceID;
}
//Announced resources
if(ischosen(p_contentResource.accessControlPolicyAnnc)) {
return f_resourceIdCleaner(p_contentResource.accessControlPolicyAnnc.resourceID);
......@@ -5809,8 +5824,8 @@ module OneM2M_Functions {
if(ischosen(p_contentResource.timeSeriesInstanceAnnc)) {
return p_contentResource.timeSeriesInstanceAnnc.resourceID;
}
if(ischosen(p_contentResource.primitveProfile)) {
return p_contentResource.primitveProfile.resourceID;
if(ischosen(p_contentResource.primitiveProfile)) {
return p_contentResource.primitiveProfile.resourceID;
}
log(__SCOPE__&":WARNING: Primitive Content Kind not implemented");
......@@ -5899,6 +5914,9 @@ module OneM2M_Functions {
if(ischosen(p_contentResource.semanticMashupJobProfile)) {
return p_contentResource.semanticMashupJobProfile.resourceName;
}
if(ischosen(p_contentResource.crossResourceSubscription)) {
return p_contentResource.crossResourceSubscription.resourceName;
}
//Announced resources
if(ischosen(p_contentResource.accessControlPolicyAnnc)) {
return p_contentResource.accessControlPolicyAnnc.resourceName;
......@@ -7150,6 +7168,13 @@ module OneM2M_Functions {
log(__SCOPE__ & ":INFO: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.group_.resourceName)
}
}
case (int48) {
if (isvalue(p_response.primitiveContent.crossResourceSubscription) and
not(ispresent(p_response.primitiveContent.crossResourceSubscription.resourceName))) {
p_response.primitiveContent.crossResourceSubscription.resourceName := p_request.primitiveContent.crossResourceSubscription.resourceName;
log(__SCOPE__ & ":INFO: resourceName not returned. Using the one provided in the request: " & p_request.primitiveContent.subscription.resourceName)
}
}
case (int61) { // TBD softwareCampaign - implemented similar to exisitng resources
if (isvalue(p_response.primitiveContent.softwareCampaign) and
not(ispresent(p_response.primitiveContent.softwareCampaign.resourceName))) {
......
LibOneM2M/OneM2M_Pixits.ttcn
View file @ 24aa5a3a
......@@ -186,7 +186,7 @@ module OneM2M_Pixits {
}
},
security := omit,
serialization := "xml"
serialization := "json"
},
mcaPortIn := {
binding := {
......@@ -202,7 +202,7 @@ module OneM2M_Pixits {
}
},
security := omit,
serialization := "xml"
serialization := "json"
}
};
modulepar AeSimuComponentDesc PX_TS_AE2 := { // AE2 component settings
......@@ -222,7 +222,7 @@ module OneM2M_Pixits {
}
},
security := omit,
serialization := "xml"
serialization := "json"
},
mcaPortIn := {
binding := {
......@@ -238,7 +238,7 @@ module OneM2M_Pixits {
}
},
security := omit,
serialization := "xml"
serialization := "json"
}
};
modulepar CseSimuComponentDesc PX_TS_CSE1 := { // CSE1 component settings
......@@ -261,7 +261,7 @@ module OneM2M_Pixits {
}
},
security := omit,
serialization := "xml"
serialization := "json"
},
mcaPortIn := {
binding := {
......@@ -277,7 +277,7 @@ module OneM2M_Pixits {
}
},
security := omit,
serialization := "xml"
serialization := "json"
},
mccPort := {
binding := {
......@@ -293,7 +293,7 @@ module OneM2M_Pixits {
}
},
security := omit,
serialization := "xml"
serialization := "json"
},
mccPortIn := {
binding := {
......@@ -309,7 +309,7 @@ module OneM2M_Pixits {
}
},
security := omit,
serialization := "xml"
serialization := "json"
}
};
modulepar CseSimuComponentDesc PX_TS_CSE2 := { // CSE2 component settings
......@@ -384,7 +384,7 @@ module OneM2M_Pixits {
}
};
modulepar UrlDesc PX_TS_UT := { url := "http://127.0.0.1:43000/" };
modulepar UrlDesc PX_TS_UT := { url := "http://127.0.0.1:8080/__ut__" };
modulepar AeSimuComponentDesc PX_TS_DAS := { // DAS component settings
aeIdStem := "",
......
LibOneM2M/OneM2M_Templates.ttcn
View file @ 24aa5a3a
Source diff could not be displayed: it is too large. Options to address this: view the blob.
LibOneM2M/OneM2M_TypesAndValues.ttcn
View file @ 24aa5a3a
This diff is collapsed.
oneM2M_Types @ af7a0093
Compare 7f2b3a92...af7a0093
Subproject commit 7f2b3a92d6f12731cc6c3ba32ecaa8a2a3ca37a4
Subproject commit af7a0093b851fd5a184d9cc2955c46bcbfe379d0
OneM2M_PermutationFunctions.ttcn
View file @ 24aa5a3a
This diff is collapsed.
OneM2M_Testcases_CSE_Release_3.ttcn
View file @ 24aa5a3a
......@@ -933,7 +933,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
const AttributeList c_optionalAttribute := {"rateLimit"};
v_createRequest.primitiveContent.subscription.rateLimit := {0, omit};
v_createRequest.primitiveContent.subscription.rateLimit := {0, "PT20M"};
v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
v_ae1.done;
......
OneM2M_Testcases_CSE_Release_4.ttcn
View file @ 24aa5a3a
This diff is collapsed.