From 3276371eda89578e4fe3ad2ce348d1da6e22ff3f Mon Sep 17 00:00:00 2001 From: liamfallon Date: Tue, 14 Nov 2023 16:52:53 +0100 Subject: Set all cross references of policy/clamp policy/clamp updated with correct cross references *** This commit is generated by a PF release script *** Issue-ID: POLICY-4854 Signed-off-by: liamfallon Change-Id: I14ecc079ddf1445eb22bbbf710190265ae1255d4 --- .../policy-clamp-docker/src/main/docker/A1pmsParticipant.Dockerfile | 2 +- packages/policy-clamp-docker/src/main/docker/AcmRuntime.Dockerfile | 2 +- .../src/main/docker/ElementParticipant.Dockerfile | 2 +- .../policy-clamp-docker/src/main/docker/HttpParticipant.Dockerfile | 2 +- .../src/main/docker/KserveParticipant.Dockerfile | 2 +- .../src/main/docker/KubernetesParticipant.Dockerfile | 2 +- .../src/main/docker/PolicyParticipant.Dockerfile | 2 +- .../policy-clamp-docker/src/main/docker/SimParticipant.Dockerfile | 2 +- pom.xml | 6 +++--- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/policy-clamp-docker/src/main/docker/A1pmsParticipant.Dockerfile b/packages/policy-clamp-docker/src/main/docker/A1pmsParticipant.Dockerfile index 464f7e442..4672d8eba 100644 --- a/packages/policy-clamp-docker/src/main/docker/A1pmsParticipant.Dockerfile +++ b/packages/policy-clamp-docker/src/main/docker/A1pmsParticipant.Dockerfile @@ -23,7 +23,7 @@ RUN mkdir /packages /extracted COPY /maven/lib/a1pms-participant.tar.gz /packages/ RUN tar xvzf /packages/a1pms-participant.tar.gz --directory /extracted/ -FROM onap/policy-jre-alpine:3.0.3-SNAPSHOT +FROM onap/policy-jre-alpine:3.1.0-SNAPSHOT LABEL maintainer="Policy Team" LABEL org.opencontainers.image.title="Policy CLAMP ACM A1 PMS Participant" diff --git a/packages/policy-clamp-docker/src/main/docker/AcmRuntime.Dockerfile b/packages/policy-clamp-docker/src/main/docker/AcmRuntime.Dockerfile index 947bb41ea..5b3c44409 100644 --- a/packages/policy-clamp-docker/src/main/docker/AcmRuntime.Dockerfile +++ b/packages/policy-clamp-docker/src/main/docker/AcmRuntime.Dockerfile @@ -23,7 +23,7 @@ RUN mkdir /packages /extracted COPY /maven/lib/policy-clamp-runtime-acm.tar.gz /packages/ RUN tar xvzf /packages/policy-clamp-runtime-acm.tar.gz --directory /extracted/ -FROM onap/policy-jre-alpine:3.0.3-SNAPSHOT +FROM onap/policy-jre-alpine:3.1.0-SNAPSHOT LABEL maintainer="Policy Team" LABEL org.opencontainers.image.title="Policy CLAMP ACM runtime" diff --git a/packages/policy-clamp-docker/src/main/docker/ElementParticipant.Dockerfile b/packages/policy-clamp-docker/src/main/docker/ElementParticipant.Dockerfile index 9fe7eed00..6785e5c9f 100644 --- a/packages/policy-clamp-docker/src/main/docker/ElementParticipant.Dockerfile +++ b/packages/policy-clamp-docker/src/main/docker/ElementParticipant.Dockerfile @@ -23,7 +23,7 @@ RUN mkdir /packages /extracted COPY /maven/lib/element-participant.tar.gz /packages RUN tar xvfz /packages/element-participant.tar.gz --directory /extracted/ -FROM onap/policy-jre-alpine:3.0.3-SNAPSHOT +FROM onap/policy-jre-alpine:3.1.0-SNAPSHOT LABEL maintainer="Policy Team" LABEL org.opencontainers.image.title="Policy CLAMP ACM Element" diff --git a/packages/policy-clamp-docker/src/main/docker/HttpParticipant.Dockerfile b/packages/policy-clamp-docker/src/main/docker/HttpParticipant.Dockerfile index 56cad79b0..0ba1072ad 100644 --- a/packages/policy-clamp-docker/src/main/docker/HttpParticipant.Dockerfile +++ b/packages/policy-clamp-docker/src/main/docker/HttpParticipant.Dockerfile @@ -23,7 +23,7 @@ RUN mkdir /packages /extracted COPY /maven/lib/http-participant.tar.gz /packages/ RUN tar xvzf /packages/http-participant.tar.gz --directory /extracted/ -FROM onap/policy-jre-alpine:3.0.3-SNAPSHOT +FROM onap/policy-jre-alpine:3.1.0-SNAPSHOT LABEL maintainer="Policy Team" LABEL org.opencontainers.image.title="Policy CLAMP ACM HTTP Participant" diff --git a/packages/policy-clamp-docker/src/main/docker/KserveParticipant.Dockerfile b/packages/policy-clamp-docker/src/main/docker/KserveParticipant.Dockerfile index 7dfd07be6..ff8a2282f 100644 --- a/packages/policy-clamp-docker/src/main/docker/KserveParticipant.Dockerfile +++ b/packages/policy-clamp-docker/src/main/docker/KserveParticipant.Dockerfile @@ -23,7 +23,7 @@ RUN mkdir /packages /extracted COPY /maven/lib/kserve-participant.tar.gz /packages/ RUN tar xvzf /packages/kserve-participant.tar.gz --directory /extracted/ -FROM onap/policy-jre-alpine:3.0.3-SNAPSHOT +FROM onap/policy-jre-alpine:3.1.0-SNAPSHOT LABEL maintainer="Policy Team" LABEL org.opencontainers.image.title="Policy CLAMP ACM KSERVE Participant" diff --git a/packages/policy-clamp-docker/src/main/docker/KubernetesParticipant.Dockerfile b/packages/policy-clamp-docker/src/main/docker/KubernetesParticipant.Dockerfile index 4587bdf22..ba5647bbe 100644 --- a/packages/policy-clamp-docker/src/main/docker/KubernetesParticipant.Dockerfile +++ b/packages/policy-clamp-docker/src/main/docker/KubernetesParticipant.Dockerfile @@ -23,7 +23,7 @@ RUN mkdir /packages /extracted COPY /maven/lib/kubernetes-participant.tar.gz /packages/ RUN tar xvzf /packages/kubernetes-participant.tar.gz --directory /extracted/ -FROM onap/policy-jre-alpine:3.0.3-SNAPSHOT +FROM onap/policy-jre-alpine:3.1.0-SNAPSHOT LABEL maintainer="Policy Team" LABEL org.opencontainers.image.title="Policy CLAMP ACM K8S Participant" diff --git a/packages/policy-clamp-docker/src/main/docker/PolicyParticipant.Dockerfile b/packages/policy-clamp-docker/src/main/docker/PolicyParticipant.Dockerfile index 00bbe4e42..fc787ec45 100644 --- a/packages/policy-clamp-docker/src/main/docker/PolicyParticipant.Dockerfile +++ b/packages/policy-clamp-docker/src/main/docker/PolicyParticipant.Dockerfile @@ -23,7 +23,7 @@ RUN mkdir /packages /extracted COPY /maven/lib/policy-participant.tar.gz /packages/ RUN tar xvzf /packages/policy-participant.tar.gz --directory /extracted/ -FROM onap/policy-jre-alpine:3.0.3-SNAPSHOT +FROM onap/policy-jre-alpine:3.1.0-SNAPSHOT LABEL maintainer="Policy Team" LABEL org.opencontainers.image.title="Policy CLAMP ACM Policy Framework Participant" diff --git a/packages/policy-clamp-docker/src/main/docker/SimParticipant.Dockerfile b/packages/policy-clamp-docker/src/main/docker/SimParticipant.Dockerfile index b1aef14ef..e0cf01595 100644 --- a/packages/policy-clamp-docker/src/main/docker/SimParticipant.Dockerfile +++ b/packages/policy-clamp-docker/src/main/docker/SimParticipant.Dockerfile @@ -23,7 +23,7 @@ RUN mkdir /packages /extracted COPY /maven/lib/sim-participant.tar.gz /packages/ RUN tar xvzf /packages/sim-participant.tar.gz --directory /extracted/ -FROM onap/policy-jre-alpine:3.0.3-SNAPSHOT +FROM onap/policy-jre-alpine:3.1.0-SNAPSHOT LABEL maintainer="Policy Team" LABEL org.opencontainers.image.title="Policy CLAMP ACM Simulator Participant" diff --git a/pom.xml b/pom.xml index e6b5c8dc8..dafbfefc9 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.parent integration - 4.0.3-SNAPSHOT + 4.1.0-SNAPSHOT org.onap.policy.clamp @@ -50,8 +50,8 @@ o policy-clamp-participant-impl-kserve: A standard participant for Kserve - 2.0.3-SNAPSHOT - 3.0.3-SNAPSHOT + 2.1.0-SNAPSHOT + 3.1.0-SNAPSHOT common -- cgit ='#n123'>123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 
# ============LICENSE_START=======================================================
# Copyright (C) 2023-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.
# 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=========================================================

