Remove Policy Model Simulator from CSIT 19/143319/2
authorFrancescoFioraEst <francesco.fiora@est.tech>
Fri, 13 Feb 2026 10:34:31 +0000 (10:34 +0000)
committerFrancesco Fiora <francesco.fiora@est.tech>
Tue, 17 Feb 2026 09:59:32 +0000 (09:59 +0000)
Remove Policy Model Simulator from CSIT and
Log outProperties in Messages

Issue-ID: POLICY-5534
Change-Id: Ia7c7981182b8fd9247f6b5802fe66e81bb958e71
Signed-off-by: FrancescoFioraEst <francesco.fiora@est.tech>
12 files changed:
compose/README.md
compose/compose.common.yml
compose/compose.yaml
compose/config/sim-all/aairesponse/vfw-cnf-cds-test-1-vnf.json [deleted file]
compose/config/sim-all/cdsresponse/apex-example-cba-modify-config.json [deleted file]
compose/config/sim-all/cdsresponse/apex-example-cba-restart.json [deleted file]
compose/config/sim-all/cdsresponse/controlloop-hostname-update-update-config.json [deleted file]
compose/config/sim-all/logback.xml [deleted file]
compose/config/sim-all/simParameters.json [deleted file]
compose/export-ports.sh
compose/get-versions-regression.sh
models/src/main/java/org/onap/policy/clamp/models/acm/concepts/AutomationCompositionElementInfo.java

index 692bc06..5c0d86c 100644 (file)
@@ -34,7 +34,7 @@ policy-clamp-runtime-acm)
 ```sh
 ./start-compose.sh component
 
-# that will start apex-pdp and its dependencies (pap, api, db, simulator)
+# that will start apex-pdp and its dependencies (pap, api, db)
 ./start-compose.sh apex-pdp
 ```
 
@@ -46,7 +46,7 @@ policy-clamp-runtime-acm)
 ```sh
 ./start-compose.sh component --grafana
 
-# that will start apex-pdp and its dependencies (pap, api, db, simulator) + grafana and prometheus server
+# that will start apex-pdp and its dependencies (pap, api, db) + grafana and prometheus server
 ./start-compose.sh apex-pdp --grafana
 ```
 
@@ -102,7 +102,6 @@ been removed.
 To make it easier and clear how the docker compose system works, there are three files describing
 the services:
 - compose.common.yml
-  - Simulator service
   - ACM-R Participants that don't connect directly to database
   - Messaging services (kafka, zookeeper)
   - Metrics services (prometheus, grafana, jaeger)
index df7e4e8..17d4978 100644 (file)
 
 services:
 
-  policy-models-simulator:
-    image: ${CONTAINER_LOCATION}onap/policy-models-simulator:${POLICY_MODELS_VERSION}
-    container_name: policy-models-simulator
-    hostname: policy-models-simulator
-    networks:
-      default:
-        aliases:
-          - aai-sim
-          - grpc-sim
-          - sdnc-sim
-          - so-sim
-    volumes:
-      - ./config/sim-all:/opt/app/policy/simulators/etc/mounted:ro
-      - ./config/sim-all/logback.xml:/opt/app/policy/simulators/etc/mounted/logback.xml:ro
-    expose:
-      - 6666
-      - 6668
-      - 6669
-      - 6680
-    ports:
-      - ${SIMULATOR_PORT}:6666
-    healthcheck:
-      test: "nc -z localhost 6666 || exit 1"
-      interval: 5s
-      timeout: 5s
-      retries: 6
-
   x-policy-clamp-ac-sim-ppnt-template: &policy-clamp-ac-sim-ppnt-template
     image: ${CONTAINER_LOCATION}onap/policy-clamp-ac-sim-ppnt:${POLICY_CLAMP_PPNT_VERSION}
     depends_on:
index b3ba947..9633389 100644 (file)
@@ -80,7 +80,6 @@ services:
     container_name: policy-apex-pdp
     hostname: policy-apex-pdp
     depends_on:
-      - policy-models-simulator
       - policy-pap
     ports:
       - ${APEX_PORT}:6969
