Remove MariaDB support

- change configurations to use PostgreSQL as default - remove unused configurations Issue-ID: POLICY-5196 Change-Id: I22ce625ff16e94375f5a93b803a71044f2d5f008 Signed-off-by: adheli.tavares <adheli.tavares@est.tech>
onap · Jan 16, 2025 · 513561b · 513561b
1 parent ee5eeb3
commit 513561b
Show file tree

Hide file tree

Showing 14 changed files with 73 additions and 426 deletions.
diff --git a/main/src/main/resources/application.yaml b/main/src/main/resources/application.yaml
@@ -4,8 +4,8 @@ spring:
       name: policyadmin
       password: zb!XztG34
   datasource:
-    url: jdbc:mariadb://mariadb:3306/policyadmin
-    driverClassName: org.mariadb.jdbc.Driver
+    url: jdbc:postgresql://postgres:5432/policyadmin
+    driverClassName: org.postgresql.Driver
     username: policy_user
     password: policy_user
   jpa:
@@ -22,6 +22,9 @@ server:
   port: 6969
   servlet:
     context-path: /policy/pap/v1
+  ssl:
+    enabled: false
+
 pap:
   name: PapGroup
   topic:
@@ -38,47 +41,39 @@ pap:
       maxWaitMs: 30000
   topicParameterGroup:
     topicSources:
-    - topic: ${pap.topic.pdp-pap.name}
-      servers:
-      - kafka
-      topicCommInfrastructure: NOOP
-      fetchTimeout: 15000
-    - topic: ${pap.topic.heartbeat.name}
-      effectiveTopic: ${pap.topic.pdp-pap.name}
-      consumerGroup: policy-pap
-      servers:
-      - kafka
-      topicCommInfrastructure: NOOP
-      fetchTimeout: 15000
+      - topic: ${pap.topic.pdp-pap.name}
+        servers:
+          - noop
+        topicCommInfrastructure: noop
+        useHttps: false
+        fetchTimeout: 15000
+      - topic: ${pap.topic.heartbeat.name}
+        effectiveTopic: ${pap.topic.pdp-pap.name}
+        consumerGroup: policy-pap
+        servers:
+          - noop
+        topicCommInfrastructure: noop
+        useHttps: false
+        fetchTimeout: 15000
     topicSinks:
-    - topic: ${pap.topic.pdp-pap.name}
-      servers:
-      - kafka
-      topicCommInfrastructure: NOOP
-    - topic: ${pap.topic.notification.name}
-      servers:
-      - kafka
-      topicCommInfrastructure: NOOP
+      - topic: ${pap.topic.pdp-pap.name}
+        servers:
+          - noop
+        topicCommInfrastructure: noop
+        useHttps: false
+      - topic: ${pap.topic.notification.name}
+        servers:
+          - noop
+        topicCommInfrastructure: noop
+        useHttps: false
   healthCheckRestClientParameters:
   - clientName: api
     hostname: policy-api
     port: 6969
     userName: policyadmin
     password: zb!XztG34
-    useHttps: true
+    useHttps: false
     basePath: policy/api/v1/healthcheck
-  - clientName: distribution
-    hostname: policy-distribution
-    port: 6969
-    userName: healthcheck
-    password: zb!XztG34
-    useHttps: true
-    basePath: healthcheck
-  - clientName: kafka
-    hostname: kafka
-    port: 3905
-    useHttps: true
-    basePath: topics
 
 management:
   endpoints:

diff --git a/main/src/test/resources/application-test-e2e.yaml b/main/src/test/resources/application-test-e2e.yaml
@@ -61,8 +61,3 @@ pap:
     password: zb!XztG34
     useHttps: true
     basePath: healthcheck
-  - clientName: kafka
-    hostname: kafka
-    port: 3905
-    useHttps: true
-    basePath: topics
diff --git a/main/src/test/resources/application-test.yaml b/main/src/test/resources/application-test.yaml
@@ -8,4 +8,4 @@ spring:
       naming:
         physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
         implicit-strategy: org.onap.policy.common.spring.utils.CustomImplicitNamingStrategy
-    open-in-view: false
+    open-in-view: false
diff --git a/packages/policy-pap-tarball/src/main/resources/etc/papParameters.yaml b/packages/policy-pap-tarball/src/main/resources/etc/papParameters.yaml
@@ -7,14 +7,11 @@ spring:
     converters:
       preferred-json-mapper: gson
   datasource:
-    url: jdbc:mariadb://mariadb:3306/policyadmin
-    driverClassName: org.mariadb.jdbc.Driver
+    url: jdbc:postgresql://postgres:5432/policyadmin
+    driverClassName: org.postgresql.Driver
     username: policy_user
     password: policy_user
   jpa:
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.MariaDB103Dialect
     hibernate:
       ddl-auto: none
       naming:
@@ -23,11 +20,17 @@ spring:
 
 server:
   port: 6969
+  servlet:
+    context-path: /policy/pap/v1
   ssl:
     enabled: false
 
 pap:
   name: PapGroup
+  topic:
+    pdp-pap.name: policy-pdp-pap
+    notification.name: policy-notification
+    heartbeat.name: policy-heartbeat
   pdpParameters:
     heartBeatMs: 120000
     updateParameters:
@@ -38,52 +41,46 @@ pap:
       maxWaitMs: 30000
   topicParameterGroup:
     topicSources:
-    - topic: POLICY-PDP-PAP
-      servers:
-      - kafka
-      topicCommInfrastructure: NOOP
-      fetchTimeout: 15000
-    - topic: POLICY-HEARTBEAT
-      effectiveTopic: POLICY-PDP-PAP
-      consumerGroup: policy-pap
-      servers:
-      - kafka
-      topicCommInfrastructure: NOOP
-      fetchTimeout: 15000
+      - topic: ${pap.topic.pdp-pap.name}
+        servers:
+          - kafka:9092
+        topicCommInfrastructure: kafka
+        useHttps: false
+        fetchTimeout: 15000
+      - topic: ${pap.topic.heartbeat.name}
+        effectiveTopic: ${pap.topic.pdp-pap.name}
+        consumerGroup: policy-pap
+        servers:
+          - kafka:9092
+        topicCommInfrastructure: kafka
+        useHttps: false
+        fetchTimeout: 15000
     topicSinks:
-    - topic: POLICY-PDP-PAP
-      servers:
-      - kafka
-      topicCommInfrastructure: NOOP
-    - topic: POLICY-NOTIFICATION
-      servers:
-      - kafka
-      topicCommInfrastructure: NOOP
+      - topic: ${pap.topic.pdp-pap.name}
+        servers:
+          - kafka:9092
+        topicCommInfrastructure: kafka
+        useHttps: false
+      - topic: ${pap.topic.notification.name}
+        servers:
+          - kafka:9092
+        topicCommInfrastructure: kafka
+        useHttps: false
   healthCheckRestClientParameters:
-  - clientName: api
-    hostname: policy-api
-    port: 6969
-    userName: policyadmin
-    password: zb!XztG34
-    useHttps: true
-    basePath: policy/api/v1/healthcheck
-  - clientName: distribution
-    hostname: policy-distribution
-    port: 6969
-    userName: healthcheck
-    password: zb!XztG34
-    useHttps: true
-    basePath: healthcheck
-  - clientName: kafka
-    hostname: kafka
-    port: 3905
-    useHttps: true
-    basePath: topics
+    - clientName: api
+      hostname: policy-api
+      port: 6969
+      userName: policyadmin
+      password: zb!XztG34
+      useHttps: false
+      basePath: policy/api/v1/healthcheck
 
 management:
   endpoints:
     web:
       base-path: /
       exposure:
         include: health, metrics, prometheus
-      path-mapping.prometheus: metrics
+      path-mapping:
+        -metrics: plain-metrics
+        -prometheus: metrics
diff --git a/testsuites/stability/src/main/resources/papsetup/config/pap/bin/policy-pap.sh b/testsuites/stability/src/main/resources/papsetup/config/pap/bin/policy-pap.sh
diff --git a/testsuites/stability/src/main/resources/papsetup/config/pap/etc/defaultConfig.json b/testsuites/stability/src/main/resources/papsetup/config/pap/etc/defaultConfig.json
diff --git a/testsuites/stability/src/main/resources/papsetup/setup_pap.sh b/testsuites/stability/src/main/resources/papsetup/setup_pap.sh
diff --git a/testsuites/stability/src/main/resources/simulatorsetup/config/db/db.conf b/testsuites/stability/src/main/resources/simulatorsetup/config/db/db.conf