11 files changed, 48 insertions, 19 deletions
diff --git a/kubernetes/modeling/charts/modeling-genericparser/.helmignore b/kubernetes/modeling/charts/modeling-etsicatalog/.helmignore
index f0c1319444..f0c1319444 100644
--- a/kubernetes/modeling/charts/modeling-genericparser/.helmignore
+++ b/kubernetes/modeling/charts/modeling-etsicatalog/.helmignore
diff --git a/kubernetes/modeling/charts/modeling-genericparser/Chart.yaml b/kubernetes/modeling/charts/modeling-etsicatalog/Chart.yaml
index d5f20be640..58173cfb97 100644
--- a/kubernetes/modeling/charts/modeling-genericparser/Chart.yaml
+++ b/kubernetes/modeling/charts/modeling-etsicatalog/Chart.yaml
@@ -13,6 +13,6 @@
 # limitations under the License.
 
 apiVersion: v1
-description: ONAP Modeling - Genericparser
-name: modeling-genericparser
+description: ONAP Modeling - Etsicatalog
+name: modeling-etsicatalog
 version: 5.0.0
 \ No newline at end of file
diff --git a/kubernetes/modeling/charts/modeling-genericparser/resources/config/logging/log.yml b/kubernetes/modeling/charts/modeling-etsicatalog/resources/config/logging/log.yml
index 1c4cf6c1c4..5ac5fefe92 100644
--- a/kubernetes/modeling/charts/modeling-genericparser/resources/config/logging/log.yml
+++ b/kubernetes/modeling/charts/modeling-etsicatalog/resources/config/logging/log.yml
@@ -2,29 +2,33 @@ version: 1
 disable_existing_loggers: False
 
 loggers:
-    gengricparser:
-        handlers: [gengricparserlocal_handler, gengricparser_handler]
+    catalog:
+        handlers: [cataloglocal_handler, catalog_handler]
         level: "DEBUG"
         propagate: False
     django:
         handlers: [django_handler]
         level: "DEBUG"
         propagate: False
+    tosca:
+        handlers: [cataloglocal_handler, catalog_handler]
+        level: "DEBUG"
+        propagate: False
 handlers:
-    gengricparserlocal_handler:
+    cataloglocal_handler:
         level: "DEBUG"
         class:
             "logging.handlers.RotatingFileHandler"
-        filename: "logs/runtime_gengricparser.log"
+        filename: "logs/runtime_catalog.log"
         formatter:
             "standard"
         maxBytes: 52428800
         backupCount: 10
-    gengricparser_handler:
+    catalog_handler:
         level: "DEBUG"
         class:
             "logging.handlers.RotatingFileHandler"
-        filename: "/var/log/onap/modeling/genericparser/runtime_gengricparser.log"
+        filename: "/var/log/onap/modeling/etsicatalog/runtime_catalog.log"
         formatter:
             "mdcFormat"
         maxBytes: 52428800
diff --git a/kubernetes/modeling/charts/modeling-genericparser/templates/configmap.yaml b/kubernetes/modeling/charts/modeling-etsicatalog/templates/configmap.yaml
index 1d0751a01b..1d0751a01b 100644
--- a/kubernetes/modeling/charts/modeling-genericparser/templates/configmap.yaml
+++ b/kubernetes/modeling/charts/modeling-etsicatalog/templates/configmap.yaml
diff --git a/kubernetes/modeling/charts/modeling-genericparser/templates/deployment.yaml b/kubernetes/modeling/charts/modeling-etsicatalog/templates/deployment.yaml
index b61cd87e6c..08d5e139b1 100644
--- a/kubernetes/modeling/charts/modeling-genericparser/templates/deployment.yaml
+++ b/kubernetes/modeling/charts/modeling-etsicatalog/templates/deployment.yaml
@@ -77,15 +77,15 @@ spec:
             - name: REDIS_ADDR
               value: "{{ .Values.global.config.redisServiceName }}:{{ .Values.global.config.redisPort }}"
           volumeMounts:
-          - name: {{ include "common.fullname" . }}-genericparser
-            mountPath: /service/modeling/genericparser/static
+          - name: {{ include "common.fullname" . }}-etsicatalog
+            mountPath: /service/modeling/etsicatalog/static
           - name: {{ include "common.fullname" . }}-localtime
             mountPath: /etc/localtime
             readOnly: true
           - name: {{ include "common.fullname" . }}-logs
             mountPath: /var/log/onap
           - name: {{ include "common.fullname" . }}-logconfig
-            mountPath: /opt/modeling/genericparser/config/log.yml
+            mountPath: /opt/modeling/etsicatalog/config/log.yml
             subPath: log.yml
           resources:
 {{ include "common.resources" . | indent 12 }}
@@ -112,7 +112,7 @@ spec:
             mountPath: /usr/share/filebeat/data
 
       volumes:
-        - name: {{ include "common.fullname" . }}-genericparser
+        - name: {{ include "common.fullname" . }}-etsicatalog
         {{- if .Values.persistence.enabled }}
           persistentVolumeClaim:
             claimName: {{ include "common.fullname" . }}
