Integrate the R1 version of the xapp manager.

Signed-off-by: Zhe Huang <zhehuang@research.att.com>
Change-Id: Ia3546f42a41cc035a9059c6ce888bf7d57c3a1f2

diff --git a/RECIPE_EXAMPLE/RIC_INFRA_RECIPE_EXAMPLE b/RECIPE_EXAMPLE/RIC_INFRA_RECIPE_EXAMPLE
index 65a0f07..737526d 100644 (file)
--- a/RECIPE_EXAMPLE/RIC_INFRA_RECIPE_EXAMPLE
+++ b/RECIPE_EXAMPLE/RIC_INFRA_RECIPE_EXAMPLE
@@ -59,12 +59,12 @@ cluster:
 
 repositoryCredential:
   user: "docker"
-  password: "haha"
+  password: "docker"
 
 
 helmrepoCredential:
   user: "helm"
-  password: "hehe"
+  password: "docker"
 
 
 adminPassword: admin123

diff --git a/RECIPE_EXAMPLE/RIC_PLATFORM_RECIPE_EXAMPLE b/RECIPE_EXAMPLE/RIC_PLATFORM_RECIPE_EXAMPLE
index 97103b4..7d70475 100644 (file)
--- a/RECIPE_EXAMPLE/RIC_PLATFORM_RECIPE_EXAMPLE
+++ b/RECIPE_EXAMPLE/RIC_PLATFORM_RECIPE_EXAMPLE
@@ -53,15 +53,15 @@ global:
 # xApp Manager 
 appmgr:
   image:
-    name: xapp-manager
-    tag: latest
+    name: ric-plt-appmgr
+    tag: 0.1.3
 
 # DBAAS 
 dbaas:
   backend:
     image:
-      name: redis-standalone
-      tag: latest
+      name: ric-plt-dbaas
+      tag: 0.1.0
 
 # E2 Manager
 e2mgr:

diff --git a/ric-infra/20-Credential/helm/resources/tls.crt b/ric-infra/20-Credential/helm/resources/tls.crt
index 3060f34..984701e 100644 (file)
--- a/ric-infra/20-Credential/helm/resources/tls.crt
+++ b/ric-infra/20-Credential/helm/resources/tls.crt
@@ -1,19 +1,19 @@
 -----BEGIN CERTIFICATE-----
-MIIDCTCCAfGgAwIBAgIBATANBgkqhkiG9w0BAQsFADAdMRswGQYDVQQDExJkb2Nr
-ZXItcmVnaXN0cnktY2EwHhcNMTkwNTE1MTQ1NzQzWhcNMjAwNTE0MTQ1NzQzWjAQ
-MQ4wDAYDVQQDEwVuZXh1czCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AKNNbC8/cil64YXmPYpN7mRaT5biVsZrOrFkXfX2AXcJAsLUL7E4t7keK4Ba/VwO
-pJKmgdjI4NxlTxe+zoOJVVz3+sMYz77UZTd1h/KDn1eBfozbqHcQ5lQksNDsL46d
-yG/JfYpEEzRha/QxEEdaaQLWMyOcf/SjWnscqMQ2cGvTaEiO8F1re2qrwfnrbqQm
-JYkIrmBbcGKMdg33edZpl3xbFc9eMfJGWuhaoC+Tk7Hj1EtV/O9KdPrvDYzO+h7P
-HVExKXU04h1f9ThAoeU9/o7EN266iuUiCVE6M0zekYSV4BuAkXqbUtmpbnYziAYo
-Cq2puiNUSirqXc6Bno12QykCAwEAAaNhMF8wDgYDVR0PAQH/BAQDAgWgMB0GA1Ud
-JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMCAGA1UdEQQZ
-MBeCFWRvY2tlci5yaWNpbmZyYS5sb2NhbDANBgkqhkiG9w0BAQsFAAOCAQEAg5aE
-yicj1VnG4G3JeCszj2hFFmg2eTnwkPsIlpeIMJY8zI/IZ2aQP5e0KPAM8IaKMnqq
-RPPusL2DF7Dl4A+ZBTkvfKtxIzwc7wnQGCfonMyM/MxyoBxXIJw+Qek42CpVbYYt
-qVZ3fz6VpCvF/QL6eGmVpMlvLIu15C9pxzEHPcUKpkM1mvKLRcxn2tt5daqjh9ao
-EvZHJt8kOh53c/FZHgA2+73I8Gx6BLUZPO0E+E1vC5K1FwtCl+Cmt6nX5jZEw1LK
-eNcb3oZhXrVnUoQ72HTJEWuPjydB7w1hxnzB5RYGZalM7XwDmOHwdGHlNxpmMbJa
-UZ4yL0N+nAUbLeUS2w==
+MIIDFzCCAf+gAwIBAgIRAPqRsyJWFaoXjwzmI+uQ5GkwDQYJKoZIhvcNAQELBQAw
+HTEbMBkGA1UEAxMSaGVsbS1yZXBvc2l0b3J5LWNhMB4XDTE5MDYyMjAzMDYxNVoX
+DTIwMDYyMTAzMDYxNVowEDEOMAwGA1UEAxMFbmV4dXMwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDBExs2W0HvXyinLL/LOkgM4Dobe1OVVntQzCGB8tqD
+xI4ZcXGh8G4b3GMLVe8vs0c0IUUbPhy23AkDxGUT7whLbo1UwGa41htxY51zok4S
+20NN706XVs6E0tKqA1L5kzyxLEAKgHE/EefWIf6MHtRt5GfwFVdjdfZP+9L/ZpUL
+u1HKmiWw7fv0m/MrcAQA7lILpB4xeaM8rYWtBj8TGeoMlWLOtOcFKGpY9Kuty1n7
+cebHcz++qY+Vsrf8RlG4lGlit2IY06FE+5ihK24Zt9Ttwf3lsTf6xDwAEGmDxOAp
+R61gY9wX8ClLO+ns+nkkEiJ90104a4U+qg115tZCGfBBAgMBAAGjXzBdMA4GA1Ud
+DwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0T
+AQH/BAIwADAeBgNVHREEFzAVghNoZWxtLnJpY2luZnJhLmxvY2FsMA0GCSqGSIb3
+DQEBCwUAA4IBAQA2Mt29tQ/3ACBpmZSKLPj3jTpPulXQKgtH9of9X0XBQ0ZdfqTN
+Evyu+K5gY/FF6RhnkaCML4XoOnvJHQQBydwMrK9f6mcC26U8PWZn9+usihw5GJHp
+Hu3pc0PDHb87ha+qCeie9ssKitz8pbJarTh6z1Ht8OT9/nktXkgPnIYI9ycAsdwy
+uBww45UxDu8OD8TT0/08RzH56ruPpRSYDNRbkcT8FZV8C6KgEKG55e/xNAITQwaD
+LD4xYkAZqK7lcPzuIM1kZUQAOJyw72TicMl94r0mL7pZ2NOJUCkkVvkYXo97TUKB
+zomEUpolyZnVpdl4HG3v3Lwd2K3bCs2X+HTc
 -----END CERTIFICATE-----

diff --git a/ric-platform/50-RIC-Platform/helm/appmgr/resources/appenv.yaml b/ric-platform/50-RIC-Platform/helm/appmgr/resources/appenv.yaml
new file mode 100644 (file)
index 0000000..c52bf15
--- /dev/null
+++ b/ric-platform/50-RIC-Platform/helm/appmgr/resources/appenv.yaml
@@ -0,0 +1,5 @@
+NAME: xappmgr
+DBAAS_SERVICE_HOST: "r0-dbaas-redis-standalone"
+DBAAS_SERVICE_PORT: "6379"
+DBAAS_PORT_6379_TCP_ADDR: "r0-dbaas-redis-standalone"
+DBAAS_PORT_6379_TCP_PORT: "6379"

diff --git a/ric-platform/50-RIC-Platform/helm/appmgr/resources/appmgr.yaml b/ric-platform/50-RIC-Platform/helm/appmgr/resources/appmgr.yaml
new file mode 100644 (file)
index 0000000..c7c8086
--- /dev/null
+++ b/ric-platform/50-RIC-Platform/helm/appmgr/resources/appmgr.yaml
@@ -0,0 +1,25 @@
+"local":
+  # Port on which the xapp-manager REST services are provided
+  "host": __REST_PORT__
+"helm":
+  # Remote helm repo URL. UPDATE this as required.
+  "repo": __HELM_REPO__
+
+  # Repo name referred within the xapp-manager
+  "repo-name": __REPO_NAME__
+
+  # Tiller service details in the cluster. UPDATE this as required.
+  "tiller-service": __TILLER_SERVICE__
+  "tiller-namespace": __TILLER_NAMESPACE__
+  "tiller-port": __TILLER_PORT__
+  # helm username and password files
+  "helm-username-file": "/opt/ric/secret/helm_repo_username"
+  "helm-password-file": "/opt/ric/secret/helm_repo_password"
+  "retry": 1
+"xapp":
+  #Namespace to install xAPPs
+  "namespace": "ricxapp"
+  "tarDir": "/tmp"
+  "schema": "descriptors/schema.json"
+  "config": "config/config-file.json"
+  "tmpConfig": "/tmp/config-file.json"