rest:
  api:
    cps-base-path: /cps/api
    ncmp-base-path: /ncmp
    ncmp-inventory-base-path: /ncmpInventory

spring:
  main:
    banner-mode: off

  application:
    name: cps-integration-test

  jpa:
    properties:
      hibernate.enable_lazy_load_no_trans: true
      hibernate.dialect: org.hibernate.dialect.PostgreSQLDialect
      hibernate.format_sql: false
      hibernate.show_sql: false
      # Please ensure these values match those used in cps-application/src/main/resources/application.yml
      hibernate.id.new_generator_mappings: true
      hibernate.jdbc.batch_size: 100

  datasource:
    url: ${DB_URL}
    username: ${DB_USERNAME}
    password: ${DB_PASSWORD}
    driverClassName: org.postgresql.Driver
    initialization-mode: always
    hikari:
      minimumIdle: 5
      maximumPoolSize: 80
      idleTimeout: 60000
      connectionTimeout: 30000
      leakDetectionThreshold: 30000
      pool-name: CpsDatabasePool

  cache:
    type: caffeine
    cache-names: yangSchema
    caffeine:
      spec: maximumSize=10000,expireAfterAccess=10m

  liquibase:
    change-log: classpath:changelog/changelog-master.yaml

  servlet:
    multipart:
      enabled: true
      max-file-size: 100MB
      max-request-size: 100MB

  kafka:
    bootstrap-servers: ${KAFKA_BOOTSTRAP_SERVER:localhost:9092}
    security:
      protocol: PLAINTEXT
    producer:
      value-serializer: io.cloudevents.kafka.CloudEventSerializer
      client-id: cps-core
    consumer:
      group-id: ${NCMP_CONSUMER_GROUP_ID:ncmp-group}
      key-deserializer: org.springframework.kafka.support.serializer.ErrorHandlingDeserializer
      value-deserializer: org.springframework.kafka.support.serializer.ErrorHandlingDeserializer
      properties:
        spring.deserializer.key.delegate.class: org.apache.kafka.common.serialization.StringDeserializer
        spring.deserializer.value.delegate.class: io.cloudevents.kafka.CloudEventDeserializer
        spring.json.use.type.headers: false

  jackson:
    default-property-inclusion: NON_NULL
    serialization:
      FAIL_ON_EMPTY_BEANS: false

  sql:
    init:
      mode: ALWAYS

app:
  ncmp:
    async-m2m:
      topic: ${NCMP_ASYNC_M2M_TOPIC:ncmp-async-m2m}
    avc:
      cm-subscription-ncmp-in: ${CM_SUBSCRIPTION_NCMP_IN_TOPIC:subscription}
      cm-subscription-dmi-in: ${CM_SUBSCRIPTION_DMI_IN_TOPIC:ncmp-dmi-cm-avc-subscription}
      cm-subscription-dmi-out: ${CM_SUBSCRIPTION_DMI_OUT_TOPIC:dmi-ncmp-cm-avc-subscription}
      cm-subscription-ncmp-out: ${CM_SUBSCRIPTION_NCMP_OUT_TOPIC:subscription-response}
      cm-events-topic: ${NCMP_CM_EVENTS_TOPIC:cm-events}
  lcm:
    events:
      topic: ${LCM_EVENTS_TOPIC:ncmp-events}
  dmi:
    cm-events:
      topic: ${DMI_CM_EVENTS_TOPIC:dmi-cm-events}
    device-heartbeat:
      topic: ${DMI_DEVICE_HEARTBEAT_TOPIC:dmi-device-heartbeat}

notification:
  enabled: true
  async:
    executor:
      core-pool-size: 2
      max-pool-size: 10
      queue-capacity: 500
      wait-for-tasks-to-complete-on-shutdown: true
      thread-name-prefix: Async-
      time-out-value-in-ms: 60000