diff --git a/compose/config/sim-all/aairesponse/vfw-cnf-cds-test-1-vnf.json b/compose/config/sim-all/aairesponse/vfw-cnf-cds-test-1-vnf.json
deleted file mode 100644 (file)
index 2e2105f..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "vnf-id": "37b008b9-b367-4359-93fd-74d3ce0ee1a0",
-  "vnf-name": "vfw-cnf-cds-test-1-vnf",
-  "vnf-type": "vfw_cnf_cds/null",
-  "service-id": "37b008b9-b367-4359-93fd-74d3ce0ee1a0",
-  "prov-status": "ACTIVE",
-  "orchestration-status": "Assigned",
-  "in-maint": false,
-  "is-closed-loop-disabled": false,
-  "resource-version": "1607506390862",
-  "model-invariant-id": "vTEST_XYZ",
-  "model-version-id": "vTEST",
-  "model-customization-id": "37b008b9-b367-4359-93fd-74d3ce0ee1a0",
-  "relationship-list": {
-    "relationship": [
-      {
-        "related-to": "service-instance",
-        "relationship-label": "org.onap.relationships.inventory.ComposedOf",
-        "related-link": "/aai/v14/business/customers/customer/DemoCust_47417dae-a821-4068-9736-e71c7da0d8bf/service-subscriptions/service-subscription/vFWDT/service-instances/service-instance/55322ada-145a-492e-b196-0d171539a4b2",
-        "relationship-data": [
-          {
-            "relationship-key": "customer.global-customer-id",
-            "relationship-value": "DemoCust_47417dae-a821-4068-9736-e71c7da0d8bf"
-          },
-          {
-            "relationship-key": "service-subscription.service-type",
-            "relationship-value": "vFWDT"
-          },
-          {
-            "relationship-key": "service-instance.service-instance-id",
-            "relationship-value": "55322ada-145a-492e-b196-0d171539a4b2"
-          }
-        ],
-        "related-to-property": [
-          {
-            "property-key": "service-instance.service-instance-name",
-            "property-value": "Service_Ete_Namea337dd5b-4620-4ea6-bc3f-6edf1124d659"
-          }
-        ]
-      }
-    ]
-  }
-}
-
diff --git a/compose/config/sim-all/cdsresponse/apex-example-cba-modify-config.json b/compose/config/sim-all/cdsresponse/apex-example-cba-modify-config.json
deleted file mode 100644 (file)
index 4f03bbf..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "correlationUUID": null,
-    "commonHeader": {
-        "timestamp": "2020-12-16T10:29:00.450Z",
-        "originatorId": "POLICY",
-        "requestId": "f392e439-c176-411b-b972-8acadac0f8df",
-        "subRequestId": "8c7935a4-79d8-4ec0-b661-dcca3cd68006",
-        "flags": null
-    },
-    "actionIdentifiers": {
-        "blueprintName": "apex-example-cba",
-        "blueprintVersion": "1.0.0",
-        "actionName": "modify-config",
-        "mode": "sync"
-    },
-    "status": {
-        "code": 200,
-        "eventType": "EVENT_COMPONENT_EXECUTED",
-        "timestamp": "2020-12-16T10:29:01.737Z",
-        "errorMessage": null,
-        "message": "success"
-    },
-    "payload": {
-        "modify-config-response": {
-            "execute-command-logs": [
-                "INFO:root:Arguments : Active,,"
-            ],
-            "prepare-environment-logs": [
-                "Installed pip packages:\n   requirements.txt\n\n"
-            ]
-        }
-    }
-}
diff --git a/compose/config/sim-all/cdsresponse/apex-example-cba-restart.json b/compose/config/sim-all/cdsresponse/apex-example-cba-restart.json
deleted file mode 100644 (file)
index 694bc6d..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "correlationUUID": null,
-    "commonHeader": {
-        "timestamp": "2020-12-16T10:30:46.213Z",
-        "originatorId": "POLICY",
-        "requestId": "f392e439-c176-411b-b972-8acadac0f8df",
-        "subRequestId": "8c7935a4-79d8-4ec0-b661-dcca3cd68006",
-        "flags": null
-    },
-    "actionIdentifiers": {
-        "blueprintName": "apex-example-cba",
-        "blueprintVersion": "1.0.0",
-        "actionName": "restart",
-        "mode": "sync"
-    },
-    "status": {
-        "code": 200,
-        "eventType": "EVENT_COMPONENT_EXECUTED",
-        "timestamp": "2020-12-16T10:30:46.828Z",
-        "errorMessage": null,
-        "message": "success"
-    },
-    "payload": {
-        "restart-response": {
-            "execute-command-logs": [
-                "INFO:root:Arguments : Active,,"
-            ],
-            "prepare-environment-logs": [
-                "Installed pip packages:\n   requirements.txt\n\n"
-            ]
-        }
-    }
-}
diff --git a/compose/config/sim-all/cdsresponse/controlloop-hostname-update-update-config.json b/compose/config/sim-all/cdsresponse/controlloop-hostname-update-update-config.json
deleted file mode 100644 (file)
index 7009a35..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "commonHeader": {
-        "timestamp": "2020-08-24T14:45:07.491Z",
-        "originatorId": "CDS",
-        "requestId": "123456",
-        "subRequestId": "123-123",
-        "flags": null
-    },
-    "actionIdentifiers": {
-        "blueprintName": "controlloop-hostname-update",
-        "blueprintVersion": "1.0.4",
-        "actionName": "update-config",
-        "mode": "sync"
-    },
-    "status": {
-        "code": 200,
-        "eventType": "EVENT_COMPONENT_EXECUTED",
-        "timestamp": "2020-08-24T14:45:12.863Z",
-        "errorMessage": null,
-        "message": "success"
-    },
-    "payload": {
-        "update-config-response": {
-            "execute-command-logs": [
-                "INFO:root:<data xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\"/>",
-                "INFO:root:configuring Device....",
-                "INFO:root:Done Device Configuration Successfully",
-                "INFO:root:Device Configuration After modification",
-                "INFO:root:http://10.101.200.10:32777/restconf/config/network-topology:network-topology/topology/topology-netconf/node/927b2580-36d9-4f13-8421-3c9d43b7a57e/yang-ext:mount",
-                "INFO:root:<data xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\"><system xmlns=\"urn:opendaylight:hostname\"><hostname>testhost-1212332324343</hostname></system></data>"
-            ],
-            "prepare-environment-logs": ["Installed pip packages:\n   requirements.txt\n\n"]
-        }
-    }
-}
diff --git a/compose/config/sim-all/logback.xml b/compose/config/sim-all/logback.xml
deleted file mode 100644 (file)
index 131b0fe..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-   Copyright (C) 2020 AT&T Intellectual Property.
-  ================================================================================
-  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.
-
-  SPDX-License-Identifier: Apache-2.0
-  ============LICENSE_END=========================================================
--->
-
-<configuration scan="true" scanPeriod="30 seconds" debug="false">
-
-    <!--
-        This is only used for testing and only a snapshot docker image is generated,
-        thus it is not necessary for the messages to following the ONAP standard.
-        Therefore, keeping it short so it's easier to wade through the output.
-
-        Also sending all output to stdout instead of to a log file; it can be viewed
-        via "docker logs" or captured by kubernetes.
-     -->
-
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <Pattern>%d %level  %msg%n</Pattern>
-        </encoder>
-    </appender>
-
-    <root level="INFO">
-        <appender-ref ref="STDOUT" />
-    </root>
-
-</configuration>
diff --git a/compose/config/sim-all/simParameters.json b/compose/config/sim-all/simParameters.json
deleted file mode 100644 (file)
index 257814f..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-    "restServers": [
-        {
-            "name": "A&AI simulator",
-            "providerClass": "org.onap.policy.simulators.AaiSimulatorJaxRs",
-            "host": "0.0.0.0",
-            "port": 6666,
-            "https": false,
-            "userName": "policy@policy.onap.org",
-            "password": "demo123456!",
-            "resourceLocation": "/opt/app/policy/simulators/etc/mounted/aairesponse/"
-        },
-        {
-            "name": "SDNC simulator",
-            "providerClass": "org.onap.policy.simulators.SdncSimulatorJaxRs",
-            "host": "0.0.0.0",
-            "port": 6668,
-            "https": false
-        },
-        {
-            "name": "SO simulator",
-            "providerClass": "org.onap.policy.simulators.SoSimulatorJaxRs",
-            "host": "0.0.0.0",
-            "port": 6669,
-            "https": false,
-            "userName": "InfraPortalClient",
-            "password": "password1$"
-        }
-    ],
-
-    "grpcServer": {
-        "name": "CDS simulator",
-        "providerClass": "org.onap.policy.simulators.CdsSimulator",
-        "host": "0.0.0.0",
-        "port": 6680,
-        "timeout": 30,
-        "username": "ccsdkapps",
-        "password": "ccsdkapps",
-        "resourceLocation": "/opt/app/policy/simulators/etc/mounted/cdsresponse/",
-        "successRepeatCount": 0,
-        "requestedResponseDelayMs": 0
-    }
-}
index 5cf8d21..ea18bba 100755 (executable)
@@ -1,6 +1,6 @@
 #!/bin/bash
 # ============LICENSE_START=======================================================
