Merge "Uplift spring boot version to 3.1.4"

author Aravindhan Ayyanathan <aravindhan.a@est.tech>

Mon, 25 Sep 2023 15:23:03 +0000 (15:23 +0000)

committer Gerrit Code Review <gerrit@o-ran-sc.org>

Mon, 25 Sep 2023 15:23:03 +0000 (15:23 +0000)
author Aravindhan Ayyanathan <aravindhan.a@est.tech>
Mon, 25 Sep 2023 15:23:03 +0000 (15:23 +0000)
committer Gerrit Code Review <gerrit@o-ran-sc.org>
Mon, 25 Sep 2023 15:23:03 +0000 (15:23 +0000)
diff --git a/README.md b/README.md

index 2d8fa3c..f76e617 100755 (executable)
--- a/README.md
+++ b/README.md
@@ -7,17 +7,25 @@ rApp manager is an application which lifecycle manages the rApp.
  
  ![Image](docs/images/architecture.png "Rapp Manager Architecture")
  
+### rApp Package (<mark>**It is a prototype**</mark>)
+
+![Image](docs/images/rApp-package.png "Rapp package")
+
  ### rApp States
  
-![Image](docs/images/rapp-states.png "Rapp States")
+![Image](docs/images/rApp-states.png "Rapp States")
  
  ### rApp Instance States
  
-![Image](docs/images/rapp-instance-states.png "Rapp Instance States")
+![Image](docs/images/rApp-instance-states.png "Rapp Instance States")
  
  ### Events responsible for rApp Instance State Transition
  
-![Image](docs/images/rapp-state-events.png "Rapp Manager State Events")
+![Image](docs/images/rApp-state-events.png "Rapp Manager State Events")
+
+### rApp Entity Relationship
+
+![Image](docs/images/rApp-entity-relationship.png "Rapp Entity Relationship")
  
  ## Integrations
  
