[BASIC_CLAMP] Adapt tca clamp plugin

The clamp plugin needs to be updated to match DCAE
enhancements

Issue-ID: INT-1978

Signed-off-by: mrichomme <morgan.richomme@orange.com>
Change-Id: I7a3b96470ec3cff4c2ee1092f282058bff368311

diff --git a/src/onaptests/configuration/tca-microservice.yaml b/src/onaptests/configuration/tca-microservice.yaml
index 0f13c53..574dd10 100644 (file)
--- a/src/onaptests/configuration/tca-microservice.yaml
+++ b/src/onaptests/configuration/tca-microservice.yaml
@@ -1,6 +1,6 @@
 # ============LICENSE_START====================================================
 # =============================================================================
-# Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2019-2021 AT&T Intellectual Property. 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.
@@ -20,7 +20,7 @@ tosca_definitions_version: cloudify_dsl_1_3
 imports:
   - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
   - plugin:k8splugin?version=>=3.4.3,<4.0.0
-  - plugin:clamppolicyplugin?version=1.1.0
+  - plugin:clamppolicyplugin?version=1.1.1
 inputs:
   service_name:
     type: string
@@ -37,13 +37,13 @@ inputs:
     default: "mongodb://dcae-mongohost/dcae-tcagen2"
   tag_version:
     type: string
-    default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.analytics.tca-gen2.dcae-analytics-tca-web:1.2.1"
+    default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.analytics.tca-gen2.dcae-analytics-tca-web:1.3.1"
   tca.aai.password:
     type: string
     default: "DCAE"
   tca.aai.url:
     type: string
-    default: "http://aai.onap.svc.cluster.local"
+    default: "https://aai.onap.svc.cluster.local:8443"
   tca.aai.username:
     type: string
     default: "DCAE"
@@ -62,6 +62,19 @@ inputs:
   policy_id:
     type: string
     default: "onap.restart.tca"
+  cpu_limit:
+    type: string
+    default: "2000m"
+  cpu_request:
+    type: string
+    default: "1000m"
+  memory_limit:
+    type: string
+    default: "2048Mi"
+  memory_request:
+    type: string
+    default: "1024Mi"
+
 node_templates:
   docker.tca:
     type: dcae.nodes.ContainerizedServiceComponent
@@ -123,6 +136,17 @@ node_templates:
           type: http
       image:
         get_input: tag_version
+      resource_config:
+        limits:
+          cpu:
+            get_input: cpu_limit
+          memory:
+            get_input: memory_limit
+        requests:
+          cpu:
+            get_input: cpu_request
+          memory:
+            get_input: memory_request
       log_info:
         log_directory:
           get_input: log_directory