diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 2db40e05e9beff5a82a3bd73a54661b128e75829..f260d46d1a9ee271631303f056686d41b8b16da1 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -5824,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");
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index c42fa4ed98d2ea09e07ac1fa17f22f4e9ccdb916..6bb748f1373013bfd91a80271ef6eff477d98679 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -807,19 +807,23 @@ module OneM2M_Templates {
template (value) RequestPrimitive m_updatePrimitiveProfileBase modifies m_update := {
requestIdentifier := "m_updatePrimitiveProfile",
- primitiveContent:= {primitveProfile := m_contentUpdatePrimitiveProfile}
+ primitiveContent:= {primitiveProfile := m_contentUpdatePrimitiveProfile}
}
template (value) RequestPrimitive m_updatePrimitiveProfileNonMutuallyExclusive modifies m_updatePrimitiveProfileBase := {
- primitiveContent:= {primitveProfile := m_contentUpdatePrimitiveProfileNonMutuallyExclusive}
+ primitiveContent:= {primitiveProfile := m_contentUpdatePrimitiveProfileNonMutuallyExclusive}
+ }
+
+ template (value) RequestPrimitive m_updatePrimitiveProfileWithInvalidAdditionsOrDeletions modifies m_updatePrimitiveProfileBase := {
+ primitiveContent:= {primitiveProfile := m_contentUpdatePrimitiveProfileWithInvalidAdditionsOrDeletions}
}
template (value) RequestPrimitive m_updatePrimitiveProfileNonPermissibleParameters modifies m_updatePrimitiveProfileBase := {
- primitiveContent:= {primitveProfile := m_contentUpdatePrimitiveProfileNonPermissibleParameters}
+ primitiveContent:= {primitiveProfile := m_contentUpdatePrimitiveProfileNonPermissibleParameters}
}
template (value) RequestPrimitive m_updatePrimitiveProfileAddContainerMaxByteNegative modifies m_updatePrimitiveProfileBase := {
- primitiveContent:= {primitveProfile := m_contentUpdatePrimitiveProfileNegativeMaxByteSize}
+ primitiveContent:= {primitiveProfile := m_contentUpdatePrimitiveProfileNegativeMaxByteSize}
}
template (value) RequestPrimitive m_updateRemoteCSEBase modifies m_update := {
@@ -1748,183 +1752,193 @@ module OneM2M_Templates {
};
/**
- * @desc Base CREATE request primitive for PrimitveProfile resource
+ * @desc Base CREATE request primitive for PrimitiveProfile resource
*/
- template (value) RequestPrimitive m_createPrimitveProfileBase modifies m_create:= {
- requestIdentifier := testcasename() & "-m_createPrimitveProfile",
+ template (value) RequestPrimitive m_createPrimitiveProfileBase modifies m_create:= {
+ requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
resourceType := int62,
- primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileBase }
+ primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileBase }
};
/**
- * @desc CREATE request primitive for PrimitveProfile resource with primitive Add for Content resource
+ * @desc CREATE request primitive for PrimitiveProfile resource with primitive Add for Content resource
*/
- template (value) RequestPrimitive m_createPrimitveProfileAddContainerMaxByte100(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
- requestIdentifier := testcasename() & "-m_createPrimitveProfile",
+ template (value) RequestPrimitive m_createPrimitiveProfileAddContainerMaxByte100(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
+ requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
resourceType := int62,
- primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileAddContainerMaxByte100(p_IDList) }
+ primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileAddContainerMaxByte100(p_IDList) }
};
/**
- * @desc CREATE request primitive for PrimitveProfile resource with primitive Add for Content resource
+ * @desc CREATE request primitive for PrimitiveProfile resource with primitive Add for Content resource
*/
template (value) RequestPrimitive m_createPrimitiveProfileAddContainerMaxByteNegative(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
- requestIdentifier := testcasename() & "-m_createPrimitveProfile",
+ requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
resourceType := int62,
- primitiveContent := {primitveProfile := m_contentCreatePrimitiveProfileAddContainerMaxByteNegative(p_IDList) }
+ primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileAddContainerMaxByteNegative(p_IDList) }
};
/**
- * @desc CREATE request primitive for PrimitveProfile resource with primitive Add for Content resource
+ * @desc CREATE request primitive for PrimitiveProfile resource with primitive Add for Content resource
*/
- template (value) RequestPrimitive m_createPrimitveProfileAddContainerMaxByte100ToResponse(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
- requestIdentifier := testcasename() & "-m_createPrimitveProfile",
+ template (value) RequestPrimitive m_createPrimitiveProfileAddContainerMaxByte100ToResponse(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
+ requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
resourceType := int62,
- primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileAddContainerMaxByte100ToResponse(p_IDList) }
+ primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileAddContainerMaxByte100ToResponse(p_IDList) }
};
/**
- * @desc CREATE request primitive for PrimitveProfile resource with primitive Add for ResultContent=4, attribute and child resources
+ * @desc CREATE request primitive for PrimitiveProfile resource with primitive Add for ResultContent=4, attribute and child resources
*/
- template (value) RequestPrimitive m_createPrimitveProfileAddResultContentTo4(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
- requestIdentifier := testcasename() & "-m_createPrimitveProfile",
+ template (value) RequestPrimitive m_createPrimitiveProfileAddResultContentTo4(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
+ requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
resourceType := int62,
- primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileAddResultContentTo4(p_IDList) }
+ primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileAddResultContentTo4(p_IDList) }
};
/**
- * @desc CREATE request primitive for PrimitveProfile resource with primitive Add for ResultContent=4, attribute and child resources
+ * @desc CREATE request primitive for PrimitiveProfile resource with primitive Add for ResultContent=4, attribute and child resources
*/
template (value) RequestPrimitive m_createPrimitiveProfileAddResultContentTo4ToResponse(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
- requestIdentifier := testcasename() & "-m_createPrimitveProfile",
+ requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
resourceType := int62,
- primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileAddResultContentTo4ToResponse(p_IDList) }
+ primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileAddResultContentTo4ToResponse(p_IDList) }
};
/**
* @desc CREATE request primitive for PrimitiveProfile resource with primitive Add for ResultContent=4, attribute and child resources
*/
template (value) RequestPrimitive m_createPrimitiveProfileModifResultContentTo4ToResponse(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
- requestIdentifier := testcasename() & "-m_createPrimitveProfile",
+ requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
resourceType := int62,
- primitiveContent := {primitveProfile := m_contentCreatePrimitiveProfileModifResultContentTo4ToResponse(p_IDList) }
+ primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileModifResultContentTo4ToResponse(p_IDList) }
};
/**
- * @desc CREATE request primitive for PrimitveProfile resource with primitive Add for ResultContent=1, attribute and child resources
+ * @desc CREATE request primitive for PrimitiveProfile resource with primitive Add for ResultContent=1, attribute and child resources
*/
- template (value) RequestPrimitive m_createPrimitveProfileAddResultContentTo1(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
- requestIdentifier := testcasename() & "-m_createPrimitveProfile",
+ template (value) RequestPrimitive m_createPrimitiveProfileAddResultContentTo1(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
+ requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
resourceType := int62,
- primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileAddResultContentTo1(p_IDList) }
+ primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileAddResultContentTo1(p_IDList) }
};
/**
- * @desc CREATE request primitive for PrimitveProfile resource with primitive Add for ResultContent=1, attribute and child resources
+ * @desc CREATE request primitive for PrimitiveProfile resource with primitive Add for ResultContent=1, attribute and child resources
*/
- template (value) RequestPrimitive m_createPrimitveProfileAddResultContentTo1ToResponse(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
- requestIdentifier := testcasename() & "-m_createPrimitveProfile",
+ template (value) RequestPrimitive m_createPrimitiveProfileAddResultContentTo1ToResponse(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
+ requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
resourceType := int62,
- primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileAddResultContentTo1ToResponse(p_IDList) }
+ primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileAddResultContentTo1ToResponse(p_IDList) }
};
/**
- * @desc CREATE request primitive for PrimitveProfile resource with primitive Delete for ResultContent
+ * @desc CREATE request primitive for PrimitiveProfile resource with primitive Delete for ResultContent
*/
- template (value) RequestPrimitive m_createPrimitveProfileDelteResultContent(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
- requestIdentifier := testcasename() & "-m_createPrimitveProfile",
+ template (value) RequestPrimitive m_createPrimitiveProfileDelteResultContent(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
+ requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
resourceType := int62,
- primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileDeleteResultContent(p_IDList) }
+ primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileDeleteResultContent(p_IDList) }
};
/**
* @desc CREATE request primitive for PrimitiveProfile resource with primitive Add for non permissible attribute
*/
template (value) RequestPrimitive m_createPrimitiveProfileAddgmty(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
- requestIdentifier := testcasename() & "-m_createPrimitveProfile",
+ requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
+ resourceType := int62,
+ primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileAddgmty(p_IDList) }
+ };
+
+ /**
+ * @desc CREATE request primitive for PrimitiveProfile resource with primitive Add for non permissible attribute
+ */
+ template (value) RequestPrimitive m_createPrimitiveProfileAddNonPermissibleAttribute(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
+ requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
resourceType := int62,
- primitiveContent := {primitveProfile := m_contentCreatePrimitiveProfileAddgmty(p_IDList) }
+ primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileAddNonPermissibleAttribute(p_IDList) }
};
/**
- * @desc CREATE request primitive for PrimitveProfile resource with primitive Add for non permissible attribute
+ * @desc CREATE request primitive for PrimitiveProfile resource with primitive additions or deletions containing invalid attribute/parametres
*/
- template (value) RequestPrimitive m_createPrimitveProfileAddNonPermissibleAttribute(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
- requestIdentifier := testcasename() & "-m_createPrimitveProfile",
+ template (value) RequestPrimitive m_createPrimitiveProfileWithInvalidAdditionsOrDeletions(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
+ requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
resourceType := int62,
- primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileAddNonPermissibleAttribute(p_IDList) }
+ primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileWithInvalidAdditionsOrDeletions(p_IDList) }
};
+
/**
- * @desc CREATE request primitive for PrimitveProfile resource with primitive Add for non permissible attribute
+ * @desc CREATE request primitive for PrimitiveProfile resource with primitive Add for non permissible attribute
*/
- template (value) RequestPrimitive m_createPrimitveProfileDeleteNonPermissibleAttribute(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
- requestIdentifier := testcasename() & "-m_createPrimitveProfile",
+ template (value) RequestPrimitive m_createPrimitiveProfileDeleteNonPermissibleAttribute(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
+ requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
resourceType := int62,
- primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileDeleteNonPermissibleAttribute(p_IDList) }
+ primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileDeleteNonPermissibleAttribute(p_IDList) }
};
/**
- * @desc CREATE request primitive for PrimitveProfile resource with primitive Add for Content resource with non mutually exclusive attributes
+ * @desc CREATE request primitive for PrimitiveProfile resource with primitive Add for Content resource with non mutually exclusive attributes
*/
- template (value) RequestPrimitive m_createPrimitveProfileAddNonMutuallyExclusive(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
- requestIdentifier := testcasename() & "-m_createPrimitveProfile",
+ template (value) RequestPrimitive m_createPrimitiveProfileAddNonMutuallyExclusive(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
+ requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
resourceType := int62,
- primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileAddNonMutuallyExclusive(p_IDList) }
+ primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileAddNonMutuallyExclusive(p_IDList) }
};
/**
- * @desc CREATE request primitive for PrimitveProfile resource with primitive Delete for Content resource
+ * @desc CREATE request primitive for PrimitiveProfile resource with primitive Delete for Content resource
*/
- template (value) RequestPrimitive m_createPrimitveProfileDeleteContainerMaxByte(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
- requestIdentifier := testcasename() & "-m_createPrimitveProfile",
+ template (value) RequestPrimitive m_createPrimitiveProfileDeleteContainerMaxByte(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
+ requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
resourceType := int62,
- primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileDeleteContainerMaxByte(p_IDList) }
+ primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileDeleteContainerMaxByte(p_IDList) }
};
/**
- * @desc CREATE request primitive for PrimitveProfile resource with primitive Delete from response.
+ * @desc CREATE request primitive for PrimitiveProfile resource with primitive Delete from response.
*/
- template (value) RequestPrimitive m_createPrimitveProfileAddMaxByte100ToResponse(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
- requestIdentifier := testcasename() & "-m_createPrimitveProfile",
+ template (value) RequestPrimitive m_createPrimitiveProfileAddMaxByte100ToResponse(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
+ requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
resourceType := int62,
- primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileAddMaxByte100ToResponse(p_IDList) }
+ primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileAddMaxByte100ToResponse(p_IDList) }
};
/**
- * @desc CREATE request primitive for PrimitveProfile resource with primitive Add for ResultContent=1 from response.
+ * @desc CREATE request primitive for PrimitiveProfile resource with primitive Add for ResultContent=1 from response.
*/
template (value) RequestPrimitive m_createPrimitiveProfileAddResultContentTo1FromResponse(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
- requestIdentifier := testcasename() & "-m_createPrimitveProfile",
+ requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
resourceType := int62,
- primitiveContent := {primitveProfile := m_contentCreatePrimitiveProfileAddResultContentTo1FromResponse(p_IDList) }
+ primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileAddResultContentTo1FromResponse(p_IDList) }
};
/**
- * @desc CREATE request primitive for PrimitveProfile resource with primitive Add for ResultContent=1 from response.
+ * @desc CREATE request primitive for PrimitiveProfile resource with primitive Add for ResultContent=1 from response.
*/
template (value) RequestPrimitive m_createPrimitiveProfileDeleteResultContentTo1FromResponse(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
- requestIdentifier := testcasename() & "-m_createPrimitveProfile",
+ requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
resourceType := int62,
- primitiveContent := {primitveProfile := m_contentCreatePrimitiveProfileDeleteResultContentTo1FromResponse(p_IDList) }
+ primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileDeleteResultContentTo1FromResponse(p_IDList) }
};
/**
- * @desc CREATE request primitive for PrimitveProfile resource with primitive Delete from response.
+ * @desc CREATE request primitive for PrimitiveProfile resource with primitive Delete from response.
*/
- template (value) RequestPrimitive m_createPrimitveProfileDeleteFromResponse(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
- requestIdentifier := testcasename() & "-m_createPrimitveProfile",
+ template (value) RequestPrimitive m_createPrimitiveProfileDeleteFromResponse(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
+ requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
resourceType := int62,
- primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileDeleteFromResponse(p_IDList) }
+ primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileDeleteFromResponse(p_IDList) }
};
/**
- * @desc CREATE request primitive for PrimitveProfile resource with primitive Delete from response.
+ * @desc CREATE request primitive for PrimitiveProfile resource with primitive Delete from response.
*/
- template (value) RequestPrimitive m_createPrimitveProfileDeletePrimtiveContentFromResponse(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
- requestIdentifier := testcasename() & "-m_createPrimitveProfile",
+ template (value) RequestPrimitive m_createPrimitiveProfileDeletePrimtiveContentFromResponse(in template (omit) ListOfM2MID p_IDList := omit) modifies m_create:= {
+ requestIdentifier := testcasename() & "-m_createPrimitiveProfile",
resourceType := int62,
- primitiveContent := {primitveProfile := m_contentCreatePrimitveProfileDeletePrimitiveContentFromResponse(p_IDList) }
+ primitiveContent := {primitiveProfile := m_contentCreatePrimitiveProfileDeletePrimitiveContentFromResponse(p_IDList) }
};
/**
@@ -4064,9 +4078,9 @@ module OneM2M_Templates {
};
/**
- * @desc Base template primitiveContent for CREATE operation for PrimitveProfile resource
+ * @desc Base template primitiveContent for CREATE operation for PrimitiveProfile resource
*/
- template PrimitveProfile_optional m_contentCreatePrimitveProfileBase := {
+ template PrimitiveProfile_optional m_contentCreatePrimitiveProfileBase := {
resourceName := c_defaultPrimitiveProfileceResourceName, //O
resourceType := omit,//NP
resourceID := omit,//NP
@@ -4095,7 +4109,7 @@ module OneM2M_Templates {
/**
* @desc Primitive Profile for adding MaxByte primitive of Content resource
*/
- template PrimitveProfile_optional m_contentCreatePrimitveProfileAddContainerMaxByte100(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
+ template PrimitiveProfile_optional m_contentCreatePrimitiveProfileAddContainerMaxByte100(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
resourceName := c_defaultPrimitiveProfileceResourceName, //O
iDList := p_IDList, //M
resourceTypes := {int3}, //O
@@ -4108,7 +4122,7 @@ module OneM2M_Templates {
/**
* @desc Primitive Profile for adding MaxByte primitive of Content resource
*/
- template PrimitveProfile_optional m_contentCreatePrimitiveProfileAddContainerMaxByteNegative(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
+ template PrimitiveProfile_optional m_contentCreatePrimitiveProfileAddContainerMaxByteNegative(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
resourceName := c_defaultPrimitiveProfileceResourceName, //O
iDList := p_IDList, //M
resourceTypes := {int3}, //O
@@ -4120,7 +4134,7 @@ module OneM2M_Templates {
/**
* @desc Primitive Profile for adding MaxByte primitive of Content resource
*/
- template PrimitveProfile_optional m_contentCreatePrimitiveProfileAddgmty(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
+ template PrimitiveProfile_optional m_contentCreatePrimitiveProfileAddgmty(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
resourceName := c_defaultPrimitiveProfileceResourceName, //O
iDList := p_IDList, //M
resourceTypes := {int3}, //O
@@ -4132,7 +4146,7 @@ module OneM2M_Templates {
/**
* @desc Primitive Profile for adding MaxByte primitive of Content resource
*/
- template PrimitveProfile_optional m_contentCreatePrimitveProfileAddContainerMaxByte100ToResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
+ template PrimitiveProfile_optional m_contentCreatePrimitiveProfileAddContainerMaxByte100ToResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
resourceName := c_defaultPrimitiveProfileceResourceName, //O
iDList := p_IDList, //M
resourceTypes := {int3}, //O
@@ -4144,7 +4158,7 @@ module OneM2M_Templates {
/**
* @desc Primitive Profile for adding resultContent primitive of container resource
*/
- template PrimitveProfile_optional m_contentCreatePrimitveProfileAddResultContentTo4(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
+ template PrimitiveProfile_optional m_contentCreatePrimitiveProfileAddResultContentTo4(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
resourceName := c_defaultPrimitiveProfileceResourceName, //O
iDList := p_IDList, //M
resourceTypes := {int3}, //O
@@ -4156,7 +4170,7 @@ module OneM2M_Templates {
/**
* @desc Primitive Profile for adding resultContent primitive of container resource
*/
- template PrimitveProfile_optional m_contentCreatePrimitveProfileAddResultContentTo4ToResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
+ template PrimitiveProfile_optional m_contentCreatePrimitiveProfileAddResultContentTo4ToResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
resourceName := c_defaultPrimitiveProfileceResourceName, //O
iDList := p_IDList, //M
resourceTypes := {int3}, //O
@@ -4168,7 +4182,7 @@ module OneM2M_Templates {
/**
* @desc Primitive Profile for modification of resultContent primitive of container resource
*/
- template PrimitveProfile_optional m_contentCreatePrimitiveProfileModifResultContentTo4ToResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
+ template PrimitiveProfile_optional m_contentCreatePrimitiveProfileModifResultContentTo4ToResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
resourceName := c_defaultPrimitiveProfileceResourceName, //O
iDList := p_IDList, //M
resourceTypes := {int3}, //O
@@ -4180,7 +4194,7 @@ module OneM2M_Templates {
/**
* @desc Primitive Profile for adding resultContent primitive of container resource
*/
- template PrimitveProfile_optional m_contentCreatePrimitveProfileAddResultContentTo1(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
+ template PrimitiveProfile_optional m_contentCreatePrimitiveProfileAddResultContentTo1(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
resourceName := c_defaultPrimitiveProfileceResourceName, //O
iDList := p_IDList, //M
resourceTypes := {int3}, //O
@@ -4192,7 +4206,7 @@ module OneM2M_Templates {
/**
* @desc Primitive Profile for adding resultContent primitive of container resource
*/
- template PrimitveProfile_optional m_contentCreatePrimitveProfileAddResultContentTo1ToResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
+ template PrimitiveProfile_optional m_contentCreatePrimitiveProfileAddResultContentTo1ToResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
resourceName := c_defaultPrimitiveProfileceResourceName, //O
iDList := p_IDList, //M
resourceTypes := {int3}, //O
@@ -4204,7 +4218,7 @@ module OneM2M_Templates {
/**
* @desc Primitive Profile for removing resultContent primitive of container resource
*/
- template PrimitveProfile_optional m_contentCreatePrimitveProfileDeleteResultContent(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
+ template PrimitiveProfile_optional m_contentCreatePrimitiveProfileDeleteResultContent(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
resourceName := c_defaultPrimitiveProfileceResourceName, //O
iDList := p_IDList, //M
resourceTypes := {int3}, //O
@@ -4216,7 +4230,7 @@ module OneM2M_Templates {
/**
* @desc Primitive Profile for adding a non permissible attribute
*/
- template PrimitveProfile_optional m_contentCreatePrimitveProfileAddNonPermissibleAttribute(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
+ template PrimitiveProfile_optional m_contentCreatePrimitiveProfileAddNonPermissibleAttribute(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
resourceName := c_defaultPrimitiveProfileceResourceName, //O
iDList := p_IDList, //M
resourceTypes := {int3}, //O
@@ -4225,10 +4239,23 @@ module OneM2M_Templates {
applicability := int1
};
+ /**
+ * @desc Primitive Profile for adding a invalid value in additions/deletions attribute
+ */
+ template PrimitiveProfile_optional m_contentCreatePrimitiveProfileWithInvalidAdditionsOrDeletions(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
+ resourceName := c_defaultPrimitiveProfileceResourceName, //O
+ iDList := p_IDList, //M
+ resourceTypes := {int3}, //O
+ operations := {int1, int2, int3, int4, int5},//O
+ additions := {{{"invalidAttributeAdd", "3"}}}, //O
+ deletions := {"invalidAttributedDelete"}, //O
+ applicability := int1
+ };
+
/**
* @desc Primitive Profile for deleting a non permissible attribute
*/
- template PrimitveProfile_optional m_contentCreatePrimitveProfileDeleteNonPermissibleAttribute(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
+ template PrimitiveProfile_optional m_contentCreatePrimitiveProfileDeleteNonPermissibleAttribute(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
resourceName := c_defaultPrimitiveProfileceResourceName, //O
iDList := p_IDList, //M
resourceTypes := {int3}, //O
@@ -4240,7 +4267,7 @@ module OneM2M_Templates {
/**
* @desc Primitive Profile for adding MaxByte primitive of Content resource in a non mutually exclusive way
*/
- template PrimitveProfile_optional m_contentCreatePrimitveProfileAddNonMutuallyExclusive(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
+ template PrimitiveProfile_optional m_contentCreatePrimitiveProfileAddNonMutuallyExclusive(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
resourceName := c_defaultPrimitiveProfileceResourceName, //O
iDList := p_IDList, //M
resourceTypes := {int3}, //O
@@ -4253,7 +4280,7 @@ module OneM2M_Templates {
/**
* @desc Primitive Profile for deleting MaxByte primitive of Container resource
*/
- template PrimitveProfile_optional m_contentCreatePrimitveProfileDeleteContainerMaxByte(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
+ template PrimitiveProfile_optional m_contentCreatePrimitiveProfileDeleteContainerMaxByte(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
resourceName := c_defaultPrimitiveProfileceResourceName, //O
iDList := p_IDList, //M
resourceTypes := {int3}, //O
@@ -4265,7 +4292,7 @@ module OneM2M_Templates {
/**
* @desc Primitive Profile for deleting MaxByte primitive of Resoponse Content
*/
- template PrimitveProfile_optional m_contentCreatePrimitveProfileDeleteFromResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
+ template PrimitiveProfile_optional m_contentCreatePrimitiveProfileDeleteFromResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
resourceName := c_defaultPrimitiveProfileceResourceName, //O
iDList := p_IDList, //M
resourceTypes := {int3}, //O
@@ -4277,7 +4304,7 @@ module OneM2M_Templates {
/**
* @desc Primitive Profile for deleting MaxByte primitive of Resoponse Content
*/
- template PrimitveProfile_optional m_contentCreatePrimitveProfileDeletePrimitiveContentFromResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
+ template PrimitiveProfile_optional m_contentCreatePrimitiveProfileDeletePrimitiveContentFromResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
resourceName := c_defaultPrimitiveProfileceResourceName, //O
iDList := p_IDList, //M
resourceTypes := {int3}, //O
@@ -4289,7 +4316,7 @@ module OneM2M_Templates {
/**
* @desc Primitive Profile for adding MaxByte primitive to Resoponse Content
*/
- template PrimitveProfile_optional m_contentCreatePrimitveProfileAddMaxByte100ToResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
+ template PrimitiveProfile_optional m_contentCreatePrimitiveProfileAddMaxByte100ToResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
resourceName := c_defaultPrimitiveProfileceResourceName, //O
iDList := p_IDList, //M
resourceTypes := {int3}, //O
@@ -4301,7 +4328,7 @@ module OneM2M_Templates {
/**
* @desc Primitive Profile for adding resultContent primitive to Resoponse Content
*/
- template PrimitveProfile_optional m_contentCreatePrimitiveProfileAddResultContentTo1FromResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
+ template PrimitiveProfile_optional m_contentCreatePrimitiveProfileAddResultContentTo1FromResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
resourceName := c_defaultPrimitiveProfileceResourceName, //O
iDList := p_IDList, //M
resourceTypes := {int3}, //O
@@ -4313,7 +4340,7 @@ module OneM2M_Templates {
/**
* @desc Primitive Profile for deleting resultContent primitive to Response Content
*/
- template PrimitveProfile_optional m_contentCreatePrimitiveProfileDeleteResultContentTo1FromResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitveProfileBase := {
+ template PrimitiveProfile_optional m_contentCreatePrimitiveProfileDeleteResultContentTo1FromResponse(in template ListOfM2MID p_IDList) modifies m_contentCreatePrimitiveProfileBase := {
resourceName := c_defaultPrimitiveProfileceResourceName, //O
iDList := p_IDList, //M
resourceTypes := {int3}, //O
@@ -7737,7 +7764,7 @@ module OneM2M_Templates {
choice := omit
}
- template (value) PrimitveProfile_optional m_contentUpdatePrimitiveProfile := {
+ template (value) PrimitiveProfile_optional m_contentUpdatePrimitiveProfile := {
resourceName := omit, //O
resourceType := omit,//NP
resourceID := omit,//NP
@@ -7763,16 +7790,22 @@ module OneM2M_Templates {
choice := omit//NP
}
- template (value) PrimitveProfile_optional m_contentUpdatePrimitiveProfileNonMutuallyExclusive modifies m_contentUpdatePrimitiveProfile := {
+ template (value) PrimitiveProfile_optional m_contentUpdatePrimitiveProfileNonMutuallyExclusive modifies m_contentUpdatePrimitiveProfile := {
additions := {{{"maxByteSize", "100"}}}, //O
deletions := {"maxByteSize"} //O
}
+
+ template (value) PrimitiveProfile_optional m_contentUpdatePrimitiveProfileWithInvalidAdditionsOrDeletions modifies m_contentUpdatePrimitiveProfile := {
+ additions := {{{"invalidAttributeAdd", "3"}}}, //O
+ deletions := {"invalidAttributedDelete"} //O
+ }
+
- template (value) PrimitveProfile_optional m_contentUpdatePrimitiveProfileNonPermissibleParameters modifies m_contentUpdatePrimitiveProfile := {
+ template (value) PrimitiveProfile_optional m_contentUpdatePrimitiveProfileNonPermissibleParameters modifies m_contentUpdatePrimitiveProfile := {
additions := {{{"releaseVersionIndicator", "3"}}} //O
}
- template (value) PrimitveProfile_optional m_contentUpdatePrimitiveProfileNegativeMaxByteSize modifies m_contentUpdatePrimitiveProfile := {
+ template (value) PrimitiveProfile_optional m_contentUpdatePrimitiveProfileNegativeMaxByteSize modifies m_contentUpdatePrimitiveProfile := {
additions := {{{"maxByteSize", "-10"}}}
}
diff --git a/LibOneM2M/OneM2M_TypesAndValues.ttcn b/LibOneM2M/OneM2M_TypesAndValues.ttcn
index c169c196e96a2f27d8b23df5ea86f50f27fe51e5..0bc205450e8b2f57f8d4734df3e1fe374e270c74 100644
--- a/LibOneM2M/OneM2M_TypesAndValues.ttcn
+++ b/LibOneM2M/OneM2M_TypesAndValues.ttcn
@@ -1623,7 +1623,7 @@ group OptionalResourceTypes {
variant (choice.choice_list[-]) "untagged";
};
- type record PrimitveProfile_optional
+ type record PrimitiveProfile_optional
{
ResourceName resourceName optional,
ResourceType resourceType optional,
@@ -5159,7 +5159,7 @@ group OtherTypes {
OntologyRepository_optional ontologyRepository,
Ontology_optional ontology,
PollingChannel_optional pollingChannel,
- PrimitveProfile_optional primitveProfile,
+ PrimitiveProfile_optional primitiveProfile,
ProcessManagement_optional processManagement, //2021 added processManagement
State_optional state, //2021 added state
Action_optional action_, //2021 added action
diff --git a/OneM2M_Testcases_CSE_Release_4.ttcn b/OneM2M_Testcases_CSE_Release_4.ttcn
index ad091a897f770d13026971ce2e97b96bba4efb1f..e80e2fdad514998b8a23f57d5254a97a9d58b468 100644
--- a/OneM2M_Testcases_CSE_Release_4.ttcn
+++ b/OneM2M_Testcases_CSE_Release_4.ttcn
@@ -6209,24 +6209,27 @@ module OneM2M_Testcases_CSE_Release_4 {
function f_CSE_PP_001_CRE() runs on AeSimu system CseSystem {
// Local variables
- var template RequestPrimitive v_createPrimitveProfile;
+ var template RequestPrimitive v_createPrimitiveProfile;
var RequestPrimitive v_requestContainerCreate;
var ResponsePrimitive v_responsePrimitive;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var MsgIn v_response;
+ // Test component configuration
+ f_cf01Up();
+
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with add atribute "maxByte" = "100" for content resource.
- v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
- v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+ v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
+ v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
//Create container resource without "maxByte" primitive
v_requestContainerCreate := f_getCreateRequestPrimitive(int3, m_createContainerBase, v_aeIndex);
- // Link Primitve Prifle created to this Request
+ // Link Primitive Prifle created to this Request
v_requestContainerCreate.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
f_send(e_mcaPort, m_request(v_requestContainerCreate));
@@ -6235,9 +6238,9 @@ module OneM2M_Testcases_CSE_Release_4 {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
tc_ac.stop;
if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100){
- setverdict(pass, __SCOPE__ & ": maxByteSize primitive value in PrimitveProfile added to Create Container Request!");
+ setverdict(pass, __SCOPE__ & ": maxByteSize primitive value in PrimitiveProfile added to Create Container Request!");
} else {
- setverdict(fail, __SCOPE__ & ": maxByteSize primitive value in PrimitveProfile not added to Create Container Request!");
+ setverdict(fail, __SCOPE__ & ": maxByteSize primitive value in PrimitiveProfile not added to Create Container Request!");
}
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
@@ -6273,7 +6276,7 @@ module OneM2M_Testcases_CSE_Release_4 {
function f_CSE_PP_001_RET() runs on AeSimu system CseSystem {
// Local variables
- var template RequestPrimitive v_createPrimitveProfile;
+ var template RequestPrimitive v_createPrimitiveProfile;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var integer v_containerParentIndex := -1;
@@ -6281,13 +6284,16 @@ module OneM2M_Testcases_CSE_Release_4 {
var RequestPrimitive v_retrieveRequest;
var template PrimitiveContent v_retriveContentResponse;
+ // Test component configuration
+ f_cf01Up();
+
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with add atribute resultContent=4(attribute and child resource) for content resource.
- v_createPrimitveProfile := m_createPrimitveProfileAddResultContentTo4({f_getOriginator(v_aeIndex)});
- v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+ v_createPrimitiveProfile := m_createPrimitiveProfileAddResultContentTo4({f_getOriginator(v_aeIndex)});
+ v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
// Set expected response as per Result Content=4 (attribute and child resource)
v_retriveContentResponse.container := mw_contentContainer_rc4;
@@ -6297,7 +6303,7 @@ module OneM2M_Testcases_CSE_Release_4 {
//Create child Container resource
f_cse_createResource(int3, m_createContainerBase, v_containerParentIndex);
- //Retrieve container with link to Primitve Profile
+ //Retrieve container with link to Primitive Profile
v_retrieveRequest := valueof(m_retrieve(f_getResourceAddress(v_containerParentIndex), f_getOriginator(v_containerParentIndex)));
v_retrieveRequest.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
f_send(e_mcaPort, m_request(v_retrieveRequest));
@@ -6345,7 +6351,7 @@ module OneM2M_Testcases_CSE_Release_4 {
function f_CSE_PP_001_DEL() runs on AeSimu system CseSystem {
// Local variables
- var template RequestPrimitive v_createPrimitveProfile;
+ var template RequestPrimitive v_createPrimitiveProfile;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var integer v_containerIndex := -1;
@@ -6353,13 +6359,16 @@ module OneM2M_Testcases_CSE_Release_4 {
var RequestPrimitive v_deleteRequest;
var template PrimitiveContent v_deleteContentResponse;
- // Preambleo
+ // Test component configuration
+ f_cf01Up();
+
+ // Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with add atribute resultContent=1 (attribute) for content resource.
- v_createPrimitveProfile := m_createPrimitveProfileAddResultContentTo1({f_getOriginator(v_aeIndex)});
- v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+ v_createPrimitiveProfile := m_createPrimitiveProfileAddResultContentTo1({f_getOriginator(v_aeIndex)});
+ v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
// Set expected container as per Result Content=1
v_deleteContentResponse.container := mw_contentContainer_rc1;
@@ -6416,7 +6425,7 @@ module OneM2M_Testcases_CSE_Release_4 {
function f_CSE_PP_001_UPD() runs on AeSimu system CseSystem {
// Local variables
- var template RequestPrimitive v_createPrimitveProfile;
+ var template RequestPrimitive v_createPrimitiveProfile;
var RequestPrimitive v_updateContainer;
var ResponsePrimitive v_responsePrimitive;
var integer v_aeIndex := -1;
@@ -6424,13 +6433,16 @@ module OneM2M_Testcases_CSE_Release_4 {
var integer v_createdContainerResource := -1;
var MsgIn v_response;
+ // Test component configuration
+ f_cf01Up();
+
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with add atribute "maxByte" = "100" for content resource.
- v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
- v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+ v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
+ v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
//Create container resource without Primtive Profile ID and no maxByte attribte
v_createdContainerResource := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
@@ -6438,7 +6450,7 @@ module OneM2M_Testcases_CSE_Release_4 {
//Update container request with Primitive Profile ID, and not including update for maxByte
v_updateContainer:= f_getUpdateRequestPrimitive(int3, v_aeIndex, m_updateContainerBase);
- // Link Primitve Prifle created to this Request
+ // Link Primitive Prifle created to this Request
v_updateContainer.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
f_send(e_mcaPort, m_request(v_updateContainer));
@@ -6446,11 +6458,11 @@ module OneM2M_Testcases_CSE_Release_4 {
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
tc_ac.stop;
- // Check that IUT applied the Primitve Profile
+ // Check that IUT applied the Primitive Profile
if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100){
- setverdict(pass, __SCOPE__ & ": maxByteSize primitive value in PrimitveProfile added correctly to Update Container Request!");
+ setverdict(pass, __SCOPE__ & ": maxByteSize primitive value in PrimitiveProfile added correctly to Update Container Request!");
} else {
- setverdict(fail, __SCOPE__ & ": maxByteSize primitive value in PrimitveProfile not added to Update Container Request!");
+ setverdict(fail, __SCOPE__ & ": maxByteSize primitive value in PrimitiveProfile not added to Update Container Request!");
}
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
@@ -6489,7 +6501,7 @@ module OneM2M_Testcases_CSE_Release_4 {
function f_CSE_PP_002_CRE() runs on AeSimu system CseSystem {
// Local variables
- var template RequestPrimitive v_createPrimitveProfile;
+ var template RequestPrimitive v_createPrimitiveProfile;
var RequestPrimitive v_requestContainerCreate;
var ResponsePrimitive v_responsePrimitive;
var integer v_aeIndex := -1;
@@ -6497,20 +6509,23 @@ module OneM2M_Testcases_CSE_Release_4 {
var integer v_createdContainerResourceIndex := -1;
var MsgIn v_response;
+ // Test component configuration
+ f_cf01Up();
+
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
- // Primitive Profile with primitve "maxByte" to be deleted
- v_createPrimitveProfile := m_createPrimitveProfileDeleteContainerMaxByte({f_getOriginator(v_aeIndex)});
- v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+ // Primitive Profile with primitive "maxByte" to be deleted
+ v_createPrimitiveProfile := m_createPrimitiveProfileDeleteContainerMaxByte({f_getOriginator(v_aeIndex)});
+ v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
//Create container resource without Primtive Profile ID and no maxByte attribte
v_createdContainerResourceIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
//Create container resource with "maxByte" primitive
v_requestContainerCreate := f_getCreateRequestPrimitive(int3, m_createContainerMaxByte(100), v_aeIndex);
- // Link Primitve Prifle created to this Request
+ // Link Primitive Prifle created to this Request
v_requestContainerCreate.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
f_send(e_mcaPort, m_request(v_requestContainerCreate));
@@ -6519,9 +6534,9 @@ module OneM2M_Testcases_CSE_Release_4 {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
tc_ac.stop;
if(ispresent(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize)){
- setverdict(fail, __SCOPE__ & ": Delete maxByteSize primitive in PrimitveProfile not applied to Container resource!");
+ setverdict(fail, __SCOPE__ & ": Delete maxByteSize primitive in PrimitiveProfile not applied to Container resource!");
} else {
- setverdict(pass, __SCOPE__ & ": Delete maxByteSize primitive value in PrimitveProfile applied correctly to Container resource!");
+ setverdict(pass, __SCOPE__ & ": Delete maxByteSize primitive value in PrimitiveProfile applied correctly to Container resource!");
}
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
@@ -6557,7 +6572,7 @@ module OneM2M_Testcases_CSE_Release_4 {
function f_CSE_PP_002_RET() runs on AeSimu system CseSystem {
// Local variables
- var template RequestPrimitive v_createPrimitveProfile;
+ var template RequestPrimitive v_createPrimitiveProfile;
var RequestPrimitive v_requestContainerCreate;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
@@ -6566,13 +6581,16 @@ module OneM2M_Testcases_CSE_Release_4 {
var RequestPrimitive v_retrieveRequest;
var template PrimitiveContent v_retriveContentResponse;
- // Preambleo
+ // Test component configuration
+ f_cf01Up();
+
+ // Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with Delete atribute resultContent for container resource.
- v_createPrimitveProfile := m_createPrimitveProfileDelteResultContent({f_getOriginator(v_aeIndex)});
- v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+ v_createPrimitiveProfile := m_createPrimitiveProfileDelteResultContent({f_getOriginator(v_aeIndex)});
+ v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
// Set expected container of retrieve request as per Result Content=1, the default value when RC is not present
v_retriveContentResponse.container := mw_contentContainer_rc1;
@@ -6583,7 +6601,7 @@ module OneM2M_Testcases_CSE_Release_4 {
//Create child Container resource
f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
- //Retrieve container with link to Primitve Profile
+ //Retrieve container with link to Primitive Profile
v_retrieveRequest := valueof(m_retrieve(f_getResourceAddress(v_containerParentIndex), f_getOriginator(v_containerParentIndex)));
v_requestContainerCreate.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
f_send(e_mcaPort, m_request(v_retrieveRequest));
@@ -6631,7 +6649,7 @@ module OneM2M_Testcases_CSE_Release_4 {
function f_CSE_PP_002_DEL() runs on AeSimu system CseSystem {
// Local variables
- var template RequestPrimitive v_createPrimitveProfile;
+ var template RequestPrimitive v_createPrimitiveProfile;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var integer v_containerIndex := -1;
@@ -6639,13 +6657,16 @@ module OneM2M_Testcases_CSE_Release_4 {
var RequestPrimitive v_deleteRequest;
var template PrimitiveContent v_deleteContentResponse;
- // Preambleo
+ // Test component configuration
+ f_cf01Up();
+
+ // Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with delete atribute resultContent of content resource.
- v_createPrimitveProfile := m_createPrimitveProfileDelteResultContent({f_getOriginator(v_aeIndex)});
- v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+ v_createPrimitiveProfile := m_createPrimitiveProfileDelteResultContent({f_getOriginator(v_aeIndex)});
+ v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
// Set expected container as per Result Content=1
v_deleteContentResponse.container := mw_contentContainer_rc1;
@@ -6699,7 +6720,7 @@ module OneM2M_Testcases_CSE_Release_4 {
function f_CSE_PP_002_UPD() runs on AeSimu system CseSystem {
// Local variables
- var template RequestPrimitive v_createPrimitveProfile;
+ var template RequestPrimitive v_createPrimitiveProfile;
var RequestPrimitive v_requestContainerUpdate;
var ResponsePrimitive v_responsePrimitive;
var integer v_aeIndex := -1;
@@ -6707,20 +6728,23 @@ module OneM2M_Testcases_CSE_Release_4 {
var integer v_createdContainerResourceIndex := -1;
var MsgIn v_response;
+ // Test component configuration
+ f_cf01Up();
+
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
- // Primitive Profile with primitve "maxByte" to be deleted
- v_createPrimitveProfile := m_createPrimitveProfileDeleteContainerMaxByte({f_getOriginator(v_aeIndex)});
- v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+ // Primitive Profile with primitive "maxByte" to be deleted
+ v_createPrimitiveProfile := m_createPrimitiveProfileDeleteContainerMaxByte({f_getOriginator(v_aeIndex)});
+ v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
//Create container resource without Primtive Profile ID and maxByte=100
v_createdContainerResourceIndex := f_cse_createResource(int3, m_createContainerMaxByte(100), v_aeIndex);
//Update container resource with "maxByte" primitive - nothing to update as it is same as exising resource
v_requestContainerUpdate := f_getCreateRequestPrimitive(int3, m_updateContainerMaxByte(100), v_aeIndex);
- // Link Primitve Prifle created to this Request
+ // Link Primitive Prifle created to this Request
v_requestContainerUpdate.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
f_send(e_mcaPort, m_request(v_requestContainerUpdate));
@@ -6729,9 +6753,9 @@ module OneM2M_Testcases_CSE_Release_4 {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
tc_ac.stop;
if(ispresent(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize)){
- setverdict(fail, __SCOPE__ & ": Delete of maxByteSize primitive in PrimitveProfile not applied to Container resource!");
+ setverdict(fail, __SCOPE__ & ": Delete of maxByteSize primitive in PrimitiveProfile not applied to Container resource!");
} else {
- setverdict(pass, __SCOPE__ & ": Delete of maxByteSize primitive value in PrimitveProfile applied correctly to Container resource!");
+ setverdict(pass, __SCOPE__ & ": Delete of maxByteSize primitive value in PrimitiveProfile applied correctly to Container resource!");
}
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
@@ -6770,25 +6794,28 @@ module OneM2M_Testcases_CSE_Release_4 {
function f_CSE_PP_003_CRE() runs on AeSimu system CseSystem {
// Local variables
- var template RequestPrimitive v_createPrimitveProfile;
+ var template RequestPrimitive v_createPrimitiveProfile;
var RequestPrimitive v_requestContainerCreate;
var ResponsePrimitive v_responsePrimitive;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var MsgIn v_response;
- // Preambleo
+ // Test component configuration
+ f_cf01Up();
+
+ // Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with add atribute "maxByte" = "100" for content resource.
- v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
- v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+ v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
+ v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
//Create container resource with "maxByte"=1000 primitive
v_requestContainerCreate := f_getCreateRequestPrimitive(int3, m_createContainerMaxByte(1000), v_aeIndex);
- // Link Primitve Prifle created to this Request
+ // Link Primitive Prifle created to this Request
v_requestContainerCreate.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
f_send(e_mcaPort, m_request(v_requestContainerCreate));
@@ -6835,7 +6862,7 @@ module OneM2M_Testcases_CSE_Release_4 {
function f_CSE_PP_003_RET() runs on AeSimu system CseSystem {
// Local variables
- var template RequestPrimitive v_createPrimitveProfile;
+ var template RequestPrimitive v_createPrimitiveProfile;
var RequestPrimitive v_requestContainerCreate;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
@@ -6844,13 +6871,16 @@ module OneM2M_Testcases_CSE_Release_4 {
var RequestPrimitive v_retrieveRequest;
var template PrimitiveContent v_retriveContentResponse;
- // Preambleo
+ // Test component configuration
+ f_cf01Up();
+
+ // Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with Add atribute resultContent for container resource.
- v_createPrimitveProfile := m_createPrimitveProfileAddResultContentTo4({f_getOriginator(v_aeIndex)});
- v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+ v_createPrimitiveProfile := m_createPrimitiveProfileAddResultContentTo4({f_getOriginator(v_aeIndex)});
+ v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
// Set expected container of retrieve request as per Result Content=1, the default value when RC is not present
v_retriveContentResponse.container := mw_contentContainer_rc4;
@@ -6861,7 +6891,7 @@ module OneM2M_Testcases_CSE_Release_4 {
//Create child Container resource
f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
- //Retrieve container with link to Primitve Profile
+ //Retrieve container with link to Primitive Profile
v_retrieveRequest := valueof(m_retrieve(f_getResourceAddress(v_containerParentIndex), f_getOriginator(v_containerParentIndex)));
v_requestContainerCreate.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
v_requestContainerCreate.resultContent := int1; // only attriubutes
@@ -6912,7 +6942,7 @@ module OneM2M_Testcases_CSE_Release_4 {
function f_CSE_PP_003_DEL() runs on AeSimu system CseSystem {
// Local variables
- var template RequestPrimitive v_createPrimitveProfile;
+ var template RequestPrimitive v_createPrimitiveProfile;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var MsgIn v_response;
@@ -6920,13 +6950,16 @@ module OneM2M_Testcases_CSE_Release_4 {
var template PrimitiveContent v_deleteContentResponse;
var integer v_containerParentIndex := -1;
- // Preambleo
+ // Test component configuration
+ f_cf01Up();
+
+ // Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with Add atribute resultContent=1 for container resource.
- v_createPrimitveProfile := m_createPrimitveProfileAddResultContentTo1({f_getOriginator(v_aeIndex)});
- v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+ v_createPrimitiveProfile := m_createPrimitiveProfileAddResultContentTo1({f_getOriginator(v_aeIndex)});
+ v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
// Set expected container as per Result Content=1
v_deleteContentResponse.container := mw_contentContainer_rc1;
@@ -6988,7 +7021,7 @@ module OneM2M_Testcases_CSE_Release_4 {
function f_CSE_PP_003_UPD() runs on AeSimu system CseSystem {
// Local variables
- var template RequestPrimitive v_createPrimitveProfile;
+ var template RequestPrimitive v_createPrimitiveProfile;
var RequestPrimitive v_updateContainer;
var ResponsePrimitive v_responsePrimitive;
var integer v_aeIndex := -1;
@@ -6996,13 +7029,16 @@ module OneM2M_Testcases_CSE_Release_4 {
var integer v_createdContainerResource := -1;
var MsgIn v_response;
+ // Test component configuration
+ f_cf01Up();
+
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with add atribute "maxByte" = "100" for content resource.
- v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
- v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+ v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
+ v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
//Create container resource with maxByte=1000 attribte
v_createdContainerResource := f_cse_createResource(int3, m_createContainerMaxByte(1000), v_aeIndex);
@@ -7010,7 +7046,7 @@ module OneM2M_Testcases_CSE_Release_4 {
//Update container request with maxByte=2000 and link to Primitive Profile
v_updateContainer:= f_getUpdateRequestPrimitive(int3, v_aeIndex, m_updateContainerMaxByte(2000));
- // Link Primitve Prifle created to this Request
+ // Link Primitive Prifle created to this Request
v_updateContainer.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
f_send(e_mcaPort, m_request(v_updateContainer));
@@ -7018,11 +7054,11 @@ module OneM2M_Testcases_CSE_Release_4 {
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
tc_ac.stop;
- // Check that IUT applied the Primitve Profile
+ // Check that IUT applied the Primitive Profile
if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100){
- setverdict(pass, __SCOPE__ & ": maxByteSize primitive value in PrimitveProfile is updated correctly to Update Container Request!");
+ setverdict(pass, __SCOPE__ & ": maxByteSize primitive value in PrimitiveProfile is updated correctly to Update Container Request!");
} else {
- setverdict(fail, __SCOPE__ & ": maxByteSize primitive value in PrimitveProfile is not updated to Update Container Request!");
+ setverdict(fail, __SCOPE__ & ": maxByteSize primitive value in PrimitiveProfile is not updated to Update Container Request!");
}
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
@@ -7061,27 +7097,30 @@ module OneM2M_Testcases_CSE_Release_4 {
function f_CSE_PP_004_CRE() runs on AeSimu system CseSystem {
// Local variables
- var template RequestPrimitive v_createPrimitveProfile;
+ var template RequestPrimitive v_createPrimitiveProfile;
var RequestPrimitive v_requestContainerCreate;
var ResponsePrimitive v_responsePrimitive;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var MsgIn v_response;
- // Preambleo
+ // Test component configuration
+ f_cf01Up();
+
+ // Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with add atribute "maxByte" = "100" for content resource.
- v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
- v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+ v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
+ v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
// Delete the Primitive Profile
f_cse_deleteResource(v_primitiveProfileIndex);
//Create container resource without "maxByte" primitive
v_requestContainerCreate := f_getCreateRequestPrimitive(int3, m_createContainerBase, v_aeIndex);
- // Link Primitve Prifle, which was deleted, to this Request
+ // Link Primitive Prifle, which was deleted, to this Request
v_requestContainerCreate.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
f_send(e_mcaPort, m_request(v_requestContainerCreate));
@@ -7094,9 +7133,9 @@ module OneM2M_Testcases_CSE_Release_4 {
// Commented out utnil TP is frozen - reject or accept.
/*
if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100){
- setverdict(fail, __SCOPE__ & ": maxByteSize primitive value in invalid PrimitveProfile applied to Create Container Request!");
+ setverdict(fail, __SCOPE__ & ": maxByteSize primitive value in invalid PrimitiveProfile applied to Create Container Request!");
} else {
- setverdict(pass, __SCOPE__ & ": maxByteSize primitive value in invalid PrimitveProfile not applied to Create Container Request!");
+ setverdict(pass, __SCOPE__ & ": maxByteSize primitive value in invalid PrimitiveProfile not applied to Create Container Request!");
} */
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
@@ -7132,7 +7171,7 @@ module OneM2M_Testcases_CSE_Release_4 {
function f_CSE_PP_004_RET() runs on AeSimu system CseSystem {
// Local variables
- var template RequestPrimitive v_createPrimitveProfile;
+ var template RequestPrimitive v_createPrimitiveProfile;
var RequestPrimitive v_requestContainerCreate;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
@@ -7141,13 +7180,16 @@ module OneM2M_Testcases_CSE_Release_4 {
var RequestPrimitive v_retrieveRequest;
var template PrimitiveContent v_retriveContentResponse;
- // Preambleo
+ // Test component configuration
+ f_cf01Up();
+
+ // Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with Add atribute resultContent for container resource.
- v_createPrimitveProfile := m_createPrimitveProfileAddResultContentTo4({f_getOriginator(v_aeIndex)});
- v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+ v_createPrimitiveProfile := m_createPrimitiveProfileAddResultContentTo4({f_getOriginator(v_aeIndex)});
+ v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
//Create Container resource
v_containerParentIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
@@ -7159,7 +7201,7 @@ module OneM2M_Testcases_CSE_Release_4 {
// Delete the Primitive Profile
f_cse_deleteResource(v_primitiveProfileIndex);
- //Retrieve container with link to Primitve Profile
+ //Retrieve container with link to Primitive Profile
v_retrieveRequest := valueof(m_retrieve(f_getResourceAddress(v_containerParentIndex), f_getOriginator(v_containerParentIndex)));
v_requestContainerCreate.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
v_requestContainerCreate.resultContent := int1; // only attriubutes
@@ -7215,20 +7257,23 @@ module OneM2M_Testcases_CSE_Release_4 {
function f_CSE_PP_004_DEL() runs on AeSimu system CseSystem {
// Local variables
- var template RequestPrimitive v_createPrimitveProfile;
+ var template RequestPrimitive v_createPrimitiveProfile;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var integer v_containerIndex := -1;
var MsgIn v_response;
var RequestPrimitive v_deleteRequest;
- // Preambleo
+ // Test component configuration
+ f_cf01Up();
+
+ // Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with Add atribute resultContent=1 for container resource.
- v_createPrimitveProfile := m_createPrimitveProfileAddResultContentTo1({f_getOriginator(v_aeIndex)});
- v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+ v_createPrimitiveProfile := m_createPrimitiveProfileAddResultContentTo1({f_getOriginator(v_aeIndex)});
+ v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
// Delete the Primitive Profile
f_cse_deleteResource(v_primitiveProfileIndex);
@@ -7288,7 +7333,7 @@ module OneM2M_Testcases_CSE_Release_4 {
function f_CSE_PP_004_UPD() runs on AeSimu system CseSystem {
// Local variables
- var template RequestPrimitive v_createPrimitveProfile;
+ var template RequestPrimitive v_createPrimitiveProfile;
var RequestPrimitive v_updateContainer;
var ResponsePrimitive v_responsePrimitive;
var integer v_aeIndex := -1;
@@ -7296,13 +7341,16 @@ module OneM2M_Testcases_CSE_Release_4 {
var integer v_createdContainerResource := -1;
var MsgIn v_response;
+ // Test component configuration
+ f_cf01Up();
+
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with add atribute "maxByte" = "100" for content resource.
- v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
- v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+ v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
+ v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
// Delete the Primitive Profile
f_cse_deleteResource(v_primitiveProfileIndex);
@@ -7313,7 +7361,7 @@ module OneM2M_Testcases_CSE_Release_4 {
//Update container request with Primitive Profile ID, and not including update for maxByte
v_updateContainer:= f_getUpdateRequestPrimitive(int3, v_aeIndex, m_updateContainerBase);
- // Link Primitve Prifle created to this Request
+ // Link Primitive Prifle created to this Request
v_updateContainer.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
f_send(e_mcaPort, m_request(v_updateContainer));
@@ -7323,11 +7371,11 @@ module OneM2M_Testcases_CSE_Release_4 {
/* commented out until TP is frozen-reject/accept
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
tc_ac.stop;
- // Check that IUT applied the Primitve Profile
+ // Check that IUT applied the Primitive Profile
if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100){
- setverdict(fail, __SCOPE__ & ": maxByteSize primitive value in invalid PrimitveProfile applied to Update Container Request!");
+ setverdict(fail, __SCOPE__ & ": maxByteSize primitive value in invalid PrimitiveProfile applied to Update Container Request!");
} else {
- setverdict(pass, __SCOPE__ & ": maxByteSize primitive value in invalid PrimitveProfile not applied to Update Container Request!");
+ setverdict(pass, __SCOPE__ & ": maxByteSize primitive value in invalid PrimitiveProfile not applied to Update Container Request!");
}
} */
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4102))) -> value v_response {
@@ -7355,6 +7403,316 @@ module OneM2M_Testcases_CSE_Release_4 {
} // f_CSE_PP_004_UPD
} //end group TC_CSE_PP_004
+ group TC_CSE_PP_005 {
+ /**
+ * @desc Check that the IUT rejects the request when the originator does not have retrieve privileges for <primitiveProfile> resource referenced by the PrimitiveProfileIdentifier parameter
+ *
+ */
+ testcase TC_CSE_PP_005_CRE() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_PP_005_CRE());
+ v_ae1.done;
+ }
+
+ function f_CSE_PP_005_CRE() runs on AeSimu system CseSystem {
+ // Local variables
+ var template RequestPrimitive v_createPrimitiveProfile;
+ var RequestPrimitive v_requestContainerCreate;
+ var ResponsePrimitive v_responsePrimitive;
+ var integer v_aeIndex := -1;
+ var integer v_primitiveProfileIndex := -1;
+ var MsgIn v_response;
+
+ // Test component configuration
+ f_cf01Up();
+
+ // Preamble
+ f_cse_createAccessControlPolicyAux(-, -, int61);//c_CUDNDi) //No resource retrieval privilege
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
+
+ // Primitive Profile with add atribute "maxByte" = "100" for content resource.
+ v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
+ v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
+
+
+
+ //Create container resource without "maxByte" primitive
+ v_requestContainerCreate := f_getCreateRequestPrimitive(int3, m_createContainerBase, v_aeIndex);
+ // Link Primitive Prifle, which was created, to this Request
+ v_requestContainerCreate.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
+
+ f_send(e_mcaPort, m_request(v_requestContainerCreate));
+ tc_ac.start;
+ alt {
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(int4136))) -> value v_response {
+ tc_ac.stop;
+ setverdict(pass, __SCOPE__ & ": IUT does not apply the primitive profile PRIMITIVE_PROFILE_NOT_ACCESSIBLE");
+
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Mismatch in status response code from IUT!");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": IUT accepted the create request with non existing primtive profile!");
+ }
+ [] tc_ac.timeout {
+ setverdict(fail, __SCOPE__ & ": No answer from IUT for the last Request!");
+ }
+ }
+
+ //Postamble
+ f_cse_postamble_deleteResources();
+
+ //Tear down
+ f_cf01Down();
+ } // f_CSE_PP_005_CRE
+
+ /**
+ * @desc Check that the IUT rejects the request when the originator does not have retrieve privileges for <primitiveProfile> resource referenced by the PrimitiveProfileIdentifier parameter
+ *
+ */
+ testcase TC_CSE_PP_005_RET() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_PP_005_RET());
+ v_ae1.done;
+ }
+
+ function f_CSE_PP_005_RET() runs on AeSimu system CseSystem {
+ // Local variables
+ var template RequestPrimitive v_createPrimitiveProfile;
+ var RequestPrimitive v_requestContainerCreate;
+ var integer v_aeIndex := -1;
+ var integer v_primitiveProfileIndex := -1;
+ var integer v_containerParentIndex := -1;
+ var MsgIn v_response;
+ var RequestPrimitive v_retrieveRequest;
+ var template PrimitiveContent v_retriveContentResponse;
+
+ // Test component configuration
+ f_cf01Up();
+
+ // Preamble
+ f_cse_createAccessControlPolicyAux(-, -, int61);//c_CUDNDi) //No resource retrieval privilege
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
+
+ // Primitive Profile with Add atribute resultContent for container resource.
+ v_createPrimitiveProfile := m_createPrimitiveProfileAddResultContentTo4({f_getOriginator(v_aeIndex)});
+ v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
+
+ //Create Container resource
+ v_containerParentIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
+
+ //Create child Container resource
+ f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
+
+ //Retrieve container with link to Primitive Profile
+ v_retrieveRequest := valueof(m_retrieve(f_getResourceAddress(v_containerParentIndex), f_getOriginator(v_containerParentIndex)));
+ v_requestContainerCreate.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
+ v_requestContainerCreate.resultContent := int1; // only attriubutes
+
+ // Set expected container of retrieve request as per Result Content=1, as the Primtive Prfile is not accessible
+ //v_retriveContentResponse.container := mw_contentContainer_rc1;
+
+ f_send(e_mcaPort, m_request(v_retrieveRequest));
+ tc_ac.start;
+ alt {
+
+ // Commenting out until TP is frozen
+ // Expect response as per resultContent=4, specified in Primitive Profile
+ /*
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_retriveContentResponse))) -> value v_response {
+ tc_ac.stop;
+ setverdict(pass, __SCOPE__ & ": ResultContent from Primtive Profile added to Retrieve Request");
+ } */
+
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(int4136))) -> value v_response {
+ tc_ac.stop;
+ setverdict(pass, __SCOPE__ & ": IUT does not apply the primitive profile PRIMITIVE_PROFILE_NOT_ACCESSIBLE");
+
+ }
+
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Mismatch in status response code from IUT!");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": IUT accepted the create request with non existing primtive profile!");
+ }
+ [] tc_ac.timeout {
+ setverdict(fail, __SCOPE__ & ": No answer from IUT for the last Request!");
+ }
+ }
+
+ //Postamble
+ f_cse_postamble_deleteResources();
+
+ //Tear down
+ f_cf01Down();
+ } // f_CSE_PP_005_RET
+
+ /**
+ * @desc Check that the IUT rejects the request when the originator does not have retrieve privileges for <primitiveProfile> resource referenced by the PrimitiveProfileIdentifier parameter
+ *
+ */
+ testcase TC_CSE_PP_005_DEL() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_PP_005_DEL());
+ v_ae1.done;
+ }
+
+ function f_CSE_PP_005_DEL() runs on AeSimu system CseSystem {
+ // Local variables
+ var template RequestPrimitive v_createPrimitiveProfile;
+ var integer v_aeIndex := -1;
+ var integer v_primitiveProfileIndex := -1;
+ var integer v_containerIndex := -1;
+ var MsgIn v_response;
+ var RequestPrimitive v_deleteRequest;
+
+ // Test component configuration
+ f_cf01Up();
+
+ // Preamble
+ f_cse_createAccessControlPolicyAux(-, -, int61);//c_CUDNDi) //No resource retrieval privilege
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
+
+ // Primitive Profile with Add atribute resultContent=1 for container resource.
+ v_createPrimitiveProfile := m_createPrimitiveProfileAddResultContentTo1({f_getOriginator(v_aeIndex)});
+ v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
+
+ //Create Container resource
+ v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
+
+ //Delete container resource with default resultContent (0-nothing)
+ v_deleteRequest := valueof(m_delete(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex)));
+ v_deleteRequest.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
+
+ f_send(e_mcaPort, m_request(v_deleteRequest));
+ tc_ac.start;
+
+ alt {
+ /*
+ // If primitive profile awas ignored, value of resultContent(0=nothing) will be applied
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(int2002, omit))) -> value v_response {
+ tc_ac.stop;
+ setverdict(pass, __SCOPE__ & ": Primitive Profile ignored as it is not accessible/does not exist");
+ }*/
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(int4136))) -> value v_response {
+ tc_ac.stop;
+ setverdict(pass, __SCOPE__ & ": IUT does not apply the primitive profile PRIMITIVE_PROFILE_NOT_ACCESSIBLE");
+
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Mismatch in status response code from IUT!");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": IUT accepted the create request with non existing primtive profile!");
+ }
+ [] tc_ac.timeout {
+ setverdict(fail, __SCOPE__ & ": No answer from IUT for the last Request!");
+ }
+ }
+
+ //Postamble
+ f_cse_postamble_deleteResources();
+
+ //Tear down
+ f_cf01Down();
+ } // f_CSE_PP_005_DEL
+
+
+ /**
+ * @desc Check that the IUT rejects the request when the originator does not have retrieve privileges for <primitiveProfile> resource referenced by the PrimitiveProfileIdentifier parameter
+ *
+ */
+ testcase TC_CSE_PP_005_UPD() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_PP_005_UPD());
+ v_ae1.done;
+ }
+
+ function f_CSE_PP_005_UPD() runs on AeSimu system CseSystem {
+ // Local variables
+ var template RequestPrimitive v_createPrimitiveProfile;
+ var RequestPrimitive v_updateContainer;
+ var ResponsePrimitive v_responsePrimitive;
+ var integer v_aeIndex := -1;
+ var integer v_primitiveProfileIndex := -1;
+ var integer v_createdContainerResource := -1;
+ var MsgIn v_response;
+
+ // Test component configuration
+ f_cf01Up();
+
+ // Preamble
+ f_cse_createAccessControlPolicyAux(-, -, int61);//c_CUDNDi) //No resource retrieval privilege
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
+
+ // Primitive Profile with add atribute "maxByte" = "100" for content resource.
+ v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
+ v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
+
+
+ //Create container resource without Primtive Profile ID and no maxByte attribte
+ v_createdContainerResource := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
+
+ //Update container request with Primitive Profile ID, and not including update for maxByte
+ v_updateContainer:= f_getUpdateRequestPrimitive(int3, v_aeIndex, m_updateContainerBase);
+
+ // Link Primitive Prifle created to this Request
+ v_updateContainer.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
+
+ f_send(e_mcaPort, m_request(v_updateContainer));
+ tc_ac.start;
+ alt {
+
+ /* commented out until TP is frozen-reject/accept
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
+ tc_ac.stop;
+ // Check that IUT applied the Primitive Profile
+ if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100){
+ setverdict(fail, __SCOPE__ & ": maxByteSize primitive value in invalid PrimitiveProfile applied to Update Container Request!");
+ } else {
+ setverdict(pass, __SCOPE__ & ": maxByteSize primitive value in invalid PrimitiveProfile not applied to Update Container Request!");
+ }
+ } */
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(int4136))) -> value v_response {
+ tc_ac.stop;
+ setverdict(pass, __SCOPE__ & ": IUT does not apply the primitive profile PRIMITIVE_PROFILE_NOT_ACCESSIBLE");
+
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Mismatch in status response code from IUT!");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": IUT accepted the create request with non existing primtive profile!");
+ }
+ [] tc_ac.timeout {
+ setverdict(fail, __SCOPE__ & ": No answer from IUT for the last Request!");
+ }
+ }
+
+ //Postamble
+ f_cse_postamble_deleteResources();
+
+ //Tear down
+ f_cf01Down();
+ } // f_CSE_PP_005_UPD
+ } //end group TC_CSE_PP_005
+
+
+
group TC_CSE_PP_006 {
/**
@@ -7370,19 +7728,22 @@ module OneM2M_Testcases_CSE_Release_4 {
function f_CSE_PP_006_CRE() runs on AeSimu system CseSystem {
// Local variables
- var template RequestPrimitive v_createPrimitveProfile;
+ var template RequestPrimitive v_createPrimitiveProfile;
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var MsgIn v_response;
- // Preambleo
+ // Test component configuration
+ f_cf01Up();
+
+ // Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with add atribute "maxByte" = "100" for content resource.
- v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
- v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+ v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
+ v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
//Create ACP with link to Primitive Profile created
v_request := valueof(m_createAcp(omit, -, int63));
@@ -7428,25 +7789,28 @@ module OneM2M_Testcases_CSE_Release_4 {
function f_CSE_PP_006_RET() runs on AeSimu system CseSystem {
// Local variables
- var template RequestPrimitive v_createPrimitveProfile;
+ var template RequestPrimitive v_createPrimitiveProfile;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var integer v_acpResourceIndex := -1;
var MsgIn v_response;
var RequestPrimitive v_retrieveRequest;
- // Preambleo
+ // Test component configuration
+ f_cf01Up();
+
+ // Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with add atribute "maxByte" = "100" for content resource.
- v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
- v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+ v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
+ v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
//Create ACP with link to Primitive Profile created
v_acpResourceIndex := f_cse_createResource(int1, m_createAcpBase, v_aeIndex);
- //Retrieve ACP resource with link to Primitve Profile
+ //Retrieve ACP resource with link to Primitive Profile
v_retrieveRequest := valueof(m_retrieve(f_getResourceAddress(v_acpResourceIndex), f_getOriginator(v_acpResourceIndex)));
v_retrieveRequest.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
f_send(e_mcaPort, m_request(v_retrieveRequest));
@@ -7489,20 +7853,23 @@ module OneM2M_Testcases_CSE_Release_4 {
function f_CSE_PP_006_DEL() runs on AeSimu system CseSystem {
// Local variables
- var template RequestPrimitive v_createPrimitveProfile;
+ var template RequestPrimitive v_createPrimitiveProfile;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var integer v_acpResourceIndex := -1;
var MsgIn v_response;
var RequestPrimitive v_deleteRequest;
- // Preambleo
+ // Test component configuration
+ f_cf01Up();
+
+ // Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with add atribute "maxByte" = "100" for content resource.
- v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
- v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+ v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
+ v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
//Create ACP
v_acpResourceIndex := f_cse_createResource(int1, m_createAcpBase, v_aeIndex);
@@ -7551,20 +7918,23 @@ module OneM2M_Testcases_CSE_Release_4 {
function f_CSE_PP_006_UPD() runs on AeSimu system CseSystem {
// Local variables
- var template RequestPrimitive v_createPrimitveProfile;
+ var template RequestPrimitive v_createPrimitiveProfile;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var integer v_acpResourceIndex := -1;
var MsgIn v_response;
var RequestPrimitive v_updateAcpRequest;
+ // Test component configuration
+ f_cf01Up();
+
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with add atribute "maxByte" = "100" for content resource.
- v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
- v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+ v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
+ v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
//Create ACP resource
@@ -7574,7 +7944,7 @@ module OneM2M_Testcases_CSE_Release_4 {
v_updateAcpRequest := f_getUpdateRequestPrimitive(int1, v_aeIndex, m_updateAcpBase);
v_updateAcpRequest.primitiveContent.accessControlPolicy.labels := {"VALUE_1"};
- // Link Primitve Prifle created to non matching Primitive Profile
+ // Link Primitive Prifle created to non matching Primitive Profile
v_updateAcpRequest.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
f_send(e_mcaPort, m_request(v_updateAcpRequest));
@@ -7605,6 +7975,126 @@ module OneM2M_Testcases_CSE_Release_4 {
} // f_CSE_PP_006_UPD
}//end group TC_CSE_PP_006
+ /**
+ * @desc Check that the IUT rejects the creation of <primitiveProfile> resource request when the request parameters or resource attributes defined in the additions and deletions attributes of the referenced <primitiveProfile> resource are not valid
+ *
+ */
+ testcase TC_CSE_PP_007() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_PP_007());
+ v_ae1.done;
+ }
+
+ function f_CSE_PP_007() runs on AeSimu system CseSystem {
+ // Local variables
+ var RequestPrimitive v_createPrimitiveProfile;
+ var RequestPrimitive v_updateContainer;
+ var ResponsePrimitive v_responsePrimitive;
+ var integer v_aeIndex := -1;
+ var integer v_primitiveProfileIndex := -1;
+ var integer v_acpResourceIndex := -1;
+ var MsgIn v_response;
+ var RequestPrimitive v_updateAcpRequest;
+
+ // Test component configuration
+ f_cf01Up();
+
+ // Preamble
+ f_cse_createAccessControlPolicyAux(-, -, int63);
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
+
+ // Primitive Profile With Invalid Additions Or Deletions attribute
+ v_createPrimitiveProfile := valueof(m_createPrimitiveProfileWithInvalidAdditionsOrDeletions({f_getOriginator(v_aeIndex)}));
+
+ f_send(e_mcaPort, m_request(v_createPrimitiveProfile));
+ tc_ac.start;
+ alt {
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(int4137))) -> value v_response {
+ tc_ac.stop;
+ setverdict(pass, __SCOPE__ & ": IUT rejected Primitive Profile with PRIMITIVE_PROFILE_BAD REQUEST");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Mismatch in status response code from IUT!");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": IUT accepted Primitive Profile with invalid parametres/attributes in additions/deletions!");
+ }
+ [] tc_ac.timeout {
+ setverdict(fail, __SCOPE__ & ": No answer from IUT for the last Request!");
+ }
+ }
+
+ //Postamble
+ f_cse_postamble_deleteResources();
+
+ //Tear down
+ f_cf01Down();
+ } // f_CSE_PP_007
+
+
+ /**
+ * @desc Check that the IUT rejects the update request of <primitiveProfile> resource when the request parameters or resource attributes defined in the additions and deletions attributes of the referenced <primitiveProfile> resource are not valid
+ *
+ */
+ testcase TC_CSE_PP_008() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_PP_008());
+ v_ae1.done;
+ }
+
+ function f_CSE_PP_008() runs on AeSimu system CseSystem {
+ // Local variables
+ var template RequestPrimitive v_createPrimitiveProfile;
+ var integer v_aeIndex := -1;
+ var integer v_primitiveProfileIndex := -1;
+ var MsgIn v_response;
+ var RequestPrimitive v_updatePrimitiveProfileRequest;
+
+ // Test component configuration
+ f_cf01Up();
+
+ // Preamble
+ f_cse_createAccessControlPolicyAux(-, -, int63);
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
+
+ // Primitive Profile with add atribute "maxByte" = "100" for content resource.
+ v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
+ v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
+
+ v_updatePrimitiveProfileRequest := f_getUpdateRequestPrimitive(int62, v_primitiveProfileIndex, m_updatePrimitiveProfileWithInvalidAdditionsOrDeletions);
+
+ f_send(e_mcaPort, m_request(v_updatePrimitiveProfileRequest));
+ tc_ac.start;
+ alt {
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(int4137))) -> value v_response {
+ tc_ac.stop;
+ setverdict(pass, __SCOPE__ & ": IUT rejected Primitive Profile with PRIMITIVE_PROFILE_BAD REQUEST");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Mismatch in status response code from IUT!");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": IUT accepted Primitive Profile with invalid parametres/attributes in additions/deletions!");
+ }
+ [] tc_ac.timeout {
+ setverdict(fail, __SCOPE__ & ": No answer from IUT for the last Request!");
+ }
+ }
+
+ //Postamble
+ f_cse_postamble_deleteResources();
+
+ //Tear down
+ f_cf01Down();
+ } // f_CSE_PP_008
+
+
/**
* @desc Check that the IUT rejects the creation of a <primitiveProfile> resource when a mutual exclusivity check is failed, on the names of the attributes or parameters specified in the additions and deletions attributes.
*
@@ -7618,26 +8108,29 @@ module OneM2M_Testcases_CSE_Release_4 {
function f_CSE_PP_009() runs on AeSimu system CseSystem {
// Local variables
- var RequestPrimitive v_createPrimitveProfile;
+ var RequestPrimitive v_createPrimitiveProfile;
var RequestPrimitive v_requestContainerCreate;
var ResponsePrimitive v_responsePrimitive;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var MsgIn v_response;
- // Preambleo
+ // Test component configuration
+ f_cf01Up();
+
+ // Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with attribute of Container resource 'MaxByte' to be added and deleted simultaneously.
- v_createPrimitveProfile := valueof(m_createPrimitveProfileAddNonMutuallyExclusive({f_getOriginator(v_aeIndex)}));
+ v_createPrimitiveProfile := valueof(m_createPrimitiveProfileAddNonMutuallyExclusive({f_getOriginator(v_aeIndex)}));
- f_send(e_mcaPort, m_request(v_createPrimitveProfile));
+ f_send(e_mcaPort, m_request(v_createPrimitiveProfile));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response {
tc_ac.stop;
- setverdict(pass, __SCOPE__ & ": IUT rejected Primitve Profile with attributes that are not mutually exclusive!");
+ setverdict(pass, __SCOPE__ & ": IUT rejected Primitive Profile with attributes that are not mutually exclusive!");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
@@ -7645,7 +8138,7 @@ module OneM2M_Testcases_CSE_Release_4 {
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": IUT accepted Primitve Profile with attributes that are not mutually exclusive!");
+ setverdict(fail, __SCOPE__ & ": IUT accepted Primitive Profile with attributes that are not mutually exclusive!");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer from IUT for the last Request!");
@@ -7672,19 +8165,22 @@ module OneM2M_Testcases_CSE_Release_4 {
function f_CSE_PP_010() runs on AeSimu system CseSystem {
// Local variables
- var template RequestPrimitive v_createPrimitveProfile;
+ var template RequestPrimitive v_createPrimitiveProfile;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var MsgIn v_response;
var RequestPrimitive v_updatePrimitiveProfileRequest;
- // Preambleo
+ // Test component configuration
+ f_cf01Up();
+
+ // Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with add atribute "maxByte" = "100" for content resource.
- v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
- v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+ v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
+ v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
v_updatePrimitiveProfileRequest := f_getUpdateRequestPrimitive(int62, v_primitiveProfileIndex, m_updatePrimitiveProfileNonMutuallyExclusive);
@@ -7693,7 +8189,7 @@ module OneM2M_Testcases_CSE_Release_4 {
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response {
tc_ac.stop;
- setverdict(pass, __SCOPE__ & ": IUT rejected Primitve Profile with attributes that are not mutually exclusive!");
+ setverdict(pass, __SCOPE__ & ": IUT rejected Primitive Profile with attributes that are not mutually exclusive!");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
@@ -7701,7 +8197,7 @@ module OneM2M_Testcases_CSE_Release_4 {
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": IUT accepted Primitve Profile with attributes that are not mutually exclusive!");
+ setverdict(fail, __SCOPE__ & ": IUT accepted Primitive Profile with attributes that are not mutually exclusive!");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer from IUT for the last Request!");
@@ -7728,7 +8224,7 @@ module OneM2M_Testcases_CSE_Release_4 {
function f_CSE_PP_011() runs on AeSimu system CseSystem {
// Local variables
- var RequestPrimitive v_createPrimitveProfile;
+ var RequestPrimitive v_createPrimitiveProfile;
var RequestPrimitive v_updateContainer;
var ResponsePrimitive v_responsePrimitive;
var integer v_aeIndex := -1;
@@ -7737,19 +8233,22 @@ module OneM2M_Testcases_CSE_Release_4 {
var MsgIn v_response;
var RequestPrimitive v_updateAcpRequest;
+ // Test component configuration
+ f_cf01Up();
+
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile for adding non permissible parameters.
- v_createPrimitveProfile := valueof(m_createPrimitveProfileAddNonPermissibleAttribute({f_getOriginator(v_aeIndex)}));
+ v_createPrimitiveProfile := valueof(m_createPrimitiveProfileAddNonPermissibleAttribute({f_getOriginator(v_aeIndex)}));
- f_send(e_mcaPort, m_request(v_createPrimitveProfile));
+ f_send(e_mcaPort, m_request(v_createPrimitiveProfile));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response {
tc_ac.stop;
- setverdict(pass, __SCOPE__ & ": IUT rejected Primitve Profile with non permissible parameters!");
+ setverdict(pass, __SCOPE__ & ": IUT rejected Primitive Profile with non permissible parameters!");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
@@ -7757,7 +8256,7 @@ module OneM2M_Testcases_CSE_Release_4 {
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": IUT accepted Primitve Profile with non permissible parameters!");
+ setverdict(fail, __SCOPE__ & ": IUT accepted Primitive Profile with non permissible parameters!");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer from IUT for the last Request!");
@@ -7784,19 +8283,22 @@ module OneM2M_Testcases_CSE_Release_4 {
function f_CSE_PP_012() runs on AeSimu system CseSystem {
// Local variables
- var template RequestPrimitive v_createPrimitveProfile;
+ var template RequestPrimitive v_createPrimitiveProfile;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var MsgIn v_response;
var RequestPrimitive v_updatePrimitiveProfileRequest;
- // Preambleo
+ // Test component configuration
+ f_cf01Up();
+
+ // Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with add atribute "maxByte" = "100" for content resource.
- v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
- v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+ v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
+ v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
v_updatePrimitiveProfileRequest := f_getUpdateRequestPrimitive(int62, v_primitiveProfileIndex, m_updatePrimitiveProfileNonPermissibleParameters);
@@ -7805,7 +8307,7 @@ module OneM2M_Testcases_CSE_Release_4 {
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response {
tc_ac.stop;
- setverdict(pass, __SCOPE__ & ": IUT rejected Primitve Profile with non permissible parameters!");
+ setverdict(pass, __SCOPE__ & ": IUT rejected Primitive Profile with non permissible parameters!");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
@@ -7813,7 +8315,7 @@ module OneM2M_Testcases_CSE_Release_4 {
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": IUT accepted Primitve Profile with non permissible parameters!");
+ setverdict(fail, __SCOPE__ & ": IUT accepted Primitive Profile with non permissible parameters!");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer from IUT for the last Request!");
@@ -7848,7 +8350,7 @@ module OneM2M_Testcases_CSE_Release_4 {
var template PrimitiveContent v_contentResponse;
var RequestPrimitive v_requestContainerCreate;
var ResponsePrimitive v_responsePrimitive;
- var template RequestPrimitive v_createPrimitveProfile;
+ var template RequestPrimitive v_createPrimitiveProfile;
// Test control
if(not PICS_NON_BLOCKING_REQUEST_SYNCH){
@@ -7856,15 +8358,16 @@ module OneM2M_Testcases_CSE_Release_4 {
stop;
}
+ // Test component configuration
f_cf01Up();
-
+
// AE registration
v_aeIndex := f_cse_preamble_registerAe(-, {f_getLocalPoA(vc_aeSimuDesc.mcaPortIn, "")});//c_CRUDNDi);
f_checkAeSimuStatus();
// Primitive Profile with attribute of Container resource 'MaxByte' to be deleted from response.
- v_createPrimitveProfile := m_createPrimitveProfileDeleteFromResponse({f_getOriginator(v_aeIndex)});
- v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+ v_createPrimitiveProfile := m_createPrimitiveProfileDeleteFromResponse({f_getOriginator(v_aeIndex)});
+ v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
// Container create with response type as nonBlockingRequestAsynch
v_requestContainerCreate := f_getCreateRequestPrimitive(int3, m_createContainerMaxByte(100), v_aeIndex);
@@ -7976,7 +8479,7 @@ module OneM2M_Testcases_CSE_Release_4 {
var OneM2M_Types.URI v_requestResourceURI;
var template PrimitiveContent v_primitiveContent;
var template RequestPrimitive v_createContainerRequest := m_createContainerBase;
- var template RequestPrimitive v_createPrimitveProfile;
+ var template RequestPrimitive v_createPrimitiveProfile;
// Test control
if(not PICS_NON_BLOCKING_REQUEST_SYNCH){
@@ -7997,8 +8500,8 @@ module OneM2M_Testcases_CSE_Release_4 {
v_aeIndex := f_cse_preamble_registerAe();
// Primitive Profile with attribute of Container resource 'MaxByte' to be added to response.
- v_createPrimitveProfile := m_createPrimitveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
- v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+ v_createPrimitiveProfile := m_createPrimitiveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
+ v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
// Create resource with responseType as nonBlockingRequestSynch
v_createContainerRequest.to_ := f_getResourceAddress(v_aeIndex);
@@ -8049,7 +8552,7 @@ module OneM2M_Testcases_CSE_Release_4 {
tc_ac.stop;
if (valueof(v_response.primitive.responsePrimitive.primitiveContent.request.operationResult.responseStatusCode) == int2001){
- // Check that IUT applied the Primitve Profile
+ // Check that IUT applied the Primitive Profile
if(v_response.primitive.responsePrimitive.primitiveContent.request.operationResult.primitiveContent.container.maxByteSize == 100){
setverdict(pass, __SCOPE__ & ": Primitive Profile applied to response primtive!");
} else {
@@ -8113,7 +8616,7 @@ module OneM2M_Testcases_CSE_Release_4 {
var template PrimitiveContent v_contentNotification := {container := mw_contentContainerWithoutMaxByteSize};// container without MaxByteSize
var RequestPrimitive v_request;
var integer v_ae2Index := -1;
- var template RequestPrimitive v_createPrimitveProfile;
+ var template RequestPrimitive v_createPrimitiveProfile;
// Test control
@@ -8126,8 +8629,8 @@ module OneM2M_Testcases_CSE_Release_4 {
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
// Primitive Profile with attribute of Container resource 'MaxByte' to be deleted from response.
- v_createPrimitveProfile := m_createPrimitveProfileDeleteFromResponse({f_getOriginator(v_aeIndex)});
- v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+ v_createPrimitiveProfile := m_createPrimitiveProfileDeleteFromResponse({f_getOriginator(v_aeIndex)});
+ v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
//Subscription resource with notification to AE2 about container creation
v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria({int3}), -, omit, omit, omit, -, omit);
@@ -8189,13 +8692,14 @@ module OneM2M_Testcases_CSE_Release_4 {
}
function f_CSE_PP_016_CRE() runs on CseSimu system CseSystem {
- var template RequestPrimitive v_createPrimitveProfile;
+ var template RequestPrimitive v_createPrimitiveProfile;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var integer v_remoteCseIndex := -1;
var XSD.ID v_targetResourceAddress;
var template RequestPrimitive v_createContainerRequest := m_createContainerBase;
+ // Test component configuration
f_cf02UpCseSimuMaster();
//Register remote CSE
@@ -8208,8 +8712,8 @@ module OneM2M_Testcases_CSE_Release_4 {
v_aeIndex := f_getLatestResourceIndex(vc_ae1);
//Create Primitive Profile from AE1 to add MaxByte Primtive to container resource creation
- v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
- vc_ae1.start(f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex));
+ v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
+ vc_ae1.start(f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex));
v_primitiveProfileIndex := f_getLatestResourceIndex(vc_ae1);
//Create container resource from AE1 with To as ID of remoteCSE
@@ -8268,7 +8772,7 @@ module OneM2M_Testcases_CSE_Release_4 {
}
function f_CSE_PP_016_RET() runs on CseSimu system CseSystem {
- var template RequestPrimitive v_createPrimitveProfile;
+ var template RequestPrimitive v_createPrimitiveProfile;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var integer v_remoteCseIndex := -1;
@@ -8277,6 +8781,7 @@ module OneM2M_Testcases_CSE_Release_4 {
var template RequestPrimitive v_createContainerRequest := m_createContainerBase;
var RequestPrimitive v_retrieveRequest;
+ // Test component configuration
f_cf02UpCseSimuMaster();
//Register remote CSE
@@ -8289,15 +8794,15 @@ module OneM2M_Testcases_CSE_Release_4 {
v_aeIndex := f_getLatestResourceIndex(vc_ae1);
//Create Primitive Profile from AE1, to add primtive resultContent=4 for container resource retrieval
- v_createPrimitveProfile := m_createPrimitveProfileAddResultContentTo4({f_getOriginator(v_aeIndex)});
- vc_ae1.start(f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex));
+ v_createPrimitiveProfile := m_createPrimitiveProfileAddResultContentTo4({f_getOriginator(v_aeIndex)});
+ vc_ae1.start(f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex));
v_primitiveProfileIndex := f_getLatestResourceIndex(vc_ae1);
// Create local container resource at Hosting CSE
v_targetResourceIndex := f_generateAndSetLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainerBase)), vc_cSEBaseIndex, int3);
v_targetResourceAddress := f_getLocalResourceAddress(v_targetResourceIndex, PX_ADDRESSING_METHOD, e_spRelative);
- //Retrieve the container resource from AE1, without any resultContent but with link to Primitve Profile created by AE1
+ //Retrieve the container resource from AE1, without any resultContent but with link to Primitive Profile created by AE1
v_retrieveRequest := valueof(m_retrieve(v_targetResourceAddress, f_getResourceAddress(v_aeIndex)));
v_retrieveRequest.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
vc_ae1.start(f_cse_operationResource(v_retrieveRequest));
@@ -8350,7 +8855,7 @@ module OneM2M_Testcases_CSE_Release_4 {
}
function f_CSE_PP_016_DEL() runs on CseSimu system CseSystem {
- var template RequestPrimitive v_createPrimitveProfile;
+ var template RequestPrimitive v_createPrimitiveProfile;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var integer v_remoteCseIndex := -1;
@@ -8359,6 +8864,7 @@ module OneM2M_Testcases_CSE_Release_4 {
var RequestPrimitive v_deleteRequest;
var integer v_targetResourceIndex := -1;
+ // Test component configuration
f_cf02UpCseSimuMaster();
//Register remote CSE
@@ -8371,8 +8877,8 @@ module OneM2M_Testcases_CSE_Release_4 {
v_aeIndex := f_getLatestResourceIndex(vc_ae1);
// Primitive Profile with Add atribute resultContent=4 for container resource delete request.
- v_createPrimitveProfile := m_createPrimitveProfileAddResultContentTo4({f_getOriginator(v_aeIndex)});
- vc_ae1.start(f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex));
+ v_createPrimitiveProfile := m_createPrimitiveProfileAddResultContentTo4({f_getOriginator(v_aeIndex)});
+ vc_ae1.start(f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex));
v_primitiveProfileIndex := f_getLatestResourceIndex(vc_ae1);
// Create local container resource at Hosting CSE
@@ -8434,7 +8940,7 @@ module OneM2M_Testcases_CSE_Release_4 {
}
function f_CSE_PP_016_UPD() runs on CseSimu system CseSystem {
- var template RequestPrimitive v_createPrimitveProfile;
+ var template RequestPrimitive v_createPrimitiveProfile;
var integer v_aeIndex := -1;
var integer v_primitiveProfileIndex := -1;
var integer v_remoteCseIndex := -1;
@@ -8442,6 +8948,7 @@ module OneM2M_Testcases_CSE_Release_4 {
var XSD.ID v_targetResourceAddress;
var template RequestPrimitive v_updateContainer := m_updateContainerBase;
+ // Test component configuration
f_cf02UpCseSimuMaster();
//Register remote CSE
@@ -8454,8 +8961,8 @@ module OneM2M_Testcases_CSE_Release_4 {
v_aeIndex := f_getLatestResourceIndex(vc_ae1);
//Create Primitive Profile from AE1, to add MaByte primitive to create container request
- v_createPrimitveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
- vc_ae1.start(f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex));
+ v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
+ vc_ae1.start(f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex));
v_primitiveProfileIndex := f_getLatestResourceIndex(vc_ae1);
// Create Local container resource in Hosting CSE
@@ -8529,8 +9036,9 @@ module OneM2M_Testcases_CSE_Release_4 {
var template PrimitiveContent v_contentResponse;
var RequestPrimitive v_requestContainerCreate;
var ResponsePrimitive v_responsePrimitive;
- var template RequestPrimitive v_createPrimitveProfile;
+ var template RequestPrimitive v_createPrimitiveProfile;
+ // Test component configuration
f_cf01Up();
// AE registration
@@ -8538,8 +9046,8 @@ module OneM2M_Testcases_CSE_Release_4 {
f_checkAeSimuStatus();
// Primitive Profile with attribute of Container resource 'MaxByte' to be added to response.
- v_createPrimitveProfile := m_createPrimitveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
- v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+ v_createPrimitiveProfile := m_createPrimitiveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
+ v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
//Create container resource without "maxByte" primitive, but with link to Primitive Profile created
v_requestContainerCreate := f_getCreateRequestPrimitive(int3, m_createContainerBase, v_aeIndex);
@@ -8550,7 +9058,7 @@ module OneM2M_Testcases_CSE_Release_4 {
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
tc_ac.stop;
- // Check that IUT applied the Primitve Profile
+ // Check that IUT applied the Primitive Profile
if(ispresent(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize)){
if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100) {
setverdict(pass, __SCOPE__ & ": Primitive Profile applied to response primtive!");
@@ -8598,10 +9106,11 @@ module OneM2M_Testcases_CSE_Release_4 {
var integer v_aeIndex := -1;
var integer v_containerIndex := -1;
var integer v_primitiveProfileIndex := -1;
- var template RequestPrimitive v_createPrimitveProfile;
+ var template RequestPrimitive v_createPrimitiveProfile;
var template PrimitiveContent v_deleteContentResponse;
var RequestPrimitive v_deleteRequest;
+ // Test component configuration
f_cf01Up();
// AE registration
@@ -8609,8 +9118,8 @@ module OneM2M_Testcases_CSE_Release_4 {
f_checkAeSimuStatus();
// Primitive Profile with attribute of Container resource 'MaxByte' to be added to response.
- v_createPrimitveProfile := m_createPrimitveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
- v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+ v_createPrimitiveProfile := m_createPrimitiveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
+ v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
// Set expected container in response as per resultContent=1
v_deleteContentResponse.container := mw_contentContainer_rc1;
@@ -8628,7 +9137,7 @@ module OneM2M_Testcases_CSE_Release_4 {
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002, v_deleteContentResponse))) -> value v_response {
tc_ac.stop;
- // Check that IUT applied the Primitve Profile
+ // Check that IUT applied the Primitive Profile
if(ispresent(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize)){
if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100) {
setverdict(pass, __SCOPE__ & ": Primitive Profile applied to response primtive!");
@@ -8681,10 +9190,11 @@ module OneM2M_Testcases_CSE_Release_4 {
var integer v_containerIndex := -1;
var integer v_aeIndex := -1;
var RequestPrimitive v_requestContainerCreate;
- var template RequestPrimitive v_createPrimitveProfile;
+ var template RequestPrimitive v_createPrimitiveProfile;
var RequestPrimitive v_retrieveRequest;
var template PrimitiveContent v_retriveContentResponse;
+ // Test component configuration
f_cf01Up();
// AE registration
@@ -8692,8 +9202,8 @@ module OneM2M_Testcases_CSE_Release_4 {
f_checkAeSimuStatus();
// Primitive Profile with attribute of Container resource 'MaxByte' to be added to response.
- v_createPrimitveProfile := m_createPrimitveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
- v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+ v_createPrimitiveProfile := m_createPrimitiveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
+ v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
// Set expected container in response
v_retriveContentResponse.container := mw_contentContainerBase;
@@ -8701,7 +9211,7 @@ module OneM2M_Testcases_CSE_Release_4 {
//Create container resource without "maxByte" primitive
v_containerIndex := f_cse_createResource(int62, m_createContainerBase, v_aeIndex);
- //Retrieve container with link to Primitve Profile
+ //Retrieve container with link to Primitive Profile
v_retrieveRequest := valueof(m_retrieve(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex)));
v_requestContainerCreate.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
f_send(e_mcaPort, m_request(v_retrieveRequest));
@@ -8710,7 +9220,7 @@ module OneM2M_Testcases_CSE_Release_4 {
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_retriveContentResponse))) -> value v_response {
tc_ac.stop;
- // Check that IUT applied the Primitve Profile
+ // Check that IUT applied the Primitive Profile
if(ispresent(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize)){
if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100) {
setverdict(pass, __SCOPE__ & ": Primitive Profile applied to response primtive!");
@@ -8759,7 +9269,7 @@ module OneM2M_Testcases_CSE_Release_4 {
function f_CSE_PP_017_UPD() runs on AeSimu system CseSystem {
// Local variables
- var template RequestPrimitive v_createPrimitveProfile;
+ var template RequestPrimitive v_createPrimitiveProfile;
var RequestPrimitive v_updateContainer;
var ResponsePrimitive v_responsePrimitive;
var integer v_aeIndex := -1;
@@ -8767,13 +9277,16 @@ module OneM2M_Testcases_CSE_Release_4 {
var integer v_createdContainerResource := -1;
var MsgIn v_response;
+ // Test component configuration
+ f_cf01Up();
+
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with attribute of Container resource 'MaxByte' to be deleted from response.
- v_createPrimitveProfile := m_createPrimitveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
- v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+ v_createPrimitiveProfile := m_createPrimitiveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
+ v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
//Create container resource without Primtive Profile ID and no maxByte attribte
v_createdContainerResource := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
@@ -8781,7 +9294,7 @@ module OneM2M_Testcases_CSE_Release_4 {
//Update container request with Primitive Profile ID, and without including update for maxByte
v_updateContainer:= f_getUpdateRequestPrimitive(int3, v_aeIndex, m_createContainerBase);
- // Link Primitve Prifle created to this Request
+ // Link Primitive Prifle created to this Request
v_updateContainer.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
f_send(e_mcaPort, m_request(v_updateContainer));
@@ -8789,7 +9302,7 @@ module OneM2M_Testcases_CSE_Release_4 {
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
tc_ac.stop;
- // Check that IUT applied the Primitve Profile
+ // Check that IUT applied the Primitive Profile
if(ispresent(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize)){
if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100) {
setverdict(pass, __SCOPE__ & ": Primitive Profile applied to response primtive!");
@@ -8843,8 +9356,9 @@ module OneM2M_Testcases_CSE_Release_4 {
var template PrimitiveContent v_contentResponse;
var RequestPrimitive v_requestContainerCreate;
var ResponsePrimitive v_responsePrimitive;
- var template RequestPrimitive v_createPrimitveProfile;
+ var template RequestPrimitive v_createPrimitiveProfile;
+ // Test component configuration
f_cf01Up();
// AE registration
@@ -8853,12 +9367,12 @@ module OneM2M_Testcases_CSE_Release_4 {
f_checkAeSimuStatus();
// Primitive Profile with attribute of Container resource 'MaxByte' to be deleted from response.
- v_createPrimitveProfile := m_createPrimitveProfileDeleteFromResponse({f_getOriginator(v_aeIndex)});
- v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+ v_createPrimitiveProfile := m_createPrimitiveProfileDeleteFromResponse({f_getOriginator(v_aeIndex)});
+ v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
//Create container resource with "maxByte" primitive
v_requestContainerCreate := f_getCreateRequestPrimitive(int3, m_createContainerMaxByte(100), v_aeIndex);
- // Link Primitve Prifle, which was deleted, to this Request
+ // Link Primitive Prifle, which was deleted, to this Request
v_requestContainerCreate.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
f_send(e_mcaPort, m_request(v_request));
@@ -8866,7 +9380,7 @@ module OneM2M_Testcases_CSE_Release_4 {
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
tc_ac.stop;
- // Check that IUT applied the Primitve Profile
+ // Check that IUT applied the Primitive Profile
if(ispresent(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize)){
setverdict(fail, __SCOPE__ & ": Primitive Profile not applied to response primtive!");
} else {
@@ -8910,10 +9424,11 @@ module OneM2M_Testcases_CSE_Release_4 {
var integer v_aeIndex := -1;
var integer v_containerIndex := -1;
var integer v_primitiveProfileIndex := -1;
- var template RequestPrimitive v_createPrimitveProfile;
+ var template RequestPrimitive v_createPrimitiveProfile;
var template PrimitiveContent v_deleteContentResponse;
var RequestPrimitive v_deleteRequest;
+ // Test component configuration
f_cf01Up();
// AE registration
@@ -8921,8 +9436,8 @@ module OneM2M_Testcases_CSE_Release_4 {
f_checkAeSimuStatus();
// Primitive Profile with attribute of Container resource 'MaxByte' to be deleted from response.
- v_createPrimitveProfile := m_createPrimitveProfileDeleteFromResponse({f_getOriginator(v_aeIndex)});
- v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+ v_createPrimitiveProfile := m_createPrimitiveProfileDeleteFromResponse({f_getOriginator(v_aeIndex)});
+ v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
// Set expected container in response as per resultContent=1
v_deleteContentResponse.container := mw_contentContainer_rc1;
@@ -8940,7 +9455,7 @@ module OneM2M_Testcases_CSE_Release_4 {
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002, v_deleteContentResponse))) -> value v_response {
tc_ac.stop;
- // Check that IUT applied the Primitve Profile
+ // Check that IUT applied the Primitive Profile
if(ispresent(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize)){
setverdict(fail, __SCOPE__ & ": IUT did not apply primtive profile to the response primtive!");
} else {
@@ -8980,7 +9495,7 @@ module OneM2M_Testcases_CSE_Release_4 {
function f_CSE_PP_018_RET() runs on AeSimu system CseSystem {
// Local variables
- var template RequestPrimitive v_createPrimitveProfile;
+ var template RequestPrimitive v_createPrimitiveProfile;
var RequestPrimitive v_updateContainer;
var ResponsePrimitive v_responsePrimitive;
var integer v_aeIndex := -1;
@@ -8990,13 +9505,16 @@ module OneM2M_Testcases_CSE_Release_4 {
var template PrimitiveContent v_retriveContentResponse;
var RequestPrimitive v_retrieveRequest;
+ // Test component configuration
+ f_cf01Up();
+
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with attribute of Container resource 'MaxByte' to be deleted from response.
- v_createPrimitveProfile := m_createPrimitveProfileDeleteFromResponse({f_getOriginator(v_aeIndex)});
- v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+ v_createPrimitiveProfile := m_createPrimitiveProfileDeleteFromResponse({f_getOriginator(v_aeIndex)});
+ v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
// Set expected container in response
v_retriveContentResponse.container := mw_contentContainerBase;
@@ -9004,7 +9522,7 @@ module OneM2M_Testcases_CSE_Release_4 {
//Create container resource with maxByte attribte
v_createdContainerResourceIndex := f_cse_createResource(int3, m_updateContainerMaxByte(100), v_aeIndex);
- //Retrieve container with link to Primitve Profile
+ //Retrieve container with link to Primitive Profile
v_retrieveRequest := valueof(m_retrieve(f_getResourceAddress(v_createdContainerResourceIndex), f_getOriginator(v_createdContainerResourceIndex)));
v_retrieveRequest.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
f_send(e_mcaPort, m_request(v_retrieveRequest));
@@ -9013,7 +9531,7 @@ module OneM2M_Testcases_CSE_Release_4 {
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_retriveContentResponse))) -> value v_response {
tc_ac.stop;
- // Check that IUT applied the Primitve Profile
+ // Check that IUT applied the Primitive Profile
if(ispresent(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize)){
setverdict(fail, __SCOPE__ & ": Primitive Profile not applied to response primtive!");
} else {
@@ -9053,7 +9571,7 @@ module OneM2M_Testcases_CSE_Release_4 {
function f_CSE_PP_018_UPD() runs on AeSimu system CseSystem {
// Local variables
- var template RequestPrimitive v_createPrimitveProfile;
+ var template RequestPrimitive v_createPrimitiveProfile;
var RequestPrimitive v_updateContainer;
var ResponsePrimitive v_responsePrimitive;
var integer v_aeIndex := -1;
@@ -9061,13 +9579,16 @@ module OneM2M_Testcases_CSE_Release_4 {
var integer v_createdContainerResource := -1;
var MsgIn v_response;
+ // Test component configuration
+ f_cf01Up();
+
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with attribute of Container resource 'MaxByte' to be deleted from response.
- v_createPrimitveProfile := m_createPrimitveProfileDeleteFromResponse({f_getOriginator(v_aeIndex)});
- v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+ v_createPrimitiveProfile := m_createPrimitiveProfileDeleteFromResponse({f_getOriginator(v_aeIndex)});
+ v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
//Create container resource without Primtive Profile ID and no maxByte attribte
v_createdContainerResource := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
@@ -9075,7 +9596,7 @@ module OneM2M_Testcases_CSE_Release_4 {
//Update container request with Primitive Profile ID, and including update for maxByte
v_updateContainer:= f_getUpdateRequestPrimitive(int3, v_aeIndex, m_updateContainerMaxByte(100));
- // Link Primitve Prifle created to this Request
+ // Link Primitive Prifle created to this Request
v_updateContainer.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
f_send(e_mcaPort, m_request(v_updateContainer));
@@ -9083,7 +9604,7 @@ module OneM2M_Testcases_CSE_Release_4 {
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
tc_ac.stop;
- // Check that IUT applied the Primitve Profile
+ // Check that IUT applied the Primitive Profile
if(ispresent(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize)){
setverdict(fail, __SCOPE__ & ": Primitive Profile to delete a primitive not applied to response!!");
} else {
@@ -9134,8 +9655,9 @@ module OneM2M_Testcases_CSE_Release_4 {
var template PrimitiveContent v_contentResponse;
var RequestPrimitive v_requestContainerCreate;
var ResponsePrimitive v_responsePrimitive;
- var template RequestPrimitive v_createPrimitveProfile;
+ var template RequestPrimitive v_createPrimitiveProfile;
+ // Test component configuration
f_cf01Up();
// AE registration
@@ -9143,12 +9665,12 @@ module OneM2M_Testcases_CSE_Release_4 {
f_checkAeSimuStatus();
// Primitive Profile with attribute of Container resource 'MaxByte'=100 to be added to response.
- v_createPrimitveProfile := m_createPrimitveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
- v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+ v_createPrimitiveProfile := m_createPrimitiveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
+ v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
//Create container resource with "maxByte"=1000
v_requestContainerCreate := f_getCreateRequestPrimitive(int3, m_createContainerMaxByte(1000), v_aeIndex);
- // Link Primitve Prifle, which was deleted, to this Request
+ // Link Primitive Prifle, which was deleted, to this Request
v_requestContainerCreate.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
f_send(e_mcaPort, m_request(v_request));
@@ -9156,7 +9678,7 @@ module OneM2M_Testcases_CSE_Release_4 {
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
tc_ac.stop;
- // Check that IUT applied the Primitve Profile
+ // Check that IUT applied the Primitive Profile
if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100){
setverdict(pass, __SCOPE__ & ": Primitive Profile applied to response primtive!");
} else {
@@ -9200,9 +9722,10 @@ module OneM2M_Testcases_CSE_Release_4 {
var integer v_containerIndex := -1;
var template PrimitiveContent v_contentResponse;
var template PrimitiveContent v_deleteContentResponse;
- var template RequestPrimitive v_createPrimitveProfile;
+ var template RequestPrimitive v_createPrimitiveProfile;
var RequestPrimitive v_deleteRequest;
+ // Test component configuration
f_cf01Up();
// AE registration
@@ -9210,8 +9733,8 @@ module OneM2M_Testcases_CSE_Release_4 {
f_checkAeSimuStatus();
// Primitive Profile with attribute of Container resource 'MaxByte'=100 to be added to response.
- v_createPrimitveProfile := m_createPrimitveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
- v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+ v_createPrimitiveProfile := m_createPrimitiveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
+ v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
// Set expected container in response as per resultContent=1
v_deleteContentResponse.container := mw_contentContainer_rc1;
@@ -9229,7 +9752,7 @@ module OneM2M_Testcases_CSE_Release_4 {
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002, v_deleteContentResponse))) -> value v_response {
tc_ac.stop;
- // Check that IUT applied the Primitve Profile
+ // Check that IUT applied the Primitive Profile
if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100){
setverdict(pass, __SCOPE__ & ": Primitive Profile applied to response primtive!");
} else {
@@ -9269,10 +9792,11 @@ module OneM2M_Testcases_CSE_Release_4 {
var integer v_aeIndex := -1;
var integer v_containerIndex := -1;
var integer v_primitiveProfileIndex := -1;
- var template RequestPrimitive v_createPrimitveProfile;
+ var template RequestPrimitive v_createPrimitiveProfile;
var template PrimitiveContent v_retriveContentResponse;
var RequestPrimitive v_retrieveRequest;
+ // Test component configuration
f_cf01Up();
// AE registration
@@ -9280,8 +9804,8 @@ module OneM2M_Testcases_CSE_Release_4 {
f_checkAeSimuStatus();
// Primitive Profile with attribute of Container resource 'MaxByte'=100 to be added to response.
- v_createPrimitveProfile := m_createPrimitveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
- v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+ v_createPrimitiveProfile := m_createPrimitiveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
+ v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
// Set expected container in response
v_retriveContentResponse.container := mw_contentContainerBase;
@@ -9289,7 +9813,7 @@ module OneM2M_Testcases_CSE_Release_4 {
//Create container resource with "maxByte"=1000
v_containerIndex := f_cse_createResource(int3, m_createContainerMaxByte(1000), v_aeIndex);
- //Retrieve container with link to Primitve Profile
+ //Retrieve container with link to Primitive Profile
v_retrieveRequest := valueof(m_retrieve(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex)));
v_retrieveRequest.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
f_send(e_mcaPort, m_request(v_retrieveRequest));
@@ -9298,7 +9822,7 @@ module OneM2M_Testcases_CSE_Release_4 {
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001, v_retriveContentResponse))) -> value v_response {
tc_ac.stop;
- // Check that IUT applied the Primitve Profile
+ // Check that IUT applied the Primitive Profile
if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100){
setverdict(pass, __SCOPE__ & ": Primitive Profile applied to response primtive!");
} else {
@@ -9334,7 +9858,7 @@ module OneM2M_Testcases_CSE_Release_4 {
function f_CSE_PP_019_UPD() runs on AeSimu system CseSystem {
// Local variables
- var template RequestPrimitive v_createPrimitveProfile;
+ var template RequestPrimitive v_createPrimitiveProfile;
var RequestPrimitive v_updateContainer;
var ResponsePrimitive v_responsePrimitive;
var integer v_aeIndex := -1;
@@ -9342,13 +9866,16 @@ module OneM2M_Testcases_CSE_Release_4 {
var integer v_createdContainerResource := -1;
var MsgIn v_response;
+ // Test component configuration
+ f_cf01Up();
+
// Preamble
f_cse_createAccessControlPolicyAux(-, -, int63);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with attribute of Container resource 'MaxByte'=100 to be added to response.
- v_createPrimitveProfile := m_createPrimitveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
- v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitveProfile, v_aeIndex);
+ v_createPrimitiveProfile := m_createPrimitiveProfileAddMaxByte100ToResponse({f_getOriginator(v_aeIndex)});
+ v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex);
//Create container resource without Primtive Profile ID and no maxByte attribte
v_createdContainerResource := f_cse_createResource(int3, m_createContainerMaxByte(1000), v_aeIndex);
@@ -9356,7 +9883,7 @@ module OneM2M_Testcases_CSE_Release_4 {
//Update container request with Primitive Profile ID, and without including update for maxByte
v_updateContainer:= f_getUpdateRequestPrimitive(int3, v_aeIndex, m_updateContainerMaxByte(2000));
- // Link Primitve Prifle created to this Request
+ // Link Primitive Prifle created to this Request
v_updateContainer.primitiveProfileIdentifier := f_getResourceId(vc_resourcesList[v_primitiveProfileIndex].resource);
f_send(e_mcaPort, m_request(v_updateContainer));
@@ -9364,7 +9891,7 @@ module OneM2M_Testcases_CSE_Release_4 {
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
tc_ac.stop;
- // Check that IUT applied the Primitve Profile
+ // Check that IUT applied the Primitive Profile
if(v_response.primitive.responsePrimitive.primitiveContent.container.maxByteSize == 100){
setverdict(pass, __SCOPE__ & ": Primitive Profile to update a primitive applied to response!");
} else {
@@ -9588,7 +10115,7 @@ module OneM2M_Testcases_CSE_Release_4 {
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": IUT accepted Primitve Profile with attributes including complex data type definition");
+ setverdict(fail, __SCOPE__ & ": IUT accepted Primitive Profile with attributes including complex data type definition");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer from IUT for the last Request!");
@@ -9685,7 +10212,7 @@ module OneM2M_Testcases_CSE_Release_4 {
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Primitive Profile with add atribute "maxByte" = "100" for content resource.
- v_createPrimitiveProfile := m_createPrimitveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
+ v_createPrimitiveProfile := m_createPrimitiveProfileAddContainerMaxByte100({f_getOriginator(v_aeIndex)});
v_primitiveProfileIndex := f_cse_createResource(int62, v_createPrimitiveProfile, v_aeIndex); // TS-004 Table 6.3.4.2.1-1 -> primitiveProfile = 62
// Update Primitive Profile containing an invalid ADD_PARAMETER attribute
@@ -20008,4 +20535,4 @@ module OneM2M_Testcases_CSE_Release_4 {
}//end group CSE
-}
\ No newline at end of file
+}