Moving softwareManagement types to oneM2M_Types

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

LibOneM2M/OneM2M_TypesAndValues.ttcn

@@ -2169,6 +2169,35 @@ group OptionalResourceTypes {
 		XSD.NonNegativeInteger maxNumInstancesPerFlexContainer optional,
 		SetOfAcrs defaultAccessControlPrivileges optional
 	};
+	
+    type record SoftwareCampaign_optional //added on Release-4
+    {
+        ResourceName resourceName optional,
+        ResourceType resourceType optional,
+        XSD.ID resourceID optional,
+        NhURI parentID optional,
+        Timestamp creationTime optional,
+        Timestamp lastModifiedTime optional,
+        Labels labels optional,
+        AcpType accessControlPolicyIDs optional,
+        Timestamp expirationTime optional,
+        ListOfURIs dynamicAuthorizationConsultationIDs optional, 
+        XSD.ID holder optional,          
+        ListOfURIs announceTo optional,
+        XSD.ID announceSyncType optional,    
+        ListOfNCNames announcedAttribute optional,
+        XSD.Boolean campaignEnabled optional,
+        ExecStatusType campaignStatus optional,
+        XSD.String version optional,
+        XSD.String softwareName optional,
+        XSD.AnyURI uRL optional,
+        ListOfM2MID softwareTargets optional,
+        Action_optional softwareTriggerCriteria optional,
+        SoftwareOperation softwareOperation optional,
+        ListOfM2MID softwareLinks optional,
+        AggregatedSoftwareStatus aggregatedSoftwareStatus optional,
+        XSD.String individualSoftwareStatus optional //ToDo - complete with tuple if used
+    };
 
 	type record StatsCollect_optional
 	{
@@ -4873,75 +4902,6 @@ with {
   encode "adapter";
 } // End of group tsSettings
 	
-    type record EvalCriteria
-    {
-        XSD.NCName  subject,
-        Operation   operator, // see type enumerated Operation
-        XSD.Integer threshold
-    }
-
-     type record ActionInput
-    {
-        XSD.NCName contentString optional,
-        XSD.AnyURI resourceID optional,
-        XSD.AnyURI resourceAttributeID optional
-    }
-
- group Software {
-
-    //TODO To be removed/replaced by the type defined in XSDs- TS-0001, Table 9.6.76-2
-    type enumerated AggregatedSoftwareStatus
-    {
-        int0(0), //Uninitialized 
-        int1(1), //Successful
-        int2(2), //Failure
-        int3(3)  //In_Process
-    }
-
-    type enumerated SoftwareOperation
-    {
-        int1(1), //install
-        int2(2), //uninstall
-        int3(3), //activate
-        int4(4)  //deactivate
-    }
-    
-    type enumerated EvalMode
-    {
-        int0(0), //off
-        int1(1), //once
-        int2(2), //periodic
-        int3(3)  //continuous
-    }
-
-    type record SoftwareCampaign_optional //added on Release-4
-    {
-        ResourceName resourceName optional,
-        ResourceType resourceType optional,
-        XSD.ID resourceID optional,
-        NhURI parentID optional,
-        Timestamp creationTime optional,
-        Timestamp lastModifiedTime optional,
-        Labels labels optional,
-        AcpType accessControlPolicyIDs optional,
-        Timestamp expirationTime optional,
-        ListOfURIs dynamicAuthorizationConsultationIDs optional, 
-        XSD.ID holder optional,          
-        ListOfURIs announceTo optional,
-        XSD.ID announceSyncType optional,    
-        ListOfNCNames announcedAttribute optional,
-        XSD.Boolean campaignEnabled optional,
-        ExecStatusType campaignStatus optional,
-        XSD.String version optional,
-        XSD.String softwareName optional,
-        XSD.AnyURI uRL optional,
-        ListOfM2MID softwareTargets optional,
-        Action_optional softwareTriggerCriteria optional,
-        SoftwareOperation softwareOperation optional,
-        ListOfM2MID softwareLinks optional,
-        AggregatedSoftwareStatus aggregatedSoftwareStatus optional,
-        XSD.String individualSoftwareStatus optional //ToDo - complete with tuple if used
-    };
- } // End of group Software   
+   
 } 
 // end of module
\ No newline at end of file

oneM2M_Types @ 42193462

-Subproject commit fdbbc9875fde66230579601d35f7874216ad8429
+Subproject commit 42193462e254a7025f3b2c8e11228652d9e595d1