Skip to content
Snippets Groups Projects
Commit a798f946 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Moved to XSD v4_10_0

parent 99f06b03
No related branches found
No related tags found
No related merge requests found
......@@ -38,37 +38,37 @@ module OneM2M_Pixits {
/**
* @desc IUT Upper Tester interface support
*/
modulepar boolean PX_UT_IMPLEMENTED := false;
modulepar boolean PX_UT_IMPLEMENTED := true;
/**
* @desc IUT CSE Name
*/
modulepar XSD.ID PX_CSE_NAME := "CSE-NAME";
modulepar XSD.ID PX_CSE_NAME := "cse-in";
/**
* @desc IUT CSE-ID with SP-relative-CSE-ID format (relative) according to TS-0001-7.2-1
*/
modulepar XSD.ID PX_CSE_ID := "/CSE-ID";
modulepar XSD.ID PX_CSE_ID := "/id-in";
/**
* @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 := "CSE-ID";
modulepar XSD.ID PX_CSE_RESOURCE_ID := "id-in";
/**
* @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 := "//CSE-SP-ID";
modulepar XSD.ID PX_SP_ID := "//acme.example.com";
/**
* @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 := "admin:admin";
modulepar XSD.ID PX_SUPER_AE_ID := "CAdmin";
/**
* @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 := "CAdmin";
/**
* @desc Allowed AE-IDs starting with C
......@@ -186,7 +186,7 @@ module OneM2M_Pixits {
}
},
security := omit,
serialization := "xml"
serialization := "json"
},
mcaPortIn := {
binding := {
......@@ -202,7 +202,7 @@ module OneM2M_Pixits {
}
},
security := omit,
serialization := "xml"
serialization := "json"
}
};
modulepar AeSimuComponentDesc PX_TS_AE2 := { // AE2 component settings
......@@ -222,7 +222,7 @@ module OneM2M_Pixits {
}
},
security := omit,
serialization := "xml"
serialization := "json"
},
mcaPortIn := {
binding := {
......@@ -238,7 +238,7 @@ module OneM2M_Pixits {
}
},
security := omit,
serialization := "xml"
serialization := "json"
}
};
modulepar CseSimuComponentDesc PX_TS_CSE1 := { // CSE1 component settings
......@@ -261,7 +261,7 @@ module OneM2M_Pixits {
}
},
security := omit,
serialization := "xml"
serialization := "json"
},
mcaPortIn := {
binding := {
......@@ -277,7 +277,7 @@ module OneM2M_Pixits {
}
},
security := omit,
serialization := "xml"
serialization := "json"
},
mccPort := {
binding := {
......@@ -293,7 +293,7 @@ module OneM2M_Pixits {
}
},
security := omit,
serialization := "xml"
serialization := "json"
},
mccPortIn := {
binding := {
......@@ -309,7 +309,7 @@ module OneM2M_Pixits {
}
},
security := omit,
serialization := "xml"
serialization := "json"
}
};
modulepar CseSimuComponentDesc PX_TS_CSE2 := { // CSE2 component settings
......@@ -384,7 +384,7 @@ module OneM2M_Pixits {
}
};
modulepar UrlDesc PX_TS_UT := { url := "http://127.0.0.1:43000/" };
modulepar UrlDesc PX_TS_UT := { url := "http://127.0.0.1:8080/__ut__" };
modulepar AeSimuComponentDesc PX_TS_DAS := { // DAS component settings
aeIdStem := "",
......
......@@ -3957,6 +3957,7 @@ module OneM2M_Templates {
lastModifiedTime := omit,//NP
labels := omit,//O
expirationTime := omit,//O
requestAggregation := omit,//O
choice := omit//NP
};
......@@ -3974,6 +3975,7 @@ module OneM2M_Templates {
lastModifiedTime := omit,//NP
labels := *,//O
expirationTime := *,//O
requestAggregation := *,//O
choice := omit//NP
};
......@@ -7461,6 +7463,7 @@ module OneM2M_Templates {
lastModifiedTime := omit,//NP
labels := omit,//O
expirationTime := omit,//O
requestAggregation := omit,//O
choice := omit
};
......@@ -8471,6 +8474,7 @@ module OneM2M_Templates {
lastModifiedTime := omit,//NP
labels := omit,//O
expirationTime := omit,//O
requestAggregation := omit,//O
choice := omit//NP
};
}
......@@ -8489,6 +8493,7 @@ module OneM2M_Templates {
lastModifiedTime := omit,//NP
labels := omit,//O
expirationTime := omit,//O
requestAggregation := omit,//O
choice := omit//NP
};
......@@ -8995,6 +9000,7 @@ module OneM2M_Templates {
lastModifiedTime := ?,//M
labels := *,//O
expirationTime := ?,//M
requestAggregation := *,//O
choice := omit//NP
};
......@@ -9007,6 +9013,7 @@ module OneM2M_Templates {
lastModifiedTime := *,//M
labels := *,//O
expirationTime := *,//M
requestAggregation := *,//O
choice := omit//NP
};
......@@ -9019,6 +9026,7 @@ module OneM2M_Templates {
lastModifiedTime := omit,//M
labels := omit,//O
expirationTime := omit,//M
requestAggregation := omit,//O
choice := omit//NP
};
......@@ -10702,6 +10710,7 @@ module OneM2M_Templates {
expirationCounter := omit,//Invalid attribute
labels := omit,//O
expirationTime := omit,//M
requestAggregation := omit,//O
choice := omit//O
};
......
......@@ -1604,6 +1604,7 @@ group OptionalResourceTypes {
Timestamp lastModifiedTime optional,
Labels labels optional,
Timestamp expirationTime optional,
XSD.Boolean requestAggregation optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
......@@ -4822,6 +4823,7 @@ group InvalidTypes {
XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for PollingChannel
Labels labels optional,
Timestamp expirationTime optional,
XSD.Boolean requestAggregation optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
......@@ -5244,6 +5246,7 @@ group OtherTypes {
AggregatedResponse aggregatedResponse,
URI uRI,
RequestPrimitive requestPrimitive,
AggregatedRequestPrimitives aggregatedRequestPrimitives,
DebugInfo debugInfo,
//Invalid types
AE_invalid aE_invalid,
......
Subproject commit d7ecc31c5febf98eaaf297bd4d1000a67e6834d7
Subproject commit c29cc72cb1ba0a9c3c236cad5170e5dda9596bd1
......@@ -933,7 +933,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
const AttributeList c_optionalAttribute := {"rateLimit"};
v_createRequest.primitiveContent.subscription.rateLimit := {0, omit};
v_createRequest.primitiveContent.subscription.rateLimit := {0, "PT20M"};
v_ae1.start(f_CSE_DMR_CRE_012(int23, v_createRequest, c_optionalAttribute));
v_ae1.done;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment