First FLXC (FlexContainer) test cases implemented

Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parent c170c6e4
......@@ -986,7 +986,16 @@ module OneM2M_Templates {
resourceType := int28,
primitiveContent := {flexContainer := ?}
};
/**
* @desc Base CREATE request primitive for GenericInterworkingService resource
*/
template (value) RequestPrimitive m_createGenericInterworkingServiceBase modifies m_create := {
requestIdentifier := testcasename() & "-m_createGenericInterworkingService",
resourceType := int28,
primitiveContent := {genericInterworkingService := m_contentCreateGenericInterworkingService()}
};
/**
* @desc Reception template for CREATE GenericInterworkingOperationInstance
*/
......@@ -1907,8 +1916,39 @@ module OneM2M_Templates {
aggregatedRequest := omit,//O
choice := omit//NP
};
};
/**
* @desc Base primitiveContent for CREATE operation for GenericInterworkingService resource
* @param p_accessControlPolicyIds ACP IDs for the PollingChannel
* @param p_name Resource name
*/
template (value) GenericInterworkingService_optional m_contentCreateGenericInterworkingService (in template (omit) XSD.String p_name := c_defaultGenericInterworkingServiceResourceName,
in template (omit) AcpType p_accessControlPolicyIds := omit) := {
resourceName := p_name,//O
resourceType := omit,//NP
resourceID := omit,//NP
parentID := omit,//NP
creationTime := omit,//NP
lastModifiedTime := omit,//NP
labels := omit,//O
accessControlPolicyIDs := p_accessControlPolicyIds,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
stateTag := omit,//NP
creator := omit,//O
containerDefinition := "org.onem2m.genericInterworkingService",//M
ontologyRef := omit,//O
serviceName := "MyService",//M??
inputDataPointLinks := omit,//O
outputDataPointLinks := omit,//O
choice := omit//NP
};
/**
* @desc Base primitiveContent for CREATE operation for Group resource
* @param p_maxNrOfMembers Max number of members
......@@ -4911,6 +4951,38 @@ module OneM2M_Templates {
choice := *//O
};
/**
* @desc Base primitiveContent for CREATE operation for GenericInterworkingService resource
* @param p_accessControlPolicyIds ACP IDs for the PollingChannel
* @param p_name Resource name
*/
template (value) GenericInterworkingService_invalid m_contentCreateGenericInterworkingService_invalid (in template (omit) XSD.String p_name := c_defaultGenericInterworkingServiceResourceName,
in template (omit) AcpType p_accessControlPolicyIds := omit) := {
resourceName := p_name,//O
resourceType := omit,//NP
resourceID := omit,//NP
parentID := omit,//NP
creationTime := omit,//NP
lastModifiedTime := omit,//NP
expirationCounter := 1,//Invalid attribute
labels := omit,//O
accessControlPolicyIDs := p_accessControlPolicyIds,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
stateTag := omit,//NP
creator := omit,//O
containerDefinition := "org.onem2m.genericInterworkingService",//M
ontologyRef := omit,//O
serviceName := "MyService",//M??
inputDataPointLinks := omit,//O
outputDataPointLinks := omit,//O
choice := omit//NP
};
template (value) AE_update_invalid m_contentUpdateAe_invalid := {
resourceName := omit,//M
resourceType := omit,//M
......
......@@ -1720,6 +1720,7 @@ type union PrimitiveContent {
TimeSeriesInstance_optional timeSeriesInstance,
TimeSeriesAnnc_optional timeSeriesAnnc,
TimeSeriesInstanceAnnc_optional timeSeriesInstanceAnnc,
GenericInterworkingService_optional genericInterworkingService,
GenericInterworkingOperationInstance_optional genericInterworkingOperationInstance,
//SecurityInfo
SecurityInfo securityInfo,
......@@ -1740,6 +1741,7 @@ type union PrimitiveContent {
AE_update_invalid aE_update_invalid,
ACP_update_invalid aCP_update_invalid,
Container_update_invalid container_update_invalid,
GenericInterworkingService_invalid genericInterworkingService_invalid,
Group_update_invalid group_update_invalid,
PollingChannel_update_invalid pollingChannel_update_invalid,
Schedule_update_invalid schedule_update_invalid,
......@@ -7220,6 +7222,48 @@ group OptionalResourceTypes {
variant (choice.choice_list[-]) "untagged";
};
type record GenericInterworkingService_optional
{
ResourceName resourceName optional,
ResourceType resourceType optional,
XSD.ID resourceID optional,
NhURI parentID optional,
Timestamp creationTime optional,
Timestamp lastModifiedTime optional,
Labels labels optional,
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
XSD.AnyURI containerDefinition optional,
XSD.AnyURI ontologyRef optional,
XSD.String serviceName optional,
ListOfDataLinks inputDataPointLinks optional,
ListOfDataLinks outputDataPointLinks optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record of union {
GenericInterworkingService genericInterworkingService,
GenericInterworkingOperationInstance genericInterworkingOperationInstance,
SemanticDescriptor semanticDescriptor,
Subscription subscription
} choice_list
} choice optional
}
with {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
};
type record GenericInterworkingOperationInstance_optional
{
ResourceName resourceName optional,
......@@ -8343,6 +8387,49 @@ group InvalidTypes {
variant (choice.choice_list[-]) "untagged";
};
type record GenericInterworkingService_invalid
{
ResourceName resourceName optional,
ResourceType resourceType optional,
XSD.ID resourceID optional,
NhURI parentID optional,
Timestamp creationTime optional,
Timestamp lastModifiedTime optional,
XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for Container
Labels labels optional,
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
XSD.AnyURI containerDefinition optional,
XSD.AnyURI ontologyRef optional,
XSD.String serviceName optional,
ListOfDataLinks inputDataPointLinks optional,
ListOfDataLinks outputDataPointLinks optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record of union {
GenericInterworkingService genericInterworkingService,
GenericInterworkingOperationInstance genericInterworkingOperationInstance,
SemanticDescriptor semanticDescriptor,
Subscription subscription
} choice_list
} choice optional
}
with {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
};
type record Group_update_invalid {
ResourceName resourceName optional,
ResourceType resourceType optional,
......
......@@ -43,6 +43,7 @@ module OneM2M_TypesAndValues {
const XSD.String c_defaultTimeSeriesResourceName := "MyTimeSeriesResource";
const XSD.String c_defaultTimeSeriesAnncResourceName := "MyTimeSeriesAnncResource";
const XSD.String c_defaultTimeSeriesInstanceResourceName := "MyTimeSeriesInstanceResource";
const XSD.String c_defaultGenericInterworkingServiceResourceName := "MyGenericInterworkingServiceResource"; //<genericInterworkingService>
const XSD.ID c_aeAuxName := "MyAe";
const XSD.String c_defaultAE2Name := "MyAe2";
const XSD.String c_acpAuxName := "MyAcp";
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment