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

Reordering of PIXITS + default values


Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parent fca634d5
...@@ -44,27 +44,27 @@ module OneM2M_Pixits { ...@@ -44,27 +44,27 @@ module OneM2M_Pixits {
/** /**
* @desc IUT CSE Name * @desc IUT CSE Name
*/ */
modulepar XSD.ID PX_CSE_NAME := "oneMPOWER-IN-CSE"; 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 * @desc IUT CSE-ID with SP-relative-CSE-ID format (relative) according to TS-0001-7.2-1
*/ */
modulepar XSD.ID PX_CSE_ID := "/ID-CSE-01"; 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 * @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 := "ID-CSE-01"; 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 * @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 := "//idcc.com"; 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 * @desc AE-ID with privileges to CREATE at the IUT CSEBase with AE-ID-Stem format (relative) according to TS-0001-7.2-1
*/ */
modulepar XSD.ID PX_SUPER_AE_ID := "CsuperAE1"; modulepar XSD.ID PX_SUPER_AE_ID := "admin:admin";
/** /**
* @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 * @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
...@@ -106,19 +106,44 @@ module OneM2M_Pixits { ...@@ -106,19 +106,44 @@ module OneM2M_Pixits {
*/ */
modulepar PrimitiveScope PX_PRIMITIVE_SCOPE := e_cseRelative; modulepar PrimitiveScope PX_PRIMITIVE_SCOPE := e_cseRelative;
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
*/
modulepar charstring PX_XML_NAMESPACE := "m2m=""http://www.onem2m.org/xml/protocols""";
/**
* @desc Character to indicate "all originators" for AccessControlOriginators element
*/
modulepar ListOfURIs PX_ACOR := {"all"};
/**
* @desc Time given for configuring IUT when required (i.e. when UT not implemented)
*/
modulepar float PX_TCONFIG_IUT := 10.0;
}
group TesterParameters {
/** /**
* @desc Test System settings * @desc Test System settings
*/ */
modulepar AeSimuComponentDesc PX_TS_AE1 := { // AE1 component settings modulepar AeSimuComponentDesc PX_TS_AE1 := { // AE1 component settings
mcaPort := { mcaPort := {
binding := { binding := {
coapBindingDesc := { httpBindingDesc := {
bindingProtocol := e_coap, bindingProtocol := e_http,
bindingDesc := { bindingDesc := {
tsAddress := "192.168.56.102", tsAddress := "127.0.0.1",
remotePort := 9010, // SUT CoAP/HTTP port remotePort := 8080, // SUT CoAP/HTTP port
localPort := 3031, // Test Adapter client port (for debug purpose only) localPort := 3031, // Test Adapter client port (for debug purpose only)
sutAddress := "192.168.56.103" sutAddress := "127.0.0.1"
} }
} }
}, },
...@@ -126,13 +151,13 @@ module OneM2M_Pixits { ...@@ -126,13 +151,13 @@ module OneM2M_Pixits {
}, },
mcaPortIn := { mcaPortIn := {
binding := { binding := {
coapBindingDesc := { httpBindingDesc := {
bindingProtocol := e_coap, bindingProtocol := e_http,
bindingDesc := { bindingDesc := {
tsAddress := "192.168.56.102", tsAddress := "127.0.0.1",
remotePort := 9010, remotePort := 8080,
localPort := 3041, // Test Adapter listener port (AeSimu acts as server) localPort := 3041, // Test Adapter listener port (AeSimu acts as server)
sutAddress := "192.168.56.103" sutAddress := "127.0.0.1"
} }
} }
}, },
...@@ -142,13 +167,13 @@ module OneM2M_Pixits { ...@@ -142,13 +167,13 @@ module OneM2M_Pixits {
modulepar AeSimuComponentDesc PX_TS_AE2 := { // AE2 component settings modulepar AeSimuComponentDesc PX_TS_AE2 := { // AE2 component settings
mcaPort := { mcaPort := {
binding := { binding := {
coapBindingDesc := { httpBindingDesc := {
bindingProtocol := e_coap, bindingProtocol := e_http,
bindingDesc := { bindingDesc := {
tsAddress := "192.168.56.102", tsAddress := "127.0.0.1",
remotePort := 9010, // SUT CoAP/HTTP port remotePort := 8080, // SUT CoAP/HTTP port
localPort := 3032, // Test Adapter client port (for debug purpose only) localPort := 3032, // Test Adapter client port (for debug purpose only)
sutAddress := "192.168.56.103" sutAddress := "127.0.0.1"
} }
} }
}, },
...@@ -156,13 +181,13 @@ module OneM2M_Pixits { ...@@ -156,13 +181,13 @@ module OneM2M_Pixits {
}, },
mcaPortIn := { mcaPortIn := {
binding := { binding := {
coapBindingDesc := { httpBindingDesc := {
bindingProtocol := e_coap, bindingProtocol := e_http,
bindingDesc := { bindingDesc := {
tsAddress := "192.168.56.102", tsAddress := "127.0.0.1",
remotePort := omit, remotePort := omit,
localPort := 3042, // Test Adapter listener port (AeSimu acts as server) localPort := 3042, // Test Adapter listener port (AeSimu acts as server)
sutAddress := "192.168.56.103" sutAddress := "127.0.0.1"
} }
} }
}, },
...@@ -172,13 +197,13 @@ module OneM2M_Pixits { ...@@ -172,13 +197,13 @@ module OneM2M_Pixits {
modulepar CseSimuComponentDesc PX_TS_CSE1 := { // CSE1 component settings modulepar CseSimuComponentDesc PX_TS_CSE1 := { // CSE1 component settings
mcaPort := { mcaPort := {
binding := { binding := {
coapBindingDesc := { httpBindingDesc := {
bindingProtocol := e_coap, bindingProtocol := e_http,
bindingDesc := { bindingDesc := {
tsAddress := "192.168.56.102", tsAddress := "127.0.0.1",
remotePort:= 9010, remotePort:= 8080,
localPort := 3131, localPort := 3131,
sutAddress := "192.168.56.103" sutAddress := "127.0.0.1"
} }
} }
}, },
...@@ -186,13 +211,13 @@ module OneM2M_Pixits { ...@@ -186,13 +211,13 @@ module OneM2M_Pixits {
}, },
mcaPortIn := { mcaPortIn := {
binding := { binding := {
coapBindingDesc := { httpBindingDesc := {
bindingProtocol := e_coap, bindingProtocol := e_http,
bindingDesc := { bindingDesc := {
tsAddress := "192.168.56.102", tsAddress := "127.0.0.1",
remotePort:= omit, remotePort:= 8080,
localPort := 3141, localPort := 3141,
sutAddress := "192.168.56.103" sutAddress := "127.0.0.1"
} }
} }
}, },
...@@ -203,10 +228,10 @@ module OneM2M_Pixits { ...@@ -203,10 +228,10 @@ module OneM2M_Pixits {
httpBindingDesc := { httpBindingDesc := {
bindingProtocol := e_http, bindingProtocol := e_http,
bindingDesc := { bindingDesc := {
tsAddress := "192.168.56.102", tsAddress := "127.0.0.1",
remotePort:= 9011, remotePort:= 8080,
localPort := 4131, localPort := 4131,
sutAddress := "192.168.56.103" sutAddress := "127.0.0.1"
} }
} }
}, },
...@@ -217,42 +242,19 @@ module OneM2M_Pixits { ...@@ -217,42 +242,19 @@ module OneM2M_Pixits {
httpBindingDesc := { httpBindingDesc := {
bindingProtocol := e_http , bindingProtocol := e_http ,
bindingDesc := { bindingDesc := {
tsAddress := "192.168.56.102", tsAddress := "127.0.0.1",
remotePort:= 9011, remotePort:= 8080,
localPort := 4141, localPort := 4141,
sutAddress := "192.168.56.103" sutAddress := "127.0.0.1"
} }
} }
}, },
serialization := e_xml serialization := e_xml
} }
}; };
modulepar UtDesc PX_TS_UT := { url := "http://192.168.55.103:43000/" };
modulepar charstring PX_WS_PROTOCOL := "oneM2M.R2.0.xml"; modulepar UtDesc PX_TS_UT := { url := "http://127.0.0.1:43000/" };
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
*/
modulepar charstring PX_XML_NAMESPACE := "m2m=""http://www.onem2m.org/xml/protocols""";
/**
* @desc Character to indicate "all originators" for AccessControlOriginators element
*/
modulepar ListOfURIs PX_ACOR := {"all"};
/**
* @desc Time given for configuring IUT when required (i.e. when UT not implemented)
*/
modulepar float PX_TCONFIG_IUT := 10.0;
}
group TesterParameters {
/** /**
* @desc Test System CSE1 Name * @desc Test System CSE1 Name
*/ */
......
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