Merge "New version of the common template. It unifies the naming convention between...

diff --combined RECIPE_EXAMPLE/RIC_AUX_RECIPE_EXAMPLE
index 085dc9b,52751af..4da8da1
--- 1/RECIPE_EXAMPLE/RIC_AUX_RECIPE_EXAMPLE
--- 2/RECIPE_EXAMPLE/RIC_AUX_RECIPE_EXAMPLE
+++ b/RECIPE_EXAMPLE/RIC_AUX_RECIPE_EXAMPLE
@@@ -29,7 -29,7 +29,7 @@@ global
    imagePullPolicy: Always
  
    # Helm repo that will be used by xApp manager
-   helmRepository: nexus.ricinfra.local
+   helmRepository: "https://ricaux-entry/helm"
  
    # Certificate of the helm repo
    helmRepositoryCert: xapp-mgr-certs
@@@ -55,8 -55,5 +55,8 @@@
  dashboard:
    image:
      name:: ric-dash-be
 -    tag: 1.0.4
 +    tag: 1.0.5
  
 +ext:
 +  ip:
 +    192.168.130.110

diff --combined RECIPE_EXAMPLE/RIC_PLATFORM_RECIPE_EXAMPLE
index 5ebf204,d12ae12..bda371a
--- 1/RECIPE_EXAMPLE/RIC_PLATFORM_RECIPE_EXAMPLE
--- 2/RECIPE_EXAMPLE/RIC_PLATFORM_RECIPE_EXAMPLE
+++ b/RECIPE_EXAMPLE/RIC_PLATFORM_RECIPE_EXAMPLE
@@@ -29,7 -29,7 +29,7 @@@ global
    imagePullPolicy: Always
  
    # Helm repo that will be used by xApp manager
-   helmRepository: helm.ricinfra.local
+   helmRepository: "https://ricaux-entry/helm"
  
    # Certificate of the helm repo
    helmRepositoryCert: xapp-mgr-certs
@@@ -50,12 -50,6 +50,12 @@@
  #-------------------------------------------------------------------------
  # Platform Components 
  #-------------------------------------------------------------------------
 +# A1 Mediator
 +a1mediator:
 +  image:
 +    name: ric-plt-a1
 +    tag: 0.8.3
 +
  # xApp Manager 
  appmgr:
    image:
@@@ -73,17 -67,16 +73,17 @@@ dbaas
  e2mgr:
    image:
      name: e2mgr
 -    tag: 1.0.0
 +    tag: 1.6.0
    env:
      RMR_RTG_SVC: "ric-full-rtmgr"
 +    RIC_ID: "bbbccc-abcd0e/20"
  
  
  # E2 Termination
  e2term:
    image:
      name: e2
 -    tag: 1.0.0
 +    tag: 1.6.0
    env:
      print: "1"
      RMR_RTG_SVC: "ric-full-rtmgr"
@@@ -93,14 -86,3 +93,14 @@@ rtmgr
    image:
      name: rtmgr
      tag: 0.0.2
 +
 +# Subscription Manager
 +submgr:
 +  image:
 +    name: submgr
 +    tag: v0.1.0
 +
 +# the service for redirecting to AUX cluster
 +ext:
 +  ip:
 +    192.168.130.102