Commit 267ceff92d41804fd1f61ca4ca5d16b958a21ab2

Authored by Miguel Angel Reina Ortega
1 parent 2c5f66f0

Clean up of reception templates for CREATE operation

Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
... ... @@ -2128,8 +2128,29 @@ module OneM2M_Functions {
2128 2128 v_myResource.contentInstance.expirationTime := "20301231T012345";
2129 2129 }
2130 2130 v_myResource.contentInstance.stateTag := 0;
2131   - v_myResource.contentInstance.contentSize := lengthof(v_myResource.contentInstance.content);
2132   - v_myResource.contentInstance.content := valueof(p_resource.contentInstance.content);
  2131 + if(not(ispresent(p_resource.contentInstance.content))) {
  2132 + v_myResource.contentInstance.contentSize := 0;
  2133 + v_myResource.contentInstance.content := omit;
  2134 + } else {
  2135 + v_myResource.contentInstance.contentSize := lengthof(v_myResource.contentInstance.content);
  2136 + v_myResource.contentInstance.content := valueof(p_resource.contentInstance.content);
  2137 + }
  2138 + }
  2139 +
  2140 + } else if(p_resourceType == int23 and ispresent(p_resource)) {//Subscription
  2141 + if(ischosen(p_resource.subscription)){
  2142 + v_myResource.subscription := valueof(p_resource.subscription);
  2143 + v_myResource.subscription.resourceID := "sub" & int2str(v_resourceIndex);
  2144 + if(not(ispresent(p_resource.subscription.resourceName))) {
  2145 + v_myResource.subscription.resourceName := "subscription" & int2str(v_resourceIndex);
  2146 + }
  2147 + v_myResource.subscription.resourceType := p_resourceType;
  2148 + v_myResource.subscription.parentID := f_getResourceId(vc_localResourcesList[p_parentIndex].resource);
  2149 + v_myResource.subscription.creationTime := fx_generateTimestamp();
  2150 + v_myResource.subscription.lastModifiedTime := v_myResource.subscription.creationTime;
  2151 + if(not(ispresent(p_resource.subscription.expirationTime))) {
  2152 + v_myResource.subscription.expirationTime := "20301231T012345";
  2153 + }
2133 2154 }
2134 2155  
2135 2156 }
... ...
... ... @@ -662,7 +662,7 @@ module OneM2M_Templates {
662 662 to_ := p_to,
663 663 from_ := p_from,
664 664 resourceType := int10002,
665   - primitiveContent := {accessControlPolicyAnnc := mw_contentCreateAcpAnnc(-)}
  665 + primitiveContent := {accessControlPolicyAnnc := mw_contentCreateAcpAnncBase(-)}
666 666 };
667 667  
668 668  
... ... @@ -720,17 +720,9 @@ module OneM2M_Templates {
720 720 };
721 721  
722 722 /**
723   - * @desc Reception template for CREATE RemoteCSE
724   - */
725   - template RequestPrimitive mw_createRemoteCSE(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
726   - resourceType := int16,
727   - primitiveContent := {remoteCSE := ?} //{remoteCSE := m_contentCreateRemoteCSE(p_resourceName, p_accessControlPolicyIds,p_cSEBase, p_cSE_ID)}
728   - };
729   -
730   - /**
731 723 * @desc Base reception template for CREATE RemoteCSE
732 724 */
733   - template RequestPrimitive mw_createRemoteCSEBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
  725 + template RequestPrimitive mw_createRemoteCSE(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
734 726 resourceType := int16,
735 727 primitiveContent := {remoteCSE := mw_contentCreateRemoteCSEBase}
736 728 };
... ... @@ -754,13 +746,13 @@ module OneM2M_Templates {
754 746 */
755 747 template RequestPrimitive mw_createContainer(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
756 748 resourceType := int3,
757   - primitiveContent := {container := ?}
  749 + primitiveContent := {container := mw_contentCreateContainerBase}
758 750 };
759 751  
760 752 /**
761 753 * @desc Base Reception template for CREATE ContainerAnnc
762 754 */
763   - template RequestPrimitive mw_createContainerAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
  755 + template RequestPrimitive mw_createContainerAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
764 756 resourceType := int10003,
765 757 primitiveContent := {containerAnnc := mw_contentCreateContainerAnncBase}
766 758 };
... ... @@ -794,7 +786,7 @@ module OneM2M_Templates {
794 786 */
795 787 template RequestPrimitive mw_createContentInstanceAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
796 788 resourceType := int10014,
797   - primitiveContent := {contentInstanceAnnc := ?}
  789 + primitiveContent := {contentInstanceAnnc := mw_contentCreateContentInstanceAnncBase}
798 790 };
799 791  
800 792 /**
... ... @@ -802,18 +794,10 @@ module OneM2M_Templates {
802 794 */
803 795 template RequestPrimitive mw_createContentInstance(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
804 796 resourceType := int4,
805   - primitiveContent := {contentInstance := ?}
  797 + primitiveContent := {contentInstance := mw_contentCreateContentInstanceBase}
806 798 };
807 799  
808 800 /**
809   - * @desc Base Reception template for CREATE ContentInstanceAnnc
810   - */
811   - template RequestPrimitive mw_createContentInstanceAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
812   - resourceType := int10014,
813   - primitiveContent := {contentInstanceAnnc := mw_contentCreateContentInstanceAnncBase}
814   - };
815   -
816   - /**
817 801 * @desc Base CREATE request primitive for Delivery resource
818 802 */
819 803 /*template (value) RequestPrimitive m_createDeliveryBase modifies m_create := {
... ... @@ -849,18 +833,10 @@ module OneM2M_Templates {
849 833 */
850 834 template RequestPrimitive mw_createGroupAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
851 835 resourceType := int10009,
852   - primitiveContent := {groupAnnc := ?}
  836 + primitiveContent := {groupAnnc := mw_contentCreateGroupAnncBase}