-# Copyright 2023-2025 OpenInfra Foundation Europe. All rights reserved.
+# Copyright 2023-2026 OpenInfra Foundation Europe. All rights reserved.
 # Modifications Copyright 2024 Deutsche Telekom
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,7 +28,6 @@ export ACM_PORT_END=30008
 export SIM_PARTICIPANT1_PORT=30011
 export SIM_PARTICIPANT2_PORT=30013
 export SIM_PARTICIPANT3_PORT=30014
-export SIMULATOR_PORT=30904
 export KAFKA_PORT=29092
 export PROMETHEUS_PORT=30259
 export GRAFANA_PORT=30269
index a867e47..ea7d9b2 100755 (executable)
@@ -1,7 +1,7 @@
 #! /bin/bash
 
 # ============LICENSE_START====================================================
-#  Copyright (C) 2024 Nordix Foundation. All rights reserved.
+#  Copyright (C) 2024,2026 OpenInfra Foundation Europe. 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.
@@ -115,9 +115,6 @@ echo POLICY_MARIADB_VER=${POLICY_MARIADB_VER}
 export POLICY_POSTGRES_VER=11.1
 echo POLICY_POSTGRES_VER=${POLICY_POSTGRES_VER}
 
-getDockerVersion models $ACM_RELEASE "'policy-models-simulator'" 3.0.1
-export POLICY_MODELS_VERSION="$docker_image_version"
-
 getDockerVersion docker $ACM_RELEASE
 export POLICY_DOCKER_VERSION="$docker_image_version"
 
index c55336f..e205954 100644 (file)
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2023-2025 OpenInfra Foundation Europe. All rights reserved.
+ *  Copyright (C) 2023-2026 OpenInfra Foundation Europe. 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.
@@ -26,6 +26,7 @@ import java.util.UUID;
 import java.util.function.UnaryOperator;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.ToString;
 import org.onap.policy.models.base.PfUtils;
 
 /**
@@ -33,6 +34,7 @@ import org.onap.policy.models.base.PfUtils;
  */
 @NoArgsConstructor
 @Data
+@ToString
 public class AutomationCompositionElementInfo {
 
     private UUID automationCompositionElementId;
@@ -60,15 +62,4 @@ public class AutomationCompositionElementInfo {
         this.useState = otherElement.useState;
         this.outProperties = PfUtils.mapMap(otherElement.outProperties, UnaryOperator.identity());
     }
-
-    @Override
-    public String toString() {
-        return "AutomationCompositionElementInfo{"
-                + "automationCompositionElementId=" + automationCompositionElementId
-                + ", deployState=" + deployState
-                + ", lockState=" + lockState
-                + ", operationalState='" + operationalState + '\''
-                + ", useState='" + useState + '\''
-                + '}';
-    }
 }