From 3b1285290267a1347427fd80ed546b7a93c31704 Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Fri, 3 May 2019 11:20:03 +0200
Subject: [PATCH] Reordering of PIXITS + default values
Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
LibOneM2M/OneM2M_Pixits.ttcn | 130 ++++++++++++++++++-----------------
1 file changed, 66 insertions(+), 64 deletions(-)
diff --git a/LibOneM2M/OneM2M_Pixits.ttcn b/LibOneM2M/OneM2M_Pixits.ttcn
index ed45e9a..fd38c0c 100644
--- a/LibOneM2M/OneM2M_Pixits.ttcn
+++ b/LibOneM2M/OneM2M_Pixits.ttcn
@@ -44,27 +44,27 @@ module OneM2M_Pixits {
/**
* @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
*/
- 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
*/
- 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
*/
- 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
*/
- 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
@@ -106,19 +106,44 @@ module OneM2M_Pixits {
*/
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
*/
modulepar AeSimuComponentDesc PX_TS_AE1 := { // AE1 component settings
mcaPort := {
binding := {
- coapBindingDesc := {
- bindingProtocol := e_coap,
+ httpBindingDesc := {
+ bindingProtocol := e_http,
bindingDesc := {
- tsAddress := "192.168.56.102",
- remotePort := 9010, // SUT CoAP/HTTP port
+ tsAddress := "127.0.0.1",
+ remotePort := 8080, // SUT CoAP/HTTP port
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 {
},
mcaPortIn := {
binding := {
- coapBindingDesc := {
- bindingProtocol := e_coap,
+ httpBindingDesc := {
+ bindingProtocol := e_http,
bindingDesc := {
- tsAddress := "192.168.56.102",
- remotePort := 9010,
+ tsAddress := "127.0.0.1",
+ remotePort := 8080,
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 {
modulepar AeSimuComponentDesc PX_TS_AE2 := { // AE2 component settings
mcaPort := {
binding := {
- coapBindingDesc := {
- bindingProtocol := e_coap,
+ httpBindingDesc := {
+ bindingProtocol := e_http,
bindingDesc := {
- tsAddress := "192.168.56.102",
- remotePort := 9010, // SUT CoAP/HTTP port
+ tsAddress := "127.0.0.1",
+ remotePort := 8080, // SUT CoAP/HTTP port
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 {
},
mcaPortIn := {
binding := {
- coapBindingDesc := {
- bindingProtocol := e_coap,
+ httpBindingDesc := {
+ bindingProtocol := e_http,
bindingDesc := {
- tsAddress := "192.168.56.102",
+ tsAddress := "127.0.0.1",
remotePort := omit,
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 {
modulepar CseSimuComponentDesc PX_TS_CSE1 := { // CSE1 component settings
mcaPort := {
binding := {
- coapBindingDesc := {
- bindingProtocol := e_coap,
+ httpBindingDesc := {
+ bindingProtocol := e_http,
bindingDesc := {
- tsAddress := "192.168.56.102",
- remotePort:= 9010,
+ tsAddress := "127.0.0.1",
+ remotePort:= 8080,
localPort := 3131,
- sutAddress := "192.168.56.103"
+ sutAddress := "127.0.0.1"
}
}
},
@@ -186,13 +211,13 @@ module OneM2M_Pixits {
},
mcaPortIn := {
binding := {
- coapBindingDesc := {
- bindingProtocol := e_coap,
+ httpBindingDesc := {
+ bindingProtocol := e_http,
bindingDesc := {
- tsAddress := "192.168.56.102",
- remotePort:= omit,
+ tsAddress := "127.0.0.1",
+ remotePort:= 8080,
localPort := 3141,
- sutAddress := "192.168.56.103"
+ sutAddress := "127.0.0.1"
}
}
},
@@ -203,10 +228,10 @@ module OneM2M_Pixits {
httpBindingDesc := {
bindingProtocol := e_http,
bindingDesc := {
- tsAddress := "192.168.56.102",
- remotePort:= 9011,
+ tsAddress := "127.0.0.1",
+ remotePort:= 8080,
localPort := 4131,
- sutAddress := "192.168.56.103"
+ sutAddress := "127.0.0.1"
}
}
},
@@ -217,42 +242,19 @@ module OneM2M_Pixits {
httpBindingDesc := {
bindingProtocol := e_http ,
bindingDesc := {
- tsAddress := "192.168.56.102",
- remotePort:= 9011,
+ tsAddress := "127.0.0.1",
+ remotePort:= 8080,
localPort := 4141,
- sutAddress := "192.168.56.103"
+ sutAddress := "127.0.0.1"
}
}
},
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 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""";
+ modulepar UtDesc PX_TS_UT := { url := "http://127.0.0.1:43000/" };
- /**
- * @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
*/
--
GitLab