From 49f07db935d114b72a44e446867b16262dd552aa Mon Sep 17 00:00:00 2001
From: rameshiyer27 <ramesh.murugan.iyer@est.tech>
Date: Mon, 29 Jan 2024 09:23:58 +0000
Subject: Remove dmaap from models

Issue-ID: POLICY-4402
Change-Id: Icead1601984f463e557b969f2792f0f0aa05f060
Signed-off-by: rameshiyer27 <ramesh.murugan.iyer@est.tech>
---
 .../src/test/resources/emptyRestServer.json        | 10 +--
 .../src/test/resources/invalidDmaapName.json       | 10 ---
 .../src/test/resources/invalidDmaapProvider.json   |  7 ---
 .../src/test/resources/invalidTopicServer.json     | 35 -----------
 .../src/test/resources/invalidTopicSweep.json      | 10 ---
 .../src/test/resources/logback-test.xml            |  6 +-
 .../src/test/resources/missingSink.json            | 26 --------
 .../src/test/resources/missingSource.json          | 26 --------
 .../src/test/resources/simParameters.json          | 72 +---------------------
 9 files changed, 3 insertions(+), 199 deletions(-)
 delete mode 100644 models-sim/policy-models-simulators/src/test/resources/invalidDmaapName.json
 delete mode 100644 models-sim/policy-models-simulators/src/test/resources/invalidDmaapProvider.json
 delete mode 100644 models-sim/policy-models-simulators/src/test/resources/invalidTopicServer.json
 delete mode 100644 models-sim/policy-models-simulators/src/test/resources/invalidTopicSweep.json
 delete mode 100644 models-sim/policy-models-simulators/src/test/resources/missingSink.json
 delete mode 100644 models-sim/policy-models-simulators/src/test/resources/missingSource.json

(limited to 'models-sim/policy-models-simulators/src/test/resources')

diff --git a/models-sim/policy-models-simulators/src/test/resources/emptyRestServer.json b/models-sim/policy-models-simulators/src/test/resources/emptyRestServer.json
index 4a86253da..ca4841eca 100644
--- a/models-sim/policy-models-simulators/src/test/resources/emptyRestServer.json
+++ b/models-sim/policy-models-simulators/src/test/resources/emptyRestServer.json
@@ -1,11 +1,3 @@
 {
-    "dmaapProvider": {
-        "name": "DMaaP simulator",
-        "topicSweepSec": 300,
-        "restServerParameters": {}
-    },
-    "restServers": [],
-    "topicSinks": [],
-    "topicSources": [],
-    "topicServers": []
+    "restServers": []
 }
diff --git a/models-sim/policy-models-simulators/src/test/resources/invalidDmaapName.json b/models-sim/policy-models-simulators/src/test/resources/invalidDmaapName.json
deleted file mode 100644
index 889c4c844..000000000
--- a/models-sim/policy-models-simulators/src/test/resources/invalidDmaapName.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "dmaapProvider": {
-        "name": null,
-        "topicSweepSec":300
-    },
-    "restServers": [],
-    "topicSinks": [],
-    "topicSources": [],
-    "topicServers": []
-}
diff --git a/models-sim/policy-models-simulators/src/test/resources/invalidDmaapProvider.json b/models-sim/policy-models-simulators/src/test/resources/invalidDmaapProvider.json
deleted file mode 100644
index ff6790144..000000000
--- a/models-sim/policy-models-simulators/src/test/resources/invalidDmaapProvider.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "dmaapProvider": {},
-    "restServers": [],
-    "topicSinks": [],
-    "topicSources": [],
-    "topicServers": []
-}
diff --git a/models-sim/policy-models-simulators/src/test/resources/invalidTopicServer.json b/models-sim/policy-models-simulators/src/test/resources/invalidTopicServer.json
deleted file mode 100644
index b3d31f6b4..000000000
--- a/models-sim/policy-models-simulators/src/test/resources/invalidTopicServer.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "dmaapProvider": {
-        "name": "DMaaP simulator",
-        "topicSweepSec": 300,
-        "restServerParameters": {
-
-        }
-    },
-    "topicSinks": [
-        {
-            "topic": "APPC-LCM-READ",
-            "servers": ["localhost"],
-            "port": 3905,
-            "topicCommInfrastructure": "DMAAP",
-            "https": true
-        }
-    ],
-    "topicSources": [
-        {
-            "topic": "APPC-LCM-WRITE",
-            "servers": ["localhost"],
-            "port": 3905,
-            "topicCommInfrastructure": "DMAAP",
-            "https": true
-        }
-    ],
-    "topicServers": [
-        {
-            "name": "Invalid Topic simulator",
-            "providerClass": "org.onap.policy.simulators.InvalidTopicServer",
-            "sink": "APPC-LCM-READ",
-            "source": "APPC-LCM-WRITE"
-        }
-    ]
-}
diff --git a/models-sim/policy-models-simulators/src/test/resources/invalidTopicSweep.json b/models-sim/policy-models-simulators/src/test/resources/invalidTopicSweep.json
deleted file mode 100644
index 11a37d5c4..000000000
--- a/models-sim/policy-models-simulators/src/test/resources/invalidTopicSweep.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "dmaapProvider": {
-        "name": "DMaaP simulator",
-        "topicSweepSec":0
-    },
-    "restServers": [],
-    "topicSinks": [],
-    "topicSources": [],
-    "topicServers": []
-}
diff --git a/models-sim/policy-models-simulators/src/test/resources/logback-test.xml b/models-sim/policy-models-simulators/src/test/resources/logback-test.xml
index e599a94a8..05a097bef 100644
--- a/models-sim/policy-models-simulators/src/test/resources/logback-test.xml
+++ b/models-sim/policy-models-simulators/src/test/resources/logback-test.xml
@@ -1,6 +1,7 @@
 <!--
   ============LICENSE_START=======================================================
   Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+  Modifications Copyright (C) 2024 Nordix Foundation.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -41,9 +42,4 @@
         <appender-ref ref="STDOUT" />
     </logger>
 
