From: Dileep Ranganathan Date: Thu, 30 May 2019 19:38:37 +0000 (-0700) Subject: Refactor Distributed Analytics project structure X-Git-Tag: 1.5.0~77 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=demo.git;a=commitdiff_plain;h=3d5a3e06530c1250d48f7d838c619f3bfbcd019d Refactor Distributed Analytics project structure Modified the project structure to improve maintainability and to add future CI and integration test support. Change-Id: Id30bfb1f83f23785a6b5f99e81f42f752d59c0f8 Issue-ID: ONAPARC-280 Signed-off-by: Dileep Ranganathan --- diff --git a/vnfs/DAaaS/README.md b/vnfs/DAaaS/README.md index b0838d54..2b3c0d6a 100644 --- a/vnfs/DAaaS/README.md +++ b/vnfs/DAaaS/README.md @@ -10,7 +10,7 @@ #### Download Framework ```bash git clone https://github.com/onap/demo.git -DA_WORKING_DIR=$PWD/demo/vnfs/DAaaS +DA_WORKING_DIR=$PWD/demo/vnfs/DAaaS/deploy cd $DA_WORKING_DIR ``` diff --git a/vnfs/DAaaS/applications/Chart.yaml b/vnfs/DAaaS/applications/Chart.yaml deleted file mode 100644 index 803e19aa..00000000 --- a/vnfs/DAaaS/applications/Chart.yaml +++ /dev/null @@ -1,5 +0,0 @@ - apiVersion: v1 - appVersion: "1.0" - description: Helm chart for sample applications that use the components that the training-core framework deploys. - name: sample-applications - version: 0.1.0 diff --git a/vnfs/DAaaS/build/README.md b/vnfs/DAaaS/build/README.md new file mode 100644 index 00000000..d1eaa323 --- /dev/null +++ b/vnfs/DAaaS/build/README.md @@ -0,0 +1 @@ +This folder consists of Dockerfiles and build scripts. diff --git a/vnfs/DAaaS/00-init/gloo/.helmignore b/vnfs/DAaaS/deploy/00-init/gloo/.helmignore similarity index 100% rename from vnfs/DAaaS/00-init/gloo/.helmignore rename to vnfs/DAaaS/deploy/00-init/gloo/.helmignore diff --git a/vnfs/DAaaS/00-init/gloo/Chart.yaml b/vnfs/DAaaS/deploy/00-init/gloo/Chart.yaml similarity index 100% rename from vnfs/DAaaS/00-init/gloo/Chart.yaml rename to vnfs/DAaaS/deploy/00-init/gloo/Chart.yaml diff --git a/vnfs/DAaaS/00-init/gloo/templates/0-namespace.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/0-namespace.yaml similarity index 100% rename from vnfs/DAaaS/00-init/gloo/templates/0-namespace.yaml rename to vnfs/DAaaS/deploy/00-init/gloo/templates/0-namespace.yaml diff --git a/vnfs/DAaaS/00-init/gloo/templates/10-ingress-deployment.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/10-ingress-deployment.yaml similarity index 100% rename from vnfs/DAaaS/00-init/gloo/templates/10-ingress-deployment.yaml rename to vnfs/DAaaS/deploy/00-init/gloo/templates/10-ingress-deployment.yaml diff --git a/vnfs/DAaaS/00-init/gloo/templates/100-gloo-crds.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/100-gloo-crds.yaml similarity index 100% rename from vnfs/DAaaS/00-init/gloo/templates/100-gloo-crds.yaml rename to vnfs/DAaaS/deploy/00-init/gloo/templates/100-gloo-crds.yaml diff --git a/vnfs/DAaaS/00-init/gloo/templates/101-knative-crds-0.5.1.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/101-knative-crds-0.5.1.yaml similarity index 100% rename from vnfs/DAaaS/00-init/gloo/templates/101-knative-crds-0.5.1.yaml rename to vnfs/DAaaS/deploy/00-init/gloo/templates/101-knative-crds-0.5.1.yaml diff --git a/vnfs/DAaaS/00-init/gloo/templates/11-ingress-proxy-deployment.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/11-ingress-proxy-deployment.yaml similarity index 100% rename from vnfs/DAaaS/00-init/gloo/templates/11-ingress-proxy-deployment.yaml rename to vnfs/DAaaS/deploy/00-init/gloo/templates/11-ingress-proxy-deployment.yaml diff --git a/vnfs/DAaaS/00-init/gloo/templates/12-ingress-proxy-configmap.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/12-ingress-proxy-configmap.yaml similarity index 100% rename from vnfs/DAaaS/00-init/gloo/templates/12-ingress-proxy-configmap.yaml rename to vnfs/DAaaS/deploy/00-init/gloo/templates/12-ingress-proxy-configmap.yaml diff --git a/vnfs/DAaaS/00-init/gloo/templates/13-ingress-proxy-service.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/13-ingress-proxy-service.yaml similarity index 100% rename from vnfs/DAaaS/00-init/gloo/templates/13-ingress-proxy-service.yaml rename to vnfs/DAaaS/deploy/00-init/gloo/templates/13-ingress-proxy-service.yaml diff --git a/vnfs/DAaaS/00-init/gloo/templates/14-clusteringress-proxy-deployment.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/14-clusteringress-proxy-deployment.yaml similarity index 100% rename from vnfs/DAaaS/00-init/gloo/templates/14-clusteringress-proxy-deployment.yaml rename to vnfs/DAaaS/deploy/00-init/gloo/templates/14-clusteringress-proxy-deployment.yaml diff --git a/vnfs/DAaaS/00-init/gloo/templates/15-clusteringress-proxy-configmap.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/15-clusteringress-proxy-configmap.yaml similarity index 100% rename from vnfs/DAaaS/00-init/gloo/templates/15-clusteringress-proxy-configmap.yaml rename to vnfs/DAaaS/deploy/00-init/gloo/templates/15-clusteringress-proxy-configmap.yaml diff --git a/vnfs/DAaaS/00-init/gloo/templates/16-clusteringress-proxy-service.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/16-clusteringress-proxy-service.yaml similarity index 100% rename from vnfs/DAaaS/00-init/gloo/templates/16-clusteringress-proxy-service.yaml rename to vnfs/DAaaS/deploy/00-init/gloo/templates/16-clusteringress-proxy-service.yaml diff --git a/vnfs/DAaaS/00-init/gloo/templates/17-knative-no-istio-0.5.1.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/17-knative-no-istio-0.5.1.yaml similarity index 100% rename from vnfs/DAaaS/00-init/gloo/templates/17-knative-no-istio-0.5.1.yaml rename to vnfs/DAaaS/deploy/00-init/gloo/templates/17-knative-no-istio-0.5.1.yaml diff --git a/vnfs/DAaaS/00-init/gloo/templates/18-settings.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/18-settings.yaml similarity index 100% rename from vnfs/DAaaS/00-init/gloo/templates/18-settings.yaml rename to vnfs/DAaaS/deploy/00-init/gloo/templates/18-settings.yaml diff --git a/vnfs/DAaaS/00-init/gloo/templates/20-namespace-clusterrole-gateway.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/20-namespace-clusterrole-gateway.yaml similarity index 100% rename from vnfs/DAaaS/00-init/gloo/templates/20-namespace-clusterrole-gateway.yaml rename to vnfs/DAaaS/deploy/00-init/gloo/templates/20-namespace-clusterrole-gateway.yaml diff --git a/vnfs/DAaaS/00-init/gloo/templates/21-namespace-clusterrole-ingress.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/21-namespace-clusterrole-ingress.yaml similarity index 100% rename from vnfs/DAaaS/00-init/gloo/templates/21-namespace-clusterrole-ingress.yaml rename to vnfs/DAaaS/deploy/00-init/gloo/templates/21-namespace-clusterrole-ingress.yaml diff --git a/vnfs/DAaaS/00-init/gloo/templates/22-namespace-clusterrole-knative.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/22-namespace-clusterrole-knative.yaml similarity index 100% rename from vnfs/DAaaS/00-init/gloo/templates/22-namespace-clusterrole-knative.yaml rename to vnfs/DAaaS/deploy/00-init/gloo/templates/22-namespace-clusterrole-knative.yaml diff --git a/vnfs/DAaaS/00-init/gloo/templates/23-namespace-clusterrolebinding-gateway.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/23-namespace-clusterrolebinding-gateway.yaml similarity index 100% rename from vnfs/DAaaS/00-init/gloo/templates/23-namespace-clusterrolebinding-gateway.yaml rename to vnfs/DAaaS/deploy/00-init/gloo/templates/23-namespace-clusterrolebinding-gateway.yaml diff --git a/vnfs/DAaaS/00-init/gloo/templates/24-namespace-clusterrolebinding-ingress.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/24-namespace-clusterrolebinding-ingress.yaml similarity index 100% rename from vnfs/DAaaS/00-init/gloo/templates/24-namespace-clusterrolebinding-ingress.yaml rename to vnfs/DAaaS/deploy/00-init/gloo/templates/24-namespace-clusterrolebinding-ingress.yaml diff --git a/vnfs/DAaaS/00-init/gloo/templates/25-namespace-clusterrolebinding-knative.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/25-namespace-clusterrolebinding-knative.yaml similarity index 100% rename from vnfs/DAaaS/00-init/gloo/templates/25-namespace-clusterrolebinding-knative.yaml rename to vnfs/DAaaS/deploy/00-init/gloo/templates/25-namespace-clusterrolebinding-knative.yaml diff --git a/vnfs/DAaaS/00-init/gloo/templates/3-gloo-deployment.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/3-gloo-deployment.yaml similarity index 100% rename from vnfs/DAaaS/00-init/gloo/templates/3-gloo-deployment.yaml rename to vnfs/DAaaS/deploy/00-init/gloo/templates/3-gloo-deployment.yaml diff --git a/vnfs/DAaaS/00-init/gloo/templates/4-gloo-service.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/4-gloo-service.yaml similarity index 100% rename from vnfs/DAaaS/00-init/gloo/templates/4-gloo-service.yaml rename to vnfs/DAaaS/deploy/00-init/gloo/templates/4-gloo-service.yaml diff --git a/vnfs/DAaaS/00-init/gloo/templates/5-discovery-deployment.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/5-discovery-deployment.yaml similarity index 100% rename from vnfs/DAaaS/00-init/gloo/templates/5-discovery-deployment.yaml rename to vnfs/DAaaS/deploy/00-init/gloo/templates/5-discovery-deployment.yaml diff --git a/vnfs/DAaaS/00-init/gloo/templates/6-gateway-deployment.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/6-gateway-deployment.yaml similarity index 100% rename from vnfs/DAaaS/00-init/gloo/templates/6-gateway-deployment.yaml rename to vnfs/DAaaS/deploy/00-init/gloo/templates/6-gateway-deployment.yaml diff --git a/vnfs/DAaaS/00-init/gloo/templates/7-gateway-proxy-deployment.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/7-gateway-proxy-deployment.yaml similarity index 100% rename from vnfs/DAaaS/00-init/gloo/templates/7-gateway-proxy-deployment.yaml rename to vnfs/DAaaS/deploy/00-init/gloo/templates/7-gateway-proxy-deployment.yaml diff --git a/vnfs/DAaaS/00-init/gloo/templates/8-gateway-proxy-service.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/8-gateway-proxy-service.yaml similarity index 100% rename from vnfs/DAaaS/00-init/gloo/templates/8-gateway-proxy-service.yaml rename to vnfs/DAaaS/deploy/00-init/gloo/templates/8-gateway-proxy-service.yaml diff --git a/vnfs/DAaaS/00-init/gloo/templates/9-gateway-proxy-configmap.yaml b/vnfs/DAaaS/deploy/00-init/gloo/templates/9-gateway-proxy-configmap.yaml similarity index 100% rename from vnfs/DAaaS/00-init/gloo/templates/9-gateway-proxy-configmap.yaml rename to vnfs/DAaaS/deploy/00-init/gloo/templates/9-gateway-proxy-configmap.yaml diff --git a/vnfs/DAaaS/00-init/gloo/values-ingress.yaml b/vnfs/DAaaS/deploy/00-init/gloo/values-ingress.yaml similarity index 100% rename from vnfs/DAaaS/00-init/gloo/values-ingress.yaml rename to vnfs/DAaaS/deploy/00-init/gloo/values-ingress.yaml diff --git a/vnfs/DAaaS/00-init/gloo/values-knative.yaml b/vnfs/DAaaS/deploy/00-init/gloo/values-knative.yaml similarity index 100% rename from vnfs/DAaaS/00-init/gloo/values-knative.yaml rename to vnfs/DAaaS/deploy/00-init/gloo/values-knative.yaml diff --git a/vnfs/DAaaS/00-init/gloo/values.yaml b/vnfs/DAaaS/deploy/00-init/gloo/values.yaml similarity index 100% rename from vnfs/DAaaS/00-init/gloo/values.yaml rename to vnfs/DAaaS/deploy/00-init/gloo/values.yaml diff --git a/vnfs/DAaaS/00-init/istio/README.md b/vnfs/DAaaS/deploy/00-init/istio/README.md similarity index 100% rename from vnfs/DAaaS/00-init/istio/README.md rename to vnfs/DAaaS/deploy/00-init/istio/README.md diff --git a/vnfs/DAaaS/00-init/rook-ceph/Chart.yaml b/vnfs/DAaaS/deploy/00-init/rook-ceph/Chart.yaml similarity index 100% rename from vnfs/DAaaS/00-init/rook-ceph/Chart.yaml rename to vnfs/DAaaS/deploy/00-init/rook-ceph/Chart.yaml diff --git a/vnfs/DAaaS/00-init/rook-ceph/templates/NOTES.txt b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/NOTES.txt similarity index 100% rename from vnfs/DAaaS/00-init/rook-ceph/templates/NOTES.txt rename to vnfs/DAaaS/deploy/00-init/rook-ceph/templates/NOTES.txt diff --git a/vnfs/DAaaS/00-init/rook-ceph/templates/_helpers.tpl b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/_helpers.tpl similarity index 100% rename from vnfs/DAaaS/00-init/rook-ceph/templates/_helpers.tpl rename to vnfs/DAaaS/deploy/00-init/rook-ceph/templates/_helpers.tpl diff --git a/vnfs/DAaaS/00-init/rook-ceph/templates/cluster.yml b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/cluster.yml similarity index 100% rename from vnfs/DAaaS/00-init/rook-ceph/templates/cluster.yml rename to vnfs/DAaaS/deploy/00-init/rook-ceph/templates/cluster.yml diff --git a/vnfs/DAaaS/00-init/rook-ceph/templates/clusterrole.yaml b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/clusterrole.yaml similarity index 100% rename from vnfs/DAaaS/00-init/rook-ceph/templates/clusterrole.yaml rename to vnfs/DAaaS/deploy/00-init/rook-ceph/templates/clusterrole.yaml diff --git a/vnfs/DAaaS/00-init/rook-ceph/templates/clusterrolebinding.yaml b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/clusterrolebinding.yaml similarity index 100% rename from vnfs/DAaaS/00-init/rook-ceph/templates/clusterrolebinding.yaml rename to vnfs/DAaaS/deploy/00-init/rook-ceph/templates/clusterrolebinding.yaml diff --git a/vnfs/DAaaS/00-init/rook-ceph/templates/dashboard-external-http.yaml b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/dashboard-external-http.yaml similarity index 100% rename from vnfs/DAaaS/00-init/rook-ceph/templates/dashboard-external-http.yaml rename to vnfs/DAaaS/deploy/00-init/rook-ceph/templates/dashboard-external-http.yaml diff --git a/vnfs/DAaaS/00-init/rook-ceph/templates/deployment.yaml b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/deployment.yaml similarity index 100% rename from vnfs/DAaaS/00-init/rook-ceph/templates/deployment.yaml rename to vnfs/DAaaS/deploy/00-init/rook-ceph/templates/deployment.yaml diff --git a/vnfs/DAaaS/00-init/rook-ceph/templates/psp.yaml b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/psp.yaml similarity index 100% rename from vnfs/DAaaS/00-init/rook-ceph/templates/psp.yaml rename to vnfs/DAaaS/deploy/00-init/rook-ceph/templates/psp.yaml diff --git a/vnfs/DAaaS/00-init/rook-ceph/templates/resources.yaml b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/resources.yaml similarity index 100% rename from vnfs/DAaaS/00-init/rook-ceph/templates/resources.yaml rename to vnfs/DAaaS/deploy/00-init/rook-ceph/templates/resources.yaml diff --git a/vnfs/DAaaS/00-init/rook-ceph/templates/role.yaml b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/role.yaml similarity index 100% rename from vnfs/DAaaS/00-init/rook-ceph/templates/role.yaml rename to vnfs/DAaaS/deploy/00-init/rook-ceph/templates/role.yaml diff --git a/vnfs/DAaaS/00-init/rook-ceph/templates/rolebinding.yaml b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/rolebinding.yaml similarity index 100% rename from vnfs/DAaaS/00-init/rook-ceph/templates/rolebinding.yaml rename to vnfs/DAaaS/deploy/00-init/rook-ceph/templates/rolebinding.yaml diff --git a/vnfs/DAaaS/00-init/rook-ceph/templates/serviceaccount.yaml b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/serviceaccount.yaml similarity index 100% rename from vnfs/DAaaS/00-init/rook-ceph/templates/serviceaccount.yaml rename to vnfs/DAaaS/deploy/00-init/rook-ceph/templates/serviceaccount.yaml diff --git a/vnfs/DAaaS/00-init/rook-ceph/templates/storageclass.yml b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/storageclass.yml similarity index 100% rename from vnfs/DAaaS/00-init/rook-ceph/templates/storageclass.yml rename to vnfs/DAaaS/deploy/00-init/rook-ceph/templates/storageclass.yml diff --git a/vnfs/DAaaS/00-init/rook-ceph/templates/tool-box.yml b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/tool-box.yml similarity index 100% rename from vnfs/DAaaS/00-init/rook-ceph/templates/tool-box.yml rename to vnfs/DAaaS/deploy/00-init/rook-ceph/templates/tool-box.yml diff --git a/vnfs/DAaaS/00-init/rook-ceph/values.yaml b/vnfs/DAaaS/deploy/00-init/rook-ceph/values.yaml similarity index 100% rename from vnfs/DAaaS/00-init/rook-ceph/values.yaml rename to vnfs/DAaaS/deploy/00-init/rook-ceph/values.yaml diff --git a/vnfs/DAaaS/applications/sample-spark-app/.helmignore b/vnfs/DAaaS/deploy/collection/.helmignore similarity index 100% rename from vnfs/DAaaS/applications/sample-spark-app/.helmignore rename to vnfs/DAaaS/deploy/collection/.helmignore diff --git a/vnfs/DAaaS/collection/Chart.yaml b/vnfs/DAaaS/deploy/collection/Chart.yaml similarity index 100% rename from vnfs/DAaaS/collection/Chart.yaml rename to vnfs/DAaaS/deploy/collection/Chart.yaml diff --git a/vnfs/DAaaS/collection/.helmignore b/vnfs/DAaaS/deploy/collection/charts/cadvisor/.helmignore similarity index 100% rename from vnfs/DAaaS/collection/.helmignore rename to vnfs/DAaaS/deploy/collection/charts/cadvisor/.helmignore diff --git a/vnfs/DAaaS/collection/charts/cadvisor/Chart.yaml b/vnfs/DAaaS/deploy/collection/charts/cadvisor/Chart.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/cadvisor/Chart.yaml rename to vnfs/DAaaS/deploy/collection/charts/cadvisor/Chart.yaml diff --git a/vnfs/DAaaS/collection/charts/cadvisor/templates/NOTES.txt b/vnfs/DAaaS/deploy/collection/charts/cadvisor/templates/NOTES.txt similarity index 100% rename from vnfs/DAaaS/collection/charts/cadvisor/templates/NOTES.txt rename to vnfs/DAaaS/deploy/collection/charts/cadvisor/templates/NOTES.txt diff --git a/vnfs/DAaaS/collection/charts/cadvisor/templates/_helpers.tpl b/vnfs/DAaaS/deploy/collection/charts/cadvisor/templates/_helpers.tpl similarity index 100% rename from vnfs/DAaaS/collection/charts/cadvisor/templates/_helpers.tpl rename to vnfs/DAaaS/deploy/collection/charts/cadvisor/templates/_helpers.tpl diff --git a/vnfs/DAaaS/collection/charts/cadvisor/templates/daemonset.yaml b/vnfs/DAaaS/deploy/collection/charts/cadvisor/templates/daemonset.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/cadvisor/templates/daemonset.yaml rename to vnfs/DAaaS/deploy/collection/charts/cadvisor/templates/daemonset.yaml diff --git a/vnfs/DAaaS/collection/charts/cadvisor/templates/service.yaml b/vnfs/DAaaS/deploy/collection/charts/cadvisor/templates/service.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/cadvisor/templates/service.yaml rename to vnfs/DAaaS/deploy/collection/charts/cadvisor/templates/service.yaml diff --git a/vnfs/DAaaS/collection/charts/cadvisor/values.yaml b/vnfs/DAaaS/deploy/collection/charts/cadvisor/values.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/cadvisor/values.yaml rename to vnfs/DAaaS/deploy/collection/charts/cadvisor/values.yaml diff --git a/vnfs/DAaaS/collection/charts/collectd/.helmignore b/vnfs/DAaaS/deploy/collection/charts/collectd/.helmignore similarity index 100% rename from vnfs/DAaaS/collection/charts/collectd/.helmignore rename to vnfs/DAaaS/deploy/collection/charts/collectd/.helmignore diff --git a/vnfs/DAaaS/collection/charts/collectd/Chart.yaml b/vnfs/DAaaS/deploy/collection/charts/collectd/Chart.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/collectd/Chart.yaml rename to vnfs/DAaaS/deploy/collection/charts/collectd/Chart.yaml diff --git a/vnfs/DAaaS/collection/charts/collectd/resources/config/collectd.conf b/vnfs/DAaaS/deploy/collection/charts/collectd/resources/config/collectd.conf similarity index 100% rename from vnfs/DAaaS/collection/charts/collectd/resources/config/collectd.conf rename to vnfs/DAaaS/deploy/collection/charts/collectd/resources/config/collectd.conf diff --git a/vnfs/DAaaS/collection/charts/collectd/templates/NOTES.txt b/vnfs/DAaaS/deploy/collection/charts/collectd/templates/NOTES.txt similarity index 100% rename from vnfs/DAaaS/collection/charts/collectd/templates/NOTES.txt rename to vnfs/DAaaS/deploy/collection/charts/collectd/templates/NOTES.txt diff --git a/vnfs/DAaaS/collection/charts/collectd/templates/_helpers.tpl b/vnfs/DAaaS/deploy/collection/charts/collectd/templates/_helpers.tpl similarity index 100% rename from vnfs/DAaaS/collection/charts/collectd/templates/_helpers.tpl rename to vnfs/DAaaS/deploy/collection/charts/collectd/templates/_helpers.tpl diff --git a/vnfs/DAaaS/collection/charts/collectd/templates/configmap.yaml b/vnfs/DAaaS/deploy/collection/charts/collectd/templates/configmap.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/collectd/templates/configmap.yaml rename to vnfs/DAaaS/deploy/collection/charts/collectd/templates/configmap.yaml diff --git a/vnfs/DAaaS/collection/charts/collectd/templates/daemonset.yaml b/vnfs/DAaaS/deploy/collection/charts/collectd/templates/daemonset.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/collectd/templates/daemonset.yaml rename to vnfs/DAaaS/deploy/collection/charts/collectd/templates/daemonset.yaml diff --git a/vnfs/DAaaS/collection/charts/collectd/templates/service.yaml b/vnfs/DAaaS/deploy/collection/charts/collectd/templates/service.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/collectd/templates/service.yaml rename to vnfs/DAaaS/deploy/collection/charts/collectd/templates/service.yaml diff --git a/vnfs/DAaaS/collection/charts/collectd/values.yaml b/vnfs/DAaaS/deploy/collection/charts/collectd/values.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/collectd/values.yaml rename to vnfs/DAaaS/deploy/collection/charts/collectd/values.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/.helmignore b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/.helmignore similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-node-exporter/.helmignore rename to vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/.helmignore diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/Chart.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/Chart.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-node-exporter/Chart.yaml rename to vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/Chart.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/OWNERS b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/OWNERS similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-node-exporter/OWNERS rename to vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/OWNERS diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/README.md b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/README.md similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-node-exporter/README.md rename to vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/README.md diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/NOTES.txt b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/NOTES.txt similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/NOTES.txt rename to vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/NOTES.txt diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/_helpers.tpl b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/_helpers.tpl similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/_helpers.tpl rename to vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/_helpers.tpl diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/daemonset.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/daemonset.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/daemonset.yaml rename to vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/daemonset.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/endpoints.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/endpoints.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/endpoints.yaml rename to vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/endpoints.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/monitor.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/monitor.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/monitor.yaml rename to vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/monitor.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/psp-clusterrole.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/psp-clusterrole.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/psp-clusterrole.yaml rename to vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/psp-clusterrole.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/psp-clusterrolebinding.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/psp-clusterrolebinding.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/psp-clusterrolebinding.yaml rename to vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/psp-clusterrolebinding.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/psp.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/psp.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/psp.yaml rename to vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/psp.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/service.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/service.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/service.yaml rename to vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/service.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/serviceaccount.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/serviceaccount.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-node-exporter/templates/serviceaccount.yaml rename to vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/serviceaccount.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus-node-exporter/values.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/values.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus-node-exporter/values.yaml rename to vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/values.yaml diff --git a/vnfs/DAaaS/collection/charts/cadvisor/.helmignore b/vnfs/DAaaS/deploy/collection/charts/prometheus/.helmignore similarity index 100% rename from vnfs/DAaaS/collection/charts/cadvisor/.helmignore rename to vnfs/DAaaS/deploy/collection/charts/prometheus/.helmignore diff --git a/vnfs/DAaaS/collection/charts/prometheus/Chart.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus/Chart.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus/Chart.yaml rename to vnfs/DAaaS/deploy/collection/charts/prometheus/Chart.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus/templates/NOTES.txt b/vnfs/DAaaS/deploy/collection/charts/prometheus/templates/NOTES.txt similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus/templates/NOTES.txt rename to vnfs/DAaaS/deploy/collection/charts/prometheus/templates/NOTES.txt diff --git a/vnfs/DAaaS/collection/charts/prometheus/templates/_helpers.tpl b/vnfs/DAaaS/deploy/collection/charts/prometheus/templates/_helpers.tpl similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus/templates/_helpers.tpl rename to vnfs/DAaaS/deploy/collection/charts/prometheus/templates/_helpers.tpl diff --git a/vnfs/DAaaS/collection/charts/prometheus/templates/prometheus.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus/templates/prometheus.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus/templates/prometheus.yaml rename to vnfs/DAaaS/deploy/collection/charts/prometheus/templates/prometheus.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus/templates/service.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus/templates/service.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus/templates/service.yaml rename to vnfs/DAaaS/deploy/collection/charts/prometheus/templates/service.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus/templates/servicemonitor.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus/templates/servicemonitor.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus/templates/servicemonitor.yaml rename to vnfs/DAaaS/deploy/collection/charts/prometheus/templates/servicemonitor.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus/values.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus/values.yaml similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus/values.yaml rename to vnfs/DAaaS/deploy/collection/charts/prometheus/values.yaml diff --git a/vnfs/DAaaS/collection/values.yaml b/vnfs/DAaaS/deploy/collection/values.yaml similarity index 100% rename from vnfs/DAaaS/collection/values.yaml rename to vnfs/DAaaS/deploy/collection/values.yaml diff --git a/vnfs/DAaaS/day2_configs/collectd/README.txt b/vnfs/DAaaS/deploy/day2_configs/collectd/README.txt similarity index 100% rename from vnfs/DAaaS/day2_configs/collectd/README.txt rename to vnfs/DAaaS/deploy/day2_configs/collectd/README.txt diff --git a/vnfs/DAaaS/day2_configs/collectd/add_plugins.yaml b/vnfs/DAaaS/deploy/day2_configs/collectd/add_plugins.yaml similarity index 100% rename from vnfs/DAaaS/day2_configs/collectd/add_plugins.yaml rename to vnfs/DAaaS/deploy/day2_configs/collectd/add_plugins.yaml diff --git a/vnfs/DAaaS/day2_configs/collectd/replace_image.yaml b/vnfs/DAaaS/deploy/day2_configs/collectd/replace_image.yaml similarity index 100% rename from vnfs/DAaaS/day2_configs/collectd/replace_image.yaml rename to vnfs/DAaaS/deploy/day2_configs/collectd/replace_image.yaml diff --git a/vnfs/DAaaS/day2_configs/prometheus/README.txt b/vnfs/DAaaS/deploy/day2_configs/prometheus/README.txt similarity index 100% rename from vnfs/DAaaS/day2_configs/prometheus/README.txt rename to vnfs/DAaaS/deploy/day2_configs/prometheus/README.txt diff --git a/vnfs/DAaaS/day2_configs/prometheus/add_remote_write.yaml b/vnfs/DAaaS/deploy/day2_configs/prometheus/add_remote_write.yaml similarity index 100% rename from vnfs/DAaaS/day2_configs/prometheus/add_remote_write.yaml rename to vnfs/DAaaS/deploy/day2_configs/prometheus/add_remote_write.yaml diff --git a/vnfs/DAaaS/collection/charts/prometheus/.helmignore b/vnfs/DAaaS/deploy/inference-core/.helmignore similarity index 100% rename from vnfs/DAaaS/collection/charts/prometheus/.helmignore rename to vnfs/DAaaS/deploy/inference-core/.helmignore diff --git a/vnfs/DAaaS/inference-core/Chart.yaml b/vnfs/DAaaS/deploy/inference-core/Chart.yaml similarity index 100% rename from vnfs/DAaaS/inference-core/Chart.yaml rename to vnfs/DAaaS/deploy/inference-core/Chart.yaml diff --git a/vnfs/DAaaS/inference-core/.helmignore b/vnfs/DAaaS/deploy/inference-core/charts/tf-serving/.helmignore similarity index 100% rename from vnfs/DAaaS/inference-core/.helmignore rename to vnfs/DAaaS/deploy/inference-core/charts/tf-serving/.helmignore diff --git a/vnfs/DAaaS/inference-core/charts/tf-serving/Chart.yaml b/vnfs/DAaaS/deploy/inference-core/charts/tf-serving/Chart.yaml similarity index 100% rename from vnfs/DAaaS/inference-core/charts/tf-serving/Chart.yaml rename to vnfs/DAaaS/deploy/inference-core/charts/tf-serving/Chart.yaml diff --git a/vnfs/DAaaS/inference-core/charts/tf-serving/templates/NOTES.txt b/vnfs/DAaaS/deploy/inference-core/charts/tf-serving/templates/NOTES.txt similarity index 100% rename from vnfs/DAaaS/inference-core/charts/tf-serving/templates/NOTES.txt rename to vnfs/DAaaS/deploy/inference-core/charts/tf-serving/templates/NOTES.txt diff --git a/vnfs/DAaaS/inference-core/charts/tf-serving/templates/_helpers.tpl b/vnfs/DAaaS/deploy/inference-core/charts/tf-serving/templates/_helpers.tpl similarity index 100% rename from vnfs/DAaaS/inference-core/charts/tf-serving/templates/_helpers.tpl rename to vnfs/DAaaS/deploy/inference-core/charts/tf-serving/templates/_helpers.tpl diff --git a/vnfs/DAaaS/inference-core/charts/tf-serving/templates/deployment.yaml b/vnfs/DAaaS/deploy/inference-core/charts/tf-serving/templates/deployment.yaml similarity index 100% rename from vnfs/DAaaS/inference-core/charts/tf-serving/templates/deployment.yaml rename to vnfs/DAaaS/deploy/inference-core/charts/tf-serving/templates/deployment.yaml diff --git a/vnfs/DAaaS/inference-core/charts/tf-serving/templates/ingress.yaml b/vnfs/DAaaS/deploy/inference-core/charts/tf-serving/templates/ingress.yaml similarity index 100% rename from vnfs/DAaaS/inference-core/charts/tf-serving/templates/ingress.yaml rename to vnfs/DAaaS/deploy/inference-core/charts/tf-serving/templates/ingress.yaml diff --git a/vnfs/DAaaS/inference-core/charts/tf-serving/templates/secrets.yaml b/vnfs/DAaaS/deploy/inference-core/charts/tf-serving/templates/secrets.yaml similarity index 100% rename from vnfs/DAaaS/inference-core/charts/tf-serving/templates/secrets.yaml rename to vnfs/DAaaS/deploy/inference-core/charts/tf-serving/templates/secrets.yaml diff --git a/vnfs/DAaaS/inference-core/charts/tf-serving/templates/service.yaml b/vnfs/DAaaS/deploy/inference-core/charts/tf-serving/templates/service.yaml similarity index 100% rename from vnfs/DAaaS/inference-core/charts/tf-serving/templates/service.yaml rename to vnfs/DAaaS/deploy/inference-core/charts/tf-serving/templates/service.yaml diff --git a/vnfs/DAaaS/inference-core/charts/tf-serving/templates/serviceaccount.yaml b/vnfs/DAaaS/deploy/inference-core/charts/tf-serving/templates/serviceaccount.yaml similarity index 100% rename from vnfs/DAaaS/inference-core/charts/tf-serving/templates/serviceaccount.yaml rename to vnfs/DAaaS/deploy/inference-core/charts/tf-serving/templates/serviceaccount.yaml diff --git a/vnfs/DAaaS/inference-core/charts/tf-serving/values.yaml b/vnfs/DAaaS/deploy/inference-core/charts/tf-serving/values.yaml similarity index 100% rename from vnfs/DAaaS/inference-core/charts/tf-serving/values.yaml rename to vnfs/DAaaS/deploy/inference-core/charts/tf-serving/values.yaml diff --git a/vnfs/DAaaS/inference-core/values.yaml b/vnfs/DAaaS/deploy/inference-core/values.yaml similarity index 100% rename from vnfs/DAaaS/inference-core/values.yaml rename to vnfs/DAaaS/deploy/inference-core/values.yaml diff --git a/vnfs/DAaaS/inference-core/charts/tf-serving/.helmignore b/vnfs/DAaaS/deploy/messaging/.helmignore similarity index 100% rename from vnfs/DAaaS/inference-core/charts/tf-serving/.helmignore rename to vnfs/DAaaS/deploy/messaging/.helmignore diff --git a/vnfs/DAaaS/messaging/Chart.yaml b/vnfs/DAaaS/deploy/messaging/Chart.yaml similarity index 100% rename from vnfs/DAaaS/messaging/Chart.yaml rename to vnfs/DAaaS/deploy/messaging/Chart.yaml diff --git a/vnfs/DAaaS/messaging/.helmignore b/vnfs/DAaaS/deploy/messaging/charts/kafka/.helmignore similarity index 100% rename from vnfs/DAaaS/messaging/.helmignore rename to vnfs/DAaaS/deploy/messaging/charts/kafka/.helmignore diff --git a/vnfs/DAaaS/messaging/charts/kafka/Chart.yaml b/vnfs/DAaaS/deploy/messaging/charts/kafka/Chart.yaml similarity index 100% rename from vnfs/DAaaS/messaging/charts/kafka/Chart.yaml rename to vnfs/DAaaS/deploy/messaging/charts/kafka/Chart.yaml diff --git a/vnfs/DAaaS/messaging/charts/kafka/templates/kafka-cluster.yaml b/vnfs/DAaaS/deploy/messaging/charts/kafka/templates/kafka-cluster.yaml similarity index 100% rename from vnfs/DAaaS/messaging/charts/kafka/templates/kafka-cluster.yaml rename to vnfs/DAaaS/deploy/messaging/charts/kafka/templates/kafka-cluster.yaml diff --git a/vnfs/DAaaS/messaging/charts/kafka/values.yaml b/vnfs/DAaaS/deploy/messaging/charts/kafka/values.yaml similarity index 100% rename from vnfs/DAaaS/messaging/charts/kafka/values.yaml rename to vnfs/DAaaS/deploy/messaging/charts/kafka/values.yaml diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/.helmignore b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/.helmignore similarity index 100% rename from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/.helmignore rename to vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/.helmignore diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/Chart.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/Chart.yaml similarity index 100% rename from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/Chart.yaml rename to vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/Chart.yaml diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/OWNERS b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/OWNERS similarity index 100% rename from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/OWNERS rename to vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/OWNERS diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/README.md b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/README.md similarity index 100% rename from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/README.md rename to vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/README.md diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/010-ServiceAccount-strimzi-cluster-operator.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/010-ServiceAccount-strimzi-cluster-operator.yaml similarity index 100% rename from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/010-ServiceAccount-strimzi-cluster-operator.yaml rename to vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/010-ServiceAccount-strimzi-cluster-operator.yaml diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/020-ClusterRole-strimzi-cluster-operator-role.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/020-ClusterRole-strimzi-cluster-operator-role.yaml similarity index 100% rename from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/020-ClusterRole-strimzi-cluster-operator-role.yaml rename to vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/020-ClusterRole-strimzi-cluster-operator-role.yaml diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/020-RoleBinding-strimzi-cluster-operator.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/020-RoleBinding-strimzi-cluster-operator.yaml similarity index 100% rename from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/020-RoleBinding-strimzi-cluster-operator.yaml rename to vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/020-RoleBinding-strimzi-cluster-operator.yaml diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/021-ClusterRole-strimzi-cluster-operator-role.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/021-ClusterRole-strimzi-cluster-operator-role.yaml similarity index 100% rename from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/021-ClusterRole-strimzi-cluster-operator-role.yaml rename to vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/021-ClusterRole-strimzi-cluster-operator-role.yaml diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/021-ClusterRoleBinding-strimzi-cluster-operator.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/021-ClusterRoleBinding-strimzi-cluster-operator.yaml similarity index 100% rename from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/021-ClusterRoleBinding-strimzi-cluster-operator.yaml rename to vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/021-ClusterRoleBinding-strimzi-cluster-operator.yaml diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/030-ClusterRole-strimzi-kafka-broker.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/030-ClusterRole-strimzi-kafka-broker.yaml similarity index 100% rename from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/030-ClusterRole-strimzi-kafka-broker.yaml rename to vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/030-ClusterRole-strimzi-kafka-broker.yaml diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/030-ClusterRoleBinding-strimzi-cluster-operator-kafka-broker-delegation.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/030-ClusterRoleBinding-strimzi-cluster-operator-kafka-broker-delegation.yaml similarity index 100% rename from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/030-ClusterRoleBinding-strimzi-cluster-operator-kafka-broker-delegation.yaml rename to vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/030-ClusterRoleBinding-strimzi-cluster-operator-kafka-broker-delegation.yaml diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/031-ClusterRole-strimzi-entity-operator.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/031-ClusterRole-strimzi-entity-operator.yaml similarity index 100% rename from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/031-ClusterRole-strimzi-entity-operator.yaml rename to vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/031-ClusterRole-strimzi-entity-operator.yaml diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/031-RoleBinding-strimzi-cluster-operator-entity-operator-delegation.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/031-RoleBinding-strimzi-cluster-operator-entity-operator-delegation.yaml similarity index 100% rename from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/031-RoleBinding-strimzi-cluster-operator-entity-operator-delegation.yaml rename to vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/031-RoleBinding-strimzi-cluster-operator-entity-operator-delegation.yaml diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/032-ClusterRole-strimzi-topic-operator.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/032-ClusterRole-strimzi-topic-operator.yaml similarity index 100% rename from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/032-ClusterRole-strimzi-topic-operator.yaml rename to vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/032-ClusterRole-strimzi-topic-operator.yaml diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/032-RoleBinding-strimzi-cluster-operator-topic-operator-delegation.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/032-RoleBinding-strimzi-cluster-operator-topic-operator-delegation.yaml similarity index 100% rename from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/032-RoleBinding-strimzi-cluster-operator-topic-operator-delegation.yaml rename to vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/032-RoleBinding-strimzi-cluster-operator-topic-operator-delegation.yaml diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/040-Crd-kafka.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/040-Crd-kafka.yaml similarity index 100% rename from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/040-Crd-kafka.yaml rename to vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/040-Crd-kafka.yaml diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/041-Crd-kafkaconnect.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/041-Crd-kafkaconnect.yaml similarity index 100% rename from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/041-Crd-kafkaconnect.yaml rename to vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/041-Crd-kafkaconnect.yaml diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/042-Crd-kafkaconnects2i.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/042-Crd-kafkaconnects2i.yaml similarity index 100% rename from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/042-Crd-kafkaconnects2i.yaml rename to vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/042-Crd-kafkaconnects2i.yaml diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/043-Crd-kafkatopic.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/043-Crd-kafkatopic.yaml similarity index 100% rename from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/043-Crd-kafkatopic.yaml rename to vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/043-Crd-kafkatopic.yaml diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/044-Crd-kafkauser.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/044-Crd-kafkauser.yaml similarity index 100% rename from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/044-Crd-kafkauser.yaml rename to vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/044-Crd-kafkauser.yaml diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/045-Crd-kafkamirrormaker.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/045-Crd-kafkamirrormaker.yaml similarity index 100% rename from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/045-Crd-kafkamirrormaker.yaml rename to vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/045-Crd-kafkamirrormaker.yaml diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/050-Deployment-strimzi-cluster-operator.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/050-Deployment-strimzi-cluster-operator.yaml similarity index 100% rename from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/050-Deployment-strimzi-cluster-operator.yaml rename to vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/050-Deployment-strimzi-cluster-operator.yaml diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/NOTES.txt b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/NOTES.txt similarity index 100% rename from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/NOTES.txt rename to vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/NOTES.txt diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/_helpers.tpl b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/_helpers.tpl similarity index 100% rename from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/_helpers.tpl rename to vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/_helpers.tpl diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/_kafka_image_map.tpl b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/_kafka_image_map.tpl similarity index 100% rename from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/_kafka_image_map.tpl rename to vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/_kafka_image_map.tpl diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/values.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/values.yaml similarity index 100% rename from vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/values.yaml rename to vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/values.yaml diff --git a/vnfs/DAaaS/messaging/values.yaml b/vnfs/DAaaS/deploy/messaging/values.yaml similarity index 100% rename from vnfs/DAaaS/messaging/values.yaml rename to vnfs/DAaaS/deploy/messaging/values.yaml diff --git a/vnfs/DAaaS/minio/.helmignore b/vnfs/DAaaS/deploy/minio/.helmignore similarity index 100% rename from vnfs/DAaaS/minio/.helmignore rename to vnfs/DAaaS/deploy/minio/.helmignore diff --git a/vnfs/DAaaS/minio/Chart.yaml b/vnfs/DAaaS/deploy/minio/Chart.yaml similarity index 100% rename from vnfs/DAaaS/minio/Chart.yaml rename to vnfs/DAaaS/deploy/minio/Chart.yaml diff --git a/vnfs/DAaaS/minio/README.md b/vnfs/DAaaS/deploy/minio/README.md similarity index 100% rename from vnfs/DAaaS/minio/README.md rename to vnfs/DAaaS/deploy/minio/README.md diff --git a/vnfs/DAaaS/minio/templates/NOTES.txt b/vnfs/DAaaS/deploy/minio/templates/NOTES.txt similarity index 100% rename from vnfs/DAaaS/minio/templates/NOTES.txt rename to vnfs/DAaaS/deploy/minio/templates/NOTES.txt diff --git a/vnfs/DAaaS/minio/templates/_helper_create_bucket.txt b/vnfs/DAaaS/deploy/minio/templates/_helper_create_bucket.txt similarity index 100% rename from vnfs/DAaaS/minio/templates/_helper_create_bucket.txt rename to vnfs/DAaaS/deploy/minio/templates/_helper_create_bucket.txt diff --git a/vnfs/DAaaS/minio/templates/_helpers.tpl b/vnfs/DAaaS/deploy/minio/templates/_helpers.tpl similarity index 100% rename from vnfs/DAaaS/minio/templates/_helpers.tpl rename to vnfs/DAaaS/deploy/minio/templates/_helpers.tpl diff --git a/vnfs/DAaaS/minio/templates/configmap.yaml b/vnfs/DAaaS/deploy/minio/templates/configmap.yaml similarity index 100% rename from vnfs/DAaaS/minio/templates/configmap.yaml rename to vnfs/DAaaS/deploy/minio/templates/configmap.yaml diff --git a/vnfs/DAaaS/minio/templates/deployment.yaml b/vnfs/DAaaS/deploy/minio/templates/deployment.yaml similarity index 100% rename from vnfs/DAaaS/minio/templates/deployment.yaml rename to vnfs/DAaaS/deploy/minio/templates/deployment.yaml diff --git a/vnfs/DAaaS/minio/templates/ingress.yaml b/vnfs/DAaaS/deploy/minio/templates/ingress.yaml similarity index 100% rename from vnfs/DAaaS/minio/templates/ingress.yaml rename to vnfs/DAaaS/deploy/minio/templates/ingress.yaml diff --git a/vnfs/DAaaS/minio/templates/networkpolicy.yaml b/vnfs/DAaaS/deploy/minio/templates/networkpolicy.yaml similarity index 100% rename from vnfs/DAaaS/minio/templates/networkpolicy.yaml rename to vnfs/DAaaS/deploy/minio/templates/networkpolicy.yaml diff --git a/vnfs/DAaaS/minio/templates/post-install-create-bucket-job.yaml b/vnfs/DAaaS/deploy/minio/templates/post-install-create-bucket-job.yaml similarity index 100% rename from vnfs/DAaaS/minio/templates/post-install-create-bucket-job.yaml rename to vnfs/DAaaS/deploy/minio/templates/post-install-create-bucket-job.yaml diff --git a/vnfs/DAaaS/minio/templates/pvc.yaml b/vnfs/DAaaS/deploy/minio/templates/pvc.yaml similarity index 100% rename from vnfs/DAaaS/minio/templates/pvc.yaml rename to vnfs/DAaaS/deploy/minio/templates/pvc.yaml diff --git a/vnfs/DAaaS/minio/templates/secrets.yaml b/vnfs/DAaaS/deploy/minio/templates/secrets.yaml similarity index 100% rename from vnfs/DAaaS/minio/templates/secrets.yaml rename to vnfs/DAaaS/deploy/minio/templates/secrets.yaml diff --git a/vnfs/DAaaS/minio/templates/service.yaml b/vnfs/DAaaS/deploy/minio/templates/service.yaml similarity index 100% rename from vnfs/DAaaS/minio/templates/service.yaml rename to vnfs/DAaaS/deploy/minio/templates/service.yaml diff --git a/vnfs/DAaaS/minio/templates/statefulset.yaml b/vnfs/DAaaS/deploy/minio/templates/statefulset.yaml similarity index 100% rename from vnfs/DAaaS/minio/templates/statefulset.yaml rename to vnfs/DAaaS/deploy/minio/templates/statefulset.yaml diff --git a/vnfs/DAaaS/minio/values.yaml b/vnfs/DAaaS/deploy/minio/values.yaml similarity index 100% rename from vnfs/DAaaS/minio/values.yaml rename to vnfs/DAaaS/deploy/minio/values.yaml diff --git a/vnfs/DAaaS/messaging/charts/kafka/.helmignore b/vnfs/DAaaS/deploy/operator/.helmignore similarity index 100% rename from vnfs/DAaaS/messaging/charts/kafka/.helmignore rename to vnfs/DAaaS/deploy/operator/.helmignore diff --git a/vnfs/DAaaS/operator/Chart.yaml b/vnfs/DAaaS/deploy/operator/Chart.yaml similarity index 100% rename from vnfs/DAaaS/operator/Chart.yaml rename to vnfs/DAaaS/deploy/operator/Chart.yaml diff --git a/vnfs/DAaaS/operator/charts/etcd-operator/.helmignore b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/.helmignore similarity index 100% rename from vnfs/DAaaS/operator/charts/etcd-operator/.helmignore rename to vnfs/DAaaS/deploy/operator/charts/etcd-operator/.helmignore diff --git a/vnfs/DAaaS/operator/charts/etcd-operator/Chart.yaml b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/Chart.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/etcd-operator/Chart.yaml rename to vnfs/DAaaS/deploy/operator/charts/etcd-operator/Chart.yaml diff --git a/vnfs/DAaaS/operator/charts/etcd-operator/OWNERS b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/OWNERS similarity index 100% rename from vnfs/DAaaS/operator/charts/etcd-operator/OWNERS rename to vnfs/DAaaS/deploy/operator/charts/etcd-operator/OWNERS diff --git a/vnfs/DAaaS/operator/charts/etcd-operator/README.md b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/README.md similarity index 100% rename from vnfs/DAaaS/operator/charts/etcd-operator/README.md rename to vnfs/DAaaS/deploy/operator/charts/etcd-operator/README.md diff --git a/vnfs/DAaaS/operator/charts/etcd-operator/templates/NOTES.txt b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/NOTES.txt similarity index 100% rename from vnfs/DAaaS/operator/charts/etcd-operator/templates/NOTES.txt rename to vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/NOTES.txt diff --git a/vnfs/DAaaS/operator/charts/etcd-operator/templates/_helpers.tpl b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/_helpers.tpl similarity index 100% rename from vnfs/DAaaS/operator/charts/etcd-operator/templates/_helpers.tpl rename to vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/_helpers.tpl diff --git a/vnfs/DAaaS/operator/charts/etcd-operator/templates/backup-etcd-crd.yaml b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/backup-etcd-crd.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/etcd-operator/templates/backup-etcd-crd.yaml rename to vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/backup-etcd-crd.yaml diff --git a/vnfs/DAaaS/operator/charts/etcd-operator/templates/backup-operator-clusterrole-binding.yaml b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/backup-operator-clusterrole-binding.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/etcd-operator/templates/backup-operator-clusterrole-binding.yaml rename to vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/backup-operator-clusterrole-binding.yaml diff --git a/vnfs/DAaaS/operator/charts/etcd-operator/templates/backup-operator-deployment.yaml b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/backup-operator-deployment.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/etcd-operator/templates/backup-operator-deployment.yaml rename to vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/backup-operator-deployment.yaml diff --git a/vnfs/DAaaS/operator/charts/etcd-operator/templates/backup-operator-service-account.yaml b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/backup-operator-service-account.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/etcd-operator/templates/backup-operator-service-account.yaml rename to vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/backup-operator-service-account.yaml diff --git a/vnfs/DAaaS/operator/charts/etcd-operator/templates/etcd-cluster-crd.yaml b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/etcd-cluster-crd.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/etcd-operator/templates/etcd-cluster-crd.yaml rename to vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/etcd-cluster-crd.yaml diff --git a/vnfs/DAaaS/operator/charts/etcd-operator/templates/operator-cluster-role.yaml b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/operator-cluster-role.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/etcd-operator/templates/operator-cluster-role.yaml rename to vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/operator-cluster-role.yaml diff --git a/vnfs/DAaaS/operator/charts/etcd-operator/templates/operator-clusterrole-binding.yaml b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/operator-clusterrole-binding.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/etcd-operator/templates/operator-clusterrole-binding.yaml rename to vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/operator-clusterrole-binding.yaml diff --git a/vnfs/DAaaS/operator/charts/etcd-operator/templates/operator-deployment.yaml b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/operator-deployment.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/etcd-operator/templates/operator-deployment.yaml rename to vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/operator-deployment.yaml diff --git a/vnfs/DAaaS/operator/charts/etcd-operator/templates/operator-service-account.yaml b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/operator-service-account.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/etcd-operator/templates/operator-service-account.yaml rename to vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/operator-service-account.yaml diff --git a/vnfs/DAaaS/operator/charts/etcd-operator/templates/restore-etcd-crd.yaml b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/restore-etcd-crd.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/etcd-operator/templates/restore-etcd-crd.yaml rename to vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/restore-etcd-crd.yaml diff --git a/vnfs/DAaaS/operator/charts/etcd-operator/templates/restore-operator-clusterrole-binding.yaml b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/restore-operator-clusterrole-binding.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/etcd-operator/templates/restore-operator-clusterrole-binding.yaml rename to vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/restore-operator-clusterrole-binding.yaml diff --git a/vnfs/DAaaS/operator/charts/etcd-operator/templates/restore-operator-deployment.yaml b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/restore-operator-deployment.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/etcd-operator/templates/restore-operator-deployment.yaml rename to vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/restore-operator-deployment.yaml diff --git a/vnfs/DAaaS/operator/charts/etcd-operator/templates/restore-operator-service-account.yaml b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/restore-operator-service-account.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/etcd-operator/templates/restore-operator-service-account.yaml rename to vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/restore-operator-service-account.yaml diff --git a/vnfs/DAaaS/operator/charts/etcd-operator/templates/restore-operator-service.yaml b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/restore-operator-service.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/etcd-operator/templates/restore-operator-service.yaml rename to vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/restore-operator-service.yaml diff --git a/vnfs/DAaaS/operator/charts/etcd-operator/values.yaml b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/values.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/etcd-operator/values.yaml rename to vnfs/DAaaS/deploy/operator/charts/etcd-operator/values.yaml diff --git a/vnfs/DAaaS/operator/charts/m3db-operator/Chart.yaml b/vnfs/DAaaS/deploy/operator/charts/m3db-operator/Chart.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/m3db-operator/Chart.yaml rename to vnfs/DAaaS/deploy/operator/charts/m3db-operator/Chart.yaml diff --git a/vnfs/DAaaS/operator/charts/m3db-operator/LICENSE b/vnfs/DAaaS/deploy/operator/charts/m3db-operator/LICENSE similarity index 100% rename from vnfs/DAaaS/operator/charts/m3db-operator/LICENSE rename to vnfs/DAaaS/deploy/operator/charts/m3db-operator/LICENSE diff --git a/vnfs/DAaaS/operator/charts/m3db-operator/NOTES.txt b/vnfs/DAaaS/deploy/operator/charts/m3db-operator/NOTES.txt similarity index 100% rename from vnfs/DAaaS/operator/charts/m3db-operator/NOTES.txt rename to vnfs/DAaaS/deploy/operator/charts/m3db-operator/NOTES.txt diff --git a/vnfs/DAaaS/operator/charts/m3db-operator/README.md b/vnfs/DAaaS/deploy/operator/charts/m3db-operator/README.md similarity index 100% rename from vnfs/DAaaS/operator/charts/m3db-operator/README.md rename to vnfs/DAaaS/deploy/operator/charts/m3db-operator/README.md diff --git a/vnfs/DAaaS/operator/charts/m3db-operator/templates/cluster_role.yaml b/vnfs/DAaaS/deploy/operator/charts/m3db-operator/templates/cluster_role.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/m3db-operator/templates/cluster_role.yaml rename to vnfs/DAaaS/deploy/operator/charts/m3db-operator/templates/cluster_role.yaml diff --git a/vnfs/DAaaS/operator/charts/m3db-operator/templates/cluster_role_binding.yaml b/vnfs/DAaaS/deploy/operator/charts/m3db-operator/templates/cluster_role_binding.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/m3db-operator/templates/cluster_role_binding.yaml rename to vnfs/DAaaS/deploy/operator/charts/m3db-operator/templates/cluster_role_binding.yaml diff --git a/vnfs/DAaaS/operator/charts/m3db-operator/templates/service_account.yaml b/vnfs/DAaaS/deploy/operator/charts/m3db-operator/templates/service_account.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/m3db-operator/templates/service_account.yaml rename to vnfs/DAaaS/deploy/operator/charts/m3db-operator/templates/service_account.yaml diff --git a/vnfs/DAaaS/operator/charts/m3db-operator/templates/stateful_set.yaml b/vnfs/DAaaS/deploy/operator/charts/m3db-operator/templates/stateful_set.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/m3db-operator/templates/stateful_set.yaml rename to vnfs/DAaaS/deploy/operator/charts/m3db-operator/templates/stateful_set.yaml diff --git a/vnfs/DAaaS/operator/charts/m3db-operator/values.yaml b/vnfs/DAaaS/deploy/operator/charts/m3db-operator/values.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/m3db-operator/values.yaml rename to vnfs/DAaaS/deploy/operator/charts/m3db-operator/values.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/.helmignore b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/.helmignore similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/.helmignore rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/.helmignore diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/Chart.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/Chart.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/Chart.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/Chart.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/README.md b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/README.md similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/README.md rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/README.md diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/NOTES.txt b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/NOTES.txt similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/NOTES.txt rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/NOTES.txt diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/_helpers.tpl b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/_helpers.tpl similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/_helpers.tpl rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/_helpers.tpl diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/alertmanager.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/alertmanager.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/alertmanager.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/alertmanager.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/ingress.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/ingress.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/ingress.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/ingress.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/podDisruptionBudget.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/podDisruptionBudget.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/podDisruptionBudget.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/podDisruptionBudget.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/psp-clusterrole.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/psp-clusterrole.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/psp-clusterrole.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/psp-clusterrole.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/psp-clusterrolebinding.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/psp-clusterrolebinding.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/psp-clusterrolebinding.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/psp-clusterrolebinding.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/psp.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/psp.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/psp.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/psp.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/secret.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/secret.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/secret.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/secret.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/service.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/service.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/service.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/service.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/serviceaccount.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/serviceaccount.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/serviceaccount.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/serviceaccount.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/servicemonitor.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/servicemonitor.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/alertmanager/servicemonitor.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/servicemonitor.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/exporters/node-exporter/servicemonitor.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/exporters/node-exporter/servicemonitor.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/exporters/node-exporter/servicemonitor.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/exporters/node-exporter/servicemonitor.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/configmap-dashboards.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/configmap-dashboards.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/configmap-dashboards.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/configmap-dashboards.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/configmaps-datasources.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/configmaps-datasources.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/configmaps-datasources.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/configmaps-datasources.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/etcd.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/etcd.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/etcd.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/etcd.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-coredns.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-coredns.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-coredns.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-coredns.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-node-rsrc-use.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-node-rsrc-use.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-node-rsrc-use.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-node-rsrc-use.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-cluster.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-cluster.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-cluster.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-cluster.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-namespace.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-namespace.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-namespace.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-namespace.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-pod.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-pod.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-pod.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-pod.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/nodes.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/nodes.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/nodes.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/nodes.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/persistentvolumesusage.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/persistentvolumesusage.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/persistentvolumesusage.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/persistentvolumesusage.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/pods.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/pods.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/pods.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/pods.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/statefulset.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/statefulset.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/dashboards/statefulset.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/statefulset.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/servicemonitor.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/servicemonitor.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/grafana/servicemonitor.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/servicemonitor.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/cleanup-crds.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/cleanup-crds.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/cleanup-crds.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/cleanup-crds.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/clusterrole.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/clusterrole.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/clusterrole.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/clusterrole.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/clusterrolebinding.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/clusterrolebinding.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/clusterrolebinding.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/clusterrolebinding.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/crd-alertmanager.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/crd-alertmanager.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/crd-alertmanager.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/crd-alertmanager.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/crd-prometheus.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/crd-prometheus.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/crd-prometheus.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/crd-prometheus.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/crd-prometheusrules.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/crd-prometheusrules.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/crd-prometheusrules.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/crd-prometheusrules.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/crd-servicemonitor.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/crd-servicemonitor.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/crd-servicemonitor.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/crd-servicemonitor.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/deployment.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/deployment.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/deployment.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/deployment.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/psp-clusterrole.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/psp-clusterrole.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/psp-clusterrole.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/psp-clusterrole.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/psp-clusterrolebinding.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/psp-clusterrolebinding.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/psp-clusterrolebinding.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/psp-clusterrolebinding.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/psp.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/psp.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/psp.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/psp.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/service.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/service.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/service.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/service.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/serviceaccount.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/serviceaccount.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/serviceaccount.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/serviceaccount.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/servicemonitor.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/servicemonitor.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus-operator/servicemonitor.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/servicemonitor.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/additionalAlertRelabelConfigs.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/additionalAlertRelabelConfigs.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/additionalAlertRelabelConfigs.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/additionalAlertRelabelConfigs.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/additionalAlertmanagerConfigs.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/additionalAlertmanagerConfigs.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/additionalAlertmanagerConfigs.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/additionalAlertmanagerConfigs.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/additionalPrometheusRules.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/additionalPrometheusRules.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/additionalPrometheusRules.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/additionalPrometheusRules.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/additionalScrapeConfigs.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/additionalScrapeConfigs.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/additionalScrapeConfigs.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/additionalScrapeConfigs.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/clusterrole.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/clusterrole.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/clusterrole.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/clusterrole.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/clusterrolebinding.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/clusterrolebinding.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/clusterrolebinding.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/clusterrolebinding.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/ingress.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/ingress.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/ingress.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/ingress.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/prometheus.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/prometheus.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/prometheus.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/prometheus.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/psp-clusterrole.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/psp-clusterrole.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/psp-clusterrole.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/psp-clusterrole.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/psp-clusterrolebinding.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/psp-clusterrolebinding.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/psp-clusterrolebinding.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/psp-clusterrolebinding.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/psp.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/psp.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/psp.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/psp.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/role-config.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/role-config.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/role-config.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/role-config.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/role-specificNamespace.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/role-specificNamespace.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/role-specificNamespace.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/role-specificNamespace.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rolebinding-config.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rolebinding-config.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rolebinding-config.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rolebinding-config.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rolebinding-specificNamespace.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rolebinding-specificNamespace.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rolebinding-specificNamespace.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rolebinding-specificNamespace.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/alertmanager.rules.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/alertmanager.rules.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/alertmanager.rules.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/alertmanager.rules.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/etcd.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/etcd.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/etcd.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/etcd.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/general.rules.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/general.rules.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/general.rules.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/general.rules.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/k8s.rules.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/k8s.rules.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/k8s.rules.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/k8s.rules.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kube-apiserver.rules.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-apiserver.rules.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kube-apiserver.rules.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-apiserver.rules.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kube-scheduler.rules.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-scheduler.rules.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kube-scheduler.rules.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-scheduler.rules.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-absent.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-absent.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-absent.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-absent.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-apps.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-apps.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-apps.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-apps.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-resources.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-resources.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-resources.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-resources.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-storage.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-storage.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-storage.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-storage.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-system.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-system.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-system.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-system.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/node.rules.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/node.rules.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/node.rules.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/node.rules.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/prometheus-operator.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/prometheus-operator.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/prometheus-operator.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/prometheus-operator.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/prometheus.rules.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/prometheus.rules.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/rules/prometheus.rules.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/prometheus.rules.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/service.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/service.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/service.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/service.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/serviceaccount.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/serviceaccount.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/serviceaccount.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/serviceaccount.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/servicemonitor.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/servicemonitor.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/servicemonitor.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/servicemonitor.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/servicemonitors.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/servicemonitors.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/templates/prometheus/servicemonitors.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/servicemonitors.yaml diff --git a/vnfs/DAaaS/operator/charts/prometheus-operator/values.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/values.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/prometheus-operator/values.yaml rename to vnfs/DAaaS/deploy/operator/charts/prometheus-operator/values.yaml diff --git a/vnfs/DAaaS/operator/charts/sparkoperator/.helmignore b/vnfs/DAaaS/deploy/operator/charts/sparkoperator/.helmignore similarity index 100% rename from vnfs/DAaaS/operator/charts/sparkoperator/.helmignore rename to vnfs/DAaaS/deploy/operator/charts/sparkoperator/.helmignore diff --git a/vnfs/DAaaS/operator/charts/sparkoperator/Chart.yaml b/vnfs/DAaaS/deploy/operator/charts/sparkoperator/Chart.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/sparkoperator/Chart.yaml rename to vnfs/DAaaS/deploy/operator/charts/sparkoperator/Chart.yaml diff --git a/vnfs/DAaaS/operator/charts/sparkoperator/README.md b/vnfs/DAaaS/deploy/operator/charts/sparkoperator/README.md similarity index 100% rename from vnfs/DAaaS/operator/charts/sparkoperator/README.md rename to vnfs/DAaaS/deploy/operator/charts/sparkoperator/README.md diff --git a/vnfs/DAaaS/operator/charts/sparkoperator/templates/_helpers.tpl b/vnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/_helpers.tpl similarity index 100% rename from vnfs/DAaaS/operator/charts/sparkoperator/templates/_helpers.tpl rename to vnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/_helpers.tpl diff --git a/vnfs/DAaaS/operator/charts/sparkoperator/templates/spark-operator-deployment.yaml b/vnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/spark-operator-deployment.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/sparkoperator/templates/spark-operator-deployment.yaml rename to vnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/spark-operator-deployment.yaml diff --git a/vnfs/DAaaS/operator/charts/sparkoperator/templates/spark-operator-rbac.yaml b/vnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/spark-operator-rbac.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/sparkoperator/templates/spark-operator-rbac.yaml rename to vnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/spark-operator-rbac.yaml diff --git a/vnfs/DAaaS/operator/charts/sparkoperator/templates/spark-operator-serviceaccount.yaml b/vnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/spark-operator-serviceaccount.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/sparkoperator/templates/spark-operator-serviceaccount.yaml rename to vnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/spark-operator-serviceaccount.yaml diff --git a/vnfs/DAaaS/operator/charts/sparkoperator/templates/spark-rbac.yaml b/vnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/spark-rbac.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/sparkoperator/templates/spark-rbac.yaml rename to vnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/spark-rbac.yaml diff --git a/vnfs/DAaaS/operator/charts/sparkoperator/templates/spark-serviceaccount.yaml b/vnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/spark-serviceaccount.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/sparkoperator/templates/spark-serviceaccount.yaml rename to vnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/spark-serviceaccount.yaml diff --git a/vnfs/DAaaS/operator/charts/sparkoperator/templates/webhook-cleanup-job.yaml b/vnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/webhook-cleanup-job.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/sparkoperator/templates/webhook-cleanup-job.yaml rename to vnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/webhook-cleanup-job.yaml diff --git a/vnfs/DAaaS/operator/charts/sparkoperator/templates/webhook-init-job.yaml b/vnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/webhook-init-job.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/sparkoperator/templates/webhook-init-job.yaml rename to vnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/webhook-init-job.yaml diff --git a/vnfs/DAaaS/operator/charts/sparkoperator/templates/webhook-service.yaml b/vnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/webhook-service.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/sparkoperator/templates/webhook-service.yaml rename to vnfs/DAaaS/deploy/operator/charts/sparkoperator/templates/webhook-service.yaml diff --git a/vnfs/DAaaS/operator/charts/sparkoperator/values.yaml b/vnfs/DAaaS/deploy/operator/charts/sparkoperator/values.yaml similarity index 100% rename from vnfs/DAaaS/operator/charts/sparkoperator/values.yaml rename to vnfs/DAaaS/deploy/operator/charts/sparkoperator/values.yaml diff --git a/vnfs/DAaaS/operator/resources/m3db.labels b/vnfs/DAaaS/deploy/operator/resources/m3db.labels similarity index 100% rename from vnfs/DAaaS/operator/resources/m3db.labels rename to vnfs/DAaaS/deploy/operator/resources/m3db.labels diff --git a/vnfs/DAaaS/applications/values.yaml b/vnfs/DAaaS/deploy/operator/values.yaml similarity index 100% rename from vnfs/DAaaS/applications/values.yaml rename to vnfs/DAaaS/deploy/operator/values.yaml diff --git a/vnfs/DAaaS/training-core/.helmignore b/vnfs/DAaaS/deploy/training-core/.helmignore similarity index 100% rename from vnfs/DAaaS/training-core/.helmignore rename to vnfs/DAaaS/deploy/training-core/.helmignore diff --git a/vnfs/DAaaS/training-core/Chart.yaml b/vnfs/DAaaS/deploy/training-core/Chart.yaml similarity index 100% rename from vnfs/DAaaS/training-core/Chart.yaml rename to vnfs/DAaaS/deploy/training-core/Chart.yaml diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/.gitignore b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/.gitignore similarity index 100% rename from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/.gitignore rename to vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/.gitignore diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/.travis.yml b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/.travis.yml similarity index 100% rename from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/.travis.yml rename to vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/.travis.yml diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/LICENSE b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/LICENSE similarity index 100% rename from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/LICENSE rename to vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/LICENSE diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/README.md b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/README.md similarity index 100% rename from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/README.md rename to vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/README.md diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/README.md b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/README.md similarity index 100% rename from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/README.md rename to vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/README.md diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-client-k8s/Chart.yaml b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-client-k8s/Chart.yaml similarity index 100% rename from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-client-k8s/Chart.yaml rename to vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-client-k8s/Chart.yaml diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-client-k8s/templates/client-deployment.yaml b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-client-k8s/templates/client-deployment.yaml similarity index 100% rename from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-client-k8s/templates/client-deployment.yaml rename to vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-client-k8s/templates/client-deployment.yaml diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-config-k8s/.helmignore b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-config-k8s/.helmignore similarity index 100% rename from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-config-k8s/.helmignore rename to vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-config-k8s/.helmignore diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-config-k8s/Chart.yaml b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-config-k8s/Chart.yaml similarity index 100% rename from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-config-k8s/Chart.yaml rename to vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-config-k8s/Chart.yaml diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-config-k8s/templates/_helpers.tpl b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-config-k8s/templates/_helpers.tpl similarity index 100% rename from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-config-k8s/templates/_helpers.tpl rename to vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-config-k8s/templates/_helpers.tpl diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-config-k8s/templates/configmap.yaml b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-config-k8s/templates/configmap.yaml similarity index 100% rename from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-config-k8s/templates/configmap.yaml rename to vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-config-k8s/templates/configmap.yaml diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-datanode-k8s/Chart.yaml b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-datanode-k8s/Chart.yaml similarity index 100% rename from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-datanode-k8s/Chart.yaml rename to vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-datanode-k8s/Chart.yaml diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-datanode-k8s/templates/datanode-daemonset.yaml b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-datanode-k8s/templates/datanode-daemonset.yaml similarity index 100% rename from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-datanode-k8s/templates/datanode-daemonset.yaml rename to vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-datanode-k8s/templates/datanode-daemonset.yaml diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-journalnode-k8s/Chart.yaml b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-journalnode-k8s/Chart.yaml similarity index 100% rename from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-journalnode-k8s/Chart.yaml rename to vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-journalnode-k8s/Chart.yaml diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-journalnode-k8s/templates/journalnode-statefulset.yaml b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-journalnode-k8s/templates/journalnode-statefulset.yaml similarity index 100% rename from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-journalnode-k8s/templates/journalnode-statefulset.yaml rename to vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-journalnode-k8s/templates/journalnode-statefulset.yaml diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/.gitignore b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/.gitignore similarity index 100% rename from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/.gitignore rename to vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/.gitignore diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/.helmignore b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/.helmignore similarity index 100% rename from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/.helmignore rename to vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/.helmignore diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/Chart.yaml b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/Chart.yaml similarity index 100% rename from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/Chart.yaml rename to vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/Chart.yaml diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/requirements.yaml b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/requirements.yaml similarity index 100% rename from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/requirements.yaml rename to vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/requirements.yaml diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/templates/_helpers.tpl b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/templates/_helpers.tpl similarity index 100% rename from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/templates/_helpers.tpl rename to vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/templates/_helpers.tpl diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/values.yaml b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/values.yaml similarity index 100% rename from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/values.yaml rename to vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-k8s/values.yaml diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-krb5-k8s/.helmignore b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-krb5-k8s/.helmignore similarity index 100% rename from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-krb5-k8s/.helmignore rename to vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-krb5-k8s/.helmignore diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-krb5-k8s/Chart.yaml b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-krb5-k8s/Chart.yaml similarity index 100% rename from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-krb5-k8s/Chart.yaml rename to vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-krb5-k8s/Chart.yaml diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-krb5-k8s/templates/statefulset.yaml b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-krb5-k8s/templates/statefulset.yaml similarity index 100% rename from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-krb5-k8s/templates/statefulset.yaml rename to vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-krb5-k8s/templates/statefulset.yaml diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-namenode-k8s/Chart.yaml b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-namenode-k8s/Chart.yaml similarity index 100% rename from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-namenode-k8s/Chart.yaml rename to vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-namenode-k8s/Chart.yaml diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-namenode-k8s/templates/namenode-statefulset.yaml b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-namenode-k8s/templates/namenode-statefulset.yaml similarity index 100% rename from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-namenode-k8s/templates/namenode-statefulset.yaml rename to vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-namenode-k8s/templates/namenode-statefulset.yaml diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-simple-namenode-k8s/Chart.yaml b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-simple-namenode-k8s/Chart.yaml similarity index 100% rename from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-simple-namenode-k8s/Chart.yaml rename to vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-simple-namenode-k8s/Chart.yaml diff --git a/vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-simple-namenode-k8s/templates/namenode-statefulset.yaml b/vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-simple-namenode-k8s/templates/namenode-statefulset.yaml similarity index 100% rename from vnfs/DAaaS/training-core/charts/kubernetes-HDFS/charts/hdfs-simple-namenode-k8s/templates/namenode-statefulset.yaml rename to vnfs/DAaaS/deploy/training-core/charts/kubernetes-HDFS/charts/hdfs-simple-namenode-k8s/templates/namenode-statefulset.yaml diff --git a/vnfs/DAaaS/operator/.helmignore b/vnfs/DAaaS/deploy/training-core/charts/m3db/.helmignore similarity index 100% rename from vnfs/DAaaS/operator/.helmignore rename to vnfs/DAaaS/deploy/training-core/charts/m3db/.helmignore diff --git a/vnfs/DAaaS/training-core/charts/m3db/Chart.yaml b/vnfs/DAaaS/deploy/training-core/charts/m3db/Chart.yaml similarity index 100% rename from vnfs/DAaaS/training-core/charts/m3db/Chart.yaml rename to vnfs/DAaaS/deploy/training-core/charts/m3db/Chart.yaml diff --git a/vnfs/DAaaS/training-core/charts/m3db/templates/NOTES.txt b/vnfs/DAaaS/deploy/training-core/charts/m3db/templates/NOTES.txt similarity index 100% rename from vnfs/DAaaS/training-core/charts/m3db/templates/NOTES.txt rename to vnfs/DAaaS/deploy/training-core/charts/m3db/templates/NOTES.txt diff --git a/vnfs/DAaaS/training-core/charts/m3db/templates/_helpers.tpl b/vnfs/DAaaS/deploy/training-core/charts/m3db/templates/_helpers.tpl similarity index 100% rename from vnfs/DAaaS/training-core/charts/m3db/templates/_helpers.tpl rename to vnfs/DAaaS/deploy/training-core/charts/m3db/templates/_helpers.tpl diff --git a/vnfs/DAaaS/training-core/charts/m3db/templates/configmap.yaml b/vnfs/DAaaS/deploy/training-core/charts/m3db/templates/configmap.yaml similarity index 100% rename from vnfs/DAaaS/training-core/charts/m3db/templates/configmap.yaml rename to vnfs/DAaaS/deploy/training-core/charts/m3db/templates/configmap.yaml diff --git a/vnfs/DAaaS/training-core/charts/m3db/templates/etcd-cluster.yaml b/vnfs/DAaaS/deploy/training-core/charts/m3db/templates/etcd-cluster.yaml similarity index 100% rename from vnfs/DAaaS/training-core/charts/m3db/templates/etcd-cluster.yaml rename to vnfs/DAaaS/deploy/training-core/charts/m3db/templates/etcd-cluster.yaml diff --git a/vnfs/DAaaS/training-core/charts/m3db/templates/m3dbcluster.yaml b/vnfs/DAaaS/deploy/training-core/charts/m3db/templates/m3dbcluster.yaml similarity index 100% rename from vnfs/DAaaS/training-core/charts/m3db/templates/m3dbcluster.yaml rename to vnfs/DAaaS/deploy/training-core/charts/m3db/templates/m3dbcluster.yaml diff --git a/vnfs/DAaaS/training-core/charts/m3db/values.yaml b/vnfs/DAaaS/deploy/training-core/charts/m3db/values.yaml similarity index 100% rename from vnfs/DAaaS/training-core/charts/m3db/values.yaml rename to vnfs/DAaaS/deploy/training-core/charts/m3db/values.yaml diff --git a/vnfs/DAaaS/training-core/hdfs-writer-source-code/hdfs-writer/README.md b/vnfs/DAaaS/deploy/training-core/hdfs-writer-source-code/hdfs-writer/README.md similarity index 100% rename from vnfs/DAaaS/training-core/hdfs-writer-source-code/hdfs-writer/README.md rename to vnfs/DAaaS/deploy/training-core/hdfs-writer-source-code/hdfs-writer/README.md diff --git a/vnfs/DAaaS/training-core/hdfs-writer-source-code/hdfs-writer/pom.xml b/vnfs/DAaaS/deploy/training-core/hdfs-writer-source-code/hdfs-writer/pom.xml similarity index 100% rename from vnfs/DAaaS/training-core/hdfs-writer-source-code/hdfs-writer/pom.xml rename to vnfs/DAaaS/deploy/training-core/hdfs-writer-source-code/hdfs-writer/pom.xml diff --git a/vnfs/DAaaS/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/CreateKafkaConsumer.java b/vnfs/DAaaS/deploy/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/CreateKafkaConsumer.java similarity index 100% rename from vnfs/DAaaS/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/CreateKafkaConsumer.java rename to vnfs/DAaaS/deploy/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/CreateKafkaConsumer.java diff --git a/vnfs/DAaaS/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/HdfsWriter.java b/vnfs/DAaaS/deploy/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/HdfsWriter.java similarity index 100% rename from vnfs/DAaaS/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/HdfsWriter.java rename to vnfs/DAaaS/deploy/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/HdfsWriter.java diff --git a/vnfs/DAaaS/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/Orchestrator.java b/vnfs/DAaaS/deploy/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/Orchestrator.java similarity index 100% rename from vnfs/DAaaS/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/Orchestrator.java rename to vnfs/DAaaS/deploy/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/Orchestrator.java diff --git a/vnfs/DAaaS/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/config/Configuration.java b/vnfs/DAaaS/deploy/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/config/Configuration.java similarity index 100% rename from vnfs/DAaaS/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/config/Configuration.java rename to vnfs/DAaaS/deploy/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/config/Configuration.java diff --git a/vnfs/DAaaS/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/kafka2hdfsApp.java b/vnfs/DAaaS/deploy/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/kafka2hdfsApp.java similarity index 100% rename from vnfs/DAaaS/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/kafka2hdfsApp.java rename to vnfs/DAaaS/deploy/training-core/hdfs-writer-source-code/hdfs-writer/src/main/java/kafka2hdfsApp.java diff --git a/vnfs/DAaaS/training-core/hdfs-writer-source-code/hdfs-writer/src/main/resources/configs.yaml b/vnfs/DAaaS/deploy/training-core/hdfs-writer-source-code/hdfs-writer/src/main/resources/configs.yaml similarity index 100% rename from vnfs/DAaaS/training-core/hdfs-writer-source-code/hdfs-writer/src/main/resources/configs.yaml rename to vnfs/DAaaS/deploy/training-core/hdfs-writer-source-code/hdfs-writer/src/main/resources/configs.yaml diff --git a/vnfs/DAaaS/operator/values.yaml b/vnfs/DAaaS/deploy/training-core/values.yaml similarity index 100% rename from vnfs/DAaaS/operator/values.yaml rename to vnfs/DAaaS/deploy/training-core/values.yaml diff --git a/vnfs/DAaaS/training-core/charts/m3db/.helmignore b/vnfs/DAaaS/deploy/visualization/.helmignore similarity index 100% rename from vnfs/DAaaS/training-core/charts/m3db/.helmignore rename to vnfs/DAaaS/deploy/visualization/.helmignore diff --git a/vnfs/DAaaS/visualization/Chart.yaml b/vnfs/DAaaS/deploy/visualization/Chart.yaml similarity index 100% rename from vnfs/DAaaS/visualization/Chart.yaml rename to vnfs/DAaaS/deploy/visualization/Chart.yaml diff --git a/vnfs/DAaaS/visualization/charts/grafana/.helmignore b/vnfs/DAaaS/deploy/visualization/charts/grafana/.helmignore similarity index 100% rename from vnfs/DAaaS/visualization/charts/grafana/.helmignore rename to vnfs/DAaaS/deploy/visualization/charts/grafana/.helmignore diff --git a/vnfs/DAaaS/visualization/charts/grafana/Chart.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/Chart.yaml similarity index 100% rename from vnfs/DAaaS/visualization/charts/grafana/Chart.yaml rename to vnfs/DAaaS/deploy/visualization/charts/grafana/Chart.yaml diff --git a/vnfs/DAaaS/visualization/charts/grafana/README.md b/vnfs/DAaaS/deploy/visualization/charts/grafana/README.md similarity index 100% rename from vnfs/DAaaS/visualization/charts/grafana/README.md rename to vnfs/DAaaS/deploy/visualization/charts/grafana/README.md diff --git a/vnfs/DAaaS/visualization/charts/grafana/dashboards/custom-dashboard.json b/vnfs/DAaaS/deploy/visualization/charts/grafana/dashboards/custom-dashboard.json similarity index 100% rename from vnfs/DAaaS/visualization/charts/grafana/dashboards/custom-dashboard.json rename to vnfs/DAaaS/deploy/visualization/charts/grafana/dashboards/custom-dashboard.json diff --git a/vnfs/DAaaS/visualization/charts/grafana/templates/NOTES.txt b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/NOTES.txt similarity index 100% rename from vnfs/DAaaS/visualization/charts/grafana/templates/NOTES.txt rename to vnfs/DAaaS/deploy/visualization/charts/grafana/templates/NOTES.txt diff --git a/vnfs/DAaaS/visualization/charts/grafana/templates/_helpers.tpl b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/_helpers.tpl similarity index 100% rename from vnfs/DAaaS/visualization/charts/grafana/templates/_helpers.tpl rename to vnfs/DAaaS/deploy/visualization/charts/grafana/templates/_helpers.tpl diff --git a/vnfs/DAaaS/visualization/charts/grafana/templates/clusterrole.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/clusterrole.yaml similarity index 100% rename from vnfs/DAaaS/visualization/charts/grafana/templates/clusterrole.yaml rename to vnfs/DAaaS/deploy/visualization/charts/grafana/templates/clusterrole.yaml diff --git a/vnfs/DAaaS/visualization/charts/grafana/templates/clusterrolebinding.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/clusterrolebinding.yaml similarity index 100% rename from vnfs/DAaaS/visualization/charts/grafana/templates/clusterrolebinding.yaml rename to vnfs/DAaaS/deploy/visualization/charts/grafana/templates/clusterrolebinding.yaml diff --git a/vnfs/DAaaS/visualization/charts/grafana/templates/configmap-dashboard-provider.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/configmap-dashboard-provider.yaml similarity index 100% rename from vnfs/DAaaS/visualization/charts/grafana/templates/configmap-dashboard-provider.yaml rename to vnfs/DAaaS/deploy/visualization/charts/grafana/templates/configmap-dashboard-provider.yaml diff --git a/vnfs/DAaaS/visualization/charts/grafana/templates/configmap.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/configmap.yaml similarity index 100% rename from vnfs/DAaaS/visualization/charts/grafana/templates/configmap.yaml rename to vnfs/DAaaS/deploy/visualization/charts/grafana/templates/configmap.yaml diff --git a/vnfs/DAaaS/visualization/charts/grafana/templates/dashboards-json-configmap.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/dashboards-json-configmap.yaml similarity index 100% rename from vnfs/DAaaS/visualization/charts/grafana/templates/dashboards-json-configmap.yaml rename to vnfs/DAaaS/deploy/visualization/charts/grafana/templates/dashboards-json-configmap.yaml diff --git a/vnfs/DAaaS/visualization/charts/grafana/templates/deployment.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/deployment.yaml similarity index 100% rename from vnfs/DAaaS/visualization/charts/grafana/templates/deployment.yaml rename to vnfs/DAaaS/deploy/visualization/charts/grafana/templates/deployment.yaml diff --git a/vnfs/DAaaS/visualization/charts/grafana/templates/ingress.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/ingress.yaml similarity index 100% rename from vnfs/DAaaS/visualization/charts/grafana/templates/ingress.yaml rename to vnfs/DAaaS/deploy/visualization/charts/grafana/templates/ingress.yaml diff --git a/vnfs/DAaaS/visualization/charts/grafana/templates/podsecuritypolicy.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/podsecuritypolicy.yaml similarity index 100% rename from vnfs/DAaaS/visualization/charts/grafana/templates/podsecuritypolicy.yaml rename to vnfs/DAaaS/deploy/visualization/charts/grafana/templates/podsecuritypolicy.yaml diff --git a/vnfs/DAaaS/visualization/charts/grafana/templates/pvc.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/pvc.yaml similarity index 100% rename from vnfs/DAaaS/visualization/charts/grafana/templates/pvc.yaml rename to vnfs/DAaaS/deploy/visualization/charts/grafana/templates/pvc.yaml diff --git a/vnfs/DAaaS/visualization/charts/grafana/templates/role.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/role.yaml similarity index 100% rename from vnfs/DAaaS/visualization/charts/grafana/templates/role.yaml rename to vnfs/DAaaS/deploy/visualization/charts/grafana/templates/role.yaml diff --git a/vnfs/DAaaS/visualization/charts/grafana/templates/rolebinding.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/rolebinding.yaml similarity index 100% rename from vnfs/DAaaS/visualization/charts/grafana/templates/rolebinding.yaml rename to vnfs/DAaaS/deploy/visualization/charts/grafana/templates/rolebinding.yaml diff --git a/vnfs/DAaaS/visualization/charts/grafana/templates/secret.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/secret.yaml similarity index 100% rename from vnfs/DAaaS/visualization/charts/grafana/templates/secret.yaml rename to vnfs/DAaaS/deploy/visualization/charts/grafana/templates/secret.yaml diff --git a/vnfs/DAaaS/visualization/charts/grafana/templates/service.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/service.yaml similarity index 100% rename from vnfs/DAaaS/visualization/charts/grafana/templates/service.yaml rename to vnfs/DAaaS/deploy/visualization/charts/grafana/templates/service.yaml diff --git a/vnfs/DAaaS/visualization/charts/grafana/templates/serviceaccount.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/serviceaccount.yaml similarity index 100% rename from vnfs/DAaaS/visualization/charts/grafana/templates/serviceaccount.yaml rename to vnfs/DAaaS/deploy/visualization/charts/grafana/templates/serviceaccount.yaml diff --git a/vnfs/DAaaS/visualization/charts/grafana/values.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/values.yaml similarity index 100% rename from vnfs/DAaaS/visualization/charts/grafana/values.yaml rename to vnfs/DAaaS/deploy/visualization/charts/grafana/values.yaml diff --git a/vnfs/DAaaS/visualization/templates/NOTES.txt b/vnfs/DAaaS/deploy/visualization/templates/NOTES.txt similarity index 100% rename from vnfs/DAaaS/visualization/templates/NOTES.txt rename to vnfs/DAaaS/deploy/visualization/templates/NOTES.txt diff --git a/vnfs/DAaaS/visualization/values.yaml b/vnfs/DAaaS/deploy/visualization/values.yaml similarity index 100% rename from vnfs/DAaaS/visualization/values.yaml rename to vnfs/DAaaS/deploy/visualization/values.yaml diff --git a/vnfs/DAaaS/lib/README.md b/vnfs/DAaaS/lib/README.md new file mode 100644 index 00000000..fac5dc96 --- /dev/null +++ b/vnfs/DAaaS/lib/README.md @@ -0,0 +1 @@ +This folder consists of library files. For eg: PromQL client library. diff --git a/vnfs/DAaaS/GoApps/src/hdfs-writer/.gitignore b/vnfs/DAaaS/microservices/GoApps/src/hdfs-writer/.gitignore similarity index 100% rename from vnfs/DAaaS/GoApps/src/hdfs-writer/.gitignore rename to vnfs/DAaaS/microservices/GoApps/src/hdfs-writer/.gitignore diff --git a/vnfs/DAaaS/GoApps/src/hdfs-writer/Makefile b/vnfs/DAaaS/microservices/GoApps/src/hdfs-writer/Makefile similarity index 100% rename from vnfs/DAaaS/GoApps/src/hdfs-writer/Makefile rename to vnfs/DAaaS/microservices/GoApps/src/hdfs-writer/Makefile diff --git a/vnfs/DAaaS/GoApps/src/hdfs-writer/README.md b/vnfs/DAaaS/microservices/GoApps/src/hdfs-writer/README.md similarity index 100% rename from vnfs/DAaaS/GoApps/src/hdfs-writer/README.md rename to vnfs/DAaaS/microservices/GoApps/src/hdfs-writer/README.md diff --git a/vnfs/DAaaS/GoApps/src/hdfs-writer/cmd/main.go b/vnfs/DAaaS/microservices/GoApps/src/hdfs-writer/cmd/main.go similarity index 100% rename from vnfs/DAaaS/GoApps/src/hdfs-writer/cmd/main.go rename to vnfs/DAaaS/microservices/GoApps/src/hdfs-writer/cmd/main.go diff --git a/vnfs/DAaaS/GoApps/src/hdfs-writer/go.mod b/vnfs/DAaaS/microservices/GoApps/src/hdfs-writer/go.mod similarity index 100% rename from vnfs/DAaaS/GoApps/src/hdfs-writer/go.mod rename to vnfs/DAaaS/microservices/GoApps/src/hdfs-writer/go.mod diff --git a/vnfs/DAaaS/collectd-operator/.gitignore b/vnfs/DAaaS/microservices/collectd-operator/.gitignore similarity index 100% rename from vnfs/DAaaS/collectd-operator/.gitignore rename to vnfs/DAaaS/microservices/collectd-operator/.gitignore diff --git a/vnfs/DAaaS/collectd-operator/Makefile b/vnfs/DAaaS/microservices/collectd-operator/Makefile similarity index 100% rename from vnfs/DAaaS/collectd-operator/Makefile rename to vnfs/DAaaS/microservices/collectd-operator/Makefile diff --git a/vnfs/DAaaS/collectd-operator/build/Dockerfile b/vnfs/DAaaS/microservices/collectd-operator/build/Dockerfile similarity index 100% rename from vnfs/DAaaS/collectd-operator/build/Dockerfile rename to vnfs/DAaaS/microservices/collectd-operator/build/Dockerfile diff --git a/vnfs/DAaaS/collectd-operator/cmd/manager/main.go b/vnfs/DAaaS/microservices/collectd-operator/cmd/manager/main.go similarity index 100% rename from vnfs/DAaaS/collectd-operator/cmd/manager/main.go rename to vnfs/DAaaS/microservices/collectd-operator/cmd/manager/main.go diff --git a/vnfs/DAaaS/collectd-operator/deploy/crds/onap_v1alpha1_collectdplugin_cr.yaml b/vnfs/DAaaS/microservices/collectd-operator/deploy/crds/onap_v1alpha1_collectdplugin_cr.yaml similarity index 100% rename from vnfs/DAaaS/collectd-operator/deploy/crds/onap_v1alpha1_collectdplugin_cr.yaml rename to vnfs/DAaaS/microservices/collectd-operator/deploy/crds/onap_v1alpha1_collectdplugin_cr.yaml diff --git a/vnfs/DAaaS/collectd-operator/deploy/crds/onap_v1alpha1_collectdplugin_crd.yaml b/vnfs/DAaaS/microservices/collectd-operator/deploy/crds/onap_v1alpha1_collectdplugin_crd.yaml similarity index 100% rename from vnfs/DAaaS/collectd-operator/deploy/crds/onap_v1alpha1_collectdplugin_crd.yaml rename to vnfs/DAaaS/microservices/collectd-operator/deploy/crds/onap_v1alpha1_collectdplugin_crd.yaml diff --git a/vnfs/DAaaS/collectd-operator/deploy/operator.yaml b/vnfs/DAaaS/microservices/collectd-operator/deploy/operator.yaml similarity index 100% rename from vnfs/DAaaS/collectd-operator/deploy/operator.yaml rename to vnfs/DAaaS/microservices/collectd-operator/deploy/operator.yaml diff --git a/vnfs/DAaaS/collectd-operator/deploy/role.yaml b/vnfs/DAaaS/microservices/collectd-operator/deploy/role.yaml similarity index 100% rename from vnfs/DAaaS/collectd-operator/deploy/role.yaml rename to vnfs/DAaaS/microservices/collectd-operator/deploy/role.yaml diff --git a/vnfs/DAaaS/collectd-operator/deploy/role_binding.yaml b/vnfs/DAaaS/microservices/collectd-operator/deploy/role_binding.yaml similarity index 100% rename from vnfs/DAaaS/collectd-operator/deploy/role_binding.yaml rename to vnfs/DAaaS/microservices/collectd-operator/deploy/role_binding.yaml diff --git a/vnfs/DAaaS/collectd-operator/deploy/service_account.yaml b/vnfs/DAaaS/microservices/collectd-operator/deploy/service_account.yaml similarity index 100% rename from vnfs/DAaaS/collectd-operator/deploy/service_account.yaml rename to vnfs/DAaaS/microservices/collectd-operator/deploy/service_account.yaml diff --git a/vnfs/DAaaS/collectd-operator/go.mod b/vnfs/DAaaS/microservices/collectd-operator/go.mod similarity index 100% rename from vnfs/DAaaS/collectd-operator/go.mod rename to vnfs/DAaaS/microservices/collectd-operator/go.mod diff --git a/vnfs/DAaaS/collectd-operator/go.sum b/vnfs/DAaaS/microservices/collectd-operator/go.sum similarity index 100% rename from vnfs/DAaaS/collectd-operator/go.sum rename to vnfs/DAaaS/microservices/collectd-operator/go.sum diff --git a/vnfs/DAaaS/collectd-operator/pkg/apis/addtoscheme_onap_v1alpha1.go b/vnfs/DAaaS/microservices/collectd-operator/pkg/apis/addtoscheme_onap_v1alpha1.go similarity index 100% rename from vnfs/DAaaS/collectd-operator/pkg/apis/addtoscheme_onap_v1alpha1.go rename to vnfs/DAaaS/microservices/collectd-operator/pkg/apis/addtoscheme_onap_v1alpha1.go diff --git a/vnfs/DAaaS/collectd-operator/pkg/apis/apis.go b/vnfs/DAaaS/microservices/collectd-operator/pkg/apis/apis.go similarity index 100% rename from vnfs/DAaaS/collectd-operator/pkg/apis/apis.go rename to vnfs/DAaaS/microservices/collectd-operator/pkg/apis/apis.go diff --git a/vnfs/DAaaS/collectd-operator/pkg/apis/onap/v1alpha1/collectdplugin_types.go b/vnfs/DAaaS/microservices/collectd-operator/pkg/apis/onap/v1alpha1/collectdplugin_types.go similarity index 100% rename from vnfs/DAaaS/collectd-operator/pkg/apis/onap/v1alpha1/collectdplugin_types.go rename to vnfs/DAaaS/microservices/collectd-operator/pkg/apis/onap/v1alpha1/collectdplugin_types.go diff --git a/vnfs/DAaaS/collectd-operator/pkg/apis/onap/v1alpha1/doc.go b/vnfs/DAaaS/microservices/collectd-operator/pkg/apis/onap/v1alpha1/doc.go similarity index 100% rename from vnfs/DAaaS/collectd-operator/pkg/apis/onap/v1alpha1/doc.go rename to vnfs/DAaaS/microservices/collectd-operator/pkg/apis/onap/v1alpha1/doc.go diff --git a/vnfs/DAaaS/collectd-operator/pkg/apis/onap/v1alpha1/register.go b/vnfs/DAaaS/microservices/collectd-operator/pkg/apis/onap/v1alpha1/register.go similarity index 100% rename from vnfs/DAaaS/collectd-operator/pkg/apis/onap/v1alpha1/register.go rename to vnfs/DAaaS/microservices/collectd-operator/pkg/apis/onap/v1alpha1/register.go diff --git a/vnfs/DAaaS/collectd-operator/pkg/apis/onap/v1alpha1/zz_generated.deepcopy.go b/vnfs/DAaaS/microservices/collectd-operator/pkg/apis/onap/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from vnfs/DAaaS/collectd-operator/pkg/apis/onap/v1alpha1/zz_generated.deepcopy.go rename to vnfs/DAaaS/microservices/collectd-operator/pkg/apis/onap/v1alpha1/zz_generated.deepcopy.go diff --git a/vnfs/DAaaS/collectd-operator/pkg/apis/onap/v1alpha1/zz_generated.openapi.go b/vnfs/DAaaS/microservices/collectd-operator/pkg/apis/onap/v1alpha1/zz_generated.openapi.go similarity index 100% rename from vnfs/DAaaS/collectd-operator/pkg/apis/onap/v1alpha1/zz_generated.openapi.go rename to vnfs/DAaaS/microservices/collectd-operator/pkg/apis/onap/v1alpha1/zz_generated.openapi.go diff --git a/vnfs/DAaaS/collectd-operator/pkg/controller/add_collectdplugin.go b/vnfs/DAaaS/microservices/collectd-operator/pkg/controller/add_collectdplugin.go similarity index 100% rename from vnfs/DAaaS/collectd-operator/pkg/controller/add_collectdplugin.go rename to vnfs/DAaaS/microservices/collectd-operator/pkg/controller/add_collectdplugin.go diff --git a/vnfs/DAaaS/collectd-operator/pkg/controller/collectdplugin/collectdplugin_controller.go b/vnfs/DAaaS/microservices/collectd-operator/pkg/controller/collectdplugin/collectdplugin_controller.go similarity index 100% rename from vnfs/DAaaS/collectd-operator/pkg/controller/collectdplugin/collectdplugin_controller.go rename to vnfs/DAaaS/microservices/collectd-operator/pkg/controller/collectdplugin/collectdplugin_controller.go diff --git a/vnfs/DAaaS/collectd-operator/pkg/controller/controller.go b/vnfs/DAaaS/microservices/collectd-operator/pkg/controller/controller.go similarity index 100% rename from vnfs/DAaaS/collectd-operator/pkg/controller/controller.go rename to vnfs/DAaaS/microservices/collectd-operator/pkg/controller/controller.go diff --git a/vnfs/DAaaS/collectd-operator/tools.go b/vnfs/DAaaS/microservices/collectd-operator/tools.go similarity index 100% rename from vnfs/DAaaS/collectd-operator/tools.go rename to vnfs/DAaaS/microservices/collectd-operator/tools.go diff --git a/vnfs/DAaaS/collectd-operator/version/version.go b/vnfs/DAaaS/microservices/collectd-operator/version/version.go similarity index 100% rename from vnfs/DAaaS/collectd-operator/version/version.go rename to vnfs/DAaaS/microservices/collectd-operator/version/version.go diff --git a/vnfs/DAaaS/applications/m3db_promql/promql_api/README.md b/vnfs/DAaaS/sample-apps/m3db_promql/promql_api/README.md similarity index 100% rename from vnfs/DAaaS/applications/m3db_promql/promql_api/README.md rename to vnfs/DAaaS/sample-apps/m3db_promql/promql_api/README.md diff --git a/vnfs/DAaaS/applications/m3db_promql/promql_api/__init__.py b/vnfs/DAaaS/sample-apps/m3db_promql/promql_api/__init__.py similarity index 100% rename from vnfs/DAaaS/applications/m3db_promql/promql_api/__init__.py rename to vnfs/DAaaS/sample-apps/m3db_promql/promql_api/__init__.py diff --git a/vnfs/DAaaS/applications/m3db_promql/promql_api/prom_ql_api.py b/vnfs/DAaaS/sample-apps/m3db_promql/promql_api/prom_ql_api.py similarity index 100% rename from vnfs/DAaaS/applications/m3db_promql/promql_api/prom_ql_api.py rename to vnfs/DAaaS/sample-apps/m3db_promql/promql_api/prom_ql_api.py diff --git a/vnfs/DAaaS/applications/m3db_promql/sample_promql_query.py b/vnfs/DAaaS/sample-apps/m3db_promql/sample_promql_query.py similarity index 100% rename from vnfs/DAaaS/applications/m3db_promql/sample_promql_query.py rename to vnfs/DAaaS/sample-apps/m3db_promql/sample_promql_query.py diff --git a/vnfs/DAaaS/applications/sample-horovod-app/Chart.yaml b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/Chart.yaml similarity index 100% rename from vnfs/DAaaS/applications/sample-horovod-app/Chart.yaml rename to vnfs/DAaaS/sample-apps/training/sample-horovod-app/Chart.yaml diff --git a/vnfs/DAaaS/applications/sample-horovod-app/Dockerfile b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/Dockerfile similarity index 100% rename from vnfs/DAaaS/applications/sample-horovod-app/Dockerfile rename to vnfs/DAaaS/sample-apps/training/sample-horovod-app/Dockerfile diff --git a/vnfs/DAaaS/applications/sample-horovod-app/README.md b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/README.md similarity index 100% rename from vnfs/DAaaS/applications/sample-horovod-app/README.md rename to vnfs/DAaaS/sample-apps/training/sample-horovod-app/README.md diff --git a/vnfs/DAaaS/applications/sample-horovod-app/keras_mnist_advanced_modified.py b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/keras_mnist_advanced_modified.py similarity index 100% rename from vnfs/DAaaS/applications/sample-horovod-app/keras_mnist_advanced_modified.py rename to vnfs/DAaaS/sample-apps/training/sample-horovod-app/keras_mnist_advanced_modified.py diff --git a/vnfs/DAaaS/applications/sample-horovod-app/sample_values.yaml b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/sample_values.yaml similarity index 100% rename from vnfs/DAaaS/applications/sample-horovod-app/sample_values.yaml rename to vnfs/DAaaS/sample-apps/training/sample-horovod-app/sample_values.yaml diff --git a/vnfs/DAaaS/applications/sample-horovod-app/templates/NOTES.txt b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/NOTES.txt similarity index 100% rename from vnfs/DAaaS/applications/sample-horovod-app/templates/NOTES.txt rename to vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/NOTES.txt diff --git a/vnfs/DAaaS/applications/sample-horovod-app/templates/_helpers.tpl b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/_helpers.tpl similarity index 100% rename from vnfs/DAaaS/applications/sample-horovod-app/templates/_helpers.tpl rename to vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/_helpers.tpl diff --git a/vnfs/DAaaS/applications/sample-horovod-app/templates/config.yaml b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/config.yaml similarity index 100% rename from vnfs/DAaaS/applications/sample-horovod-app/templates/config.yaml rename to vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/config.yaml diff --git a/vnfs/DAaaS/applications/sample-horovod-app/templates/job-service.yaml b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/job-service.yaml similarity index 100% rename from vnfs/DAaaS/applications/sample-horovod-app/templates/job-service.yaml rename to vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/job-service.yaml diff --git a/vnfs/DAaaS/applications/sample-horovod-app/templates/job.yaml b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/job.yaml similarity index 100% rename from vnfs/DAaaS/applications/sample-horovod-app/templates/job.yaml rename to vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/job.yaml diff --git a/vnfs/DAaaS/applications/sample-horovod-app/templates/minio-secrets.yaml b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/minio-secrets.yaml similarity index 100% rename from vnfs/DAaaS/applications/sample-horovod-app/templates/minio-secrets.yaml rename to vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/minio-secrets.yaml diff --git a/vnfs/DAaaS/applications/sample-horovod-app/templates/secrets.yaml b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/secrets.yaml similarity index 100% rename from vnfs/DAaaS/applications/sample-horovod-app/templates/secrets.yaml rename to vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/secrets.yaml diff --git a/vnfs/DAaaS/applications/sample-horovod-app/templates/statefulset-service.yaml b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/statefulset-service.yaml similarity index 100% rename from vnfs/DAaaS/applications/sample-horovod-app/templates/statefulset-service.yaml rename to vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/statefulset-service.yaml diff --git a/vnfs/DAaaS/applications/sample-horovod-app/templates/statefulset.yaml b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/statefulset.yaml similarity index 100% rename from vnfs/DAaaS/applications/sample-horovod-app/templates/statefulset.yaml rename to vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/statefulset.yaml diff --git a/vnfs/DAaaS/visualization/.helmignore b/vnfs/DAaaS/sample-apps/training/sample-spark-app/.helmignore similarity index 100% rename from vnfs/DAaaS/visualization/.helmignore rename to vnfs/DAaaS/sample-apps/training/sample-spark-app/.helmignore diff --git a/vnfs/DAaaS/applications/sample-spark-app/Chart.yaml b/vnfs/DAaaS/sample-apps/training/sample-spark-app/Chart.yaml similarity index 100% rename from vnfs/DAaaS/applications/sample-spark-app/Chart.yaml rename to vnfs/DAaaS/sample-apps/training/sample-spark-app/Chart.yaml diff --git a/vnfs/DAaaS/applications/sample-spark-app/Dockerfile b/vnfs/DAaaS/sample-apps/training/sample-spark-app/Dockerfile similarity index 100% rename from vnfs/DAaaS/applications/sample-spark-app/Dockerfile rename to vnfs/DAaaS/sample-apps/training/sample-spark-app/Dockerfile diff --git a/vnfs/DAaaS/applications/sample-spark-app/templates/SampleSparkApp.yaml b/vnfs/DAaaS/sample-apps/training/sample-spark-app/templates/SampleSparkApp.yaml similarity index 100% rename from vnfs/DAaaS/applications/sample-spark-app/templates/SampleSparkApp.yaml rename to vnfs/DAaaS/sample-apps/training/sample-spark-app/templates/SampleSparkApp.yaml diff --git a/vnfs/DAaaS/applications/sample-spark-app/templates/_helpers.tpl b/vnfs/DAaaS/sample-apps/training/sample-spark-app/templates/_helpers.tpl similarity index 100% rename from vnfs/DAaaS/applications/sample-spark-app/templates/_helpers.tpl rename to vnfs/DAaaS/sample-apps/training/sample-spark-app/templates/_helpers.tpl diff --git a/vnfs/DAaaS/applications/sample-spark-app/values.yaml b/vnfs/DAaaS/sample-apps/training/sample-spark-app/values.yaml similarity index 100% rename from vnfs/DAaaS/applications/sample-spark-app/values.yaml rename to vnfs/DAaaS/sample-apps/training/sample-spark-app/values.yaml diff --git a/vnfs/DAaaS/training-core/values.yaml b/vnfs/DAaaS/training-core/values.yaml deleted file mode 100644 index fd98eb36..00000000 --- a/vnfs/DAaaS/training-core/values.yaml +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright © 2019 Intel Corporation -# -# 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. - -################################################################# -# Global configuration defaults. -################################################################# -global: - nodePortPrefix: 310 - repository: nexus3.onap.org:10001 - readinessRepository: oomk8s - readinessImage: readiness-check:2.0.0 - loggingRepository: docker.elastic.co - loggingImage: beats/filebeat:5.5.0 - -################################################################# -# k8s Operator Day-0 configuration defaults. -################################################################# -