From: wahidw <abdulwahid.w@nokia.com>
Date: Fri, 27 Mar 2020 13:53:54 +0000 (+0000)
Subject: Add alarmadapter to ric-common template
X-Git-Tag: f-release~120
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=a66498cacf991ec1dde0e8e53d793b7e8a8458de;p=it%2Fdep.git

Add alarmadapter to ric-common template

Change-Id: Iea2c620afc990b6bddc37f408448fbd9f0b08a04
Signed-off-by: wahidw <abdulwahid.w@nokia.com>
---

diff --git a/ric-aux/helm/dashboard/requirements.yaml b/ric-aux/helm/dashboard/requirements.yaml
index 40a2e9bd..ba6a2203 100644
--- a/ric-aux/helm/dashboard/requirements.yaml
+++ b/ric-aux/helm/dashboard/requirements.yaml
@@ -17,5 +17,5 @@
 
 dependencies:
   - name: ric-common
-    version: ~3.1.0
+    version: ^3.1.0
     repository: "@local"
diff --git a/ric-aux/helm/ves/requirements.yaml b/ric-aux/helm/ves/requirements.yaml
index 40a2e9bd..ba6a2203 100644
--- a/ric-aux/helm/ves/requirements.yaml
+++ b/ric-aux/helm/ves/requirements.yaml
@@ -17,5 +17,5 @@
 
 dependencies:
   - name: ric-common
-    version: ~3.1.0
+    version: ^3.1.0
     repository: "@local"
diff --git a/ric-common/Common-Template/helm/ric-common/Chart.yaml b/ric-common/Common-Template/helm/ric-common/Chart.yaml
index e40385bd..23da5017 100644
--- a/ric-common/Common-Template/helm/ric-common/Chart.yaml
+++ b/ric-common/Common-Template/helm/ric-common/Chart.yaml
@@ -18,4 +18,4 @@
 apiVersion: v1
 description: Common templates for inclusion in other charts
 name: ric-common
-version: 3.1.1
+version: 3.3.0
diff --git a/ric-common/Common-Template/helm/ric-common/templates/_alarmadapter.tpl b/ric-common/Common-Template/helm/ric-common/templates/_alarmadapter.tpl
new file mode 100755
index 00000000..6ff7b580
--- /dev/null
+++ b/ric-common/Common-Template/helm/ric-common/templates/_alarmadapter.tpl
@@ -0,0 +1,64 @@
+################################################################################
+#   Copyright (c) 2019 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.                                             #
+################################################################################
+
+{{- define "common.name.alarmadapter" -}}
+  {{- printf "alarmadapter" -}}
+{{- end -}}
+
+{{- define "common.fullname.alarmadapter" -}}
+  {{- $name := ( include "common.name.alarmadapter" . ) -}}
+  {{- $namespace := ( include "common.namespace.platform" . ) -}}
+  {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.configmapname.alarmadapter" -}}
+  {{- $name := ( include "common.fullname.alarmadapter" . ) -}}
+  {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.deploymentname.alarmadapter" -}}
+  {{- $name := ( include "common.fullname.alarmadapter" . ) -}}
+  {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.containername.alarmadapter" -}}
+  {{- $name := ( include "common.fullname.alarmadapter" . ) -}}
+  {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.serviceaccountname.alarmadapter" -}}
+  {{- $name := ( include "common.fullname.alarmadapter" . ) -}}
+  {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.ingressname.alarmadapter" -}}
+  {{- $name := ( include "common.fullname.alarmadapter" . ) -}}
+  {{- printf "ingress-%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.servicename.alarmadapter.rmr" -}}
+  {{- $name := ( include "common.fullname.alarmadapter" . ) -}}
+  {{- printf "service-%s-rmr" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.servicename.alarmadapter.http" -}}
+  {{- $name := ( include "common.fullname.alarmadapter" . ) -}}
+  {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "common.serviceport.alarmadapter.rmr.data" -}}4560{{- end -}}
+{{- define "common.serviceport.alarmadapter.rmr.route" -}}4561{{- end -}}
+{{- define "common.serviceport.alarmadapter.http" -}}3800{{- end -}}