diff options
Diffstat (limited to 'tosca-controlloop/models/src/test/resources')
4 files changed, 57 insertions, 57 deletions
diff --git a/tosca-controlloop/models/src/test/resources/META-INF/persistence.xml b/tosca-controlloop/models/src/test/resources/META-INF/persistence.xml index 8f0e0648b..078d534be 100644 --- a/tosca-controlloop/models/src/test/resources/META-INF/persistence.xml +++ b/tosca-controlloop/models/src/test/resources/META-INF/persistence.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- ============LICENSE_START======================================================= - Copyright (C) 2019-2020 Nordix Foundation. + Copyright (C) 2021 Nordix Foundation. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/tosca-controlloop/models/src/test/resources/json/ControlLoopElementNoOrderedState.json b/tosca-controlloop/models/src/test/resources/json/ControlLoopElementNoOrderedState.json index e9da16aad..33a63e604 100644 --- a/tosca-controlloop/models/src/test/resources/json/ControlLoopElementNoOrderedState.json +++ b/tosca-controlloop/models/src/test/resources/json/ControlLoopElementNoOrderedState.json @@ -4,8 +4,8 @@ "name": "cleDef", "version": "0.0.1" }, - "participantId": { - "name": "participant", + "participantType": { + "name": "participantType", "version": "0.0.1" }, "state": "UNINITIALISED", diff --git a/tosca-controlloop/models/src/test/resources/providers/TestControlLoops.json b/tosca-controlloop/models/src/test/resources/providers/TestControlLoops.json index 25e36458c..fedda9600 100644 --- a/tosca-controlloop/models/src/test/resources/providers/TestControlLoops.json +++ b/tosca-controlloop/models/src/test/resources/providers/TestControlLoops.json @@ -7,64 +7,64 @@ }, "state": "UNINITIALISED", "orderedState": "UNINITIALISED", - "elements": [ - { + "elements": { + "709c62b3-8918-41b9-a747-e21eb79c6c20": { "id": "709c62b3-8918-41b9-a747-d21eb79c6c20", "definition": { "name": "org.onap.domain.pmsh.PMSH_DCAEMicroservice", "version": "1.2.3" }, - "participantId": { - "name": "DCAEParticipant0", - "version": "1.0.0" + "participantType": { + "name": "org.onap.dcae.controlloop.DCAEMicroserviceControlLoopParticipant", + "version": "2.3.4" }, "state": "UNINITIALISED", "orderedState": "UNINITIALISED", "description": "DCAE Control Loop Element for the PMSH instance 0 control loop" }, - { + "709c62b3-8918-41b9-a747-e21eb79c6c21": { "id": "709c62b3-8918-41b9-a747-d21eb79c6c21", "definition": { "name": "org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement", "version": "1.2.3" }, - "participantId": { - "name": "PolicyParticipant0", - "version": "1.0.0" + "participantType": { + "name": "org.onap.policy.controlloop.PolicyControlLoopParticipant", + "version": "2.3.1" }, "state": "UNINITIALISED", "orderedState": "UNINITIALISED", "description": "Monitoring Policy Control Loop Element for the PMSH instance 0 control loop" }, - { + "709c62b3-8918-41b9-a747-e21eb79c6c22": { "id": "709c62b3-8918-41b9-a747-d21eb79c6c22", "definition": { "name": "org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement", "version": "1.2.3" }, - "participantId": { - "name": "PolicyParticipant0", - "version": "1.0.0" + "participantType": { + "name": "org.onap.policy.controlloop.PolicyControlLoopParticipant", + "version": "2.3.1" }, "state": "UNINITIALISED", "orderedState": "UNINITIALISED", "description": "Operational Policy Control Loop Element for the PMSH instance 0 control loop" }, - { + "709c62b3-8918-41b9-a747-e21eb79c6c23": { "id": "709c62b3-8918-41b9-a747-d21eb79c6c23", "definition": { "name": "org.onap.domain.pmsh.PMSH_CDS_ControlLoopElement", "version": "1.2.3" }, - "participantId": { - "name": "CDSParticipant0", - "version": "1.0.0" + "participantType": { + "name": "org.onap.ccsdk.cds.controlloop.CdsControlLoopParticipant", + "version": "2.2.1" }, "state": "UNINITIALISED", "orderedState": "UNINITIALISED", "description": "CDS Control Loop Element for the PMSH instance 0 control loop" } - ], + }, "name": "PMSHInstance0", "version": "1.0.1", "description": "PMSH control loop instance 0" @@ -76,64 +76,64 @@ }, "state": "UNINITIALISED", "orderedState": "UNINITIALISED", - "elements": [ - { + "elements": { + "709c62b3-8918-41b9-a747-e21eb79c6c24": { "id": "709c62b3-8918-41b9-a747-e21eb79c6c24", "definition": { "name": "org.onap.domain.pmsh.PMSH_DCAEMicroservice", "version": "1.2.3" }, - "participantId": { - "name": "DCAEParticipant0", - "version": "1.0.0" + "participantType": { + "name": "org.onap.dcae.controlloop.DCAEMicroserviceControlLoopParticipant", + "version": "2.3.4" }, "state": "UNINITIALISED", "orderedState": "UNINITIALISED", "description": "DCAE Control Loop Element for the PMSH instance 1 control loop" }, - { + "709c62b3-8918-41b9-a747-e21eb79c6c25": { "id": "709c62b3-8918-41b9-a747-e21eb79c6c25", "definition": { "name": "org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement", "version": "1.2.3" }, - "participantId": { - "name": "PolicyParticipant0", - "version": "1.0.0" + "participantType": { + "name": "org.onap.policy.controlloop.PolicyControlLoopParticipant", + "version": "2.3.1" }, "state": "UNINITIALISED", "orderedState": "UNINITIALISED", "description": "Monitoring Policy Control Loop Element for the PMSH instance 1 control loop" }, - { + "709c62b3-8918-41b9-a747-e21eb79c6c26": { "id": "709c62b3-8918-41b9-a747-e21eb79c6c26", "definition": { "name": "org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement", "version": "1.2.3" }, - "participantId": { - "name": "PolicyParticipant0", - "version": "1.0.0" + "participantType": { + "name": "org.onap.policy.controlloop.PolicyControlLoopParticipant", + "version": "2.3.1" }, "state": "UNINITIALISED", "orderedState": "UNINITIALISED", "description": "Operational Policy Control Loop Element for the PMSH instance 1 control loop" }, - { + "709c62b3-8918-41b9-a747-e21eb79c6c27": { "id": "709c62b3-8918-41b9-a747-e21eb79c6c27", "definition": { "name": "org.onap.domain.pmsh.PMSH_CDS_ControlLoopElement", "version": "1.2.3" }, - "participantId": { - "name": "CDSParticipant0", - "version": "1.0.0" + "participantType": { + "name": "org.onap.ccsdk.cds.controlloop.CdsControlLoopParticipant", + "version": "2.2.1" }, "state": "UNINITIALISED", "orderedState": "UNINITIALISED", "description": "CDS Control Loop Element for the PMSH instance 1 control loop" } - ], + }, "name": "PMSHInstance1", "version": "1.0.1", "description": "PMSH control loop instance 1" diff --git a/tosca-controlloop/models/src/test/resources/providers/UpdateControlLoops.json b/tosca-controlloop/models/src/test/resources/providers/UpdateControlLoops.json index 0ae402629..2d6bd0753 100644 --- a/tosca-controlloop/models/src/test/resources/providers/UpdateControlLoops.json +++ b/tosca-controlloop/models/src/test/resources/providers/UpdateControlLoops.json @@ -10,64 +10,64 @@ "state": "RUNNING", "orderedState": "RUNNING", "description": "PMSH control loop instance 0", - "elements": [ - { + "elements": { + "709c62b3-8918-41b9-a747-d21eb79c6c20": { "id": "709c62b3-8918-41b9-a747-d21eb79c6c20", "definition": { "name": "org.onap.domain.pmsh.PMSH_DCAEMicroservice", "version": "1.2.3" }, - "participantId": { - "name": "DCAEParticipant0", - "version": "1.0.0" + "participantType": { + "name": "org.onap.dcae.controlloop.DCAEMicroserviceControlLoopParticipant", + "version": "2.3.4" }, "state": "RUNNING", "orderedState": "RUNNING", "description": "DCAE Control Loop Element for the PMSH instance 0 control loop" }, - { + "709c62b3-8918-41b9-a747-d21eb79c6c21": { "id": "709c62b3-8918-41b9-a747-d21eb79c6c21", "definition": { "name": "org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement", "version": "1.2.3" }, - "participantId": { - "name": "PolicyParticipant0", - "version": "1.0.0" + "participantType": { + "name": "org.onap.policy.controlloop.PolicyControlLoopParticipant", + "version": "2.3.1" }, "state": "RUNNING", "orderedState": "RUNNING", "description": "Monitoring Policy Control Loop Element for the PMSH instance 0 control loop" }, - { + "709c62b3-8918-41b9-a747-d21eb79c6c22": { "id": "709c62b3-8918-41b9-a747-d21eb79c6c22", "definition": { "name": "org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement", - "version": "1.2.3" + "version": "2.3.1" }, - "participantId": { - "name": "PolicyParticipant0", + "participantType": { + "name": "org.onap.policy.controlloop.PolicyControlLoopParticipant", "version": "1.0.0" }, "state": "RUNNING", "orderedState": "RUNNING", "description": "Operational Policy Control Loop Element for the PMSH instance 0 control loop" }, - { + "709c62b3-8918-41b9-a747-d21eb79c6c23": { "id": "709c62b3-8918-41b9-a747-d21eb79c6c23", "definition": { "name": "org.onap.domain.pmsh.PMSH_CDS_ControlLoopElement", "version": "1.2.3" }, - "participantId": { - "name": "CDSParticipant0", - "version": "1.0.0" + "participantType": { + "name": "org.onap.ccsdk.cds.controlloop.CdsControlLoopParticipant", + "version": "2.2.1" }, "state": "RUNNING", "orderedState": "RUNNING", "description": "CDS Control Loop Element for the PMSH instance 0 control loop" } - ] + } } ] } |