Commit 3ae8fd8c authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Merge branch 'Release2' into FLXC_TEST_CASES


Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parents dd265a0f 1fdc0304
This diff is collapsed.
/*
/**
* Copyright Notification
* No part of this document may be reproduced, in an electronic retrieval system or otherwise, except as authorized by written permission.
* The copyright and the foregoing restriction extend to reproduction in all media.
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
* @author ETSI
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/OneM2M_Pics.ttcn $
* $Id: OneM2M_Pics.ttcn 347 2017-08-11 08:48:20Z reinaortega $
* @author oneM2M/ETSI
* @desc Module containing Pixits for oneM2M
*
*/
......
......@@ -5,9 +5,7 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
* @author ETSI
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/OneM2M_Pixits.ttcn $
* $Id: OneM2M_Pixits.ttcn 347 2017-08-11 08:48:20Z reinaortega $
* @author oneM2M/ETSI
* @desc Module containing Pixits for oneM2M
*
*/
......@@ -36,11 +34,6 @@ module OneM2M_Pixits {
*/
modulepar boolean PX_ASN_CSE:= false;
/**
* @desc IUT IP address and port
*/
modulepar charstring PX_SUT_ADDRESS := "127.0.0.1:8080";
/**
* @desc IUT Upper Tester interface support
*/
......@@ -49,22 +42,22 @@ module OneM2M_Pixits {
/**
* @desc IUT CSE Name
*/
modulepar XSD.ID PX_CSE_NAME := "cseName";
modulepar XSD.ID PX_CSE_NAME := "CSE-NAME";
/**
* @desc IUT CSE-ID with SP-relative-CSE-ID format (relative) according to TS-0001-7.2-1
*/
modulepar XSD.ID PX_CSE_ID := "/cseId";
modulepar XSD.ID PX_CSE_ID := "/CSE-ID";
/**
* @desc IUT CSE resource ID with Unstructured-CSE-relative-Resource-ID (relative) format according to TS-0001-7.2-1
*/
modulepar XSD.ID PX_CSE_RESOURCE_ID := "cseResourceId";
modulepar XSD.ID PX_CSE_RESOURCE_ID := "CSE-ID";
/**
* @desc IUT M2M-SP-ID with M2M-SP-ID format (absolute) according to TS-0001-7.2-1 Unstructured-CSE-relative -Resource-ID
*/
modulepar XSD.ID PX_SP_ID := "//om2m.org";
modulepar XSD.ID PX_SP_ID := "//CSE-SP-ID";
/**
* @desc AE-ID with privileges to CREATE at the IUT CSEBase with AE-ID-Stem format (relative) according to TS-0001-7.2-1
......@@ -74,7 +67,7 @@ module OneM2M_Pixits {
/**
* @desc CSE-ID with privileges to CREATE at the IUT CSEBase with SP-relative-CSE-ID format (relative) according to TS-0001-7.2-1
*/
modulepar XSD.ID PX_SUPER_CSE_ID := "/admin:admin";
modulepar XSD.ID PX_SUPER_CSE_ID := "admin:admin";
/**
* @desc Allowed AE-IDs starting with C
......@@ -110,32 +103,13 @@ module OneM2M_Pixits {
* @desc Primitive scope to use during test execution
*/
modulepar PrimitiveScope PX_PRIMITIVE_SCOPE := e_cseRelative;
/**
* @desc Serialization to use during test execution
*/
modulepar charstring PX_SERIALIZATION := "XML";
/**
* @desc Protocolo binding to use during test execution
*/
//modulepar charstring PX_PROTOCOL_BINDING := "HTTP";
/**
* @desc Protocolo binding to use during test execution
*/
modulepar charstring PX_PROTOCOL_BINDING_CSE1 := "HTTP";
/**
* @desc Protocolo binding to use during test execution
*/
modulepar charstring PX_PROTOCOL_BINDING_AE1 := "HTTP";
/**
* @desc Protocolo binding to use during test execution
*/
modulepar charstring PX_PROTOCOL_BINDING_AE2 := "HTTP";
modulepar charstring PX_WS_PROTOCOL := "oneM2M.R2.0.xml";
modulepar charstring PX_HOSTING_CSE_ID := "CSE-Dekra-ID";
modulepar charstring PX_CREDENTIAL_ID := "admin:admin";
modulepar charstring PX_REQUEST_URI := "/";
/**
* @desc Namespace composed of "prefix" = "xml namespace" to use during test execution
*/
......@@ -150,26 +124,135 @@ module OneM2M_Pixits {
* @desc Time given for configuring IUT when required (i.e. when UT not implemented)
*/
modulepar float PX_TCONFIG_IUT := 10.0;
}
group TesterParameters {
/**
* @desc AE1 IP address and listening port
*/
modulepar charstring PX_AE1_ADDRESS := "127.0.0.1:3141";
/**
* @desc AE2 IP address and listening port
*/
modulepar charstring PX_AE2_ADDRESS := "127.0.0.1:3142";
/**
* @desc CSE1 IP address and listening port
*/
modulepar charstring PX_CSE1_ADDRESS := "127.0.0.1:4141";
* @desc Test System settings
*/
modulepar AeSimuComponentDesc PX_TS_AE1 := { // AE1 component settings
mcaPort := {
binding := {
httpBindingDesc := {
bindingProtocol := e_http,
bindingDesc := {
tsAddress := "127.0.0.1",
remotePort := 8080, // SUT CoAP/HTTP port
localPort := 3031, // Test Adapter client port (for debug purpose only)
sutAddress := "127.0.0.1"
}
}
},
serialization := e_xml
},
mcaPortIn := {
binding := {
httpBindingDesc := {
bindingProtocol := e_http,
bindingDesc := {
tsAddress := "127.0.0.1",
remotePort := 8080,
localPort := 3041, // Test Adapter listener port (AeSimu acts as server)
sutAddress := "127.0.0.1"
}
}
},
serialization := e_xml
}
};
modulepar AeSimuComponentDesc PX_TS_AE2 := { // AE2 component settings
mcaPort := {
binding := {
httpBindingDesc := {
bindingProtocol := e_http,
bindingDesc := {
tsAddress := "127.0.0.1",
remotePort := 8080, // SUT CoAP/HTTP port
localPort := 3032, // Test Adapter client port (for debug purpose only)
sutAddress := "127.0.0.1"
}
}
},
serialization := e_xml
},
mcaPortIn := {
binding := {
httpBindingDesc := {
bindingProtocol := e_http,
bindingDesc := {
tsAddress := "127.0.0.1",
remotePort := omit,
localPort := 3042, // Test Adapter listener port (AeSimu acts as server)
sutAddress := "127.0.0.1"
}
}
},
serialization := e_xml
}
};
modulepar CseSimuComponentDesc PX_TS_CSE1 := { // CSE1 component settings
mcaPort := {
binding := {
httpBindingDesc := {
bindingProtocol := e_http,
bindingDesc := {
tsAddress := "127.0.0.1",
remotePort:= 8080,
localPort := 3131,
sutAddress := "127.0.0.1"
}
}
},
serialization := e_xml
},
mcaPortIn := {
binding := {
httpBindingDesc := {
bindingProtocol := e_http,
bindingDesc := {
tsAddress := "127.0.0.1",
remotePort:= 8080,
localPort := 3141,
sutAddress := "127.0.0.1"
}
}
},
serialization := e_xml
},
mccPort := {
binding := {
httpBindingDesc := {
bindingProtocol := e_http,
bindingDesc := {
tsAddress := "127.0.0.1",
remotePort:= 8080,
localPort := 4131,
sutAddress := "127.0.0.1"
}
}
},
serialization := e_xml
},
mccPortIn := {
binding := {
httpBindingDesc := {
bindingProtocol := e_http ,
bindingDesc := {
tsAddress := "127.0.0.1",
remotePort:= 8080,
localPort := 4141,
sutAddress := "127.0.0.1"
}
}
},
serialization := e_xml
}
};
modulepar UtDesc PX_TS_UT := { url := "http://127.0.0.1:43000/" };
/**
* @desc Test System CSE1 Name
*/
......
......@@ -5,8 +5,7 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
* @author oneM2M
* @version
* @author oneM2M/ETSI
* @desc Port modules for oneM2M Test System
*
*/
......@@ -31,6 +30,7 @@ module OneM2M_Ports {
MsgIn;
out
MsgOut;
map param (in PortDesc p_portDesc);
};
/**
......@@ -62,6 +62,7 @@ module OneM2M_Ports {
UtTriggerAckPrimitive;
out
UtTriggerPrimitive;
map param (in UtDesc p_utDesc)
}
}//end module
This diff is collapsed.
......@@ -5,9 +5,7 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
* @author ETSI
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/OneM2M_TestSystem.ttcn $
* $Id: OneM2M_TestSystem.ttcn 347 2017-08-11 08:48:20Z reinaortega $
* @author oneM2M/ETSI
* @desc Test System module for oneM2M
*
*/
......@@ -16,12 +14,28 @@ module OneM2M_TestSystem {
import from OneM2M_Types all;
import from LibCommon_Time all;
import from OneM2M_Ports all;
import from OneM2M_Pixits all;
/* ***************************************
* Test System Components
* ***************************************
*/
type enumerated InterfaceIds {
e_mca_port (0),
e_mca_in_port (1),
e_mcc_port (2),
e_mcc_in_port (3)
}
type record Interface {
OneM2MPort myPort,
charstring myHost,
charstring myProtocolBinding,
charstring mySerialization
}
type record of Interface Interfaces;
type component Tester {
port AdapterControlPort acPort;
port InfoPort infoPort;
......@@ -29,20 +43,19 @@ module OneM2M_TestSystem {
//timers
timer tc_ac := PX_TAC;
timer tc_wait := PX_TWAIT;
timer tc_done := PX_TDONE;
//global variables
var charstring vc_protocolBinding;
var Configurations vc_config;
var TestSystemRole vc_testSystemRole;
var MyResourcesList vc_resourcesList;
var IntegerList vc_resourcesIndexToBeDeleted := {};
var integer vc_aeAuxIndex := -1;//TODO To be removed
var integer vc_remoteCseIndex := -1;
var integer vc_acpAuxIndex := -1;
var AccessControlPolicy_optional vc_acpAux;
var MsgIn vc_request;
var MsgIn vc_response;
var default vc_aeSimu := null;
var default vc_cseSimu := null;
var PrimitiveContent vc_primitiveContentRetrievedResource;
var Interfaces vc_myInterfaces := {};
};
type component AeSimu extends Tester {
......@@ -51,10 +64,11 @@ module OneM2M_TestSystem {
port OneM2MPort mcaPortIn;
//global variables
var PrimitiveContent vc_primitiveContentRetrievedResource;
//var PrimitiveContent vc_primitiveContentRetrievedResource;
var CseSimu vc_cse1;//For CF02 when AeSimu is master
var boolean vc_auxiliaryAe2Up := false;
var integer vc_aeAuxIndex := -1;//Specific to AeSimu
};
type component CseSimu extends Tester {
......@@ -69,6 +83,7 @@ module OneM2M_TestSystem {
var integer vc_localRemoteCseIndex := -1;
var integer vc_cSEBaseIndex := -1; //Index of the CSEBase resource of the Tester inside vc_localResourcesList
var CseTypeID vc_cseType; //cseType of the simulated CSE. IN =1, MN = 2
var integer vc_remoteCseIndex := -1;//Specific to CseSimu
};
type component InCseSimu extends CseSimu {
......
This diff is collapsed.
......@@ -5,9 +5,7 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
* @author ETSI
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/OneM2M_TypesAndValues.ttcn $
* $Id: OneM2M_TypesAndValues.ttcn 347 2017-08-11 08:48:20Z reinaortega $
* @author oneM2M/ETSI
* @desc Module containing types and values for oneM2M
*
*/
......
......@@ -5,9 +5,7 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
* @author oneM2M
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/UsefulTtcn3Types.ttcn $
* $Id: UsefulTtcn3Types.ttcn 234 2017-03-20 16:37:29Z reinaortega $
* @author oneM2M/ETSI
* @desc Useful types
*
*/
......
......@@ -5,9 +5,7 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
* @author oneM2M
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/XSD.ttcn $
* $Id: XSD.ttcn 234 2017-03-20 16:37:29Z reinaortega $
* @author oneM2M/ETSI
* @desc XSD Aux
*
*/
......
This diff is collapsed.
......@@ -5,9 +5,7 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
* @author ETSI
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/OneM2M_TestControl.ttcn $
* $Id: OneM2M_TestControl.ttcn 347 2017-08-11 08:48:20Z reinaortega $
* @author oneM2M/ETSI
* @desc Test control module for oneM2M
*
*/
......
......@@ -5,9 +5,7 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
* @author ETSI
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/OneM2M_TestControl.ttcn $
* $Id: OneM2M_TestControl.ttcn 347 2017-08-11 08:48:20Z reinaortega $
* @author oneM2M/ETSI
* @desc Test control module for oneM2M
*
*/
......
......@@ -5,9 +5,7 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
* @author ETSI
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/OneM2M_TestControl.ttcn $
* $Id: OneM2M_TestControl.ttcn 347 2017-08-11 08:48:20Z reinaortega $
* @author oneM2M/ETSI
* @desc Test control module for oneM2M
*
*/
......
......@@ -5,9 +5,7 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
* @author ETSI
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/OneM2M_TestControl.ttcn $
* $Id: OneM2M_TestControl.ttcn 347 2017-08-11 08:48:20Z reinaortega $
* @author oneM2M/ETSI
* @desc Test control module for oneM2M
*
*/
......
......@@ -5,9 +5,7 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
* @author ETSI
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/OneM2M_TestControl.ttcn $
* $Id: OneM2M_TestControl.ttcn 347 2017-08-11 08:48:20Z reinaortega $
* @author oneM2M/ETSI
* @desc Test control module for oneM2M
*
*/
......
......@@ -5,9 +5,7 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
* @author ETSI
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/OneM2M_TestControl.ttcn $
* $Id: OneM2M_TestControl.ttcn 347 2017-08-11 08:48:20Z reinaortega $
* @author oneM2M/ETSI
* @desc Test control module for oneM2M
*
*/
......@@ -15,6 +13,7 @@ module OneM2M_TestControl_IN_profile {
import from OneM2M_Testcases_CSE_Release_1 all;
import from OneM2M_Testcases_CSE_Release_2 all;
import from OneM2M_Pics all;
control {
......@@ -80,8 +79,10 @@ module OneM2M_TestControl_IN_profile {
if(PICS_AE_POA) {execute (TC_CSE_REG_CRE_012_AE_POA());}
if(PICS_AE_POA) {execute (TC_CSE_REG_RET_004_POA());}
if(PICS_AE_POA) {execute (TC_CSE_DMR_UPD_015_AE_POA());}
if(PICS_IN_CSE) {execute (TC_CSE_REG_CRE_001());}
if(true) {execute (TC_CSE_REG_CRE_002());}
if(PICS_IN_CSE) {execute (TC_CSE_REG_CRE_001_CAE());}
if(PICS_IN_CSE) {execute (TC_CSE_REG_CRE_001_SAE());}
if(PICS_IN_CSE) {execute (TC_CSE_REG_CRE_002_CAE());}
if(PICS_IN_CSE) {execute (TC_CSE_REG_CRE_002_SAE());}
//CE_REG_00004
if(true) {execute (TC_CSE_REG_CRE_018());}
......
......@@ -5,9 +5,7 @@
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
* @author ETSI
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/OneM2M_TestControl.ttcn $
* $Id: OneM2M_TestControl.ttcn 347 2017-08-11 08:48:20Z reinaortega $
* @author oneM2M/ETSI
* @desc Test control module for oneM2M
*
*/
......@@ -15,6 +13,7 @@ module OneM2M_TestControl_MN_profile {
import from OneM2M_Testcases_CSE_Release_1 all;
import from OneM2M_Testcases_CSE_Release_2 all;
import from OneM2M_Pics all;
control {
......@@ -84,10 +83,10 @@ module OneM2M_TestControl_MN_profile {
if(PICS_AE_POA) {execute (TC_CSE_REG_CRE_012_AE_POA());}
if(PICS_AE_POA) {execute (TC_CSE_REG_RET_004_POA());}
if(PICS_AE_POA) {execute (TC_CSE_DMR_UPD_015_AE_POA());}
if(true) {execute (TC_CSE_REG_CRE_002());}
//if(true) {execute (TC_CSE_REG_CRE_003());} //TO BE IMPLEMENTED
if(PICS_MN_CSE or PICS_ASN_CSE) {execute (TC_CSE_REG_CRE_020());}
if(true) {execute (TC_CSE_REG_CRE_001_CAE());}
if(true) {execute (TC_CSE_REG_CRE_002_CAE());}
if(true) {execute (TC_CSE_REG_CRE_003());} //TO BE IMPLEMENTED
//CE_REG_00004
if(true) {execute (TC_CSE_REG_CRE_018());}
if(true) {execute (TC_CSE_REG_CRE_019());}
......
This diff is collapsed.
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