-    <logger name="org.onap.policy.models.sim.dmaap" level="debug"
-        additivity="false">
-        <appender-ref ref="STDOUT" />
-    </logger>
-
 </configuration>
diff --git a/models-sim/policy-models-simulators/src/test/resources/missingSink.json b/models-sim/policy-models-simulators/src/test/resources/missingSink.json
deleted file mode 100644
index e7d63e04f..000000000
--- a/models-sim/policy-models-simulators/src/test/resources/missingSink.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "dmaapProvider": {
-        "name": "DMaaP simulator",
-        "topicSweepSec": 300,
-        "restServerParameters": {
-
-        }
-    },
-    "topicSources": [
-        {
-            "topic": "APPC-LCM-WRITE",
-            "servers": ["localhost"],
-            "port": 3905,
-            "topicCommInfrastructure": "DMAAP",
-            "https": true
-        }
-    ],
-    "topicServers": [
-        {
-            "name": "APPC-LCM simulator",
-            "providerClass": "org.onap.policy.simulators.AppcLcmTopicServer",
-            "sink": "APPC-LCM-READ",
-            "source": "APPC-LCM-WRITE"
-        }
-    ]
-}
diff --git a/models-sim/policy-models-simulators/src/test/resources/missingSource.json b/models-sim/policy-models-simulators/src/test/resources/missingSource.json
deleted file mode 100644
index 0f02e4095..000000000
--- a/models-sim/policy-models-simulators/src/test/resources/missingSource.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "dmaapProvider": {
-        "name": "DMaaP simulator",
-        "topicSweepSec": 300,
-        "restServerParameters": {
-
-        }
-    },
-    "topicSinks": [
-        {
-            "topic": "APPC-LCM-READ",
-            "servers": ["localhost"],
-            "port": 3905,
-            "topicCommInfrastructure": "DMAAP",
-            "https": true
-        }
-    ],
-    "topicServers": [
-        {
-            "name": "APPC-LCM simulator",
-            "providerClass": "org.onap.policy.simulators.AppcLcmTopicServer",
-            "sink": "APPC-LCM-READ",
-            "source": "APPC-LCM-WRITE"
-        }
-    ]
-}
diff --git a/models-sim/policy-models-simulators/src/test/resources/simParameters.json b/models-sim/policy-models-simulators/src/test/resources/simParameters.json
index 325998fef..6d3ae3acd 100644
--- a/models-sim/policy-models-simulators/src/test/resources/simParameters.json
+++ b/models-sim/policy-models-simulators/src/test/resources/simParameters.json
@@ -1,16 +1,5 @@
 {
-    "dmaapProvider": {
-        "name": "DMaaP simulator",
-        "topicSweepSec": 300
-    },
     "restServers": [
-        {
-            "name": "DMaaP simulator",
-            "providerClass": "org.onap.policy.models.sim.dmaap.rest.DmaapSimRestControllerV1",
-            "host": "localhost",
-            "port": 3905,
-            "https": true
-        },
         {
             "name": "A&AI simulator",
             "providerClass": "org.onap.policy.simulators.AaiSimulatorJaxRs",
@@ -47,66 +36,7 @@
             "https": true
         }
     ],
-    "topicSinks": [
-        {
-            "topic": "appc-cl",
-            "servers": ["localhost"],
-            "topicCommInfrastructure": "DMAAP",
-            "useHttps": true
-        },
-        {
-            "topic": "appc-lcm-write",
-            "servers": ["localhost"],
-            "topicCommInfrastructure": "DMAAP",
-            "useHttps": true
-        },
-        {
-            "topic": "sdnr-cl",
-            "servers": ["localhost"],
-            "topicCommInfrastructure": "DMAAP",
-            "useHttps": true
-        }
-    ],
-    "topicSources": [
-        {
-            "topic": "appc-cl",
-            "servers": ["localhost"],
-            "topicCommInfrastructure": "DMAAP",
-            "useHttps": true
-        },
-        {
-            "topic": "appc-lcm-read",
-            "servers": ["localhost"],
-            "topicCommInfrastructure": "DMAAP",
-            "useHttps": true
-        },
-        {
-            "topic": "sdnr-cl-rsp",
-            "servers": ["localhost"],
-            "topicCommInfrastructure": "DMAAP",
-            "useHttps": true
-        }
-    ],
-    "topicServers": [
-        {
-            "name": "APPC Legacy simulator",
-            "providerClass": "org.onap.policy.simulators.AppcLegacyTopicServer",
-            "sink": "appc-cl",
-            "source": "appc-cl"
-        },
-        {
-            "name": "APPC-LCM simulator",
-            "providerClass": "org.onap.policy.simulators.AppcLcmTopicServer",
-            "sink": "appc-lcm-write",
-            "source": "appc-lcm-read"
-        },
-        {
-            "name": "SDNR simulator",
-            "providerClass": "org.onap.policy.simulators.SdnrTopicServer",
-            "sink": "sdnr-cl",
-            "source": "sdnr-cl-rsp"
-        }
-    ],
+
     "grpcServer": {
         "name": "CDS simulator",
         "providerClass": "org.onap.policy.simulators.CdsSimulator",
-- 
cgit