Commit c170c6e4873024aaeef37ce153e0ccede94f4b9e

Authored by Miguel Angel Reina Ortega
2 parents 299d9baf 267ceff9

Merge remote-tracking branch 'remotes/origin/Release1'

Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
... ... @@ -2701,8 +2701,29 @@ module OneM2M_Functions {
2701 2701 v_myResource.contentInstance.expirationTime := "20301231T012345";
2702 2702 }
2703 2703 v_myResource.contentInstance.stateTag := 0;
2704   - v_myResource.contentInstance.contentSize := lengthof(v_myResource.contentInstance.content);
2705   - v_myResource.contentInstance.content := valueof(p_resource.contentInstance.content);
  2704 + if(not(ispresent(p_resource.contentInstance.content))) {
  2705 + v_myResource.contentInstance.contentSize := 0;
  2706 + v_myResource.contentInstance.content := omit;
  2707 + } else {
  2708 + v_myResource.contentInstance.contentSize := lengthof(v_myResource.contentInstance.content);
  2709 + v_myResource.contentInstance.content := valueof(p_resource.contentInstance.content);
  2710 + }
  2711 + }
  2712 +
  2713 + } else if(p_resourceType == int23 and ispresent(p_resource)) {//Subscription
  2714 + if(ischosen(p_resource.subscription)){
  2715 + v_myResource.subscription := valueof(p_resource.subscription);
  2716 + v_myResource.subscription.resourceID := "sub" & int2str(v_resourceIndex);
  2717 + if(not(ispresent(p_resource.subscription.resourceName))) {
  2718 + v_myResource.subscription.resourceName := "subscription" & int2str(v_resourceIndex);
  2719 + }
  2720 + v_myResource.subscription.resourceType := p_resourceType;
  2721 + v_myResource.subscription.parentID := f_getResourceId(vc_localResourcesList[p_parentIndex].resource);
  2722 + v_myResource.subscription.creationTime := fx_generateTimestamp();
  2723 + v_myResource.subscription.lastModifiedTime := v_myResource.subscription.creationTime;
  2724 + if(not(ispresent(p_resource.subscription.expirationTime))) {
  2725 + v_myResource.subscription.expirationTime := "20301231T012345";
  2726 + }
2706 2727 }
2707 2728  
2708 2729 } else if(p_resourceType == int23 and ispresent(p_resource)) { //Subscription
... ...
... ... @@ -861,7 +861,7 @@ module OneM2M_Templates {
861 861 to_ := p_to,
862 862 from_ := p_from,
863 863 resourceType := int10001,
864   - primitiveContent := {accessControlPolicyAnnc := mw_contentCreateAcpAnnc(-)}
  864 + primitiveContent := {accessControlPolicyAnnc := mw_contentCreateAcpAnncBase(-)}
865 865 };
866 866  
867 867 /**
... ... @@ -942,19 +942,11 @@ module OneM2M_Templates {
942 942 };
943 943  
944 944 /**
945   - * @desc Reception template for CREATE RemoteCSE
  945 + * @desc Base reception template for CREATE RemoteCSE
946 946 */
947 947 template RequestPrimitive mw_createRemoteCSE(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
948 948 resourceType := int16,
949   - primitiveContent := {remoteCSE := ?} //{remoteCSE := m_contentCreateRemoteCSE(p_resourceName, p_accessControlPolicyIds,p_cSEBase, p_cSE_ID)}
950   - };
951   -
952   - /**
953   - * @desc CREATE request primitive for remoteCSE resource
954   - */
955   - template RequestPrimitive mw_createRemoteCSEBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
956   - resourceType := int16,
957   - primitiveContent := ?//{remoteCSE := m_contentCreateRemoteCSE(p_resourceName, p_accessControlPolicyIds,p_cSEBase, p_cSE_ID)}
  949 + primitiveContent := {remoteCSE := mw_contentCreateRemoteCSEBase}
958 950 };
959 951  
960 952 /**
... ... @@ -976,13 +968,13 @@ module OneM2M_Templates {
976 968 */
977 969 template RequestPrimitive mw_createContainer(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
978 970 resourceType := int3,
979   - primitiveContent := {container := ?}
  971 + primitiveContent := {container := mw_contentCreateContainerBase}
980 972 };
981 973  
982 974 /**
983 975 * @desc Base Reception template for CREATE ContainerAnnc
984 976 */
985   - template RequestPrimitive mw_createContainerAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
  977 + template RequestPrimitive mw_createContainerAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
986 978 resourceType := int10003,
987 979 primitiveContent := {containerAnnc := mw_contentCreateContainerAnncBase}
988 980 };
... ... @@ -1032,7 +1024,7 @@ module OneM2M_Templates {
1032 1024 */
1033 1025 template RequestPrimitive mw_createContentInstanceAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
1034 1026 resourceType := int10004,
1035   - primitiveContent := {contentInstanceAnnc := ?}
  1027 + primitiveContent := {contentInstanceAnnc := mw_contentCreateContentInstanceAnncBase}
1036 1028 };
1037 1029  
1038 1030 /**
... ... @@ -1040,18 +1032,10 @@ module OneM2M_Templates {
1040 1032 */
1041 1033 template RequestPrimitive mw_createContentInstance(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
1042 1034 resourceType := int4,
1043   - primitiveContent := {contentInstance := ?}
  1035 + primitiveContent := {contentInstance := mw_contentCreateContentInstanceBase}
1044 1036 };
1045 1037  
1046 1038 /**
1047   - * @desc Base Reception template for CREATE ContentInstanceAnnc
1048   - */
1049   - template RequestPrimitive mw_createContentInstanceAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
1050   - resourceType := int10014,
1051   - primitiveContent := {contentInstanceAnnc := mw_contentCreateContentInstanceAnncBase}
1052   - };
1053   -
1054   - /**
1055 1039 * @desc Base CREATE request primitive for Delivery resource
1056 1040 */
1057 1041 /*template (value) RequestPrimitive m_createDeliveryBase modifies m_create := {
... ... @@ -1096,18 +1080,10 @@ module OneM2M_Templates {
1096 1080 */
1097 1081 template RequestPrimitive mw_createGroupAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
1098 1082 resourceType := int10009,
1099   - primitiveContent := {groupAnnc := ?}
  1083 + primitiveContent := {groupAnnc := mw_contentCreateGroupAnncBase}
1100 1084 };
1101 1085  
1102 1086 /**
1103   - * @desc Base Reception template for CREATE GroupAnnc
1104   - */
1105   - template RequestPrimitive mw_createGroupAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
1106   - resourceType := int10009,
1107   - primitiveContent := {groupAnnc := mw_contentCreateGroupAnncBase}
1108   - };
1109   -
1110   - /**
1111 1087 * @desc Base CREATE request primitive for MgmtCmd resource
1112 1088 */
1113 1089 template (value) RequestPrimitive m_createMgmtCmdBase modifies m_create := {
... ... @@ -1139,14 +1115,6 @@ module OneM2M_Templates {
1139 1115 */
1140 1116 template RequestPrimitive mw_createMgmtObjAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
1141 1117 resourceType := int10013,
1142   - primitiveContent := {announcedMgmtResource := ?}
1143   - };
1144   -
1145   - /**
1146   - * @desc Base Reception template for CREATE MgmtObjAnnc
1147   - */
1148   - template RequestPrimitive mw_createMgmtObjAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
1149   - resourceType := int10013,
1150 1118 primitiveContent := {announcedMgmtResource := mw_contentCreateMgmtObjAnncBase}
1151 1119 };
1152 1120  
... ... @@ -1173,7 +1141,7 @@ module OneM2M_Templates {
1173 1141 */
1174 1142 template RequestPrimitive mw_createNodeAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
1175 1143 resourceType := int10014,
1176   - primitiveContent := {nodeAnnc := ?}
  1144 + primitiveContent := {nodeAnnc := mw_contentCreateNodeAnncBase}
1177 1145 };
1178 1146  
1179 1147 /**
... ... @@ -1220,17 +1188,9 @@ module OneM2M_Templates {
1220 1188 */
1221 1189 template RequestPrimitive mw_createScheduleAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
1222 1190 resourceType := int10018,
1223   - primitiveContent := {scheduleAnnc := ?}
1224   - };
1225   -
1226   - /**
1227   - * @desc Base Reception template for CREATE ScheduleAnnc
1228   - */
1229   - template RequestPrimitive mw_createScheduleAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
1230   - resourceType := int10018,
1231 1191 primitiveContent := {scheduleAnnc := mw_contentCreateScheduleAnncBase}
1232 1192 };
1233   -
  1193 +