diff --git a/ric-platform/50-RIC-Platform/helm/appmgr/resources/xapp-manager.yaml b/ric-platform/50-RIC-Platform/helm/appmgr/resources/xapp-manager.yaml
deleted file mode 100644 (file)
index 179bb75..0000000
--- a/ric-platform/50-RIC-Platform/helm/appmgr/resources/xapp-manager.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-"local":
-  # Port on which the xapp-manager REST services are provided
-  "host": __REST_PORT__
-"helm":
-  # Remote helm repo URL. UPDATE this as required.
-  "repo": __HELM_REPO__
-
-  # Repo name referred within the xapp-manager
-  "repo-name": __REPO_NAME__
-
-  # Tiller service details in the cluster. UPDATE this as required.
-  "tiller-service": __TILLER_SERVICE__
-  "tiller-namespace": __TILLER_SERVICE__
-  "tiller-port": __TILLER_PORT__

diff --git a/ric-platform/50-RIC-Platform/helm/appmgr/templates/appconfig.yaml b/ric-platform/50-RIC-Platform/helm/appmgr/templates/appconfig.yaml
index 0ed87d4..79f334d 100644 (file)
--- a/ric-platform/50-RIC-Platform/helm/appmgr/templates/appconfig.yaml
+++ b/ric-platform/50-RIC-Platform/helm/appmgr/templates/appconfig.yaml
@@ -20,10 +20,11 @@ kind: ConfigMap
 metadata:
   name: {{ include "appmgr.fullname" . }}-appconfig
 data:
-  {{- $restport := default ":8080" (printf ":%.0f" .Values.appmgr.containerPort) | quote -}}
-  {{- $helmrepo := include "common.helmrepository" . | quote -}}
-  {{- $reponame := default "helm-repo" .Values.appmgr.reponame | quote -}}
-  {{- $tiller := include "common.helmrepositorytiller" . | quote -}}
-  {{- $tillernamespace := include "common.helmrepositorytillernamespace" . | quote -}}
-  {{- $tillerport := include "common.helmrepositorytillerport" . | quote -}}
-  {{- (.Files.Glob "resources/xapp-manager.yaml").AsConfig | replace "__HELM_REPO__" $helmrepo | replace "__REST_PORT__" $restport | replace "__REPO_NAME__" $reponame | replace "__TILLER_SERVICE__" $tiller | replace "__TILLER_NAMESPACE__" $tillernamespace | replace "__TILLER_PORT__" $tillerport | nindent 2 }}
+  appmgr.yaml: |
+    {{- $restport := default ":8080" (printf ":%.0f" .Values.appmgr.containerPort) | quote -}}
+    {{- $helmrepo := include "common.helmrepository" . | quote -}}
+    {{- $reponame := default "helm-repo" .Values.appmgr.reponame | quote -}}
+    {{- $tiller := include "common.helmrepositorytiller" . | quote -}}
+    {{- $tillernamespace := include "common.helmrepositorytillernamespace" . | quote -}}
+    {{- $tillerport := include "common.helmrepositorytillerport" . | quote -}}
+    {{- (.Files.Glob "resources/appmgr.yaml").AsConfig | replace "__HELM_REPO__" $helmrepo | replace "__REST_PORT__" $restport | replace "__REPO_NAME__" $reponame | replace "__TILLER_SERVICE__" $tiller | replace "__TILLER_NAMESPACE__" $tillernamespace | replace "__TILLER_PORT__" $tillerport | nindent 2 }}

diff --git a/ric-platform/50-RIC-Platform/helm/appmgr/templates/appenv.yaml b/ric-platform/50-RIC-Platform/helm/appmgr/templates/appenv.yaml
index 465f08c..5f6c8e7 100644 (file)
--- a/ric-platform/50-RIC-Platform/helm/appmgr/templates/appenv.yaml
+++ b/ric-platform/50-RIC-Platform/helm/appmgr/templates/appenv.yaml
@@ -20,6 +20,5 @@ kind: ConfigMap
 metadata:
   name: {{ include "appmgr.fullname" . }}-appenv
 data:
-  {{- with .Values.appmgr.appenv }}
-    {{- toYaml . | nindent 2 }}
-  {{- end }}
+  {{- (.Files.Get "resources/appenv.yaml") | nindent 2 }}
+  

