From 07de7e37dd471e9c67a5e436bedbad787bb7927d Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Thu, 16 Apr 2020 00:34:22 +0200
Subject: [PATCH] Use of PIXIT for setting the location of the flexContainer
resource specializations
Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
LibOneM2M/OneM2M_Pixits.ttcn | 15 ++++++++++++---
LibOneM2M/OneM2M_Templates.ttcn | 4 ++--
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/LibOneM2M/OneM2M_Pixits.ttcn b/LibOneM2M/OneM2M_Pixits.ttcn
index 67732cb..6f817db 100644
--- a/LibOneM2M/OneM2M_Pixits.ttcn
+++ b/LibOneM2M/OneM2M_Pixits.ttcn
@@ -127,6 +127,15 @@ module OneM2M_Pixits {
*/
modulepar float PX_TCONFIG_IUT := 10.0;
+ group flexContainerContainerDefinitions {
+ /**
+ * @desc These contain the identifier reference (URI) to the <flexContainer> schema definition which is used by the CSE to validate the syntax of the <flexContainer> resource
+ */
+ modulepar XSD.AnyURI PX_CND_GENERIC_INTERWORKING_SERVICE := "urn:m2m:CDT-gis-v2_21_0.xsd";
+
+ modulepar XSD.AnyURI PX_CND_GENERIC_INTERWORKING_OPERATION_INSTANCE := "urn:m2m:CDT-gio-v2_21_0.xsd";
+
+ }
}
group TesterParameters {
@@ -157,7 +166,7 @@ module OneM2M_Pixits {
bindingProtocol := e_http,
bindingDesc := {
tsAddress := "127.0.0.1",
- remotePort := 8080,
+ remotePort := omit,
localPort := 3041, // Test Adapter listener port (AeSimu acts as server)
sutAddress := "127.0.0.1"
}
@@ -224,7 +233,7 @@ module OneM2M_Pixits {
bindingProtocol := e_http,
bindingDesc := {
tsAddress := "127.0.0.1",
- remotePort:= 8080,
+ remotePort:= omit,
localPort := 3141,
sutAddress := "127.0.0.1"
}
@@ -252,7 +261,7 @@ module OneM2M_Pixits {
bindingProtocol := e_http ,
bindingDesc := {
tsAddress := "127.0.0.1",
- remotePort:= 8080,
+ remotePort:= omit,
localPort := 4141,
sutAddress := "127.0.0.1"
}
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 9274cc4..36823ef 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -1971,7 +1971,7 @@ module OneM2M_Templates {
announcedAttribute := omit,//O
stateTag := omit,//NP
creator := omit,//O
- containerDefinition := "urn:m2m:CDT-gis-v2_17_0.xsd",//M
+ containerDefinition := PX_CND_GENERIC_INTERWORKING_SERVICE,//M
ontologyRef := omit,//O
contentSize := omit,//NP
serviceName := "MyService",//M??
@@ -5161,7 +5161,7 @@ module OneM2M_Templates {
announcedAttribute := omit,//O
stateTag := omit,//NP
creator := omit,//O
- containerDefinition := "urn:m2m:CDT-gis-v2_17_0.xsd",//M
+ containerDefinition := PX_CND_GENERIC_INTERWORKING_SERVICE,//M
ontologyRef := omit,//O
contentSize := omit, //NP
serviceName := "MyService",//M??
--
GitLab