1234 1194 template (value) RequestPrimitive m_createServiceSubscribedAppRule (in ListOfM2MID p_applicableCredIDs, in ListOfM2MID p_allowedAppIDs, in ListOfM2MID p_allowedAEs) modifies m_create := {
1235 1195 requestIdentifier := testcasename() & "-m_createServiceSubscribedAppRule",
1236 1196 resourceType := int19,//FIXME Is this the correct value?
... ... @@ -1267,7 +1227,7 @@ module OneM2M_Templates {
1267 1227 */
1268 1228 template RequestPrimitive mw_createSubscription(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
1269 1229 resourceType := int23,
1270   - primitiveContent := {subscription := ?}
  1230 + primitiveContent := {subscription := mw_contentCreateSubscriptionBase}
1271 1231 };
1272 1232  
1273 1233 template (value) RequestPrimitive m_createSubscriptionAdvanced( XSD.ID p_parentResourceAddress,
... ... @@ -1305,14 +1265,6 @@ module OneM2M_Templates {
1305 1265 */
1306 1266 template RequestPrimitive mw_createLocationPolicyAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
1307 1267 resourceType := int10010,
1308   - primitiveContent := {locationPolicyAnnc := ?}
1309   - };
1310   -
1311   - /**
1312   - * @desc Base Reception template for CREATE LocationPolicyAnnc
1313   - */
1314   - template RequestPrimitive mw_createLocationPolicyAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
1315   - resourceType := int10010,
1316 1268 primitiveContent := {locationPolicyAnnc := mw_contentCreateLocationPolicyAnncBase}
1317 1269 };
1318 1270  
... ... @@ -1413,13 +1365,13 @@ module OneM2M_Templates {
1413 1365 */
1414 1366 template RequestPrimitive mw_createTimeSeriesInstance(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
1415 1367 resourceType := int30,
1416   - primitiveContent := {timeSeriesInstance := ?}
  1368 + primitiveContent := {timeSeriesInstance := mw_contentCreateTimeSeriesInstanceBase}
1417 1369 };
1418 1370  
1419 1371 /**
1420 1372 * @desc Base Reception template for CREATE TimeSeriesAnnc
1421 1373 */
1422   - template RequestPrimitive mw_createTimeSeriesAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
  1374 + template RequestPrimitive mw_createTimeSeriesAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
1423 1375 resourceType := int10029,
1424 1376 primitiveContent := {timeSeriesAnnc := mw_contentCreateTimeSeriesAnncBase}
1425 1377 };
... ... @@ -1427,7 +1379,7 @@ module OneM2M_Templates {
1427 1379 /**
1428 1380 * @desc Base Reception template for CREATE TimeSeriesInstanceAnnc
1429 1381 */
1430   - template RequestPrimitive mw_createTimeSeriesInstanceAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
  1382 + template RequestPrimitive mw_createTimeSeriesInstanceAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
1431 1383 resourceType := int10030,
1432 1384 primitiveContent := {timeSeriesInstanceAnnc := mw_contentCreateTimeSeriesInstanceAnncBase}
1433 1385 };
... ... @@ -1854,7 +1806,7 @@ module OneM2M_Templates {
1854 1806 * @desc Base reception template of primitiveContent for CREATE operation for AccessControlPolicyAnnc resource
1855 1807 * @param p_labels Labels
1856 1808 */
1857   - template AccessControlPolicyAnnc_optional mw_contentCreateAcpAnnc (in template Labels p_labels := *) := {
  1809 + template AccessControlPolicyAnnc_optional mw_contentCreateAcpAnncBase (in template (omit) Labels p_labels := omit) := {
1858 1810 resourceName := omit,//NA M
1859 1811 resourceType := omit,//NA M
1860 1812 resourceID := omit,//NA M
... ... @@ -2155,7 +2107,53 @@ module OneM2M_Templates {
2155 2107 mgmtClientAddress := omit,//O
2156 2108 choice := omit//O
2157 2109 };
  2110 +
  2111 + /**
  2112 + * @desc Base reception template primitiveContent for CREATE operation for Node resource
  2113 + * @param p_name Resource name
  2114 + */
  2115 + template Node_optional mw_contentCreateNodeBase (template XSD.String p_name := *) := {
  2116 +
  2117 + resourceName := p_name,//O
  2118 + resourceType := omit,//NP
  2119 + resourceID := omit,//NP
  2120 + parentID := omit,//NP
  2121 + creationTime := omit,//NP
  2122 + lastModifiedTime := omit,//NP
  2123 + labels := *,//O
  2124 + accessControlPolicyIDs := *,//O
  2125 + expirationTime := *,//O
  2126 + dynamicAuthorizationConsultationIDs := *, //O
  2127 + announceTo := *,//O
  2128 + announcedAttribute := *,//O
  2129 + nodeID := ?,//M
  2130 + hostedCSELink := *,//O
  2131 + mgmtClientAddress := omit,//O
  2132 + choice := *//O
  2133 + };
2158 2134  
  2135 + /**
  2136 + * @desc Base reception template primitiveContent for CREATE operation for NodeAnnc resource
  2137 + * @param p_name Resource name
  2138 + */
  2139 + template NodeAnnc_optional mw_contentCreateNodeAnncBase := {
  2140 +
  2141 + resourceName := omit,//NP
  2142 + resourceType := omit,//NP
  2143 + resourceID := omit,//NP
  2144 + parentID := omit,//NP
  2145 + creationTime := omit,//NP
  2146 + lastModifiedTime := omit,//NP
  2147 + labels := ?,//M
  2148 + accessControlPolicyIDs := ?,//M
  2149 + expirationTime := ?,//M
  2150 + dynamicAuthorizationConsultationIDs := *, //O
  2151 + link := ?,//M
  2152 + nodeID := ?,//M
  2153 + hostedCSELink := *,//O
  2154 + mgmtClientAddress := *,//O
  2155 + choice := omit//NP
  2156 + };
2159 2157  
2160 2158 /**
2161 2159 * @desc Base primitiveContent for CREATE operation for PollingChannel resource
... ... @@ -2299,6 +2297,40 @@ module OneM2M_Templates {
2299 2297 choice := omit//NP
2300 2298 };
2301 2299  
  2300 + /**
  2301 + * @desc Base reception template primitiveContent for CREATE operation for Subscription resource
  2302 + * @param p_notificationURI Notification URI
  2303 + * @param p_name Resource name
  2304 + */
  2305 + template Subscription_optional mw_contentCreateSubscriptionBase (template XSD.String p_name := *) := {
  2306 + resourceName := p_name,//O
  2307 + resourceType := omit,//NP
  2308 + resourceID := omit,//NP
  2309 + parentID := omit,//NP
  2310 + creationTime := omit,//NP
  2311 + lastModifiedTime := omit,//NP
  2312 + labels := *,//O
  2313 + accessControlPolicyIDs := *,//O
  2314 + expirationTime := *,//O
  2315 + dynamicAuthorizationConsultationIDs := *, //O
  2316 + creator := *,//O
  2317 + eventNotificationCriteria := *,//O
  2318 + expirationCounter := *,//O
  2319 + notificationURI := ?,//M
  2320 + groupID := *,//O
  2321 + notificationForwardingURI := *,//O
  2322 + batchNotify := *,//O
  2323 + rateLimit := *,//O
  2324 + preSubscriptionNotify := *,//O
  2325 + pendingNotification := *,//O
  2326 + notificationStoragePriority := *,//O
  2327 + latestNotify := *,//O
  2328 + notificationContentType := *, //O
  2329 + notificationEventCat := *,//O
  2330 + subscriberURI := *,//O
  2331 + choice := *//O
  2332 + };
  2333 +
2302 2334 template (value) Subscription_optional m_contentCreateSubscriptionAdvanced (in template (value) ListOfURIs p_notificationURI,
2303 2335 in template (omit) XSD.String p_name := c_defaultSubscriptionResourceName,
2304 2336 in template (omit) EventNotificationCriteria p_eventNotificationCriteria,
... ... @@ -2367,7 +2399,32 @@ module OneM2M_Templates {
2367 2399 content := p_primitiveContent,//M
2368 2400 choice := omit //O
2369 2401 };
2370   -
  2402 +
  2403 + /**
  2404 + * @desc Base reception template primitiveContent for CREATE operation for ContentInstance resource
  2405 + * @param p_primitiveContent Content for the ContentInstance
  2406 + */
  2407 + template ContentInstance_optional mw_contentCreateContentInstanceBase(template XSD.String p_name := *) := {
  2408 + resourceName := p_name,//O
  2409 + resourceType := omit,//NP
  2410 + resourceID := omit,//NP
  2411 + parentID := omit,//NP
  2412 + creationTime := omit,//NP
  2413 + lastModifiedTime := omit,//NP
  2414 + labels := *,//O
  2415 + expirationTime := *,//O
  2416 + announceTo := *,//O
  2417 + announcedAttribute := *,//O
  2418 + stateTag := omit,//NP
  2419 + creator := *,//O
  2420 + contentInfo := *,//O
  2421 + contentSize := omit,//NP
  2422 + contentRef := *, //O
  2423 + ontologyRef := *,//O
  2424 + content := ?,//M
  2425 + choice := * //O
  2426 + };
  2427 +
2371 2428 /**
2372 2429 * @desc Base primitiveContent for CREATE operation for ContentInstanceAnnc resource
2373 2430 * @param p_primitiveContent Content for the ContentInstanceAnnc
... ... @@ -2447,6 +2504,36 @@ module OneM2M_Templates {
2447 2504 disableRetrieval := omit, //O
2448 2505 choice := omit//NP
2449 2506 };
  2507 +
  2508 + /**
  2509 + * @desc Base reception template primitiveContent for CREATE operation for Container resource
  2510 + * @param p_name Resource name
  2511 + */
  2512 + template Container_optional mw_contentCreateContainerBase (template XSD.String p_name := *):= {
  2513 + resourceName := p_name,//O
  2514 + resourceType := omit,//NP
  2515 + resourceID := omit,//NP
  2516 + parentID := omit,//NP
  2517 + creationTime := omit,//NP
  2518 + lastModifiedTime := omit,//NP
  2519 + labels := *,//O
  2520 + accessControlPolicyIDs := *,//O
  2521 + expirationTime := *,//O
  2522 + dynamicAuthorizationConsultationIDs := *, //O
  2523 + announceTo := *,//O
  2524 + announcedAttribute := *,//O
  2525 + stateTag := omit,//NP
  2526 + creator := *,//O
  2527 + maxNrOfInstances := *,//O
  2528 + maxByteSize := *,//O
  2529 + maxInstanceAge := *,//O
  2530 + currentNrOfInstances := omit,//NP
  2531 + currentByteSize := omit,//NP
  2532 + locationID := *,//O
  2533 + ontologyRef := *,//O
  2534 + disableRetrieval := *, //O
  2535 + choice := *//NP
  2536 + };
2450 2537  
2451 2538 /**
2452 2539 * @desc Base primitiveContent for invalid CREATE operation for Container resource (using Container_update_invalid)
... ... @@ -2542,6 +2629,36 @@ module OneM2M_Templates {
2542 2629 };
2543 2630  
2544 2631 /**
  2632 + * @desc Base reception template of primitiveContent for CREATE operation for remoteCSE resource
  2633 + */
  2634 + template RemoteCSE_optional mw_contentCreateRemoteCSEBase := {
  2635 + resourceName := *,//O
  2636 + resourceType := omit,//NP
  2637 + resourceID := omit,//NP
  2638 + parentID := omit,//NP
  2639 + creationTime := omit,//NP
  2640 + lastModifiedTime := omit,//NP
  2641 + labels := *,//O
  2642 + accessControlPolicyIDs := *,//O
  2643 + expirationTime := *,//O
  2644 + dynamicAuthorizationConsultationIDs := omit,
  2645 + announceTo := *,//O
  2646 + announcedAttribute := *,//O
  2647 + cseType := *,//O
  2648 + pointOfAccess := *,//O
  2649 + cSEBase := ?,//M
  2650 + cSE_ID := ?,//M
  2651 + m2M_Ext_ID := *,//O
  2652 + trigger_Recipient_ID := *,//O
  2653 + requestReachability := ?,//M
  2654 + nodeLink := *,//O
  2655 + triggerReferenceNumber := omit,//O
  2656 + e2eSecInfo := omit,//O
  2657 + supportedReleaseVersions := {"2a"}, //M
  2658 + choice := omit//O
  2659 + };
  2660 +
  2661 + /**
2545 2662 * @desc Base reception template of primitiveContent for CREATE operation for ContainerAnnc resource
2546 2663 */
2547 2664 template ContainerAnnc_optional mw_contentCreateContainerAnncBase := {
... ... @@ -2831,7 +2948,41 @@ module OneM2M_Templates {
2831 2948 ontologyRef := omit,//O
2832 2949 choice := omit//NP
2833 2950 };
2834   -
  2951 +
  2952 + /**
  2953 + * @desc Base reception template primitiveContent for CREATE operation for timeSeries resource
  2954 + * @param p_name Resource name
  2955 + */
  2956 + template TimeSeries_optional mw_contentCreateTimeSeriesBase (template XSD.String p_name := *):= {
  2957 + resourceName := p_name,//O
  2958 + resourceType := omit,//NP
  2959 + resourceID := omit,//NP
  2960 + parentID := omit,//NP
  2961 + creationTime := omit,//NP
  2962 + lastModifiedTime := omit,//NP
  2963 + labels := *,//O
  2964 + accessControlPolicyIDs := *,//O
  2965 + expirationTime := *,//O
  2966 + dynamicAuthorizationConsultationIDs := *, //O
  2967 + announceTo := *,//O
  2968 + announcedAttribute := *,//O
  2969 + stateTag := omit,//NP
  2970 + creator := *,//O
  2971 + maxNrOfInstances := *,//O
  2972 + maxByteSize := *,//O
  2973 + maxInstanceAge := *,//O
  2974 + currentNrOfInstances := omit,//NP
  2975 + currentByteSize := omit,//NP
  2976 + periodicInterval := *,//O
  2977 + missingDataDetect := *,//O
  2978 + missingDataMaxNr := *,//O
  2979 + missingDataList := omit,//NP
  2980 + missingDataCurrentNr := omit,//NP
  2981 + missingDataDetectTimer := *,//O
  2982 + ontologyRef := *,//O
  2983 + choice := *//NP
  2984 + };
  2985 +
2835 2986 /**
2836 2987 * @desc Base primitiveContent for CREATE operation for timeSeriesAnnc resource
2837 2988 * @param p_name Resource name
... ... @@ -2986,6 +3137,27 @@ module OneM2M_Templates {
2986 3137 contentSize := omit//NP
2987 3138 };
2988 3139  
  3140 + /**
  3141 + * @desc Base reception template primitiveContent for CREATE operation for Container resource
  3142 + * @param p_name Resource name
  3143 + */
  3144 + template TimeSeriesInstance_optional mw_contentCreateTimeSeriesInstanceBase (template XSD.String p_name := *):= {
  3145 + resourceName := p_name,//O
  3146 + resourceType := omit,//NP
  3147 + resourceID := omit,//NP
  3148 + parentID := omit,//NP
  3149 + creationTime := omit,//NP
  3150 + lastModifiedTime := omit,//NP
  3151 + labels := *,//O
  3152 + expirationTime := *,//O
  3153 + announceTo := *,//O
  3154 + announcedAttribute := *,//O
  3155 + dataGenerationTime := ?,//M
  3156 + content := ?,//M
  3157 + sequenceNr := *,//O
  3158 + contentSize := omit//NP
  3159 + };
  3160 +
2989 3161 template (value) MissingData m_missingData( in XSD.NonNegativeInteger p_number, in XSD.Duration p_duration) := {
2990 3162 number := p_number,
2991 3163 duration := p_duration
... ...
... ... @@ -1679,7 +1679,7 @@ module OneM2M_PermutationFunctions {
1679 1679 // Test adapter configuration
1680 1680  
1681 1681 // Preamble
1682   - vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
  1682 + vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSE);
1683 1683  
1684 1684 //Send Trigger Message
1685 1685 v_utRequest.requestPrimitive.to_ := f_getResourceAddress();
... ... @@ -3036,7 +3036,7 @@ module OneM2M_PermutationFunctions {
3036 3036 // Preamble
3037 3037  
3038 3038 if (PX_MN_CSE) {
3039   - vc_cse1.start(f_cse_registrationRemoteCse(mw_createRemoteCSEBase));
  3039 + vc_cse1.start(f_cse_registrationRemoteCse(mw_createRemoteCSE));
3040 3040 }else if (PX_IN_CSE) {
3041 3041 vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSEBase));
3042 3042 }
... ... @@ -7300,7 +7300,7 @@ module OneM2M_PermutationFunctions {
7300 7300 // Test adapter configuration
7301 7301  
7302 7302 //Register the CSE
7303   - f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
  7303 + f_cse_registrationRemoteCse(mw_createRemoteCSE);
7304 7304  
7305 7305 //Preamble
7306 7306 vc_ae1.start(f_cse_preamble_registerAe());
... ... @@ -7399,7 +7399,7 @@ module OneM2M_PermutationFunctions {
7399 7399  
7400 7400 //Preamble
7401 7401 v_aeIndex := f_cse_preamble_registerAe();
7402   - vc_cse1.start(f_cse_announcementProcedure_createHandler(mw_createContainerAnncBase(-, -)));
  7402 + vc_cse1.start(f_cse_announcementProcedure_createHandler(mw_createContainerAnnc(-, -)));
7403 7403 v_resourceIndex := f_cse_createResource(int3,v_createContainer, v_aeIndex);
7404 7404 f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
7405 7405  
... ... @@ -7501,7 +7501,7 @@ module OneM2M_PermutationFunctions {
7501 7501  
7502 7502 // Test adapter configuration
7503 7503 // Register the CSE
7504   - vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
  7504 + vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSE);
7505 7505  
7506 7506 f_checkCseSimuStatus();
7507 7507  
... ... @@ -7520,7 +7520,7 @@ module OneM2M_PermutationFunctions {
7520 7520  
7521 7521 tc_ac.start;
7522 7522 alt {
7523   - [] mccPortIn.receive(mw_request(mw_createContainerAnncBase(PX_CSE_ID, vc_localResourcesList[vc_localRemoteCseIndex].resource.remoteCSE.announceTo[0] ))) -> value v_request {
  7523 + [] mccPortIn.receive(mw_request(mw_createContainerAnnc(PX_CSE_ID, vc_localResourcesList[vc_localRemoteCseIndex].resource.remoteCSE.announceTo[0] ))) -> value v_request {
7524 7524 tc_ac.stop;
7525 7525 setverdict(pass, __SCOPE__ & ":INFO: Resource Announced CREATE received");
7526 7526  
... ... @@ -7633,7 +7633,7 @@ module OneM2M_PermutationFunctions {
7633 7633  
7634 7634 // Test adapter configuration
7635 7635 // Register the CSE
7636   - vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
  7636 + vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSE);
7637 7637  
7638 7638 f_checkCseSimuStatus();
7639 7639  
... ... @@ -7652,7 +7652,7 @@ module OneM2M_PermutationFunctions {
7652 7652  
7653 7653 tc_ac.start;
7654 7654 alt {
7655   - [] mccPortIn.receive(mw_request(mw_createContainerAnncBase(PX_CSE_ID, vc_localResourcesList[vc_localRemoteCseIndex].resource.remoteCSE.announceTo[0] ))) -> value v_request {
  7655 + [] mccPortIn.receive(mw_request(mw_createContainerAnnc(PX_CSE_ID, vc_localResourcesList[vc_localRemoteCseIndex].resource.remoteCSE.announceTo[0] ))) -> value v_request {
7656 7656 tc_ac.stop;
7657 7657 setverdict(pass, __SCOPE__ & ":INFO: Resource Announced CREATE received");
7658 7658  
... ...
... ... @@ -1844,7 +1844,7 @@ module OneM2M_Testcases_CSE_Release_1 {
1844 1844 // Test Body
1845 1845 tc_ac.start;
1846 1846 alt {
1847   - [not(v_cseRegistered)] mccPortIn.receive(mw_request(mw_createRemoteCSEBase)) -> value v_request {
  1847 + [not(v_cseRegistered)] mccPortIn.receive(mw_request(mw_createRemoteCSE)) -> value v_request {
1848 1848 tc_ac.stop;
1849 1849 setverdict(pass, __SCOPE__&":INFO: CREATE remoteCSE request received");
1850 1850 v_parentResourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
... ... @@ -2742,7 +2742,7 @@ module OneM2M_Testcases_CSE_Release_1 {
2742 2742 // Test adapter configuration
2743 2743  
2744 2744 // Preamble
2745   - vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
  2745 + vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSE);
2746 2746  
2747 2747 //Send Trigger Message
2748 2748 v_utRequest := m_utRetrieve(f_getLocalResourceAddress(vc_localRemoteCseIndex));
... ...
... ... @@ -2247,7 +2247,7 @@ module OneM2M_Testcases_CSE_Release_2 {
2247 2247 v_ae1.done;
2248 2248 v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
2249 2249  
2250   - v_ae1.start(f_CSE_DMR_CRE_020(int3, v_createRequest, mw_createContainerAnncBase));//Container
  2250 + v_ae1.start(f_CSE_DMR_CRE_020(int3, v_createRequest, mw_createContainerAnnc));//Container
2251 2251 v_ae1.done;
2252 2252 }
2253 2253  
... ... @@ -2259,7 +2259,7 @@ module OneM2M_Testcases_CSE_Release_2 {
2259 2259 v_ae1.done;
2260 2260 v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
2261 2261  
2262   - v_ae1.start(f_CSE_DMR_CRE_020(int4, v_createRequest, mw_createContentInstanceAnncBase));//ContentInstance
  2262 + v_ae1.start(f_CSE_DMR_CRE_020(int4, v_createRequest, mw_createContentInstanceAnnc));//ContentInstance
2263 2263 v_ae1.done;
2264 2264 }
2265 2265  
... ... @@ -2272,7 +2272,7 @@ module OneM2M_Testcases_CSE_Release_2 {
2272 2272 v_ae1.done;
2273 2273 v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
2274 2274  
2275   - v_ae1.start(f_CSE_DMR_CRE_020(int9, v_createRequest, mw_createGroupAnncBase));//Group
  2275 + v_ae1.start(f_CSE_DMR_CRE_020(int9, v_createRequest, mw_createGroupAnnc));//Group
2276 2276 v_ae1.done;
2277 2277 }
2278 2278  
... ... @@ -2285,7 +2285,7 @@ module OneM2M_Testcases_CSE_Release_2 {
2285 2285 v_ae1.done;
2286 2286 v_createRequest.primitiveContent.locationPolicy.announceTo := {PX_CSE1_ID};
2287 2287  
2288   - v_ae1.start(f_CSE_DMR_CRE_020(int10, v_createRequest, mw_createLocationPolicyAnncBase));//LocationPolicy
  2288 + v_ae1.start(f_CSE_DMR_CRE_020(int10, v_createRequest, mw_createLocationPolicyAnnc));//LocationPolicy
2289 2289 v_ae1.done;
2290 2290 }
2291 2291  
... ... @@ -2298,7 +2298,7 @@ module OneM2M_Testcases_CSE_Release_2 {
2298 2298 v_ae1.done;
2299 2299 v_createRequest.primitiveContent.mgmtResource.announceTo := {PX_CSE1_ID};
2300 2300  
2301   - v_ae1.start(f_CSE_DMR_CRE_020(int13, v_createRequest, mw_createMgmtObjAnncBase));//MgmtObj
  2301 + v_ae1.start(f_CSE_DMR_CRE_020(int13, v_createRequest, mw_createMgmtObjAnnc));//MgmtObj
2302 2302 v_ae1.done;
2303 2303 }
2304 2304  
... ... @@ -2324,7 +2324,7 @@ module OneM2M_Testcases_CSE_Release_2 {
2324 2324 v_ae1.done;
2325 2325 v_createRequest.primitiveContent.schedule.announceTo := {PX_CSE1_ID};
2326 2326  
2327   - v_ae1.start(f_CSE_DMR_CRE_020(int18, v_createRequest, mw_createScheduleAnncBase));//Schedule
  2327 + v_ae1.start(f_CSE_DMR_CRE_020(int18, v_createRequest, mw_createScheduleAnnc));//Schedule
2328 2328 v_ae1.done;
2329 2329 }
2330 2330  
... ... @@ -2337,7 +2337,7 @@ module OneM2M_Testcases_CSE_Release_2 {
2337 2337 v_ae1.done;
2338 2338 v_createRequest.primitiveContent.timeSeries.announceTo := {f_getCompletePoA()};
2339 2339  
2340   - v_ae1.start(f_CSE_DMR_CRE_020(int29, v_createRequest, mw_createTimeSeriesAnncBase));//TimeSeries
  2340 + v_ae1.start(f_CSE_DMR_CRE_020(int29, v_createRequest, mw_createTimeSeriesAnnc));//TimeSeries
2341 2341 v_ae1.done;
2342 2342 }
2343 2343  
... ... @@ -2350,7 +2350,7 @@ module OneM2M_Testcases_CSE_Release_2 {
2350 2350 v_ae1.done;
2351 2351 v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {f_getCompletePoA()};
2352 2352  
2353   - v_ae1.start(f_CSE_DMR_CRE_020(int30, v_createRequest, mw_createTimeSeriesInstanceAnncBase));//TimeSeriesInstance
  2353 + v_ae1.start(f_CSE_DMR_CRE_020(int30, v_createRequest, mw_createTimeSeriesInstanceAnnc));//TimeSeriesInstance
2354 2354 v_ae1.done;
2355 2355 }
2356 2356  
... ... @@ -2374,7 +2374,7 @@ module OneM2M_Testcases_CSE_Release_2 {
2374 2374 v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize;
2375 2375 v_createRequest.primitiveContent.container.announcedAttribute := {"mbs"};
2376 2376  
2377   - v_ae1.start(f_CSE_DMR_CRE_021(int3, v_createRequest, mw_createContainerAnncBase()));//Container
  2377 + v_ae1.start(f_CSE_DMR_CRE_021(int3, v_createRequest, mw_createContainerAnnc()));//Container
2378 2378 v_ae1.done;
2379 2379  
2380 2380 if(getverdict == pass){
... ... @@ -2404,7 +2404,7 @@ module OneM2M_Testcases_CSE_Release_2 {
2404 2404 v_createRequest.primitiveContent.contentInstance.contentSize := v_contentSize;
2405 2405 v_createRequest.primitiveContent.contentInstance.announcedAttribute := {"cs"};
2406 2406  
2407   - v_ae1.start(f_CSE_DMR_CRE_021(int4, v_createRequest, mw_createContentInstanceAnncBase()));//ContentInstance
  2407 + v_ae1.start(f_CSE_DMR_CRE_021(int4, v_createRequest, mw_createContentInstanceAnnc()));//ContentInstance
2408 2408 v_ae1.done;
2409 2409  
2410 2410 if(getverdict == pass){
... ... @@ -2434,7 +2434,7 @@ module OneM2M_Testcases_CSE_Release_2 {
2434 2434 v_createRequest.primitiveContent.group_.maxNrOfMembers := v_maxNrOfMembers;
2435 2435 v_createRequest.primitiveContent.group_.announcedAttribute := {"mnm"};
2436 2436  
2437   - v_ae1.start(f_CSE_DMR_CRE_021(int9, v_createRequest, mw_createGroupAnncBase()));//Group
  2437 + v_ae1.start(f_CSE_DMR_CRE_021(int9, v_createRequest, mw_createGroupAnnc()));//Group
2438 2438 v_ae1.done;
2439 2439  
2440 2440 if(getverdict == pass){
... ... @@ -2464,7 +2464,7 @@ module OneM2M_Testcases_CSE_Release_2 {
2464 2464 v_createRequest.primitiveContent.locationPolicy.locationSource := v_locationSource;
2465 2465 v_createRequest.primitiveContent.locationPolicy.announcedAttribute := {"los"};
2466 2466  
2467   - v_ae1.start(f_CSE_DMR_CRE_021(int10, v_createRequest, mw_createLocationPolicyAnncBase()));//LocationPolicy
  2467 + v_ae1.start(f_CSE_DMR_CRE_021(int10, v_createRequest, mw_createLocationPolicyAnnc()));//LocationPolicy
2468 2468 v_ae1.done;
2469 2469  
2470 2470 if(getverdict == pass){
... ... @@ -2494,7 +2494,7 @@ module OneM2M_Testcases_CSE_Release_2 {
2494 2494 v_createRequest.primitiveContent.mgmtResource.description := v_description;
2495 2495 v_createRequest.primitiveContent.mgmtResource.announcedAttribute := {"dc"};
2496 2496  
2497   - v_ae1.start(f_CSE_DMR_CRE_021(int13, v_createRequest, mw_createMgmtObjAnncBase()));//MgmtObj
  2497 + v_ae1.start(f_CSE_DMR_CRE_021(int13, v_createRequest, mw_createMgmtObjAnnc()));//MgmtObj
2498 2498 v_ae1.done;
2499 2499  
2500 2500 if(getverdict == pass){
... ... @@ -2539,7 +2539,7 @@ module OneM2M_Testcases_CSE_Release_2 {
2539 2539 v_createRequest.primitiveContent.schedule.scheduleElement := v_scheduleElement;
2540 2540 v_createRequest.primitiveContent.schedule.announcedAttribute := {"se"};
2541 2541  
2542   - v_ae1.start(f_CSE_DMR_CRE_021(int18, v_createRequest, mw_createScheduleAnncBase()));//Schedule
  2542 + v_ae1.start(f_CSE_DMR_CRE_021(int18, v_createRequest, mw_createScheduleAnnc()));//Schedule
2543 2543 v_ae1.done;
2544 2544  
2545 2545 if(getverdict == pass){
... ... @@ -2570,7 +2570,7 @@ module OneM2M_Testcases_CSE_Release_2 {
2570 2570 v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize;
2571 2571 v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"mbs"};
2572 2572  
2573   - v_ae1.start(f_CSE_DMR_CRE_021(int29, v_createRequest, mw_createTimeSeriesAnncBase()));//TimeSeries
  2573 + v_ae1.start(f_CSE_DMR_CRE_021(int29, v_createRequest, mw_createTimeSeriesAnnc()));//TimeSeries
2574 2574 v_ae1.done;
2575 2575  
2576 2576 if(getverdict == pass){
... ... @@ -2601,7 +2601,7 @@ module OneM2M_Testcases_CSE_Release_2 {
2601 2601 v_createRequest.primitiveContent.timeSeriesInstance.sequenceNr := v_sequenceNr;
2602 2602 v_createRequest.primitiveContent.timeSeriesInstance.announcedAttribute := {"snr"};
2603 2603  
2604   - v_ae1.start(f_CSE_DMR_CRE_021(int30, v_createRequest, mw_createTimeSeriesInstanceAnncBase()));//TimeSeriesInstance
  2604 + v_ae1.start(f_CSE_DMR_CRE_021(int30, v_createRequest, mw_createTimeSeriesInstanceAnnc()));//TimeSeriesInstance
2605 2605 v_ae1.done;
2606 2606  
2607 2607 if(getverdict == pass){
... ... @@ -7359,7 +7359,7 @@ module OneM2M_Testcases_CSE_Release_2 {
7359 7359 // Local variables
7360 7360 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
7361 7361 var template RequestPrimitive v_createRequest := m_createContainerBase;
7362   - var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
  7362 + var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
7363 7363 var template RequestPrimitive v_updateRequest := m_updateContainerBase;
7364 7364  
7365 7365 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
... ... @@ -7375,7 +7375,7 @@ module OneM2M_Testcases_CSE_Release_2 {
7375 7375 // Local variables
7376 7376 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
7377 7377 var template RequestPrimitive v_createRequest := m_createGroupBase;
7378   - var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
  7378 + var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
7379 7379 var template RequestPrimitive v_updateRequest := m_updateGroupBase;
7380 7380  
7381 7381 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
... ... @@ -7390,7 +7390,7 @@ module OneM2M_Testcases_CSE_Release_2 {
7390 7390 // Local variables
7391 7391 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
7392 7392 var template RequestPrimitive v_createRequest := m_createScheduleBase;
7393   - var template RequestPrimitive v_createRequestAnnc := mw_createScheduleAnncBase;
  7393 + var template RequestPrimitive v_createRequestAnnc := mw_createScheduleAnnc;
7394 7394 var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
7395 7395  
7396 7396 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
... ... @@ -7405,7 +7405,7 @@ module OneM2M_Testcases_CSE_Release_2 {
7405 7405 // Local variables
7406 7406 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
7407 7407 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
7408   - var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
  7408 + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
7409 7409 var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
7410 7410  
7411 7411 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
... ... @@ -7420,7 +7420,7 @@ module OneM2M_Testcases_CSE_Release_2 {
7420 7420 // Local variables
7421 7421 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
7422 7422 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
7423   - var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase;
  7423 + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnnc;
7424 7424 var template RequestPrimitive v_updateRequest := m_updateTimeSeriesInstanceBase;
7425 7425  
7426 7426 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
... ... @@ -7439,7 +7439,7 @@ module OneM2M_Testcases_CSE_Release_2 {
7439 7439 // Local variables
7440 7440 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
7441 7441 var template RequestPrimitive v_createRequest := m_createContainerBase;
7442   - var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
  7442 + var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
7443 7443 var template RequestPrimitive v_updateRequest := m_updateContainerBase;
7444 7444 var template RequestPrimitive v_updateRequestAnnc := mw_updateContainerAnnc;
7445 7445 var XSD.NonNegativeInteger v_maxByteSize := 512;
... ... @@ -7463,7 +7463,7 @@ module OneM2M_Testcases_CSE_Release_2 {
7463 7463 // Local variables
7464 7464 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
7465 7465 var template RequestPrimitive v_createRequest := m_createGroupBase;
7466   - var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
  7466 + var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
7467 7467 var template RequestPrimitive v_updateRequest := m_updateGroupBase;
7468 7468 var template RequestPrimitive v_updateRequestAnnc := mw_updateGroupAnnc;
7469 7469 var MemberType v_memberType := int3;
... ... @@ -7487,7 +7487,7 @@ module OneM2M_Testcases_CSE_Release_2 {
7487 7487 // Local variables
7488 7488 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
7489 7489 var template RequestPrimitive v_createRequest := m_createGroupBase;
7490   - var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
  7490 + var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
7491 7491 var template RequestPrimitive v_updateRequest := m_updateGroupBase;
7492 7492 var template RequestPrimitive v_updateRequestAnnc := mw_updateGroupAnnc;
7493 7493  
... ... @@ -7507,7 +7507,7 @@ module OneM2M_Testcases_CSE_Release_2 {
7507 7507 // Local variables
7508 7508 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
7509 7509 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
7510   - var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
  7510 + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
7511 7511 var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
7512 7512 var template RequestPrimitive v_updateRequestAnnc := mw_updateTimeSeriesAnnc;
7513 7513 var XSD.NonNegativeInteger v_maxByteSize := 512;
... ... @@ -10202,7 +10202,7 @@ module OneM2M_Testcases_CSE_Release_2 {
10202 10202 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
10203 10203  
10204 10204 var template RequestPrimitive v_updateRequest := m_updateContainerBase;
10205   - var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
  10205 + var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
10206 10206 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
10207 10207 v_ae1.done;
10208 10208 v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
... ... @@ -10216,7 +10216,7 @@ module OneM2M_Testcases_CSE_Release_2 {
10216 10216 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
10217 10217  
10218 10218 var template RequestPrimitive v_createRequest := m_createContainerBase;
10219   - var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
  10219 + var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
10220 10220 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
10221 10221 v_ae1.done;
10222 10222 v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
... ... @@ -10230,7 +10230,7 @@ module OneM2M_Testcases_CSE_Release_2 {
10230 10230 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
10231 10231  
10232 10232 var template RequestPrimitive v_updateRequest := m_updateGroupBase;
10233   - var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
  10233 + var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
10234 10234 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
10235 10235 v_ae1.done;
10236 10236 v_updateRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
... ... @@ -10244,7 +10244,7 @@ module OneM2M_Testcases_CSE_Release_2 {
10244 10244 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
10245 10245  
10246 10246 var template RequestPrimitive v_createRequest := m_createGroupBase;
10247   - var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
  10247 + var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
10248 10248 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
10249 10249 v_ae1.done;
10250 10250 v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
... ... @@ -10258,7 +10258,7 @@ module OneM2M_Testcases_CSE_Release_2 {
10258 10258 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
10259 10259  
10260 10260 var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
10261   - var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnncBase;
  10261 + var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
10262 10262 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
10263 10263 v_ae1.done;
10264 10264 v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
... ... @@ -10271,7 +10271,7 @@ module OneM2M_Testcases_CSE_Release_2 {
10271 10271 // Local variables
10272 10272 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
10273 10273 var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
10274   - var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
  10274 + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
10275 10275  
10276 10276 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
10277 10277 v_ae1.done;
... ... @@ -10285,7 +10285,7 @@ module OneM2M_Testcases_CSE_Release_2 {
10285 10285 // Local variables
10286 10286 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
10287 10287 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
10288   - var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
  10288 + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
10289 10289  
10290 10290 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
10291 10291 v_ae1.done;
... ... @@ -10299,7 +10299,7 @@ module OneM2M_Testcases_CSE_Release_2 {
10299 10299 // Local variables
10300 10300 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
10301 10301 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
10302   - var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase;
  10302 + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnnc;
10303 10303  
10304 10304 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
10305 10305 v_ae1.done;
... ... @@ -10325,7 +10325,7 @@ module OneM2M_Testcases_CSE_Release_2 {
10325 10325 //Local variables
10326 10326 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
10327 10327 var template RequestPrimitive v_createRequest := m_createContainerBase;
10328   - var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
  10328 + var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
10329 10329  
10330 10330 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
10331 10331 v_ae1.done;
... ... @@ -10363,7 +10363,7 @@ module OneM2M_Testcases_CSE_Release_2 {
10363 10363 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
10364 10364 var template RequestPrimitive v_updateRequest := m_updateContainerBase;
10365 10365 var template RequestPrimitive v_createRequest := m_createContainerBase;
10366   - var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
  10366 + var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
10367 10367  
10368 10368 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
10369 10369 v_cse1.done;
... ... @@ -10378,7 +10378,7 @@ module OneM2M_Testcases_CSE_Release_2 {
10378 10378 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
10379 10379 var template RequestPrimitive v_updateRequest := m_updateGroupBase;
10380 10380 var template RequestPrimitive v_createRequest := m_createGroupBase;
10381   - var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
  10381 + var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
10382 10382  
10383 10383 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
10384 10384 v_cse1.done;
... ... @@ -10393,7 +10393,7 @@ module OneM2M_Testcases_CSE_Release_2 {
10393 10393 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
10394 10394 var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
10395 10395 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
10396   - var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
  10396 + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
10397 10397  
10398 10398 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
10399 10399 v_cse1.done;
... ... @@ -10451,7 +10451,7 @@ module OneM2M_Testcases_CSE_Release_2 {
10451 10451 // Local variables
10452 10452 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
10453 10453 var template RequestPrimitive v_createRequest := m_createContainerBase;
10454   - var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
  10454 + var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
10455 10455  
10456 10456 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
10457 10457 v_cse1.done;
... ... @@ -10479,7 +10479,7 @@ module OneM2M_Testcases_CSE_Release_2 {
10479 10479 // Local variables
10480 10480 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
10481 10481 var template RequestPrimitive v_createRequest := m_createGroupBase;
10482   - var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
  10482 + var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
10483 10483  
10484 10484 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
10485 10485 v_cse1.done;
... ... @@ -10493,7 +10493,7 @@ module OneM2M_Testcases_CSE_Release_2 {
10493 10493 // Local variables
10494 10494 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
10495 10495 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
10496   - var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
  10496 + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
10497 10497  
10498 10498 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
10499 10499 v_cse1.done;
... ... @@ -10529,7 +10529,7 @@ module OneM2M_Testcases_CSE_Release_2 {
10529 10529 //Local variables
10530 10530 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
10531 10531 var template RequestPrimitive v_createRequest := m_createContainerBase;
10532   - var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
  10532 + var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
10533 10533  
10534 10534 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
10535 10535 v_cse1.done;
... ... @@ -10558,7 +10558,7 @@ module OneM2M_Testcases_CSE_Release_2 {
10558 10558 //Local variables
10559 10559 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
10560 10560 var template RequestPrimitive v_createRequest := m_createGroupBase;
10561   - var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
  10561 + var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
10562 10562  
10563 10563 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
10564 10564 v_cse1.done;
... ... @@ -10572,7 +10572,7 @@ module OneM2M_Testcases_CSE_Release_2 {
10572 10572 //Local variables
10573 10573 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
10574 10574 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
10575   - var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
  10575 + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
10576 10576  
10577 10577 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
10578 10578 v_cse1.done;
... ... @@ -10586,7 +10586,7 @@ module OneM2M_Testcases_CSE_Release_2 {
10586 10586 //Local variables
10587 10587 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
10588 10588 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
10589   - var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase;
  10589 + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnnc;
10590 10590  
10591 10591 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
10592 10592 v_cse1.done;
... ... @@ -10622,7 +10622,7 @@ module OneM2M_Testcases_CSE_Release_2 {
10622 10622 //Local variables
10623 10623 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
10624 10624 var template RequestPrimitive v_createRequest := m_createContainerBase;
10625   - var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
  10625 + var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
10626 10626  
10627 10627 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
10628 10628 v_cse1.done;
... ... @@ -10651,7 +10651,7 @@ module OneM2M_Testcases_CSE_Release_2 {
10651 10651 //Local variables
10652 10652 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
10653 10653 var template RequestPrimitive v_createRequest := m_createGroupBase;
10654   - var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
  10654 + var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
10655 10655  
10656 10656 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
10657 10657 v_cse1.done;
... ... @@ -10665,7 +10665,7 @@ module OneM2M_Testcases_CSE_Release_2 {
10665 10665 //Local variables
10666 10666 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
10667 10667 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
10668   - var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
  10668 + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
10669 10669  
10670 10670 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
10671 10671 v_cse1.done;
... ... @@ -10679,7 +10679,7 @@ module OneM2M_Testcases_CSE_Release_2 {
10679 10679 //Local variables
10680 10680 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
10681 10681 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
10682   - var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase;
  10682 + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnnc;
10683 10683  
10684 10684 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
10685 10685 v_cse1.done;
... ... @@ -10715,7 +10715,7 @@ module OneM2M_Testcases_CSE_Release_2 {
10715 10715 //Local variables
10716 10716 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
10717 10717 var template RequestPrimitive v_createRequest := m_createContainerBase;
10718   - var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
  10718 + var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
10719 10719  
10720 10720 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
10721 10721 v_cse1.done;
... ... @@ -10744,7 +10744,7 @@ module OneM2M_Testcases_CSE_Release_2 {
10744 10744 //Local variables
10745 10745 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
10746 10746 var template RequestPrimitive v_createRequest := m_createGroupBase;
10747   - var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
  10747 + var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
10748 10748  
10749 10749 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
10750 10750 v_cse1.done;
... ... @@ -10758,7 +10758,7 @@ module OneM2M_Testcases_CSE_Release_2 {
10758 10758 //Local variables
10759 10759 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
10760 10760 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
10761   - var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
  10761 + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
10762 10762  
10763 10763 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
10764 10764 v_cse1.done;
... ... @@ -10772,7 +10772,7 @@ module OneM2M_Testcases_CSE_Release_2 {
10772 10772 //Local variables
10773 10773 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
10774 10774 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
10775   - var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase;
  10775 + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnnc;
10776 10776 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
10777 10777 v_cse1.done;
10778 10778  
... ... @@ -10794,7 +10794,7 @@ module OneM2M_Testcases_CSE_Release_2 {
10794 10794 //Local variables
10795 10795 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
10796 10796 var template RequestPrimitive v_createRequest := m_createContainerBase;
10797   - var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
  10797 + var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
10798 10798  
10799 10799 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
10800 10800 v_cse1.done;
... ... @@ -10826,7 +10826,7 @@ module OneM2M_Testcases_CSE_Release_2 {
10826 10826 //Local variables
10827 10827 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
10828 10828 var template RequestPrimitive v_createRequest := m_createGroupBase;
10829   - var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
  10829 + var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
10830 10830  
10831 10831 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
10832 10832 v_cse1.done;
... ... @@ -10843,7 +10843,7 @@ module OneM2M_Testcases_CSE_Release_2 {
10843 10843 //Local variables
10844 10844 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
10845 10845 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
10846   - var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
  10846 + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
10847 10847 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
10848 10848 v_cse1.done;
10849 10849  
... ... @@ -10859,7 +10859,7 @@ module OneM2M_Testcases_CSE_Release_2 {
10859 10859 //Local variables
10860 10860 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
10861 10861 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
10862   - var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase;
  10862 + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnnc;
10863 10863  
10864 10864 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
10865 10865 v_cse1.done;
... ... @@ -10883,7 +10883,7 @@ module OneM2M_Testcases_CSE_Release_2 {
10883 10883 //Local variables
10884 10884 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
10885 10885 var template RequestPrimitive v_createRequest := m_createContainerBase;
10886   - var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
  10886 + var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
10887 10887 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
10888 10888 v_cse1.done;
10889 10889  
... ... @@ -10921,7 +10921,7 @@ module OneM2M_Testcases_CSE_Release_2 {
10921 10921 //Local variables
10922 10922 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
10923 10923 var template RequestPrimitive v_createRequest := m_createContainerBase;
10924   - var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
  10924 + var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
10925 10925  
10926 10926 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
10927 10927 v_ae1.done;
... ... @@ -10945,7 +10945,7 @@ module OneM2M_Testcases_CSE_Release_2 {
10945 10945 //Local variables
10946 10946 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
10947 10947 var template RequestPrimitive v_createRequest := m_createGroupBase;
10948   - var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
  10948 + var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
10949 10949  
10950 10950 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
10951 10951 v_ae1.done;
... ... @@ -10957,7 +10957,7 @@ module OneM2M_Testcases_CSE_Release_2 {
10957 10957 //Local variables
10958 10958 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
10959 10959 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
10960   - var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
  10960 + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
10961 10961  
10962 10962 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
10963 10963 v_ae1.done;
... ... @@ -10969,7 +10969,7 @@ module OneM2M_Testcases_CSE_Release_2 {
10969 10969 //Local variables
10970 10970 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
10971 10971 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
10972   - var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase;
  10972 + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnnc;
10973 10973  
10974 10974 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
10975 10975 v_ae1.done;
... ... @@ -11001,7 +11001,7 @@ module OneM2M_Testcases_CSE_Release_2 {
11001 11001 //Local variables
11002 11002 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
11003 11003 var template RequestPrimitive v_createRequest := m_createContainerBase;
11004   - var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
  11004 + var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
11005 11005  
11006 11006 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
11007 11007 v_ae1.done;
... ... @@ -11025,7 +11025,7 @@ module OneM2M_Testcases_CSE_Release_2 {
11025 11025 //Local variables
11026 11026 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
11027 11027 var template RequestPrimitive v_createRequest := m_createGroupBase;
11028   - var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
  11028 + var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
11029 11029  
11030 11030 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
11031 11031 v_ae1.done;
... ... @@ -11037,7 +11037,7 @@ module OneM2M_Testcases_CSE_Release_2 {
11037 11037 //Local variables
11038 11038 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
11039 11039 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
11040   - var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
  11040 + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
11041 11041  
11042 11042 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
11043 11043 v_ae1.done;
... ... @@ -11049,7 +11049,7 @@ module OneM2M_Testcases_CSE_Release_2 {
11049 11049 //Local variables
11050 11050 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
11051 11051 var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
11052   - var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase;
  11052 + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnnc;
11053 11053  
11054 11054 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
11055 11055 v_ae1.done;
... ... @@ -11088,7 +11088,7 @@ module OneM2M_Testcases_CSE_Release_2 {
11088 11088 // Local variables
11089 11089 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
11090 11090 var template RequestPrimitive v_createRequest := m_createContainerBase;
11091   - var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
  11091 + var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
11092 11092 var template RequestPrimitive v_updateRequest := m_updateContainerBase;
11093 11093  
11094 11094 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
... ... @@ -11103,7 +11103,7 @@ module OneM2M_Testcases_CSE_Release_2 {
11103 11103 // Local variables
11104 11104 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
11105 11105 var template RequestPrimitive v_createRequest := m_createGroupBase;
11106   - var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
  11106 + var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
11107 11107 var template RequestPrimitive v_updateRequest := m_updateGroupBase;
11108 11108  
11109 11109 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
... ... @@ -11118,7 +11118,7 @@ module OneM2M_Testcases_CSE_Release_2 {
11118 11118 // Local variables
11119 11119 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
11120 11120 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
11121   - var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
  11121 + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
11122 11122 var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
11123 11123 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
11124 11124 v_cse1.done;
... ... @@ -11163,7 +11163,7 @@ module OneM2M_Testcases_CSE_Release_2 {
11163 11163 // Local variables
11164 11164 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
11165 11165 var template RequestPrimitive v_createRequest := m_createContainerBase;
11166   - var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
  11166 + var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
11167 11167 var template RequestPrimitive v_updateRequest := m_updateContainerBase;
11168 11168 var AttributeAux_list v_nullFields;
11169 11169 var ListOfURIs v_announceTo := {"To be deleted"};
... ... @@ -11183,7 +11183,7 @@ module OneM2M_Testcases_CSE_Release_2 {
11183 11183 // Local variables
11184 11184 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
11185 11185 var template RequestPrimitive v_createRequest := m_createGroupBase;
11186   - var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
  11186 + var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
11187 11187 var template RequestPrimitive v_updateRequest := m_updateGroupBase;
11188 11188 var AttributeAux_list v_nullFields;
11189 11189 var ListOfURIs v_announceTo := {"To be deleted"};
... ... @@ -11203,7 +11203,7 @@ module OneM2M_Testcases_CSE_Release_2 {
11203 11203 // Local variables
11204 11204 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
11205 11205 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
11206   - var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
  11206 + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
11207 11207 var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
11208 11208 var AttributeAux_list v_nullFields;
11209 11209 var ListOfURIs v_announceTo := {"To be deleted"};
... ... @@ -11276,7 +11276,7 @@ module OneM2M_Testcases_CSE_Release_2 {
11276 11276 // Local variables
11277 11277 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
11278 11278 var template RequestPrimitive v_createRequest := m_createContainerBase;
11279   - var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
  11279 + var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
11280 11280 var template RequestPrimitive v_updateRequest := m_updateContainerBase;
11281 11281 var ResponsePrimitive v_responsePrimitive;
11282 11282 var AttributeAux_list v_nullFields;
... ... @@ -11319,7 +11319,7 @@ module OneM2M_Testcases_CSE_Release_2 {
11319 11319 // Local variables
11320 11320 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
11321 11321 var template RequestPrimitive v_createRequest := m_createGroupBase;
11322   - var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
  11322 + var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
11323 11323 var template RequestPrimitive v_updateRequest := m_updateGroupBase;
11324 11324 var ResponsePrimitive v_responsePrimitive;
11325 11325 var AttributeAux_list v_nullFields;
... ... @@ -11361,7 +11361,7 @@ module OneM2M_Testcases_CSE_Release_2 {
11361 11361 // Local variables
11362 11362 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
11363 11363 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
11364   - var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
  11364 + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
11365 11365 var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
11366 11366 var ResponsePrimitive v_responsePrimitive;
11367 11367 var AttributeAux_list v_nullFields;
... ... @@ -11428,7 +11428,7 @@ module OneM2M_Testcases_CSE_Release_2 {
11428 11428 // Local variables
11429 11429 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
11430 11430 var template RequestPrimitive v_createRequest := m_createContainerBase;
11431   - var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
  11431 + var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
11432 11432 var template RequestPrimitive v_updateRequest := m_updateContainerBase;
11433 11433  
11434 11434 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
... ... @@ -11445,7 +11445,7 @@ module OneM2M_Testcases_CSE_Release_2 {
11445 11445 // Local variables
11446 11446 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
11447 11447 var template RequestPrimitive v_createRequest := m_createGroupBase;
11448   - var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
  11448 + var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
11449 11449 var template RequestPrimitive v_updateRequest := m_updateGroupBase;
11450 11450  
11451 11451 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
... ... @@ -11462,7 +11462,7 @@ module OneM2M_Testcases_CSE_Release_2 {
11462 11462 // Local variables
11463 11463 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
11464 11464 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
11465   - var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
  11465 + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
11466 11466 var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
11467 11467 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
11468 11468 v_cse1.done;
... ... @@ -11488,7 +11488,7 @@ module OneM2M_Testcases_CSE_Release_2 {
11488 11488 // Local variables
11489 11489 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
11490 11490 var template RequestPrimitive v_createRequest := m_createContainerBase;
11491   - var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
  11491 + var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
11492 11492 var template RequestPrimitive v_updateRequest := m_updateContainerBase;
11493 11493 var template RequestPrimitive v_updateRequestAnnc := mw_updateContainerAnnc;
11494 11494 var RequestPrimitive v_requestPrimitive;
... ... @@ -11547,7 +11547,7 @@ module OneM2M_Testcases_CSE_Release_2 {
11547 11547 //Local variables
11548 11548 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
11549 11549 var template RequestPrimitive v_createRequest := m_createContainerBase;
11550   - var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
  11550 + var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
11551 11551 var template RequestPrimitive v_updateRequest := m_updateContainerBase;
11552 11552  
11553 11553 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
... ... @@ -11562,7 +11562,7 @@ module OneM2M_Testcases_CSE_Release_2 {
11562 11562 //Local variables
11563 11563 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
11564 11564 var template RequestPrimitive v_createRequest := m_createGroupBase;
11565   - var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
  11565 + var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
11566 11566 var template RequestPrimitive v_updateRequest := m_updateGroupBase;
11567 11567  
11568 11568 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
... ... @@ -11577,7 +11577,7 @@ module OneM2M_Testcases_CSE_Release_2 {
11577 11577 //Local variables
11578 11578 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
11579 11579 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
11580   - var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
  11580 + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
11581 11581 var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
11582 11582 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
11583 11583 v_cse1.done;
... ... @@ -11616,7 +11616,7 @@ module OneM2M_Testcases_CSE_Release_2 {
11616 11616 //Local variables
11617 11617 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
11618 11618 var template RequestPrimitive v_createRequest := m_createContainerBase;
11619   - var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
  11619 + var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
11620 11620 var template RequestPrimitive v_updateRequest := m_updateContainerBase;
11621 11621  
11622 11622 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
... ... @@ -11631,7 +11631,7 @@ module OneM2M_Testcases_CSE_Release_2 {
11631 11631 //Local variables
11632 11632 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
11633 11633 var template RequestPrimitive v_createRequest := m_createGroupBase;
11634   - var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
  11634 + var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
11635 11635 var template RequestPrimitive v_updateRequest := m_updateGroupBase;
11636 11636  
11637 11637 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
... ... @@ -11646,7 +11646,7 @@ module OneM2M_Testcases_CSE_Release_2 {
11646 11646 //Local variables
11647 11647 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
11648 11648 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
11649   - var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
  11649 + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
11650 11650 var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
11651 11651 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
11652 11652 v_cse1.done;
... ... @@ -11667,7 +11667,7 @@ module OneM2M_Testcases_CSE_Release_2 {
11667 11667 // Local variables
11668 11668 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
11669 11669 var template RequestPrimitive v_createRequest := m_createContainerBase;
11670   - var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
  11670 + var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
11671 11671 var template RequestPrimitive v_updateRequest := m_updateContainerBase;
11672 11672 var ResponsePrimitive v_responsePrimitive;
11673 11673 var AttributeAux_list v_nullFields;
... ... @@ -11715,7 +11715,7 @@ module OneM2M_Testcases_CSE_Release_2 {
11715 11715 // Local variables
11716 11716 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
11717 11717 var template RequestPrimitive v_createRequest := m_createGroupBase;
11718   - var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
  11718 + var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
11719 11719 var template RequestPrimitive v_updateRequest := m_updateGroupBase;
11720 11720 var ResponsePrimitive v_responsePrimitive;
11721 11721 var AttributeAux_list v_nullFields;
... ... @@ -11763,7 +11763,7 @@ module OneM2M_Testcases_CSE_Release_2 {
11763 11763 // Local variables
11764 11764 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
11765 11765 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
11766   - var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
  11766 + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
11767 11767 var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
11768 11768 var ResponsePrimitive v_responsePrimitive;
11769 11769 var AttributeAux_list v_nullFields;
... ... @@ -11818,7 +11818,7 @@ module OneM2M_Testcases_CSE_Release_2 {
11818 11818 // Local variables
11819 11819 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
11820 11820 var template RequestPrimitive v_createRequest := m_createContainerBase;
11821   - var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
  11821 + var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
11822 11822 var template RequestPrimitive v_updateRequest := m_updateContainerBase;
11823 11823 var template RequestPrimitive v_updateRequestAnnc := mw_updateContainerAnnc;
11824 11824 var XSD.NonNegativeInteger v_maxByteSize := 512;
... ... @@ -11842,7 +11842,7 @@ module OneM2M_Testcases_CSE_Release_2 {
11842 11842 // Local variables
11843 11843 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
11844 11844 var template RequestPrimitive v_createRequest := m_createGroupBase;
11845   - var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
  11845 + var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
11846 11846 var template RequestPrimitive v_updateRequest := m_updateGroupBase;
11847 11847 var template RequestPrimitive v_updateRequestAnnc := mw_updateGroupAnnc;
11848 11848 var MemberType v_memberType := int3;
... ... @@ -11866,7 +11866,7 @@ module OneM2M_Testcases_CSE_Release_2 {
11866 11866 // Local variables
11867 11867 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
11868 11868 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
11869   - var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
  11869 + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
11870 11870 var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
11871 11871 var template RequestPrimitive v_updateRequestAnnc := mw_updateTimeSeriesAnnc;
11872 11872 var XSD.NonNegativeInteger v_maxByteSize := 512;
... ... @@ -11925,7 +11925,7 @@ module OneM2M_Testcases_CSE_Release_2 {
11925 11925 // Local variables
11926 11926 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
11927 11927 var template RequestPrimitive v_createRequest := m_createContainerBase;
11928   - var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
  11928 + var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
11929 11929 var template RequestPrimitive v_updateRequest := m_updateContainerBase;
11930 11930 var template RequestPrimitive v_updateRequestAnnc := mw_updateContainerAnnc;
11931 11931 var Timestamp v_expirationTime_1 := "21001231T012345";
... ... @@ -11950,7 +11950,7 @@ module OneM2M_Testcases_CSE_Release_2 {
11950 11950 // Local variables
11951 11951 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
11952 11952 var template RequestPrimitive v_createRequest := m_createGroupBase;
11953   - var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
  11953 + var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
11954 11954 var template RequestPrimitive v_updateRequest := m_updateGroupBase;
11955 11955 var template RequestPrimitive v_updateRequestAnnc := mw_updateGroupAnnc;
11956 11956 var Timestamp v_expirationTime_1 := "21001231T012345";
... ... @@ -11975,7 +11975,7 @@ module OneM2M_Testcases_CSE_Release_2 {
11975 11975 // Local variables
11976 11976 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
11977 11977 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
11978   - var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
  11978 + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
11979 11979 var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
11980 11980 var template RequestPrimitive v_updateRequestAnnc := mw_updateTimeSeriesAnnc;
11981 11981 var Timestamp v_expirationTime_1 := "21001231T012345";
... ... @@ -12010,7 +12010,7 @@ module OneM2M_Testcases_CSE_Release_2 {
12010 12010 // Local variables
12011 12011 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
12012 12012 var template RequestPrimitive v_createRequest := m_createContainerBase;
12013   - var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
  12013 + var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
12014 12014 var template RequestPrimitive v_updateRequest := m_updateContainerBase;
12015 12015 var template RequestPrimitive v_updateRequestAnnc := mw_updateContainerAnnc;
12016 12016 var XSD.NonNegativeInteger v_maxByteSize_1 := 512;
... ... @@ -12036,7 +12036,7 @@ module OneM2M_Testcases_CSE_Release_2 {
12036 12036 // Local variables
12037 12037 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
12038 12038 var template RequestPrimitive v_createRequest := m_createGroupBase;
12039   - var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
  12039 + var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
12040 12040 var template RequestPrimitive v_updateRequest := m_updateGroupBase;
12041 12041 var template RequestPrimitive v_updateRequestAnnc := mw_updateGroupAnnc;
12042 12042 var MemberType v_memberType_1 := int3;
... ... @@ -12062,7 +12062,7 @@ module OneM2M_Testcases_CSE_Release_2 {
12062 12062 // Local variables
12063 12063 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
12064 12064 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
12065   - var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
  12065 + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
12066 12066 var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
12067 12067 var template RequestPrimitive v_updateRequestAnnc := mw_updateTimeSeriesAnnc;
12068 12068 var XSD.NonNegativeInteger v_maxByteSize_1 := 512;
... ... @@ -12098,7 +12098,7 @@ module OneM2M_Testcases_CSE_Release_2 {
12098 12098 // Local variables
12099 12099 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
12100 12100 var template RequestPrimitive v_createRequest := m_createContainerBase;
12101   - var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
  12101 + var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
12102 12102 var template RequestPrimitive v_updateRequest := m_updateContainerBase;
12103 12103 var template RequestPrimitive v_updateRequestAnnc := mw_updateContainerAnnc;
12104 12104 var RequestPrimitive v_requestPrimitive;
... ... @@ -12138,7 +12138,7 @@ module OneM2M_Testcases_CSE_Release_2 {
12138 12138 // Local variables
12139 12139 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
12140 12140 var template RequestPrimitive v_createRequest := m_createGroupBase;
12141   - var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
  12141 + var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
12142 12142 var template RequestPrimitive v_updateRequest := m_updateGroupBase;
12143 12143 var template RequestPrimitive v_updateRequestAnnc := mw_updateGroupAnnc;
12144 12144 var RequestPrimitive v_requestPrimitive;
... ... @@ -12177,7 +12177,7 @@ module OneM2M_Testcases_CSE_Release_2 {
12177 12177 // Local variables
12178 12178 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
12179 12179 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
12180   - var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
  12180 + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
12181 12181 var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
12182 12182 var template RequestPrimitive v_updateRequestAnnc := mw_updateTimeSeriesAnnc;
12183 12183 var RequestPrimitive v_requestPrimitive;
... ... @@ -12227,7 +12227,7 @@ module OneM2M_Testcases_CSE_Release_2 {
12227 12227 // Local variables
12228 12228 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
12229 12229 var template RequestPrimitive v_createRequest := m_createContainerBase;
12230   - var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
  12230 + var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
12231 12231 var template RequestPrimitive v_updateRequest := m_updateContainerBase;
12232 12232 var ResponsePrimitive v_responsePrimitive;
12233 12233 var AttributeAux_list v_nullFields;
... ... @@ -12273,7 +12273,7 @@ module OneM2M_Testcases_CSE_Release_2 {
12273 12273 // Local variables
12274 12274 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
12275 12275 var template RequestPrimitive v_createRequest := m_createGroupBase;
12276   - var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
  12276 + var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
12277 12277 var template RequestPrimitive v_updateRequest := m_updateGroupBase;
12278 12278 var ResponsePrimitive v_responsePrimitive;
12279 12279 var AttributeAux_list v_nullFields;
... ... @@ -12318,7 +12318,7 @@ module OneM2M_Testcases_CSE_Release_2 {
12318 12318 // Local variables
12319 12319 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
12320 12320 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
12321   - var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
  12321 + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
12322 12322 var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
12323 12323 var ResponsePrimitive v_responsePrimitive;
12324 12324 var AttributeAux_list v_nullFields;
... ... @@ -12372,7 +12372,7 @@ module OneM2M_Testcases_CSE_Release_2 {
12372 12372 // Local variables
12373 12373 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
12374 12374 var template RequestPrimitive v_createRequest := m_createContainerBase;
12375   - var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
  12375 + var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
12376 12376 var template RequestPrimitive v_updateRequest := m_updateContainerBase;
12377 12377 var ResponsePrimitive v_responsePrimitive;
12378 12378  
... ... @@ -12423,7 +12423,7 @@ module OneM2M_Testcases_CSE_Release_2 {
12423 12423 // Local variables
12424 12424 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
12425 12425 var template RequestPrimitive v_createRequest := m_createContainerBase;
12426   - var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
  12426 + var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
12427 12427  
12428 12428 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
12429 12429 v_ae1.done;
... ... @@ -12437,7 +12437,7 @@ module OneM2M_Testcases_CSE_Release_2 {
12437 12437 // Local variables
12438 12438 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
12439 12439 var template RequestPrimitive v_createRequest := m_createGroupBase;
12440   - var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
  12440 + var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
12441 12441  
12442 12442 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
12443 12443 v_ae1.done;
... ... @@ -12451,7 +12451,7 @@ module OneM2M_Testcases_CSE_Release_2 {
12451 12451 // Local variables
12452 12452 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
12453 12453 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
12454   - var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
  12454 + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
12455 12455  
12456 12456 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
12457 12457 v_ae1.done;
... ... @@ -12487,7 +12487,7 @@ module OneM2M_Testcases_CSE_Release_2 {
12487 12487 // Local variables
12488 12488 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
12489 12489 var template RequestPrimitive v_createRequest := m_createContainerBase;
12490   - var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
  12490 + var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
12491 12491  
12492 12492 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
12493 12493 v_cse1.done;
... ... @@ -12501,7 +12501,7 @@ module OneM2M_Testcases_CSE_Release_2 {
12501 12501 // Local variables
12502 12502 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
12503 12503 var template RequestPrimitive v_createRequest := m_createGroupBase;
12504   - var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
  12504 + var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
12505 12505  
12506 12506 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
12507 12507 v_cse1.done;
... ... @@ -12515,7 +12515,7 @@ module OneM2M_Testcases_CSE_Release_2 {
12515 12515 // Local variables
12516 12516 var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
12517 12517 var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
12518   - var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
  12518 + var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
12519 12519 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
12520 12520 v_cse1.done;
12521 12521  
... ...