Commit 3dfdb91d authored by Naum Spaseski's avatar Naum Spaseski
Browse files

Corrected attributeNames in f_getResourceName and resourceIds f_getResourceName


corrected mw_retrieve template to Not check for resourceType and primitiveContent
corrected compilation error for TC_CSE_REG_CRE_013
Signed-off-by: default avatarNaum Spaseski <naum.spaseski@gmail.com>
parent 19954d4a
...@@ -2340,6 +2340,9 @@ module OneM2M_Functions { ...@@ -2340,6 +2340,9 @@ module OneM2M_Functions {
if(ischosen(p_contentResource.remoteCSE)) { if(ischosen(p_contentResource.remoteCSE)) {
return f_resourceIdCleaner(p_contentResource.remoteCSE.resourceID); return f_resourceIdCleaner(p_contentResource.remoteCSE.resourceID);
} }
if(ischosen(p_contentResource.cSEBase)) {
return f_resourceIdCleaner(p_contentResource.cSEBase.resourceID);
}
log(__SCOPE__&":WARNING: Primitive Content Kind not implemented"); log(__SCOPE__&":WARNING: Primitive Content Kind not implemented");
...@@ -2385,6 +2388,9 @@ module OneM2M_Functions { ...@@ -2385,6 +2388,9 @@ module OneM2M_Functions {
if(ischosen(p_contentResource.remoteCSE)) { if(ischosen(p_contentResource.remoteCSE)) {
return p_contentResource.remoteCSE.resourceName; return p_contentResource.remoteCSE.resourceName;
} }
if(ischosen(p_contentResource.cSEBase)) {
return p_contentResource.cSEBase.resourceName;
}
log(__SCOPE__&":WARNING: Primitive Content Kind not implemented"); log(__SCOPE__&":WARNING: Primitive Content Kind not implemented");
return "resourceNameNotFound"; return "resourceNameNotFound";
......
...@@ -130,8 +130,8 @@ module OneM2M_Templates { ...@@ -130,8 +130,8 @@ module OneM2M_Templates {
to_ := p_targetResourceAddress, to_ := p_targetResourceAddress,
from_ := ?, from_ := ?,
requestIdentifier := ?, requestIdentifier := ?,
resourceType := ?, resourceType := omit,
primitiveContent := ?, primitiveContent := *,
role := *, role := *,
originatingTimestamp := *, originatingTimestamp := *,
requestExpirationTimestamp := *, requestExpirationTimestamp := *,
......
...@@ -1452,7 +1452,7 @@ module OneM2M_Testcases_CSE { ...@@ -1452,7 +1452,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_REG_CRE_013_LBL() runs on Tester system CseSystem { testcase TC_CSE_REG_CRE_013_LBL() runs on Tester system CseSystem {
// Local variables // Local variables
var template RequestPrimitive v_createRequest := m_createRemoteCSEBase; var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;
const AttributeAux c_optionalAttribute := {"labels", omit}; const c_optionalAttribute := {"labels", omit};
var CseSimu v_cse1 := CseSimu.create("CSE1") alive; var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
v_createRequest.primitiveContent.remoteCSE.labels := {"MyLabel"}; v_createRequest.primitiveContent.remoteCSE.labels := {"MyLabel"};
...@@ -5587,7 +5587,7 @@ module OneM2M_Testcases_CSE { ...@@ -5587,7 +5587,7 @@ module OneM2M_Testcases_CSE {
// Local variables // Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive; var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createContainerBase; var template RequestPrimitive v_createRequest := m_createContainerBase;
const AttributeList c_optionalAttribute := {"accessControlPolicyIDs"}; const AttributeAux c_optionalAttribute := {"accessControlPolicyIDs"};
v_createRequest.primitiveContent.container.accessControlPolicyIDs := {"NotInitialized"}; v_createRequest.primitiveContent.container.accessControlPolicyIDs := {"NotInitialized"};
...@@ -5599,7 +5599,7 @@ module OneM2M_Testcases_CSE { ...@@ -5599,7 +5599,7 @@ module OneM2M_Testcases_CSE {
// Local variables // Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive; var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createContainerBase; var template RequestPrimitive v_createRequest := m_createContainerBase;
const AttributeList c_optionalAttribute := {"expirationTime"}; const AttributeAux c_optionalAttribute := {"expirationTime"};
v_createRequest.primitiveContent.container.expirationTime := "20301231T012345"; v_createRequest.primitiveContent.container.expirationTime := "20301231T012345";
...@@ -5612,7 +5612,7 @@ module OneM2M_Testcases_CSE { ...@@ -5612,7 +5612,7 @@ module OneM2M_Testcases_CSE {
// Local variables // Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive; var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createContainerBase; var template RequestPrimitive v_createRequest := m_createContainerBase;
const AttributeList c_optionalAttribute := {"labels"}; const AttributeAux c_optionalAttribute := {"labels"};
v_createRequest.primitiveContent.container.labels := {"MyLabel"}; v_createRequest.primitiveContent.container.labels := {"MyLabel"};
...@@ -5625,7 +5625,7 @@ module OneM2M_Testcases_CSE { ...@@ -5625,7 +5625,7 @@ module OneM2M_Testcases_CSE {
// Local variables // Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive; var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createContainerBase; var template RequestPrimitive v_createRequest := m_createContainerBase;
const AttributeList c_optionalAttribute := {"maxNrOfInstances"}; const AttributeAux c_optionalAttribute := {"maxNrOfInstances"};
v_createRequest.primitiveContent.container.maxNrOfInstances := 0; v_createRequest.primitiveContent.container.maxNrOfInstances := 0;
...@@ -5651,7 +5651,7 @@ module OneM2M_Testcases_CSE { ...@@ -5651,7 +5651,7 @@ module OneM2M_Testcases_CSE {
// Local variables // Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive; var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createContainerBase; var template RequestPrimitive v_createRequest := m_createContainerBase;
const AttributeList c_optionalAttribute := {"maxInstanceAge"}; const AttributeAux c_optionalAttribute := {"maxInstanceAge"};
v_createRequest.primitiveContent.container.maxInstanceAge := 0; v_createRequest.primitiveContent.container.maxInstanceAge := 0;
...@@ -5677,7 +5677,7 @@ module OneM2M_Testcases_CSE { ...@@ -5677,7 +5677,7 @@ module OneM2M_Testcases_CSE {
// Local variables // Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive; var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createContentInstanceBase; var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
const AttributeList c_optionalAttribute := {"expirationTime"}; const AttributeAux c_optionalAttribute := {"expirationTime"};
v_createRequest.primitiveContent.contentInstance.expirationTime := "20301231T012345"; v_createRequest.primitiveContent.contentInstance.expirationTime := "20301231T012345";
...@@ -5689,7 +5689,7 @@ module OneM2M_Testcases_CSE { ...@@ -5689,7 +5689,7 @@ module OneM2M_Testcases_CSE {
// Local variables // Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive; var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createContentInstanceBase; var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
const AttributeList c_optionalAttribute := {"labels"}; const AttributeAux c_optionalAttribute := {"labels"};
v_createRequest.primitiveContent.contentInstance.labels := {"MyLabel"}; v_createRequest.primitiveContent.contentInstance.labels := {"MyLabel"};
...@@ -5715,7 +5715,7 @@ module OneM2M_Testcases_CSE { ...@@ -5715,7 +5715,7 @@ module OneM2M_Testcases_CSE {
// Local variables // Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive; var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createContentInstanceBase; var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
const AttributeList c_optionalAttribute := {"contentInfo"}; const AttributeAux c_optionalAttribute := {"contentInfo"};
v_createRequest.primitiveContent.contentInstance.contentInfo := "MyContentInfo"; v_createRequest.primitiveContent.contentInstance.contentInfo := "MyContentInfo";
...@@ -5728,7 +5728,7 @@ module OneM2M_Testcases_CSE { ...@@ -5728,7 +5728,7 @@ module OneM2M_Testcases_CSE {
// Local variables // Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive; var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createContentInstanceBase; var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
const AttributeList c_optionalAttribute := {"ontologyRef"}; const AttributeAux c_optionalAttribute := {"ontologyRef"};
v_createRequest.primitiveContent.contentInstance.ontologyRef := "MyOntologyRef"; v_createRequest.primitiveContent.contentInstance.ontologyRef := "MyOntologyRef";
...@@ -5741,7 +5741,7 @@ module OneM2M_Testcases_CSE { ...@@ -5741,7 +5741,7 @@ module OneM2M_Testcases_CSE {
// Local variables // Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive; var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createAcpBase; var template RequestPrimitive v_createRequest := m_createAcpBase;
const AttributeList c_optionalAttribute := {"expirationTime"}; const AttributeAux c_optionalAttribute := {"expirationTime"};
v_createRequest.primitiveContent.accessControlPolicy.expirationTime := "20301231T012345"; v_createRequest.primitiveContent.accessControlPolicy.expirationTime := "20301231T012345";
...@@ -5754,7 +5754,7 @@ module OneM2M_Testcases_CSE { ...@@ -5754,7 +5754,7 @@ module OneM2M_Testcases_CSE {
// Local variables // Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive; var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createAcpBase; var template RequestPrimitive v_createRequest := m_createAcpBase;
const AttributeList c_optionalAttribute := {"labels"}; const AttributeAux c_optionalAttribute := {"labels"};
v_createRequest.primitiveContent.accessControlPolicy.labels := {"MyLabel"}; v_createRequest.primitiveContent.accessControlPolicy.labels := {"MyLabel"};
...@@ -5767,7 +5767,7 @@ module OneM2M_Testcases_CSE { ...@@ -5767,7 +5767,7 @@ module OneM2M_Testcases_CSE {
// Local variables // Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive; var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase; var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
const AttributeList c_optionalAttribute := {"accessControlPolicyIDs"}; const AttributeAux c_optionalAttribute := {"accessControlPolicyIDs"};
v_createRequest.primitiveContent.subscription.accessControlPolicyIDs := {"NotInitialized"}; v_createRequest.primitiveContent.subscription.accessControlPolicyIDs := {"NotInitialized"};
...@@ -5779,7 +5779,7 @@ module OneM2M_Testcases_CSE { ...@@ -5779,7 +5779,7 @@ module OneM2M_Testcases_CSE {
// Local variables // Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive; var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase; var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
const AttributeList c_optionalAttribute := {"expirationTime"}; const AttributeAux c_optionalAttribute := {"expirationTime"};
v_createRequest.primitiveContent.subscription.expirationTime := "20301231T012345"; v_createRequest.primitiveContent.subscription.expirationTime := "20301231T012345";
...@@ -5792,7 +5792,7 @@ module OneM2M_Testcases_CSE { ...@@ -5792,7 +5792,7 @@ module OneM2M_Testcases_CSE {
// Local variables // Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive; var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase; var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
const AttributeList c_optionalAttribute := {"labels"}; const AttributeAux c_optionalAttribute := {"labels"};
v_createRequest.primitiveContent.subscription.labels := {"MyLabel"}; v_createRequest.primitiveContent.subscription.labels := {"MyLabel"};
...@@ -5805,7 +5805,7 @@ module OneM2M_Testcases_CSE { ...@@ -5805,7 +5805,7 @@ module OneM2M_Testcases_CSE {
// Local variables // Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive; var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase; var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
const AttributeList c_optionalAttribute := {"eventNotificationCriteria"}; const AttributeAux c_optionalAttribute := {"eventNotificationCriteria"};
v_createRequest.primitiveContent.subscription.eventNotificationCriteria := valueof(m_eventNotificationCriteria({int1}, -)); v_createRequest.primitiveContent.subscription.eventNotificationCriteria := valueof(m_eventNotificationCriteria({int1}, -));
...@@ -5818,7 +5818,7 @@ module OneM2M_Testcases_CSE { ...@@ -5818,7 +5818,7 @@ module OneM2M_Testcases_CSE {
// Local variables // Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive; var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase; var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
const AttributeList c_optionalAttribute := {"expirationCounter"}; const AttributeAux c_optionalAttribute := {"expirationCounter"};
v_createRequest.primitiveContent.subscription.expirationCounter := 1; v_createRequest.primitiveContent.subscription.expirationCounter := 1;
...@@ -5831,7 +5831,7 @@ module OneM2M_Testcases_CSE { ...@@ -5831,7 +5831,7 @@ module OneM2M_Testcases_CSE {
// Local variables // Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive; var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase; var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
const AttributeList c_optionalAttribute := {"groupID"}; const AttributeAux c_optionalAttribute := {"groupID"};
v_createRequest.primitiveContent.subscription.groupID := "MyGroupID"; v_createRequest.primitiveContent.subscription.groupID := "MyGroupID";
...@@ -5844,7 +5844,7 @@ module OneM2M_Testcases_CSE { ...@@ -5844,7 +5844,7 @@ module OneM2M_Testcases_CSE {
// Local variables // Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive; var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase; var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
const AttributeList c_optionalAttribute := {"notificationForwardingURI"}; const AttributeAux c_optionalAttribute := {"notificationForwardingURI"};
v_createRequest.primitiveContent.subscription.notificationForwardingURI := "MyForwardingURI"; v_createRequest.primitiveContent.subscription.notificationForwardingURI := "MyForwardingURI";
...@@ -5857,7 +5857,7 @@ module OneM2M_Testcases_CSE { ...@@ -5857,7 +5857,7 @@ module OneM2M_Testcases_CSE {
// Local variables // Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive; var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase; var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
const AttributeList c_optionalAttribute := {"batchNotify"}; const AttributeAux c_optionalAttribute := {"batchNotify"};
v_createRequest.primitiveContent.subscription.batchNotify := {0, "PT1S"}; v_createRequest.primitiveContent.subscription.batchNotify := {0, "PT1S"};
...@@ -5869,7 +5869,7 @@ module OneM2M_Testcases_CSE { ...@@ -5869,7 +5869,7 @@ module OneM2M_Testcases_CSE {
// Local variables // Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive; var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase; var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
const AttributeList c_optionalAttribute := {"rateLimit"}; const AttributeAux c_optionalAttribute := {"rateLimit"};
v_createRequest.primitiveContent.subscription.rateLimit := {0, omit}; v_createRequest.primitiveContent.subscription.rateLimit := {0, omit};
...@@ -5882,7 +5882,7 @@ module OneM2M_Testcases_CSE { ...@@ -5882,7 +5882,7 @@ module OneM2M_Testcases_CSE {
// Local variables // Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive; var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase; var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
const AttributeList c_optionalAttribute := {"preSubscriptionNotify"}; const AttributeAux c_optionalAttribute := {"preSubscriptionNotify"};
v_createRequest.primitiveContent.subscription.preSubscriptionNotify := 1; v_createRequest.primitiveContent.subscription.preSubscriptionNotify := 1;
...@@ -5895,7 +5895,7 @@ module OneM2M_Testcases_CSE { ...@@ -5895,7 +5895,7 @@ module OneM2M_Testcases_CSE {
// Local variables // Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive; var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase; var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
const AttributeList c_optionalAttribute := {"pendingNotification"}; const AttributeAux c_optionalAttribute := {"pendingNotification"};
v_createRequest.primitiveContent.subscription.pendingNotification := int1; v_createRequest.primitiveContent.subscription.pendingNotification := int1;
...@@ -5907,7 +5907,7 @@ module OneM2M_Testcases_CSE { ...@@ -5907,7 +5907,7 @@ module OneM2M_Testcases_CSE {
// Local variables // Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive; var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase; var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
const AttributeList c_optionalAttribute := {"notificationStoragePriority"}; const AttributeAux c_optionalAttribute := {"notificationStoragePriority"};
v_createRequest.primitiveContent.subscription.notificationStoragePriority := 1; v_createRequest.primitiveContent.subscription.notificationStoragePriority := 1;
...@@ -5920,7 +5920,7 @@ module OneM2M_Testcases_CSE { ...@@ -5920,7 +5920,7 @@ module OneM2M_Testcases_CSE {
// Local variables // Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive; var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase; var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
const AttributeList c_optionalAttribute := {"latestNotify"}; const AttributeAux c_optionalAttribute := {"latestNotify"};
v_createRequest.primitiveContent.subscription.latestNotify := true; v_createRequest.primitiveContent.subscription.latestNotify := true;
...@@ -5933,7 +5933,7 @@ module OneM2M_Testcases_CSE { ...@@ -5933,7 +5933,7 @@ module OneM2M_Testcases_CSE {
// Local variables // Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive; var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase; var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
const AttributeList c_optionalAttribute := {"notificationContentType"}; const AttributeAux c_optionalAttribute := {"notificationContentType"};
v_createRequest.primitiveContent.subscription.notificationContentType := int1; v_createRequest.primitiveContent.subscription.notificationContentType := int1;
...@@ -5946,7 +5946,7 @@ module OneM2M_Testcases_CSE { ...@@ -5946,7 +5946,7 @@ module OneM2M_Testcases_CSE {
// Local variables // Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive; var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase; var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
const AttributeList c_optionalAttribute := {"notificationEventCat"}; const AttributeAux c_optionalAttribute := {"notificationEventCat"};
v_createRequest.primitiveContent.subscription.notificationEventCat := {alt_1 := 100}; v_createRequest.primitiveContent.subscription.notificationEventCat := {alt_1 := 100};
...@@ -5972,7 +5972,7 @@ module OneM2M_Testcases_CSE { ...@@ -5972,7 +5972,7 @@ module OneM2M_Testcases_CSE {
// Local variables // Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive; var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase; var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
const AttributeList c_optionalAttribute := {"subscriberURI"}; const AttributeAux c_optionalAttribute := {"subscriberURI"};
v_createRequest.primitiveContent.subscription.subscriberURI := "MySubscriberURI"; v_createRequest.primitiveContent.subscription.subscriberURI := "MySubscriberURI";
......
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