springdoc:
  swagger-ui:
    disable-swagger-default-url: true
    urlsPrimaryName: cps-core
    urls:
      - name: cps-core
        url: /api-docs/cps-core/openapi.yaml
      - name: cps-ncmp
        url: /api-docs/cps-ncmp/openapi.yaml
      - name: cps-ncmp-inventory
        url: /api-docs/cps-ncmp/openapi-inventory.yaml

security:
  # comma-separated uri patterns which do not require authorization
  permit-uri: /actuator/**,/swagger-ui.html,/swagger-ui/**,/swagger-resources/**,/api-docs/**,/v3/api-docs/**
  auth:
    username: cps
    password: cpsr0cks!

# Actuator
management:
  endpoints:
    web:
      exposure:
        include: info,health,loggers,prometheus
  endpoint:
    health:
      show-details: always
      # kubernetes probes: liveness and readiness
      probes:
        enabled: false

logging:
  format: text
  level:
    org:
      springframework: INFO
      onap:
        cps: INFO

ncmp:
  dmi:
    httpclient:
      connectionTimeoutInSeconds: 30
      maximumConnectionsPerRoute: 50
      maximumConnectionsTotal: 100
      idleConnectionEvictionThresholdInSeconds: 5
      maximumInMemorySizeInMegabytes: 16
    auth:
      username: dmi
      password: dmi
      enabled: false
    api:
      base-path: dmi

  timers:
    advised-modules-sync:
      sleep-time-ms: 1000000
    cm-handle-data-sync:
      sleep-time-ms: 30000
    subscription-forwarding:
      dmi-response-timeout-ms: 30000
    model-loader:
      retry-time-ms: 1000
    trust-level:
      dmi-availability-watchdog-ms: 30000

  modules-sync-watchdog:
    async-executor:
      parallelism-level: 1

  model-loader:
    maximum-attempt-count: 20

  servlet:
    multipart:
      enabled: true
      max-file-size: 100MB
      max-request-size: 100MB

  jackson:
    default-property-inclusion: NON_NULL
    serialization:
      FAIL_ON_EMPTY_BEANS: false

  sql:
    init:
      mode: ALWAYS

  policy-executor:
    enabled: true
    defaultDecision: "test default decision"
    server:
      address: http://localhost
      port: 8790
    httpclient:
      all-services:
        maximumInMemorySizeInMegabytes: 1
        maximumConnectionsTotal: 10
        pendingAcquireMaxCount: 10
        connectionTimeoutInSeconds: 30
        readTimeoutInSeconds: 1
        writeTimeoutInSeconds: 30

hazelcast:
  cluster-name: cps-and-ncmp-test-caches
  instance-config-name: "cps-and-ncmp-hazelcast-instance-test-config"
  mode:
    kubernetes:
      enabled: false
      service-name: cps-and-ncmp-service

cps:
  tracing:
    enabled: false
    exporter:
      protocol: grpc