Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
TST
ATS
Commits
a2b47b58
Commit
a2b47b58
authored
Sep 27, 2016
by
Miguel Angel Reina Ortega
Browse files
Constants types corrected + new template for sending response primitives
parent
5bc80d78
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
14 deletions
+27
-14
LibOneM2M/OneM2M_Pixits.ttcn
LibOneM2M/OneM2M_Pixits.ttcn
+10
-10
LibOneM2M/OneM2M_Templates.ttcn
LibOneM2M/OneM2M_Templates.ttcn
+15
-2
LibOneM2M/OneM2M_TypesAndValues.ttcn
LibOneM2M/OneM2M_TypesAndValues.ttcn
+2
-2
No files found.
LibOneM2M/OneM2M_Pixits.ttcn
View file @
a2b47b58
...
...
@@ -7,7 +7,7 @@
*
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Pixits.ttcn $
* $Id: OneM2M_Pixits.ttcn 1
03
2016-0
8-30
0
9
:3
9:32
Z reinaortega $
* $Id: OneM2M_Pixits.ttcn 1
21
2016-0
9-27
0
8
:3
6:54
Z reinaortega $
* @desc Module containing Pixits for oneM2M
*
*/
...
...
@@ -18,7 +18,7 @@ module OneM2M_Pixits {
modulepar
boolean
PX_DELETE_CREATED_RESOURCES
:=
true
;
modulepar
charstring
PX_RESOURCE_TO_BE_DELETED
:=
"/ae_test"
;
modulepar
XSD
.
AnyURI
PX_RESOURCE_TO_BE_DELETED
:=
"/ae_test"
;
modulepar
XSD
.
IDREFS
PX_RESOURCES_TO_BE_DELETED
:=
{
"/ae_test"
,
"/MyAcp"
};
...
...
@@ -26,15 +26,15 @@ module OneM2M_Pixits {
modulepar
charstring
PX_XML_NAMESPACE
:=
"om2m=""http://www.onem2m.org/xml/protocols"""
;
modulepar
charstring
PX_CSE_NAME
:=
"in-cse"
;
modulepar
XSD
.
ID
PX_CSE_NAME
:=
"in-cse"
;
modulepar
charstring
PX_URI_CSE
:=
"/~/in-cse"
;
modulepar
XSD
.
AnyURI
PX_URI_CSE
:=
"/~/in-cse"
;
modulepar
boolean
PX_UNSTRUCTURED
:=
false
;
modulepar
charstring
PX_AE_ID_STEM
:=
"admin:admin"
;
modulepar
XSD
.
ID
PX_AE_ID_STEM
:=
"admin:admin"
;
modulepar
charstring
PX_APP_ID
:=
"myAppId"
;
modulepar
XSD
.
ID
PX_APP_ID
:=
"myAppId"
;
modulepar
boolean
PX_RUN_POSTAMBLE
:=
true
;
...
...
@@ -42,21 +42,21 @@ module OneM2M_Pixits {
modulepar
AddressingFormat
PX_ADDRESSING_FORMAT
:=
e_cseRelative
;
modulepar
charstring
PX_SERIALIZATION
:=
"
JSON
"
;
modulepar
charstring
PX_SERIALIZATION
:=
"
XML
"
;
modulepar
charstring
PX_PROTOCOL_BINDING
:=
"HTTP"
;
modulepar
boolean
PX_ACP_SUPPORT
:=
true
;
modulepar
charstring
PX_CSE_ID
:=
"in-cse"
;
modulepar
XSD
.
ID
PX_CSE_ID
:=
"in-cse"
;
modulepar
boolean
PX_FROM_IS_AE_ID
:=
false
;
//@Martin
//constant parameters for LOC
modulepar
LocationSource
PX_LOCATION_SOURCE
:=
int1
;
//network-defined
modulepar
charstring
PX_LOCATION_TARGET_ID
:=
"{LOCATION-TARGET-ID}"
;
//SUPPOSE TO BE RECEIVED FROM LOCATION SERVER
modulepar
charstring
PX_LOCATION_SERVER_ADDRESS
:=
"{LOCATION-SERVER-ADDRESS}"
;
modulepar
XSD
.
Token
PX_LOCATION_TARGET_ID
:=
"{LOCATION-TARGET-ID}"
;
//SUPPOSE TO BE RECEIVED FROM LOCATION SERVER
modulepar
XSD
.
AnyURI
PX_LOCATION_SERVER_ADDRESS
:=
"{LOCATION-SERVER-ADDRESS}"
;
modulepar
charstring
PX_LOCATION_UPDATE_PERIOD
:=
"PT10M10S"
;
//10 Minute 10 Seconds
modulepar
charstring
PX_LOCATION_UPDATE_PERIOD_INVALID
:=
"-PT30M10S"
;
//duration set to invalid value (minus value)
modulepar
charstring
PX_LOCATION_CONTAINER_NAME
:=
"myLoContainer"
;
...
...
LibOneM2M/OneM2M_Templates.ttcn
View file @
a2b47b58
...
...
@@ -7,7 +7,7 @@
*
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Templates.ttcn $
* $Id: OneM2M_Templates.ttcn 11
9
2016-09-2
0 13:40:03
Z reinaortega $
* $Id: OneM2M_Templates.ttcn 1
2
1 2016-09-2
7 08:36:54
Z reinaortega $
* @desc Module containing templates for oneM2M
*
*/
...
...
@@ -50,6 +50,19 @@ module OneM2M_Templates {
serialization
:=
PX_SERIALIZATION
,
nullFields
:=
p_nullFields
};
/**
* @desc Base template for response sending operations
* @param p_responsePrimitive
*/
template
(
value
)
MsgOut
m_response
(
in
template
(
value
)
ResponsePrimitive
p_responsePrimitive
,
in
template
(
omit
)
AttributeList_1
p_nullFields
:=
omit
)
:=
{
primitive
:=
{
responsePrimitive
:=
p_responsePrimitive
},
host
:=
PX_HOST_ADDRESS
,
xmlNamespace
:=
PX_XML_NAMESPACE
,
protocolBinding
:=
PX_PROTOCOL_BINDING
,
serialization
:=
PX_SERIALIZATION
,
nullFields
:=
p_nullFields
};
//Added by @Naum
template
MsgIn
mw_request
(
in
template
(
present
)
RequestPrimitive
p_requestPrimitive
)
:=
{
primitive
:=
{
requestPrimitive
:=
p_requestPrimitive
}
...
...
@@ -63,7 +76,7 @@ module OneM2M_Templates {
primitive
:=
{
responsePrimitive
:=
p_responsePrimitive
}
};
}
}
//end of group primitives
group
RequestPrimitives
{
...
...
LibOneM2M/OneM2M_TypesAndValues.ttcn
View file @
a2b47b58
...
...
@@ -7,7 +7,7 @@
*
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_TypesAndValues.ttcn $
* $Id: OneM2M_TypesAndValues.ttcn 1
0
2 2016-0
8-30 09:28:49
Z reinaortega $
* $Id: OneM2M_TypesAndValues.ttcn 12
1
2016-0
9-27 08:36:54
Z reinaortega $
* @desc Module containing types and values for oneM2M
*
*/
...
...
@@ -20,7 +20,7 @@ module OneM2M_TypesAndValues {
const
charstring
c_uri_cse
:=
"/~/in-cse/"
;
const
charstring
c_cse_name
:=
"in-cse"
;
const
XSD
.
String
c_defaultResourceName
:=
"MyResource"
;
const
charstring
c_aeAuxName
:=
"MyAe"
;
const
XSD
.
ID
c_aeAuxName
:=
"MyAe"
;
const
XSD
.
String
c_acpAuxName
:=
"MyAcp"
;
//AccessControlOperations
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment