Merge "Update CLAMP deployment for Frankfurt release (RC0)"

7 files changed, 221 insertions, 63 deletions

diff --git a/kubernetes/clamp/charts/clamp-backend/values.yaml b/kubernetes/clamp/charts/clamp-backend/values.yaml
index 498149412a..153f1e7e2e 100644
--- a/kubernetes/clamp/charts/clamp-backend/values.yaml
+++ b/kubernetes/clamp/charts/clamp-backend/values.yaml
@@ -27,7 +27,7 @@ flavor: small
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/clamp-backend:4.1.3
+image: onap/clamp-backend:5.0.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required
@@ -45,12 +45,7 @@ config:
   springApplicationJson: >
     {
         "spring.datasource.cldsdb.url": "jdbc:mariadb:sequential://clampdb.{{ include "common.namespace" . }}:3306/cldsdb4?autoReconnect=true&connectTimeout=10000&socketTimeout=10000&retriesAllDown=3",
-        "spring.profiles.active": "clamp-default,clamp-default-user,clamp-sdc-controller-new",
-        "clamp.config.sdc.catalog.url": "http://sdc-be.{{ include "common.namespace" . }}:8080/sdc/v1/catalog/",
-        "clamp.config.sdc.hostUrl": "http://sdc-be.{{ include "common.namespace" . }}:8080/",
-        "clamp.config.sdc.serviceUrl": "http://sdc-be.{{ include "common.namespace" . }}:8080/sdc/v1/catalog/services",
-        "clamp.config.sdc.serviceUsername": "clamp",
-        "clamp.config.sdc.servicePassword": "b7acccda32b98c5bb7acccda32b98c5b05D511BD6D93626E90D18E9D24D9B78CD34C7EE8012F0A189A28763E82271E50A5D4EC10C7D93E06E0A2D27CAE66B981",
+        "spring.profiles.active": "clamp-default,clamp-aaf-authentication,clamp-sdc-controller,clamp-ssl-config,clamp-policy-controller,legacy-operational-policy,default-dictionary-elements",
         "clamp.config.files.sdcController": "file:/opt/clamp/sdc-controllers-config.json",
         "clamp.config.dcae.inventory.url": "https4://inventory.{{ include "common.namespace" . }}:8080",
         "clamp.config.dcae.dispatcher.url": "https4://deployment-handler.{{ include "common.namespace" . }}:8443",
@@ -63,10 +58,6 @@ config:
         "clamp.config.policy.pap.url": "https4://policy-pap.{{ include "common.namespace" . }}:6969",
         "clamp.config.policy.pap.userName": "healthcheck",
         "clamp.config.policy.pap.password": "zb!XztG34",
-        "clamp.config.policy.pdpUrl1": "https://pdp.{{ include "common.namespace" . }}:8081/pdp/ , testpdp, alpha123",
-        "clamp.config.policy.pdpUrl2": "https://pdp.{{ include "common.namespace" . }}:8081/pdp/ , testpdp, alpha123",
-        "clamp.config.policy.papUrl": "https://pap.{{ include "common.namespace" . }}:9091/pap/ , testpap, alpha123",
-        "clamp.config.policy.clientKey": "dGVzdA==",
         "clamp.config.cadi.aafLocateUrl": "https://aaf-locate.{{ include "common.namespace" . }}:8095",
         "com.att.eelf.logging.path": "/opt/clamp",
         "com.att.eelf.logging.file": "logback.xml"
diff --git a/kubernetes/clamp/charts/mariadb/resources/config/mariadb/docker-entrypoint-initdb.d/bulkload/create-tables.sql b/kubernetes/clamp/charts/mariadb/resources/config/mariadb/docker-entrypoint-initdb.d/bulkload/create-tables.sql
index 0e15d4d3a2..1f153bce04 100644
--- a/kubernetes/clamp/charts/mariadb/resources/config/mariadb/docker-entrypoint-initdb.d/bulkload/create-tables.sql
+++ b/kubernetes/clamp/charts/mariadb/resources/config/mariadb/docker-entrypoint-initdb.d/bulkload/create-tables.sql
@@ -1,10 +1,53 @@
 
+    create table dictionary (
+       name varchar(255) not null,
+        created_by varchar(255),
+        created_timestamp datetime(6) not null,
+        updated_by varchar(255),
+        updated_timestamp datetime(6) not null,
+        dictionary_second_level integer,
+        dictionary_type varchar(255),
+        primary key (name)
+    ) engine=InnoDB;
+
+    create table dictionary_elements (
+       short_name varchar(255) not null,
+        created_by varchar(255),
+        created_timestamp datetime(6) not null,
+        updated_by varchar(255),
+        updated_timestamp datetime(6) not null,
+        description varchar(255) not null,
+        name varchar(255) not null,
+        subdictionary_name varchar(255),
+        type varchar(255) not null,
+        primary key (short_name)
+    ) engine=InnoDB;
+
+    create table dictionary_to_dictionaryelements (
+       dictionary_name varchar(255) not null,
+        dictionary_element_short_name varchar(255) not null,
+        primary key (dictionary_name, dictionary_element_short_name)
+    ) engine=InnoDB;
+
     create table hibernate_sequence (
        next_val bigint
     ) engine=InnoDB;
 
     insert into hibernate_sequence values ( 1 );
 
+    create table loop_element_models (
+       name varchar(255) not null,
+        created_by varchar(255),
+        created_timestamp datetime(6) not null,
+        updated_by varchar(255),
+        updated_timestamp datetime(6) not null,
+        blueprint_yaml MEDIUMTEXT,
+        dcae_blueprint_id varchar(255),
+        loop_element_type varchar(255) not null,
+        short_name varchar(255),
+        primary key (name)
+    ) engine=InnoDB;
+
     create table loop_logs (
        id bigint not null,
         log_component varchar(255) not null,
@@ -15,59 +58,200 @@
         primary key (id)
     ) engine=InnoDB;
 
-    create table loops (
+    create table loop_templates (
        name varchar(255) not null,
-        blueprint_yaml MEDIUMTEXT not null,
+        created_by varchar(255),
+        created_timestamp datetime(6) not null,
+        updated_by varchar(255),
+        updated_timestamp datetime(6) not null,
+        allowed_loop_type varchar(255),
+        blueprint_yaml MEDIUMTEXT,
         dcae_blueprint_id varchar(255),
+        maximum_instances_allowed integer,
+        svg_representation MEDIUMTEXT,
+        unique_blueprint boolean default false,
+        service_uuid varchar(255),
+        primary key (name)
+    ) engine=InnoDB;
+
+    create table loopelementmodels_to_policymodels (
+       loop_element_name varchar(255) not null,
+        policy_model_type varchar(255) not null,
+        policy_model_version varchar(255) not null,
+        primary key (loop_element_name, policy_model_type, policy_model_version)
+    ) engine=InnoDB;
+
+    create table loops (
+       name varchar(255) not null,
+        created_by varchar(255),
+        created_timestamp datetime(6) not null,
+        updated_by varchar(255),
+        updated_timestamp datetime(6) not null,
         dcae_deployment_id varchar(255),
         dcae_deployment_status_url varchar(255),
         global_properties_json json,
         last_computed_state varchar(255) not null,
-        model_properties_json json,
-        operational_policy_schema json,
         svg_representation MEDIUMTEXT,
+        loop_template_name varchar(255) not null,
+        service_uuid varchar(255),
         primary key (name)
     ) engine=InnoDB;
 
-    create table loops_microservicepolicies (
-       loop_id varchar(255) not null,
-        microservicepolicy_id varchar(255) not null,
-        primary key (loop_id, microservicepolicy_id)
+    create table loops_to_microservicepolicies (
+       loop_name varchar(255) not null,
+        microservicepolicy_name varchar(255) not null,
+        primary key (loop_name, microservicepolicy_name)
+    ) engine=InnoDB;
+
+    create table looptemplates_to_loopelementmodels (
+       loop_element_model_name varchar(255) not null,
+        loop_template_name varchar(255) not null,
+        flow_order integer not null,
+        primary key (loop_element_model_name, loop_template_name)
     ) engine=InnoDB;
 
     create table micro_service_policies (
        name varchar(255) not null,
+        created_by varchar(255),
+        created_timestamp datetime(6) not null,
+        updated_by varchar(255),
+        updated_timestamp datetime(6) not null,
+        configurations_json json,
         json_representation json not null,
-        model_type varchar(255) not null,
-        policy_tosca MEDIUMTEXT not null,
-        properties json,
+        pdp_group varchar(255),
+        pdp_sub_group varchar(255),
+        context varchar(255),
+        dcae_blueprint_id varchar(255),
+        dcae_deployment_id varchar(255),
+        dcae_deployment_status_url varchar(255),
+        device_type_scope varchar(255),
         shared bit not null,
+        loop_element_model_id varchar(255),
+        policy_model_type varchar(255),
+        policy_model_version varchar(255),
         primary key (name)
     ) engine=InnoDB;
 
     create table operational_policies (
        name varchar(255) not null,
+        created_by varchar(255),
+        created_timestamp datetime(6) not null,
+        updated_by varchar(255),
+        updated_timestamp datetime(6) not null,
         configurations_json json,
+        json_representation json not null,
+        pdp_group varchar(255),
+        pdp_sub_group varchar(255),
+        loop_element_model_id varchar(255),
+        policy_model_type varchar(255),
+        policy_model_version varchar(255),
         loop_id varchar(255) not null,
         primary key (name)
     ) engine=InnoDB;
 
-    alter table loop_logs 
-       add constraint FK1j0cda46aickcaoxqoo34khg2 
-       foreign key (loop_id) 
+    create table policy_models (
+       policy_model_type varchar(255) not null,
+        version varchar(255) not null,
+        created_by varchar(255),
+        created_timestamp datetime(6) not null,
+        updated_by varchar(255),
+        updated_timestamp datetime(6) not null,
+        policy_acronym varchar(255),
+        policy_tosca MEDIUMTEXT,
+        policy_pdp_group json,
+        primary key (policy_model_type, version)
+    ) engine=InnoDB;
+
+    create table services (
+       service_uuid varchar(255) not null,
+        name varchar(255) not null,
+        resource_details json,
+        service_details json,
+        version varchar(255),
+        primary key (service_uuid)
+    ) engine=InnoDB;
+
+    alter table dictionary_to_dictionaryelements
+       add constraint FK68hjjinnm8nte2owstd0xwp23
+       foreign key (dictionary_element_short_name)
+       references dictionary_elements (short_name);
+
+    alter table dictionary_to_dictionaryelements
+       add constraint FKtqfxg46gsxwlm2gkl6ne3cxfe
+       foreign key (dictionary_name)
+       references dictionary (name);
+
+    alter table loop_logs
+       add constraint FK1j0cda46aickcaoxqoo34khg2
+       foreign key (loop_id)
        references loops (name);
 
-    alter table loops_microservicepolicies 
-       add constraint FKem7tp1cdlpwe28av7ef91j1yl 
-       foreign key (microservicepolicy_id) 
+    alter table loop_templates
+       add constraint FKn692dk6281wvp1o95074uacn6
+       foreign key (service_uuid)
+       references services (service_uuid);
+
+    alter table loopelementmodels_to_policymodels
+       add constraint FK23j2q74v6kaexefy0tdabsnda
+       foreign key (policy_model_type, policy_model_version)
+       references policy_models (policy_model_type, version);
+
+    alter table loopelementmodels_to_policymodels
+       add constraint FKjag1iu0olojfwryfkvb5o0rk5
+       foreign key (loop_element_name)
+       references loop_element_models (name);
+
+    alter table loops
+       add constraint FK844uwy82wt0l66jljkjqembpj
+       foreign key (loop_template_name)
+       references loop_templates (name);
+
+    alter table loops
+       add constraint FK4b9wnqopxogwek014i1shqw7w
+       foreign key (service_uuid)
+       references services (service_uuid);
+
+    alter table loops_to_microservicepolicies
+       add constraint FKle255jmi7b065fwbvmwbiehtb
+       foreign key (microservicepolicy_name)
        references micro_service_policies (name);
 
-    alter table loops_microservicepolicies 
-       add constraint FKsvx91jekgdkfh34iaxtjfgebt 
-       foreign key (loop_id) 
+    alter table loops_to_microservicepolicies
+       add constraint FK8avfqaf7xl71l7sn7a5eri68d
+       foreign key (loop_name)
        references loops (name);
 
-    alter table operational_policies 
-       add constraint FK1ddoggk9ni2bnqighv6ecmuwu 
-       foreign key (loop_id) 
+    alter table looptemplates_to_loopelementmodels
+       add constraint FK1k7nbrbugvqa0xfxkq3cj1yn9
+       foreign key (loop_element_model_name)
+       references loop_element_models (name);
+
+    alter table looptemplates_to_loopelementmodels
+       add constraint FKj29yxyw0x7ue6mwgi6d3qg748
+       foreign key (loop_template_name)
+       references loop_templates (name);
+
+    alter table micro_service_policies
+       add constraint FKqvvdypacbww07fuv8xvlvdjgl
+       foreign key (loop_element_model_id)
+       references loop_element_models (name);
+
+    alter table micro_service_policies
+       add constraint FKn17j9ufmyhqicb6cvr1dbjvkt
+       foreign key (policy_model_type, policy_model_version)
+       references policy_models (policy_model_type, version);
+
+    alter table operational_policies
+       add constraint FKi9kh7my40737xeuaye9xwbnko
+       foreign key (loop_element_model_id)
+       references loop_element_models (name);
+
+    alter table operational_policies
+       add constraint FKlsyhfkoqvkwj78ofepxhoctip
+       foreign key (policy_model_type, policy_model_version)
+       references policy_models (policy_model_type, version);
+
+    alter table operational_policies
+       add constraint FK1ddoggk9ni2bnqighv6ecmuwu
+       foreign key (loop_id)
        references loops (name);
diff --git a/kubernetes/clamp/charts/mariadb/templates/configmap.yaml b/kubernetes/clamp/charts/mariadb/templates/configmap.yaml
index b21f052ce3..705c38fa19 100644
--- a/kubernetes/clamp/charts/mariadb/templates/configmap.yaml
+++ b/kubernetes/clamp/charts/mariadb/templates/configmap.yaml
@@ -30,19 +30,6 @@ data:
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: clamp-entrypoint-drop-configmap
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    app: {{ include "common.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ include "common.release" . }}
-    heritage: {{ .Release.Service }}
-data:
-{{ tpl (.Files.Glob "resources/config/mariadb/docker-entrypoint-initdb.d/drop/*").AsConfig . | indent 2 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
   name: clamp-entrypoint-bulkload-configmap
   namespace: {{ include "common.namespace" . }}
   labels:
diff --git a/kubernetes/clamp/charts/mariadb/templates/deployment.yaml b/kubernetes/clamp/charts/mariadb/templates/deployment.yaml
index 490ff18522..be46f89433 100644
--- a/kubernetes/clamp/charts/mariadb/templates/deployment.yaml
+++ b/kubernetes/clamp/charts/mariadb/templates/deployment.yaml
@@ -58,14 +58,12 @@ spec:
                   name: {{ template "common.fullname" . }}
                   key: db-root-password
           volumeMounts:
-          - mountPath: /docker-entrypoint-initdb.d/load-sql-files-tests-automation.sh
+          - mountPath: /docker-entrypoint-initdb.d/bootstrap-database.sh
             name: docker-entrypoint-initdb
-            subPath: load-sql-files-tests-automation.sh
+            subPath: bootstrap-database.sh
           - mountPath: /etc/localtime
             name: localtime
             readOnly: true
-          - mountPath: /docker-entrypoint-initdb.d/drop/
-            name: docker-entrypoint-clds-drop
           - mountPath: /docker-entrypoint-initdb.d/bulkload/
             name: docker-entrypoint-bulkload
           - mountPath: /etc/mysql/conf.d/conf1/
@@ -93,9 +91,6 @@ spec:
         - name: docker-entrypoint-initdb
           configMap:
             name: clamp-entrypoint-initdb-configmap
-        - name: docker-entrypoint-clds-drop
-          configMap:
-            name: clamp-entrypoint-drop-configmap
         - name: docker-entrypoint-bulkload
           configMap:
             name: clamp-entrypoint-bulkload-configmap
diff --git a/kubernetes/clamp/resources/config/nginx.conf b/kubernetes/clamp/resources/config/default.conf
index da7978ad01..84beff8d5a 100644
--- a/kubernetes/clamp/resources/config/nginx.conf
+++ b/kubernetes/clamp/resources/config/default.conf
@@ -1,6 +1,6 @@
 server {
 
-  listen 443 default ssl;
+  listen 2443 default ssl;
   ssl_protocols TLSv1.2;
   ssl_certificate /etc/ssl/clamp.pem;
   ssl_certificate_key /etc/ssl/clamp.key;
diff --git a/kubernetes/clamp/templates/deployment.yaml b/kubernetes/clamp/templates/deployment.yaml
index cc6440050f..e4ac4723da 100644
--- a/kubernetes/clamp/templates/deployment.yaml
+++ b/kubernetes/clamp/templates/deployment.yaml
@@ -81,9 +81,9 @@ spec:
           volumeMounts:
           - name: {{ include "common.fullname" . }}-logs
             mountPath: /var/log/nginx/
-          - mountPath: /etc/nginx/conf.d/nginx.conf
+          - mountPath: /etc/nginx/conf.d/default.conf
             name: {{ include "common.fullname" . }}-config
-            subPath: nginx.conf
+            subPath: default.conf
           resources:
 {{ include "common.resources" . | indent 12 }}
         {{- if .Values.nodeSelector }}
@@ -99,8 +99,8 @@ spec:
           configMap:
             name: {{ include "common.fullname" . }}
             items:
-            - key: nginx.conf
-              path: nginx.conf
+            - key: default.conf
+              path: default.conf
         - name: {{ include "common.fullname" . }}-filebeat-conf
           configMap:
             name: {{ include "common.release" . }}-clamp-filebeat-configmap
@@ -110,3 +110,4 @@ spec:
           emptyDir: {}
       imagePullSecrets:
       - name: "{{ include "common.namespace" . }}-docker-registry-key"
+
diff --git a/kubernetes/clamp/values.yaml b/kubernetes/clamp/values.yaml
index d66273dce1..1839633196 100644
--- a/kubernetes/clamp/values.yaml
+++ b/kubernetes/clamp/values.yaml
@@ -30,7 +30,7 @@ flavor: small
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/clamp-frontend:4.1.3
+image: onap/clamp-frontend:5.0.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required
@@ -69,7 +69,7 @@ service:
   type: NodePort
   name: clamp-external
   portName: clamp-external
-  internalPort: 443
+  internalPort: 2443
   nodePort: 58
 
   # as of 20180904 port 58 is reserved for clamp from log/logdemonode
@@ -78,7 +78,7 @@ service:
   type2: ClusterIP
   name2: clamp
   portName2: clamp-internal
-  internalPort2: 443
+  internalPort2: 2443
   externalPort2: 8443
 
 ingress:
@@ -86,7 +86,7 @@ ingress:
   service:
     - baseaddr: "clamp"
       name: "clamp"
-      port: 443
+      port: 2443
   config:
     ssl: "redirect"