@@ -32,6 +40,10 @@ ONAP ACM related details can be found [here](https://docs.onap.org/projects/onap
  
  This integration is based on the CAPIF function developed as part of O-RAN SC. It is available [here](https://github.com/o-ran-sc/nonrtric-plt-sme/blob/master/capifcore/README.md)
  
+### Integration of DME (ICS)
+
+This integration is based on the ICS as part of O-RAN SC NONRTRIC. It is available [here](https://docs.o-ran-sc.org/projects/o-ran-sc-nonrtric/en/latest/overview.html#information-coordination-service)
+
  ## Flow Diagrams
  
  ### Application Lifecycle
@@ -40,11 +52,11 @@ This integration is based on the CAPIF function developed as part of O-RAN SC. I
  
  ### rApp Flow
  
-![Image](docs/images/rapp-flow.png "Rapp Flow")
+![Image](docs/images/rApp-flow.png "Rapp Flow")
  
  ### rApp Instance Flow
  
-![Image](docs/images/rapp-instance-flow.png "Rapp Instance Flow")
+![Image](docs/images/rApp-instance-flow.png "Rapp Instance Flow")
  
  
  ## Maven Build
diff --git a/docs/drawio/rApp-manager.drawio b/docs/drawio/rApp-manager.drawio

new file mode 100755 (executable)

index 0000000..d874480
--- /dev/null
+++ b/docs/drawio/rApp-manager.drawio
@@ -0,0 +1 @@
+<mxfile host="drawio-plugin" modified="2023-09-22T09:16:39.003Z" agent="5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Safari/537.36" etag="jpbtSBGK3T1NSi324dXv" version="20.5.3" type="embed" pages="5"><diagram name="Architecture" id="17ScgUcGnw9kMPdYQ0jm"><mxGraphModel dx="1069" dy="1053" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="0" pageScale="1" pageWidth="827" pageHeight="1169" background="none" math="0" shadow="0"><root><mxCell id="0"/><mxCell id="1" parent="0"/><mxCell id="cXwkYd20uXq4Kvx39tCG-18" value="" style="rounded=0;whiteSpace=wrap;html=1;fontSize=16;dashed=1;dashPattern=1 2;" parent="1" vertex="1"><mxGeometry x="200" y="100" width="560" height="260" as="geometry"/></mxCell><mxCell id="IMkn7QF7C7UZfDmJMlh3-2" value="rApp Manager" style="rounded=1;whiteSpace=wrap;html=1;fontSize=16;fillColor=#b0e3e6;strokeColor=#0e8088;" parent="1" vertex="1"><mxGeometry x="60" y="-97" width="122" height="63" as="geometry"/></mxCell><mxCell id="KdB-_tFk0e3cPOdDlfYL-5" style="edgeStyle=none;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;fontSize=12;startSize=8;endSize=8;" parent="1" source="IMkn7QF7C7UZfDmJMlh3-6" target="IMkn7QF7C7UZfDmJMlh3-2" edge="1"><mxGeometry relative="1" as="geometry"/></mxCell><mxCell id="IMkn7QF7C7UZfDmJMlh3-6" value="API User" style="shape=umlActor;verticalLabelPosition=top;verticalAlign=bottom;html=1;outlineConnect=0;fontSize=16;labelPosition=center;align=center;" parent="1" vertex="1"><mxGeometry x="106" y="-284.5" width="30" height="60" as="geometry"/></mxCell><mxCell id="HdeRTKC2PSPPZ0eF_beT-1" value="Rapp Catalogue" style="rounded=1;whiteSpace=wrap;html=1;fontSize=16;fillColor=#e1d5e7;strokeColor=#9673a6;" parent="1" vertex="1"><mxGeometry x="1060" y="-130" width="120" height="60" as="geometry"/></mxCell><mxCell id="cXwkYd20uXq4Kvx39tCG-6" value="" style="group" parent="1" vertex="1" connectable="0"><mxGeometry x="-380" y="100" width="535" height="264" as="geometry"/></mxCell><mxCell id="IMkn7QF7C7UZfDmJMlh3-10" value="" style="rounded=0;whiteSpace=wrap;html=1;fontSize=16;shadow=0;glass=0;dashed=1;dashPattern=1 2;" parent="cXwkYd20uXq4Kvx39tCG-6" vertex="1"><mxGeometry width="535" height="264" as="geometry"/></mxCell><mxCell id="IMkn7QF7C7UZfDmJMlh3-1" value="ACM Runtime" style="rounded=1;whiteSpace=wrap;html=1;fontSize=16;fillColor=#fff2cc;strokeColor=#d6b656;" parent="cXwkYd20uXq4Kvx39tCG-6" vertex="1"><mxGeometry x="201" y="24" width="120" height="60" as="geometry"/></mxCell><mxCell id="IMkn7QF7C7UZfDmJMlh3-3" value="Kubernetes Participant" style="rounded=1;whiteSpace=wrap;html=1;fontSize=16;fillColor=#dae8fc;strokeColor=#6c8ebf;" parent="cXwkYd20uXq4Kvx39tCG-6" vertex="1"><mxGeometry x="45" y="168" width="120" height="60" as="geometry"/></mxCell><mxCell id="IMkn7QF7C7UZfDmJMlh3-4" value="A1PMS Participant" style="rounded=1;whiteSpace=wrap;html=1;fontSize=16;fillColor=#dae8fc;strokeColor=#6c8ebf;" parent="cXwkYd20uXq4Kvx39tCG-6" vertex="1"><mxGeometry x="201" y="168" width="120" height="60" as="geometry"/></mxCell><mxCell id="IMkn7QF7C7UZfDmJMlh3-5" value="Kserve Participant" style="rounded=1;whiteSpace=wrap;html=1;fontSize=16;fillColor=#dae8fc;strokeColor=#6c8ebf;" parent="cXwkYd20uXq4Kvx39tCG-6" vertex="1"><mxGeometry x="398" y="168" width="120" height="60" as="geometry"/></mxCell><mxCell id="IMkn7QF7C7UZfDmJMlh3-7" value="" style="endArrow=classic;startArrow=classic;html=1;rounded=0;fontSize=12;startSize=8;endSize=8;curved=1;" parent="cXwkYd20uXq4Kvx39tCG-6" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="209" y="84" as="sourcePoint"/><mxPoint x="105" y="165" as="targetPoint"/></mxGeometry></mxCell><mxCell id="IMkn7QF7C7UZfDmJMlh3-8" value="" style="endArrow=classic;startArrow=classic;html=1;rounded=0;fontSize=12;startSize=8;endSize=8;curved=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="cXwkYd20uXq4Kvx39tCG-6" target="IMkn7QF7C7UZfDmJMlh3-4" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="260" y="84" as="sourcePoint"/><mxPoint x="156" y="165" as="targetPoint"/></mxGeometry></mxCell><mxCell id="IMkn7QF7C7UZfDmJMlh3-9" value="" style="endArrow=classic;startArrow=classic;html=1;rounded=0;fontSize=12;startSize=8;endSize=8;curved=1;entryX=0.944;entryY=0.939;entryDx=0;entryDy=0;entryPerimeter=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" parent="cXwkYd20uXq4Kvx39tCG-6" source="IMkn7QF7C7UZfDmJMlh3-5" target="IMkn7QF7C7UZfDmJMlh3-1" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="628" y="46" as="sourcePoint"/><mxPoint x="524" y="127" as="targetPoint"/></mxGeometry></mxCell><mxCell id="IMkn7QF7C7UZfDmJMlh3-11" value="ACM" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=16;" parent="cXwkYd20uXq4Kvx39tCG-6" vertex="1"><mxGeometry x="475" width="60" height="30" as="geometry"/></mxCell><mxCell id="IMkn7QF7C7UZfDmJMlh3-13" value="" style="endArrow=none;dashed=1;html=1;rounded=0;fontSize=12;startSize=8;endSize=8;curved=1;dashPattern=1 2;" parent="cXwkYd20uXq4Kvx39tCG-6" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="334" y="201" as="sourcePoint"/><mxPoint x="386" y="201" as="targetPoint"/></mxGeometry></mxCell><mxCell id="IMkn7QF7C7UZfDmJMlh3-17" style="edgeStyle=none;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fontSize=12;startSize=8;endSize=8;" parent="1" source="IMkn7QF7C7UZfDmJMlh3-2" target="IMkn7QF7C7UZfDmJMlh3-1" edge="1"><mxGeometry relative="1" as="geometry"/></mxCell><mxCell id="cXwkYd20uXq4Kvx39tCG-10" value="NONRTRIC" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=16;" parent="1" vertex="1"><mxGeometry x="660" y="110" width="60" height="12.1875" as="geometry"/></mxCell><mxCell id="cXwkYd20uXq4Kvx39tCG-20" value="" style="group;fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1" connectable="0"><mxGeometry x="500" y="150" width="240" height="190" as="geometry"/></mxCell><mxCell id="cXwkYd20uXq4Kvx39tCG-2" value="" style="rounded=0;whiteSpace=wrap;html=1;fontSize=16;shadow=0;glass=0;fillColor=#b1ddf0;strokeColor=#10739e;" parent="cXwkYd20uXq4Kvx39tCG-20" vertex="1"><mxGeometry x="-5" width="245" height="190" as="geometry"/></mxCell><mxCell id="cXwkYd20uXq4Kvx39tCG-4" value="ICS" style="rounded=1;whiteSpace=wrap;html=1;fontSize=16;fillColor=#fff2cc;strokeColor=#d6b656;" parent="cXwkYd20uXq4Kvx39tCG-20" vertex="1"><mxGeometry x="41.03" y="51.7" width="152.93" height="56.61" as="geometry"/></mxCell><mxCell id="cXwkYd20uXq4Kvx39tCG-5" style="edgeStyle=none;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;fontSize=12;startSize=8;endSize=8;" parent="cXwkYd20uXq4Kvx39tCG-20" source="cXwkYd20uXq4Kvx39tCG-2" target="cXwkYd20uXq4Kvx39tCG-2" edge="1"><mxGeometry relative="1" as="geometry"/></mxCell><mxCell id="IMkn7QF7C7UZfDmJMlh3-26" value="DME" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=16;" parent="cXwkYd20uXq4Kvx39tCG-20" vertex="1"><mxGeometry x="189.9961896243292" y="9.999913043478273" width="42.933810375670845" height="10.17391304347826" as="geometry"/></mxCell><mxCell id="cXwkYd20uXq4Kvx39tCG-8" style="edgeStyle=none;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;fontSize=12;startSize=8;endSize=8;" parent="1" source="IMkn7QF7C7UZfDmJMlh3-2" target="cXwkYd20uXq4Kvx39tCG-4" edge="1"><mxGeometry relative="1" as="geometry"/></mxCell><mxCell id="KdB-_tFk0e3cPOdDlfYL-3" value="" style="rounded=0;whiteSpace=wrap;html=1;fontSize=16;shadow=0;glass=0;fillColor=#fad9d5;strokeColor=#ae4132;container=0;" parent="1" vertex="1"><mxGeometry x="220" y="150" width="240" height="190" as="geometry"/></mxCell><mxCell id="IMkn7QF7C7UZfDmJMlh3-22" value="CAPIF" style="rounded=1;whiteSpace=wrap;html=1;fontSize=16;fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1"><mxGeometry x="270" y="175.9090909090909" width="170" height="60.45454545454545" as="geometry"/></mxCell><mxCell id="IMkn7QF7C7UZfDmJMlh3-25" value="SME" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=16;" parent="1" vertex="1"><mxGeometry x="402.4642857142857" y="158.0229890422078" width="47.14285714285714" height="9.773741883116884" as="geometry"/></mxCell><mxCell id="cXwkYd20uXq4Kvx39tCG-22" value="Keycloak" style="rounded=1;whiteSpace=wrap;html=1;fontSize=16;fillColor=#b0e3e6;strokeColor=#0e8088;" parent="1" vertex="1"><mxGeometry x="270" y="253.63636363636363" width="170" height="60.45454545454545" as="geometry"/></mxCell><mxCell id="cXwkYd20uXq4Kvx39tCG-7" value="" style="edgeStyle=none;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;fontSize=12;startSize=8;endSize=8;" parent="1" source="IMkn7QF7C7UZfDmJMlh3-2" target="IMkn7QF7C7UZfDmJMlh3-22" edge="1"><mxGeometry relative="1" as="geometry"/></mxCell></root></mxGraphModel></diagram><diagram id="5WbYrmaVoOUk7OSHm8GO" name="rApp-States">&#xa;    <mxGraphModel dx="1034" dy="486" grid="0" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="0" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">&#xa;      <root>&#xa;        <mxCell id="0"/>&#xa;        <mxCell id="1" parent="0"/>&#xa;        <mxCell id="OlEAaxTOH4qE6BNT9p8g-16" style="edgeStyle=none;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fontSize=12;startSize=8;endSize=8;" parent="1" source="kaBHNdDOut0HFUkxyrMo-2" target="OlEAaxTOH4qE6BNT9p8g-2" edge="1">&#xa;          <mxGeometry relative="1" as="geometry"/>&#xa;        </mxCell>&#xa;        <mxCell id="kaBHNdDOut0HFUkxyrMo-2" value="PRIMING" style="rounded=1;whiteSpace=wrap;html=1;fontSize=16;fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">&#xa;          <mxGeometry x="734" y="763" width="120" height="60" as="geometry"/>&#xa;        </mxCell>&#xa;        <mxCell id="SM-95HUsG2i_VOHMoe33-1" style="edgeStyle=none;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;fontSize=12;startSize=8;endSize=8;" parent="1" source="kaBHNdDOut0HFUkxyrMo-3" target="OlEAaxTOH4qE6BNT9p8g-1" edge="1">&#xa;          <mxGeometry relative="1" as="geometry">&#xa;            <Array as="points">&#xa;              <mxPoint x="1153" y="850"/>&#xa;            </Array>&#xa;          </mxGeometry>&#xa;        </mxCell>&#xa;        <mxCell id="kaBHNdDOut0HFUkxyrMo-3" value="DEPRIMING" style="rounded=1;whiteSpace=wrap;html=1;fontSize=16;fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">&#xa;          <mxGeometry x="734" y="985" width="120" height="60" as="geometry"/>&#xa;        </mxCell>&#xa;        <mxCell id="OlEAaxTOH4qE6BNT9p8g-15" style="edgeStyle=none;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fontSize=12;startSize=8;endSize=8;" parent="1" source="OlEAaxTOH4qE6BNT9p8g-1" target="kaBHNdDOut0HFUkxyrMo-2" edge="1">&#xa;          <mxGeometry relative="1" as="geometry"/>&#xa;        </mxCell>&#xa;        <mxCell id="OlEAaxTOH4qE6BNT9p8g-1" value="COMMISSIONED" style="rounded=1;whiteSpace=wrap;html=1;fontSize=16;fillColor=#60a917;strokeColor=#2D7600;fontColor=#ffffff;" parent="1" vertex="1">&#xa;          <mxGeometry x="726" y="659" width="136" height="60" as="geometry"/>&#xa;        </mxCell>&#xa;        <mxCell id="OlEAaxTOH4qE6BNT9p8g-17" style="edgeStyle=none;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;fontSize=12;startSize=8;endSize=8;" parent="1" source="OlEAaxTOH4qE6BNT9p8g-2" target="kaBHNdDOut0HFUkxyrMo-3" edge="1">&#xa;          <mxGeometry relative="1" as="geometry"/>&#xa;        </mxCell>&#xa;        <mxCell id="OlEAaxTOH4qE6BNT9p8g-2" value="PRIMED" style="rounded=1;whiteSpace=wrap;html=1;fontSize=16;fillColor=#60a917;strokeColor=#2D7600;fontColor=#ffffff;" parent="1" vertex="1">&#xa;          <mxGeometry x="734" y="874" width="120" height="60" as="geometry"/>&#xa;        </mxCell>&#xa;      </root>&#xa;    </mxGraphModel>&#xa;  </diagram><diagram name="rApp Instance States" id="4tHQkv6kBpBhb85iWkPI">&#xa;    <mxGraphModel dx="1034" dy="486" grid="0" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="0" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">&#xa;      <root>&#xa;        <mxCell id="TQWpiqcAljcXlIxfPDRo-0"/>&#xa;        <mxCell id="TQWpiqcAljcXlIxfPDRo-1" parent="TQWpiqcAljcXlIxfPDRo-0"/>&#xa;        <mxCell id="TQWpiqcAljcXlIxfPDRo-4" style="edgeStyle=none;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fontSize=12;startSize=8;endSize=8;" parent="TQWpiqcAljcXlIxfPDRo-1" source="TQWpiqcAljcXlIxfPDRo-5" target="TQWpiqcAljcXlIxfPDRo-12" edge="1">&#xa;          <mxGeometry relative="1" as="geometry"/>&#xa;        </mxCell>&#xa;        <mxCell id="TQWpiqcAljcXlIxfPDRo-5" value="DEPLOYED" style="rounded=1;whiteSpace=wrap;html=1;fontSize=16;fillColor=#60a917;strokeColor=#2D7600;fontColor=#ffffff;" parent="TQWpiqcAljcXlIxfPDRo-1" vertex="1">&#xa;          <mxGeometry x="734" y="763" width="120" height="60" as="geometry"/>&#xa;        </mxCell>&#xa;        <mxCell id="htJC7knH3mB6ENcDUvvf-0" style="edgeStyle=none;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.997;entryY=0.62;entryDx=0;entryDy=0;entryPerimeter=0;fontSize=12;startSize=8;endSize=8;" parent="TQWpiqcAljcXlIxfPDRo-1" source="TQWpiqcAljcXlIxfPDRo-6" target="TQWpiqcAljcXlIxfPDRo-9" edge="1">&#xa;          <mxGeometry relative="1" as="geometry">&#xa;            <Array as="points">&#xa;              <mxPoint x="1100" y="810"/>&#xa;            </Array>&#xa;          </mxGeometry>&#xa;        </mxCell>&#xa;        <mxCell id="TQWpiqcAljcXlIxfPDRo-6" value="UNDEPLOYED" style="rounded=1;whiteSpace=wrap;html=1;fontSize=16;fillColor=#60a917;strokeColor=#2D7600;fontColor=#ffffff;" parent="TQWpiqcAljcXlIxfPDRo-1" vertex="1">&#xa;          <mxGeometry x="734" y="985" width="120" height="60" as="geometry"/>&#xa;        </mxCell>&#xa;        <mxCell id="TQWpiqcAljcXlIxfPDRo-7" style="edgeStyle=none;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fontSize=12;startSize=8;endSize=8;" parent="TQWpiqcAljcXlIxfPDRo-1" source="TQWpiqcAljcXlIxfPDRo-9" target="TQWpiqcAljcXlIxfPDRo-5" edge="1">&#xa;          <mxGeometry relative="1" as="geometry"/>&#xa;        </mxCell>&#xa;        <mxCell id="TQWpiqcAljcXlIxfPDRo-9" value="DEPLOYING" style="rounded=1;whiteSpace=wrap;html=1;fontSize=16;fillColor=#fff2cc;strokeColor=#d6b656;" parent="TQWpiqcAljcXlIxfPDRo-1" vertex="1">&#xa;          <mxGeometry x="734" y="662" width="120" height="60" as="geometry"/>&#xa;        </mxCell>&#xa;        <mxCell id="TQWpiqcAljcXlIxfPDRo-10" style="edgeStyle=none;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;fontSize=12;startSize=8;endSize=8;" parent="TQWpiqcAljcXlIxfPDRo-1" source="TQWpiqcAljcXlIxfPDRo-12" target="TQWpiqcAljcXlIxfPDRo-6" edge="1">&#xa;          <mxGeometry relative="1" as="geometry"/>&#xa;        </mxCell>&#xa;        <mxCell id="TQWpiqcAljcXlIxfPDRo-12" value="UNDEPLOYING" style="rounded=1;whiteSpace=wrap;html=1;fontSize=16;fillColor=#fff2cc;strokeColor=#d6b656;" parent="TQWpiqcAljcXlIxfPDRo-1" vertex="1">&#xa;          <mxGeometry x="734" y="874" width="120" height="60" as="geometry"/>&#xa;        </mxCell>&#xa;      </root>&#xa;    </mxGraphModel>&#xa;  </diagram><diagram name="rApp Instance Events" id="e8AQIz6e7eoNnJf5ZOEh">&#xa;    <mxGraphModel dx="1287" dy="642" grid="0" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="0" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">&#xa;      <root>&#xa;        <mxCell id="EyTT8lpdAKgMZ4VjWMC6-0"/>&#xa;        <mxCell id="EyTT8lpdAKgMZ4VjWMC6-1" parent="EyTT8lpdAKgMZ4VjWMC6-0"/>&#xa;        <mxCell id="EyTT8lpdAKgMZ4VjWMC6-2" style="edgeStyle=none;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fontSize=12;startSize=8;endSize=8;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="EyTT8lpdAKgMZ4VjWMC6-1" source="EyTT8lpdAKgMZ4VjWMC6-3" target="EyTT8lpdAKgMZ4VjWMC6-8" edge="1">&#xa;          <mxGeometry relative="1" as="geometry">&#xa;            <mxPoint x="796" y="643" as="targetPoint"/>&#xa;          </mxGeometry>&#xa;        </mxCell>&#xa;        <mxCell id="EyTT8lpdAKgMZ4VjWMC6-3" value="UNDEPLOYED" style="rounded=1;whiteSpace=wrap;html=1;fontSize=16;fillColor=#60a917;strokeColor=#2D7600;fontColor=#ffffff;" parent="EyTT8lpdAKgMZ4VjWMC6-1" vertex="1">&#xa;          <mxGeometry x="733" y="530" width="120" height="60" as="geometry"/>&#xa;        </mxCell>&#xa;        <mxCell id="EyTT8lpdAKgMZ4VjWMC6-4" style="edgeStyle=none;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fontSize=12;startSize=8;endSize=8;" parent="EyTT8lpdAKgMZ4VjWMC6-1" source="EyTT8lpdAKgMZ4VjWMC6-5" target="EyTT8lpdAKgMZ4VjWMC6-10" edge="1">&#xa;          <mxGeometry relative="1" as="geometry"/>&#xa;        </mxCell>&#xa;        <mxCell id="EyTT8lpdAKgMZ4VjWMC6-5" value="DEPLOYED" style="rounded=1;whiteSpace=wrap;html=1;fontSize=16;fillColor=#60a917;fontColor=#ffffff;strokeColor=#2D7600;" parent="EyTT8lpdAKgMZ4VjWMC6-1" vertex="1">&#xa;          <mxGeometry x="734" y="931" width="120" height="60" as="geometry"/>&#xa;        </mxCell>&#xa;        <mxCell id="h__vrVu5-qu6cgSce-rx-6" style="edgeStyle=none;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=-0.087;entryY=0.478;entryDx=0;entryDy=0;entryPerimeter=0;fontSize=12;startSize=8;endSize=8;" parent="EyTT8lpdAKgMZ4VjWMC6-1" source="EyTT8lpdAKgMZ4VjWMC6-8" target="EyTT8lpdAKgMZ4VjWMC6-3" edge="1">&#xa;          <mxGeometry relative="1" as="geometry">&#xa;            <Array as="points">&#xa;              <mxPoint x="496" y="649"/>&#xa;            </Array>&#xa;          </mxGeometry>&#xa;        </mxCell>&#xa;        <mxCell id="SABqlHIYieWgqcJjw3hA-13" style="edgeStyle=none;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fontSize=12;startSize=8;endSize=8;" edge="1" parent="EyTT8lpdAKgMZ4VjWMC6-1" source="EyTT8lpdAKgMZ4VjWMC6-8">&#xa;          <mxGeometry relative="1" as="geometry">&#xa;            <mxPoint x="680" y="863" as="targetPoint"/>&#xa;          </mxGeometry>&#xa;        </mxCell>&#xa;        <mxCell id="SABqlHIYieWgqcJjw3hA-14" style="edgeStyle=none;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fontSize=12;startSize=8;endSize=8;" edge="1" parent="EyTT8lpdAKgMZ4VjWMC6-1" source="EyTT8lpdAKgMZ4VjWMC6-8">&#xa;          <mxGeometry relative="1" as="geometry">&#xa;            <mxPoint x="906" y="864" as="targetPoint"/>&#xa;          </mxGeometry>&#xa;        </mxCell>&#xa;        <mxCell id="SABqlHIYieWgqcJjw3hA-15" style="edgeStyle=none;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fontSize=12;startSize=8;endSize=8;" edge="1" parent="EyTT8lpdAKgMZ4VjWMC6-1" source="EyTT8lpdAKgMZ4VjWMC6-8">&#xa;          <mxGeometry relative="1" as="geometry">&#xa;            <mxPoint x="794" y="866" as="targetPoint"/>&#xa;          </mxGeometry>&#xa;        </mxCell>&#xa;        <mxCell id="EyTT8lpdAKgMZ4VjWMC6-8" value="DEPLOYING" style="rounded=1;whiteSpace=wrap;html=1;fontSize=16;fillColor=#fff2cc;strokeColor=#d6b656;" parent="EyTT8lpdAKgMZ4VjWMC6-1" vertex="1">&#xa;          <mxGeometry x="734" y="662" width="120" height="60" as="geometry"/>&#xa;        </mxCell>&#xa;        <mxCell id="h__vrVu5-qu6cgSce-rx-4" style="edgeStyle=none;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;fontSize=12;startSize=8;endSize=8;" parent="EyTT8lpdAKgMZ4VjWMC6-1" source="EyTT8lpdAKgMZ4VjWMC6-10" target="EyTT8lpdAKgMZ4VjWMC6-5" edge="1">&#xa;          <mxGeometry relative="1" as="geometry">&#xa;            <Array as="points">&#xa;              <mxPoint x="531" y="1041"/>&#xa;            </Array>&#xa;          </mxGeometry>&#xa;        </mxCell>&#xa;        <mxCell id="SABqlHIYieWgqcJjw3hA-8" style="edgeStyle=none;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fontSize=12;startSize=8;endSize=8;" edge="1" parent="EyTT8lpdAKgMZ4VjWMC6-1" source="EyTT8lpdAKgMZ4VjWMC6-10">&#xa;          <mxGeometry relative="1" as="geometry">&#xa;            <mxPoint x="675" y="1280" as="targetPoint"/>&#xa;          </mxGeometry>&#xa;        </mxCell>&#xa;        <mxCell id="SABqlHIYieWgqcJjw3hA-9" style="edgeStyle=none;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fontSize=12;startSize=8;endSize=8;" edge="1" parent="EyTT8lpdAKgMZ4VjWMC6-1" source="EyTT8lpdAKgMZ4VjWMC6-10">&#xa;          <mxGeometry relative="1" as="geometry">&#xa;            <mxPoint x="908" y="1282" as="targetPoint"/>&#xa;          </mxGeometry>&#xa;        </mxCell>&#xa;        <mxCell id="SABqlHIYieWgqcJjw3hA-10" style="edgeStyle=none;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fontSize=12;startSize=8;endSize=8;" edge="1" parent="EyTT8lpdAKgMZ4VjWMC6-1" source="EyTT8lpdAKgMZ4VjWMC6-10">&#xa;          <mxGeometry relative="1" as="geometry">&#xa;            <mxPoint x="794" y="1282" as="targetPoint"/>&#xa;          </mxGeometry>&#xa;        </mxCell>&#xa;        <mxCell id="EyTT8lpdAKgMZ4VjWMC6-10" value="UNDEPLOYING" style="rounded=1;whiteSpace=wrap;html=1;fontSize=16;fillColor=#fff2cc;strokeColor=#d6b656;" parent="EyTT8lpdAKgMZ4VjWMC6-1" vertex="1">&#xa;          <mxGeometry x="734" y="1067" width="120" height="60" as="geometry"/>&#xa;        </mxCell>&#xa;        <mxCell id="EyTT8lpdAKgMZ4VjWMC6-12" value="&lt;div style=&quot;background-color: rgb(255, 255, 255); font-size: 17px;&quot;&gt;&lt;span style=&quot;font-size: 17px;&quot;&gt;DEPLOYING&lt;/span&gt;&lt;/div&gt;" style="text;whiteSpace=wrap;html=1;fontSize=17;fontStyle=1;fontFamily=Times New Roman;align=center;horizontal=1;fontColor=#CC00CC;" parent="EyTT8lpdAKgMZ4VjWMC6-1" vertex="1">&#xa;          <mxGeometry x="740" y="600" width="99" height="38" as="geometry"/>&#xa;        </mxCell>&#xa;        <mxCell id="EyTT8lpdAKgMZ4VjWMC6-16" value="&lt;div style=&quot;background-color: rgb(255, 255, 255); font-size: 17px;&quot;&gt;&lt;span style=&quot;font-size: 17px;&quot;&gt;SMEDEPLOYED&lt;/span&gt;&lt;/div&gt;" style="text;whiteSpace=wrap;html=1;fontSize=17;fontStyle=1;fontFamily=Times New Roman;align=center;horizontal=1;fontColor=#CC00CC;" parent="EyTT8lpdAKgMZ4VjWMC6-1" vertex="1">&#xa;          <mxGeometry x="751" y="805" width="99" height="38" as="geometry"/>&#xa;        </mxCell>&#xa;        <mxCell id="EyTT8lpdAKgMZ4VjWMC6-17" value="&lt;div style=&quot;background-color: rgb(255, 255, 255); font-size: 17px;&quot;&gt;&lt;span style=&quot;font-size: 17px;&quot;&gt;ACMDEPLOYED&lt;/span&gt;&lt;/div&gt;" style="text;whiteSpace=wrap;html=1;fontSize=17;fontStyle=1;fontFamily=Times New Roman;align=center;horizontal=1;fontColor=#CC00CC;" parent="EyTT8lpdAKgMZ4VjWMC6-1" vertex="1">&#xa;          <mxGeometry x="667" y="767" width="99" height="38" as="geometry"/>&#xa;        </mxCell>&#xa;        <mxCell id="EyTT8lpdAKgMZ4VjWMC6-19" value="&lt;div style=&quot;background-color: rgb(255, 255, 255); font-size: 17px;&quot;&gt;&lt;span style=&quot;font-size: 17px;&quot;&gt;ACMUNDEPLOYFAILED&lt;/span&gt;&lt;/div&gt;" style="text;whiteSpace=wrap;html=1;fontSize=17;fontStyle=1;fontFamily=Times New Roman;align=center;horizontal=1;fontColor=#CC00CC;" parent="EyTT8lpdAKgMZ4VjWMC6-1" vertex="1">&#xa;          <mxGeometry x="458" y="982" width="99" height="38" as="geometry"/>&#xa;        </mxCell>&#xa;        <mxCell id="EyTT8lpdAKgMZ4VjWMC6-20" value="&lt;div style=&quot;background-color: rgb(255, 255, 255); font-size: 17px;&quot;&gt;&lt;span style=&quot;font-size: 17px;&quot;&gt;ACMDEPLOYFAILED&lt;/span&gt;&lt;/div&gt;" style="text;whiteSpace=wrap;html=1;fontSize=17;fontStyle=1;fontFamily=Times New Roman;align=center;horizontal=1;fontColor=#CC00CC;" parent="EyTT8lpdAKgMZ4VjWMC6-1" vertex="1">&#xa;          <mxGeometry x="458" y="581" width="99" height="38" as="geometry"/>&#xa;        </mxCell>&#xa;        <mxCell id="EyTT8lpdAKgMZ4VjWMC6-21" value="&lt;div style=&quot;background-color: rgb(255, 255, 255); font-size: 17px;&quot;&gt;&lt;span style=&quot;font-size: 17px;&quot;&gt;UNDEPLOYING&lt;/span&gt;&lt;/div&gt;" style="text;whiteSpace=wrap;html=1;fontSize=17;fontStyle=1;fontFamily=Times New Roman;align=center;horizontal=1;fontColor=#CC00CC;" parent="EyTT8lpdAKgMZ4VjWMC6-1" vertex="1">&#xa;          <mxGeometry x="751" y="1007" width="99" height="38" as="geometry"/>&#xa;        </mxCell>&#xa;        <mxCell id="EyTT8lpdAKgMZ4VjWMC6-25" value="&lt;div style=&quot;background-color: rgb(255, 255, 255); font-size: 17px;&quot;&gt;&lt;span style=&quot;font-size: 17px;&quot;&gt;SMEUNDEPLOYED&lt;/span&gt;&lt;/div&gt;" style="text;whiteSpace=wrap;html=1;fontSize=17;fontStyle=1;fontFamily=Times New Roman;align=center;horizontal=1;fontColor=#CC00CC;" parent="EyTT8lpdAKgMZ4VjWMC6-1" vertex="1">&#xa;          <mxGeometry x="748" y="1223" width="99" height="38" as="geometry"/>&#xa;        </mxCell>&#xa;        <mxCell id="EyTT8lpdAKgMZ4VjWMC6-26" value="&lt;div style=&quot;background-color: rgb(255, 255, 255); font-size: 17px;&quot;&gt;&lt;span style=&quot;font-size: 17px;&quot;&gt;ACMUNDEPLOYED&lt;/span&gt;&lt;/div&gt;" style="text;whiteSpace=wrap;html=1;fontSize=17;fontStyle=1;fontFamily=Times New Roman;align=center;horizontal=1;fontColor=#CC00CC;" parent="EyTT8lpdAKgMZ4VjWMC6-1" vertex="1">&#xa;          <mxGeometry x="656" y="1179" width="99" height="38" as="geometry"/>&#xa;        </mxCell>&#xa;        <mxCell id="EyTT8lpdAKgMZ4VjWMC6-28" value="&lt;span style=&quot;color: rgb(204, 0, 204); font-family: &amp;quot;Times New Roman&amp;quot;; font-size: 17px; font-style: normal; font-variant-ligatures: normal; font-variant-caps: normal; font-weight: 700; letter-spacing: normal; orphans: 2; text-align: center; text-indent: 0px; text-transform: none; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255); text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial; float: none; display: inline !important;&quot;&gt;SMEDEPLOYFAILED&lt;/span&gt;" style="text;whiteSpace=wrap;html=1;fontSize=16;" parent="EyTT8lpdAKgMZ4VjWMC6-1" vertex="1">&#xa;          <mxGeometry x="418.99855398995555" y="612.0028397042412" width="199" height="42" as="geometry"/>&#xa;        </mxCell>&#xa;        <mxCell id="EyTT8lpdAKgMZ4VjWMC6-29" value="&lt;span style=&quot;color: rgb(204, 0, 204); font-family: &amp;quot;Times New Roman&amp;quot;; font-size: 17px; font-style: normal; font-variant-ligatures: normal; font-variant-caps: normal; font-weight: 700; letter-spacing: normal; orphans: 2; text-align: center; text-indent: 0px; text-transform: none; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255); text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial; float: none; display: inline !important;&quot;&gt;SMEUNDEPLOYFAILED&lt;/span&gt;" style="text;whiteSpace=wrap;html=1;fontSize=16;" parent="EyTT8lpdAKgMZ4VjWMC6-1" vertex="1">&#xa;          <mxGeometry x="405.0042682756698" y="1015.9999825613841" width="223" height="42" as="geometry"/>&#xa;        </mxCell>&#xa;        <mxCell id="h__vrVu5-qu6cgSce-rx-1" value="" style="shape=link;html=1;rounded=0;fontSize=12;startSize=8;endSize=8;curved=1;" parent="EyTT8lpdAKgMZ4VjWMC6-1" edge="1">&#xa;          <mxGeometry width="100" relative="1" as="geometry">&#xa;            <mxPoint x="923.44" y="1286" as="sourcePoint"/>&#xa;            <mxPoint x="664.31" y="1284" as="targetPoint"/>&#xa;            <Array as="points">&#xa;              <mxPoint x="923.69" y="1286"/>&#xa;              <mxPoint x="799" y="1284"/>&#xa;            </Array>&#xa;          </mxGeometry>&#xa;        </mxCell>&#xa;        <mxCell id="SABqlHIYieWgqcJjw3hA-1" value="&lt;span style=&quot;color: rgb(204, 0, 204); font-family: &amp;quot;Times New Roman&amp;quot;; font-size: 17px; font-style: normal; font-variant-ligatures: normal; font-variant-caps: normal; font-weight: 700; letter-spacing: normal; orphans: 2; text-align: center; text-indent: 0px; text-transform: none; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255); text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial; float: none; display: inline !important;&quot;&gt;DMEDEPLOYFAILED&lt;/span&gt;" style="text;whiteSpace=wrap;html=1;fontSize=16;" vertex="1" parent="EyTT8lpdAKgMZ4VjWMC6-1">&#xa;          <mxGeometry x="418.99855398995555" y="647.0028397042412" width="199" height="42" as="geometry"/>&#xa;        </mxCell>&#xa;        <mxCell id="SABqlHIYieWgqcJjw3hA-2" value="&lt;div style=&quot;background-color: rgb(255, 255, 255); font-size: 17px;&quot;&gt;&lt;span style=&quot;font-size: 17px;&quot;&gt;DMEUNDEPLOYFAILED&lt;/span&gt;&lt;/div&gt;" style="text;whiteSpace=wrap;html=1;fontSize=17;fontStyle=1;fontFamily=Times New Roman;align=center;horizontal=1;fontColor=#CC00CC;" vertex="1" parent="EyTT8lpdAKgMZ4VjWMC6-1">&#xa;          <mxGeometry x="458" y="1048" width="99" height="38" as="geometry"/>&#xa;        </mxCell>&#xa;        <mxCell id="SABqlHIYieWgqcJjw3hA-7" value="&lt;div style=&quot;background-color: rgb(255, 255, 255); font-size: 17px;&quot;&gt;&lt;span style=&quot;font-size: 17px;&quot;&gt;DMEUNDEPLOYED&lt;/span&gt;&lt;/div&gt;" style="text;whiteSpace=wrap;html=1;fontSize=17;fontStyle=1;fontFamily=Times New Roman;align=center;horizontal=1;fontColor=#CC00CC;" vertex="1" parent="EyTT8lpdAKgMZ4VjWMC6-1">&#xa;          <mxGeometry x="829" y="1179" width="99" height="38" as="geometry"/>&#xa;        </mxCell>&#xa;        <mxCell id="SABqlHIYieWgqcJjw3hA-11" value="" style="curved=1;endArrow=classic;html=1;rounded=0;fontSize=12;startSize=8;endSize=8;entryX=1;entryY=0.5;entryDx=0;entryDy=0;dashed=1;" edge="1" parent="EyTT8lpdAKgMZ4VjWMC6-1">&#xa;          <mxGeometry width="50" height="50" relative="1" as="geometry">&#xa;            <mxPoint x="797" y="1285" as="sourcePoint"/>&#xa;            <mxPoint x="853" y="561" as="targetPoint"/>&#xa;            <Array as="points">&#xa;              <mxPoint x="1024" y="1387"/>&#xa;              <mxPoint x="1019" y="737"/>&#xa;            </Array>&#xa;          </mxGeometry>&#xa;        </mxCell>&#xa;        <mxCell id="SABqlHIYieWgqcJjw3hA-16" value="" style="shape=link;html=1;rounded=0;fontSize=12;startSize=8;endSize=8;curved=1;" edge="1" parent="EyTT8lpdAKgMZ4VjWMC6-1">&#xa;          <mxGeometry width="100" relative="1" as="geometry">&#xa;            <mxPoint x="923.44" y="868" as="sourcePoint"/>&#xa;            <mxPoint x="664.31" y="866" as="targetPoint"/>&#xa;            <Array as="points">&#xa;              <mxPoint x="923.69" y="868"/>&#xa;            </Array>&#xa;          </mxGeometry>&#xa;        </mxCell>&#xa;        <mxCell id="SABqlHIYieWgqcJjw3hA-23" value="&lt;div style=&quot;background-color: rgb(255, 255, 255); font-size: 17px;&quot;&gt;&lt;span style=&quot;font-size: 17px;&quot;&gt;DMEDEPLOYED&lt;/span&gt;&lt;/div&gt;" style="text;whiteSpace=wrap;html=1;fontSize=17;fontStyle=1;fontFamily=Times New Roman;align=center;horizontal=1;fontColor=#CC00CC;" vertex="1" parent="EyTT8lpdAKgMZ4VjWMC6-1">&#xa;          <mxGeometry x="823" y="767" width="99" height="38" as="geometry"/>&#xa;        </mxCell>&#xa;        <mxCell id="SABqlHIYieWgqcJjw3hA-25" value="" style="endArrow=classic;html=1;rounded=0;fontSize=12;startSize=8;endSize=8;curved=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;dashed=1;" edge="1" parent="EyTT8lpdAKgMZ4VjWMC6-1" target="EyTT8lpdAKgMZ4VjWMC6-5">&#xa;          <mxGeometry width="50" height="50" relative="1" as="geometry">&#xa;            <mxPoint x="794" y="869" as="sourcePoint"/>&#xa;            <mxPoint x="702" y="962" as="targetPoint"/>&#xa;          </mxGeometry>&#xa;        </mxCell>&#xa;      </root>&#xa;    </mxGraphModel>&#xa;  </diagram><diagram id="iqw_mrV9lKbJkvdqUL_S" name="Entity Relationship"><mxGraphModel dx="669" dy="1053" grid="0" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="0" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0"><root><mxCell id="0"/><mxCell id="1" parent="0"/><mxCell id="MwSbNYkhp2zP1ZTl8Bha-4" value="rApp Instance" style="rounded=1;arcSize=10;whiteSpace=wrap;html=1;align=center;fontSize=16;fillColor=#f8cecc;strokeColor=#b85450;glass=0;shadow=0;" parent="1" vertex="1"><mxGeometry x="818" y="141" width="100" height="40" as="geometry"/></mxCell><mxCell id="MwSbNYkhp2zP1ZTl8Bha-5" value="rApp" style="rounded=1;arcSize=10;whiteSpace=wrap;html=1;align=center;fontSize=16;fillColor=#f8cecc;strokeColor=#b85450;glass=0;shadow=0;" parent="1" vertex="1"><mxGeometry x="75" y="141" width="105" height="40" as="geometry"/></mxCell><mxCell id="MwSbNYkhp2zP1ZTl8Bha-6" value="ACM Composition" style="rounded=1;arcSize=10;whiteSpace=wrap;html=1;align=center;fontSize=16;fillColor=#ffe6cc;strokeColor=#d79b00;glass=0;shadow=0;" parent="1" vertex="1"><mxGeometry x="421" y="-226" width="100" height="40" as="geometry"/></mxCell><mxCell id="MwSbNYkhp2zP1ZTl8Bha-7" value="ACM Composition&lt;br&gt;Instance" style="rounded=1;arcSize=10;whiteSpace=wrap;html=1;align=center;fontSize=16;fillColor=#ffe6cc;strokeColor=#d79b00;glass=0;shadow=0;" parent="1" vertex="1"><mxGeometry x="416" y="-139" width="100" height="62" as="geometry"/></mxCell><mxCell id="MwSbNYkhp2zP1ZTl8Bha-11" value="DME&lt;br style=&quot;border-color: var(--border-color);&quot;&gt;Info Producer" style="rounded=1;arcSize=10;whiteSpace=wrap;html=1;align=center;fontSize=16;fillColor=#ffff88;strokeColor=#36393d;glass=0;shadow=0;" parent="1" vertex="1"><mxGeometry x="416" y="-34" width="100" height="49" as="geometry"/></mxCell><mxCell id="MwSbNYkhp2zP1ZTl8Bha-13" value="SME Provider" style="rounded=1;arcSize=10;whiteSpace=wrap;html=1;align=center;fontSize=16;fillColor=#dae8fc;strokeColor=#6c8ebf;glass=0;shadow=0;" parent="1" vertex="1"><mxGeometry x="421" y="234" width="100" height="40" as="geometry"/></mxCell><mxCell id="MwSbNYkhp2zP1ZTl8Bha-14" value="SME &lt;br&gt;Service Api" style="rounded=1;arcSize=10;whiteSpace=wrap;html=1;align=center;fontSize=16;fillColor=#dae8fc;strokeColor=#6c8ebf;glass=0;shadow=0;" parent="1" vertex="1"><mxGeometry x="421" y="311" width="100" height="40" as="geometry"/></mxCell><mxCell id="MwSbNYkhp2zP1ZTl8Bha-15" value="" style="edgeStyle=orthogonalEdgeStyle;fontSize=12;html=1;endArrow=ERoneToMany;rounded=0;startSize=8;endSize=8;curved=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.006;entryY=0.384;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="MwSbNYkhp2zP1ZTl8Bha-5" target="MwSbNYkhp2zP1ZTl8Bha-7" edge="1"><mxGeometry width="100" height="100" relative="1" as="geometry"><mxPoint x="310" y="250" as="sourcePoint"/><mxPoint x="200" y="64" as="targetPoint"/></mxGeometry></mxCell><mxCell id="MwSbNYkhp2zP1ZTl8Bha-17" value="1..N" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=16;" parent="MwSbNYkhp2zP1ZTl8Bha-15" vertex="1" connectable="0"><mxGeometry x="0.0469" y="3" relative="1" as="geometry"><mxPoint x="165" y="8" as="offset"/></mxGeometry></mxCell><mxCell id="MwSbNYkhp2zP1ZTl8Bha-20" value="" style="edgeStyle=orthogonalEdgeStyle;fontSize=12;html=1;endArrow=ERmandOne;startArrow=ERmandOne;rounded=0;startSize=8;endSize=8;curved=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="MwSbNYkhp2zP1ZTl8Bha-5" target="MwSbNYkhp2zP1ZTl8Bha-6" edge="1"><mxGeometry width="100" height="100" relative="1" as="geometry"><mxPoint x="310" y="250" as="sourcePoint"/><mxPoint x="410" y="150" as="targetPoint"/></mxGeometry></mxCell><mxCell id="MwSbNYkhp2zP1ZTl8Bha-21" value="1..1" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=16;" parent="1" vertex="1" connectable="0"><mxGeometry x="351.9982392983694" y="6.003039352585901" as="geometry"><mxPoint x="-30" y="-205" as="offset"/></mxGeometry></mxCell><mxCell id="MwSbNYkhp2zP1ZTl8Bha-22" value="" style="edgeStyle=orthogonalEdgeStyle;fontSize=12;html=1;endArrow=ERoneToMany;rounded=0;startSize=8;endSize=8;curved=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="MwSbNYkhp2zP1ZTl8Bha-5" target="MwSbNYkhp2zP1ZTl8Bha-11" edge="1"><mxGeometry width="100" height="100" relative="1" as="geometry"><mxPoint x="157" y="120" as="sourcePoint"/><mxPoint x="451.5" y="-6" as="targetPoint"/></mxGeometry></mxCell><mxCell id="MwSbNYkhp2zP1ZTl8Bha-23" value="1..N" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=16;" parent="MwSbNYkhp2zP1ZTl8Bha-22" vertex="1" connectable="0"><mxGeometry x="0.0469" y="3" relative="1" as="geometry"><mxPoint x="113" y="7" as="offset"/></mxGeometry></mxCell><mxCell id="MwSbNYkhp2zP1ZTl8Bha-24" value="" style="edgeStyle=orthogonalEdgeStyle;fontSize=12;html=1;endArrow=ERoneToMany;rounded=0;startSize=8;endSize=8;curved=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" parent="1" source="MwSbNYkhp2zP1ZTl8Bha-5" target="MwSbNYkhp2zP1ZTl8Bha-13" edge="1"><mxGeometry width="100" height="100" relative="1" as="geometry"><mxPoint x="174" y="237" as="sourcePoint"/><mxPoint x="352" y="348" as="targetPoint"/></mxGeometry></mxCell><mxCell id="MwSbNYkhp2zP1ZTl8Bha-25" value="1..N" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=16;" parent="MwSbNYkhp2zP1ZTl8Bha-24" vertex="1" connectable="0"><mxGeometry x="0.0469" y="3" relative="1" as="geometry"><mxPoint x="68" y="-6" as="offset"/></mxGeometry></mxCell><mxCell id="MwSbNYkhp2zP1ZTl8Bha-26" value="" style="edgeStyle=orthogonalEdgeStyle;fontSize=12;html=1;endArrow=ERoneToMany;rounded=0;startSize=8;endSize=8;curved=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="MwSbNYkhp2zP1ZTl8Bha-5" target="MwSbNYkhp2zP1ZTl8Bha-14" edge="1"><mxGeometry width="100" height="100" relative="1" as="geometry"><mxPoint x="130.99999999999994" y="251.99999999999994" as="sourcePoint"/><mxPoint x="372.21" y="421.2" as="targetPoint"/></mxGeometry></mxCell><mxCell id="MwSbNYkhp2zP1ZTl8Bha-27" value="1..N" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=16;" parent="MwSbNYkhp2zP1ZTl8Bha-26" vertex="1" connectable="0"><mxGeometry x="0.0469" y="3" relative="1" as="geometry"><mxPoint x="102" y="-10" as="offset"/></mxGeometry></mxCell><mxCell id="MwSbNYkhp2zP1ZTl8Bha-28" value="" style="edgeStyle=orthogonalEdgeStyle;fontSize=12;html=1;endArrow=ERoneToMany;rounded=0;startSize=8;endSize=8;curved=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="MwSbNYkhp2zP1ZTl8Bha-5" target="MwSbNYkhp2zP1ZTl8Bha-4" edge="1"><mxGeometry width="100" height="100" relative="1" as="geometry"><mxPoint x="314" y="249" as="sourcePoint"/><mxPoint x="414" y="149" as="targetPoint"/></mxGeometry></mxCell><mxCell id="MwSbNYkhp2zP1ZTl8Bha-29" value="1..N" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=16;" parent="1" vertex="1" connectable="0"><mxGeometry x="382.9968503216668" y="228.00044469513193" as="geometry"><mxPoint x="84" y="-70" as="offset"/></mxGeometry></mxCell><mxCell id="MwSbNYkhp2zP1ZTl8Bha-30" value="" style="edgeStyle=orthogonalEdgeStyle;fontSize=12;html=1;endArrow=ERmandOne;startArrow=ERmandOne;rounded=0;startSize=8;endSize=8;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;curved=1;" parent="1" source="MwSbNYkhp2zP1ZTl8Bha-6" target="MwSbNYkhp2zP1ZTl8Bha-4" edge="1"><mxGeometry width="100" height="100" relative="1" as="geometry"><mxPoint x="561" y="46" as="sourcePoint"/><mxPoint x="739" y="-100" as="targetPoint"/></mxGeometry></mxCell><mxCell id="MwSbNYkhp2zP1ZTl8Bha-31" value="" style="edgeStyle=orthogonalEdgeStyle;fontSize=12;html=1;endArrow=ERmandOne;startArrow=ERmandOne;rounded=0;startSize=8;endSize=8;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;curved=1;" parent="1" source="MwSbNYkhp2zP1ZTl8Bha-7" target="MwSbNYkhp2zP1ZTl8Bha-4" edge="1"><mxGeometry width="100" height="100" relative="1" as="geometry"><mxPoint x="543" y="78" as="sourcePoint"/><mxPoint x="718" y="224" as="targetPoint"/></mxGeometry></mxCell><mxCell id="MwSbNYkhp2zP1ZTl8Bha-32" value="" style="edgeStyle=orthogonalEdgeStyle;fontSize=12;html=1;endArrow=ERmandOne;startArrow=ERmandOne;rounded=0;startSize=8;endSize=8;curved=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="MwSbNYkhp2zP1ZTl8Bha-11" target="MwSbNYkhp2zP1ZTl8Bha-4" edge="1"><mxGeometry width="100" height="100" relative="1" as="geometry"><mxPoint x="551" y="210" as="sourcePoint"/><mxPoint x="728" y="268" as="targetPoint"/></mxGeometry></mxCell><mxCell id="MwSbNYkhp2zP1ZTl8Bha-33" value="" style="edgeStyle=orthogonalEdgeStyle;fontSize=12;html=1;endArrow=ERmandOne;startArrow=ERmandOne;rounded=0;startSize=8;endSize=8;curved=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" parent="1" source="MwSbNYkhp2zP1ZTl8Bha-13" target="MwSbNYkhp2zP1ZTl8Bha-4" edge="1"><mxGeometry width="100" height="100" relative="1" as="geometry"><mxPoint x="569" y="296" as="sourcePoint"/><mxPoint x="746" y="354" as="targetPoint"/></mxGeometry></mxCell><mxCell id="MwSbNYkhp2zP1ZTl8Bha-34" value="" style="edgeStyle=orthogonalEdgeStyle;fontSize=12;html=1;endArrow=ERmandOne;startArrow=ERmandOne;rounded=0;startSize=8;endSize=8;curved=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="MwSbNYkhp2zP1ZTl8Bha-14" target="MwSbNYkhp2zP1ZTl8Bha-4" edge="1"><mxGeometry width="100" height="100" relative="1" as="geometry"><mxPoint x="571" y="364" as="sourcePoint"/><mxPoint x="690" y="184" as="targetPoint"/></mxGeometry></mxCell><mxCell id="MwSbNYkhp2zP1ZTl8Bha-36" value="1..1" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=16;" parent="1" vertex="1" connectable="0"><mxGeometry x="624.9982392983694" y="-3.996960647414099" as="geometry"><mxPoint x="-13" y="-9" as="offset"/></mxGeometry></mxCell><mxCell id="MwSbNYkhp2zP1ZTl8Bha-37" value="1..1" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=16;" parent="1" vertex="1" connectable="0"><mxGeometry x="624.9982392983694" y="257.0030393525859" as="geometry"><mxPoint x="-13" y="-9" as="offset"/></mxGeometry></mxCell><mxCell id="MwSbNYkhp2zP1ZTl8Bha-38" value="1..1" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=16;" parent="1" vertex="1" connectable="0"><mxGeometry x="624.9982392983694" y="333.0030393525859" as="geometry"><mxPoint x="-13" y="-9" as="offset"/></mxGeometry></mxCell><mxCell id="5RuYRl4ZCnVYUHxBw5YV-1" value="SME&amp;nbsp;&lt;br&gt;Invoker" style="rounded=1;arcSize=10;whiteSpace=wrap;html=1;align=center;fontSize=16;fillColor=#cce5ff;strokeColor=#36393d;glass=0;shadow=0;" parent="1" vertex="1"><mxGeometry x="421" y="396" width="100" height="40" as="geometry"/></mxCell><mxCell id="5RuYRl4ZCnVYUHxBw5YV-2" value="DME &lt;br&gt;Info Consumer" style="rounded=1;arcSize=10;whiteSpace=wrap;html=1;align=center;fontSize=16;fillColor=#ffff88;strokeColor=#36393d;glass=0;shadow=0;" parent="1" vertex="1"><mxGeometry x="421" y="42" width="100" height="62" as="geometry"/></mxCell><mxCell id="5RuYRl4ZCnVYUHxBw5YV-3" value="" style="edgeStyle=orthogonalEdgeStyle;fontSize=12;html=1;endArrow=ERmandOne;startArrow=ERmandOne;rounded=0;startSize=8;endSize=8;curved=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="5RuYRl4ZCnVYUHxBw5YV-2" target="MwSbNYkhp2zP1ZTl8Bha-4" edge="1"><mxGeometry width="100" height="100" relative="1" as="geometry"><mxPoint x="523" y="516" as="sourcePoint"/><mxPoint x="696" y="179" as="targetPoint"/></mxGeometry></mxCell><mxCell id="5RuYRl4ZCnVYUHxBw5YV-4" value="" style="edgeStyle=orthogonalEdgeStyle;fontSize=12;html=1;endArrow=ERmandOne;startArrow=ERmandOne;rounded=0;startSize=8;endSize=8;curved=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" parent="1" source="5RuYRl4ZCnVYUHxBw5YV-1" target="MwSbNYkhp2zP1ZTl8Bha-4" edge="1"><mxGeometry width="100" height="100" relative="1" as="geometry"><mxPoint x="533" y="526" as="sourcePoint"/><mxPoint x="697" y="185" as="targetPoint"/></mxGeometry></mxCell><mxCell id="5RuYRl4ZCnVYUHxBw5YV-5" value="1..1" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=16;" parent="1" vertex="1" connectable="0"><mxGeometry x="624.9982392983694" y="416.0030393525859" as="geometry"><mxPoint x="-13" y="-9" as="offset"/></mxGeometry></mxCell><mxCell id="5RuYRl4ZCnVYUHxBw5YV-7" value="" style="edgeStyle=orthogonalEdgeStyle;fontSize=12;html=1;endArrow=ERoneToMany;rounded=0;startSize=8;endSize=8;curved=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="MwSbNYkhp2zP1ZTl8Bha-5" target="5RuYRl4ZCnVYUHxBw5YV-1" edge="1"><mxGeometry width="100" height="100" relative="1" as="geometry"><mxPoint x="90" y="288" as="sourcePoint"/><mxPoint x="270" y="476" as="targetPoint"/></mxGeometry></mxCell><mxCell id="5RuYRl4ZCnVYUHxBw5YV-8" value="1..N" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=16;" parent="5RuYRl4ZCnVYUHxBw5YV-7" vertex="1" connectable="0"><mxGeometry x="0.0469" y="3" relative="1" as="geometry"><mxPoint x="137" y="-14" as="offset"/></mxGeometry></mxCell><mxCell id="5RuYRl4ZCnVYUHxBw5YV-9" value="" style="edgeStyle=orthogonalEdgeStyle;fontSize=12;html=1;endArrow=ERoneToMany;rounded=0;startSize=8;endSize=8;curved=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="MwSbNYkhp2zP1ZTl8Bha-5" target="5RuYRl4ZCnVYUHxBw5YV-2" edge="1"><mxGeometry width="100" height="100" relative="1" as="geometry"><mxPoint x="170" y="202" as="sourcePoint"/><mxPoint x="464.5" y="136" as="targetPoint"/></mxGeometry></mxCell><mxCell id="5RuYRl4ZCnVYUHxBw5YV-10" value="1..N" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=16;" parent="5RuYRl4ZCnVYUHxBw5YV-9" vertex="1" connectable="0"><mxGeometry x="0.0469" y="3" relative="1" as="geometry"><mxPoint x="70" y="3" as="offset"/></mxGeometry></mxCell><mxCell id="5RuYRl4ZCnVYUHxBw5YV-13" value="1..1" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=16;" parent="1" vertex="1" connectable="0"><mxGeometry x="624.9982392983694" y="77.0030393525859" as="geometry"><mxPoint x="-13" y="-9" as="offset"/></mxGeometry></mxCell><mxCell id="5RuYRl4ZCnVYUHxBw5YV-14" value="1..1" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=16;" parent="1" vertex="1" connectable="0"><mxGeometry x="624.9982392983694" y="-191.99696064741408" as="geometry"><mxPoint x="-13" y="-9" as="offset"/></mxGeometry></mxCell><mxCell id="5RuYRl4ZCnVYUHxBw5YV-15" value="1..1" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=16;" parent="1" vertex="1" connectable="0"><mxGeometry x="626.9982392983694" y="-101.99696064741408" as="geometry"><mxPoint x="-13" y="-9" as="offset"/></mxGeometry></mxCell></root></mxGraphModel></diagram></mxfile>
+\ No newline at end of file
diff --git a/docs/drawio/rapp-manager.drawio b/docs/drawio/rapp-manager.drawio

deleted file mode 100755 (executable)

index 25a2419..0000000
--- a/docs/drawio/rapp-manager.drawio
+++ /dev/null
@@ -1,439 +0,0 @@
-<mxfile host="Electron" modified="2023-07-28T09:27:43.207Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/21.6.5 Chrome/114.0.5735.243 Electron/25.3.1 Safari/537.36" etag="zI_o3S6yMMhHybAjjMN1" version="21.6.5" type="device" pages="5">
-  <diagram name="Architecture" id="17ScgUcGnw9kMPdYQ0jm">
-    <mxGraphModel dx="1438" dy="1058" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="0" pageScale="1" pageWidth="827" pageHeight="1169" background="none" math="0" shadow="0">
-      <root>
-        <mxCell id="0" />
-        <mxCell id="1" parent="0" />
-        <mxCell id="KdB-_tFk0e3cPOdDlfYL-3" value="" style="rounded=0;whiteSpace=wrap;html=1;fontSize=16;shadow=0;glass=0;dashed=1;dashPattern=1 2;" parent="1" vertex="1">
-          <mxGeometry x="260.5" y="100" width="279.5" height="265.5" as="geometry" />
-        </mxCell>
-        <mxCell id="IMkn7QF7C7UZfDmJMlh3-10" value="" style="rounded=0;whiteSpace=wrap;html=1;fontSize=16;shadow=0;glass=0;dashed=1;dashPattern=1 2;" parent="1" vertex="1">
-          <mxGeometry x="-350" y="100" width="535" height="264" as="geometry" />
-        </mxCell>
-        <mxCell id="IMkn7QF7C7UZfDmJMlh3-1" value="ACM Runtime" style="rounded=1;whiteSpace=wrap;html=1;fontSize=16;fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
-          <mxGeometry x="-149" y="124" width="120" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="IMkn7QF7C7UZfDmJMlh3-17" style="edgeStyle=none;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fontSize=12;startSize=8;endSize=8;" parent="1" source="IMkn7QF7C7UZfDmJMlh3-2" target="IMkn7QF7C7UZfDmJMlh3-1" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="KdB-_tFk0e3cPOdDlfYL-4" style="edgeStyle=none;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;fontSize=12;startSize=8;endSize=8;" parent="1" source="IMkn7QF7C7UZfDmJMlh3-2" target="IMkn7QF7C7UZfDmJMlh3-22" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="IMkn7QF7C7UZfDmJMlh3-2" value="rApp Manager" style="rounded=1;whiteSpace=wrap;html=1;fontSize=16;fillColor=#b0e3e6;strokeColor=#0e8088;" parent="1" vertex="1">
-          <mxGeometry x="125" y="-100" width="122" height="63" as="geometry" />
-        </mxCell>
-        <mxCell id="IMkn7QF7C7UZfDmJMlh3-3" value="Kubernetes Participant" style="rounded=1;whiteSpace=wrap;html=1;fontSize=16;fillColor=#dae8fc;strokeColor=#6c8ebf;" parent="1" vertex="1">
-          <mxGeometry x="-305" y="268" width="120" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="IMkn7QF7C7UZfDmJMlh3-4" value="A1PMS Participant" style="rounded=1;whiteSpace=wrap;html=1;fontSize=16;fillColor=#dae8fc;strokeColor=#6c8ebf;" parent="1" vertex="1">
-          <mxGeometry x="-149" y="268" width="120" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="IMkn7QF7C7UZfDmJMlh3-5" value="Kserve Participant" style="rounded=1;whiteSpace=wrap;html=1;fontSize=16;fillColor=#dae8fc;strokeColor=#6c8ebf;" parent="1" vertex="1">
-          <mxGeometry x="48" y="268" width="120" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="KdB-_tFk0e3cPOdDlfYL-5" style="edgeStyle=none;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;fontSize=12;startSize=8;endSize=8;" parent="1" source="IMkn7QF7C7UZfDmJMlh3-6" target="IMkn7QF7C7UZfDmJMlh3-2" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="IMkn7QF7C7UZfDmJMlh3-6" value="API User" style="shape=umlActor;verticalLabelPosition=top;verticalAlign=bottom;html=1;outlineConnect=0;fontSize=16;labelPosition=center;align=center;" parent="1" vertex="1">
-          <mxGeometry x="-170" y="-97" width="30" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="IMkn7QF7C7UZfDmJMlh3-7" value="" style="endArrow=classic;startArrow=classic;html=1;rounded=0;fontSize=12;startSize=8;endSize=8;curved=1;" parent="1" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="-141" y="184" as="sourcePoint" />
-            <mxPoint x="-245" y="265" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="IMkn7QF7C7UZfDmJMlh3-8" value="" style="endArrow=classic;startArrow=classic;html=1;rounded=0;fontSize=12;startSize=8;endSize=8;curved=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" target="IMkn7QF7C7UZfDmJMlh3-4" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="-90" y="184" as="sourcePoint" />
-            <mxPoint x="-194" y="265" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="IMkn7QF7C7UZfDmJMlh3-9" value="" style="endArrow=classic;startArrow=classic;html=1;rounded=0;fontSize=12;startSize=8;endSize=8;curved=1;entryX=0.944;entryY=0.939;entryDx=0;entryDy=0;entryPerimeter=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" parent="1" source="IMkn7QF7C7UZfDmJMlh3-5" target="IMkn7QF7C7UZfDmJMlh3-1" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="278" y="146" as="sourcePoint" />
-            <mxPoint x="174" y="227" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="IMkn7QF7C7UZfDmJMlh3-11" value="ACM" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=16;" parent="1" vertex="1">
-          <mxGeometry x="125" y="100" width="60" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="IMkn7QF7C7UZfDmJMlh3-13" value="" style="endArrow=none;dashed=1;html=1;rounded=0;fontSize=12;startSize=8;endSize=8;curved=1;dashPattern=1 2;" parent="1" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="-16" y="301" as="sourcePoint" />
-            <mxPoint x="36" y="301" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="IMkn7QF7C7UZfDmJMlh3-18" value="Keycloak" style="rounded=1;whiteSpace=wrap;html=1;fontSize=16;fillColor=#e1d5e7;strokeColor=#9673a6;" parent="1" vertex="1">
-          <mxGeometry x="330" y="261.5" width="120" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="IMkn7QF7C7UZfDmJMlh3-22" value="CAPIF" style="rounded=1;whiteSpace=wrap;html=1;fontSize=16;fillColor=#e1d5e7;strokeColor=#9673a6;" parent="1" vertex="1">
-          <mxGeometry x="330" y="135.5" width="120" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="IMkn7QF7C7UZfDmJMlh3-24" value="" style="rounded=0;whiteSpace=wrap;html=1;fontSize=16;fillColor=#f5f5f5;fontColor=#333333;strokeColor=#666666;" parent="1" vertex="1">
-          <mxGeometry x="690" y="-280" width="298" height="130" as="geometry" />
-        </mxCell>
-        <mxCell id="IMkn7QF7C7UZfDmJMlh3-25" value="SME" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=16;" parent="1" vertex="1">
-          <mxGeometry x="470" y="105.5" width="60" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="HdeRTKC2PSPPZ0eF_beT-1" value="Rapp Catalogue" style="rounded=1;whiteSpace=wrap;html=1;fontSize=16;fillColor=#e1d5e7;strokeColor=#9673a6;" parent="1" vertex="1">
-          <mxGeometry x="790" y="-120" width="120" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="IMkn7QF7C7UZfDmJMlh3-26" value="DME" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=16;" parent="1" vertex="1">
-          <mxGeometry x="690" y="-280" width="60" height="30" as="geometry" />
-        </mxCell>
-      </root>
-    </mxGraphModel>
-  </diagram>
-  <diagram id="5WbYrmaVoOUk7OSHm8GO" name="rApp-States">
-    <mxGraphModel dx="650" dy="271" grid="0" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="0" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
-      <root>
-        <mxCell id="0" />
-        <mxCell id="1" parent="0" />
-        <mxCell id="OlEAaxTOH4qE6BNT9p8g-16" style="edgeStyle=none;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fontSize=12;startSize=8;endSize=8;" parent="1" source="kaBHNdDOut0HFUkxyrMo-2" target="OlEAaxTOH4qE6BNT9p8g-2" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="kaBHNdDOut0HFUkxyrMo-2" value="PRIMING" style="rounded=1;whiteSpace=wrap;html=1;fontSize=16;fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
-          <mxGeometry x="734" y="763" width="120" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="SM-95HUsG2i_VOHMoe33-1" style="edgeStyle=none;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;fontSize=12;startSize=8;endSize=8;" parent="1" source="kaBHNdDOut0HFUkxyrMo-3" target="OlEAaxTOH4qE6BNT9p8g-1" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="1153" y="850" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="kaBHNdDOut0HFUkxyrMo-3" value="DEPRIMING" style="rounded=1;whiteSpace=wrap;html=1;fontSize=16;fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
-          <mxGeometry x="734" y="985" width="120" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="OlEAaxTOH4qE6BNT9p8g-15" style="edgeStyle=none;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fontSize=12;startSize=8;endSize=8;" parent="1" source="OlEAaxTOH4qE6BNT9p8g-1" target="kaBHNdDOut0HFUkxyrMo-2" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="OlEAaxTOH4qE6BNT9p8g-1" value="COMMISSIONED" style="rounded=1;whiteSpace=wrap;html=1;fontSize=16;fillColor=#60a917;strokeColor=#2D7600;fontColor=#ffffff;" parent="1" vertex="1">
-          <mxGeometry x="726" y="659" width="136" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="OlEAaxTOH4qE6BNT9p8g-17" style="edgeStyle=none;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;fontSize=12;startSize=8;endSize=8;" parent="1" source="OlEAaxTOH4qE6BNT9p8g-2" target="kaBHNdDOut0HFUkxyrMo-3" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="OlEAaxTOH4qE6BNT9p8g-2" value="PRIMED" style="rounded=1;whiteSpace=wrap;html=1;fontSize=16;fillColor=#60a917;strokeColor=#2D7600;fontColor=#ffffff;" parent="1" vertex="1">
-          <mxGeometry x="734" y="874" width="120" height="60" as="geometry" />
-        </mxCell>
-      </root>
-    </mxGraphModel>
-  </diagram>
-  <diagram name="rApp Instance States" id="4tHQkv6kBpBhb85iWkPI">
-    <mxGraphModel dx="650" dy="271" grid="0" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="0" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
-      <root>
-        <mxCell id="TQWpiqcAljcXlIxfPDRo-0" />
-        <mxCell id="TQWpiqcAljcXlIxfPDRo-1" parent="TQWpiqcAljcXlIxfPDRo-0" />
-        <mxCell id="TQWpiqcAljcXlIxfPDRo-4" style="edgeStyle=none;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fontSize=12;startSize=8;endSize=8;" parent="TQWpiqcAljcXlIxfPDRo-1" source="TQWpiqcAljcXlIxfPDRo-5" target="TQWpiqcAljcXlIxfPDRo-12" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="TQWpiqcAljcXlIxfPDRo-5" value="DEPLOYED" style="rounded=1;whiteSpace=wrap;html=1;fontSize=16;fillColor=#60a917;strokeColor=#2D7600;fontColor=#ffffff;" parent="TQWpiqcAljcXlIxfPDRo-1" vertex="1">
-          <mxGeometry x="734" y="763" width="120" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="htJC7knH3mB6ENcDUvvf-0" style="edgeStyle=none;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.997;entryY=0.62;entryDx=0;entryDy=0;entryPerimeter=0;fontSize=12;startSize=8;endSize=8;" parent="TQWpiqcAljcXlIxfPDRo-1" source="TQWpiqcAljcXlIxfPDRo-6" target="TQWpiqcAljcXlIxfPDRo-9" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="1100" y="810" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="TQWpiqcAljcXlIxfPDRo-6" value="UNDEPLOYED" style="rounded=1;whiteSpace=wrap;html=1;fontSize=16;fillColor=#60a917;strokeColor=#2D7600;fontColor=#ffffff;" parent="TQWpiqcAljcXlIxfPDRo-1" vertex="1">
-          <mxGeometry x="734" y="985" width="120" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="TQWpiqcAljcXlIxfPDRo-7" style="edgeStyle=none;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fontSize=12;startSize=8;endSize=8;" parent="TQWpiqcAljcXlIxfPDRo-1" source="TQWpiqcAljcXlIxfPDRo-9" target="TQWpiqcAljcXlIxfPDRo-5" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="TQWpiqcAljcXlIxfPDRo-9" value="DEPLOYING" style="rounded=1;whiteSpace=wrap;html=1;fontSize=16;fillColor=#fff2cc;strokeColor=#d6b656;" parent="TQWpiqcAljcXlIxfPDRo-1" vertex="1">
-          <mxGeometry x="734" y="662" width="120" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="TQWpiqcAljcXlIxfPDRo-10" style="edgeStyle=none;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;fontSize=12;startSize=8;endSize=8;" parent="TQWpiqcAljcXlIxfPDRo-1" source="TQWpiqcAljcXlIxfPDRo-12" target="TQWpiqcAljcXlIxfPDRo-6" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="TQWpiqcAljcXlIxfPDRo-12" value="UNDEPLOYING" style="rounded=1;whiteSpace=wrap;html=1;fontSize=16;fillColor=#fff2cc;strokeColor=#d6b656;" parent="TQWpiqcAljcXlIxfPDRo-1" vertex="1">
-          <mxGeometry x="734" y="874" width="120" height="60" as="geometry" />
-        </mxCell>
-      </root>
-    </mxGraphModel>
-  </diagram>
-  <diagram name="rApp Instance Events" id="e8AQIz6e7eoNnJf5ZOEh">
-    <mxGraphModel dx="650" dy="271" grid="0" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="0" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
-      <root>
-        <mxCell id="EyTT8lpdAKgMZ4VjWMC6-0" />
-        <mxCell id="EyTT8lpdAKgMZ4VjWMC6-1" parent="EyTT8lpdAKgMZ4VjWMC6-0" />
-        <mxCell id="EyTT8lpdAKgMZ4VjWMC6-2" style="edgeStyle=none;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fontSize=12;startSize=8;endSize=8;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="EyTT8lpdAKgMZ4VjWMC6-1" source="EyTT8lpdAKgMZ4VjWMC6-3" target="EyTT8lpdAKgMZ4VjWMC6-8" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <mxPoint x="796" y="643" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="EyTT8lpdAKgMZ4VjWMC6-3" value="UNDEPLOYED" style="rounded=1;whiteSpace=wrap;html=1;fontSize=16;fillColor=#60a917;strokeColor=#2D7600;fontColor=#ffffff;" parent="EyTT8lpdAKgMZ4VjWMC6-1" vertex="1">
-          <mxGeometry x="733" y="530" width="120" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="EyTT8lpdAKgMZ4VjWMC6-4" style="edgeStyle=none;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fontSize=12;startSize=8;endSize=8;" parent="EyTT8lpdAKgMZ4VjWMC6-1" source="EyTT8lpdAKgMZ4VjWMC6-5" target="EyTT8lpdAKgMZ4VjWMC6-10" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="EyTT8lpdAKgMZ4VjWMC6-5" value="DEPLOYED" style="rounded=1;whiteSpace=wrap;html=1;fontSize=16;fillColor=#60a917;fontColor=#ffffff;strokeColor=#2D7600;" parent="EyTT8lpdAKgMZ4VjWMC6-1" vertex="1">
-          <mxGeometry x="734" y="872" width="120" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="h__vrVu5-qu6cgSce-rx-6" style="edgeStyle=none;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=-0.087;entryY=0.478;entryDx=0;entryDy=0;entryPerimeter=0;fontSize=12;startSize=8;endSize=8;" parent="EyTT8lpdAKgMZ4VjWMC6-1" source="EyTT8lpdAKgMZ4VjWMC6-8" target="EyTT8lpdAKgMZ4VjWMC6-3" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="496" y="649" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="EyTT8lpdAKgMZ4VjWMC6-8" value="DEPLOYING" style="rounded=1;whiteSpace=wrap;html=1;fontSize=16;fillColor=#fff2cc;strokeColor=#d6b656;" parent="EyTT8lpdAKgMZ4VjWMC6-1" vertex="1">
-          <mxGeometry x="734" y="662" width="120" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="h__vrVu5-qu6cgSce-rx-4" style="edgeStyle=none;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;fontSize=12;startSize=8;endSize=8;" parent="EyTT8lpdAKgMZ4VjWMC6-1" source="EyTT8lpdAKgMZ4VjWMC6-10" target="EyTT8lpdAKgMZ4VjWMC6-5" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="531" y="982" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="EyTT8lpdAKgMZ4VjWMC6-10" value="UNDEPLOYING" style="rounded=1;whiteSpace=wrap;html=1;fontSize=16;fillColor=#fff2cc;strokeColor=#d6b656;" parent="EyTT8lpdAKgMZ4VjWMC6-1" vertex="1">
-          <mxGeometry x="734" y="1008" width="120" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="EyTT8lpdAKgMZ4VjWMC6-12" value="&lt;div style=&quot;background-color: rgb(255, 255, 255); font-size: 17px;&quot;&gt;&lt;span style=&quot;font-size: 17px;&quot;&gt;DEPLOYING&lt;/span&gt;&lt;/div&gt;" style="text;whiteSpace=wrap;html=1;fontSize=17;fontStyle=1;fontFamily=Times New Roman;align=center;horizontal=1;fontColor=#CC00CC;" parent="EyTT8lpdAKgMZ4VjWMC6-1" vertex="1">
-          <mxGeometry x="740" y="600" width="99" height="38" as="geometry" />
-        </mxCell>
-        <mxCell id="EyTT8lpdAKgMZ4VjWMC6-13" value="" style="shape=link;html=1;rounded=0;fontSize=12;startSize=8;endSize=8;curved=1;" parent="EyTT8lpdAKgMZ4VjWMC6-1" edge="1">
-          <mxGeometry width="100" relative="1" as="geometry">
-            <mxPoint x="726.75" y="808" as="sourcePoint" />
-            <mxPoint x="861.25" y="808" as="targetPoint" />
-            <Array as="points">
-              <mxPoint x="796" y="808" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="EyTT8lpdAKgMZ4VjWMC6-14" value="" style="endArrow=classic;html=1;rounded=0;fontSize=12;startSize=8;endSize=8;curved=1;" parent="EyTT8lpdAKgMZ4VjWMC6-1" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="753" y="722" as="sourcePoint" />
-            <mxPoint x="753" y="805" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="EyTT8lpdAKgMZ4VjWMC6-15" value="" style="endArrow=classic;html=1;rounded=0;fontSize=12;startSize=8;endSize=8;curved=1;" parent="EyTT8lpdAKgMZ4VjWMC6-1" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="832" y="722" as="sourcePoint" />
-            <mxPoint x="832" y="805" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="EyTT8lpdAKgMZ4VjWMC6-16" value="&lt;div style=&quot;background-color: rgb(255, 255, 255); font-size: 17px;&quot;&gt;&lt;span style=&quot;font-size: 17px;&quot;&gt;SMEDEPLOYED&lt;/span&gt;&lt;/div&gt;" style="text;whiteSpace=wrap;html=1;fontSize=17;fontStyle=1;fontFamily=Times New Roman;align=center;horizontal=1;fontColor=#CC00CC;" parent="EyTT8lpdAKgMZ4VjWMC6-1" vertex="1">
-          <mxGeometry x="819" y="743" width="99" height="38" as="geometry" />
-        </mxCell>
-        <mxCell id="EyTT8lpdAKgMZ4VjWMC6-17" value="&lt;div style=&quot;background-color: rgb(255, 255, 255); font-size: 17px;&quot;&gt;&lt;span style=&quot;font-size: 17px;&quot;&gt;ACMDEPLOYED&lt;/span&gt;&lt;/div&gt;" style="text;whiteSpace=wrap;html=1;fontSize=17;fontStyle=1;fontFamily=Times New Roman;align=center;horizontal=1;fontColor=#CC00CC;" parent="EyTT8lpdAKgMZ4VjWMC6-1" vertex="1">
-          <mxGeometry x="676" y="743" width="99" height="38" as="geometry" />
-        </mxCell>
-        <mxCell id="EyTT8lpdAKgMZ4VjWMC6-18" style="edgeStyle=none;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fontSize=12;startSize=8;endSize=8;entryX=0.5;entryY=0;entryDx=0;entryDy=0;dashed=1;" parent="EyTT8lpdAKgMZ4VjWMC6-1" target="EyTT8lpdAKgMZ4VjWMC6-5" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <mxPoint x="793.5" y="810" as="sourcePoint" />
-            <mxPoint x="793.5" y="861" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="EyTT8lpdAKgMZ4VjWMC6-19" value="&lt;div style=&quot;background-color: rgb(255, 255, 255); font-size: 17px;&quot;&gt;&lt;span style=&quot;font-size: 17px;&quot;&gt;ACMUNDEPLOYFAILED&lt;/span&gt;&lt;/div&gt;" style="text;whiteSpace=wrap;html=1;fontSize=17;fontStyle=1;fontFamily=Times New Roman;align=center;horizontal=1;fontColor=#CC00CC;" parent="EyTT8lpdAKgMZ4VjWMC6-1" vertex="1">
-          <mxGeometry x="498" y="991" width="99" height="38" as="geometry" />
-        </mxCell>
-        <mxCell id="EyTT8lpdAKgMZ4VjWMC6-20" value="&lt;div style=&quot;background-color: rgb(255, 255, 255); font-size: 17px;&quot;&gt;&lt;span style=&quot;font-size: 17px;&quot;&gt;ACMDEPLOYFAILED&lt;/span&gt;&lt;/div&gt;" style="text;whiteSpace=wrap;html=1;fontSize=17;fontStyle=1;fontFamily=Times New Roman;align=center;horizontal=1;fontColor=#CC00CC;" parent="EyTT8lpdAKgMZ4VjWMC6-1" vertex="1">
-          <mxGeometry x="481" y="579" width="99" height="38" as="geometry" />
-        </mxCell>
-        <mxCell id="EyTT8lpdAKgMZ4VjWMC6-21" value="&lt;div style=&quot;background-color: rgb(255, 255, 255); font-size: 17px;&quot;&gt;&lt;span style=&quot;font-size: 17px;&quot;&gt;UNDEPLOYING&lt;/span&gt;&lt;/div&gt;" style="text;whiteSpace=wrap;html=1;fontSize=17;fontStyle=1;fontFamily=Times New Roman;align=center;horizontal=1;fontColor=#CC00CC;" parent="EyTT8lpdAKgMZ4VjWMC6-1" vertex="1">
-          <mxGeometry x="751" y="948" width="99" height="38" as="geometry" />
-        </mxCell>
-        <mxCell id="EyTT8lpdAKgMZ4VjWMC6-23" value="" style="endArrow=classic;html=1;rounded=0;fontSize=12;startSize=8;endSize=8;curved=1;" parent="EyTT8lpdAKgMZ4VjWMC6-1" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="854" y="1019" as="sourcePoint" />
-            <mxPoint x="1027" y="1019" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="EyTT8lpdAKgMZ4VjWMC6-25" value="&lt;div style=&quot;background-color: rgb(255, 255, 255); font-size: 17px;&quot;&gt;&lt;span style=&quot;font-size: 17px;&quot;&gt;SMEUNDEPLOYED&lt;/span&gt;&lt;/div&gt;" style="text;whiteSpace=wrap;html=1;fontSize=17;fontStyle=1;fontFamily=Times New Roman;align=center;horizontal=1;fontColor=#CC00CC;" parent="EyTT8lpdAKgMZ4VjWMC6-1" vertex="1">
-          <mxGeometry x="885" y="1054" width="99" height="38" as="geometry" />
-        </mxCell>
-        <mxCell id="EyTT8lpdAKgMZ4VjWMC6-26" value="&lt;div style=&quot;background-color: rgb(255, 255, 255); font-size: 17px;&quot;&gt;&lt;span style=&quot;font-size: 17px;&quot;&gt;ACMUNDEPLOYED&lt;/span&gt;&lt;/div&gt;" style="text;whiteSpace=wrap;html=1;fontSize=17;fontStyle=1;fontFamily=Times New Roman;align=center;horizontal=1;fontColor=#CC00CC;" parent="EyTT8lpdAKgMZ4VjWMC6-1" vertex="1">
-          <mxGeometry x="885" y="986" width="99" height="38" as="geometry" />
-        </mxCell>
-        <mxCell id="EyTT8lpdAKgMZ4VjWMC6-28" value="&lt;span style=&quot;color: rgb(204, 0, 204); font-family: &amp;quot;Times New Roman&amp;quot;; font-size: 17px; font-style: normal; font-variant-ligatures: normal; font-variant-caps: normal; font-weight: 700; letter-spacing: normal; orphans: 2; text-align: center; text-indent: 0px; text-transform: none; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255); text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial; float: none; display: inline !important;&quot;&gt;SMEDEPLOYFAILED&lt;/span&gt;" style="text;whiteSpace=wrap;html=1;fontSize=16;" parent="EyTT8lpdAKgMZ4VjWMC6-1" vertex="1">
-          <mxGeometry x="439.99855398995555" y="655.0028397042412" width="199" height="42" as="geometry" />
-        </mxCell>
-        <mxCell id="EyTT8lpdAKgMZ4VjWMC6-29" value="&lt;span style=&quot;color: rgb(204, 0, 204); font-family: &amp;quot;Times New Roman&amp;quot;; font-size: 17px; font-style: normal; font-variant-ligatures: normal; font-variant-caps: normal; font-weight: 700; letter-spacing: normal; orphans: 2; text-align: center; text-indent: 0px; text-transform: none; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255); text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial; float: none; display: inline !important;&quot;&gt;SMEUNDEPLOYFAILED&lt;/span&gt;" style="text;whiteSpace=wrap;html=1;fontSize=16;" parent="EyTT8lpdAKgMZ4VjWMC6-1" vertex="1">
-          <mxGeometry x="444.0042682756698" y="910.9999825613841" width="223" height="42" as="geometry" />
-        </mxCell>
-        <mxCell id="h__vrVu5-qu6cgSce-rx-1" value="" style="shape=link;html=1;rounded=0;fontSize=12;startSize=8;endSize=8;curved=1;" parent="EyTT8lpdAKgMZ4VjWMC6-1" edge="1">
-          <mxGeometry width="100" relative="1" as="geometry">
-            <mxPoint x="1029" y="985" as="sourcePoint" />
-            <mxPoint x="1029" y="1077" as="targetPoint" />
-            <Array as="points">
-              <mxPoint x="1029.25" y="985" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="h__vrVu5-qu6cgSce-rx-2" value="" style="endArrow=classic;html=1;rounded=0;fontSize=12;startSize=8;endSize=8;curved=1;" parent="EyTT8lpdAKgMZ4VjWMC6-1" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="854" y="1055.41" as="sourcePoint" />
-            <mxPoint x="1026" y="1055" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="h__vrVu5-qu6cgSce-rx-3" style="edgeStyle=none;curved=1;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fontSize=12;startSize=8;endSize=8;entryX=1;entryY=0.5;entryDx=0;entryDy=0;dashed=1;" parent="EyTT8lpdAKgMZ4VjWMC6-1" target="EyTT8lpdAKgMZ4VjWMC6-3" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <mxPoint x="1031" y="1038" as="sourcePoint" />
-            <mxPoint x="1114.5" y="899" as="targetPoint" />
-            <Array as="points">
-              <mxPoint x="1204" y="715" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-      </root>
-    </mxGraphModel>
-  </diagram>
-  <diagram id="iqw_mrV9lKbJkvdqUL_S" name="Entity Relationship">
-    <mxGraphModel dx="1050" dy="1071" grid="0" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="0" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
-      <root>
-        <mxCell id="0" />
-        <mxCell id="1" parent="0" />
-        <mxCell id="MwSbNYkhp2zP1ZTl8Bha-4" value="rApp Instance" style="rounded=1;arcSize=10;whiteSpace=wrap;html=1;align=center;fontSize=16;fillColor=#f8cecc;strokeColor=#b85450;glass=0;shadow=0;" parent="1" vertex="1">
-          <mxGeometry x="646" y="140" width="100" height="40" as="geometry" />
-        </mxCell>
-        <mxCell id="MwSbNYkhp2zP1ZTl8Bha-5" value="rApp" style="rounded=1;arcSize=10;whiteSpace=wrap;html=1;align=center;fontSize=16;fillColor=#f8cecc;strokeColor=#b85450;glass=0;shadow=0;" parent="1" vertex="1">
-          <mxGeometry x="188" y="140" width="105" height="40" as="geometry" />
-        </mxCell>
-        <mxCell id="MwSbNYkhp2zP1ZTl8Bha-6" value="ACM Composition" style="rounded=1;arcSize=10;whiteSpace=wrap;html=1;align=center;fontSize=16;fillColor=#ffe6cc;strokeColor=#d79b00;glass=0;shadow=0;" parent="1" vertex="1">
-          <mxGeometry x="421" y="-26" width="100" height="40" as="geometry" />
-        </mxCell>
-        <mxCell id="MwSbNYkhp2zP1ZTl8Bha-7" value="ACM Composition&lt;br&gt;Instance" style="rounded=1;arcSize=10;whiteSpace=wrap;html=1;align=center;fontSize=16;fillColor=#ffe6cc;strokeColor=#d79b00;glass=0;shadow=0;" parent="1" vertex="1">
-          <mxGeometry x="419" y="51" width="100" height="62" as="geometry" />
-        </mxCell>
-        <mxCell id="MwSbNYkhp2zP1ZTl8Bha-11" value="SME Provider" style="rounded=1;arcSize=10;whiteSpace=wrap;html=1;align=center;fontSize=16;fillColor=#dae8fc;strokeColor=#6c8ebf;glass=0;shadow=0;" parent="1" vertex="1">
-          <mxGeometry x="421" y="202" width="100" height="40" as="geometry" />
-        </mxCell>
-        <mxCell id="MwSbNYkhp2zP1ZTl8Bha-13" value="SME &lt;br&gt;Invoker" style="rounded=1;arcSize=10;whiteSpace=wrap;html=1;align=center;fontSize=16;fillColor=#dae8fc;strokeColor=#6c8ebf;glass=0;shadow=0;" parent="1" vertex="1">
-          <mxGeometry x="421" y="271" width="100" height="40" as="geometry" />
-        </mxCell>
-        <mxCell id="MwSbNYkhp2zP1ZTl8Bha-14" value="SME &lt;br&gt;Service Api" style="rounded=1;arcSize=10;whiteSpace=wrap;html=1;align=center;fontSize=16;fillColor=#dae8fc;strokeColor=#6c8ebf;glass=0;shadow=0;" parent="1" vertex="1">
-          <mxGeometry x="421" y="348" width="100" height="40" as="geometry" />
-        </mxCell>
-        <mxCell id="MwSbNYkhp2zP1ZTl8Bha-15" value="" style="edgeStyle=orthogonalEdgeStyle;fontSize=12;html=1;endArrow=ERoneToMany;rounded=0;startSize=8;endSize=8;curved=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.006;entryY=0.384;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="MwSbNYkhp2zP1ZTl8Bha-5" target="MwSbNYkhp2zP1ZTl8Bha-7" edge="1">
-          <mxGeometry width="100" height="100" relative="1" as="geometry">
-            <mxPoint x="310" y="250" as="sourcePoint" />
-            <mxPoint x="200" y="64" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="MwSbNYkhp2zP1ZTl8Bha-17" value="1..N" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=16;" parent="MwSbNYkhp2zP1ZTl8Bha-15" vertex="1" connectable="0">
-          <mxGeometry x="0.0469" y="3" relative="1" as="geometry">
-            <mxPoint x="52" y="5" as="offset" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="MwSbNYkhp2zP1ZTl8Bha-20" value="" style="edgeStyle=orthogonalEdgeStyle;fontSize=12;html=1;endArrow=ERmandOne;startArrow=ERmandOne;rounded=0;startSize=8;endSize=8;curved=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="MwSbNYkhp2zP1ZTl8Bha-5" target="MwSbNYkhp2zP1ZTl8Bha-6" edge="1">
-          <mxGeometry width="100" height="100" relative="1" as="geometry">
-            <mxPoint x="310" y="250" as="sourcePoint" />
-            <mxPoint x="410" y="150" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="MwSbNYkhp2zP1ZTl8Bha-21" value="1..1" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=16;" parent="1" vertex="1" connectable="0">
-          <mxGeometry x="358.9982392983694" y="1.0030393525859012" as="geometry">
-            <mxPoint x="1" y="-3" as="offset" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="MwSbNYkhp2zP1ZTl8Bha-22" value="" style="edgeStyle=orthogonalEdgeStyle;fontSize=12;html=1;endArrow=ERoneToMany;rounded=0;startSize=8;endSize=8;curved=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="MwSbNYkhp2zP1ZTl8Bha-5" target="MwSbNYkhp2zP1ZTl8Bha-11" edge="1">
-          <mxGeometry width="100" height="100" relative="1" as="geometry">
-            <mxPoint x="253" y="150" as="sourcePoint" />
-            <mxPoint x="429" y="92" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="MwSbNYkhp2zP1ZTl8Bha-23" value="1..N" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=16;" parent="MwSbNYkhp2zP1ZTl8Bha-22" vertex="1" connectable="0">
-          <mxGeometry x="0.0469" y="3" relative="1" as="geometry">
-            <mxPoint x="38" y="-2" as="offset" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="MwSbNYkhp2zP1ZTl8Bha-24" value="" style="edgeStyle=orthogonalEdgeStyle;fontSize=12;html=1;endArrow=ERoneToMany;rounded=0;startSize=8;endSize=8;curved=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" parent="1" source="MwSbNYkhp2zP1ZTl8Bha-5" target="MwSbNYkhp2zP1ZTl8Bha-13" edge="1">
-          <mxGeometry width="100" height="100" relative="1" as="geometry">
-            <mxPoint x="174" y="237" as="sourcePoint" />
-            <mxPoint x="352" y="348" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="MwSbNYkhp2zP1ZTl8Bha-25" value="1..N" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=16;" parent="MwSbNYkhp2zP1ZTl8Bha-24" vertex="1" connectable="0">
-          <mxGeometry x="0.0469" y="3" relative="1" as="geometry">
-            <mxPoint x="68" y="-6" as="offset" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="MwSbNYkhp2zP1ZTl8Bha-26" value="" style="edgeStyle=orthogonalEdgeStyle;fontSize=12;html=1;endArrow=ERoneToMany;rounded=0;startSize=8;endSize=8;curved=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="MwSbNYkhp2zP1ZTl8Bha-5" target="MwSbNYkhp2zP1ZTl8Bha-14" edge="1">
-          <mxGeometry width="100" height="100" relative="1" as="geometry">
-            <mxPoint x="130.99999999999994" y="251.99999999999994" as="sourcePoint" />
-            <mxPoint x="372.21" y="421.2" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="MwSbNYkhp2zP1ZTl8Bha-27" value="1..N" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=16;" parent="MwSbNYkhp2zP1ZTl8Bha-26" vertex="1" connectable="0">
-          <mxGeometry x="0.0469" y="3" relative="1" as="geometry">
-            <mxPoint x="102" y="-10" as="offset" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="MwSbNYkhp2zP1ZTl8Bha-28" value="" style="edgeStyle=orthogonalEdgeStyle;fontSize=12;html=1;endArrow=ERoneToMany;rounded=0;startSize=8;endSize=8;curved=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="MwSbNYkhp2zP1ZTl8Bha-5" target="MwSbNYkhp2zP1ZTl8Bha-4" edge="1">
-          <mxGeometry width="100" height="100" relative="1" as="geometry">
-            <mxPoint x="310" y="250" as="sourcePoint" />
-            <mxPoint x="410" y="150" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="MwSbNYkhp2zP1ZTl8Bha-29" value="1..N" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=16;" parent="1" vertex="1" connectable="0">
-          <mxGeometry x="382.9968503216668" y="228.00044469513193" as="geometry">
-            <mxPoint x="84" y="-70" as="offset" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="MwSbNYkhp2zP1ZTl8Bha-30" value="" style="edgeStyle=orthogonalEdgeStyle;fontSize=12;html=1;endArrow=ERmandOne;startArrow=ERmandOne;rounded=0;startSize=8;endSize=8;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;curved=1;" parent="1" source="MwSbNYkhp2zP1ZTl8Bha-6" target="MwSbNYkhp2zP1ZTl8Bha-4" edge="1">
-          <mxGeometry width="100" height="100" relative="1" as="geometry">
-            <mxPoint x="561" y="46" as="sourcePoint" />
-            <mxPoint x="739" y="-100" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="MwSbNYkhp2zP1ZTl8Bha-31" value="" style="edgeStyle=orthogonalEdgeStyle;fontSize=12;html=1;endArrow=ERmandOne;startArrow=ERmandOne;rounded=0;startSize=8;endSize=8;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;curved=1;" parent="1" source="MwSbNYkhp2zP1ZTl8Bha-7" target="MwSbNYkhp2zP1ZTl8Bha-4" edge="1">
-          <mxGeometry width="100" height="100" relative="1" as="geometry">
-            <mxPoint x="543" y="78" as="sourcePoint" />
-            <mxPoint x="718" y="224" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="MwSbNYkhp2zP1ZTl8Bha-32" value="" style="edgeStyle=orthogonalEdgeStyle;fontSize=12;html=1;endArrow=ERmandOne;startArrow=ERmandOne;rounded=0;startSize=8;endSize=8;curved=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" parent="1" source="MwSbNYkhp2zP1ZTl8Bha-11" target="MwSbNYkhp2zP1ZTl8Bha-4" edge="1">
-          <mxGeometry width="100" height="100" relative="1" as="geometry">
-            <mxPoint x="551" y="210" as="sourcePoint" />
-            <mxPoint x="728" y="268" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="MwSbNYkhp2zP1ZTl8Bha-33" value="" style="edgeStyle=orthogonalEdgeStyle;fontSize=12;html=1;endArrow=ERmandOne;startArrow=ERmandOne;rounded=0;startSize=8;endSize=8;curved=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" parent="1" source="MwSbNYkhp2zP1ZTl8Bha-13" target="MwSbNYkhp2zP1ZTl8Bha-4" edge="1">
-          <mxGeometry width="100" height="100" relative="1" as="geometry">
-            <mxPoint x="569" y="296" as="sourcePoint" />
-            <mxPoint x="746" y="354" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="MwSbNYkhp2zP1ZTl8Bha-34" value="" style="edgeStyle=orthogonalEdgeStyle;fontSize=12;html=1;endArrow=ERmandOne;startArrow=ERmandOne;rounded=0;startSize=8;endSize=8;curved=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="MwSbNYkhp2zP1ZTl8Bha-14" target="MwSbNYkhp2zP1ZTl8Bha-4" edge="1">
-          <mxGeometry width="100" height="100" relative="1" as="geometry">
-            <mxPoint x="571" y="364" as="sourcePoint" />
-            <mxPoint x="690" y="184" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="MwSbNYkhp2zP1ZTl8Bha-35" value="1..1" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=16;" parent="1" vertex="1" connectable="0">
-          <mxGeometry x="587.9982392983694" y="5.003039352585901" as="geometry">
-            <mxPoint x="-13" y="-9" as="offset" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="MwSbNYkhp2zP1ZTl8Bha-36" value="1..1" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=16;" parent="1" vertex="1" connectable="0">
-          <mxGeometry x="587.9982392983694" y="91.0030393525859" as="geometry">
-            <mxPoint x="-13" y="-9" as="offset" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="MwSbNYkhp2zP1ZTl8Bha-37" value="1..1" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=16;" parent="1" vertex="1" connectable="0">
-          <mxGeometry x="587.9982392983694" y="228.00303935258592" as="geometry">
-            <mxPoint x="-13" y="-9" as="offset" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="MwSbNYkhp2zP1ZTl8Bha-38" value="1..1" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=16;" parent="1" vertex="1" connectable="0">
-          <mxGeometry x="587.9982392983694" y="295.0030393525859" as="geometry">
-            <mxPoint x="-13" y="-9" as="offset" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="MwSbNYkhp2zP1ZTl8Bha-39" value="1..1" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=16;" parent="1" vertex="1" connectable="0">
-          <mxGeometry x="587.9982392983694" y="368.0030393525859" as="geometry">
-            <mxPoint x="-13" y="-9" as="offset" />
-          </mxGeometry>
-        </mxCell>
-      </root>
-    </mxGraphModel>
-  </diagram>
-</mxfile>
diff --git a/docs/images/architecture.png b/docs/images/architecture.png

index e76519b..b473ea4 100755 (executable)

Binary files a/docs/images/architecture.png and b/docs/images/architecture.png differ
diff --git a/docs/images/rApp-entity-relationship.png b/docs/images/rApp-entity-relationship.png

new file mode 100755 (executable)

index 0000000..938e80e

Binary files /dev/null and b/docs/images/rApp-entity-relationship.png differ
diff --git a/docs/images/rApp-flow.png b/docs/images/rApp-flow.png

new file mode 100755 (executable)

index 0000000..aaf9f0b

Binary files /dev/null and b/docs/images/rApp-flow.png differ
diff --git a/docs/images/rApp-instance-flow.png b/docs/images/rApp-instance-flow.png

new file mode 100755 (executable)

index 0000000..1f4ecc0

Binary files /dev/null and b/docs/images/rApp-instance-flow.png differ
diff --git a/docs/images/rapp-instance-states.png b/docs/images/rApp-instance-states.png

similarity index 100%

rename from docs/images/rapp-instance-states.png

rename to docs/images/rApp-instance-states.png
diff --git a/docs/images/rApp-package.png b/docs/images/rApp-package.png

new file mode 100755 (executable)

index 0000000..e485b86

Binary files /dev/null and b/docs/images/rApp-package.png differ
diff --git a/docs/images/rApp-state-events.png b/docs/images/rApp-state-events.png

new file mode 100755 (executable)

index 0000000..92e8f76

Binary files /dev/null and b/docs/images/rApp-state-events.png differ
diff --git a/docs/images/rapp-states.png b/docs/images/rApp-states.png

similarity index 100%

rename from docs/images/rapp-states.png

rename to docs/images/rApp-states.png
diff --git a/docs/images/rapp-entity-relationship.png b/docs/images/rapp-entity-relationship.png

deleted file mode 100755 (executable)

index 8bd6918..0000000

Binary files a/docs/images/rapp-entity-relationship.png and /dev/null differ
diff --git a/docs/images/rapp-flow.png b/docs/images/rapp-flow.png

deleted file mode 100755 (executable)

index 56e2ffa..0000000

Binary files a/docs/images/rapp-flow.png and /dev/null differ
diff --git a/docs/images/rapp-instance-flow.png b/docs/images/rapp-instance-flow.png

deleted file mode 100755 (executable)

index 3f1796f..0000000

Binary files a/docs/images/rapp-instance-flow.png and /dev/null differ
diff --git a/docs/images/rapp-state-events.png b/docs/images/rapp-state-events.png

deleted file mode 100755 (executable)

index a429add..0000000

Binary files a/docs/images/rapp-state-events.png and /dev/null differ
diff --git a/docs/ppt/rapp-manager.pptx b/docs/ppt/rapp-manager.pptx

deleted file mode 100755 (executable)

index a6516f8..0000000

Binary files a/docs/ppt/rapp-manager.pptx and /dev/null differ
diff --git a/docs/uml/rapp-flow.puml b/docs/uml/rApp-flow.puml

similarity index 87%

rename from docs/uml/rapp-flow.puml

rename to docs/uml/rApp-flow.puml

index 758a786..682003b 100755 (executable)
--- a/docs/uml/rapp-flow.puml
+++ b/docs/uml/rApp-flow.puml
@@ -5,6 +5,7 @@ actor "API User"
  participant "rApp Manager"
  collections "File System"
  participant "ACM Runtime"
+participant "ICS"
  
  group Create rApp
  "API User"->"rApp Manager": Create rApp
@@ -16,6 +17,8 @@ group Create rApp
  "ACM Runtime"->"rApp Manager": Create ACM composition Status
  "rApp Manager"->"ACM Runtime": Prime ACM composition
  "ACM Runtime"->"rApp Manager": Prime ACM composition Status
+"rApp Manager"->"ICS": Check information type availability
+"ICS"->"rApp Manager": Information type availability Status
  end
  
  autonumber
diff --git a/docs/uml/rapp-instance-flow.puml b/docs/uml/rApp-instance-flow.puml

similarity index 70%

rename from docs/uml/rapp-instance-flow.puml

rename to docs/uml/rApp-instance-flow.puml

index 1f3bc7c..3507b4a 100755 (executable)
--- a/docs/uml/rapp-instance-flow.puml
+++ b/docs/uml/rApp-instance-flow.puml
@@ -9,6 +9,7 @@ participant "A1PMS Participant"
  participant "Kserve Participant"
  participant "K8s Participant"
  participant "CAPIF"
+participant "ICS"
  
  autonumber
  group Create rApp Instance
@@ -32,9 +33,17 @@ group Deploy rApp Instance
      end
  
      group SME Deploy
-    "rApp Manager"->"CAPIF": Create CAPIF entities
-    "CAPIF"->"CAPIF": Create the entities as provided
-    "rApp Manager"<-"CAPIF": Response of CAPIF entities creation
+        "rApp Manager"->"CAPIF": Create CAPIF entities
+        "CAPIF"->"CAPIF": Create the entities as provided
+        "rApp Manager"<-"CAPIF": Response of CAPIF entities creation
+    end
+    group DME Deploy
+        "rApp Manager"->"ICS": Create Info types for producer and consumer
+        "rApp Manager"<--"ICS": Response
+        "rApp Manager"->"ICS": Create Info producer
+        "rApp Manager"<--"ICS": Response
+        "rApp Manager"->"ICS": Create Info consumer
+        "rApp Manager"<--"ICS": Response
      end
  "API User"<-"rApp Manager": Deploy rApp Instance Status
  end
@@ -57,9 +66,15 @@ group Undeploy rApp Instance
      end
  
      group SME Undeploy
-    "rApp Manager"->"CAPIF": Delete CAPIF entities
-    "CAPIF"->"CAPIF": Delete the entities as provided
-    "rApp Manager"<-"CAPIF": Response of CAPIF entities Deletion
+        "rApp Manager"->"CAPIF": Delete CAPIF entities
+        "CAPIF"->"CAPIF": Delete the entities as provided
+        "rApp Manager"<-"CAPIF": Response of CAPIF entities Deletion
+    end
+    group DME Undeploy
+        "rApp Manager"->"ICS": Delete Info consumer
+        "rApp Manager"<-"ICS": Response
+        "rApp Manager"->"ICS": Delete Info producer
+        "rApp Manager"<-"ICS": Response
      end
  "API User"<-"rApp Manager": Undeploy rApp Instance Status
  end
diff --git a/pom.xml b/pom.xml

index 0baa852..0a8f1d1 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -36,6 +36,7 @@
          <module>rapp-manager-models</module>
          <module>rapp-manager-acm</module>
          <module>rapp-manager-sme</module>
+        <module>rapp-manager-dme</module>
          <module>rapp-manager-application</module>
      </modules>
      <repositories>
diff --git a/rapp-manager-acm/src/main/java/com/oransc/rappmanager/acm/service/AcmDeployer.java b/rapp-manager-acm/src/main/java/com/oransc/rappmanager/acm/service/AcmDeployer.java

index 41f4bae..eb93ed3 100755 (executable)
--- a/rapp-manager-acm/src/main/java/com/oransc/rappmanager/acm/service/AcmDeployer.java
+++ b/rapp-manager-acm/src/main/java/com/oransc/rappmanager/acm/service/AcmDeployer.java
@@ -25,7 +25,6 @@ import com.oransc.rappmanager.models.RappDeployer;
  import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
  import com.oransc.rappmanager.models.rapp.Rapp;
  import com.oransc.rappmanager.models.rapp.RappEvent;
-import com.oransc.rappmanager.models.rapp.RappState;
  import com.oransc.rappmanager.models.rappinstance.RappACMInstance;
  import com.oransc.rappmanager.models.rappinstance.RappInstance;
  import com.oransc.rappmanager.models.statemachine.RappInstanceStateMachine;
@@ -172,7 +171,6 @@ public class AcmDeployer implements RappDeployer {
                  rapp.setCompositionId(commissioningResponse.getCompositionId());
                  logger.info("Priming automation Composition");
                  primeACMComposition(commissioningResponse.getCompositionId(), PrimeOrder.PRIME);
-                rapp.setState(RappState.PRIMED);
                  return true;
              } else {
                  logger.error("Failed to create automation composition");
@@ -189,7 +187,6 @@ public class AcmDeployer implements RappDeployer {
              primeACMComposition(rapp.getCompositionId(), PrimeOrder.DEPRIME);
              CommissioningResponse commissioningResponse = deleteComposition(rapp.getCompositionId());
              if (commissioningResponse != null) {
-                rapp.setState(RappState.COMMISSIONED);
                  return true;
              }
          } catch (Exception e) {
diff --git a/rapp-manager-acm/src/test/java/com/oransc/rappmanager/acm/service/AcmDeployerTest.java b/rapp-manager-acm/src/test/java/com/oransc/rappmanager/acm/service/AcmDeployerTest.java

index 59e69a6..f3016b0 100755 (executable)
--- a/rapp-manager-acm/src/test/java/com/oransc/rappmanager/acm/service/AcmDeployerTest.java
+++ b/rapp-manager-acm/src/test/java/com/oransc/rappmanager/acm/service/AcmDeployerTest.java
@@ -287,8 +287,6 @@ class AcmDeployerTest {
          boolean primeRapp = acmDeployer.primeRapp(rapp);
          mockServer.verify();
          assertTrue(primeRapp);
-        assertEquals(RappState.PRIMED, rapp.getState());
-
      }
  
      @Test
diff --git a/rapp-manager-acm/src/test/resources/valid-rapp-package.csar b/rapp-manager-acm/src/test/resources/valid-rapp-package.csar

index b8b36e3..398a516 100755 (executable)

Binary files a/rapp-manager-acm/src/test/resources/valid-rapp-package.csar and b/rapp-manager-acm/src/test/resources/valid-rapp-package.csar differ
diff --git a/rapp-manager-application/pom.xml b/rapp-manager-application/pom.xml

index ee830cf..5bd7dd1 100755 (executable)
--- a/rapp-manager-application/pom.xml
+++ b/rapp-manager-application/pom.xml
@@ -53,6 +53,11 @@
              <artifactId>rapp-manager-sme</artifactId>
              <version>${project.version}</version>
          </dependency>
+        <dependency>
+            <groupId>org.o-ran-sc.nonrtric.plt.rappmanager</groupId>
+            <artifactId>rapp-manager-dme</artifactId>
+            <version>${project.version}</version>
+        </dependency>
          <dependency>
              <groupId>org.onap.policy.clamp</groupId>
              <artifactId>policy-clamp-models</artifactId>
diff --git a/rapp-manager-application/src/main/java/com/oransc/rappmanager/BeanConfiguration.java b/rapp-manager-application/src/main/java/com/oransc/rappmanager/BeanConfiguration.java

index 0d3bd3d..4e7f7fd 100755 (executable)
--- a/rapp-manager-application/src/main/java/com/oransc/rappmanager/BeanConfiguration.java
+++ b/rapp-manager-application/src/main/java/com/oransc/rappmanager/BeanConfiguration.java
@@ -23,6 +23,9 @@ import com.oransc.rappmanager.acm.configuration.ACMConfiguration;
  import com.oransc.rappmanager.acm.rest.AutomationCompositionDefinitionApiClient;
  import com.oransc.rappmanager.acm.rest.AutomationCompositionInstanceApiClient;
  import com.oransc.rappmanager.acm.rest.ParticipantMonitoringApiClient;
+import com.oransc.rappmanager.dme.configuration.DmeConfiguration;
+import com.oransc.rappmanager.dme.rest.DataConsumerApiClient;
+import com.oransc.rappmanager.dme.rest.DataProducerRegistrationApiClient;
  import com.oransc.rappmanager.sme.configuration.SmeConfiguration;
  import com.oransc.rappmanager.sme.provider.rest.DefaultApiClient;
  import lombok.RequiredArgsConstructor;
@@ -40,6 +43,7 @@ public class BeanConfiguration {
  
      private final ACMConfiguration acmConfiguration;
      private final SmeConfiguration smeConfiguration;
+    private final DmeConfiguration dmeConfiguration;
  
      @Bean
      public RestTemplate restTemplate(RestTemplateBuilder builder) {
@@ -108,6 +112,23 @@ public class BeanConfiguration {
          return new com.oransc.rappmanager.sme.invoker.rest.DefaultApiClient(apiClient);
      }
  
+    @Bean
+    public com.oransc.rappmanager.dme.ApiClient dmeApiClient(RestTemplate restTemplate) {
+        com.oransc.rappmanager.dme.ApiClient apiClient = new com.oransc.rappmanager.dme.ApiClient(restTemplate);
+        return apiClient.setBasePath(dmeConfiguration.getBaseUrl());
+    }
+
+    @Bean
+    public DataProducerRegistrationApiClient dataProducerRegistrationApiClient(
+            com.oransc.rappmanager.dme.ApiClient apiClient) {
+        return new DataProducerRegistrationApiClient(apiClient);
+    }
+
+    @Bean
+    public DataConsumerApiClient dataConsumerApiClient(com.oransc.rappmanager.dme.ApiClient apiClient) {
+        return new DataConsumerApiClient(apiClient);
+    }
+
      @Bean
      public CacheManager cacheManager() {
          return new ConcurrentMapCacheManager();
diff --git a/rapp-manager-application/src/main/java/com/oransc/rappmanager/service/RappService.java b/rapp-manager-application/src/main/java/com/oransc/rappmanager/service/RappService.java

index 6411b2b..1b9fb68 100755 (executable)
--- a/rapp-manager-application/src/main/java/com/oransc/rappmanager/service/RappService.java
+++ b/rapp-manager-application/src/main/java/com/oransc/rappmanager/service/RappService.java
@@ -19,6 +19,7 @@
  package com.oransc.rappmanager.service;
  
  import com.oransc.rappmanager.acm.service.AcmDeployer;
+import com.oransc.rappmanager.dme.service.DmeDeployer;
  import com.oransc.rappmanager.models.rapp.Rapp;
  import com.oransc.rappmanager.models.rapp.RappEvent;
  import com.oransc.rappmanager.models.rapp.RappState;
@@ -37,13 +38,16 @@ public class RappService {
  
      private final AcmDeployer acmDeployer;
      private final SmeDeployer smeDeployer;
+    private final DmeDeployer dmeDeployer;
      private final RappInstanceStateMachine rappInstanceStateMachine;
      private static final String STATE_TRANSITION_NOT_PERMITTED = "State transition from %s to %s is not permitted.";
  
      public ResponseEntity<String> primeRapp(Rapp rapp) {
          if (rapp.getState().equals(RappState.COMMISSIONED)) {
              rapp.setState(RappState.PRIMING);
-            if (!acmDeployer.primeRapp(rapp)) {
+            if (acmDeployer.primeRapp(rapp) && dmeDeployer.primeRapp(rapp)) {
+                rapp.setState(RappState.PRIMED);
+            } else {
                  rapp.setState(RappState.COMMISSIONED);
              }
              return ResponseEntity.ok().build();
@@ -57,7 +61,9 @@ public class RappService {
      public ResponseEntity<String> deprimeRapp(Rapp rapp) {
          if (rapp.getState().equals(RappState.PRIMED) && rapp.getRappInstances().isEmpty()) {
              rapp.setState(RappState.DEPRIMING);
-            if (!acmDeployer.deprimeRapp(rapp)) {
+            if (acmDeployer.deprimeRapp(rapp) && dmeDeployer.deprimeRapp(rapp)) {
+                rapp.setState(RappState.COMMISSIONED);
+            } else {
                  rapp.setState(RappState.PRIMED);
              }
              return ResponseEntity.ok().build();
@@ -75,8 +81,8 @@ public class RappService {
      public ResponseEntity<String> deployRappInstance(Rapp rapp, RappInstance rappInstance) {
          if (rappInstance.getState().equals(RappInstanceState.UNDEPLOYED)) {
              rappInstanceStateMachine.sendRappInstanceEvent(rappInstance, RappEvent.DEPLOYING);
-            if (acmDeployer.deployRappInstance(rapp, rappInstance) && smeDeployer.deployRappInstance(rapp,
-                    rappInstance)) {
+            if (acmDeployer.deployRappInstance(rapp, rappInstance) && smeDeployer.deployRappInstance(rapp, rappInstance)
+                        && dmeDeployer.deployRappInstance(rapp, rappInstance)) {
                  return ResponseEntity.accepted().build();
              }
              return ResponseEntity.status(HttpStatus.BAD_GATEWAY).build();
@@ -91,7 +97,7 @@ public class RappService {
          if (rappInstance.getState().equals(RappInstanceState.DEPLOYED)) {
              rappInstanceStateMachine.sendRappInstanceEvent(rappInstance, RappEvent.UNDEPLOYING);
              if (acmDeployer.undeployRappInstance(rapp, rappInstance) && smeDeployer.undeployRappInstance(rapp,
-                    rappInstance)) {
+                    rappInstance) && dmeDeployer.undeployRappInstance(rapp, rappInstance)) {
                  return ResponseEntity.accepted().build();
              }
              return ResponseEntity.status(HttpStatus.BAD_GATEWAY).build();
diff --git a/rapp-manager-application/src/main/resources/application.yaml b/rapp-manager-application/src/main/resources/application.yaml

index 0672fd2..8a30abb 100755 (executable)
--- a/rapp-manager-application/src/main/resources/application.yaml
+++ b/rapp-manager-application/src/main/resources/application.yaml
@@ -1,23 +1,25 @@
  rappmanager:
    csarlocation: src/test/resources/csar
    acm:
-    baseurl: http://10.101.3.22:30442/onap/policy/clamp/acm/v2/
+    baseurl: http://10.101.2.41:30442/onap/policy/clamp/acm/v2/
      username: runtimeUser
      password: zb!XztG34
-    maxRetries: 3
+    maxRetries: 10
      retryInterval: 2 #seconds
    sme:
-    baseurl: http://localhost:60821 #http://10.101.3.22:61761
+    baseurl: http://localhost:56571 #http://10.101.3.22:61761
      providerBasePath: /api-provider-management/v1/
      invokerBasePath: /api-invoker-management/v1/
      publishApiBasePath: /published-apis/v1/
      maxRetries: 3
      retryInterval: 2 #seconds
+  dme:
+    baseurl: http://localhost:63475 #http://10.101.3.22:61761
  
  logging:
    level:
      root: INFO
-    com.oransc.rapps: DEBUG
+    com.oransc: DEBUG
      org.apache.http: DEBUG
      httpclient.wire: DEBUG
      org.springframework.web.client.RestTemplate: TRACE
diff --git a/rapp-manager-application/src/main/resources/resource-csar/Files/Acm/definition/compositions.json b/rapp-manager-application/src/main/resources/resource-csar/Files/Acm/definition/compositions.json

index bc568ad..e64d882 100755 (executable)
--- a/rapp-manager-application/src/main/resources/resource-csar/Files/Acm/definition/compositions.json
+++ b/rapp-manager-application/src/main/resources/resource-csar/Files/Acm/definition/compositions.json
@@ -263,7 +263,7 @@
              "name": "org.onap.policy.clamp.acm.KserveParticipant",
              "version": "2.3.4"
            },
-          "uninitializedToPassiveTimeout": 60,
+          "uninitializedToPassiveTimeout": 300,
            "statusCheckInterval": 30
          }
        },
diff --git a/rapp-manager-application/src/main/resources/resource-csar/Files/Acm/instances/k8s-instance.json b/rapp-manager-application/src/main/resources/resource-csar/Files/Acm/instances/k8s-instance.json

index 286a943..562b5a2 100755 (executable)
--- a/rapp-manager-application/src/main/resources/resource-csar/Files/Acm/instances/k8s-instance.json
+++ b/rapp-manager-application/src/main/resources/resource-csar/Files/Acm/instances/k8s-instance.json
@@ -22,7 +22,7 @@
            "podName": "ransliceassurance",
            "repository": {
              "repoName": "local",
-            "address": "http://10.101.3.22:8879/charts"
+            "address": "http://10.101.2.41:8879/charts"
            }
          }
        }
diff --git a/rapp-manager-application/src/main/resources/resource-csar/Files/Dme/infoconsumers/json-file-consumer.json b/rapp-manager-application/src/main/resources/resource-csar/Files/Dme/infoconsumers/json-file-consumer.json

new file mode 100755 (executable)

index 0000000..b18a643
--- /dev/null
+++ b/rapp-manager-application/src/main/resources/resource-csar/Files/Dme/infoconsumers/json-file-consumer.json
@@ -0,0 +1,13 @@
+{
+  "info_type_id": "json-file-data-from-filestore",
+  "job_owner": "console",
+  "status_notification_uri": "http://callback.nonrtric:80/post",
+  "job_definition": {
+    "db-url": "http://influxdb2.nonrtric:8086",
+    "db-org": "est",
+    "db-bucket": "pm-bucket",
+    "db-token": "token",
+    "filterType": "pmdata",
+    "filter": {}
+  }
+}
+\ No newline at end of file
diff --git a/rapp-manager-application/src/main/resources/resource-csar/Files/Dme/infoconsumers/xml-file-consumer.json b/rapp-manager-application/src/main/resources/resource-csar/Files/Dme/infoconsumers/xml-file-consumer.json

new file mode 100755 (executable)

index 0000000..b33482a
--- /dev/null
+++ b/rapp-manager-application/src/main/resources/resource-csar/Files/Dme/infoconsumers/xml-file-consumer.json
@@ -0,0 +1,13 @@
+{
+  "info_type_id": "xml-file-data-from-filestore",
+  "job_owner": "console",
+  "status_notification_uri": "http://callback.nonrtric:80/post",
+  "job_definition": {
+    "db-url": "http://influxdb2.nonrtric:8086",
+    "db-org": "est",
+    "db-bucket": "pm-bucket",
+    "db-token": "token",
+    "filterType": "pmdata",
+    "filter": {}
+  }
+}
+\ No newline at end of file
diff --git a/rapp-manager-application/src/main/resources/resource-csar/Files/Dme/infoproducers/json-file-data-producer.json b/rapp-manager-application/src/main/resources/resource-csar/Files/Dme/infoproducers/json-file-data-producer.json

new file mode 100755 (executable)

index 0000000..ed74384
--- /dev/null
+++ b/rapp-manager-application/src/main/resources/resource-csar/Files/Dme/infoproducers/json-file-data-producer.json
@@ -0,0 +1,7 @@
+{
+  "info_job_callback_url": "http://localhost/jsonproducerjobcallback",
+  "info_producer_supervision_callback_url": "http://localhost/jsonproducersupervisioncallback",
+  "supported_info_types": [
+    "json-file-data-from-filestore"
+  ]
+}
+\ No newline at end of file
diff --git a/rapp-manager-application/src/main/resources/resource-csar/Files/Dme/infoproducers/xml-file-data-producer.json b/rapp-manager-application/src/main/resources/resource-csar/Files/Dme/infoproducers/xml-file-data-producer.json

new file mode 100755 (executable)

index 0000000..33075de
--- /dev/null
+++ b/rapp-manager-application/src/main/resources/resource-csar/Files/Dme/infoproducers/xml-file-data-producer.json
@@ -0,0 +1,7 @@
+{
+  "info_job_callback_url": "http://localhost/xmlproducerjobcallback",
+  "info_producer_supervision_callback_url": "http://localhost/xmlproducersupervisioncallback",
+  "supported_info_types": [
+    "xml-file-data-from-filestore"
+  ]
+}
+\ No newline at end of file
diff --git a/rapp-manager-application/src/main/resources/resource-csar/Files/Dme/infotypes/json-file-data-from-filestore.json b/rapp-manager-application/src/main/resources/resource-csar/Files/Dme/infotypes/json-file-data-from-filestore.json

new file mode 100755 (executable)

index 0000000..a5f9d02
--- /dev/null
+++ b/rapp-manager-application/src/main/resources/resource-csar/Files/Dme/infotypes/json-file-data-from-filestore.json
@@ -0,0 +1,8 @@
+{
+  "info_job_data_schema": {
+    "schema": "http://json-schema.org/draft-07/schema#",
+    "title": "json-file-data-from-filestore",
+    "description": "json-file-data-from-filestore",
+    "type": "object"
+  }
+}
+\ No newline at end of file
diff --git a/rapp-manager-application/src/main/resources/resource-csar/Files/Dme/infotypes/xml-file-data-from-filestore.json b/rapp-manager-application/src/main/resources/resource-csar/Files/Dme/infotypes/xml-file-data-from-filestore.json

new file mode 100755 (executable)

index 0000000..3585603
--- /dev/null
+++ b/rapp-manager-application/src/main/resources/resource-csar/Files/Dme/infotypes/xml-file-data-from-filestore.json
@@ -0,0 +1,8 @@
+{
+  "info_job_data_schema": {
+    "schema": "http://json-schema.org/draft-07/schema#",
+    "title": "xml-file-data-to-filestore",
+    "description": "xml-file-data-to-filestore",
+    "type": "object"
+  }
+}
+\ No newline at end of file
diff --git a/rapp-manager-application/src/main/resources/resource-csar/asd.mf b/rapp-manager-application/src/main/resources/resource-csar/asd.mf

index 39218a5..09818fc 100755 (executable)
--- a/rapp-manager-application/src/main/resources/resource-csar/asd.mf
+++ b/rapp-manager-application/src/main/resources/resource-csar/asd.mf
@@ -17,7 +17,24 @@ Source: TOSCA-Metadata/TOSCA.meta
  Source: Artifacts/Deployment/HELM/free5gc-1.1.3.tgz\r
  Source: Artifacts/Deployment/HELM/ueransim-2.0.14.tgz\r
  Source: Files/rapp1/rapp.zip\r
-Source: Files/Acm/instantiation.yaml\r
+Source: Files/Acm/definition/compositions.json\r
+Source: Files/Acm/instances/a1pms-instance.json\r
+Source: Files/Acm/instances/k8s-instance.json\r
+Source: Files/Acm/instances/kserve-instance.json\r
+Source: Files/Dme/infoconsumers/json-file-consumer.json\r
+Source: Files/Dme/infoconsumers/xml-file-consumer.json\r
+Source: Files/Dme/infoproducers/json-file-data-producer.json\r
+Source: Files/Dme/infoproducers/xml-file-data-producer.json\r
+Source: Files/Dme/infotypes/json-file-data-from-filestore.json\r
+Source: Files/Dme/infotypes/xml-file-data-from-filestore.json\r
+Source: Files/Sme/invokers/invoker-app1.json\r
+Source: Files/Sme/invokers/invoker-app2.json\r
+Source: Files/Sme/provider/aef-provider-function.json\r
+Source: Files/Sme/provider/amf-provider-function.json\r
+Source: Files/Sme/provider/apf-provider-function.json\r
+Source: Files/Sme/provider/gateway-provider-function.json\r
+Source: Files/Sme/serviceapis/api-set-1.json\r
+Source: Files/Sme/serviceapis/api-set-2.json\r
  \r
  non_mano_artifact_sets:\r
      onap_ves_events:\r
diff --git a/rapp-manager-application/src/test/java/com/oransc/rappmanager/rest/RappInstanceControllerTest.java b/rapp-manager-application/src/test/java/com/oransc/rappmanager/rest/RappInstanceControllerTest.java

index d6ba4ce..9eb959a 100755 (executable)
--- a/rapp-manager-application/src/test/java/com/oransc/rappmanager/rest/RappInstanceControllerTest.java
+++ b/rapp-manager-application/src/test/java/com/oransc/rappmanager/rest/RappInstanceControllerTest.java
@@ -8,6 +8,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
  
  import com.fasterxml.jackson.databind.ObjectMapper;
  import com.oransc.rappmanager.acm.service.AcmDeployer;
+import com.oransc.rappmanager.dme.service.DmeDeployer;
  import com.oransc.rappmanager.models.rappinstance.DeployOrder;
  import com.oransc.rappmanager.models.rapp.Rapp;
  import com.oransc.rappmanager.models.rappinstance.RappInstance;
@@ -49,6 +50,9 @@ class RappInstanceControllerTest {
      @MockBean
      SmeDeployer smeDeployer;
  
+    @MockBean
+    DmeDeployer dmeDeployer;
+
      @MockBean
      SmeLifecycleManager smeLifecycleManager;
  
@@ -146,6 +150,7 @@ class RappInstanceControllerTest {
          rappInstanceDeployOrder.setDeployOrder(DeployOrder.DEPLOY);
          when(acmDeployer.deployRappInstance(any(), any())).thenReturn(true);
          when(smeDeployer.deployRappInstance(any(), any())).thenReturn(true);
+        when(dmeDeployer.deployRappInstance(any(), any())).thenReturn(true);
          mockMvc.perform(MockMvcRequestBuilders.put("/rapps/{rapp_id}/instance/{instance_id}", rappId, rappInstanceId)
                                  .contentType(MediaType.APPLICATION_JSON)
                                  .content(objectMapper.writeValueAsString(rappInstanceDeployOrder)))
@@ -164,6 +169,7 @@ class RappInstanceControllerTest {
          rappInstanceDeployOrder.setDeployOrder(DeployOrder.DEPLOY);
          when(acmDeployer.deployRappInstance(any(), any())).thenReturn(true);
          when(smeDeployer.deployRappInstance(any(), any())).thenReturn(true);
+        when(dmeDeployer.deployRappInstance(any(), any())).thenReturn(true);
          mockMvc.perform(MockMvcRequestBuilders.put("/rapps/{rapp_id}/instance/{instance_id}", rappId, rappInstanceId)
                                  .contentType(MediaType.APPLICATION_JSON)
                                  .content(objectMapper.writeValueAsString(rappInstanceDeployOrder)))
@@ -176,6 +182,7 @@ class RappInstanceControllerTest {
          rappInstanceDeployOrder.setDeployOrder(DeployOrder.DEPLOY);
          when(acmDeployer.deployRappInstance(any(), any())).thenReturn(true);
          when(smeDeployer.deployRappInstance(any(), any())).thenReturn(true);
+        when(dmeDeployer.deployRappInstance(any(), any())).thenReturn(true);
          mockMvc.perform(MockMvcRequestBuilders.put("/rapps/{rapp_id}/instance/{instance_id}", UUID.randomUUID(),
                                  UUID.randomUUID()).contentType(MediaType.APPLICATION_JSON)
                                  .content(objectMapper.writeValueAsString(rappInstanceDeployOrder)))
@@ -194,6 +201,7 @@ class RappInstanceControllerTest {
          rappInstanceDeployOrder.setDeployOrder(DeployOrder.UNDEPLOY);
          when(acmDeployer.undeployRappInstance(any(), any())).thenReturn(true);
          when(smeDeployer.undeployRappInstance(any(), any())).thenReturn(true);
+        when(dmeDeployer.undeployRappInstance(any(), any())).thenReturn(true);
          mockMvc.perform(MockMvcRequestBuilders.put("/rapps/{rapp_id}/instance/{instance_id}", rappId, rappInstanceId)
                                  .contentType(MediaType.APPLICATION_JSON)
                                  .content(objectMapper.writeValueAsString(rappInstanceDeployOrder)))
@@ -212,6 +220,7 @@ class RappInstanceControllerTest {
          rappInstanceDeployOrder.setDeployOrder(DeployOrder.UNDEPLOY);
          when(acmDeployer.undeployRappInstance(any(), any())).thenReturn(true);
          when(smeDeployer.undeployRappInstance(any(), any())).thenReturn(true);
+        when(dmeDeployer.undeployRappInstance(any(), any())).thenReturn(true);
          mockMvc.perform(MockMvcRequestBuilders.put("/rapps/{rapp_id}/instance/{instance_id}", rappId, rappInstanceId)
                                  .contentType(MediaType.APPLICATION_JSON)
                                  .content(objectMapper.writeValueAsString(rappInstanceDeployOrder)))
@@ -226,6 +235,7 @@ class RappInstanceControllerTest {
          rappInstanceDeployOrder.setDeployOrder(DeployOrder.UNDEPLOY);
          when(acmDeployer.undeployRappInstance(any(), any())).thenReturn(true);
          when(smeDeployer.undeployRappInstance(any(), any())).thenReturn(true);
+        when(dmeDeployer.undeployRappInstance(any(), any())).thenReturn(true);
          mockMvc.perform(MockMvcRequestBuilders.put("/rapps/{rapp_id}/instance/{instance_id}", rappId, rappInstanceId)
                                  .contentType(MediaType.APPLICATION_JSON)
                                  .content(objectMapper.writeValueAsString(rappInstanceDeployOrder)))
diff --git a/rapp-manager-application/src/test/java/com/oransc/rappmanager/service/RappServiceTest.java b/rapp-manager-application/src/test/java/com/oransc/rappmanager/service/RappServiceTest.java

index dbb3da7..c50f0b4 100755 (executable)
--- a/rapp-manager-application/src/test/java/com/oransc/rappmanager/service/RappServiceTest.java
+++ b/rapp-manager-application/src/test/java/com/oransc/rappmanager/service/RappServiceTest.java
@@ -5,6 +5,7 @@ import static org.mockito.ArgumentMatchers.any;
  import static org.mockito.Mockito.when;
  
  import com.oransc.rappmanager.acm.service.AcmDeployer;
+import com.oransc.rappmanager.dme.service.DmeDeployer;
  import com.oransc.rappmanager.models.rapp.Rapp;
  import com.oransc.rappmanager.models.rapp.RappState;
  import com.oransc.rappmanager.models.rappinstance.RappInstance;
@@ -34,6 +35,9 @@ class RappServiceTest {
      @MockBean
      SmeDeployer smeDeployer;
  
+    @MockBean
+    DmeDeployer dmeDeployer;
+
      @MockBean
      SmeLifecycleManager smeLifecycleManager;
  
@@ -44,15 +48,15 @@ class RappServiceTest {
  
      private final String validRappFile = "valid-rapp-package.csar";
  
-    private final String invalidRappFile = "invalid-rapp-package.csar";
-
  
      @Test
      void testPrimeRapp() {
          Rapp rapp = Rapp.builder().rappId(UUID.randomUUID()).name("").packageName(validRappFile)
                              .packageLocation(validCsarFileLocation).state(RappState.COMMISSIONED).build();
          when(acmDeployer.primeRapp(any())).thenReturn(true);
+        when(dmeDeployer.primeRapp(any())).thenReturn(true);
          assertEquals(HttpStatus.OK, rappService.primeRapp(rapp).getStatusCode());
+        assertEquals(RappState.PRIMED, rapp.getState());
      }
  
      @Test
@@ -67,23 +71,49 @@ class RappServiceTest {
          Rapp rapp = Rapp.builder().rappId(UUID.randomUUID()).name("").packageName(validRappFile)
                              .packageLocation(validCsarFileLocation).state(RappState.COMMISSIONED).build();
          when(acmDeployer.primeRapp(any())).thenReturn(false);
+        when(dmeDeployer.primeRapp(any())).thenReturn(true);
+        assertEquals(HttpStatus.OK, rappService.primeRapp(rapp).getStatusCode());
+        assertEquals(RappState.COMMISSIONED, rapp.getState());
+    }
+    @Test
+    void testPrimeRappDmeFailure() {
+        Rapp rapp = Rapp.builder().rappId(UUID.randomUUID()).name("").packageName(validRappFile)
+                            .packageLocation(validCsarFileLocation).state(RappState.COMMISSIONED).build();
+        when(acmDeployer.primeRapp(any())).thenReturn(true);
+        when(dmeDeployer.primeRapp(any())).thenReturn(false);
          assertEquals(HttpStatus.OK, rappService.primeRapp(rapp).getStatusCode());
+        assertEquals(RappState.COMMISSIONED, rapp.getState());
      }
  
+
      @Test
      void testDeprimeRapp() {
          Rapp rapp = Rapp.builder().rappId(UUID.randomUUID()).name("").packageName(validRappFile)
                              .packageLocation(validCsarFileLocation).state(RappState.PRIMED).build();
          when(acmDeployer.deprimeRapp(any())).thenReturn(true);
+        when(dmeDeployer.deprimeRapp(any())).thenReturn(true);
          assertEquals(HttpStatus.OK, rappService.deprimeRapp(rapp).getStatusCode());
+        assertEquals(RappState.COMMISSIONED, rapp.getState());
      }
  
      @Test
-    void testDeprimeRappFailure() {
+    void testDeprimeRappAcmFailure() {
          Rapp rapp = Rapp.builder().rappId(UUID.randomUUID()).name("").packageName(validRappFile)
                              .packageLocation(validCsarFileLocation).state(RappState.PRIMED).build();
          when(acmDeployer.deprimeRapp(any())).thenReturn(false);
+        when(dmeDeployer.deprimeRapp(any())).thenReturn(true);
          assertEquals(HttpStatus.OK, rappService.deprimeRapp(rapp).getStatusCode());
+        assertEquals(RappState.PRIMED, rapp.getState());
+    }
+
+    @Test
+    void testDeprimeRappDmeFailure() {
+        Rapp rapp = Rapp.builder().rappId(UUID.randomUUID()).name("").packageName(validRappFile)
+                            .packageLocation(validCsarFileLocation).state(RappState.PRIMED).build();
+        when(acmDeployer.deprimeRapp(any())).thenReturn(true);
+        when(dmeDeployer.deprimeRapp(any())).thenReturn(false);
+        assertEquals(HttpStatus.OK, rappService.deprimeRapp(rapp).getStatusCode());
+        assertEquals(RappState.PRIMED, rapp.getState());
      }
  
      @Test
@@ -91,14 +121,16 @@ class RappServiceTest {
          Rapp rapp = Rapp.builder().rappId(UUID.randomUUID()).name("").packageName(validRappFile)
                              .packageLocation(validCsarFileLocation).state(RappState.COMMISSIONED).build();
          assertEquals(HttpStatus.BAD_REQUEST, rappService.deprimeRapp(rapp).getStatusCode());
+        assertEquals(RappState.COMMISSIONED, rapp.getState());
      }
  
      @Test
      void testDeprimeRappActiveInstances() {
          Rapp rapp = Rapp.builder().rappId(UUID.randomUUID()).name("").packageName(validRappFile)
-                            .packageLocation(validCsarFileLocation).state(RappState.COMMISSIONED)
+                            .packageLocation(validCsarFileLocation).state(RappState.PRIMED)
                              .rappInstances(Map.of(UUID.randomUUID(), new RappInstance())).build();
          assertEquals(HttpStatus.BAD_REQUEST, rappService.deprimeRapp(rapp).getStatusCode());
+        assertEquals(RappState.PRIMED, rapp.getState());
      }
  
      @Test
@@ -109,6 +141,7 @@ class RappServiceTest {
          rappInstanceStateMachine.onboardRappInstance(rappInstance.getRappInstanceId());
          when(acmDeployer.deployRappInstance(any(), any())).thenReturn(true);
          when(smeDeployer.deployRappInstance(any(), any())).thenReturn(true);
+        when(dmeDeployer.deployRappInstance(any(), any())).thenReturn(true);
          assertEquals(HttpStatus.ACCEPTED, rappService.deployRappInstance(rapp, rappInstance).getStatusCode());
      }
  
@@ -120,6 +153,19 @@ class RappServiceTest {
          rappInstanceStateMachine.onboardRappInstance(rappInstance.getRappInstanceId());
          when(acmDeployer.deployRappInstance(any(), any())).thenReturn(true);
          when(smeDeployer.deployRappInstance(any(), any())).thenReturn(false);
+        when(dmeDeployer.deployRappInstance(any(), any())).thenReturn(true);
+        assertEquals(HttpStatus.BAD_GATEWAY, rappService.deployRappInstance(rapp, rappInstance).getStatusCode());
+    }
+
+    @Test
+    void testDeployRappInstanceDmeFailure() {
+        Rapp rapp = Rapp.builder().rappId(UUID.randomUUID()).name("").packageName(validRappFile)
+                            .packageLocation(validCsarFileLocation).state(RappState.PRIMED).build();
+        RappInstance rappInstance = new RappInstance();
+        rappInstanceStateMachine.onboardRappInstance(rappInstance.getRappInstanceId());
+        when(acmDeployer.deployRappInstance(any(), any())).thenReturn(true);
+        when(smeDeployer.deployRappInstance(any(), any())).thenReturn(true);
+        when(dmeDeployer.deployRappInstance(any(), any())).thenReturn(false);
          assertEquals(HttpStatus.BAD_GATEWAY, rappService.deployRappInstance(rapp, rappInstance).getStatusCode());
      }
  
@@ -132,6 +178,7 @@ class RappServiceTest {
          rappInstanceStateMachine.onboardRappInstance(rappInstance.getRappInstanceId());
          when(acmDeployer.undeployRappInstance(any(), any())).thenReturn(true);
          when(smeDeployer.undeployRappInstance(any(), any())).thenReturn(true);
+        when(dmeDeployer.undeployRappInstance(any(), any())).thenReturn(true);
          assertEquals(HttpStatus.ACCEPTED, rappService.undeployRappInstance(rapp, rappInstance).getStatusCode());
      }
  
@@ -144,6 +191,20 @@ class RappServiceTest {
          rappInstanceStateMachine.onboardRappInstance(rappInstance.getRappInstanceId());
          when(acmDeployer.undeployRappInstance(any(), any())).thenReturn(true);
          when(smeDeployer.undeployRappInstance(any(), any())).thenReturn(false);
+        when(dmeDeployer.undeployRappInstance(any(), any())).thenReturn(true);
+        assertEquals(HttpStatus.BAD_GATEWAY, rappService.undeployRappInstance(rapp, rappInstance).getStatusCode());
+    }
+
+    @Test
+    void testUndeployRappInstanceDmeFailure() {
+        Rapp rapp = Rapp.builder().rappId(UUID.randomUUID()).name("").packageName(validRappFile)
+                            .packageLocation(validCsarFileLocation).state(RappState.PRIMED).build();
+        RappInstance rappInstance = new RappInstance();
+        rappInstance.setState(RappInstanceState.DEPLOYED);
+        rappInstanceStateMachine.onboardRappInstance(rappInstance.getRappInstanceId());
+        when(acmDeployer.undeployRappInstance(any(), any())).thenReturn(true);
+        when(smeDeployer.undeployRappInstance(any(), any())).thenReturn(true);
+        when(dmeDeployer.undeployRappInstance(any(), any())).thenReturn(false);
          assertEquals(HttpStatus.BAD_GATEWAY, rappService.undeployRappInstance(rapp, rappInstance).getStatusCode());
      }
  
@@ -156,6 +217,7 @@ class RappServiceTest {
          rappInstanceStateMachine.onboardRappInstance(rappInstance.getRappInstanceId());
          when(acmDeployer.undeployRappInstance(any(), any())).thenReturn(true);
          when(smeDeployer.undeployRappInstance(any(), any())).thenReturn(false);
+        when(dmeDeployer.undeployRappInstance(any(), any())).thenReturn(true);
          assertEquals(HttpStatus.BAD_REQUEST, rappService.undeployRappInstance(rapp, rappInstance).getStatusCode());
      }
  }
diff --git a/rapp-manager-dme/pom.xml b/rapp-manager-dme/pom.xml

new file mode 100755 (executable)

index 0000000..6b8e83f
--- /dev/null
+++ b/rapp-manager-dme/pom.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+* ========================LICENSE_START=================================
+* O-RAN-SC
+* %%
+* Copyright (C) 2023 Nordix Foundation
+* %%
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+* ========================LICENSE_END===================================
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.o-ran-sc.nonrtric.plt</groupId>
+        <artifactId>rappmanager</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.o-ran-sc.nonrtric.plt.rappmanager</groupId>
+    <artifactId>rapp-manager-dme</artifactId>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.o-ran-sc.nonrtric.plt.rappmanager</groupId>
+            <artifactId>rapp-manager-models</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.openapitools</groupId>
+            <artifactId>jackson-databind-nullable</artifactId>
+            <version>${openapi.jackson.databind.nullable.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.openapitools</groupId>
+                <artifactId>openapi-generator-maven-plugin</artifactId>
+                <version>${openapi.maven.version}</version>
+                <executions>
+                    <execution>
+                        <id>dme-spec-generator</id>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                        <configuration>
+                            <inputSpec>${project.basedir}/src/main/resources/openapi/ics-api.yaml</inputSpec>
+                            <generatorName>java</generatorName>
+                            <library>resttemplate</library>
+                            <generateApiTests>false</generateApiTests>
+                            <generateModelTests>false</generateModelTests>
+                            <generateApiDocumentation>false</generateApiDocumentation>
+                            <generateModelDocumentation>false</generateModelDocumentation>
+                            <generateModels>true</generateModels>
+                            <additionalProperties>
+                                <additionalProperty>apiNameSuffix=ApiClient</additionalProperty>
+                            </additionalProperties>
+                            <configOptions>
+                                <sourceFolder>src/main/java</sourceFolder>
+                                <useJakartaEe>true</useJakartaEe>
+                                <invokerPackage>com.oransc.rappmanager.dme</invokerPackage>
+                                <apiPackage>com.oransc.rappmanager.dme.rest</apiPackage>
+                                <modelPackage>com.oransc.rappmanager.dme.data</modelPackage>
+                                <generateClientAsBean>false</generateClientAsBean>
+                            </configOptions>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
+\ No newline at end of file
diff --git a/rapp-manager-dme/src/main/java/com/oransc/rappmanager/dme/configuration/DmeConfiguration.java b/rapp-manager-dme/src/main/java/com/oransc/rappmanager/dme/configuration/DmeConfiguration.java

new file mode 100755 (executable)

index 0000000..e7cc151
--- /dev/null
+++ b/rapp-manager-dme/src/main/java/com/oransc/rappmanager/dme/configuration/DmeConfiguration.java
@@ -0,0 +1,30 @@
+/*-
+ * ============LICENSE_START======================================================================
+ * Copyright (C) 2023 Nordix Foundation. All rights reserved.
+ * ===============================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END========================================================================
+ */
+
+package com.oransc.rappmanager.dme.configuration;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ConfigurationProperties(prefix = "rappmanager.dme")
+@Data
+public class DmeConfiguration {
+    String baseUrl;
+}
diff --git a/rapp-manager-dme/src/main/java/com/oransc/rappmanager/dme/service/DmeDeployer.java b/rapp-manager-dme/src/main/java/com/oransc/rappmanager/dme/service/DmeDeployer.java

new file mode 100755 (executable)

index 0000000..388a565
--- /dev/null
+++ b/rapp-manager-dme/src/main/java/com/oransc/rappmanager/dme/service/DmeDeployer.java
@@ -0,0 +1,230 @@
+/*-
+ * ============LICENSE_START======================================================================
+ * Copyright (C) 2023 Nordix Foundation. All rights reserved.
+ * ===============================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END========================================================================
+ */
+
+package com.oransc.rappmanager.dme.service;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.oransc.rappmanager.dme.data.ConsumerJob;
+import com.oransc.rappmanager.dme.data.ProducerInfoTypeInfo;
+import com.oransc.rappmanager.dme.data.ProducerRegistrationInfo;
+import com.oransc.rappmanager.dme.rest.DataConsumerApiClient;
+import com.oransc.rappmanager.dme.rest.DataProducerRegistrationApiClient;
+import com.oransc.rappmanager.models.RappDeployer;
+import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
+import com.oransc.rappmanager.models.rapp.Rapp;
+import com.oransc.rappmanager.models.rapp.RappEvent;
+import com.oransc.rappmanager.models.rappinstance.RappInstance;
+import com.oransc.rappmanager.models.statemachine.RappInstanceStateMachine;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import lombok.RequiredArgsConstructor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class DmeDeployer implements RappDeployer {
+
+    Logger logger = LoggerFactory.getLogger(DmeDeployer.class);
+
+    private final DataProducerRegistrationApiClient dataProducerRegistrationApiClient;
+
+    private final DataConsumerApiClient dataConsumerApiClient;
+
+    private final RappCsarConfigurationHandler rappCsarConfigurationHandler;
+
+    private final ObjectMapper objectMapper;
+
+    private final RappInstanceStateMachine rappInstanceStateMachine;
+
+    @Override
+    public boolean deployRappInstance(Rapp rapp, RappInstance rappInstance) {
+        logger.debug("Deploying DME functions for RappInstance {}", rappInstance.getRappInstanceId());
+        boolean deployState = true;
+        if (rappInstance.getDme().getInfoTypesProducer() != null
+                    || rappInstance.getDme().getInfoTypeConsumer() != null) {
+            Set<String> infoTypes = new HashSet<>();
+            if (rappInstance.getDme().getInfoTypesProducer() != null) {
+                infoTypes.addAll(rappInstance.getDme().getInfoTypesProducer());
+            }
+            if (rappInstance.getDme().getInfoTypeConsumer() != null) {
+                infoTypes.add(rappInstance.getDme().getInfoTypeConsumer());
+            }
+            deployState = createInfoTypes(rapp, infoTypes);
+        }
+        if (rappInstance.getDme().getInfoProducer() != null) {
+            deployState = deployState && createInfoProducer(rapp, rappInstance.getDme().getInfoProducer());
+        }
+        if (rappInstance.getDme().getInfoConsumer() != null) {
+            deployState = deployState && createInfoConsumer(rapp, rappInstance.getDme().getInfoConsumer());
+        }
+        if (deployState) {
+            rappInstanceStateMachine.sendRappInstanceEvent(rappInstance, RappEvent.DMEDEPLOYED);
+        } else {
+            rappInstanceStateMachine.sendRappInstanceEvent(rappInstance, RappEvent.DMEDEPLOYFAILED);
+        }
+        return deployState;
+    }
+
+    @Override
+    public boolean undeployRappInstance(Rapp rapp, RappInstance rappInstance) {
+        logger.debug("Undeploying DME functions for RappInstance {}", rappInstance.getRappInstanceId());
+        boolean undeployState = true;
+        if (rappInstance.getDme().getInfoConsumer() != null) {
+            undeployState = deleteInfoConsumer(rapp, rappInstance.getDme().getInfoConsumer());
+        }
+        if (rappInstance.getDme().getInfoProducer() != null) {
+            undeployState = undeployState && deleteInfoProducer(rapp, rappInstance.getDme().getInfoProducer());
+        }
+        if (undeployState) {
+            rappInstanceStateMachine.sendRappInstanceEvent(rappInstance, RappEvent.DMEUNDEPLOYED);
+        } else {
+            rappInstanceStateMachine.sendRappInstanceEvent(rappInstance, RappEvent.DMEUNDEPLOYFAILED);
+        }
+        return undeployState;
+    }
+
+    @Override
+    public boolean primeRapp(Rapp rapp) {
+        logger.debug("Priming DME functions for rApp {}", rapp.getRappId());
+        try {
+            Set<String> requiredInfoTypes = new HashSet<>();
+            for (String producerResourceName : rapp.getRappResources().getDme().getInfoProducers()) {
+                String producerPayload =
+                        rappCsarConfigurationHandler.getDmeInfoProducerPayload(rapp, producerResourceName);
+                ProducerRegistrationInfo producerRegistrationInfo =
+                        objectMapper.readValue(producerPayload, ProducerRegistrationInfo.class);
+                requiredInfoTypes.addAll(producerRegistrationInfo.getSupportedInfoTypes());
+            }
+            for (String consumerResourceName : rapp.getRappResources().getDme().getInfoConsumers()) {
+                String consumerPayload =
+                        rappCsarConfigurationHandler.getDmeInfoConsumerPayload(rapp, consumerResourceName);
+                ConsumerJob consumerJob = objectMapper.readValue(consumerPayload, ConsumerJob.class);
+                requiredInfoTypes.add(consumerJob.getInfoTypeId());
+            }
+            Set<String> allInfoTypes = new HashSet<>(rapp.getRappResources().getDme().getInfoTypes());
+            requiredInfoTypes.removeAll(allInfoTypes);
+            if (!requiredInfoTypes.isEmpty()) {
+                allInfoTypes.addAll(dataProducerRegistrationApiClient.getInfoTypdentifiers());
+                requiredInfoTypes.removeAll(allInfoTypes);
+                if (!requiredInfoTypes.isEmpty()) {
+                    logger.info("Invalid rapp package as the following info types cannot be found {}",
+                            requiredInfoTypes);
+                    rapp.setIsDmeValid(false);
+                } else {
+                    rapp.setIsDmeValid(true);
+                }
+            } else {
+                rapp.setIsDmeValid(true);
+            }
+            return true;
+        } catch (Exception e) {
+            logger.warn("Failed to prime DME", e);
+            rapp.setIsDmeValid(false);
+            return false;
+        }
+    }
+
+    @Override
+    public boolean deprimeRapp(Rapp rapp) {
+        logger.debug("Depriming DME functions for rApp {}", rapp.getRappId());
+        rapp.setIsDmeValid(null);
+        return true;
+    }
+
+    boolean createInfoTypes(Rapp rApp, Set<String> infoTypes) {
+        logger.debug("Creating DME info types {} for rApp {}", infoTypes, rApp.getRappId());
+        try {
+            Map<String, ProducerInfoTypeInfo> producerInfoTypeInfoMap = new HashMap<>();
+            for (String infoType : infoTypes) {
+                String infoTypePayload = rappCsarConfigurationHandler.getDmeInfoTypePayload(rApp, infoType);
+                if (infoTypePayload != null && !infoTypePayload.isEmpty()) {
+                    producerInfoTypeInfoMap.put(infoType,
+                            objectMapper.readValue(infoTypePayload, ProducerInfoTypeInfo.class));
+                }
+            }
+            return producerInfoTypeInfoMap.entrySet().stream().map(stringProducerInfoTypeInfoEntry -> {
+                ResponseEntity<Object> objectResponseEntity = dataProducerRegistrationApiClient.putInfoTypeWithHttpInfo(
+                        stringProducerInfoTypeInfoEntry.getKey(), stringProducerInfoTypeInfoEntry.getValue());
+                return objectResponseEntity.getStatusCode().is2xxSuccessful();
+            }).reduce(true, (a, b) -> a && b);
+        } catch (Exception e) {
+            logger.warn("Error in creating info types {} for rApp {}", infoTypes, rApp.getRappId(), e);
+            return false;
+        }
+    }
+
+    boolean createInfoProducer(Rapp rApp, String producerResource) {
+        logger.debug("Creating DME info producer {} for rApp {}", producerResource, rApp.getRappId());
+        try {
+            String infoProducerPayload = rappCsarConfigurationHandler.getDmeInfoProducerPayload(rApp, producerResource);
+            ProducerRegistrationInfo producerRegistrationInfo =
+                    objectMapper.readValue(infoProducerPayload, ProducerRegistrationInfo.class);
+
+            ResponseEntity<Object> objectResponseEntity =
+                    dataProducerRegistrationApiClient.putInfoProducerWithHttpInfo(producerResource,
+                            producerRegistrationInfo);
+            return objectResponseEntity.getStatusCode().is2xxSuccessful();
+        } catch (Exception e) {
+            logger.warn("Error in creating info producer {} for rApp {}", producerResource, rApp.getRappId(), e);
+            return false;
+        }
+    }
+
+    boolean createInfoConsumer(Rapp rApp, String consumerResource) {
+        logger.debug("Creating DME info consumer {} for rApp {}", consumerResource, rApp.getRappId());
+        try {
+            String infoJobPayload = rappCsarConfigurationHandler.getDmeInfoConsumerPayload(rApp, consumerResource);
+            ConsumerJob consumerJob = objectMapper.readValue(infoJobPayload, ConsumerJob.class);
+            ResponseEntity<Object> objectResponseEntity =
+                    dataConsumerApiClient.putIndividualInfoJobWithHttpInfo(consumerResource, consumerJob);
+            return objectResponseEntity.getStatusCode().is2xxSuccessful();
+        } catch (Exception e) {
+            logger.warn("Error in creating info consumer {} for rApp {}", consumerResource, rApp.getRappId(), e);
+            return false;
+        }
+    }
+
+    boolean deleteInfoProducer(Rapp rApp, String producerResource) {
+        logger.debug("Deleting DME info producer {} for rApp {}", producerResource, rApp.getRappId());
+        try {
+            ResponseEntity<Object> objectResponseEntity =
+                    dataProducerRegistrationApiClient.deleteInfoProducerWithHttpInfo(producerResource);
+            return objectResponseEntity.getStatusCode().is2xxSuccessful();
+        } catch (Exception e) {
+            logger.warn("Error in deleting info producer {} for rApp {}", producerResource, rApp.getRappId(), e);
+            return false;
+        }
+    }
+
+    boolean deleteInfoConsumer(Rapp rApp, String consumerResource) {
+        logger.debug("Deleting DME info consumer {} for rApp {}", consumerResource, rApp.getRappId());
+        try {
+            ResponseEntity<Object> objectResponseEntity =
+                    dataConsumerApiClient.deleteIndividualInfoJobWithHttpInfo(consumerResource);
+            return objectResponseEntity.getStatusCode().is2xxSuccessful();
+        } catch (Exception e) {
+            logger.warn("Error in deleting info consumer {} for rApp {}", consumerResource, rApp.getRappId(), e);
+            return false;
+        }
+    }
+}
diff --git a/rapp-manager-dme/src/main/resources/openapi/ics-api.yaml b/rapp-manager-dme/src/main/resources/openapi/ics-api.yaml

new file mode 100755 (executable)

index 0000000..6762bc5
--- /dev/null
+++ b/rapp-manager-dme/src/main/resources/openapi/ics-api.yaml
@@ -0,0 +1,1669 @@
+openapi: 3.0.1
+info:
+  title: Data management and exposure
+  description: <h1>API documentation</h1><h2>General</h2><p>  The service is mainly
+    a broker between data producers and data consumers. A data producer has the ability
+    to produce one or several types of data (Information Type). One type of data can
+    be produced by zero to many producers. <br /><br />A data consumer can have several
+    active data subscriptions (Information Job). One Information Job consists of the
+    type of data to produce and additional parameters for filtering of the data. These
+    parameters are different for different data types.</p><h2>APIs provided by the
+    service</h2><h4>A1-EI</h4><p>  This API is between Near-RT RIC and the Non-RT
+    RIC.  The Near-RT RIC is a data consumer, which creates Information Jobs to subscribe
+    for data.  In this context, the information is referred to as 'Enrichment Information',
+    EI.</p><h4>Data producer API</h4><p>  This API is provided by the Non-RT RIC platform
+    and is intended to be part of the O-RAN R1 interface.  The API is for use by different
+    kinds of data producers and provides support for:<ul><li>Registry of supported
+    information types and which parameters needed to setup a subscription.</li><li>Registry
+    of existing data producers.</li><li>Callback API provided by producers to setup
+    subscriptions.</li></ul></p><h4>Data consumer API</h4><p>  This API is provided
+    by the Non-RT RIC platform and is intended to be part of the O-RAN R1 interface.  The
+    API is for use by different kinds of data consumers and provides support for:<ul><li>Querying
+    of available types of data to consume.</li><li>Management of data subscription
+    jobs</li><li>Optional callback API provided by consumers to get notification on
+    added and removed information types.</li></ul></p><h4>Service status</h4><p>  This
+    API provides a means to monitor the health of this service.</p>
+  license:
+    name: Copyright (C) 2020-2023 Nordix Foundation. Licensed under the Apache License.
+    url: http://www.apache.org/licenses/LICENSE-2.0
+  version: "1.0"
+servers:
+- url: /
+tags:
+- name: A1-EI (registration)
+  description: Data consumer EI job registration
+- name: A1-EI (callbacks)
+  description: Data consumer EI job status callbacks
+- name: Data consumer (callbacks)
+  description: API for data consumers
+- name: Data producer (registration)
+  description: API for data producers
+- name: Data producer (callbacks)
+  description: API implemented by data producers
+- name: Data consumer
+  description: API for data consumers
+- name: Service status
+  description: API for monitoring of the service
+- name: Actuator
+  description: Monitor and interact
+  externalDocs:
+    description: Spring Boot Actuator Web API Documentation
+    url: https://docs.spring.io/spring-boot/docs/current/actuator-api/html/
+- name: Authorization API
+  description: API used for authorization of information job access (this is provided
+    by an authorization producer such as OPA)
+paths:
+  /example-authz-check:
+    post:
+      tags:
+      - Authorization API
+      summary: Request for access authorization.
+      description: The authorization function decides if access is granted.
+      operationId: subscriptionAuth
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/subscription_authorization'
+        required: true
+      responses:
+        200:
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/authorization_result'
+  /data-producer/v1/info-types:
+    get:
+      tags:
+      - Data producer (registration)
+      summary: Info Type identifiers
+      operationId: getInfoTypdentifiers
+      responses:
+        200:
+          description: Info Type identifiers
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: string
+  /actuator/threaddump:
+    get:
+      tags:
+      - Actuator
+      summary: Actuator web endpoint 'threaddump'
+      operationId: threaddump
+      responses:
+        200:
+          description: OK
+          content:
+            text/plain;charset=UTF-8:
+              schema:
+                type: object
+            application/vnd.spring-boot.actuator.v3+json:
+              schema:
+                type: object
+            application/json:
+              schema:
+                type: object
+            application/vnd.spring-boot.actuator.v2+json:
+              schema:
+                type: object
+  /A1-EI/v1/eitypes/{eiTypeId}:
+    get:
+      tags:
+      - A1-EI (registration)
+      summary: Individual EI type
+      operationId: getEiType
+      parameters:
+      - name: eiTypeId
+        in: path
+        required: true
+        style: simple
+        explode: false
+        schema:
+          type: string
+      responses:
+        200:
+          description: EI type
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/EiTypeObject'
+        404:
+          description: Enrichment Information type is not found
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+  /data-producer/v1/info-types/{infoTypeId}:
+    get:
+      tags:
+      - Data producer (registration)
+      summary: Individual Information Type
+      operationId: getInfoType
+      parameters:
+      - name: infoTypeId
+        in: path
+        required: true
+        style: simple
+        explode: false
+        schema:
+          type: string
+      responses:
+        200:
+          description: Info Type
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/producer_info_type_info'
+        404:
+          description: Information type is not found
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+    put:
+      tags:
+      - Data producer (registration)
+      summary: Individual Information Type
+      operationId: putInfoType
+      parameters:
+      - name: infoTypeId
+        in: path
+        required: true
+        style: simple
+        explode: false
+        schema:
+          type: string
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/producer_info_type_info'
+        required: true
+      responses:
+        200:
+          description: Type updated
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Void'
+        201:
+          description: Type created
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Void'
+        400:
+          description: Input validation failed
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+    delete:
+      tags:
+      - Data producer (registration)
+      summary: Individual Information Type
+      description: Existing jobs of the type will be automatically deleted.
+      operationId: deleteInfoType
+      parameters:
+      - name: infoTypeId
+        in: path
+        required: true
+        style: simple
+        explode: false
+        schema:
+          type: string
+      responses:
+        200:
+          description: Not used
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Void'
+        204:
+          description: Producer deleted
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Void'
+        404:
+          description: Information type is not found
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+        409:
+          description: The Information type has one or several active producers
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+  /data-consumer/v1/info-type-subscription/{subscriptionId}:
+    get:
+      tags:
+      - Data consumer
+      summary: Individual subscription for information types (registration/deregistration)
+      operationId: getIndividualTypeSubscription
+      parameters:
+      - name: subscriptionId
+        in: path
+        required: true
+        style: simple
+        explode: false
+        schema:
+          type: string
+      responses:
+        200:
+          description: Type subscription
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/consumer_type_subscription_info'
+        404:
+          description: Subscription is not found
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+    put:
+      tags:
+      - Data consumer
+      summary: Individual subscription for information types (registration/deregistration)
+      description: This service operation is used to subscribe to notifications for
+        changes in the availability of data types.
+      operationId: putIndividualTypeSubscription
+      parameters:
+      - name: subscriptionId
+        in: path
+        required: true
+        style: simple
+        explode: false
+        schema:
+          type: string
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/consumer_type_subscription_info'
+        required: true
+      responses:
+        200:
+          description: Subscription updated
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Void'
+        201:
+          description: Subscription created
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Void'
+    delete:
+      tags:
+      - Data consumer
+      summary: Individual subscription for information types (registration/deregistration)
+      operationId: deleteIndividualTypeSubscription
+      parameters:
+      - name: subscriptionId
+        in: path
+        required: true
+        style: simple
+        explode: false
+        schema:
+          type: string
+      responses:
+        200:
+          description: Not used
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Void'
+        204:
+          description: Subscription deleted
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Void'
+        404:
+          description: Subscription is not found
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+  /example-dataproducer/health-check:
+    get:
+      tags:
+      - Data producer (callbacks)
+      summary: Producer supervision
+      description: The endpoint is provided by the Information Producer and is used
+        for supervision of the producer.
+      operationId: producerSupervision
+      responses:
+        200:
+          description: The producer is OK
+          content:
+            application/json:
+              schema:
+                type: string
+  /actuator/loggers:
+    get:
+      tags:
+      - Actuator
+      summary: Actuator web endpoint 'loggers'
+      operationId: loggers
+      responses:
+        200:
+          description: OK
+          content:
+            application/vnd.spring-boot.actuator.v3+json:
+              schema:
+                type: object
+            application/json:
+              schema:
+                type: object
+            application/vnd.spring-boot.actuator.v2+json:
+              schema:
+                type: object
+  /actuator/health/**:
+    get:
+      tags:
+      - Actuator
+      summary: Actuator web endpoint 'health-path'
+      operationId: health-path
+      responses:
+        200:
+          description: OK
+          content:
+            application/vnd.spring-boot.actuator.v3+json:
+              schema:
+                type: object
+            application/json:
+              schema:
+                type: object
+            application/vnd.spring-boot.actuator.v2+json:
+              schema:
+                type: object
+  /data-consumer/v1/info-types:
+    get:
+      tags:
+      - Data consumer
+      summary: Information type identifiers
+      operationId: getinfoTypeIdentifiers
+      responses:
+        200:
+          description: Information type identifiers
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: string
+  /example-dataconsumer/info-type-status:
+    post:
+      tags:
+      - Data consumer (callbacks)
+      summary: Callback for changed Information type registration status
+      description: The primitive is implemented by the data consumer and is invoked
+        when a Information type status has been changed. <br/>Subscription are managed
+        by primitives in 'Data consumer'
+      operationId: typeStatusCallback
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/consumer_type_registration_info'
+        required: true
+      responses:
+        200:
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Void'
+  /actuator/shutdown:
+    post:
+      tags:
+      - Actuator
+      summary: Actuator web endpoint 'shutdown'
+      operationId: shutdown
+      responses:
+        200:
+          description: OK
+          content:
+            application/vnd.spring-boot.actuator.v3+json:
+              schema:
+                type: object
+            application/json:
+              schema:
+                type: object
+            application/vnd.spring-boot.actuator.v2+json:
+              schema:
+                type: object
+  /actuator/metrics/{requiredMetricName}:
+    get:
+      tags:
+      - Actuator
+      summary: Actuator web endpoint 'metrics-requiredMetricName'
+      operationId: metrics-requiredMetricName
+      parameters:
+      - name: requiredMetricName
+        in: path
+        required: true
+        style: simple
+        explode: false
+        schema:
+          type: string
+      responses:
+        200:
+          description: OK
+          content:
+            application/vnd.spring-boot.actuator.v3+json:
+              schema:
+                type: object
+            application/json:
+              schema:
+                type: object
+            application/vnd.spring-boot.actuator.v2+json:
+              schema:
+                type: object
+  /actuator:
+    get:
+      tags:
+      - Actuator
+      summary: Actuator root web endpoint
+      operationId: links
+      responses:
+        200:
+          description: OK
+          content:
+            application/vnd.spring-boot.actuator.v3+json:
+              schema:
+                type: object
+                additionalProperties:
+                  type: object
+                  additionalProperties:
+                    $ref: '#/components/schemas/Link'
+            application/json:
+              schema:
+                type: object
+                additionalProperties:
+                  type: object
+                  additionalProperties:
+                    $ref: '#/components/schemas/Link'
+            application/vnd.spring-boot.actuator.v2+json:
+              schema:
+                type: object
+                additionalProperties:
+                  type: object
+                  additionalProperties:
+                    $ref: '#/components/schemas/Link'
+  /data-consumer/v1/info-jobs:
+    get:
+      tags:
+      - Data consumer
+      summary: Information Job identifiers
+      description: query for information job identifiers
+      operationId: getJobIds
+      parameters:
+      - name: infoTypeId
+        in: query
+        description: selects subscription jobs of matching information type
+        required: false
+        style: form
+        explode: true
+        schema:
+          type: string
+      - name: owner
+        in: query
+        description: selects result for one owner
+        required: false
+        style: form
+        explode: true
+        schema:
+          type: string
+      responses:
+        200:
+          description: Information information job identifiers
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: string
+        404:
+          description: Information type is not found
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+    delete:
+      tags:
+      - Data consumer
+      summary: Information Jobs
+      description: delete all jobs for one owner
+      operationId: deleteJobsForOwner
+      parameters:
+      - name: owner
+        in: query
+        description: selects result for one owner
+        required: true
+        style: form
+        explode: true
+        schema:
+          type: string
+      responses:
+        204:
+          description: No Content
+          content:
+            application/json:
+              schema:
+                type: object
+  /actuator/loggers/{name}:
+    get:
+      tags:
+      - Actuator
+      summary: Actuator web endpoint 'loggers-name'
+      operationId: loggers-name
+      parameters:
+      - name: name
+        in: path
+        required: true
+        style: simple
+        explode: false
+        schema:
+          type: string
+      responses:
+        200:
+          description: OK
+          content:
+            application/vnd.spring-boot.actuator.v3+json:
+              schema:
+                type: object
+            application/json:
+              schema:
+                type: object
+            application/vnd.spring-boot.actuator.v2+json:
+              schema:
+                type: object
+    post:
+      tags:
+      - Actuator
+      summary: Actuator web endpoint 'loggers-name'
+      operationId: loggers-name_2
+      parameters:
+      - name: name
+        in: path
+        required: true
+        style: simple
+        explode: false
+        schema:
+          type: string
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: string
+              enum:
+              - TRACE
+              - DEBUG
+              - INFO
+              - WARN
+              - ERROR
+              - FATAL
+              - OFF
+      responses:
+        200:
+          description: OK
+          content:
+            '*/*':
+              schema:
+                type: object
+  /example-dataproducer/info-job:
+    post:
+      tags:
+      - Data producer (callbacks)
+      summary: Callback for Information Job creation/modification
+      description: The call is invoked to activate or to modify a data subscription.
+        The endpoint is provided by the Information Producer.
+      operationId: jobCreatedCallback
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/producer_info_job_request'
+        required: true
+      responses:
+        200:
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Void'
+  /example-dataproducer/info-job/{infoJobId}:
+    delete:
+      tags:
+      - Data producer (callbacks)
+      summary: Callback for Information Job deletion
+      description: The call is invoked to terminate a data subscription. The endpoint
+        is provided by the Information Producer.
+      operationId: jobDeletedCallback
+      parameters:
+      - name: infoJobId
+        in: path
+        required: true
+        style: simple
+        explode: false
+        schema:
+          type: string
+      responses:
+        200:
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Void'
+  /A1-EI/v1/eijobs/{eiJobId}/status:
+    get:
+      tags:
+      - A1-EI (registration)
+      summary: EI job status
+      operationId: getEiJobStatus
+      parameters:
+      - name: eiJobId
+        in: path
+        required: true
+        style: simple
+        explode: false
+        schema:
+          type: string
+      responses:
+        200:
+          description: EI job status
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/EiJobStatusObject'
+        404:
+          description: Enrichment Information job is not found
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+  /data-producer/v1/info-producers/{infoProducerId}/status:
+    get:
+      tags:
+      - Data producer (registration)
+      summary: Information producer status
+      operationId: getInfoProducerStatus
+      parameters:
+      - name: infoProducerId
+        in: path
+        required: true
+        style: simple
+        explode: false
+        schema:
+          type: string
+      responses:
+        200:
+          description: Information producer status
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/producer_status'
+        404:
+          description: Information producer is not found
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+  /data-consumer/v1/info-jobs/{infoJobId}/status:
+    get:
+      tags:
+      - Data consumer
+      summary: Job status
+      operationId: getInfoJobStatus
+      parameters:
+      - name: infoJobId
+        in: path
+        required: true
+        style: simple
+        explode: false
+        schema:
+          type: string
+      responses:
+        200:
+          description: Information subscription job status
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/consumer_job_status'
+        404:
+          description: Information subscription job is not found
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+  /actuator/metrics:
+    get:
+      tags:
+      - Actuator
+      summary: Actuator web endpoint 'metrics'
+      operationId: metrics
+      responses:
+        200:
+          description: OK
+          content:
+            application/vnd.spring-boot.actuator.v3+json:
+              schema:
+                type: object
+            application/json:
+              schema:
+                type: object
+            application/vnd.spring-boot.actuator.v2+json:
+              schema:
+                type: object
+  /example-dataconsumer/info-jobs/{infoJobId}/status:
+    post:
+      tags:
+      - A1-EI (callbacks)
+      summary: Callback for changed Information Job status
+      description: The primitive is implemented by the data consumer and is invoked
+        when a Information Job status has been changed.
+      operationId: jobStatusCallback
+      parameters:
+      - name: infoJobId
+        in: path
+        required: true
+        style: simple
+        explode: false
+        schema:
+          type: string
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/EiJobStatusObject'
+        required: true
+      responses:
+        200:
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Void'
+  /actuator/info:
+    get:
+      tags:
+      - Actuator
+      summary: Actuator web endpoint 'info'
+      operationId: info
+      responses:
+        200:
+          description: OK
+          content:
+            application/vnd.spring-boot.actuator.v3+json:
+              schema:
+                type: object
+            application/json:
+              schema:
+                type: object
+            application/vnd.spring-boot.actuator.v2+json:
+              schema:
+                type: object
+  /A1-EI/v1/eitypes:
+    get:
+      tags:
+      - A1-EI (registration)
+      summary: EI type identifiers
+      operationId: getEiTypeIdentifiers
+      responses:
+        200:
+          description: EI type identifiers
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: string
+  /data-producer/v1/info-producers/{infoProducerId}:
+    get:
+      tags:
+      - Data producer (registration)
+      summary: Individual Information Producer
+      operationId: getInfoProducer
+      parameters:
+      - name: infoProducerId
+        in: path
+        required: true
+        style: simple
+        explode: false
+        schema:
+          type: string
+      responses:
+        200:
+          description: Information producer
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/producer_registration_info'
+        404:
+          description: Information producer is not found
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+    put:
+      tags:
+      - Data producer (registration)
+      summary: Individual Information Producer
+      operationId: putInfoProducer
+      parameters:
+      - name: infoProducerId
+        in: path
+        required: true
+        style: simple
+        explode: false
+        schema:
+          type: string
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/producer_registration_info'
+        required: true
+      responses:
+        200:
+          description: Producer updated
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Void'
+        201:
+          description: Producer created
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Void'
+        400:
+          description: Input validation failed
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+        404:
+          description: Producer type not found
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+    delete:
+      tags:
+      - Data producer (registration)
+      summary: Individual Information Producer
+      operationId: deleteInfoProducer
+      parameters:
+      - name: infoProducerId
+        in: path
+        required: true
+        style: simple
+        explode: false
+        schema:
+          type: string
+      responses:
+        200:
+          description: Not used
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Void'
+        204:
+          description: Producer deleted
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Void'
+        404:
+          description: Producer is not found
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+  /status:
+    get:
+      tags:
+      - Service status
+      summary: Returns status and statistics of this service
+      operationId: getStatus
+      responses:
+        200:
+          description: Service is living
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/service_status_info'
+  /data-consumer/v1/info-type-subscription:
+    get:
+      tags:
+      - Data consumer
+      summary: Information type subscription identifiers
+      description: query for information type subscription identifiers
+      operationId: getInfoTypeSubscriptions
+      parameters:
+      - name: owner
+        in: query
+        description: selects result for one owner
+        required: false
+        style: form
+        explode: true
+        schema:
+          type: string
+      responses:
+        200:
+          description: Information type subscription identifiers
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: string
+  /A1-EI/v1/eijobs/{eiJobId}:
+    get:
+      tags:
+      - A1-EI (registration)
+      summary: Individual EI job
+      operationId: getIndividualEiJob
+      parameters:
+      - name: eiJobId
+        in: path
+        required: true
+        style: simple
+        explode: false
+        schema:
+          type: string
+      responses:
+        200:
+          description: EI job
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/EiJobObject'
+        404:
+          description: Enrichment Information job is not found
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+    put:
+      tags:
+      - A1-EI (registration)
+      summary: Individual EI job
+      description: If the requested info_type_id is not found, an attempt to find
+        a compatible version is made. As an example, 'type_1.9.0' is backwards compatible
+        with 'type_1.0.0'
+      operationId: putIndividualEiJob
+      parameters:
+      - name: eiJobId
+        in: path
+        required: true
+        style: simple
+        explode: false
+        schema:
+          type: string
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/EiJobObject'
+        required: true
+      responses:
+        200:
+          description: Job updated
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Void'
+        201:
+          description: Job created
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Void'
+        400:
+          description: Input validation failed
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+        404:
+          description: Enrichment Information type is not found
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+        409:
+          description: Cannot modify job type
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+    delete:
+      tags:
+      - A1-EI (registration)
+      summary: Individual EI job
+      operationId: deleteIndividualEiJob
+      parameters:
+      - name: eiJobId
+        in: path
+        required: true
+        style: simple
+        explode: false
+        schema:
+          type: string
+      responses:
+        200:
+          description: Not used
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Void'
+        204:
+          description: Job deleted
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Void'
+        404:
+          description: Enrichment Information job is not found
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+  /actuator/logfile:
+    get:
+      tags:
+      - Actuator
+      summary: Actuator web endpoint 'logfile'
+      operationId: logfile
+      responses:
+        200:
+          description: OK
+          content:
+            text/plain;charset=UTF-8:
+              schema:
+                type: object
+  /data-consumer/v1/info-jobs/{infoJobId}:
+    get:
+      tags:
+      - Data consumer
+      summary: Individual data subscription job
+      operationId: getIndividualInfoJob
+      parameters:
+      - name: infoJobId
+        in: path
+        required: true
+        style: simple
+        explode: false
+        schema:
+          type: string
+      responses:
+        200:
+          description: Information subscription job
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/consumer_job'
+        404:
+          description: Information subscription job is not found
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+    put:
+      tags:
+      - Data consumer
+      summary: Individual data subscription job
+      description: The job will be enabled when a producer is available. If the requested
+        info_type_id is not found, an attempt to find a compatible version is made.
+        As an example, 'type_1.9.0' is backwards compatible with 'type_1.0.0'
+      operationId: putIndividualInfoJob
+      parameters:
+      - name: infoJobId
+        in: path
+        required: true
+        style: simple
+        explode: false
+        schema:
+          type: string
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/consumer_job'
+        required: true
+      responses:
+        200:
+          description: Job updated
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Void'
+        201:
+          description: Job created
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Void'
+        400:
+          description: Input validation failed
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+        404:
+          description: Information type is not found
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+        409:
+          description: Cannot modify job type
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+    delete:
+      tags:
+      - Data consumer
+      summary: Individual data subscription job
+      operationId: deleteIndividualInfoJob
+      parameters:
+      - name: infoJobId
+        in: path
+        required: true
+        style: simple
+        explode: false
+        schema:
+          type: string
+      responses:
+        200:
+          description: Not used
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Void'
+        204:
+          description: Job deleted
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Void'
+        404:
+          description: Information subscription job is not found
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+  /data-producer/v1/info-producers:
+    get:
+      tags:
+      - Data producer (registration)
+      summary: Information producer identifiers
+      operationId: getInfoProducerIdentifiers
+      parameters:
+      - name: infoTypeId
+        in: query
+        description: If given, only the producers for the Info Type is returned.
+        required: false
+        style: form
+        explode: true
+        schema:
+          type: string
+      responses:
+        200:
+          description: Information producer identifiers
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: string
+  /data-consumer/v1/info-types/{infoTypeId}:
+    get:
+      tags:
+      - Data consumer
+      summary: Individual information type
+      operationId: getInfoType_1
+      parameters:
+      - name: infoTypeId
+        in: path
+        required: true
+        style: simple
+        explode: false
+        schema:
+          type: string
+      responses:
+        200:
+          description: Information type
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/consumer_information_type'
+        404:
+          description: Information type is not found
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+  /actuator/health:
+    get:
+      tags:
+      - Actuator
+      summary: Actuator web endpoint 'health'
+      operationId: health
+      responses:
+        200:
+          description: OK
+          content:
+            application/vnd.spring-boot.actuator.v3+json:
+              schema:
+                type: object
+            application/json:
+              schema:
+                type: object
+            application/vnd.spring-boot.actuator.v2+json:
+              schema:
+                type: object
+  /A1-EI/v1/eijobs:
+    get:
+      tags:
+      - A1-EI (registration)
+      summary: EI job identifiers
+      description: query for EI job identifiers
+      operationId: getEiJobIds
+      parameters:
+      - name: eiTypeId
+        in: query
+        description: selects EI jobs of matching EI type
+        required: false
+        style: form
+        explode: true
+        schema:
+          type: string
+      - name: owner
+        in: query
+        description: selects EI jobs for one EI job owner
+        required: false
+        style: form
+        explode: true
+        schema:
+          type: string
+      responses:
+        200:
+          description: EI job identifiers
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: string
+        404:
+          description: Enrichment Information type is not found
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+  /data-producer/v1/info-producers/{infoProducerId}/info-jobs:
+    get:
+      tags:
+      - Data producer (registration)
+      summary: Information Job definitions
+      description: Information Job definitions for one Information Producer
+      operationId: getInfoProducerJobs
+      parameters:
+      - name: infoProducerId
+        in: path
+        required: true
+        style: simple
+        explode: false
+        schema:
+          type: string
+      responses:
+        200:
+          description: Information producer
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/producer_info_job_request'
+        404:
+          description: Information producer is not found
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+  /actuator/heapdump:
+    get:
+      tags:
+      - Actuator
+      summary: Actuator web endpoint 'heapdump'
+      operationId: heapdump
+      responses:
+        200:
+          description: OK
+          content:
+            application/octet-stream:
+              schema:
+                type: object
+components:
+  schemas:
+    consumer_information_type:
+      required:
+      - job_data_schema
+      - no_of_producers
+      - type_status
+      type: object
+      properties:
+        no_of_producers:
+          type: integer
+          description: The number of registered producers for the type
+          format: int32
+        type_status:
+          type: string
+          description: 'Allowed values: <br/>ENABLED: one or several producers for
+            the information type are available <br/>DISABLED: no producers for the
+            information type are available'
+          enum:
+          - ENABLED
+          - DISABLED
+        job_data_schema:
+          type: object
+          description: Json schema for the job data
+      description: Information for an Information type
+    EiTypeObject:
+      type: object
+      description: Information for an EI type
+    authorization_result:
+      required:
+      - result
+      type: object
+      properties:
+        result:
+          type: boolean
+          description: If true, the access is granted
+      description: Result of authorization
+    service_status_info:
+      required:
+      - no_of_jobs
+      - no_of_producers
+      - no_of_types
+      - status
+      type: object
+      properties:
+        no_of_producers:
+          type: integer
+          description: Number of Information Producers
+          format: int32
+        no_of_types:
+          type: integer
+          description: Number of Information Types
+          format: int32
+        no_of_jobs:
+          type: integer
+          description: Number of Information Jobs
+          format: int32
+        status:
+          type: string
+          description: status text
+    producer_registration_info:
+      required:
+      - info_job_callback_url
+      - info_producer_supervision_callback_url
+      - supported_info_types
+      type: object
+      properties:
+        info_producer_supervision_callback_url:
+          type: string
+          description: callback for producer supervision
+        supported_info_types:
+          type: array
+          description: Supported Information Type IDs
+          items:
+            type: string
+            description: Supported Information Type IDs
+        info_job_callback_url:
+          type: string
+          description: callback for Information Job
+      description: Information for an Information Producer
+    consumer_type_registration_info:
+      required:
+      - info_type_id
+      - job_data_schema
+      - status
+      type: object
+      properties:
+        info_type_id:
+          type: string
+          description: Information type identifier
+        job_data_schema:
+          type: object
+          description: Json schema for the job data
+        status:
+          type: string
+          description: 'Allowed values: <br/>REGISTERED: the information type has
+            been registered <br/>DEREGISTERED: the information type has been removed'
+          enum:
+          - REGISTERED
+          - DEREGISTERED
+      description: Information for an Information type
+    ProblemDetails:
+      type: object
+      properties:
+        detail:
+          type: string
+          description: A human-readable explanation specific to this occurrence of
+            the problem.
+          example: Information Job type not found
+        status:
+          type: integer
+          description: The HTTP status code generated by the origin server for this
+            occurrence of the problem.
+          format: int32
+          example: 404
+      description: A problem detail to carry details in a HTTP response according
+        to RFC 7807
+    EiJobStatusObject:
+      required:
+      - eiJobStatus
+      type: object
+      properties:
+        eiJobStatus:
+          type: string
+          description: 'Allowed values for EI job status: <br/>ENABLED: the A1-EI
+            producer is able to deliver EI result for the EI job <br/>DISABLED: the
+            A1-EI producer is unable to deliver EI result for the EI job'
+          enum:
+          - ENABLED
+          - DISABLED
+      description: Status for an EI job
+    consumer_job_status:
+      required:
+      - info_job_status
+      - producers
+      type: object
+      properties:
+        info_job_status:
+          type: string
+          description: 'Allowed values: <br/>ENABLED: the A1-Information producer
+            is able to deliver result for the Information Job <br/>DISABLED: the A1-Information
+            producer is unable to deliver result for the Information Job'
+          enum:
+          - ENABLED
+          - DISABLED
+        producers:
+          type: array
+          description: An array of all registered Information Producer Identifiers.
+          items:
+            type: string
+            description: An array of all registered Information Producer Identifiers.
+      description: Status for an Information Job
+    EiJobObject:
+      required:
+      - eiTypeId
+      - jobDefinition
+      - jobOwner
+      - jobResultUri
+      type: object
+      properties:
+        eiTypeId:
+          type: string
+          description: EI type Idenitifier of the EI job
+        jobResultUri:
+          type: string
+          description: The target URI of the EI data
+        jobOwner:
+          type: string
+          description: Identity of the owner of the job
+        statusNotificationUri:
+          type: string
+          description: The target of EI job status notifications
+        jobDefinition:
+          type: object
+          description: EI type specific job data
+      description: Information for an Enrichment Information Job
+    subscription_authorization:
+      required:
+      - input
+      type: object
+      properties:
+        input:
+          $ref: '#/components/schemas/input'
+      description: Authorization request for subscription requests
+    producer_info_type_info:
+      required:
+      - info_job_data_schema
+      type: object
+      properties:
+        info_type_information:
+          type: object
+          description: Type specific information for the information type
+        info_job_data_schema:
+          type: object
+          description: Json schema for the job data
+      description: Information for an Information Type
+    producer_info_job_request:
+      required:
+      - info_job_identity
+      type: object
+      properties:
+        owner:
+          type: string
+          description: The owner of the job. This is a string that indentifies the
+            job owner, which could be an application, a POD or something else.
+        last_updated:
+          type: string
+          description: The time when the job was last updated or created (ISO-8601)
+        info_job_identity:
+          type: string
+          description: Identity of the Information Job
+        target_uri:
+          type: string
+          description: URI for the target of the produced Information. Note, this
+            is deprecated and will be removed. The information on how the data is
+            delivered is type specific and should be defined in the type specific
+            info_job_data.
+        info_job_data:
+          type: object
+          description: Json for the job data
+        info_type_identity:
+          type: string
+          description: Type identity for the job
+      description: The body of the Information Producer callbacks for Information
+        Job creation and deletion
+    input:
+      required:
+      - access_type
+      - auth_token
+      - info_type_id
+      - job_definition
+      type: object
+      properties:
+        access_type:
+          type: string
+          description: Access type
+          enum:
+          - READ
+          - WRITE
+        info_type_id:
+          type: string
+          description: Information type identifier
+        job_definition:
+          type: object
+          description: Information type specific job data
+        auth_token:
+          type: string
+          description: Authorization token
+      description: input
+    consumer_job:
+      required:
+      - info_type_id
+      - job_definition
+      - job_owner
+      - job_result_uri
+      type: object
+      properties:
+        info_type_id:
+          type: string
+          description: Information type Idenitifier of the subscription job
+        job_result_uri:
+          type: string
+          description: The target URI of the subscribed information
+        job_owner:
+          type: string
+          description: Identity of the owner of the job
+        job_definition:
+          type: object
+          description: Information type specific job data
+        status_notification_uri:
+          type: string
+          description: The target of Information subscription job status notifications
+      description: Information for an Information Job
+    producer_status:
+      required:
+      - operational_state
+      type: object
+      properties:
+        operational_state:
+          type: string
+          description: Represents the operational states
+          enum:
+          - ENABLED
+          - DISABLED
+      description: Status for an Info Producer
+    Void:
+      type: object
+      description: 'Void/empty '
+    Link:
+      type: object
+      properties:
+        templated:
+          type: boolean
+        href:
+          type: string
+    consumer_type_subscription_info:
+      required:
+      - owner
+      - status_result_uri
+      type: object
+      properties:
+        owner:
+          type: string
+          description: Identity of the owner of the subscription
+        status_result_uri:
+          type: string
+          description: The target URI of the subscribed information
+      description: Information for an information type subscription
diff --git a/rapp-manager-dme/src/test/java/com/oransc/rappmanager/dme/service/BeanTestConfiguration.java b/rapp-manager-dme/src/test/java/com/oransc/rappmanager/dme/service/BeanTestConfiguration.java

new file mode 100755 (executable)

index 0000000..d22e939
--- /dev/null
+++ b/rapp-manager-dme/src/test/java/com/oransc/rappmanager/dme/service/BeanTestConfiguration.java
@@ -0,0 +1,78 @@
+/*-
+ * ============LICENSE_START======================================================================
+ * Copyright (C) 2023 Nordix Foundation. All rights reserved.
+ * ===============================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END========================================================================
+ */
+
+package com.oransc.rappmanager.dme.service;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.oransc.rappmanager.dme.configuration.DmeConfiguration;
+import com.oransc.rappmanager.dme.rest.DataConsumerApiClient;
+import com.oransc.rappmanager.dme.rest.DataProducerRegistrationApiClient;
+import lombok.RequiredArgsConstructor;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
+import org.springframework.context.annotation.Bean;
+import org.springframework.web.client.RestTemplate;
+
+@TestConfiguration
+@RequiredArgsConstructor
+public class BeanTestConfiguration {
+
+    private final DmeConfiguration dmeConfiguration;
+
+    @Bean
+    public ObjectMapper objectMapper() {
+        ObjectMapper objectMapper = new ObjectMapper();
+        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        return objectMapper;
+    }
+
+    @Bean
+    public RestTemplateBuilder restTemplateBuilder() {
+        return new RestTemplateBuilder();
+    }
+
+    @Bean
+    public CacheManager cacheManager() {
+        return new ConcurrentMapCacheManager(); // or any other CacheManager implementation you want to use in the test
+    }
+
+    @Bean
+    public RestTemplate restTemplate(RestTemplateBuilder builder) {
+        return builder.build();
+    }
+
+    @Bean
+    public com.oransc.rappmanager.dme.ApiClient dmeApiClient(RestTemplate restTemplate) {
+        com.oransc.rappmanager.dme.ApiClient apiClient = new com.oransc.rappmanager.dme.ApiClient(restTemplate);
+        return apiClient.setBasePath(dmeConfiguration.getBaseUrl());
+    }
+
+    @Bean
+    public DataProducerRegistrationApiClient dataProducerRegistrationApiClient(
+            com.oransc.rappmanager.dme.ApiClient apiClient) {
+        return new DataProducerRegistrationApiClient(apiClient);
+    }
+
+    @Bean
+    public DataConsumerApiClient dataConsumerApiClient(com.oransc.rappmanager.dme.ApiClient apiClient) {
+        return new DataConsumerApiClient(apiClient);
+    }
+}
diff --git a/rapp-manager-dme/src/test/java/com/oransc/rappmanager/dme/service/DmeDeployerTest.java b/rapp-manager-dme/src/test/java/com/oransc/rappmanager/dme/service/DmeDeployerTest.java

new file mode 100755 (executable)

index 0000000..5b97b2d
--- /dev/null
+++ b/rapp-manager-dme/src/test/java/com/oransc/rappmanager/dme/service/DmeDeployerTest.java
@@ -0,0 +1,350 @@
+/*-
+ * ============LICENSE_START======================================================================
+ * Copyright (C) 2023 Nordix Foundation. All rights reserved.
+ * ===============================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END========================================================================
+ */
+
+package com.oransc.rappmanager.dme.service;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.method;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo;
+import static org.springframework.test.web.client.response.MockRestResponseCreators.withStatus;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.oransc.rappmanager.dme.configuration.DmeConfiguration;
+import com.oransc.rappmanager.models.cache.RappCacheService;
+import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
+import com.oransc.rappmanager.models.rapp.Rapp;
+import com.oransc.rappmanager.models.rapp.RappDmeResourceBuilder;
+import com.oransc.rappmanager.models.rapp.RappResources;
+import com.oransc.rappmanager.models.rapp.RappState;
+import com.oransc.rappmanager.models.rappinstance.RappInstance;
+import com.oransc.rappmanager.models.statemachine.RappInstanceStateMachine;
+import com.oransc.rappmanager.models.statemachine.RappInstanceStateMachineConfig;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
+import java.util.stream.Stream;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.test.web.client.ExpectedCount;
+import org.springframework.test.web.client.MockRestServiceServer;
+import org.springframework.web.client.RestTemplate;
+
+@SpringBootTest(classes = {DmeConfiguration.class, DmeDeployer.class, BeanTestConfiguration.class,
+        RappCsarConfigurationHandler.class, RappCacheService.class, RappInstanceStateMachineConfig.class,
+        RappInstanceStateMachine.class})
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@AutoConfigureMockMvc
+class DmeDeployerTest {
+
+    MockRestServiceServer mockServer;
+    @SpyBean
+    DmeDeployer dmeDeployer;
+    @Autowired
+    RestTemplate restTemplate;
+    @Autowired
+    DmeConfiguration dmeConfiguration;
+    @SpyBean
+    RappInstanceStateMachine rappInstanceStateMachine;
+
+    RappDmeResourceBuilder rappDmeResourceBuilder = new RappDmeResourceBuilder();
+
+    private static final String validRappFile = "valid-rapp-package.csar";
+    private static final String validRappFileNewInfoType = "valid-rapp-package-new-info-type.csar";
+    String validCsarFileLocation = "src/test/resources/";
+    ObjectMapper objectMapper = new ObjectMapper();
+
+    String URI_INFO_TYPES, URI_INFO_TYPE, URI_INFO_PRODUCER, URI_INFO_CONSUMER;
+
+    @BeforeAll
+    void initACMURI() {
+        URI_INFO_TYPES = dmeConfiguration.getBaseUrl() + "/data-producer/v1/info-types";
+        URI_INFO_TYPE = dmeConfiguration.getBaseUrl() + "/data-producer/v1/info-types/%s";
+        URI_INFO_PRODUCER = dmeConfiguration.getBaseUrl() + "/data-producer/v1/info-producers/%s";
+        URI_INFO_CONSUMER = dmeConfiguration.getBaseUrl() + "/data-consumer/v1/info-jobs/%s";
+    }
+
+    @BeforeEach
+    public void init() {
+        mockServer = MockRestServiceServer.createServer(restTemplate);
+    }
+
+    @ParameterizedTest
+    @MethodSource("getSuccessParamsWithUnavailableInfoTypes")
+    void testPrimeRappSuccessWithUnavailableInfoType(String rappFile, boolean result) throws JsonProcessingException {
+        RappResources rappResources = rappDmeResourceBuilder.getResources();
+        Rapp rapp = getRapp(Optional.empty());
+        rapp.setPackageName(rappFile);
+        rapp.setRappResources(rappResources);
+        List<String> infoTypes = List.of();
+        mockServer.expect(ExpectedCount.once(), requestTo(URI_INFO_TYPES)).andExpect(method(HttpMethod.GET)).andRespond(
+                withStatus(HttpStatus.OK).contentType(MediaType.APPLICATION_JSON)
+                        .body(objectMapper.writeValueAsString(infoTypes)));
+        assertTrue(dmeDeployer.primeRapp(rapp));
+        if (rappFile.equals(validRappFileNewInfoType)) {
+            mockServer.verify();
+        }
+        assertEquals(rapp.getIsDmeValid(), result);
+    }
+
+    private static Stream<Arguments> getSuccessParamsWithUnavailableInfoTypes() {
+        return Stream.of(Arguments.of(validRappFile, true), Arguments.of(validRappFileNewInfoType, false));
+    }
+
+    @ParameterizedTest
+    @MethodSource("getSuccessParamsWithAvailableInfoTypes")
+    void testPrimeRappSuccessWithValidInfoType(String rappFile, boolean result) throws JsonProcessingException {
+        RappResources rappResources = rappDmeResourceBuilder.getResources();
+        Rapp rapp = getRapp(Optional.empty());
+        rapp.setPackageName(rappFile);
+        rapp.setRappResources(rappResources);
+        List<String> infoTypes = List.of("new-info-type-not-available");
+        mockServer.expect(ExpectedCount.once(), requestTo(URI_INFO_TYPES)).andExpect(method(HttpMethod.GET)).andRespond(
+                withStatus(HttpStatus.OK).contentType(MediaType.APPLICATION_JSON)
+                        .body(objectMapper.writeValueAsString(infoTypes)));
+        assertTrue(dmeDeployer.primeRapp(rapp));
+        if (rappFile.equals(validRappFileNewInfoType)) {
+            mockServer.verify();
+        }
+        assertEquals(rapp.getIsDmeValid(), result);
+    }
+
+    private static Stream<Arguments> getSuccessParamsWithAvailableInfoTypes() {
+        return Stream.of(Arguments.of(validRappFile, true), Arguments.of(validRappFileNewInfoType, true));
+    }
+
+    @Test
+    void testPrimeRappFailure() {
+        RappResources rappResources = rappDmeResourceBuilder.getResources();
+        RappResources.DMEResources dme = rappResources.getDme();
+        Set<String> infoProducers = new HashSet<>(rappResources.getDme().getInfoProducers());
+        infoProducers.add("invalid-producer-not-available-in-rapp");
+        dme.setInfoProducers(infoProducers);
+        rappResources.setDme(dme);
+        Rapp rapp = getRapp(Optional.empty());
+        rapp.setRappResources(rappResources);
+        assertFalse(dmeDeployer.primeRapp(rapp));
+        assertFalse(rapp.getIsDmeValid());
+    }
+
+    @Test
+    void testDeprimeRapp() {
+        Rapp rapp = getRapp(Optional.empty());
+        rapp.setIsDmeValid(true);
+        assertTrue(dmeDeployer.deprimeRapp(rapp));
+        assertNull(rapp.getIsDmeValid());
+    }
+
+    @Test
+    void testDeployrAppInstanceSuccess() {
+        Rapp rapp = getRapp(Optional.empty());
+        RappInstance rappInstance = rappDmeResourceBuilder.getRappInstance();
+        getMockServerClientCreateInfoType(rappInstance.getDme().getInfoTypesProducer().toArray()[0].toString(), true);
+        getMockServerClientCreateInfoProducer(rappInstance.getDme().getInfoProducer(), true);
+        getMockServerClientCreateInfoConsumer(rappInstance.getDme().getInfoConsumer(), true);
+        rappInstanceStateMachine.onboardRappInstance(rappInstance.getRappInstanceId());
+        assertTrue(dmeDeployer.deployRappInstance(rapp, rappInstance));
+        mockServer.verify();
+    }
+
+    @Test
+    void testDeployrAppInstanceSuccessWithoutConsumer() {
+        Rapp rapp = getRapp(Optional.empty());
+        RappInstance rappInstance = rappDmeResourceBuilder.getRappInstance();
+        rappInstance.getDme().setInfoTypeConsumer(null);
+        rappInstance.getDme().setInfoConsumer(null);
+        getMockServerClientCreateInfoType(rappInstance.getDme().getInfoTypesProducer().toArray()[0].toString(), true);
+        getMockServerClientCreateInfoProducer(rappInstance.getDme().getInfoProducer(), true);
+        rappInstanceStateMachine.onboardRappInstance(rappInstance.getRappInstanceId());
+        assertTrue(dmeDeployer.deployRappInstance(rapp, rappInstance));
+        mockServer.verify();
+    }
+
+    @Test
+    void testDeployrAppInstanceWithoutProducer() {
+        Rapp rapp = getRapp(Optional.empty());
+        RappInstance rappInstance = rappDmeResourceBuilder.getRappInstance();
+        rappInstance.getDme().setInfoTypesProducer(null);
+        rappInstance.getDme().setInfoProducer(null);
+        getMockServerClientCreateInfoType(rappInstance.getDme().getInfoTypeConsumer(), true);
+        getMockServerClientCreateInfoConsumer(rappInstance.getDme().getInfoConsumer(), true);
+        rappInstanceStateMachine.onboardRappInstance(rappInstance.getRappInstanceId());
+        assertTrue(dmeDeployer.deployRappInstance(rapp, rappInstance));
+        mockServer.verify();
+    }
+
+    @Test
+    void testDeployrAppInstanceFailureWithInfoType() {
+        Rapp rapp = getRapp(Optional.empty());
+        RappInstance rappInstance = rappDmeResourceBuilder.getRappInstance();
+        getMockServerClientCreateInfoType(rappInstance.getDme().getInfoTypesProducer().toArray()[0].toString(), false);
+        rappInstanceStateMachine.onboardRappInstance(rappInstance.getRappInstanceId());
+        assertFalse(dmeDeployer.deployRappInstance(rapp, rappInstance));
+        mockServer.verify();
+    }
+
+    @Test
+    void testDeployrAppInstanceFailureWithInfoProducer() {
+        Rapp rapp = getRapp(Optional.empty());
+        RappInstance rappInstance = rappDmeResourceBuilder.getRappInstance();
+        getMockServerClientCreateInfoType(rappInstance.getDme().getInfoTypesProducer().toArray()[0].toString(), true);
+        getMockServerClientCreateInfoProducer(rappInstance.getDme().getInfoProducer(), false);
+        rappInstanceStateMachine.onboardRappInstance(rappInstance.getRappInstanceId());
+        assertFalse(dmeDeployer.deployRappInstance(rapp, rappInstance));
+        mockServer.verify();
+    }
+
+    @Test
+    void testDeployrAppInstanceFailureWithInfoConsumer() {
+        Rapp rapp = getRapp(Optional.empty());
+        RappInstance rappInstance = rappDmeResourceBuilder.getRappInstance();
+        getMockServerClientCreateInfoType(rappInstance.getDme().getInfoTypesProducer().toArray()[0].toString(), true);
+        getMockServerClientCreateInfoProducer(rappInstance.getDme().getInfoProducer(), true);
+        getMockServerClientCreateInfoConsumer(rappInstance.getDme().getInfoConsumer(), false);
+        rappInstanceStateMachine.onboardRappInstance(rappInstance.getRappInstanceId());
+        assertFalse(dmeDeployer.deployRappInstance(rapp, rappInstance));
+        mockServer.verify();
+    }
+
+    @Test
+    void testUndeployrAppInstanceSuccess() {
+        Rapp rapp = getRapp(Optional.empty());
+        rapp.setState(RappState.PRIMED);
+        RappInstance rappInstance = rappDmeResourceBuilder.getRappInstance();
+        getMockServerClientDeleteInfoConsumer(rappInstance.getDme().getInfoConsumer(), true);
+        getMockServerClientDeleteInfoProducer(rappInstance.getDme().getInfoProducer(), true);
+        rappInstanceStateMachine.onboardRappInstance(rappInstance.getRappInstanceId());
+        assertTrue(dmeDeployer.undeployRappInstance(rapp, rappInstance));
+        mockServer.verify();
+    }
+
+
+    @Test
+    void testUndeployrAppInstanceFailureWithInfoProducer() {
+        Rapp rapp = getRapp(Optional.empty());
+        rapp.setState(RappState.PRIMED);
+        RappInstance rappInstance = rappDmeResourceBuilder.getRappInstance();
+        getMockServerClientDeleteInfoConsumer(rappInstance.getDme().getInfoConsumer(), true);
+        getMockServerClientDeleteInfoProducer(rappInstance.getDme().getInfoProducer(), false);
+        rappInstanceStateMachine.onboardRappInstance(rappInstance.getRappInstanceId());
+        assertFalse(dmeDeployer.undeployRappInstance(rapp, rappInstance));
+        mockServer.verify();
+    }
+
+    @Test
+    void testUndeployrAppInstanceFailureWithInfoConsumer() {
+        Rapp rapp = getRapp(Optional.empty());
+        rapp.setState(RappState.PRIMED);
+        RappInstance rappInstance = rappDmeResourceBuilder.getRappInstance();
+        getMockServerClientDeleteInfoConsumer(rappInstance.getDme().getInfoConsumer(), false);
+        rappInstanceStateMachine.onboardRappInstance(rappInstance.getRappInstanceId());
+        assertFalse(dmeDeployer.undeployRappInstance(rapp, rappInstance));
+        mockServer.verify();
+    }
+
+    @Test
+    void testCreateInfoTypeFailureInvalidInfoType() {
+        Rapp rapp = getRapp(Optional.empty());
+        assertFalse(dmeDeployer.createInfoTypes(rapp, null));
+    }
+
+    @Test
+    void testCreateInfoTypeFailureInvalidInfoProducer() {
+        Rapp rapp = getRapp(Optional.empty());
+        assertFalse(dmeDeployer.createInfoProducer(rapp, ""));
+    }
+
+    @Test
+    void testCreateInfoTypeFailureInvalidInfoConsumer() {
+        Rapp rapp = getRapp(Optional.empty());
+        assertFalse(dmeDeployer.createInfoConsumer(rapp, ""));
+    }
+
+    Rapp getRapp(Optional<UUID> rappOptional) {
+        return Rapp.builder().rappId(rappOptional.orElse(UUID.randomUUID())).name("").packageName(validRappFile)
+                       .packageLocation(validCsarFileLocation).state(RappState.COMMISSIONED).build();
+    }
+
+    void getMockServerClientCreateInfoType(String infoType, boolean isSuccess) {
+        if (isSuccess) {
+            mockServer.expect(ExpectedCount.once(), requestTo(String.format(URI_INFO_TYPE, infoType)))
+                    .andExpect(method(HttpMethod.PUT)).andRespond(withStatus(HttpStatus.CREATED));
+        } else {
+            mockServer.expect(ExpectedCount.once(), requestTo(String.format(URI_INFO_TYPE, infoType)))
+                    .andExpect(method(HttpMethod.PUT)).andRespond(withStatus(HttpStatus.BAD_GATEWAY));
+        }
+    }
+
+    void getMockServerClientCreateInfoProducer(String infoProducer, boolean isSuccess) {
+        if (isSuccess) {
+            mockServer.expect(ExpectedCount.once(), requestTo(String.format(URI_INFO_PRODUCER, infoProducer)))
+                    .andExpect(method(HttpMethod.PUT)).andRespond(withStatus(HttpStatus.CREATED));
+        } else {
+            mockServer.expect(ExpectedCount.once(), requestTo(String.format(URI_INFO_PRODUCER, infoProducer)))
+                    .andExpect(method(HttpMethod.PUT)).andRespond(withStatus(HttpStatus.BAD_GATEWAY));
+        }
+    }
+
+    void getMockServerClientCreateInfoConsumer(String infoConsumer, boolean isSuccess) {
+        if (isSuccess) {
+            mockServer.expect(ExpectedCount.once(), requestTo(String.format(URI_INFO_CONSUMER, infoConsumer)))
+                    .andExpect(method(HttpMethod.PUT)).andRespond(withStatus(HttpStatus.CREATED));
+        } else {
+            mockServer.expect(ExpectedCount.once(), requestTo(String.format(URI_INFO_CONSUMER, infoConsumer)))
+                    .andExpect(method(HttpMethod.PUT)).andRespond(withStatus(HttpStatus.BAD_GATEWAY));
+        }
+    }
+
+    void getMockServerClientDeleteInfoProducer(String infoProducer, boolean isSuccess) {
+        if (isSuccess) {
+            mockServer.expect(ExpectedCount.once(), requestTo(String.format(URI_INFO_PRODUCER, infoProducer)))
+                    .andExpect(method(HttpMethod.DELETE)).andRespond(withStatus(HttpStatus.NO_CONTENT));
+        } else {
+            mockServer.expect(ExpectedCount.once(), requestTo(String.format(URI_INFO_PRODUCER, infoProducer)))
+                    .andExpect(method(HttpMethod.DELETE)).andRespond(withStatus(HttpStatus.BAD_GATEWAY));
+        }
+    }
+
+    void getMockServerClientDeleteInfoConsumer(String infoConsumer, boolean isSuccess) {
+        if (isSuccess) {
+            mockServer.expect(ExpectedCount.once(), requestTo(String.format(URI_INFO_CONSUMER, infoConsumer)))
+                    .andExpect(method(HttpMethod.DELETE)).andRespond(withStatus(HttpStatus.NO_CONTENT));
+        } else {
+            mockServer.expect(ExpectedCount.once(), requestTo(String.format(URI_INFO_CONSUMER, infoConsumer)))
+                    .andExpect(method(HttpMethod.DELETE)).andRespond(withStatus(HttpStatus.BAD_GATEWAY));
+        }
+    }
+
+}
diff --git a/rapp-manager-dme/src/test/java/com/oransc/rappmanager/models/rapp/RappDmeResourceBuilder.java b/rapp-manager-dme/src/test/java/com/oransc/rappmanager/models/rapp/RappDmeResourceBuilder.java

new file mode 100755 (executable)

index 0000000..c12d981
--- /dev/null
+++ b/rapp-manager-dme/src/test/java/com/oransc/rappmanager/models/rapp/RappDmeResourceBuilder.java
@@ -0,0 +1,47 @@
+/*-
+ * ============LICENSE_START======================================================================
+ * Copyright (C) 2023 Nordix Foundation. All rights reserved.
+ * ===============================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END========================================================================
+ */
+
+package com.oransc.rappmanager.models.rapp;
+
+import com.oransc.rappmanager.models.rappinstance.RappDMEInstance;
+import com.oransc.rappmanager.models.rappinstance.RappInstance;
+import java.util.Set;
+
+public class RappDmeResourceBuilder {
+
+    public RappResources getResources() {
+        RappResources rappResources = new RappResources();
+        RappResources.DMEResources dmeResources =
+                new RappResources.DMEResources(Set.of("json-file-data-from-filestore", "xml-file-data-from-filestore"),
+                        Set.of("json-file-data-producer", "xml-file-data-producer"),
+                        Set.of("json-file-consumer", "xml-file-consumer"));
+        rappResources.setDme(dmeResources);
+        return rappResources;
+    }
+
+    public RappInstance getRappInstance() {
+        RappInstance rappInstance = new RappInstance();
+        RappDMEInstance rappDMEInstance = new RappDMEInstance();
+        rappDMEInstance.setInfoTypesProducer(Set.of("json-file-data-from-filestore"));
+        rappDMEInstance.setInfoProducer("json-file-data-producer");
+        rappDMEInstance.setInfoTypeConsumer("json-file-data-from-filestore");
+        rappDMEInstance.setInfoConsumer("json-file-consumer");
+        rappInstance.setDme(rappDMEInstance);
+        return rappInstance;
+    }
+}
diff --git a/rapp-manager-dme/src/test/resources/application.yaml b/rapp-manager-dme/src/test/resources/application.yaml

new file mode 100755 (executable)

index 0000000..3c53841
--- /dev/null
+++ b/rapp-manager-dme/src/test/resources/application.yaml
@@ -0,0 +1,3 @@
+rappmanager:
+  dme:
+    baseurl: http://localhost:39390
diff --git a/rapp-manager-dme/src/test/resources/valid-rapp-package-new-info-type.csar b/rapp-manager-dme/src/test/resources/valid-rapp-package-new-info-type.csar

new file mode 100755 (executable)

index 0000000..67ae27c

Binary files /dev/null and b/rapp-manager-dme/src/test/resources/valid-rapp-package-new-info-type.csar differ
diff --git a/rapp-manager-dme/src/test/resources/valid-rapp-package.csar b/rapp-manager-dme/src/test/resources/valid-rapp-package.csar

new file mode 100755 (executable)

index 0000000..b3d75b2

Binary files /dev/null and b/rapp-manager-dme/src/test/resources/valid-rapp-package.csar differ
diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/RappCsarConfigurationHandler.java b/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/RappCsarConfigurationHandler.java

index 73c644e..05bf056 100755 (executable)
--- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/RappCsarConfigurationHandler.java
+++ b/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/RappCsarConfigurationHandler.java
@@ -47,11 +47,12 @@ public class RappCsarConfigurationHandler {
      private static final String ACM_COMPOSITION_JSON_LOCATION = "Files/Acm/definition/compositions.json";
      private static final String ACM_DEFINITION_LOCATION = "Files/Acm/definition";
      private static final String ACM_INSTANCES_LOCATION = "Files/Acm/instances";
-
      private static final String SME_PROVIDER_FUNCS_LOCATION = "Files/Sme/providers";
      private static final String SME_SERVICE_APIS_LOCATION = "Files/Sme/serviceapis";
-
      private static final String SME_INVOKERS_LOCATION = "Files/Sme/invokers";
+    private static final String DME_INFO_TYPES_LOCATION = "Files/Dme/infotypes";
+    private static final String DME_INFO_PRODUCERS_LOCATION = "Files/Dme/infoproducers";
+    private static final String DME_INFO_CONSUMERS_LOCATION = "Files/Dme/infoconsumers";
  
  
      public boolean isValidRappPackage(MultipartFile multipartFile) {
@@ -88,7 +89,7 @@ public class RappCsarConfigurationHandler {
      }
  
      String getPayload(Rapp rapp, String location) {
-        logger.info("Getting payload for {} from {}", rapp.getRappId(), location);
+        logger.debug("Getting payload for {} from {}", rapp.getRappId(), location);
          File csarFile = getCsarFile(rapp);
          return getFileFromCsar(csarFile, location).toString();
      }
@@ -136,6 +137,18 @@ public class RappCsarConfigurationHandler {
                  getResourceUri(ACM_DEFINITION_LOCATION, rapp.getRappResources().getAcm().getCompositionDefinitions()));
      }
  
+    public String getDmeInfoProducerPayload(Rapp rapp, String producerIdentifier) {
+        return getPayload(rapp, getResourceUri(DME_INFO_PRODUCERS_LOCATION, producerIdentifier));
+    }
+
+    public String getDmeInfoTypePayload(Rapp rapp, String infoTypeIdentifier) {
+        return getPayload(rapp, getResourceUri(DME_INFO_TYPES_LOCATION, infoTypeIdentifier));
+    }
+
+    public String getDmeInfoConsumerPayload(Rapp rapp, String infoConsumerIdentifier) {
+        return getPayload(rapp, getResourceUri(DME_INFO_CONSUMERS_LOCATION, infoConsumerIdentifier));
+    }
+
      String getResourceUri(String resourceLocation, String resource) {
          return resourceLocation + "/" + resource + ".json";
      }
@@ -152,6 +165,10 @@ public class RappCsarConfigurationHandler {
                                  getFileListFromCsar(csarFile, SME_PROVIDER_FUNCS_LOCATION))
                                               .serviceApis(getFileListFromCsar(csarFile, SME_SERVICE_APIS_LOCATION))
                                               .invokers(getFileListFromCsar(csarFile, SME_INVOKERS_LOCATION)).build());
+                rappResources.setDme(RappResources.DMEResources.builder()
+                                             .infoTypes(getFileListFromCsar(csarFile, DME_INFO_TYPES_LOCATION))
+                                             .infoProducers(getFileListFromCsar(csarFile, DME_INFO_PRODUCERS_LOCATION))
+                                             .infoConsumers(getFileListFromCsar(csarFile, DME_INFO_CONSUMERS_LOCATION)).build());
              }
          } catch (Exception e) {
              logger.warn("Error in getting the rapp resources", e);
diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rapp/Rapp.java b/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rapp/Rapp.java

index 0aac806..a845fac 100755 (executable)
--- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rapp/Rapp.java
+++ b/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rapp/Rapp.java
@@ -41,4 +41,5 @@ public class Rapp {
      Map<UUID, RappInstance> rappInstances = new HashMap<>();
  
      UUID compositionId;
+    Boolean isDmeValid;
  }
diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rapp/RappEvent.java b/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rapp/RappEvent.java

index 1bdc67d..7cb00be 100755 (executable)
--- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rapp/RappEvent.java
+++ b/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rapp/RappEvent.java
@@ -28,5 +28,9 @@ public enum RappEvent {
      ACMUNDEPLOYED,
      SMEUNDEPLOYED,
      ACMUNDEPLOYFAILED,
-    SMEUNDEPLOYFAILED
+    SMEUNDEPLOYFAILED,
+    DMEDEPLOYED,
+    DMEDEPLOYFAILED,
+    DMEUNDEPLOYED,
+    DMEUNDEPLOYFAILED
  }
diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rapp/RappResources.java b/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rapp/RappResources.java

index a3033e2..d9344e4 100755 (executable)
--- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rapp/RappResources.java
+++ b/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rapp/RappResources.java
@@ -27,6 +27,7 @@ public class RappResources {
  
      ACMResources acm;
      SMEResources sme;
+    DMEResources dme;
  
      @Data
      @Builder
@@ -44,4 +45,13 @@ public class RappResources {
          Set<String> serviceApis;
          Set<String> invokers;
      }
+
+    @Data
+    @Builder
+    public static class DMEResources {
+
+        Set<String> infoTypes;
+        Set<String> infoProducers;
+        Set<String> infoConsumers;
+    }
  }
diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rappinstance/RappDMEInstance.java b/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rappinstance/RappDMEInstance.java

new file mode 100755 (executable)

index 0000000..bd1d19d
--- /dev/null
+++ b/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rappinstance/RappDMEInstance.java
@@ -0,0 +1,31 @@
+/*-
+ * ============LICENSE_START======================================================================
+ * Copyright (C) 2023 Nordix Foundation. All rights reserved.
+ * ===============================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END========================================================================
+ */
+
+package com.oransc.rappmanager.models.rappinstance;
+
+import java.util.Set;
+import lombok.Data;
+
+@Data
+public class RappDMEInstance {
+
+    Set<String> infoTypesProducer;
+    String infoProducer;
+    String infoTypeConsumer;
+    String infoConsumer;
+}
diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rappinstance/RappInstance.java b/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rappinstance/RappInstance.java

index b5e54a7..39d2709 100755 (executable)
--- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rappinstance/RappInstance.java
+++ b/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rappinstance/RappInstance.java
@@ -28,4 +28,5 @@ public class RappInstance {
      RappInstanceState state = RappInstanceState.UNDEPLOYED;
      RappACMInstance acm;
      RappSMEInstance sme;
+    RappDMEInstance dme;
  }
diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/statemachine/RappInstanceStateMachineConfig.java b/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/statemachine/RappInstanceStateMachineConfig.java

index e1bc784..34c9a92 100755 (executable)
--- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/statemachine/RappInstanceStateMachineConfig.java
+++ b/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/statemachine/RappInstanceStateMachineConfig.java
@@ -57,12 +57,18 @@ public class RappInstanceStateMachineConfig extends EnumStateMachineConfigurerAd
                  .withExternal()
                      .source(RappInstanceState.DEPLOYING).target(RappInstanceState.UNDEPLOYED).event(RappEvent.SMEDEPLOYFAILED)
                      .and()
+                .withExternal()
+                    .source(RappInstanceState.DEPLOYING).target(RappInstanceState.UNDEPLOYED).event(RappEvent.DMEDEPLOYFAILED)
+                    .and()
                  .withExternal()
                      .source(RappInstanceState.UNDEPLOYING).target(RappInstanceState.DEPLOYED).event(RappEvent.ACMUNDEPLOYFAILED)
                      .and()
                  .withExternal()
                      .source(RappInstanceState.UNDEPLOYING).target(RappInstanceState.DEPLOYED).event(RappEvent.SMEUNDEPLOYFAILED)
                      .and()
+                .withExternal()
+                    .source(RappInstanceState.UNDEPLOYING).target(RappInstanceState.DEPLOYED).event(RappEvent.DMEUNDEPLOYFAILED)
+                    .and()
                  .withExternal()
                      .source(RappInstanceState.DEPLOYED).target(RappInstanceState.UNDEPLOYING).event(RappEvent.UNDEPLOYING)
                      .and()
@@ -74,12 +80,20 @@ public class RappInstanceStateMachineConfig extends EnumStateMachineConfigurerAd
                      .source(RappInstanceState.DEPLOYING).target(RappInstanceState.DEPLOYED).event(RappEvent.SMEDEPLOYED)
                      .guard(deployedGuard())
                      .and()
+                .withExternal()
+                    .source(RappInstanceState.DEPLOYING).target(RappInstanceState.DEPLOYED).event(RappEvent.DMEDEPLOYED)
+                    .guard(deployedGuard())
+                    .and()
                  .withExternal()
                      .source(RappInstanceState.UNDEPLOYING).target(RappInstanceState.UNDEPLOYED).event(RappEvent.ACMUNDEPLOYED)
                      .guard(undeployedGuard())
                      .and()
                  .withExternal()
                      .source(RappInstanceState.UNDEPLOYING).target(RappInstanceState.UNDEPLOYED).event(RappEvent.SMEUNDEPLOYED)
+                    .guard(undeployedGuard())
+                    .and()
+                .withExternal()
+                    .source(RappInstanceState.UNDEPLOYING).target(RappInstanceState.UNDEPLOYED).event(RappEvent.DMEUNDEPLOYED)
                      .guard(undeployedGuard());
  
      }
@@ -90,7 +104,8 @@ public class RappInstanceStateMachineConfig extends EnumStateMachineConfigurerAd
          return stateContext -> {
              stateContext.getExtendedState().getVariables().put(stateContext.getEvent(), true);
              return stateContext.getExtendedState().getVariables().get(RappEvent.ACMDEPLOYED) != null
-                           && stateContext.getExtendedState().getVariables().get(RappEvent.SMEDEPLOYED) != null;
+                           && stateContext.getExtendedState().getVariables().get(RappEvent.SMEDEPLOYED) != null
+                           && stateContext.getExtendedState().getVariables().get(RappEvent.DMEDEPLOYED) != null;
          };
      }
  
@@ -99,7 +114,8 @@ public class RappInstanceStateMachineConfig extends EnumStateMachineConfigurerAd
          return stateContext -> {
              stateContext.getExtendedState().getVariables().put(stateContext.getEvent(), true);
              return stateContext.getExtendedState().getVariables().get(RappEvent.ACMUNDEPLOYED) != null
-                           && stateContext.getExtendedState().getVariables().get(RappEvent.SMEUNDEPLOYED) != null;
+                           && stateContext.getExtendedState().getVariables().get(RappEvent.SMEUNDEPLOYED) != null
+                           && stateContext.getExtendedState().getVariables().get(RappEvent.DMEUNDEPLOYED) != null;
          };
      }
  }
diff --git a/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/csar/RappCsarConfigurationHandlerTest.java b/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/csar/RappCsarConfigurationHandlerTest.java

index 0a18ec4..d5e8d42 100755 (executable)
--- a/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/csar/RappCsarConfigurationHandlerTest.java
+++ b/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/csar/RappCsarConfigurationHandlerTest.java
@@ -22,11 +22,14 @@ import static org.assertj.core.api.Assertions.assertThat;
  import static org.junit.jupiter.api.Assertions.assertEquals;
  import static org.junit.jupiter.api.Assertions.assertNotNull;
  import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.mockito.Mockito.mock;
  
  import com.oransc.rappmanager.models.rapp.Rapp;
  import com.oransc.rappmanager.models.rapp.RappResources;
  import com.oransc.rappmanager.models.rappinstance.RappACMInstance;
+import com.oransc.rappmanager.models.rappinstance.RappDMEInstance;
  import com.oransc.rappmanager.models.rappinstance.RappSMEInstance;
+import java.io.ByteArrayOutputStream;
  import java.io.File;
  import java.io.FileInputStream;
  import java.io.IOException;
@@ -74,6 +77,18 @@ class RappCsarConfigurationHandlerTest {
          assertEquals(Boolean.FALSE, rappCsarConfigurationHandler.isValidRappPackage(multipartFile));
      }
  
+    @Test
+    void testCsarPackageValidationFailureWithoutOrginalName() throws IOException {
+        MultipartFile multipartFile = mock(MultipartFile.class);
+        assertEquals(Boolean.FALSE, rappCsarConfigurationHandler.isValidRappPackage(multipartFile));
+    }
+
+    @Test
+    void testInvalidCsarFileExist() {
+        MultipartFile multipartFile = mock(MultipartFile.class);
+        assertEquals(Boolean.FALSE, rappCsarConfigurationHandler.isFileExistsInCsar(multipartFile, "INVALID_LOCATION"));
+    }
+
      @Test
      void testCsarInstantiationPayload() throws JSONException {
          Rapp rapp = Rapp.builder().name("").packageName(validRappFile).packageLocation(validCsarFileLocation).build();
@@ -99,6 +114,13 @@ class RappCsarConfigurationHandlerTest {
          assertThat(fileListFromCsar).isEmpty();
      }
  
+    @Test
+    void testInvalidFileListingFromCsar() {
+        File file = new File("InvalidFile");
+        ByteArrayOutputStream fileByteArray = rappCsarConfigurationHandler.getFileFromCsar(file, null);
+        assertThat(fileByteArray.size()).isZero();
+    }
+
      @Test
      void testListResources() {
          UUID rappId = UUID.randomUUID();
@@ -108,10 +130,13 @@ class RappCsarConfigurationHandlerTest {
          RappResources rappResources = rappCsarConfigurationHandler.getRappResource(rapp);
          assertThat(rappResources).isNotNull();
          assertNotNull(rappResources.getAcm().getCompositionDefinitions());
-        assertThat(rappResources.getAcm().getCompositionInstances()).hasSize(3);
+        assertThat(rappResources.getAcm().getCompositionInstances()).hasSize(4);
          assertThat(rappResources.getSme().getProviderFunctions()).hasSize(4);
          assertThat(rappResources.getSme().getServiceApis()).hasSize(2);
          assertThat(rappResources.getSme().getInvokers()).hasSize(2);
+        assertThat(rappResources.getDme().getInfoTypes()).hasSize(2);
+        assertThat(rappResources.getDme().getInfoProducers()).hasSize(2);
+        assertThat(rappResources.getDme().getInfoConsumers()).hasSize(2);
      }
  
      @Test
@@ -122,6 +147,7 @@ class RappCsarConfigurationHandlerTest {
          assertThat(rappResources).isNotNull();
          assertNull(rappResources.getAcm());
          assertNull(rappResources.getSme());
+        assertNull(rappResources.getDme());
      }
  
      @Test
@@ -187,4 +213,43 @@ class RappCsarConfigurationHandlerTest {
          assertNotNull(smeProviderDomainPayload);
      }
  
+    @Test
+    void testGetDmeInfoTypePayload() {
+        UUID rappId = UUID.randomUUID();
+        RappDMEInstance rappDMEInstance = new RappDMEInstance();
+        rappDMEInstance.setInfoTypesProducer(Set.of("json-file-data-from-filestore"));
+        Rapp rapp =
+                Rapp.builder().rappId(rappId).name("").packageName(validRappFile).packageLocation(validCsarFileLocation)
+                        .build();
+        String dmeInfoTypePayload = rappCsarConfigurationHandler.getDmeInfoTypePayload(rapp,
+                rappDMEInstance.getInfoTypesProducer().iterator().next());
+        assertNotNull(dmeInfoTypePayload);
+    }
+
+    @Test
+    void testGetDmeInfoProducerPayload() {
+        UUID rappId = UUID.randomUUID();
+        RappDMEInstance rappDMEInstance = new RappDMEInstance();
+        rappDMEInstance.setInfoProducer("json-file-data-producer");
+        Rapp rapp =
+                Rapp.builder().rappId(rappId).name("").packageName(validRappFile).packageLocation(validCsarFileLocation)
+                        .build();
+        String dmeInfoProducerPayload =
+                rappCsarConfigurationHandler.getDmeInfoProducerPayload(rapp, rappDMEInstance.getInfoProducer());
+        assertNotNull(dmeInfoProducerPayload);
+    }
+
+    @Test
+    void testGetDmeInfoConsumerPayload() {
+        UUID rappId = UUID.randomUUID();
+        RappDMEInstance rappDMEInstance = new RappDMEInstance();
+        rappDMEInstance.setInfoConsumer("json-file-consumer");
+        Rapp rapp =
+                Rapp.builder().rappId(rappId).name("").packageName(validRappFile).packageLocation(validCsarFileLocation)
+                        .build();
+        String dmeInfoConsumerPayload =
+                rappCsarConfigurationHandler.getDmeInfoConsumerPayload(rapp, rappDMEInstance.getInfoConsumer());
+        assertNotNull(dmeInfoConsumerPayload);
+    }
+
  }
diff --git a/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/statemachine/RappInstanceStateMachineConfigTest.java b/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/statemachine/RappInstanceStateMachineConfigTest.java

index 59d5c94..4657c76 100755 (executable)
--- a/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/statemachine/RappInstanceStateMachineConfigTest.java
+++ b/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/statemachine/RappInstanceStateMachineConfigTest.java
@@ -75,7 +75,7 @@ class RappInstanceStateMachineConfigTest {
      }
  
      @ParameterizedTest
-    @EnumSource(value = RappEvent.class, names = {"ACMDEPLOYED", "SMEDEPLOYED"})
+    @EnumSource(value = RappEvent.class, names = {"ACMDEPLOYED", "SMEDEPLOYED", "DMEDEPLOYED" })
      void testIndividualDeployedState(RappEvent rappEvent) throws Exception {
          StateMachineTestPlan plan =
                  StateMachineTestPlanBuilder.<RappInstanceState, RappEvent>builder().stateMachine(stateMachine).step()
@@ -92,23 +92,51 @@ class RappInstanceStateMachineConfigTest {
                          .expectState(RappInstanceState.UNDEPLOYED).and().step().sendEvent(RappEvent.DEPLOYING)
                          .expectState(RappInstanceState.DEPLOYING).expectStateChanged(1).and().step()
                          .sendEvent(RappEvent.ACMDEPLOYED).expectState(RappInstanceState.DEPLOYING).and().step()
-                        .sendEvent(RappEvent.SMEDEPLOYED).expectState(RappInstanceState.DEPLOYED).expectStateChanged(1)
+                        .sendEvent(RappEvent.SMEDEPLOYED).expectState(RappInstanceState.DEPLOYING).and().step()
+                        .sendEvent(RappEvent.DMEDEPLOYED).expectState(RappInstanceState.DEPLOYED).expectStateChanged(1)
                          .and().build();
          plan.test();
      }
  
      @Test
-    void testDeployFailedState() throws Exception {
+    void testAcmDeployFailedState() throws Exception {
+        StateMachineTestPlan plan =
+                StateMachineTestPlanBuilder.<RappInstanceState, RappEvent>builder().stateMachine(stateMachine).step()
+                        .expectState(RappInstanceState.UNDEPLOYED).and().step().sendEvent(RappEvent.DEPLOYING)
+                        .expectState(RappInstanceState.DEPLOYING).expectStateChanged(1).and().step()
+                        .sendEvent(RappEvent.SMEDEPLOYED).expectState(RappInstanceState.DEPLOYING).and().step()
+                        .sendEvent(RappEvent.DMEDEPLOYED).expectState(RappInstanceState.DEPLOYING).and().step()
+                        .sendEvent(RappEvent.ACMDEPLOYFAILED).expectState(RappInstanceState.UNDEPLOYED)
+                        .expectStateChanged(1).and().build();
+        plan.test();
+    }
+
+    @Test
+    void testSmeDeployFailedState() throws Exception {
          StateMachineTestPlan plan =
                  StateMachineTestPlanBuilder.<RappInstanceState, RappEvent>builder().stateMachine(stateMachine).step()
                          .expectState(RappInstanceState.UNDEPLOYED).and().step().sendEvent(RappEvent.DEPLOYING)
                          .expectState(RappInstanceState.DEPLOYING).expectStateChanged(1).and().step()
                          .sendEvent(RappEvent.ACMDEPLOYED).expectState(RappInstanceState.DEPLOYING).and().step()
+                        .sendEvent(RappEvent.DMEDEPLOYED).expectState(RappInstanceState.DEPLOYING).and().step()
                          .sendEvent(RappEvent.SMEDEPLOYFAILED).expectState(RappInstanceState.UNDEPLOYED)
                          .expectStateChanged(1).and().build();
          plan.test();
      }
  
+    @Test
+    void testDmeDeployFailedState() throws Exception {
+        StateMachineTestPlan plan =
+                StateMachineTestPlanBuilder.<RappInstanceState, RappEvent>builder().stateMachine(stateMachine).step()
+                        .expectState(RappInstanceState.UNDEPLOYED).and().step().sendEvent(RappEvent.DEPLOYING)
+                        .expectState(RappInstanceState.DEPLOYING).expectStateChanged(1).and().step()
+                        .sendEvent(RappEvent.ACMDEPLOYED).expectState(RappInstanceState.DEPLOYING).and().step()
+                        .sendEvent(RappEvent.SMEDEPLOYED).expectState(RappInstanceState.DEPLOYING).and().step()
+                        .sendEvent(RappEvent.DMEDEPLOYFAILED).expectState(RappInstanceState.UNDEPLOYED)
+                        .expectStateChanged(1).and().build();
+        plan.test();
+    }
+
      @Test
      void testUndeployingState() throws Exception {
          StateMachineTestPlan plan =
@@ -116,21 +144,23 @@ class RappInstanceStateMachineConfigTest {
                          .expectState(RappInstanceState.UNDEPLOYED).and().step().sendEvent(RappEvent.DEPLOYING)
                          .expectState(RappInstanceState.DEPLOYING).expectStateChanged(1).and().step()
                          .sendEvent(RappEvent.ACMDEPLOYED).expectState(RappInstanceState.DEPLOYING).and().step()
-                        .sendEvent(RappEvent.SMEDEPLOYED).expectState(RappInstanceState.DEPLOYED).expectStateChanged(1)
+                        .sendEvent(RappEvent.SMEDEPLOYED).expectState(RappInstanceState.DEPLOYING).and().step()
+                        .sendEvent(RappEvent.DMEDEPLOYED).expectState(RappInstanceState.DEPLOYED).expectStateChanged(1)
                          .and().step().sendEvent(RappEvent.UNDEPLOYING).expectState(RappInstanceState.UNDEPLOYING)
                          .expectStateChanged(1).and().build();
          plan.test();
      }
  
      @ParameterizedTest
-    @EnumSource(value = RappEvent.class, names = {"ACMUNDEPLOYED", "SMEUNDEPLOYED"})
+    @EnumSource(value = RappEvent.class, names = {"ACMUNDEPLOYED", "SMEUNDEPLOYED", "DMEUNDEPLOYED" })
      void testIndividualUndeployedState(RappEvent rappEvent) throws Exception {
          StateMachineTestPlan plan =
                  StateMachineTestPlanBuilder.<RappInstanceState, RappEvent>builder().stateMachine(stateMachine).step()
                          .expectState(RappInstanceState.UNDEPLOYED).and().step().sendEvent(RappEvent.DEPLOYING)
                          .expectState(RappInstanceState.DEPLOYING).expectStateChanged(1).and().step()
                          .sendEvent(RappEvent.ACMDEPLOYED).expectState(RappInstanceState.DEPLOYING).and().step()
-                        .sendEvent(RappEvent.SMEDEPLOYED).expectState(RappInstanceState.DEPLOYED).expectStateChanged(1)
+                        .sendEvent(RappEvent.SMEDEPLOYED).expectState(RappInstanceState.DEPLOYING).and().step()
+                        .sendEvent(RappEvent.DMEDEPLOYED).expectState(RappInstanceState.DEPLOYED).expectStateChanged(1)
                          .and().step().sendEvent(RappEvent.UNDEPLOYING).expectState(RappInstanceState.UNDEPLOYING)
                          .expectStateChanged(1).and().step().sendEvent(rappEvent)
                          .expectState(RappInstanceState.UNDEPLOYING).and().build();
@@ -144,26 +174,64 @@ class RappInstanceStateMachineConfigTest {
                          .expectState(RappInstanceState.UNDEPLOYED).and().step().sendEvent(RappEvent.DEPLOYING)
                          .expectState(RappInstanceState.DEPLOYING).expectStateChanged(1).and().step()
                          .sendEvent(RappEvent.ACMDEPLOYED).expectState(RappInstanceState.DEPLOYING).and().step()
-                        .sendEvent(RappEvent.SMEDEPLOYED).expectState(RappInstanceState.DEPLOYED).expectStateChanged(1)
+                        .sendEvent(RappEvent.SMEDEPLOYED).expectState(RappInstanceState.DEPLOYING).and().step()
+                        .sendEvent(RappEvent.DMEDEPLOYED).expectState(RappInstanceState.DEPLOYED).expectStateChanged(1)
                          .and().step().sendEvent(RappEvent.UNDEPLOYING).expectState(RappInstanceState.UNDEPLOYING)
                          .expectStateChanged(1).and().step().sendEvent(RappEvent.ACMUNDEPLOYED)
                          .expectState(RappInstanceState.UNDEPLOYING).and().step().sendEvent(RappEvent.SMEUNDEPLOYED)
-                        .expectState(RappInstanceState.UNDEPLOYED).expectStateChanged(1).and().build();
+                        .expectState(RappInstanceState.UNDEPLOYING).and().step().sendEvent(RappEvent.DMEUNDEPLOYED)
+                        .expectStateChanged(1).and().build();
+        plan.test();
+    }
+
+    @Test
+    void testUndeployAcmFailedState() throws Exception {
+        StateMachineTestPlan plan =
+                StateMachineTestPlanBuilder.<RappInstanceState, RappEvent>builder().stateMachine(stateMachine).step()
+                        .expectState(RappInstanceState.UNDEPLOYED).and().step().sendEvent(RappEvent.DEPLOYING)
+                        .expectState(RappInstanceState.DEPLOYING).expectStateChanged(1).and().step()
+                        .sendEvent(RappEvent.ACMDEPLOYED).expectState(RappInstanceState.DEPLOYING).and().step()
+                        .sendEvent(RappEvent.SMEDEPLOYED).expectState(RappInstanceState.DEPLOYING).and().step()
+                        .sendEvent(RappEvent.DMEDEPLOYED).expectState(RappInstanceState.DEPLOYED).expectStateChanged(1)
+                        .and().step().sendEvent(RappEvent.UNDEPLOYING).expectState(RappInstanceState.UNDEPLOYING)
+                        .expectStateChanged(1).and().step().sendEvent(RappEvent.SMEUNDEPLOYED)
+                        .expectState(RappInstanceState.UNDEPLOYING).and().step().sendEvent(RappEvent.DMEUNDEPLOYED)
+                        .expectState(RappInstanceState.UNDEPLOYING).and().step().sendEvent(RappEvent.ACMUNDEPLOYFAILED)
+                        .expectState(RappInstanceState.DEPLOYED).expectStateChanged(1).and().build();
          plan.test();
      }
  
      @Test
-    void testUndeployFailedState() throws Exception {
+    void testUndeploySmeFailedState() throws Exception {
          StateMachineTestPlan plan =
                  StateMachineTestPlanBuilder.<RappInstanceState, RappEvent>builder().stateMachine(stateMachine).step()
                          .expectState(RappInstanceState.UNDEPLOYED).and().step().sendEvent(RappEvent.DEPLOYING)
                          .expectState(RappInstanceState.DEPLOYING).expectStateChanged(1).and().step()
                          .sendEvent(RappEvent.ACMDEPLOYED).expectState(RappInstanceState.DEPLOYING).and().step()
-                        .sendEvent(RappEvent.SMEDEPLOYED).expectState(RappInstanceState.DEPLOYED).expectStateChanged(1)
+                        .sendEvent(RappEvent.SMEDEPLOYED).expectState(RappInstanceState.DEPLOYING).and().step()
+                        .sendEvent(RappEvent.DMEDEPLOYED).expectState(RappInstanceState.DEPLOYED).expectStateChanged(1)
                          .and().step().sendEvent(RappEvent.UNDEPLOYING).expectState(RappInstanceState.UNDEPLOYING)
                          .expectStateChanged(1).and().step().sendEvent(RappEvent.ACMUNDEPLOYED)
+                        .expectState(RappInstanceState.UNDEPLOYING).and().step().sendEvent(RappEvent.DMEUNDEPLOYED)
                          .expectState(RappInstanceState.UNDEPLOYING).and().step().sendEvent(RappEvent.SMEUNDEPLOYFAILED)
                          .expectState(RappInstanceState.DEPLOYED).expectStateChanged(1).and().build();
          plan.test();
      }
+
+    @Test
+    void testUndeployDmeFailedState() throws Exception {
+        StateMachineTestPlan plan =
+                StateMachineTestPlanBuilder.<RappInstanceState, RappEvent>builder().stateMachine(stateMachine).step()
+                        .expectState(RappInstanceState.UNDEPLOYED).and().step().sendEvent(RappEvent.DEPLOYING)
+                        .expectState(RappInstanceState.DEPLOYING).expectStateChanged(1).and().step()
+                        .sendEvent(RappEvent.ACMDEPLOYED).expectState(RappInstanceState.DEPLOYING).and().step()
+                        .sendEvent(RappEvent.SMEDEPLOYED).expectState(RappInstanceState.DEPLOYING).and().step()
+                        .sendEvent(RappEvent.DMEDEPLOYED).expectState(RappInstanceState.DEPLOYED).expectStateChanged(1)
+                        .and().step().sendEvent(RappEvent.UNDEPLOYING).expectState(RappInstanceState.UNDEPLOYING)
+                        .expectStateChanged(1).and().step().sendEvent(RappEvent.ACMUNDEPLOYED)
+                        .expectState(RappInstanceState.UNDEPLOYING).and().step().sendEvent(RappEvent.SMEUNDEPLOYED)
+                        .expectState(RappInstanceState.UNDEPLOYING).and().step().sendEvent(RappEvent.DMEUNDEPLOYFAILED)
+                        .expectState(RappInstanceState.DEPLOYED).expectStateChanged(1).and().build();
+        plan.test();
+    }
  }
diff --git a/rapp-manager-models/src/test/resources/valid-rapp-package.csar b/rapp-manager-models/src/test/resources/valid-rapp-package.csar

index b8b36e3..b3d75b2 100755 (executable)

Binary files a/rapp-manager-models/src/test/resources/valid-rapp-package.csar and b/rapp-manager-models/src/test/resources/valid-rapp-package.csar differ
diff --git a/rapp-manager-sme/src/main/java/com/oransc/rappmanager/sme/service/SmeDeployer.java b/rapp-manager-sme/src/main/java/com/oransc/rappmanager/sme/service/SmeDeployer.java

index 1760e9c..fc42f4d 100755 (executable)
--- a/rapp-manager-sme/src/main/java/com/oransc/rappmanager/sme/service/SmeDeployer.java
+++ b/rapp-manager-sme/src/main/java/com/oransc/rappmanager/sme/service/SmeDeployer.java
@@ -21,12 +21,11 @@ package com.oransc.rappmanager.sme.service;
  import com.fasterxml.jackson.core.JsonProcessingException;
  import com.fasterxml.jackson.core.type.TypeReference;
  import com.fasterxml.jackson.databind.ObjectMapper;
-import com.oransc.rappmanager.models.rapp.Rapp;
-import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
  import com.oransc.rappmanager.models.RappDeployer;
+import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
+import com.oransc.rappmanager.models.rapp.Rapp;
  import com.oransc.rappmanager.models.rapp.RappEvent;
  import com.oransc.rappmanager.models.rappinstance.RappInstance;
-import com.oransc.rappmanager.models.cache.RappCacheService;
  import com.oransc.rappmanager.models.statemachine.RappInstanceStateMachine;
  import com.oransc.rappmanager.sme.invoker.data.APIInvokerEnrolmentDetails;
  import com.oransc.rappmanager.sme.provider.data.APIProviderEnrolmentDetails;
@@ -49,6 +48,7 @@ public class SmeDeployer implements RappDeployer {
  
      private final com.oransc.rappmanager.sme.provider.rest.DefaultApiClient providerDefaultApiClient;
  
+
      private final com.oransc.rappmanager.sme.publishservice.rest.DefaultApiClient publishServiceDefaultApiClient;
  
      private final com.oransc.rappmanager.sme.invoker.rest.DefaultApiClient invokerDefaultApiClient;
@@ -57,8 +57,6 @@ public class SmeDeployer implements RappDeployer {
  
      private final ObjectMapper objectMapper;
  
-    private final RappCacheService rappCacheService;
-
      private final RappInstanceStateMachine rappInstanceStateMachine;
  
      private String amfRegistrationId;
@@ -131,7 +129,7 @@ public class SmeDeployer implements RappDeployer {
  
      @Override
      public boolean deprimeRapp(Rapp rapp) {
-        //If there is any deprimgng operations
+        //If there is any depriming operations
          return true;
      }
  
@@ -190,7 +188,8 @@ public class SmeDeployer implements RappDeployer {
              if (providerApiPayload != null) {
                  ServiceAPIDescription serviceAPIDescription =
                          objectMapper.readValue(providerApiPayload, ServiceAPIDescription.class);
-                serviceAPIDescription.getAefProfiles().forEach(aefProfile -> aefProfile.setAefId(rappInstance.getSme().getAefId()));
+                serviceAPIDescription.getAefProfiles()
+                        .forEach(aefProfile -> aefProfile.setAefId(rappInstance.getSme().getAefId()));
                  ServiceAPIDescription serviceAPIDescriptionResponse =
                          publishServiceDefaultApiClient.postApfIdServiceApis(rappInstance.getSme().getApfId(),
                                  serviceAPIDescription);
author	Aravindhan Ayyanathan <aravindhan.a@est.tech>
	Mon, 25 Sep 2023 15:23:03 +0000 (15:23 +0000)
committer	Gerrit Code Review <gerrit@o-ran-sc.org>
	Mon, 25 Sep 2023 15:23:03 +0000 (15:23 +0000)
README.md		patch \| blob \| history
docs/drawio/rApp-manager.drawio	[new file with mode: 0755]	patch \| blob
docs/drawio/rapp-manager.drawio	[deleted file]	patch \| blob \| history
docs/images/architecture.png		patch \| blob \| history
docs/images/rApp-entity-relationship.png	[new file with mode: 0755]	patch \| blob
docs/images/rApp-flow.png	[new file with mode: 0755]	patch \| blob
docs/images/rApp-instance-flow.png	[new file with mode: 0755]	patch \| blob
docs/images/rApp-instance-states.png	[moved from docs/images/rapp-instance-states.png with 100% similarity]	patch \| blob \| history
docs/images/rApp-package.png	[new file with mode: 0755]	patch \| blob
docs/images/rApp-state-events.png	[new file with mode: 0755]	patch \| blob
docs/images/rApp-states.png	[moved from docs/images/rapp-states.png with 100% similarity]	patch \| blob \| history
docs/images/rapp-entity-relationship.png	[deleted file]	patch \| blob \| history
docs/images/rapp-flow.png	[deleted file]	patch \| blob \| history
docs/images/rapp-instance-flow.png	[deleted file]	patch \| blob \| history
docs/images/rapp-state-events.png	[deleted file]	patch \| blob \| history
docs/ppt/rapp-manager.pptx	[deleted file]	patch \| blob \| history
docs/uml/rApp-flow.puml	[moved from docs/uml/rapp-flow.puml with 87% similarity]	patch \| blob \| history
docs/uml/rApp-instance-flow.puml	[moved from docs/uml/rapp-instance-flow.puml with 70% similarity]	patch \| blob \| history
pom.xml		patch \| blob \| history
rapp-manager-acm/src/main/java/com/oransc/rappmanager/acm/service/AcmDeployer.java		patch \| blob \| history
rapp-manager-acm/src/test/java/com/oransc/rappmanager/acm/service/AcmDeployerTest.java		patch \| blob \| history
rapp-manager-acm/src/test/resources/valid-rapp-package.csar		patch \| blob \| history
rapp-manager-application/pom.xml		patch \| blob \| history
rapp-manager-application/src/main/java/com/oransc/rappmanager/BeanConfiguration.java		patch \| blob \| history
rapp-manager-application/src/main/java/com/oransc/rappmanager/service/RappService.java		patch \| blob \| history
rapp-manager-application/src/main/resources/application.yaml		patch \| blob \| history
rapp-manager-application/src/main/resources/resource-csar/Files/Acm/definition/compositions.json		patch \| blob \| history
rapp-manager-application/src/main/resources/resource-csar/Files/Acm/instances/k8s-instance.json		patch \| blob \| history
rapp-manager-application/src/main/resources/resource-csar/Files/Dme/infoconsumers/json-file-consumer.json	[new file with mode: 0755]	patch \| blob
rapp-manager-application/src/main/resources/resource-csar/Files/Dme/infoconsumers/xml-file-consumer.json	[new file with mode: 0755]	patch \| blob
rapp-manager-application/src/main/resources/resource-csar/Files/Dme/infoproducers/json-file-data-producer.json	[new file with mode: 0755]	patch \| blob
rapp-manager-application/src/main/resources/resource-csar/Files/Dme/infoproducers/xml-file-data-producer.json	[new file with mode: 0755]	patch \| blob
rapp-manager-application/src/main/resources/resource-csar/Files/Dme/infotypes/json-file-data-from-filestore.json	[new file with mode: 0755]	patch \| blob
rapp-manager-application/src/main/resources/resource-csar/Files/Dme/infotypes/xml-file-data-from-filestore.json	[new file with mode: 0755]	patch \| blob
rapp-manager-application/src/main/resources/resource-csar/asd.mf		patch \| blob \| history
rapp-manager-application/src/test/java/com/oransc/rappmanager/rest/RappInstanceControllerTest.java		patch \| blob \| history
rapp-manager-application/src/test/java/com/oransc/rappmanager/service/RappServiceTest.java		patch \| blob \| history
rapp-manager-dme/pom.xml	[new file with mode: 0755]	patch \| blob
rapp-manager-dme/src/main/java/com/oransc/rappmanager/dme/configuration/DmeConfiguration.java	[new file with mode: 0755]	patch \| blob
rapp-manager-dme/src/main/java/com/oransc/rappmanager/dme/service/DmeDeployer.java	[new file with mode: 0755]	patch \| blob
rapp-manager-dme/src/main/resources/openapi/ics-api.yaml	[new file with mode: 0755]	patch \| blob
rapp-manager-dme/src/test/java/com/oransc/rappmanager/dme/service/BeanTestConfiguration.java	[new file with mode: 0755]	patch \| blob
rapp-manager-dme/src/test/java/com/oransc/rappmanager/dme/service/DmeDeployerTest.java	[new file with mode: 0755]	patch \| blob
rapp-manager-dme/src/test/java/com/oransc/rappmanager/models/rapp/RappDmeResourceBuilder.java	[new file with mode: 0755]	patch \| blob
rapp-manager-dme/src/test/resources/application.yaml	[new file with mode: 0755]	patch \| blob
rapp-manager-dme/src/test/resources/valid-rapp-package-new-info-type.csar	[new file with mode: 0755]	patch \| blob
rapp-manager-dme/src/test/resources/valid-rapp-package.csar	[new file with mode: 0755]	patch \| blob
rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/RappCsarConfigurationHandler.java		patch \| blob \| history
rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rapp/Rapp.java		patch \| blob \| history
rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rapp/RappEvent.java		patch \| blob \| history
rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rapp/RappResources.java		patch \| blob \| history
rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rappinstance/RappDMEInstance.java	[new file with mode: 0755]	patch \| blob
rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rappinstance/RappInstance.java		patch \| blob \| history
rapp-manager-models/src/main/java/com/oransc/rappmanager/models/statemachine/RappInstanceStateMachineConfig.java		patch \| blob \| history
rapp-manager-models/src/test/java/com/oransc/rappmanager/models/csar/RappCsarConfigurationHandlerTest.java		patch \| blob \| history
rapp-manager-models/src/test/java/com/oransc/rappmanager/models/statemachine/RappInstanceStateMachineConfigTest.java		patch \| blob \| history
rapp-manager-models/src/test/resources/valid-rapp-package.csar		patch \| blob \| history
rapp-manager-sme/src/main/java/com/oransc/rappmanager/sme/service/SmeDeployer.java		patch \| blob \| history