853 837 };
854 838  
855 839 /**
856   - * @desc Base Reception template for CREATE GroupAnnc
857   - */
858   - template RequestPrimitive mw_createGroupAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
859   - resourceType := int10009,
860   - primitiveContent := {groupAnnc := mw_contentCreateGroupAnncBase}
861   - };
862   -
863   - /**
864 840 * @desc Base CREATE request primitive for MgmtCmd resource
865 841 */
866 842 template (value) RequestPrimitive m_createMgmtCmdBase modifies m_create := {
... ... @@ -892,14 +868,6 @@ module OneM2M_Templates {
892 868 */
893 869 template RequestPrimitive mw_createMgmtObjAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
894 870 resourceType := int10013,
895   - primitiveContent := {announcedMgmtResource := ?}
896   - };
897   -
898   - /**
899   - * @desc Base Reception template for CREATE MgmtObjAnnc
900   - */
901   - template RequestPrimitive mw_createMgmtObjAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
902   - resourceType := int10013,
903 871 primitiveContent := {announcedMgmtResource := mw_contentCreateMgmtObjAnncBase}
904 872 };
905 873  
... ... @@ -926,7 +894,7 @@ module OneM2M_Templates {
926 894 */
927 895 template RequestPrimitive mw_createNodeAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
928 896 resourceType := int10014,
929   - primitiveContent := {nodeAnnc := ?}
  897 + primitiveContent := {nodeAnnc := mw_contentCreateNodeAnncBase}
930 898 };
931 899  
932 900 /**
... ... @@ -967,17 +935,9 @@ module OneM2M_Templates {
967 935 */
968 936 template RequestPrimitive mw_createScheduleAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
969 937 resourceType := int10018,
970   - primitiveContent := {scheduleAnnc := ?}
971   - };
972   -
973   - /**
974   - * @desc Base Reception template for CREATE ScheduleAnnc
975   - */
976   - template RequestPrimitive mw_createScheduleAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
977   - resourceType := int10018,
978 938 primitiveContent := {scheduleAnnc := mw_contentCreateScheduleAnncBase}
979 939 };
980   -
  940 +
