From d32ff1f486548b1a6123761055c2757c5762904f Mon Sep 17 00:00:00 2001
From: wrider <lji@research.att.com>
Date: Wed, 26 Jun 2019 21:25:21 -0400
Subject: [PATCH] Fixes for ric-aux

Incorporating fixes identified during 06/26 testing.

Change-Id: I24d5ce8d1d137b0df0173b4cb9ce788ec8a57fc9
Signed-off-by: wrider <lji@research.att.com>
---
 RECIPE_EXAMPLE/RIC_AUX_RECIPE_EXAMPLE                             | 2 +-
 RECIPE_EXAMPLE/RIC_PLATFORM_RECIPE_EXAMPLE                        | 4 ++--
 ric-aux/80-Auxiliary-Functions/helm/dashboard/values.yaml         | 8 ++++----
 .../helm/message-router/templates/service.yaml                    | 4 ++--
 ric-platform/50-RIC-Platform/bin/install                          | 4 +++-
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/RECIPE_EXAMPLE/RIC_AUX_RECIPE_EXAMPLE b/RECIPE_EXAMPLE/RIC_AUX_RECIPE_EXAMPLE
index cb494e4b..2aa79e0e 100644
--- a/RECIPE_EXAMPLE/RIC_AUX_RECIPE_EXAMPLE
+++ b/RECIPE_EXAMPLE/RIC_AUX_RECIPE_EXAMPLE
@@ -55,5 +55,5 @@ global:
 dashboard:
   image:
     name:: ric-dash-be
-    tag: 1.0.0-SNAPSHOT
+    tag: 1.0.4
 
diff --git a/RECIPE_EXAMPLE/RIC_PLATFORM_RECIPE_EXAMPLE b/RECIPE_EXAMPLE/RIC_PLATFORM_RECIPE_EXAMPLE
index 7d704757..dd547cd3 100644
--- a/RECIPE_EXAMPLE/RIC_PLATFORM_RECIPE_EXAMPLE
+++ b/RECIPE_EXAMPLE/RIC_PLATFORM_RECIPE_EXAMPLE
@@ -53,8 +53,8 @@ global:
 # xApp Manager 
 appmgr:
   image:
-    name: ric-plt-appmgr
-    tag: 0.1.3
+    name: appmgr
+    tag: 1.0.4
 
 # DBAAS 
 dbaas:
diff --git a/ric-aux/80-Auxiliary-Functions/helm/dashboard/values.yaml b/ric-aux/80-Auxiliary-Functions/helm/dashboard/values.yaml
index eb946460..e3a129de 100644
--- a/ric-aux/80-Auxiliary-Functions/helm/dashboard/values.yaml
+++ b/ric-aux/80-Auxiliary-Functions/helm/dashboard/values.yaml
@@ -36,10 +36,10 @@ dashboard:
   # config URLs must be specified at deployment
   properties:
     a1med:
-      url:  http://values-yaml-default-A1-URL
+      url:  http://ricplt-entry/a1mediator
     anrxapp:
-      url:  http://values-yaml-default-ANR-URL
+      url:  http://ricxapp-entry/anr
     e2mgr:
-      url:  http://values-yaml-default-E2-URL
+      url:  http://ricplt-entry/e2mgr
     xappmgr:
-      url:  http://values-yaml-default-MGR-URL
+      url:  http://ricplt-entry/appmgr
\ No newline at end of file
diff --git a/ric-aux/80-Auxiliary-Functions/helm/message-router/templates/service.yaml b/ric-aux/80-Auxiliary-Functions/helm/message-router/templates/service.yaml
index dfd90b28..eac67fcd 100644
--- a/ric-aux/80-Auxiliary-Functions/helm/message-router/templates/service.yaml
+++ b/ric-aux/80-Auxiliary-Functions/helm/message-router/templates/service.yaml
@@ -16,7 +16,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "common.servicename" .  }}
+  name: {{ include "common.fullname" .  }}
   namespace: {{ include "common.namespace" . }}
   labels:
     app: {{ include "common.name" . }}
@@ -26,7 +26,7 @@ metadata:
   annotations:
     msb.onap.org/service-info: '[
       {
-          "serviceName": "{{ include "common.servicename" . }}",
+          "serviceName": "{{ include "common.fullname" . }}",
           "version": "v1",
           "url": "/",
           "protocol": "REST",
diff --git a/ric-platform/50-RIC-Platform/bin/install b/ric-platform/50-RIC-Platform/bin/install
index eee5e52c..f50435ee 100755
--- a/ric-platform/50-RIC-Platform/bin/install
+++ b/ric-platform/50-RIC-Platform/bin/install
@@ -47,6 +47,8 @@ echo "Helm Release Name: $RELEASE_NAME"
 
 COMMON_CHART_VERSION=$(cat $DIR/../helm/common/Chart.yaml | grep version | awk '{print $2}')
 
+helm repo remove local
+
 helm package -d /tmp $DIR/../helm/common
 
 
@@ -76,4 +78,4 @@ for component in $RICPLT_COMPONENTS; do
   else
   helm install -f $OVERRIDEYAML --namespace "${NAMESPACE}" --name "${RELEASE_NAME}-$component" $DIR/../helm/$component
   fi
-done
+done
\ No newline at end of file
-- 
2.16.6