diff --git a/ric-platform/50-RIC-Platform/helm/appmgr/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/appmgr/templates/deployment.yaml
index b425365..b671152 100644 (file)
--- a/ric-platform/50-RIC-Platform/helm/appmgr/templates/deployment.yaml
+++ b/ric-platform/50-RIC-Platform/helm/appmgr/templates/deployment.yaml
@@ -40,6 +40,10 @@ spec:
         release: {{ .Release.Name }}
     spec:
       hostname: {{ .Chart.Name }}
+      hostAliases:
+      - ip: "135.207.143.86"
+        hostnames:
+        - "helm.ricinfra.local"
       imagePullSecrets:
         - name: {{ include "common.repositoryCred" . }}
       containers:
@@ -52,7 +56,8 @@ spec:
               protocol: TCP
           volumeMounts:
             - name: config-volume
-              mountPath: {{ .Values.appmgr.appconfigpath }}
+              mountPath: {{ .Values.appmgr.appconfigpath }}/appmgr.yaml
+              subPath: appmgr.yaml
             - name: secret-volume
               mountPath: {{ .Values.appmgr.appsecretpath }}
             - name: cert-volume

diff --git a/ric-platform/50-RIC-Platform/helm/appmgr/values.yaml b/ric-platform/50-RIC-Platform/helm/appmgr/values.yaml
index fef7eb9..2bb470b 100644 (file)
--- a/ric-platform/50-RIC-Platform/helm/appmgr/values.yaml
+++ b/ric-platform/50-RIC-Platform/helm/appmgr/values.yaml
@@ -16,15 +16,15 @@
 ################################################################################
 
 repository: "nexus3.o-ran-sc.org:10004"
+#repositoryOverride: "nexus3.o-ran-sc.org:10004"
 imagePullPolicy: IfNotPresent
 repositoryCred: docker-reg-cred
 
-
 # Helm Repo for xApp
 # By default a local helm repo is used. The global setting will override
 # the default value. You can further override using
 #helmRepositoryOverride: ""
-helmRepository: "helm.ricinfra.local" 
+helmRepository: "https://helm.ricinfra.local:31000" 
 
 # Default secret name for Helm Repo credential. .Value.golbal.helmRepositoryCred will
 # override the default value. You can further override uing
@@ -65,8 +65,8 @@ helmRepositoryTillerPort: "44134"
 appmgr:
   image:
     # xAppmanager Docker image name and tag
-    name: xapp-manager
-    tag: latest
+    name: ric-plt-appmgr
+    tag: 0.1.3
 
   # This section describes xAppManager
   replicaCount: 1
@@ -79,18 +79,13 @@ appmgr:
     port: 8080
     name: appmgr-service
     protocol: "TCP"
-    export: 30020
+    extport: 30020
 
 
   # config
   # Path referred in xapp-manager for retrieving configuration details
   appconfigpath: /opt/ric/config
 
-  # To be provided as env variables
-  appenv:
-    NAME: xappmgr
-    #ENV1: "envvalue1"
-    #ENV2: "envvalue2"
 
   # secret
   # Path referred in xapp-manager for retrieving helm repo secrets

diff --git a/ric-platform/50-RIC-Platform/helm/common/templates/_helmrepo.tpl b/ric-platform/50-RIC-Platform/helm/common/templates/_helmrepo.tpl
index 4143ce3..c662cf5 100644 (file)
--- a/ric-platform/50-RIC-Platform/helm/common/templates/_helmrepo.tpl
+++ b/ric-platform/50-RIC-Platform/helm/common/templates/_helmrepo.tpl
@@ -154,16 +154,16 @@
 */}}
 {{- define "common.helmrepositorytillerport" -}}
   {{- if .Values.helmRepositoryTillerPortOverride -}}
-    {{- printf "%s" .Values.helmRepositoryTillerPortOverride -}}
+    {{- printf "%.0f" .Values.helmRepositoryTillerPortOverride -}}
   {{- else -}}
     {{- if  .Values.global -}}
       {{- if .Values.global.helmRepositoryTillerPort -}}
-        {{- printf "%s" .Values.global.helmRepositoryTillerPort -}}
+        {{- printf "%.0f" .Values.global.helmRepositoryTillerPort -}}
       {{- else -}}
-        {{- printf "%s" .Values.helmRepositoryTillerPort -}}
+        {{- printf "%.0f" .Values.helmRepositoryTillerPort -}}
       {{- end -}}
     {{- else -}}
-      {{- printf "%s" .Values.helmRepositoryTillerPort -}}
+      {{- printf "%.0f" .Values.helmRepositoryTillerPort -}}
     {{- end -}}
   {{- end -}}
 {{- end -}}