Fix TC_CSE_DMR_CRE_020_XXX and TC_CSE_DMR_UPD_022_XXX according to TDE-2019-0025

Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>

OneM2M_Testcases_CSE_Release_2.ttcn

@@ -904,6 +904,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_ae1.done;
 					
 						v_contentResponse.container := mw_contentContainer_rc1;
+						//Provided attributes should not be returned unless modified
+						v_contentResponse.container.resourceName := omit;
 						                    
 						v_ae1.start(f_CSE_DMR_CRE_020(int3, m_createContainerBase, v_contentResponse));//Container
 						v_ae1.done;
@@ -917,6 +919,10 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_ae1.done;
 					
 						v_contentResponse.group_ := mw_contentGroup_rc1;
+						//Provided attributes should not be returned unless modified
+						v_contentResponse.group_.resourceName := omit;
+						v_contentResponse.group_.maxNrOfMembers := omit;
+						v_contentResponse.group_.memberIDs := omit;
 						
 						v_ae1.start(f_CSE_DMR_CRE_020(int9, m_createGroupBase, v_contentResponse));//Group
 						v_ae1.done;
@@ -930,7 +936,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_ae1.done;
 											
 						v_contentResponse.accessControlPolicy := mw_contentAcp_rc1;
-						
+						//Provided attributes should not be returned unless modified
+						v_contentResponse.accessControlPolicy.resourceName := omit;
+						v_contentResponse.accessControlPolicy.privileges := omit;
+						v_contentResponse.accessControlPolicy.selfPrivileges := omit;
+						 
 						v_ae1.start(f_CSE_DMR_CRE_020(int1, m_createAcpBase,v_contentResponse));//AccessControlPolicy
 						v_ae1.done;
 					}
@@ -943,6 +953,9 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_ae1.done;
 											
 						v_contentResponse.subscription := mw_contentSubscription_rc1;
+						//Provided attributes should not be returned unless modified
+						v_contentResponse.subscription.resourceName := omit;
+						v_contentResponse.subscription.notificationURI := omit;
 						
 						v_ae1.start(f_CSE_DMR_CRE_020(int23, m_createSubscriptionBase, v_contentResponse));//Subscription
 						v_ae1.done;
@@ -956,6 +969,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_ae1.done;
 											
 						v_contentResponse.pollingChannel := mw_contentPollingChannel_rc1;
+						//Provided attributes should not be returned unless modified
+						v_contentResponse.pollingChannel.resourceName := omit;
 						
 						v_ae1.start(f_CSE_DMR_CRE_020(int15, m_createPollingChannelBase, v_contentResponse));//PollingChannel
 						v_ae1.done;
@@ -2378,7 +2393,8 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
 						v_contentResponse.container := m_contentContainer_allOmit;
-						v_contentResponse.container.labels := ?;
+						v_contentResponse.container.lastModifiedTime := ?;
+						v_contentResponse.container.stateTag := ?; 
 						v_updateRequest.primitiveContent.container.labels := {"VALUE_1"};
 		        
 						v_ae1.start(f_CSE_DMR_UPD_022(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase, v_updateRequest));//Container
@@ -2393,7 +2409,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
 						v_contentResponse.group_ := m_contentGroup_allOmit;
-						v_contentResponse.group_.labels := ?;
+						v_contentResponse.group_.lastModifiedTime := ?;
 						v_updateRequest.primitiveContent.group_.labels := {"VALUE_1"};
 		
 						v_ae1.start(f_CSE_DMR_UPD_022(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase, v_updateRequest));//Group
@@ -2409,7 +2425,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
 						v_ae1.done;
 						v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
-						v_contentResponse.accessControlPolicy.labels := ?;
+						v_contentResponse.accessControlPolicy.lastModifiedTime := ?;
 						v_updateRequest.primitiveContent.accessControlPolicy.labels := {"VALUE_1"};
 		
 						v_ae1.start(f_CSE_DMR_UPD_022(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase, v_updateRequest));//AccessControlPolicy