diff --git a/kubernetes/modeling/charts/modeling-genericparser/templates/pv.yaml b/kubernetes/modeling/charts/modeling-etsicatalog/templates/pv.yaml
index d1e1b04121..d1e1b04121 100644
--- a/kubernetes/modeling/charts/modeling-genericparser/templates/pv.yaml
+++ b/kubernetes/modeling/charts/modeling-etsicatalog/templates/pv.yaml
diff --git a/kubernetes/modeling/charts/modeling-genericparser/templates/pvc.yaml b/kubernetes/modeling/charts/modeling-etsicatalog/templates/pvc.yaml
index 74ba690fa6..74ba690fa6 100644
--- a/kubernetes/modeling/charts/modeling-genericparser/templates/pvc.yaml
+++ b/kubernetes/modeling/charts/modeling-etsicatalog/templates/pvc.yaml
diff --git a/kubernetes/modeling/charts/modeling-genericparser/templates/service.yaml b/kubernetes/modeling/charts/modeling-etsicatalog/templates/service.yaml
index c69be571c8..217e6af759 100644
--- a/kubernetes/modeling/charts/modeling-genericparser/templates/service.yaml
+++ b/kubernetes/modeling/charts/modeling-etsicatalog/templates/service.yaml
@@ -32,6 +32,14 @@ metadata:
           "port": "{{.Values.service.externalPort}}",
           "visualRange":"1"
       }
+      {
+          "serviceName": "etsicatalog",
+          "version": "v1",
+          "url": "/api/catalog/v1",
+          "protocol": "REST",
+          "port": "{{.Values.service.externalPort}}",
+          "visualRange":"1"
+      }
 	  {
           "serviceName": "nsd",
           "version": "v1",
diff --git a/kubernetes/modeling/charts/modeling-genericparser/values.yaml b/kubernetes/modeling/charts/modeling-etsicatalog/values.yaml
index 467d7315b5..3217389755 100644
--- a/kubernetes/modeling/charts/modeling-genericparser/values.yaml
+++ b/kubernetes/modeling/charts/modeling-etsicatalog/values.yaml
@@ -29,7 +29,7 @@ global:
 flavor: small
 
 repository: nexus3.onap.org:10001
-image: onap/modeling/genericparser:1.0.2
+image: onap/modeling/etsicatalog:1.0.4
 pullPolicy: Always
 
 #Istio sidecar injection policy
@@ -79,12 +79,12 @@ persistence:
   accessMode: ReadWriteOnce
   size: 2Gi
   mountPath: /dockerdata-nfs
-  mountSubPath: modeling/genericparser
+  mountSubPath: modeling/etsicatalog
 
 service:
   type: ClusterIP
-  name: modeling-genericparser
-  portName: modeling-genericparser
+  name: modeling-etsicatalog
+  portName: modeling-etsicatalog
   externalPort: 8806
   internalPort: 8806
 #  nodePort: 30806
diff --git a/kubernetes/multicloud/values.yaml b/kubernetes/multicloud/values.yaml
index 426b3efd07..9fd0789e32 100644
--- a/kubernetes/multicloud/values.yaml
+++ b/kubernetes/multicloud/values.yaml
@@ -20,7 +20,7 @@ global:
   nodePortPrefix: 302
   loggingRepository: docker.elastic.co
   loggingImage: beats/filebeat:5.5.0
-  artifactImage: onap/multicloud/framework-artifactbroker:1.4.1
+  artifactImage: onap/multicloud/framework-artifactbroker:1.4.2
   prometheus:
     enabled: false
 
@@ -29,7 +29,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/multicloud/framework:1.4.1
+image: onap/multicloud/framework:1.4.2
 pullPolicy: Always
 
 #Istio sidecar injection policy
diff --git a/kubernetes/onap/resources/overrides/onap-all-ingress-nginx.yaml b/kubernetes/onap/resources/overrides/onap-all-ingress-nginx.yaml
index 07861444e7..7ef1e02714 100644
--- a/kubernetes/onap/resources/overrides/onap-all-ingress-nginx.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all-ingress-nginx.yaml
@@ -68,6 +68,16 @@ sdnc:
   enabled: true
 so:
   enabled: true
+  so-monitoring:
+      enabled: true
+      ingress:
+          enabled: true
+          service:
+              - path: "/so-monitoring"
+                name: "so-monitoring"
+                port: 9091
+          annotations:
+            nginx.ingress.kubernetes.io/ssl-redirect: "false"
 uui:
   enabled: true
 vfc:
@@ -75,8 +85,15 @@ vfc:
 vid:
   enabled: true
   ingress:
-      enabled: true
+   enabled: true
+   service:
+       - path: "/vid"
+         name: "vid-http"
+         port: 8080
+   annotations:
+         nginx.ingress.kubernetes.io/ssl-redirect: "false"
 vnfsdk:
   enabled: true
 nginx-ingress:
     enabled: true
+