981 941 template (value) RequestPrimitive m_createServiceSubscribedAppRule (in ListOfM2MID p_applicableCredIDs, in ListOfM2MID p_allowedAppIDs, in ListOfM2MID p_allowedAEs) modifies m_create := {
982 942 requestIdentifier := testcasename() & "-m_createServiceSubscribedAppRule",
983 943 resourceType := int19,//FIXME Is this the correct value?
... ... @@ -1014,7 +974,7 @@ module OneM2M_Templates {
1014 974 */
1015 975 template RequestPrimitive mw_createSubscription(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
1016 976 resourceType := int23,
1017   - primitiveContent := {subscription := ?}
  977 + primitiveContent := {subscription := mw_contentCreateSubscriptionBase}
1018 978 };
1019 979  
1020 980 template (value) RequestPrimitive m_createSubscriptionAdvanced( XSD.ID p_parentResourceAddress,
... ... @@ -1052,14 +1012,6 @@ module OneM2M_Templates {
1052 1012 */
1053 1013 template RequestPrimitive mw_createLocationPolicyAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
1054 1014 resourceType := int10010,
1055   - primitiveContent := {locationPolicyAnnc := ?}
1056   - };
1057   -
1058   - /**
1059   - * @desc Base Reception template for CREATE LocationPolicyAnnc
1060   - */
1061   - template RequestPrimitive mw_createLocationPolicyAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
1062   - resourceType := int10010,
1063 1015 primitiveContent := {locationPolicyAnnc := mw_contentCreateLocationPolicyAnncBase}
1064 1016 };
1065 1017  
... ... @@ -1386,7 +1338,7 @@ module OneM2M_Templates {
1386 1338 * @desc Base reception template of primitiveContent for CREATE operation for AccessControlPolicyAnnc resource
1387 1339 * @param p_labels Labels
1388 1340 */
1389   - template AccessControlPolicyAnnc_optional mw_contentCreateAcpAnnc (in template (omit) Labels p_labels := omit) := {
  1341 + template AccessControlPolicyAnnc_optional mw_contentCreateAcpAnncBase (in template (omit) Labels p_labels := omit) := {
1390 1342 resourceName := omit,//NA M
1391 1343 resourceType := omit,//NA M
1392 1344 resourceID := omit,//NA M
... ... @@ -1635,7 +1587,49 @@ module OneM2M_Templates {
1635 1587 hostedCSELink := omit,//O
1636 1588 choice := omit//O
1637 1589 };
  1590 +
  1591 + /**
  1592 + * @desc Base reception template primitiveContent for CREATE operation for Node resource
  1593 + * @param p_name Resource name
  1594 + */
  1595 + template Node_optional mw_contentCreateNodeBase (template XSD.String p_name := *) := {
  1596 +
  1597 + resourceName := p_name,//O
  1598 + resourceType := omit,//NP
  1599 + resourceID := omit,//NP
  1600 + parentID := omit,//NP
  1601 + creationTime := omit,//NP
  1602 + lastModifiedTime := omit,//NP
  1603 + labels := *,//O
  1604 + accessControlPolicyIDs := *,//O
  1605 + expirationTime := *,//O
  1606 + announceTo := *,//O
  1607 + announcedAttribute := *,//O
  1608 + nodeID := ?,//M
  1609 + hostedCSELink := *,//O
  1610 + choice := *//O
  1611 + };
1638 1612  
  1613 + /**
  1614 + * @desc Base reception template primitiveContent for CREATE operation for NodeAnnc resource
  1615 + * @param p_name Resource name
  1616 + */
  1617 + template NodeAnnc_optional mw_contentCreateNodeAnncBase := {
  1618 +
  1619 + resourceName := omit,//NP
  1620 + resourceType := omit,//NP
  1621 + resourceID := omit,//NP
  1622 + parentID := omit,//NP
  1623 + creationTime := omit,//NP
  1624 + lastModifiedTime := omit,//NP
  1625 + labels := ?,//M
  1626 + accessControlPolicyIDs := ?,//M
  1627 + expirationTime := ?,//M
  1628 + link := ?,//M
  1629 + nodeID := ?,//M
  1630 + hostedCSELink := *,//O
  1631 + choice := omit//NP
  1632 + };
1639 1633  
1640 1634 /**
1641 1635 * @desc Base primitiveContent for CREATE operation for PollingChannel resource
... ... @@ -1759,6 +1753,39 @@ module OneM2M_Templates {
1759 1753 choice := omit//NP
1760 1754 };
1761 1755  
  1756 + /**
  1757 + * @desc Base reception template primitiveContent for CREATE operation for Subscription resource
  1758 + * @param p_notificationURI Notification URI
  1759 + * @param p_name Resource name
  1760 + */
  1761 + template Subscription_optional mw_contentCreateSubscriptionBase (template XSD.String p_name := *) := {
  1762 + resourceName := p_name,//O
  1763 + resourceType := omit,//NP
  1764 + resourceID := omit,//NP
  1765 + parentID := omit,//NP
  1766 + creationTime := omit,//NP
  1767 + lastModifiedTime := omit,//NP
  1768 + labels := *,//O
  1769 + accessControlPolicyIDs := *,//O
  1770 + expirationTime := *,//O
  1771 + eventNotificationCriteria := *,//O
  1772 + expirationCounter := *,//O
  1773 + notificationURI := ?,//M
  1774 + groupID := *,//O
  1775 + notificationForwardingURI := *,//O
  1776 + batchNotify := *,//O
  1777 + rateLimit := *,//O
  1778 + preSubscriptionNotify := *,//O
  1779 + pendingNotification := *,//O
  1780 + notificationStoragePriority := *,//O
  1781 + latestNotify := *,//O
  1782 + notificationContentType := *, //O
  1783 + notificationEventCat := *,//O
  1784 + creator := *,//O
  1785 + subscriberURI := *,//O
  1786 + choice := *//O
  1787 + };
  1788 +
1762 1789 template (value) Subscription_optional m_contentCreateSubscriptionAdvanced (in template (value) ListOfURIs p_notificationURI,
1763 1790 in template (omit) XSD.String p_name := c_defaultSubscriptionResourceName,
1764 1791 in template (omit) EventNotificationCriteria p_eventNotificationCriteria,
... ... @@ -1824,7 +1851,30 @@ module OneM2M_Templates {
1824 1851 ontologyRef := omit,//O
1825 1852 content := p_content//M
1826 1853 };
1827   -
  1854 +
  1855 + /**
  1856 + * @desc Base reception template primitiveContent for CREATE operation for ContentInstance resource
  1857 + * @param p_primitiveContent Content for the ContentInstance
  1858 + */
  1859 + template ContentInstance_optional mw_contentCreateContentInstanceBase(template XSD.String p_name := *) := {
  1860 + resourceName := p_name,//O
  1861 + resourceType := omit,//NP
  1862 + resourceID := omit,//NP
  1863 + parentID := omit,//NP
  1864 + creationTime := omit,//NP
  1865 + lastModifiedTime := omit,//NP
  1866 + labels := *,//O
  1867 + expirationTime := *,//O
  1868 + announceTo := *,//O
  1869 + announcedAttribute := *,//O
  1870 + stateTag := omit,//NP
  1871 + creator := *,//O
  1872 + contentInfo := *,//O
  1873 + contentSize := omit,//NP
  1874 + ontologyRef := *,//O
  1875 + content := ?//M
  1876 + };
  1877 +
1828 1878 /**
1829 1879 * @desc Base primitiveContent for CREATE operation for ContentInstanceAnnc resource
1830 1880 * @param p_primitiveContent Content for the ContentInstanceAnnc
... ... @@ -1873,6 +1923,34 @@ module OneM2M_Templates {
1873 1923 ontologyRef := omit,//O
1874 1924 choice := omit//NP
1875 1925 };
  1926 +
  1927 + /**
  1928 + * @desc Base reception template primitiveContent for CREATE operation for Container resource
  1929 + * @param p_name Resource name
  1930 + */
  1931 + template Container_optional mw_contentCreateContainerBase (template XSD.String p_name := *):= {
  1932 + resourceName := p_name,//O
  1933 + resourceType := omit,//NP
  1934 + resourceID := omit,//NP
  1935 + parentID := omit,//NP
  1936 + creationTime := omit,//NP
  1937 + lastModifiedTime := omit,//NP
  1938 + labels := *,//O
  1939 + accessControlPolicyIDs := *,//O
  1940 + expirationTime := *,//O
  1941 + announceTo := *,//O
  1942 + announcedAttribute := *,//O
  1943 + stateTag := omit,//NP
  1944 + creator := *,//O
  1945 + maxNrOfInstances := *,//O
  1946 + maxByteSize := *,//O
  1947 + maxInstanceAge := *,//O
  1948 + currentNrOfInstances := omit,//NP
  1949 + currentByteSize := omit,//NP
  1950 + locationID := *,//O
  1951 + ontologyRef := *,//O
  1952 + choice := *//NP
  1953 + };
1876 1954  
1877 1955 /**
1878 1956 * @desc Base primitiveContent for invalid CREATE operation for Container resource (using Container_update_invalid)
... ...
... ... @@ -1678,7 +1678,7 @@ module OneM2M_PermutationFunctions {
1678 1678 // Test adapter configuration
1679 1679  
1680 1680 // Preamble
1681   - vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
  1681 + vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSE);
1682 1682  
1683 1683 //Send Trigger Message
1684 1684 v_utRequest.requestPrimitive.to_ := f_getResourceAddress();
... ...
... ... @@ -1834,7 +1834,7 @@ module OneM2M_Testcases_CSE_Release_1 {
1834 1834 // Test Body
1835 1835 tc_ac.start;
1836 1836 alt {
1837   - [not(v_cseRegistered)] mccPortIn.receive(mw_request(mw_createRemoteCSEBase)) -> value v_request {
  1837 + [not(v_cseRegistered)] mccPortIn.receive(mw_request(mw_createRemoteCSE)) -> value v_request {
1838 1838 tc_ac.stop;
1839 1839 setverdict(pass, __SCOPE__&":INFO: CREATE remoteCSE request received");
1840 1840 v_parentResourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
... ... @@ -2732,7 +2732,7 @@ module OneM2M_Testcases_CSE_Release_1 {
2732 2732 // Test adapter configuration
2733 2733  
2734 2734 // Preamble
2735   - vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
  2735 + vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSE);
2736 2736  
2737 2737 //Send Trigger Message
2738 2738 v_utRequest := m_utRetrieve(f_getLocalResourceAddress(vc_localRemoteCseIndex));
... ...
... ... @@ -1332,7 +1332,7 @@ module OneM2M_Testcases_CSE_Release_2 {
1332 1332 v_ae1.done;
1333 1333 v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
1334 1334  
1335   - v_ae1.start(f_CSE_DMR_CRE_020(int3, v_createRequest, mw_createContainerAnncBase));//Container
  1335 + v_ae1.start(f_CSE_DMR_CRE_020(int3, v_createRequest, mw_createContainerAnnc));//Container
1336 1336 v_ae1.done;
1337 1337 }
1338 1338  
... ... @@ -1344,7 +1344,7 @@ module OneM2M_Testcases_CSE_Release_2 {
1344 1344 v_ae1.done;
1345 1345 v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
1346 1346  
1347   - v_ae1.start(f_CSE_DMR_CRE_020(int4, v_createRequest, mw_createContentInstanceAnncBase));//ContentInstance
  1347 + v_ae1.start(f_CSE_DMR_CRE_020(int4, v_createRequest, mw_createContentInstanceAnnc));//ContentInstance
1348 1348 v_ae1.done;
1349 1349 }
1350 1350  
... ... @@ -1357,7 +1357,7 @@ module OneM2M_Testcases_CSE_Release_2 {
1357 1357 v_ae1.done;
1358 1358 v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
1359 1359  
1360   - v_ae1.start(f_CSE_DMR_CRE_020(int9, v_createRequest, mw_createGroupAnncBase));//Group
  1360 + v_ae1.start(f_CSE_DMR_CRE_020(int9, v_createRequest, mw_createGroupAnnc));//Group
1361 1361 v_ae1.done;
1362 1362 }
1363 1363  
... ... @@ -1370,7 +1370,7 @@ module OneM2M_Testcases_CSE_Release_2 {
1370 1370 v_ae1.done;
1371 1371 v_createRequest.primitiveContent.locationPolicy.announceTo := {PX_CSE1_ID};
1372 1372  
1373   - v_ae1.start(f_CSE_DMR_CRE_020(int10, v_createRequest, mw_createLocationPolicyAnncBase));//LocationPolicy
  1373 + v_ae1.start(f_CSE_DMR_CRE_020(int10, v_createRequest, mw_createLocationPolicyAnnc));//LocationPolicy
1374 1374 v_ae1.done;
1375 1375 }
1376 1376  
... ... @@ -1383,7 +1383,7 @@ module OneM2M_Testcases_CSE_Release_2 {
1383 1383 v_ae1.done;
1384 1384 v_createRequest.primitiveContent.mgmtResource.announceTo := {PX_CSE1_ID};
1385 1385  
1386   - v_ae1.start(f_CSE_DMR_CRE_020(int13, v_createRequest, mw_createMgmtObjAnncBase));//MgmtObj
  1386 + v_ae1.start(f_CSE_DMR_CRE_020(int13, v_createRequest, mw_createMgmtObjAnnc));//MgmtObj
1387 1387 v_ae1.done;
1388 1388 }
1389 1389  
... ... @@ -1409,7 +1409,7 @@ module OneM2M_Testcases_CSE_Release_2 {
1409 1409 v_ae1.done;
1410 1410 v_createRequest.primitiveContent.schedule.announceTo := {PX_CSE1_ID};
1411 1411  
1412   - v_ae1.start(f_CSE_DMR_CRE_020(int18, v_createRequest, mw_createScheduleAnncBase));//Schedule
  1412 + v_ae1.start(f_CSE_DMR_CRE_020(int18, v_createRequest, mw_createScheduleAnnc));//Schedule
1413 1413 v_ae1.done;
1414 1414 }
1415 1415  
... ... @@ -1434,7 +1434,7 @@ module OneM2M_Testcases_CSE_Release_2 {
1434 1434 v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize;
1435 1435 v_createRequest.primitiveContent.container.announcedAttribute := {"mbs"};
1436 1436  
1437   - v_ae1.start(f_CSE_DMR_CRE_021(int3, v_createRequest, mw_createContainerAnncBase()));//Container
  1437 + v_ae1.start(f_CSE_DMR_CRE_021(int3, v_createRequest, mw_createContainerAnnc()));//Container
1438 1438 v_ae1.done;
1439 1439  
1440 1440 if(getverdict == pass){
... ... @@ -1466,7 +1466,7 @@ module OneM2M_Testcases_CSE_Release_2 {
1466 1466 v_createRequest.primitiveContent.contentInstance.contentSize := v_contentSize;
1467 1467 v_createRequest.primitiveContent.contentInstance.announcedAttribute := {"cs"}; //Correct value? Shall be indicated in TP?
1468 1468  
1469   - v_ae1.start(f_CSE_DMR_CRE_021(int4, v_createRequest, mw_createContentInstanceAnncBase()));//ContentInstance
  1469 + v_ae1.start(f_CSE_DMR_CRE_021(int4, v_createRequest, mw_createContentInstanceAnnc()));//ContentInstance
1470 1470 v_ae1.done;
1471 1471  
1472 1472 if(getverdict == pass){
... ... @@ -1497,7 +1497,7 @@ module OneM2M_Testcases_CSE_Release_2 {
1497 1497 v_createRequest.primitiveContent.group_.maxNrOfMembers := v_maxNrOfMembers;
1498 1498 v_createRequest.primitiveContent.group_.announcedAttribute := {"mnm"};
1499 1499  
1500   - v_ae1.start(f_CSE_DMR_CRE_021(int9, v_createRequest, mw_createGroupAnncBase()));//Group
  1500 + v_ae1.start(f_CSE_DMR_CRE_021(int9, v_createRequest, mw_createGroupAnnc()));//Group
1501 1501 v_ae1.done;
1502 1502  
1503 1503 if(getverdict == pass){
... ... @@ -1528,7 +1528,7 @@ module OneM2M_Testcases_CSE_Release_2 {
1528 1528 v_createRequest.primitiveContent.locationPolicy.locationSource := v_locationSource;
1529 1529 v_createRequest.primitiveContent.locationPolicy.announcedAttribute := {"los"};
1530 1530  
1531   - v_ae1.start(f_CSE_DMR_CRE_021(int10, v_createRequest, mw_createLocationPolicyAnncBase()));//LocationPolicy
  1531 + v_ae1.start(f_CSE_DMR_CRE_021(int10, v_createRequest, mw_createLocationPolicyAnnc()));//LocationPolicy
1532 1532 v_ae1.done;
1533 1533  
1534 1534 if(getverdict == pass){
... ... @@ -1559,7 +1559,7 @@ module OneM2M_Testcases_CSE_Release_2 {
1559 1559 v_createRequest.primitiveContent.mgmtResource.description := v_description;
1560 1560 v_createRequest.primitiveContent.mgmtResource.announcedAttribute := {"dc"};
1561 1561  
1562   - v_ae1.start(f_CSE_DMR_CRE_021(int13, v_createRequest, mw_createMgmtObjAnncBase()));//MgmtObj
  1562 + v_ae1.start(f_CSE_DMR_CRE_021(int13, v_createRequest, mw_createMgmtObjAnnc()));//MgmtObj
1563 1563 v_ae1.done;
1564 1564  
1565 1565 if(getverdict == pass){
... ... @@ -1606,7 +1606,7 @@ module OneM2M_Testcases_CSE_Release_2 {
1606 1606 v_createRequest.primitiveContent.schedule.scheduleElement := v_scheduleElement;
1607 1607 v_createRequest.primitiveContent.schedule.announcedAttribute := {"se"};
1608 1608  
1609   - v_ae1.start(f_CSE_DMR_CRE_021(int18, v_createRequest, mw_createScheduleAnncBase()));//Schedule
  1609 + v_ae1.start(f_CSE_DMR_CRE_021(int18, v_createRequest, mw_createScheduleAnnc()));//Schedule
1610 1610 v_ae1.done;
1611 1611  
1612 1612 if(getverdict == pass){
... ... @@ -7599,7 +7599,7 @@ module OneM2M_Testcases_CSE_Release_2 {
7599 7599 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
7600 7600  
7601 7601 var template RequestPrimitive v_updateRequest := m_updateContainerBase;
7602   - var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
  7602 + var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
7603 7603 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
7604 7604 v_ae1.done;
7605 7605 v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
... ... @@ -7613,7 +7613,7 @@ module OneM2M_Testcases_CSE_Release_2 {
7613 7613 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
7614 7614  
7615 7615 var template RequestPrimitive v_createRequest := m_createContainerBase;
7616   - var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
  7616 + var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
7617 7617 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
7618 7618 v_ae1.done;
7619 7619 v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
... ... @@ -7627,7 +7627,7 @@ module OneM2M_Testcases_CSE_Release_2 {
7627 7627 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
7628 7628  
7629 7629 var template RequestPrimitive v_updateRequest := m_updateGroupBase;
7630   - var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
  7630 + var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
7631 7631 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
7632 7632 v_ae1.done;
7633 7633 v_updateRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
... ... @@ -7641,7 +7641,7 @@ module OneM2M_Testcases_CSE_Release_2 {
7641 7641 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
7642 7642  
7643 7643 var template RequestPrimitive v_createRequest := m_createGroupBase;
7644   - var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
  7644 + var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
7645 7645 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
7646 7646 v_ae1.done;
7647 7647 v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
... ... @@ -7655,7 +7655,7 @@ module OneM2M_Testcases_CSE_Release_2 {
7655 7655 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
7656 7656  
7657 7657 var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
7658   - var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnncBase;
  7658 + var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
7659 7659 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
7660 7660 v_ae1.done;
7661 7661 v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
... ...