Merge "Add Consul health check support for SDC"
authorMike Elliott <mike.elliott@amdocs.com>
Mon, 25 Sep 2017 13:51:48 +0000 (13:51 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 25 Sep 2017 13:51:48 +0000 (13:51 +0000)
54 files changed:
kubernetes/aai/templates/aai-resources-deployment.yaml
kubernetes/aai/templates/aai-traversal-deployment.yaml
kubernetes/aai/templates/gremlin-deployment.yaml [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/attributes/gremlin-server-config.rb [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/recipes/gremlin-server-config.rb [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/templates/default/aai-traversal-app-config/gremlin-server-config.yaml [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/runlist-aai-traversal.json
kubernetes/config/docker/init/src/config/aai/aai-data/environments/simpledemo.json
kubernetes/config/docker/init/src/config/aai/aai-data/environments/solo.json
kubernetes/config/docker/init/src/config/aai/aai-resources/docker-entrypoint.sh [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-traversal/docker-entrypoint.sh [deleted file]
kubernetes/config/docker/init/src/config/aai/data-router/appconfig/model/aai_oxm_v11.xml [new file with mode: 0644]
kubernetes/config/docker/init/src/config/consul/consul-agent-config/mr-dmaap-health.json [new file with mode: 0644]
kubernetes/config/docker/init/src/config/consul/consul-agent-config/mr-kafka-health.json [new file with mode: 0644]
kubernetes/config/docker/init/src/config/consul/consul-agent-config/mr-zookeeper-health.json [new file with mode: 0644]
kubernetes/config/docker/init/src/config/consul/consul-agent-config/mso-health.json [new file with mode: 0644]
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mr-kafka-health.sh [new file with mode: 0644]
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mr-zookeeper-health.sh [new file with mode: 0644]
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-api-script.sh [new file with mode: 0644]
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-camunda-script.sh [new file with mode: 0644]
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-jra-script.sh [new file with mode: 0644]
kubernetes/config/docker/init/src/config/mso/docker-files/chef-configs/solo.rb [deleted file]
kubernetes/config/docker/init/src/config/mso/docker-files/jboss-configs/configuration/application-roles.properties [deleted file]
kubernetes/config/docker/init/src/config/mso/docker-files/jboss-configs/configuration/application-users.properties [deleted file]
kubernetes/config/docker/init/src/config/mso/docker-files/jboss-configs/configuration/mgmt-groups.properties [deleted file]
kubernetes/config/docker/init/src/config/mso/docker-files/jboss-configs/configuration/mgmt-users.properties [deleted file]
kubernetes/config/docker/init/src/config/mso/docker-files/jboss-configs/configuration/standalone-full-ha.xml [deleted file]
kubernetes/config/docker/init/src/config/mso/docker-files/jboss-configs/modules/mariadb/main/module.xml [deleted file]
kubernetes/config/docker/init/src/config/mso/mariadb/conf.d/mariadb1.cnf [changed mode: 0755->0644]
kubernetes/config/docker/init/src/config/mso/mariadb/conf.d/mariadb1.cnf.example [deleted file]
kubernetes/config/docker/init/src/config/mso/mariadb/docker-entrypoint-initdb.d/02-load-additional-changes.sh
kubernetes/config/docker/init/src/config/mso/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/bulkload-files/default/create_mso_db-default.sql
kubernetes/config/docker/init/src/config/mso/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/bulkload-files/demo-vfw/create_mso_db-demo-vfw.sql
kubernetes/config/docker/init/src/config/mso/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/camunda/mariadb_engine_7.7.3-ee.sql [moved from kubernetes/config/docker/init/src/config/mso/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/camunda/mariadb_engine_7.6.0.sql with 90% similarity]
kubernetes/config/docker/init/src/config/mso/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/camunda/mariadb_identity_7.6.0.sql [deleted file]
kubernetes/config/docker/init/src/config/mso/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/camunda/mysql_create_camunda_admin.sql
kubernetes/config/docker/init/src/config/mso/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/camunda/mysql_engine_7.3.0.sql [deleted file]
kubernetes/config/docker/init/src/config/mso/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/camunda/mysql_identity_7.3.0.sql [deleted file]
kubernetes/config/docker/init/src/config/mso/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/camunda/mysql_updates_7.3.0.sql [deleted file]
kubernetes/config/docker/init/src/config/mso/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/camunda/mysql_updates_7.3.0_to_7.6.0.sql [deleted file]
kubernetes/config/docker/init/src/config/mso/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/main-schemas/MySQL-Catalog-schema.sql
kubernetes/config/docker/init/src/config/mso/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/sub-sql-files/catalog_add_constraints.sql [deleted file]
kubernetes/config/docker/init/src/config/mso/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/sub-sql-files/catalog_timestamp_mso_db.sql [deleted file]
kubernetes/config/docker/init/src/config/mso/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/sub-sql-files/site_status_updated_timestamp.sql [deleted file]
kubernetes/config/docker/init/src/config/mso/mso/mso-docker.json
kubernetes/dcaegen2/.helmignore [new file with mode: 0644]
kubernetes/dcaegen2/Chart.yaml [new file with mode: 0644]
kubernetes/dcaegen2/dcae-parameters-sample.yaml [new file with mode: 0644]
kubernetes/dcaegen2/templates/pod.yaml [new file with mode: 0644]
kubernetes/dcaegen2/values.yaml [new file with mode: 0644]
kubernetes/mso/templates/db-deployment.yaml
kubernetes/mso/templates/mso-deployment.yaml
kubernetes/oneclick/createAll.bash
kubernetes/oneclick/setenv.bash

index c61bc6f..c874e39 100644 (file)
@@ -37,7 +37,7 @@ spec:
               "imagePullPolicy": "{{ .Values.pullPolicy }}",
               "name": "aai-resources-readiness"
           }
-        ]'      
+        ]'
     spec:
       containers:
       - name: aai-resources
@@ -62,8 +62,6 @@ spec:
           name: aai-resources-logs
         - mountPath: /var/chef/aai-data/
           name: aai-data
-        - mountPath: /docker-entrypoint.sh
-          name: entrypoint-override
         ports:
         - containerPort: 8447
         readinessProbe:
@@ -81,9 +79,6 @@ spec:
       - name: aai-data
         hostPath:
           path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-data/"
-      - name: entrypoint-override
-        hostPath:
-          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-resources/docker-entrypoint.sh"
       restartPolicy: Always
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
index ec387b0..d430479 100644 (file)
@@ -39,7 +39,7 @@ spec:
               "imagePullPolicy": "{{ .Values.pullPolicy }}",
               "name": "aai-traversal-readiness"
           }
-        ]'      
+        ]'
     spec:
       containers:
       - name: aai-traversal
@@ -56,6 +56,8 @@ spec:
           value: /var/chef/aai-data/environments
         - name: CHEF_GIT_URL
           value: http://gerrit.onap.org/r/aai
+        - name: RESOURCES_HOSTNAME
+          value: aai-resources.{{ .Values.nsPrefix }}-aai
         volumeMounts:
         - mountPath: /etc/localtime
           name: localtime
@@ -64,8 +66,6 @@ spec:
           name: aai-traversal-logs
         - mountPath: /var/chef/aai-data/
           name: aai-data
-        - mountPath: /docker-entrypoint.sh
-          name: entrypoint-override
         ports:
         - containerPort: 8446
         readinessProbe:
@@ -83,9 +83,6 @@ spec:
       - name: aai-data
         hostPath:
           path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-data/"
-      - name: entrypoint-override
-        hostPath:
-          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-traversal/docker-entrypoint.sh"
       restartPolicy: Always
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/aai/templates/gremlin-deployment.yaml b/kubernetes/aai/templates/gremlin-deployment.yaml
deleted file mode 100644 (file)
index 75b3e92..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: gremlin
-  namespace: "{{ .Values.nsPrefix }}-aai"
-spec:
-  selector:
-    matchLabels:
-      app: gremlin
-  template:
-    metadata:
-      labels:
-        app: gremlin
-      name: gremlin
-      annotations:
-        pod.beta.kubernetes.io/init-containers: '[
-          {
-              "args": [
-                  "--container-name",
-                  "hbase"
-              ],
-              "command": [
-                  "/root/ready.py"
-              ],
-              "env": [
-                  {
-                      "name": "NAMESPACE",
-                      "valueFrom": {
-                          "fieldRef": {
-                              "apiVersion": "v1",
-                              "fieldPath": "metadata.namespace"
-                          }
-                      }
-                  }
-              ],
-              "image": "{{ .Values.image.readiness }}",
-              "imagePullPolicy": "{{ .Values.pullPolicy }}",
-              "name": "gremlin-readiness"
-          }
-          ]'
-    spec:
-      hostname: gremlin
-      containers:
-      - name: gremlin
-        image: {{ .Values.image.gremlinServerImage }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        env:
-        - name: SERVER_HOST
-          value: "hbase.{{ .Values.nsPrefix }}-aai"
-        - name: SERVER_TABLE
-          value: aaigraph.dev
-        - name: GREMLIN_HOST
-          value: "gremlin"
-        ports:
-        - containerPort: 8182
-        readinessProbe:
-          tcpSocket:
-            port: 8182
-          initialDelaySeconds: 5
-          periodSeconds: 10
-        volumeMounts:
-        - name: localtime
-          mountPath: /etc/localtime
-          readOnly: true
-      volumes:
-      - name: localtime
-        hostPath:
-          path: /etc/localtime
-      imagePullSecrets:
-      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/attributes/gremlin-server-config.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/attributes/gremlin-server-config.rb
deleted file mode 100644 (file)
index 97fa6fd..0000000
+++ /dev/null
@@ -1 +0,0 @@
-node.default["aai-traversal-config"]["AAI_GREMLIN_SERVER_CONFIG_HOST_LIST"] = '[localhost]'
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/recipes/gremlin-server-config.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/recipes/gremlin-server-config.rb
deleted file mode 100644 (file)
index 2af775b..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-['gremlin-server-config.yaml'].each do |file|
-  template "#{node['aai-traversal-config']['PROJECT_HOME']}/bundleconfig/etc/appprops/#{file}" do
-    source "aai-traversal-app-config/gremlin-server-config.yaml"
-    owner "aaiadmin"
-    group "aaiadmin"
-    mode "0644"
-    variables(
-:AAI_GREMLIN_SERVER_CONFIG_HOST_LIST => node["aai-traversal-config"]["AAI_GREMLIN_SERVER_CONFIG_HOST_LIST"]
-      )
-  end
-end
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/templates/default/aai-traversal-app-config/gremlin-server-config.yaml b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/templates/default/aai-traversal-app-config/gremlin-server-config.yaml
deleted file mode 100644 (file)
index 23637a8..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-hosts: <%= @AAI_GREMLIN_SERVER_CONFIG_HOST_LIST %>
-port: 8182
-serializer: { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0 }
\ No newline at end of file
index 8baa3e4..98c61a7 100644 (file)
@@ -5,7 +5,6 @@
     "recipe[aai-traversal-config::aaiEventDMaaPPublisher]",
     "recipe[aai-traversal-config::titan-cached]",
     "recipe[aai-traversal-config::titan-realtime]",
-    "recipe[aai-traversal-config::gremlin-server-config]",
     "recipe[aai-traversal-config::aai-traversal-config]",
     "recipe[aai-traversal-config::aai-preferredRoute]"
   ]
index 5c64d25..99edba2 100644 (file)
@@ -5,7 +5,7 @@
                "aai-traversal-auth" : "= 1.0.0",
                "aai-traversal-config" : "= 1.0.0",
                "aai-traversal-process" : "= 1.0.0",
-       
+
                "aai-resources-auth" : "= 1.0.0",
                "aai-resources-config" : "= 1.0.0",
                "aai-resources-process" : "= 1.0.0"
@@ -57,7 +57,6 @@
                "TXN_ZOOKEEPER_QUORUM": "hbase.onap-aai",
                "TXN_ZOOKEEPER_PROPERTY_CLIENTPORT": "2181",
                "TXN_HBASE_ZOOKEEPER_ZNODE_PARENT": "/hbase",
-               "AAI_GREMLIN_SERVER_CONFIG_HOST_LIST" : "[gremlin.onap-aai]",
                "AAI_WORKLOAD_PREFERRED_ROUTE_KEY": "MR1",
                "STORAGE_HOSTNAME": "hbase.onap-aai",
                "STORAGE_HBASE_TABLE": "aaigraph.dev",
                "AAI_NOTIFICATION_EVENT_DEFAULT_SEQUENCE_NUMBER": "0",
                "AAI_NOTIFICATION_EVENT_DEFAULT_SEVERITY": "NORMAL",
                "AAI_NOTIFICATION_EVENT_DEFAULT_VERSION": "v11",
-               "AAI_NOTIFICATION_CURRENT_VERSION": "v11",              
+               "AAI_NOTIFICATION_CURRENT_VERSION": "v11",
                "RESOURCE_VERSION_ENABLE_FLAG": "true",
                "TXN_HBASE_TABLE_NAME": "aailogging.dev",
                "TXN_ZOOKEEPER_QUORUM": "hbase.onap-aai",
index fb8e91b..ac83173 100644 (file)
@@ -5,7 +5,7 @@
                "aai-traversal-auth" : "= 1.0.0",
                "aai-traversal-config" : "= 1.0.0",
                "aai-traversal-process" : "= 1.0.0",
-       
+
                "aai-resources-auth" : "= 1.0.0",
                "aai-resources-config" : "= 1.0.0",
                "aai-resources-process" : "= 1.0.0"
@@ -56,7 +56,6 @@
                "TXN_ZOOKEEPER_QUORUM": "localhost",
                "TXN_ZOOKEEPER_PROPERTY_CLIENTPORT": "2181",
                "TXN_HBASE_ZOOKEEPER_ZNODE_PARENT": "/hbase",
-               "AAI_GREMLIN_SERVER_CONFIG_HOST_LIST" : "[localhost]",
                "AAI_WORKLOAD_PREFERRED_ROUTE_KEY": "MR1",
                "STORAGE_HOSTNAME": "localhost",
                "STORAGE_HBASE_TABLE": "aaigraph.dev",
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-resources/docker-entrypoint.sh b/kubernetes/config/docker/init/src/config/aai/aai-resources/docker-entrypoint.sh
deleted file mode 100755 (executable)
index 059ef45..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# org.openecomp.aai
-# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
-# 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.
-# ============LICENSE_END=========================================================
-###
-
-cd /var/chef;
-
-CHEF_CONFIG_REPO=${CHEF_CONFIG_REPO:-aai-config};
-
-CHEF_GIT_URL=${CHEF_GIT_URL:-http://nexus.onap.org/r/aai};
-
-CHEF_CONFIG_GIT_URL=${CHEF_CONFIG_GIT_URL:-$CHEF_GIT_URL};
-CHEF_DATA_GIT_URL=${CHEF_DATA_GIT_URL:-$CHEF_GIT_URL};
-
-if [ ! -d "aai-config" ]; then
-
-    git clone --depth 1 -b ${CHEF_BRANCH} --single-branch ${CHEF_CONFIG_GIT_URL}/${CHEF_CONFIG_REPO}.git aai-config || {
-        echo "Error: Unable to clone the aai-config repo with url: ${CHEF_GIT_URL}/${CHEF_CONFIG_REPO}.git";
-        exit;
-    }
-
-    (cd aai-config/cookbooks/aai-resources/ && \
-        for f in $(ls); do mv $f ../; done && \
-        cd ../ && rmdir aai-resources);
-fi
-
-
-chef-solo \
-    -c /var/chef/aai-data/chef-config/dev/.knife/solo.rb \
-    -j /var/chef/aai-config/cookbooks/runlist-aai-resources.json \
-    -E ${AAI_CHEF_ENV};
-
-# TODO: If this runs, startup hangs and logs errors indicating aaiGraph.dev already exists in HBASE.
-# Commenting out until we figure out whether it is needed or not.
-# /opt/app/aai-resources/bin/createDBSchema.sh || {
-#     echo "Error: Unable to create the db schema, please check if the hbase host is configured and up";
-#     exit;
-# }
-
-
-java -cp ${CLASSPATH}:/opt/app/commonLibs/*:/opt/app/aai-resources/etc:/opt/app/aai-resources/lib/*:/opt/app/aai-resources/extJars/logback-access-1.1.7.jar:/opt/app/aai-resources/extJars/logback-core-1.1.7.jar:/opt/app/aai-resources/extJars/aai-core-${AAI_CORE_VERSION}.jar -server -XX:NewSize=512m -XX:MaxNewSize=512m -XX:SurvivorRatio=8 -XX:+DisableExplicitGC -verbose:gc -XX:+UseParNewGC -XX:+CMSParallelRemarkEnabled -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:-UseBiasedLocking -XX:ParallelGCThreads=4 -XX:LargePageSizeInBytes=128m -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -Dsun.net.inetaddr.ttl=180 -XX:+HeapDumpOnOutOfMemoryError -Dhttps.protocols=TLSv1.1,TLSv1.2 -DSOACLOUD_SERVICE_VERSION=1.0.1 -DAJSC_HOME=/opt/app/aai-resources/ -DAJSC_CONF_HOME=/opt/app/aai-resources/bundleconfig -DAJSC_SHARED_CONFIG=/opt/app/aai-resources/bundleconfig -DAFT_HOME=/opt/app/aai-resources -DAAI_CORE_VERSION=${AAI_CORE_VERSION} -Daai-core.version=${AAI_CORE_VERSION} -Dlogback.configurationFile=/opt/app/aai-resources/bundleconfig/etc/logback.xml -Xloggc:/opt/app/aai-resources/logs/ajsc-jetty/gc/graph-query_gc.log com.att.ajsc.runner.Runner context=/ port=8087 sslport=8447
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-traversal/docker-entrypoint.sh b/kubernetes/config/docker/init/src/config/aai/aai-traversal/docker-entrypoint.sh
deleted file mode 100755 (executable)
index 60268f6..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# org.openecomp.aai
-# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
-# 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.
-# ============LICENSE_END=========================================================
-###
-
-cd /var/chef;
-
-CHEF_CONFIG_REPO=${CHEF_CONFIG_REPO:-aai-config};
-
-CHEF_GIT_URL=${CHEF_GIT_URL:-http://nexus.onap.org/r/aai};
-
-CHEF_CONFIG_GIT_URL=${CHEF_CONFIG_GIT_URL:-$CHEF_GIT_URL};
-CHEF_DATA_GIT_URL=${CHEF_DATA_GIT_URL:-$CHEF_GIT_URL};
-
-if [ ! -d "aai-config" ]; then
-
-    git clone --depth 1 -b ${CHEF_BRANCH} --single-branch ${CHEF_CONFIG_GIT_URL}/${CHEF_CONFIG_REPO}.git aai-config || {
-       echo "Error: Unable to clone the aai-config repo with url: ${CHEF_GIT_URL}/${CHEF_CONFIG_REPO}.git";
-       exit;
-    }
-    
-    (cd aai-config/cookbooks/aai-traversal/ && \
-       for f in $(ls); do mv $f ../; done && \
-       cd ../ && rmdir aai-traversal);
-fi
-
-chef-solo \
-      -c /var/chef/aai-data/chef-config/dev/.knife/solo.rb \
-      -j /var/chef/aai-config/cookbooks/runlist-aai-traversal.json \
-      -E ${AAI_CHEF_ENV};
-
-java -cp ${CLASSPATH}:/opt/app/commonLibs/*:/opt/app/aai-traversal/etc:/opt/app/aai-traversal/lib/*:/opt/app/aai-traversal/extJars/logback-access-1.1.7.jar:/opt/app/aai-traversal/extJars/logback-core-1.1.7.jar:/opt/app/aai-traversal/extJars/aai-core-${AAI_CORE_VERSION}.jar -server -XX:NewSize=512m -XX:MaxNewSize=512m -XX:SurvivorRatio=8 -XX:+DisableExplicitGC -verbose:gc -XX:+UseParNewGC -XX:+CMSParallelRemarkEnabled -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:-UseBiasedLocking -XX:ParallelGCThreads=4 -XX:LargePageSizeInBytes=128m -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -Dsun.net.inetaddr.ttl=180 -XX:+HeapDumpOnOutOfMemoryError -Dhttps.protocols=TLSv1.1,TLSv1.2 -DSOACLOUD_SERVICE_VERSION=1.0.1 -DAJSC_HOME=/opt/app/aai-traversal/ -DAJSC_CONF_HOME=/opt/app/aai-traversal/bundleconfig -DAJSC_SHARED_CONFIG=/opt/app/aai-traversal/bundleconfig -DAFT_HOME=/opt/app/aai-traversal -DAAI_CORE_VERSION=${AAI_CORE_VERSION} -Daai-core.version=${AAI_CORE_VERSION} -Dlogback.configurationFile=/opt/app/aai-traversal/bundleconfig/etc/logback.xml -Xloggc:/opt/app/aai-traversal/logs/ajsc-jetty/gc/graph-query_gc.log com.att.ajsc.runner.Runner context=/ port=8086 sslport=8446
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/data-router/appconfig/model/aai_oxm_v11.xml b/kubernetes/config/docker/init/src/config/aai/data-router/appconfig/model/aai_oxm_v11.xml
new file mode 100644 (file)
index 0000000..ecf163e
--- /dev/null
@@ -0,0 +1,6307 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+  ============LICENSE_START=======================================================
+  org.openecomp.aai
+  ================================================================================
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  ================================================================================
+  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.
+  ============LICENSE_END=========================================================
+  -->
+
+<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v11" xml-mapping-metadata-complete="true">
+       <xml-schema element-form-default="QUALIFIED">
+               <xml-ns namespace-uri="http://org.openecomp.aai.inventory/v11" />
+       </xml-schema>
+       <java-types>
+               <java-type name="Inventory">
+                       <xml-root-element name="inventory" />
+                       <java-attributes>
+                               <xml-element java-attribute="search" name="search" type="inventory.aai.onap.org.v11.Search" />
+                               <xml-element java-attribute="actions" name="actions" type="inventory.aai.onap.org.v11.Actions" />
+                               <xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.onap.org.v11.CloudInfrastructure" />
+                               <xml-element java-attribute="externalSystem" name="external-system" type="inventory.aai.onap.org.v11.ExternalSystem" />
+                               <xml-element java-attribute="business" name="business" type="inventory.aai.onap.org.v11.Business" />
+                               <xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.onap.org.v11.ServiceDesignAndCreation" />
+                               <xml-element java-attribute="network" name="network" type="inventory.aai.onap.org.v11.Network" />
+                               <xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.onap.org.v11.AaiInternal" />
+                               <xml-element java-attribute="nodes" name="nodes" type="inventory.aai.onap.org.v11.Nodes"/>
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="Nodes">
+                       <xml-root-element name="nodes" />
+               </java-type>
+               <java-type name="Search">
+                       <xml-root-element name="search" />
+                       <java-attributes>
+                               <xml-element java-attribute="edgeTagQueryResult" name="edge-tag-query-result" type="inventory.aai.onap.org.v11.EdgeTagQueryResult" />
+                               <xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.onap.org.v11.EdgeTagQueryRequest" />
+                               <xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.onap.org.v11.SearchResults" />
+                               <xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.onap.org.v11.SdnZoneResponse" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="EdgeTagQueryResult">
+                       <xml-root-element name="edge-tag-query-result" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v11.TaggedInventoryItemList" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="TaggedInventoryItemList">
+                       <xml-root-element name="tagged-inventory-item-list" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItem" name="inventory-item" type="inventory.aai.onap.org.v11.InventoryItem" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="InventoryItem">
+                       <xml-root-element name="inventory-item" />
+                       <java-attributes>
+                               <xml-element java-attribute="inventoryItemType" name="inventory-item-type" type="java.lang.String" />
+                               <xml-element java-attribute="inventoryItemLink" name="inventory-item-link" type="java.lang.String" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="inventoryItemData" name="inventory-item-data" type="inventory.aai.onap.org.v11.InventoryItemData" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v11.TaggedInventoryItemList" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="InventoryItemData">
+                       <xml-root-element name="inventory-item-data" />
+                       <java-attributes>
+                               <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" />
+                               <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="EdgeTagQueryRequest">
+                       <xml-root-element name="edge-tag-query-request" />
+                       <java-attributes>
+                               <xml-element java-attribute="edgeTag" name="edge-tag" type="java.lang.String" />
+                               <xml-element java-attribute="resultDetail" name="result-detail" type="java.lang.String" />
+                               <xml-element java-attribute="startNodeType" name="start-node-type" type="java.lang.String" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="startNodeFilter" name="start-node-filter" type="inventory.aai.onap.org.v11.StartNodeFilter" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.onap.org.v11.IncludeNodeFilter" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.onap.org.v11.SecondaryFilter" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="StartNodeFilter">
+                       <xml-root-element name="start-node-filter" />
+                       <java-attributes>
+                               <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" />
+                               <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="IncludeNodeFilter">
+                       <xml-root-element name="include-node-filter" />
+                       <java-attributes>
+                               <xml-element java-attribute="includeNodeType" name="include-node-type" type="java.lang.String" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="SecondaryFilter">
+                       <xml-root-element name="secondary-filter" />
+                       <java-attributes>
+                               <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" />
+                               <xml-element java-attribute="filterType" name="filter-type" type="java.lang.String" />
+                               <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="SearchResults">
+                       <xml-root-element name="search-results" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="resultData" name="result-data" type="inventory.aai.onap.org.v11.ResultData" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="ResultData">
+                       <xml-root-element name="result-data" />
+                       <java-attributes>
+                               <xml-element java-attribute="resourceType" name="resource-type" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="The specific type of node in the A&amp;AI graph" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceLink" name="resource-link" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="The URL to the specific resource" />
+                                       </xml-properties>
+                               </xml-element>
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="SdnZoneResponse">
+                       <xml-root-element name="sdn-zone-response" />
+                       <java-attributes>
+                               <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v11.OamNetworks" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.onap.org.v11.AzAndDvsSwitches" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="AzAndDvsSwitches">
+                       <xml-root-element name="az-and-dvs-switches" />
+                       <java-attributes>
+                               <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v11.DvsSwitches" />
+                               <xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v11.AvailabilityZone" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="Actions">
+                       <xml-properties>
+                               <xml-property name="description" value="APIs that are more action related than REST (e.g., notify, update)." />
+                       </xml-properties>
+                       <xml-root-element name="actions" />
+                       <java-attributes>
+                               <xml-element java-attribute="update" name="update" type="inventory.aai.onap.org.v11.Update" />
+                               <xml-element java-attribute="notify" name="notify" type="inventory.aai.onap.org.v11.Notify" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="Update">
+                       <xml-properties>
+                               <xml-property name="description" value="Serves a PATCH like function.  Does not enforce concurrency control.  Clear each usage with AAI team." />
+                       </xml-properties>
+                       <xml-root-element name="update" />
+                       <java-attributes>
+                               <xml-element java-attribute="updateNodeType" name="update-node-type" required="true" type="java.lang.String" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="updateNodeKey" name="update-node-key" type="inventory.aai.onap.org.v11.UpdateNodeKey" />
+                               <xml-element java-attribute="updateNodeUri" name="update-node-uri" type="java.lang.String" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="action" name="action" type="inventory.aai.onap.org.v11.Action" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="Action">
+                       <xml-root-element name="action" />
+                       <java-attributes>
+                               <xml-element java-attribute="actionType" name="action-type" type="java.lang.String" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="actionData" name="action-data" type="inventory.aai.onap.org.v11.ActionData" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="ActionData">
+                       <xml-root-element name="action-data" />
+                       <java-attributes>
+                               <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" />
+                               <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="UpdateNodeKey">
+                       <xml-root-element name="update-node-key" />
+                       <java-attributes>
+                               <xml-element java-attribute="keyName" name="key-name" type="java.lang.String" />
+                               <xml-element java-attribute="keyValue" name="key-value" type="java.lang.String" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="Notify">
+                       <xml-root-element name="notify" />
+                       <java-attributes>
+                               <xml-element java-attribute="eventId" name="event-id" required="true" type="java.lang.String" />
+                               <xml-element java-attribute="nodeType" name="node-type" type="java.lang.String" />
+                               <xml-element java-attribute="eventTrigger" name="event-trigger" type="java.lang.String" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="keyData" name="key-data" type="inventory.aai.onap.org.v11.KeyData" />
+                               <xml-element java-attribute="selflink" name="selflink" type="java.lang.String" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="KeyData">
+                       <xml-root-element name="key-data" />
+                       <java-attributes>
+                               <xml-element java-attribute="keyName" name="key-name" type="java.lang.String" />
+                               <xml-element java-attribute="keyValue" name="key-value" type="java.lang.String" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="ExternalSystem">
+                       <xml-properties>
+                               <xml-property name="description" value="Namespace for external system." />
+                       </xml-properties>
+                       <xml-root-element name="external-system" />
+                       <java-attributes>
+                               <xml-element java-attribute="esrEmsList" name="esr-ems-list" type="inventory.aai.onap.org.v11.EsrEmsList" />
+                               <xml-element java-attribute="esrVnfmList" name="esr-vnfm-list" type="inventory.aai.onap.org.v11.EsrVnfmList" />
+                               <xml-element java-attribute="esrThirdpartySdncList" name="esr-thirdparty-sdnc-list" type="inventory.aai.onap.org.v11.EsrThirdpartySdncList" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="EsrEmsList">
+                       <xml-root-element name="esr-ems-list" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="esrEms" name="esr-ems" type="inventory.aai.onap.org.v11.EsrEms" />
+                       </java-attributes>
+            <xml-properties>
+                               <xml-property name="maximumDepth" value="0" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="EsrEms">
+                       <xml-root-element name="esr-ems" />
+                       <java-attributes>
+                               <xml-element java-attribute="emsId" name="ems-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique ID of EMS." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v11.EsrSystemInfoList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Persist EMS address information used by EMS driver." />
+                               <xml-property name="indexedProps" value="ems-id" />
+                               <xml-property name="searchable" value="ems-id" />
+                               <xml-property name="container" value="esr-ems-list" />
+                               <xml-property name="namespace" value="external-system" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="EsrVnfmList">
+                       <xml-root-element name="esr-vnfm-list" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="esrVnfm" name="esr-vnfm" type="inventory.aai.onap.org.v11.EsrVnfm" />
+                       </java-attributes>
+            <xml-properties>
+                               <xml-property name="maximumDepth" value="0" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="EsrVnfm">
+                       <xml-root-element name="esr-vnfm" />
+                       <java-attributes>
+                               <xml-element java-attribute="vnfmId" name="vnfm-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique ID of VNFM." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vimId" name="vim-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="indecate the VIM to deploy VNF." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="certificateUrl" name="certificate-url" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="certificate url of VNFM." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v11.EsrSystemInfoList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Persist VNFM address information used by VF-C." />
+                               <xml-property name="indexedProps" value="vnfm-id" />
+                               <xml-property name="searchable" value="vnfm-id" />
+                               <xml-property name="container" value="esr-vnfm-list" />
+                               <xml-property name="namespace" value="external-system" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="EsrThirdpartySdncList">
+                       <xml-root-element name="esr-thirdparty-sdnc-list" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="esrThirdpartySdnc" name="esr-thirdparty-sdnc" type="inventory.aai.onap.org.v11.EsrThirdpartySdnc" />
+                       </java-attributes>
+            <xml-properties>
+                               <xml-property name="maximumDepth" value="0" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="EsrThirdpartySdnc">
+                       <xml-root-element name="esr-thirdparty-sdnc" />
+                       <java-attributes>
+                               <xml-element java-attribute="thirdpartySdncId" name="thirdparty-sdnc-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique ID of SDNC." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="location" name="location" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="used for DC type to indicate the location of SDNC, such as Core or Edge." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="productName" name="product-name" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="password used to access SDNC server." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v11.EsrSystemInfoList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Persist SDNC address information used by ONAP SDNC." />
+                               <xml-property name="indexedProps" value="sdnc-id" />
+                               <xml-property name="searchable" value="sdnc-id" />
+                               <xml-property name="container" value="esr-thirdparty-sdnc-list" />
+                               <xml-property name="namespace" value="external-system" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="EsrSystemInfoList">
+                       <xml-root-element name="esr-system-info-list" />
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of persistent block-level external system auth info." />
+                       </xml-properties>
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="esrSystemInfo" name="esr-system-info" type="inventory.aai.onap.org.v11.EsrSystemInfo" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="maximumDepth" value="0" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="EsrSystemInfo">
+                       <xml-root-element name="esr-system-info" />
+                       <java-attributes>
+                               <xml-element java-attribute="esrSystemInfoId" name="esr-system-info-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique ID of esr system info." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="systemName" name="system-name" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="name of external system." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="type" name="type" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="type of external systems." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vendor" name="vendor" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="vendor of external systems." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="version" name="version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="version of external systems." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="serviceUrl" name="service-url" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="url used to access external systems." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="userName" name="user-name" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="username used to access external systems." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="password" name="password" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="password used to access external systems." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="systemType" name="system-type" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="it could be vim/vnfm/thirdparty-sdnc/ems-resource/ems-performance/ems-alarm." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="protocol" name="protocol" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="protocol of third party SDNC, for example netconf/snmp." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="sslCacert" name="ssl-cacert" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="ca file content if enabled ssl on auth-url." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element default-value="false" java-attribute="sslInsecure" name="ssl-insecure" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Whether to verify VIM's certificate." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ipAddress" name="ip-address" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="service IP of ftp server." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="port" name="port" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="service port of ftp server." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="cloudDomain" name="cloud-domain" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="domain info for authentication." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="defaultTenant" name="default-tenant" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="default tenant of VIM." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="passive" name="passive" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="description" value="ftp passive mode or not." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="remotepath" name="remote-path" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="resource or performance data file path." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="systemStatus" name="system-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the status of external system." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Persist common address information of external systems." />
+                               <xml-property name="indexedProps" value="esr-system-info-id,system-name,system-type" />
+                               <xml-property name="searchable" value="esr-system-info-id,system-name,system-type" />
+                               <xml-property name="container" value="esr-system-info-list" />
+                               <xml-property name="dependentOn" value="cloud-region,esr-ems,esr-vnfm,esr-thirdparty-sdnc" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="CloudInfrastructure">
+                       <xml-properties>
+                               <xml-property name="description" value="Namespace for cloud infrastructure." />
+                       </xml-properties>
+                       <xml-root-element name="cloud-infrastructure" />
+                       <java-attributes>
+                               <xml-element java-attribute="complexes" name="complexes" type="inventory.aai.onap.org.v11.Complexes" />
+                               <xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.onap.org.v11.CloudRegions" />
+                               <xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.onap.org.v11.NetworkProfiles" />
+                               <xml-element java-attribute="pservers" name="pservers" type="inventory.aai.onap.org.v11.Pservers" />
+                               <xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.onap.org.v11.VirtualDataCenters" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="CloudRegions">
+                       <xml-root-element name="cloud-regions" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="cloudRegion" name="cloud-region" type="inventory.aai.onap.org.v11.CloudRegion" />
+                       </java-attributes>
+            <xml-properties>
+                               <xml-property name="maximumDepth" value="0" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="CloudRegion">
+                       <xml-root-element name="cloud-region" />
+                       <java-attributes>
+                               <xml-element java-attribute="cloudOwner" name="cloud-owner" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="cloudRegionId" name="cloud-region-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Identifier used by the vendor for the region. Second part of composite key" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="cloudType" name="cloud-type" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Type of the cloud (e.g., openstack)" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ownerDefinedType" name="owner-defined-type" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Cloud-owner defined type indicator (e.g., dcp, lcp)" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="cloudRegionVersion" name="cloud-region-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Software version employed at the site.  NOTE - THIS FIELD IS NOT KEPT UP TO DATE." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="identityUrl" name="identity-url" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="URL of the keystone identity service" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="cloudZone" name="cloud-zone" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Zone where the cloud is homed.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="complexName" name="complex-name" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="complex name for cloud-region instance.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element default-value="false" required="true" java-attribute="sriovAutomation" name="sriov-automation" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="defaultValue" value="false"/>
+                                               <xml-property name="description" value="Whether the cloud region supports (true) or does not support (false) SR-IOV automation." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="cloudExtraInfo" name="cloud-extra-info" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="ESR inputs extra information about the VIM or Cloud which will be decoded by MultiVIM." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="cloudEpaCaps" name="cloud-epa-caps" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="MultiVIM will discover and expose EPA capabilities." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="volumeGroups" name="volume-groups" type="inventory.aai.onap.org.v11.VolumeGroups" />
+                               <xml-element java-attribute="tenants" name="tenants" type="inventory.aai.onap.org.v11.Tenants" />
+                               <xml-element java-attribute="flavors" name="flavors" type="inventory.aai.onap.org.v11.Flavors" />
+                               <xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.onap.org.v11.GroupAssignments" />
+                               <xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.onap.org.v11.Snapshots" />
+                               <xml-element java-attribute="images" name="images" type="inventory.aai.onap.org.v11.Images" />
+                               <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v11.DvsSwitches" />
+                               <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v11.OamNetworks" />
+                               <xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.onap.org.v11.AvailabilityZones" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                               <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v11.EsrSystemInfoList" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="vipIpv4AddressList" name="vip-ipv4-address-list" type="inventory.aai.onap.org.v11.VipIpv4AddressList" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="vipIpv6AddressList" name="vip-ipv6-address-list" type="inventory.aai.onap.org.v11.VipIpv6AddressList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation." />
+                               <xml-property name="indexedProps" value="cloud-owner,cloud-region-id,cloud-type,owner-defined-type" />
+                               <xml-property name="nameProps" value="owner-defined-type" />
+                               <xml-property name="container" value="cloud-regions" />
+                               <xml-property name="namespace" value="cloud-infrastructure" />
+                       </xml-properties>
+               </java-type>
+               <java-type name="VolumeGroups">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of persistent block-level storage." />
+                       </xml-properties>
+                       <xml-root-element name="volume-groups" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="volumeGroup" name="volume-group" type="inventory.aai.onap.org.v11.VolumeGroup" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="VolumeGroup">
+                       <xml-root-element name="volume-group" />
+                       <java-attributes>
+                               <xml-element java-attribute="volumeGroupId" name="volume-group-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique ID of volume-group." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="volumeGroupName" name="volume-group-name" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Name of the volume group." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Heat stack id corresponding to this volume-group" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Orchestration status of this volume-group" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vfModuleModelCustomizationId" name="vf-module-model-customization-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="helps relate the volume group to the vf-module whose components will require the volume group" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Persistent block-level storage." />
+                               <xml-property name="indexedProps" value="volume-group-name,vnf-type,heat-stack-id,volume-group-id" />
+                               <xml-property name="searchable" value="volume-group-id,volume-group-name" />
+                               <xml-property name="dependentOn" value="cloud-region" />
+                               <xml-property name="container" value="volume-groups" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="RelationshipList">
+                       <xml-root-element name="relationship-list" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="relationship" name="relationship" type="inventory.aai.onap.org.v11.Relationship" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="Relationship">
+                       <xml-root-element name="relationship" />
+                       <java-attributes>
+                               <xml-element java-attribute="relatedTo" name="related-to" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="A keyword provided by A&amp;AI to indicate type of node." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relatedLink" name="related-link" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="URL to the object in A&amp;AI." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="relationshipData" name="relationship-data" type="inventory.aai.onap.org.v11.RelationshipData" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.onap.org.v11.RelatedToProperty" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="RelatedToProperty">
+                       <xml-root-element name="related-to-property" />
+                       <java-attributes>
+                               <xml-element java-attribute="propertyKey" name="property-key" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Key part of a key/value pair" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Value part of a key/value pair" />
+                                       </xml-properties>
+                               </xml-element>
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="RelationshipData">
+                       <xml-root-element name="relationship-data" />
+                       <java-attributes>
+                               <xml-element java-attribute="relationshipKey" name="relationship-key" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="A keyword provided by A&amp;AI to indicate an attribute." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipValue" name="relationship-value" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Value of the attribute." />
+                                       </xml-properties>
+                               </xml-element>
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="Complexes">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of physical locations that can house cloud-regions." />
+                       </xml-properties>
+                       <xml-root-element name="complexes" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.onap.org.v11.Complex" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="maximumDepth" value="0" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="Complex">
+                       <xml-root-element name="complex" />
+                       <java-attributes>
+                               <xml-element java-attribute="physicalLocationId" name="physical-location-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique identifier for physical location, e.g., CLLI" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="dataCenterCode" name="data-center-code" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Data center code which can be an alternate way to identify a complex" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="complexName" name="complex-name" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Gamma complex name for LCP instance." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="identityUrl" name="identity-url" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="URL of the keystone identity service" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="physicalLocationType" name="physical-location-type" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Type, e.g., central office, data center." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="street1" name="street1" required="true" type="java.lang.String" />
+                               <xml-element java-attribute="street2" name="street2" type="java.lang.String" />
+                               <xml-element java-attribute="city" name="city" required="true" type="java.lang.String" />
+                               <xml-element java-attribute="state" name="state" type="java.lang.String" />
+                               <xml-element java-attribute="postalCode" name="postal-code" required="true" type="java.lang.String" />
+                               <xml-element java-attribute="country" name="country" required="true" type="java.lang.String" />
+                               <xml-element java-attribute="region" name="region" required="true" type="java.lang.String" />
+                               <xml-element java-attribute="latitude" name="latitude" type="java.lang.String" />
+                               <xml-element java-attribute="longitude" name="longitude" type="java.lang.String" />
+                               <xml-element java-attribute="elevation" name="elevation" type="java.lang.String" />
+                               <xml-element java-attribute="lata" name="lata" type="java.lang.String" />
+                               <xml-element java-attribute="ctagPools" name="ctag-pools" type="inventory.aai.onap.org.v11.CtagPools" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of physical locations that can house cloud-regions." />
+                               <xml-property name="indexedProps" value="identity-url,data-center-code,complex-name,physical-location-id" />
+                               <xml-property name="searchable" value="physical-location-id,data-center-code,complex-name,street1,street2,postal-code" />
+                               <xml-property name="uniqueProps" value="physical-location-id" />
+                               <xml-property name="container" value="complexes" />
+                               <xml-property name="namespace" value="cloud-infrastructure" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="CtagPools">
+                       <xml-root-element name="ctag-pools" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="ctagPool" name="ctag-pool" type="inventory.aai.onap.org.v11.CtagPool" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="CtagPool">
+                       <xml-root-element name="ctag-pool" />
+                       <java-attributes>
+                               <xml-element java-attribute="targetPe" name="target-pe" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="The Target provider edge router" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="availabilityZoneName" name="availability-zone-name" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Name of the availability zone" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ctagPoolPurpose" name="ctag-pool-purpose" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Describes what the intended purpose of this pool is." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ctagValues" name="ctag-values" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Comma separated list of ctags" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="A collection of C tags (vlan tags) grouped for a specific purpose." />
+                               <xml-property name="indexedProps" value="availability-zone-name" />
+                               <xml-property name="dependentOn" value="complex" />
+                               <xml-property name="container" value="ctag-pools" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="Tenants">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of openstack tenants." />
+                       </xml-properties>
+                       <xml-root-element name="tenants" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.onap.org.v11.Tenant" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="maximumDepth" value="0" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="Tenant">
+                       <xml-root-element name="tenant" />
+                       <java-attributes>
+                               <xml-element java-attribute="tenantId" name="tenant-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique id relative to the cloud-region." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="tenantName" name="tenant-name" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Readable name of tenant" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="tenantContext" name="tenant-context" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="This field will store the tenant context." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vservers" name="vservers" type="inventory.aai.onap.org.v11.Vservers" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Openstack tenant" />
+                               <xml-property name="nameProps" value="tenant-name" />
+                               <xml-property name="indexedProps" value="tenant-name,tenant-id,tenant-context" />
+                               <xml-property name="searchable" value="tenant-id,tenant-name" />
+                               <xml-property name="dependentOn" value="cloud-region" />
+                               <xml-property name="container" value="tenants" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="Vservers">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of virtual Servers, aka virtual machines or VMs." />
+                       </xml-properties>
+                       <xml-root-element name="vservers" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="vserver" name="vserver" type="inventory.aai.onap.org.v11.Vserver" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="Vserver">
+                       <xml-root-element name="vserver" />
+                       <java-attributes>
+                               <xml-element java-attribute="vserverId" name="vserver-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique identifier for this vserver relative to its tenant" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vserverName" name="vserver-name" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Name of vserver" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vserverName2" name="vserver-name2" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Alternative name of vserver" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vserverSelflink" name="vserver-selflink" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="URL to endpoint where AAI can get more details" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="defaultValue" value="false"/>
+                                               <xml-property name="description" value="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element default-value="false" required="true" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="defaultValue" value="false"/>
+                                               <xml-property name="description" value="Used to indicate whether closed loop function is enabled on this node" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="volumes" name="volumes" type="inventory.aai.onap.org.v11.Volumes" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                               <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Virtual Servers, aka virtual machine or VM." />
+                               <xml-property name="nameProps" value="vserver-name" />
+                               <xml-property name="indexedProps" value="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2" />
+                               <xml-property name="searchable" value="vserver-id,vserver-name,vserver-name2" />
+                               <xml-property name="dependentOn" value="tenant" />
+                               <xml-property name="container" value="vservers" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="LInterfaces">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of logical interfaces." />
+                       </xml-properties>
+                       <xml-root-element name="l-interfaces" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="lInterface" name="l-interface" type="inventory.aai.onap.org.v11.LInterface" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="LInterface">
+                       <xml-root-element name="l-interface" />
+                       <java-attributes>
+                               <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Name given to the interface" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="E.g., CUSTOMER, UPLINK, etc." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="v6WanLinkIp" name="v6-wan-link-ip" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Questionably placed - v6 ip addr of this interface (is in vr-lan-interface from Mary B." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="URL to endpoint where AAI can get more details" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="interfaceId" name="interface-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="ID of interface" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="macaddr" name="macaddr" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="MAC address for the interface" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="networkName" name="network-name" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Name of the network" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Whether A&amp;AI should be managing this interface of not. Could have value like CUSTOMER" />
+                                       </xml-properties>
+                               </xml-element>  
+                               <xml-element java-attribute="interfaceDescription" name="interface-description" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Human friendly text regarding this interface." />
+                                       </xml-properties>
+                               </xml-element>                  
+                               <xml-element java-attribute="isPortMirrored" name="is-port-mirrored" required="true" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="defaultValue" value="false"/>
+                                               <xml-property name="description" value="boolean indicatating whether or not port is a mirrored." />
+                                       </xml-properties>
+                               </xml-element>                                  
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="defaultValue" value="false"/>
+                                               <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Prov Status of the logical interface. Valid values [PREPROV/NVTPROV/PROV]." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element default-value="false" java-attribute="isIpUnnumbered" name="is-ip-unnumbered" required="true" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="defaultValue" value="false"/>
+                                               <xml-property name="description" value="Flag indicating the interface uses the IP Unnumbered configuration." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="allowedAddressPairs" name="allowed-address-pairs" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Freeform field for storing an ip address, list of ip addresses or a subnet block." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vlans" name="vlans" type="inventory.aai.onap.org.v11.Vlans" />
+                               <xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.onap.org.v11.SriovVfs" />
+                               <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v11.L3InterfaceIpv4AddressList" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v11.L3InterfaceIpv6AddressList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Logical interfaces, e.g., a vnic." />
+                               <xml-property name="indexedProps" value="macaddr,interface-id,interface-name,network-name" />
+                               <xml-property name="dependentOn" value="generic-vnf,newvce,p-interface,vserver,lag-interface" />
+                               <xml-property name="container" value="l-interfaces" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="SriovVfs">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of SR-IOV Virtual Functions." />
+                       </xml-properties>
+                       <xml-root-element name="sriov-vfs" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="sriovVf" name="sriov-vf" type="inventory.aai.onap.org.v11.SriovVf" />
+                       </java-attributes>
+               </java-type>
+               <java-type name="SriovVf">
+                       <xml-root-element name="sriov-vf" />
+                       <java-attributes>
+                               <xml-element java-attribute="pciId" name="pci-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="PCI ID used to identify the sriov-vf" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vfVlanFilter" name="vf-vlan-filter" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="This metadata provides option to specify list of VLAN filters applied on VF to pass the traffic to VM." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vfMacFilter" name="vf-mac-filter" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="When MAC filters are specified, VF-agent service configures VFs to do MAC level filtering before the traffic is passed to VM." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vfVlanStrip" name="vf-vlan-strip" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="description" value="When this field is set to true, VF will configured to strip the outer TAG before the traffic is passed to VM." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vfVlanAntiSpoofCheck" name="vf-vlan-anti-spoof-check" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="description" value="This option ensures anti VLAN spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vfMacAntiSpoofCheck" name="vf-mac-anti-spoof-check" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="description" value="This option ensures anti MAC spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vfMirrors" name="vf-mirrors" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="This option defines the set of Mirror objects which essentially mirrors the traffic from source to set of collector VNF Ports." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vfBroadcastAllow" name="vf-broadcast-allow" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows all broadcast traffic to reach the VM" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vfUnknownMulticastAllow" name="vf-unknown-multicast-allow" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows unknown multicast traffic to reach the VM" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vfUnknownUnicastAllow" name="vf-unknown-unicast-allow" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows unknown unicast traffic to reach the VM" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vfInsertStag" name="vf-insert-stag" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="description" value="This option, if set to true, instructs to insert outer tag after traffic comes out of VM." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vfLinkStatus" name="vf-link-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="This option is used to set the link status.  Valid values as of 1607 are on, off, and auto." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Neutron network id of the interface" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="SR-IOV Virtual Function (not to be confused with virtual network function)" />
+                               <xml-property name="indexedProps" value="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id" />
+                               <xml-property name="dependentOn" value="l-interface" />
+                               <xml-property name="container" value="sriov-vfs" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="L3InterfaceIpv4AddressList">
+                       <xml-root-element name="l3-interface-ipv4-address-list" />
+                       <java-attributes>
+                               <xml-element java-attribute="l3InterfaceIpv4Address" name="l3-interface-ipv4-address" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="IP address" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="l3InterfaceIpv4PrefixLength" name="l3-interface-ipv4-prefix-length" type="java.lang.Long">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Prefix length, 32 for single address" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Inner VLAN tag" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Outer VLAN tag" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Indicator of fixed or floating address" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Neutron network id of the interface that address belongs to" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Neutron id of subnet that address belongs to" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="IPv4 Address Range" />
+                               <xml-property name="indexedProps" value="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id" />
+                               <xml-property name="dependentOn" value="vlan,l-interface,vnfc" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="Vlans">
+                       <xml-root-element name="vlans" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="vlan" name="vlan" type="inventory.aai.onap.org.v11.Vlan" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="Vlan">
+                       <xml-root-element name="vlan" />
+                       <java-attributes>
+                               <xml-element java-attribute="vlanInterface" name="vlan-interface" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="String that identifies the interface" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Inner VLAN tag" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Outer VLAN tag" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Captures the numeric part of the speed" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Captures the units corresponding to the speed" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vlanDescription" name="vlan-description" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used to describe (the service associated with) the vlan" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="backdoorConnection" name="backdoor-connection" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Whether customer is going to use this VLAN for backdoor connection to another customer premise device." />
+                                       </xml-properties>
+                               </xml-element>                                  
+                               <xml-element java-attribute="vpnKey" name="vpn-key" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="This indicates the customers VPN ID associated with this vlan" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Status of a vnf's vlan interface, on which the customer circuit resides, mastered by SDN-C." />
+                                       </xml-properties>
+                               </xml-element>
+                                       <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="defaultValue" value="false"/>
+                                               <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Prov Status of the VLAN configuration related to a logical interface. Valid values [PREPROV/NVTPROV/PROV]." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element default-value="false" java-attribute="isIpUnnumbered" name="is-ip-unnumbered" required="true" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="defaultValue" value="false"/>
+                                               <xml-property name="description" value="Flag indicating the interface uses the IP Unnumbered configuration." />
+                                       </xml-properties>
+                               </xml-element>                  
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v11.L3InterfaceIpv4AddressList" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v11.L3InterfaceIpv6AddressList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Definition of vlan" />
+                               <xml-property name="indexedProps" value="vlan-interface,vlan-id-inner,vpn-key" />
+                               <xml-property name="dependentOn" value="l-interface" />
+                               <xml-property name="container" value="vlans" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="L3InterfaceIpv6AddressList">
+                       <xml-root-element name="l3-interface-ipv6-address-list" />
+                       <java-attributes>
+                               <xml-element java-attribute="l3InterfaceIpv6Address" name="l3-interface-ipv6-address" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="IP address" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="l3InterfaceIpv6PrefixLength" name="l3-interface-ipv6-prefix-length" type="java.lang.Long">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Prefix length, 128 for single address" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Inner VLAN tag" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Outer VLAN tag" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Indicator of fixed or floating address" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Neutron network id of the interface that address belongs to" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Neutron id of subnet that address belongs to" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="IPv6 Address Range" />
+                               <xml-property name="indexedProps" value="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id" />
+                               <xml-property name="dependentOn" value="vlan,l-interface,vnfc" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="Volumes">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of ephemeral Block storage volumes." />
+                       </xml-properties>
+                       <xml-root-element name="volumes" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="volume" name="volume" type="inventory.aai.onap.org.v11.Volume" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="Volume">
+                       <xml-root-element name="volume" />
+                       <java-attributes>
+                               <xml-element java-attribute="volumeId" name="volume-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique ID of block storage volume relative to the vserver." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="volumeSelflink" name="volume-selflink" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="URL to endpoint where AAI can get more details" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Ephemeral Block storage volume." />
+                               <xml-property name="indexedProps" value="volume-id" />
+                               <xml-property name="dependentOn" value="vserver" />
+                               <xml-property name="container" value="volumes" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="Flavors">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of openstack flavors." />
+                       </xml-properties>
+                       <xml-root-element name="flavors" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="flavor" name="flavor" type="inventory.aai.onap.org.v11.Flavor" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="Flavor">
+                       <xml-root-element name="flavor" />
+                       <java-attributes>
+                               <xml-element java-attribute="flavorId" name="flavor-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Flavor id, expected to be unique across cloud-region." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="flavorName" name="flavor-name" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Flavor name" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="flavorVcpus" name="flavor-vcpus" type="java.lang.Integer">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Number of CPUs" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="flavorRam" name="flavor-ram" type="java.lang.Integer">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Amount of memory" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="flavorDisk" name="flavor-disk" type="java.lang.Integer">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Disk space" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="flavorEphemeral" name="flavor-ephemeral" type="java.lang.Integer">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Amount of ephemeral disk space" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="flavorSwap" name="flavor-swap" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="amount of swap space allocation" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="flavorIsPublic" name="flavor-is-public" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="description" value="whether flavor is available to all users or private to the tenant it was created in." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="flavorSelflink" name="flavor-selflink" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="URL to endpoint where AAI can get more details" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="flavorDisabled" name="flavor-disabled" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Boolean as to whether this flavor is no longer enabled" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Openstack flavor." />
+                               <xml-property name="nameProps" value="flavor-name" />
+                               <xml-property name="indexedProps" value="flavor-name,flavor-id" />
+                               <xml-property name="dependentOn" value="cloud-region" />
+                               <xml-property name="container" value="flavors" />
+                       </xml-properties>
+               </java-type>
+               
+               <java-type name="Snapshots">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of openstack snapshots" />
+                       </xml-properties>
+                       <xml-root-element name="snapshots" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="snapshot" name="snapshot" type="inventory.aai.onap.org.v11.Snapshot" />
+                       </java-attributes>              
+               </java-type>
+               
+               <java-type name="Snapshot">
+                       <xml-root-element name="snapshot" />
+                       <java-attributes>
+                               <xml-element java-attribute="snapshotId" name="snapshot-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Snapshot id, this is the key UUID assoc associated in glance with the snapshots." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="snapshotName" name="snapshot-name" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Snapshot name" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="snapshotArchitecture" name="snapshot-architecture" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Operating system architecture" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="snapshotOsDistro" name="snapshot-os-distro" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="The common name of the operating system distribution in lowercase" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="snapshotOsVersion" name="snapshot-os-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="The operating system version as specified by the distributor." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="application" name="application" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="The application that the image instantiates." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="applicationVendor" name="application-vendor" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="The vendor of the application." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="The version of the application." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="snapshotSelflink" name="snapshot-selflink" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="URL to endpoint where AAI can get more details" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="prevSnapshotId" name="prev-snapshot-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="This field contains the UUID of the previous snapshot (if any)." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Openstack snapshot" />
+                               <xml-property name="nameProps" value="snapshot-name" />
+                               <xml-property name="uniqueProps" value="snapshot-id" />
+                               <xml-property name="indexedProps" value="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id" />
+                               <xml-property name="dependentOn" value="cloud-region" />
+                               <xml-property name="container" value="snapshots" />
+                       </xml-properties>       
+               </java-type>
+               
+               <java-type name="GroupAssignments">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of openstack group assignments" />
+                       </xml-properties>
+                       <xml-root-element name="group-assignments" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="groupAssignment" name="group-assignment" type="inventory.aai.onap.org.v11.GroupAssignment" />
+                       </java-attributes>
+               </java-type>
+               
+               <java-type name="GroupAssignment">
+                       <xml-root-element name="group-assignment" />
+                       <java-attributes>
+                               <xml-element java-attribute="groupId" name="group-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Group id, expected to be unique across cloud-region." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="groupType" name="group-type" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Group type - the type of group this instance refers to" />
+                                       </xml-properties>
+                               </xml-element>                          
+                               <xml-element java-attribute="groupName" name="group-name" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Group name - name assigned to the group" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="groupDescription" name="group-description" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Group description - description of the group" />
+                                       </xml-properties>
+                               </xml-element>  
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>          
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Openstack group-assignment used to store exclusivity groups (EG)." />
+                               <xml-property name="nameProps" value="group-name" />
+                               <xml-property name="indexedProps" value="group-id,group-type,group-name" />
+                               <xml-property name="searchable" value="group-id,group-name"/>
+                               <xml-property name="dependentOn" value="cloud-region" />
+                               <xml-property name="container" value="group-assignments" />
+                       </xml-properties>
+               </java-type>                    
+
+               <java-type name="Images">
+                       <xml-properties>
+                               <xml-property name="description" value="Collectio of Openstack images." />
+                       </xml-properties>
+                       <xml-root-element name="images" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="image" name="image" type="inventory.aai.onap.org.v11.Image" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="Image">
+                       <xml-root-element name="image" />
+                       <java-attributes>
+                               <xml-element java-attribute="imageId" name="image-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Image id, expected to be unique across cloud region" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="imageName" name="image-name" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Image name" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="imageArchitecture" name="image-architecture" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Operating system architecture." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="imageOsDistro" name="image-os-distro" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="The common name of the operating system distribution in lowercase" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="imageOsVersion" name="image-os-version" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="The operating system version as specified by the distributor." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="application" name="application" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="The application that the image instantiates." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="applicationVendor" name="application-vendor" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="The vendor of the application." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="The version of the application." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="imageSelflink" name="image-selflink" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="URL to endpoint where AAI can get more details" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                               <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v11.Metadata" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Openstack image." />
+                               <xml-property name="nameProps" value="image-name" />
+                               <xml-property name="indexedProps" value="application,image-name,application-vendor,image-id,application-version" />
+                               <xml-property name="dependentOn" value="cloud-region" />
+                               <xml-property name="container" value="images" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="Metadata">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of metadatum (key/value pairs)" />
+                       </xml-properties>
+                       <xml-root-element name="metadata" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="metadatum" name="metadatum" type="inventory.aai.onap.org.v11.Metadatum" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="Metadatum">
+                       <xml-root-element name="metadatum" />
+                       <java-attributes>
+                               <xml-element java-attribute="metaname" name="metaname" required="true" type="java.lang.String" xml-key="true" />
+                               <xml-element java-attribute="metaval" name="metaval" required="true" type="java.lang.String" />
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Key/value pairs" />
+                               <xml-property name="indexedProps" value="metaname" />
+                               <xml-property name="dependentOn" value="tenant,image,service-instance,connector,model" />
+                               <xml-property name="container" value="metadata" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="DvsSwitches">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of digital virtual switch metadata used for vmWare VCEs and GenericVnfs." />
+                       </xml-properties>
+                       <xml-root-element name="dvs-switches" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="dvsSwitch" name="dvs-switch" type="inventory.aai.onap.org.v11.DvsSwitch" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="DvsSwitch">
+                       <xml-root-element name="dvs-switch" />
+                       <java-attributes>
+                               <xml-element java-attribute="switchName" name="switch-name" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="DVS switch name" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vcenterUrl" name="vcenter-url" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="URL used to reach the vcenter" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. " />
+                               <xml-property name="indexedProps" value="vcenter-url,switch-name" />
+                               <xml-property name="dependentOn" value="cloud-region" />
+                               <xml-property name="container" value="dvs-switches" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="NetworkProfiles">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of network profiles" />
+                       </xml-properties>
+                       <xml-root-element name="network-profiles" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="networkProfile" name="network-profile" type="inventory.aai.onap.org.v11.NetworkProfile" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="NetworkProfile">
+                       <xml-root-element name="network-profile" />
+                       <java-attributes>
+                               <xml-element java-attribute="nmProfileName" name="nm-profile-name" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique name of network profile." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="communityString" name="community-string" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Encrypted SNMP community string" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Network profile populated by SDN-GP for SNMP" />
+                               <xml-property name="indexedProps" value="nm-profile-name" />
+                               <xml-property name="container" value="network-profiles" />
+                               <xml-property name="namespace" value="cloud-infrastructure" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="Pservers">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of compute hosts." />
+                       </xml-properties>
+                       <xml-root-element name="pservers" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.onap.org.v11.Pserver" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="maximumDepth" value="0" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="Pserver">
+                       <xml-root-element name="pserver" />
+                       <java-attributes>
+                               <xml-element java-attribute="hostname" name="hostname" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Value from executing hostname on the compute node." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ptniiEquipName" name="ptnii-equip-name" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="PTNII name" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="numberOfCpus" name="number-of-cpus" type="java.lang.Integer">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Number of cpus" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="diskInGigabytes" name="disk-in-gigabytes" type="java.lang.Integer">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Disk size, in GBs" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ramInMegabytes" name="ram-in-megabytes" type="java.lang.Integer">
+                                       <xml-properties>
+                                               <xml-property name="description" value="RAM size, in MBs" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="equipType" name="equip-type" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Equipment type.  Source of truth should define valid values." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="equipVendor" name="equip-vendor" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Equipment vendor.  Source of truth should define valid values." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="equipModel" name="equip-model" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Equipment model.  Source of truth should define valid values." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="fqdn" name="fqdn" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Fully-qualified domain name" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="pserverSelflink" name="pserver-selflink" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="URL to endpoint where AAI can get more details" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used to configure device, also used for troubleshooting and is IP used for traps generated by device." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="serialNumber" name="serial-number" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Serial number, may be queried" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ipaddressV4Loopback0" name="ipaddress-v4-loopback-0" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="IPV4 Loopback 0 address" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ipaddressV6Loopback0" name="ipaddress-v6-loopback-0" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="IPV6 Loopback 0 address" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ipaddressV4Aim" name="ipaddress-v4-aim" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="IPV4 AIM address" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ipaddressV6Aim" name="ipaddress-v6-aim" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="IPV6 AIM address" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ipaddressV6Oam" name="ipaddress-v6-oam" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="IPV6 OAM address" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="invStatus" name="inv-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="pserverId" name="pserver-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="ID of Pserver" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="internetTopology" name="internet-topology" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="internet topology of Pserver" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="defaultValue" value="false"/>
+                                               <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="pserverName2" name="pserver-name2" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="alternative pserver name" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="purpose" name="purpose" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="purpose of pserver" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Indicates who owns and or manages the device." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="hostProfile" name="host-profile" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="The host profile that defines the configuration of the pserver." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                               <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v11.PInterfaces" />
+                               <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v11.LagInterfaces" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver." />
+                               <xml-property name="nameProps" value="pserver-name2" />
+                               <xml-property name="indexedProps" value="hostname,in-maint,pserver-id,pserver-name2,inv-status" />
+                               <xml-property name="searchable" value="hostname,pserver-name2,pserver-id,ipv4-oam-address" />
+                               <xml-property name="container" value="pservers" />
+                               <xml-property name="namespace" value="cloud-infrastructure" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="PInterfaces">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of physical interfaces." />
+                       </xml-properties>
+                       <xml-root-element name="p-interfaces" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="pInterface" name="p-interface" type="inventory.aai.onap.org.v11.PInterface" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="PInterface">
+                       <xml-root-element name="p-interface" />
+                       <java-attributes>
+                               <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Name that identifies the physical interface" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Captures the numeric part of the speed" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Captures the units corresponding to the speed" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="portDescription" name="port-description" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Nature of the services and connectivity on this port." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="equipmentIdentifier" name="equipment-identifier" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="CLEI or other specification for p-interface hardware." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Role specification for p-interface hardware." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="interfaceType" name="interface-type" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Indicates the physical properties of the interface." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="macAddress" name="mac-addresss" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="MAC Address of the p-interface." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="defaultValue" value="false"/>
+                                               <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="invStatus" name="inv-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="inventory status" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                               <xml-element java-attribute="sriovPfs" name="sriov-pfs" type="inventory.aai.onap.org.v11.SriovPfs" />
+                               <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Physical interface (e.g., nic)" />
+                               <xml-property name="indexedProps" value="interface-name,prov-status" />
+                               <xml-property name="nameProps" value="prov-status" />
+                               <xml-property name="dependentOn" value="vpls-pe,pserver,pnf" />
+                               <xml-property name="container" value="p-interfaces" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="LagInterfaces">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of link aggregate interfaces." />
+                       </xml-properties>
+                       <xml-root-element name="lag-interfaces" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="lagInterface" name="lag-interface" type="inventory.aai.onap.org.v11.LagInterface" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="LagInterface">
+                       <xml-root-element name="lag-interface" />
+                       <java-attributes>
+                               <xml-element java-attribute="interfaceName" name="interface-name" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Name that identifies the link aggregate interface" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="interfaceDescription" name="interface-description" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Human friendly text regarding this interface." />
+                                       </xml-properties>
+                               </xml-element>  
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Captures the numeric part of the speed" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Captures the units corresponding to the speed" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="interfaceId" name="interface-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="ID of interface" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Role assigned to this Interface, should use values as defined in ECOMP Yang models." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="defaultValue" value="false"/>
+                                               <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                               <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Link aggregate interface" />
+                               <xml-property name="indexedProps" value="interface-name,interface-id,interface-role" />
+                               <xml-property name="dependentOn" value="generic-vnf,pserver,vpls-pe,pnf" />
+                               <xml-property name="container" value="lag-interfaces" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="OamNetworks">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of OAM networks, to be deprecated shortly.  Do not use for new purposes. " />
+                       </xml-properties>
+                       <xml-root-element name="oam-networks" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="oamNetwork" name="oam-network" type="inventory.aai.onap.org.v11.OamNetwork" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="OamNetwork">
+                       <xml-root-element name="oam-network" />
+                       <java-attributes>
+                               <xml-element java-attribute="networkUuid" name="network-uuid" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="UUID of the network. Unique across a cloud-region" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="networkName" name="network-name" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Name of the network." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="cvlanTag" name="cvlan-tag" required="true" type="java.lang.Long">
+                                       <xml-properties>
+                                               <xml-property name="description" value="cvlan-id" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ipv4OamGatewayAddress" name="ipv4-oam-gateway-address" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ipv4OamGatewayAddressPrefixLength" name="ipv4-oam-gateway-address-prefix-length" type="java.lang.Integer">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="OAM network, to be deprecated shortly.  Do not use for new purposes. " />
+                               <xml-property name="nameProps" value="network-name" />
+                               <xml-property name="indexedProps" value="cvlan-tag,network-uuid,network-name" />
+                               <xml-property name="dependentOn" value="cloud-region" />
+                               <xml-property name="container" value="oam-networks" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="AvailabilityZones">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of availability zones" />
+                       </xml-properties>
+                       <xml-root-element name="availability-zones" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v11.AvailabilityZone" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="AvailabilityZone">
+                       <xml-root-element name="availability-zone" />
+                       <java-attributes>
+                               <xml-element java-attribute="availabilityZoneName" name="availability-zone-name" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Name of the availability zone.  Unique across a cloud region" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="hypervisorType" name="hypervisor-type" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Type of hypervisor.  Source of truth should define valid values." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="State that indicates whether the availability zone should be used, etc.  Source of truth should define valid values." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Availability zone, a collection of compute hosts/pservers" />
+                               <xml-property name="indexedProps" value="availability-zone-name" />
+                               <xml-property name="dependentOn" value="cloud-region" />
+                               <xml-property name="container" value="availability-zones" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="VirtualDataCenters">
+                       <xml-properties>
+                               <xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context" />
+                       </xml-properties>
+                       <xml-root-element name="virtual-data-centers" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="virtualDataCenter" name="virtual-data-center" type="inventory.aai.onap.org.v11.VirtualDataCenter" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="VirtualDataCenter">
+                       <xml-root-element name="virtual-data-center" />
+                       <java-attributes>
+                               <xml-element java-attribute="vdcId" name="vdc-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique ID of the vdc" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vdcName" name="vdc-name" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Name of the virtual data center" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context" />
+                               <xml-property name="nameProps" value="vdc-name" />
+                               <xml-property name="indexedProps" value="vdc-name,vdc-id" />
+                               <xml-property name="container" value="virtual-data-centers" />
+                               <xml-property name="namespace" value="cloud-infrastructure" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="Business">
+                       <xml-properties>
+                               <xml-property name="description" value="Namespace for business related constructs" />
+                       </xml-properties>
+                       <xml-root-element name="business" />
+                       <java-attributes>
+                               <xml-element java-attribute="connectors" name="connectors" type="inventory.aai.onap.org.v11.Connectors" />
+                               <xml-element java-attribute="customers" name="customers" type="inventory.aai.onap.org.v11.Customers" />
+                               <xml-element java-attribute="linesOfBusiness" name="lines-of-business" type="inventory.aai.onap.org.v11.LinesOfBusiness" />
+                               <xml-element java-attribute="owningEntities" name="owning-entities" type="inventory.aai.onap.org.v11.OwningEntities" />
+                               <xml-element java-attribute="platforms" name="platforms" type="inventory.aai.onap.org.v11.Platforms" />
+                               <xml-element java-attribute="projects" name="projects" type="inventory.aai.onap.org.v11.Projects" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="Projects">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of projects" />
+                       </xml-properties>
+                       <xml-root-element name="projects" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="project" name="project" type="inventory.aai.onap.org.v11.Project" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="Project">
+                       <xml-root-element name="project" />
+                       <java-attributes>
+                               <xml-element java-attribute="projectName" name="project-name" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Name of the project deploying a service" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="describes the project" />
+                               <xml-property name="indexedProps" value="project-name" />
+                               <xml-property name="uniqueProps" value="project-name" />
+                               <xml-property name="container" value="projects" />
+                               <xml-property name="namespace" value="business" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="Connectors">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets" />
+                       </xml-properties>
+                       <xml-root-element name="connectors" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="connector" name="connector" type="inventory.aai.onap.org.v11.Connector" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="Connector">
+                       <xml-root-element name="connector" />
+                       <java-attributes>
+                               <xml-element java-attribute="resourceInstanceId" name="resource-instance-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique id of resource instance." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC model id for this resource or service model." />
+                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="requires" value="model-version-id" />
+                                               <xml-property name="dbAlias" value="model-invariant-id-local" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="requires" value="model-invariant-id" />
+                                               <xml-property name="dbAlias" value="model-version-id-local" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                                               <xml-property name="visibility" value="internal" />
+                                               <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                               <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v11.Metadata" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets" />
+                               <xml-property name="indexedProps" value="resource-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version" />
+                               <xml-property name="container" value="connectors" />
+                               <xml-property name="namespace" value="business" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="Customers">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information." />
+                       </xml-properties>
+                       <xml-root-element name="customers" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.onap.org.v11.Customer" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="maximumDepth" value="0" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="Customer">
+                       <xml-root-element name="customer" />
+                       <java-attributes>
+                               <xml-element java-attribute="globalCustomerId" name="global-customer-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Global customer id used across ECOMP to uniquely identify customer." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="subscriberName" name="subscriber-name" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Subscriber name, an alternate way to retrieve a customer." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="subscriberType" name="subscriber-type" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Subscriber type, a way to provide VID with only the INFRA customers." />
+                                               <xml-property name="defaultValue" value="CUST" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="serviceSubscriptions" name="service-subscriptions" type="inventory.aai.onap.org.v11.ServiceSubscriptions" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="customer identifiers to provide linkage back to BSS information." />
+                               <xml-property name="nameProps" value="subscriber-name" />
+                               <xml-property name="indexedProps" value="subscriber-name,global-customer-id,subscriber-type" />
+                               <xml-property name="searchable" value="global-customer-id,subscriber-name" />
+                               <xml-property name="uniqueProps" value="global-customer-id" />
+                               <xml-property name="container" value="customers" />
+                               <xml-property name="namespace" value="business" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="LinesOfBusiness">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of lines-of-business" />
+                       </xml-properties>
+                       <xml-root-element name="lines-of-business" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="lineOfBusiness" name="line-of-business" type="inventory.aai.onap.org.v11.LineOfBusiness" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="LineOfBusiness">
+                       <xml-root-element name="line-of-business" />
+                       <java-attributes>
+                               <xml-element java-attribute="lineOfBusinessName" name="line-of-business-name" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Name of the line-of-business (product)" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="describes a line-of-business" />
+                               <xml-property name="indexedProps" value="line-of-business-name" />
+                               <xml-property name="uniqueProps" value="line-of-business-name" />
+                               <xml-property name="container" value="lines-of-business" />
+                               <xml-property name="namespace" value="business" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="OwningEntities">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of owning-entities" />
+                       </xml-properties>
+                       <xml-root-element name="owning-entities" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="owningEntity" name="owning-entity" type="inventory.aai.onap.org.v11.OwningEntity" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="OwningEntity">
+                       <xml-root-element name="owning-entity" />
+                       <java-attributes>
+                               <xml-element java-attribute="owningEntityId" name="owning-entity-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="UUID of an owning entity" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="owningEntityName" name="owning-entity-name" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Owning entity name" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="describes an owning-entity" />
+                               <xml-property name="indexedProps" value="owning-entity-id, owning-entity-name" />
+                               <xml-property name="searchable" value="owning-entity-id" />
+                               <xml-property name="uniqueProps" value="owning-entity-id, owning-entity-name" />
+                               <xml-property name="container" value="owning-entities" />
+                               <xml-property name="namespace" value="business" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="Platforms">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of platforms" />
+                       </xml-properties>
+                       <xml-root-element name="platforms" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="platform" name="platform" type="inventory.aai.onap.org.v11.Platform" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="Platform">
+                       <xml-root-element name="platform" />
+                       <java-attributes>
+                               <xml-element java-attribute="platformName" name="platform-name" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Name of the platform" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="describes a platform" />
+                               <xml-property name="indexedProps" value="platform-name" />
+                               <xml-property name="uniqueProps" value="platform-name" />
+                               <xml-property name="container" value="platforms" />
+                               <xml-property name="namespace" value="business" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="ServiceSubscriptions">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of objects that group service instances." />
+                       </xml-properties>
+                       <xml-root-element name="service-subscriptions" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="serviceSubscription" name="service-subscription" type="inventory.aai.onap.org.v11.ServiceSubscription" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="ServiceSubscription">
+                       <xml-root-element name="service-subscription" />
+                       <java-attributes>
+                               <xml-element java-attribute="serviceType" name="service-type" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Value defined by orchestration to identify this service across ECOMP." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="tempUbSubAccountId" name="temp-ub-sub-account-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This property will be deleted from A&amp;AI in the near future. Only stop gap solution." />
+                    </xml-properties>
+                </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="serviceInstances" name="service-instances" type="inventory.aai.onap.org.v11.ServiceInstances">
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Object that group service instances." />
+                               <xml-property name="indexedProps" value="service-type" />
+                               <xml-property name="dependentOn" value="customer" />
+                               <xml-property name="container" value="service-subscriptions" />
+                               <xml-property name="crossEntityReference" value="service-instance,service-type" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="ServiceInstances">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of service instances" />
+                       </xml-properties>
+                       <xml-root-element name="service-instances" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="serviceInstance" name="service-instance" type="inventory.aai.onap.org.v11.ServiceInstance" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="ServiceInstance">
+                       <xml-root-element name="service-instance" />
+                       <java-attributes>
+                               <xml-element java-attribute="serviceInstanceId" name="service-instance-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Uniquely identifies this instance of a service" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="serviceInstanceName" name="service-instance-name" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="This field will store a name assigned to the service-instance." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="serviceType" name="service-type" required="false" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="String capturing type of service." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="serviceRole" name="service-role" required="false" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="String capturing the service role." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="environmentContext" name="environment-context" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="This field will store the environment context assigned to the service-instance." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="workloadContext" name="workload-context" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="This field will store the workload context assigned to the service-instance." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC model id for this resource or service model." />
+                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="requires" value="model-version-id" />
+                                               <xml-property name="dbAlias" value="model-invariant-id-local" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="requires" value="model-invariant-id" />
+                                               <xml-property name="dbAlias" value="model-version-id-local" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                                               <xml-property name="visibility" value="internal" />
+                                               <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="bandwidthTotal" name="bandwidth-total" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Indicates the total bandwidth to be used for this service." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="bandwidthUpWan1" name="bandwidth-up-wan1" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN1 port of the physical device." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="bandwidthDownWan1" name="bandwidth-down-wan1" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN1 port of the physical device." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="bandwidthUpWan2" name="bandwidth-up-wan2" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN2 port of the physical device." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="bandwidthDownWan2" name="bandwidth-down-wan2" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN2 port of the physical device." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vhnPortalUrl" name="vhn-portal-url" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="URL customers will use to access the vHN Portal." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="serviceInstanceLocationId" name="service-instance-location-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="An identifier that customers assign to the location where this service is being used." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Path to the controller object." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Orchestration status of this service." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                               <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v11.Metadata" />
+                               <xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.onap.org.v11.AllottedResources" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Instance of a service" />
+                               <xml-property name="indexedProps" value="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status,environment-context,workload-context" />
+                               <xml-property name="nameProps" value="service-instance-name" />
+                               <xml-property name="searchable" value="service-instance-id,service-instance-name" />
+                               <xml-property name="uniqueProps" value="service-instance-id" />
+                               <xml-property name="dependentOn" value="service-subscription" />
+                               <xml-property name="container" value="service-instances" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="ServiceDesignAndCreation">
+                       <xml-properties>
+                               <xml-property name="description" value="Namespace for objects managed by ASDC" />
+                       </xml-properties>
+                       <xml-root-element name="service-design-and-creation" />
+                       <java-attributes>
+                               <xml-element java-attribute="vnfImages" name="vnf-images" type="inventory.aai.onap.org.v11.VnfImages" />
+                               <xml-element java-attribute="services" name="services" type="inventory.aai.onap.org.v11.Services" />
+                               <xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.onap.org.v11.ServiceCapabilities" />
+                               <xml-element java-attribute="models" name="models" type="inventory.aai.onap.org.v11.Models" />
+                               <xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.onap.org.v11.NamedQueries" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="VnfImages">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of image objects that pertain to a VNF that doesn't have associated vservers.  This is a kludge." />
+                       </xml-properties>
+                       <xml-root-element name="vnf-images" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="vnfImage" name="vnf-image" type="inventory.aai.onap.org.v11.VnfImage" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="VnfImage">
+                       <xml-root-element name="vnf-image" />
+                       <java-attributes>
+                               <xml-element java-attribute="vnfImageUuid" name="vnf-image-uuid" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique ID of this asset" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="application" name="application" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="The application that the image instantiates." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="applicationVendor" name="application-vendor" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="The vendor of the application." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="The version of the application." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="URL to endpoint where AAI can get more details" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge." />
+                               <xml-property name="indexedProps" value="application,vnf-image-uuid,application-vendor,application-version" />
+                               <xml-property name="uniqueProps" value="vnf-image-uuid" />
+                               <xml-property name="container" value="vnf-images" />
+                               <xml-property name="namespace" value="service-design-and-creation" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="Services">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of service model definitions.  Likely to be deprecated in favor of models from ASDC." />
+                       </xml-properties>
+                       <xml-root-element name="services" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="service" name="service" type="inventory.aai.onap.org.v11.Service" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="Service">
+                       <xml-root-element name="service" />
+                       <java-attributes>
+                               <xml-element java-attribute="serviceId" name="service-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="serviceDescription" name="service-description" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Description of the service" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="serviceSelflink" name="service-selflink" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="URL to endpoint where AAI can get more details" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="serviceVersion" name="service-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="service version" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services." />
+                               <xml-property name="indexedProps" value="service-description,service-id" />
+                               <xml-property name="container" value="services" />
+                               <xml-property name="namespace" value="service-design-and-creation" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="ServiceCapabilities">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of service capabilities." />
+                       </xml-properties>
+                       <xml-root-element name="service-capabilities" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="serviceCapability" name="service-capability" type="inventory.aai.onap.org.v11.ServiceCapability" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="ServiceCapability">
+                       <xml-root-element name="service-capability" />
+                       <java-attributes>
+                               <xml-element java-attribute="serviceType" name="service-type" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this." />
+                               <xml-property name="indexedProps" value="service-type,vnf-type" />
+                               <xml-property name="container" value="service-capabilities" />
+                               <xml-property name="namespace" value="service-design-and-creation" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="Network">
+                       <xml-properties>
+                               <xml-property name="description" value="Namespace for network inventory resources." />
+                       </xml-properties>
+                       <xml-root-element name="network" />
+                       <java-attributes>
+                               <xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.onap.org.v11.LogicalLinks" />
+                               <xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.onap.org.v11.SitePairSets" />
+                               <xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.onap.org.v11.VpnBindings" />
+                               <xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.onap.org.v11.VplsPes" />
+                               <xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.onap.org.v11.MulticastConfigurations" />
+                               <xml-element java-attribute="vces" name="vces" type="inventory.aai.onap.org.v11.Vces" />
+                               <xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.onap.org.v11.Vnfcs" />
+                               <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.onap.org.v11.L3Networks" />
+                               <xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.onap.org.v11.NetworkPolicies" />
+                               <xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.onap.org.v11.GenericVnfs" />
+                               <xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.onap.org.v11.LagLinks" />
+                               <xml-element java-attribute="newvces" name="newvces" type="inventory.aai.onap.org.v11.Newvces" />
+                               <xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.onap.org.v11.Pnfs" />
+                               <xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.onap.org.v11.PhysicalLinks" />
+                               <xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.onap.org.v11.IpsecConfigurations" />
+                               <xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.onap.org.v11.RouteTableReferences" />
+                               <xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.onap.org.v11.InstanceGroups" />
+                               <xml-element java-attribute="zones" name="zones" type="inventory.aai.onap.org.v11.Zones" />
+                       </java-attributes>
+               </java-type>
+        <java-type name="Configurations">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of configurations" />
+                       </xml-properties>
+                       <xml-root-element name="configurations" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="configuration" name="configurations" type="inventory.aai.onap.org.v11.Configuration" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="Configuration">
+                       <xml-root-element name="configuration" />
+                       <java-attributes>
+                               <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Indicates the entity that will manage this feature. Could be an organization or the name of the application as well." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="configurationId" name="configuration-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="UUID assigned to configuration." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="configurationName" name="configuration-name" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Name of the configuration." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="configurationType" name="configuration-type" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="port-mirroring-configuration." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="configurationSubType" name="configuration-sub-type" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="vprobe, pprobe." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC model id for this resource or service model." />
+                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="requires" value="model-version-id" />
+                                               <xml-property name="dbAlias" value="model-invariant-id-local" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="requires" value="model-invariant-id" />
+                                               <xml-property name="dbAlias" value="model-version-id-local" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="orchestrationStatus" name="orchestration-status" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Orchestration status of the configuration." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="operationalStatus" name="operational-status" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Indicator for whether the resource is considered operational." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="configurationSelflink" name="configuration-selflink" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="URL to endpoint where AAI can get more details from SDN-GC." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelCustomizationId" name="model-customization-id" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="id of  the configuration used to customize the resource" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                               <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v11.Metadata" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Port Mirror Configuration." />
+                               <xml-property name="indexedProps" value="configuration-id,model-invariant-id,model-version-id" />
+                               <xml-property name="uniqueProps" value="configuration-id" />
+                               <xml-property name="container" value="configurations" />
+                               <xml-property name="namespace" value="network" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="LogicalLinks">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of logical connections" />
+                       </xml-properties>
+                       <xml-root-element name="logical-links" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="logicalLink" name="logical-link" type="inventory.aai.onap.org.v11.LogicalLink" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="LogicalLink">
+                       <xml-root-element name="logical-link" />
+                       <java-attributes>
+                               <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="defaultValue" value="false"/>
+                                               <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="linkType" name="link-type" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Type of logical link, e.g., evc" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Captures the numeric part of the speed" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Captures the units corresponding to the speed" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="v4, v6, or ds for dual stack" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="routingProtocol" name="routing-protocol" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="For example, static or BGP" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC model id for this resource or service model." />
+                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="requires" value="model-version-id" />
+                                               <xml-property name="dbAlias" value="model-invariant-id-local" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="requires" value="model-invariant-id" />
+                                               <xml-property name="dbAlias" value="model-version-id-local" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                                               <xml-property name="visibility" value="internal" />
+                                               <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Indication of operational status of the logical link." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="linkRole" name="link-role" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Indication of the network use of the logical link." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="linkName2" name="link-name2" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Alias or alternate name (CLCI or D1 name)." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="linkId" name="link-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="UUID of the logical-link, SDNC generates this." />
+                                       </xml-properties>
+                               </xml-element>
+                                       <xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Circuit id" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="purpose" name="purpose" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Reason for this entity, role it is playing" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Logical links generally connect l-interfaces but are used to express logical connectivity between two points" />
+                               <xml-property name="indexedProps" value="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose" />
+                               <xml-property name="uniqueProps" value="link-id" />
+                               <xml-property name="container" value="logical-links" />
+                               <xml-property name="namespace" value="network" />
+                               <xml-property name="searchable" value="link-name" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="SitePairSets">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of sets of instances for probes related to generic-vnf" />
+                       </xml-properties>
+                       <xml-root-element name="site-pair-sets" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="sitePairSet" name="site-pair-set" type="inventory.aai.onap.org.v11.SitePairSet" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="SitePairSet">
+                       <xml-root-element name="site-pair-set" />
+                       <java-attributes>
+                               <xml-element java-attribute="sitePairSetId" name="site-pair-set-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique id of site pair set." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="routingInstances" name="routing-instances" type="inventory.aai.onap.org.v11.RoutingInstances" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Set of instances for probes used to measure service level agreements" />
+                               <xml-property name="indexedProps" value="site-pair-set-id" />
+                               <xml-property name="uniqueProps" value="site-pair-set-id" />
+                               <xml-property name="container" value="site-pair-sets" />
+                               <xml-property name="namespace" value="network" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="RoutingInstances">
+                       <xml-properties>
+                               <xml-property name="description" value="set of probes related to generic-vnf routing instance" />
+                       </xml-properties>
+                       <xml-root-element name="routing-instances" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="routingInstance" name="routing-instance" type="inventory.aai.onap.org.v11.RoutingInstance" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="RoutingInstance">
+                       <xml-root-element name="routing-instance" />
+                       <java-attributes>
+                               <xml-element java-attribute="routingInstanceId" name="routing-instance-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique id of routing instance" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="rpmOwner" name="rpm-owner" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="rpm owner" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="sitePairs" name="site-pairs" type="inventory.aai.onap.org.v11.SitePairs" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="indexedProps" value="routing-instance-id" />
+                               <xml-property name="dependentOn" value="site-pair-set" />
+                               <xml-property name="container" value="routing-instances" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="SitePairs">
+                       <xml-properties>
+                               <xml-property name="description" value="probe within a set" />
+                       </xml-properties>
+                       <xml-root-element name="site-pairs" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="sitePair" name="site-pair" type="inventory.aai.onap.org.v11.SitePair" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="SitePair">
+                       <xml-root-element name="site-pair" />
+                       <java-attributes>
+                               <xml-element java-attribute="sitePairId" name="site-pair-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="unique identifier of probe" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="sourceIp" name="source-ip" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Prefix address" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="destinationIp" name="destination-ip" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Prefix address" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="ip version, v4, v6" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="destinationHostname" name="destination-hostname" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Hostname of the destination equipment to which SLAs are measured against." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="destinationEquipType" name="destination-equip-type" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="The type of destinatination equipment. Could be Router, UCPE, etc." />
+                                       </xml-properties>
+                               </xml-element>                                  
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="classesOfService" name="classes-of-service" type="inventory.aai.onap.org.v11.ClassesOfService" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="indexedProps" value="site-pair-id" />
+                               <xml-property name="uniqueProps" value="site-pair-id" />
+                               <xml-property name="dependentOn" value="routing-instance" />
+                               <xml-property name="container" value="site-pairs" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="ClassesOfService">
+                       <xml-properties>
+                               <xml-property name="description" value="class-of-service of probe" />
+                       </xml-properties>
+                       <xml-root-element name="classes-of-service" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="classOfService" name="class-of-service" type="inventory.aai.onap.org.v11.ClassOfService" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="ClassOfService">
+                       <xml-root-element name="class-of-service" />
+                       <java-attributes>
+                               <xml-element java-attribute="cos" name="cos" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="unique identifier of probe" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="probeId" name="probe-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="identifier of probe" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="probeType" name="probe-type" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="type of probe" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="indexedProps" value="cos" />
+                               <xml-property name="dependentOn" value="site-pair" />
+                               <xml-property name="container" value="classes-of-service" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="VpnBindings">
+                       <xml-root-element name="vpn-bindings" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="vpnBinding" name="vpn-binding" type="inventory.aai.onap.org.v11.VpnBinding" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="VpnBinding">
+                       <xml-root-element name="vpn-binding" />
+                       <java-attributes>
+                               <xml-element java-attribute="vpnId" name="vpn-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="VPN ID, globally unique within A&amp;AI" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vpnName" name="vpn-name" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="VPN Name" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vpnPlatform" name="vpn-platform" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the platform associated with the VPN example AVPN, Mobility" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vpnType" name="vpn-type" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Type of the vpn, should be taken from enumerated/valid values" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vpnRegion" name="vpn-region" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="region of customer vpn" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="customerVpnId" name="customer-vpn-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="id for this customer vpn" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="routeDistinguisher" name="route-distinguisher" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used to distinguish the distinct VPN routes of separate customers who connect to the provider in an MPLS network." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="routeTargets" name="route-targets" type="inventory.aai.onap.org.v11.RouteTargets" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList">
+                                       <xml-properties>
+                                               <xml-property name="description" value="l3-networks relate to vpn-bindings" />
+                                       </xml-properties>
+                               </xml-element>
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="VPN binding" />
+                               <xml-property name="nameProps" value="vpn-name,vpn-type" />
+                               <xml-property name="indexedProps" value="vpn-name,vpn-id,vpn-type" />
+                               <xml-property name="searchable" value="vpn-id,vpn-name" />
+                               <xml-property name="uniqueProps" value="vpn-id" />
+                               <xml-property name="container" value="vpn-bindings" />
+                               <xml-property name="namespace" value="network" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="VplsPes">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of VPLS Provider Edge routers" />
+                       </xml-properties>
+                       <xml-root-element name="vpls-pes" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="vplsPe" name="vpls-pe" type="inventory.aai.onap.org.v11.VplsPe" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="VplsPe">
+                       <xml-root-element name="vpls-pe" />
+                       <java-attributes>
+                               <xml-element java-attribute="equipmentName" name="equipment-name" required="true" type="java.lang.String" xml-key="true" />
+                               <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Client should send valid enumerated value, e.g., VPLS-PE." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Temporary location for stag to get to VCE" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                               <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v11.PInterfaces" />
+                               <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v11.LagInterfaces" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="VPLS Provider Edge routers." />
+                               <xml-property name="indexedProps" value="prov-status,equipment-name" />
+                               <xml-property name="container" value="vpls-pes" />
+                               <xml-property name="namespace" value="network" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="MulticastConfigurations">
+                       <xml-properties>
+                               <xml-property name="description" value="multicast configuration of generic-vnf ip-address" />
+                       </xml-properties>
+                       <xml-root-element name="multicast-configurations" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="multicastConfiguration" name="multicast-configuration" type="inventory.aai.onap.org.v11.MulticastConfiguration" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="MulticastConfiguration">
+                       <xml-root-element name="multicast-configuration" />
+                       <java-attributes>
+                               <xml-element java-attribute="multicastConfigurationId" name="multicast-configuration-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique id of multicast configuration." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="multicastProtocol" name="multicast-protocol" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="protocol of multicast configuration" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="rpType" name="rp-type" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="rp type of multicast configuration" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="indexedProps" value="multicast-configuration-id" />
+                               <xml-property name="uniqueProps" value="multicast-configuration-id" />
+                               <xml-property name="container" value="multicast-configurations" />
+                               <xml-property name="namespace" value="network" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="Vces">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of Virtual Customer Edge Routers, used specifically for Gamma.  This object is deprecated." />
+                       </xml-properties>
+                       <xml-root-element name="vces" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="vce" name="vce" type="inventory.aai.onap.org.v11.Vce" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="Vce">
+                       <xml-root-element name="vce" />
+                       <java-attributes>
+                               <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique id of VNF.  This is unique across the graph." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Name of VNF." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Alternate name of VNF." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="serviceId" name="service-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique identifier of service, does not strictly map to ASDC services, SOON TO BE DEPRECATED." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="regionalResourceZone" name="regional-resource-zone" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Regional way of organizing pservers, source of truth should define values" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Indicator for whether the resource is considered operational" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="OBSOLETE -  do not use" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Network role being played by this VNF" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vpeId" name="vpe-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique ID of VPE connected to this VCE." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="v6VceWanAddress" name="v6-vce-wan-address" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Valid v6 IP address for the WAN Link on this router.  Implied length of /64." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Address tail-f uses to configure vce, also used for troubleshooting and is IP used for traps generated by VCE." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ipv4Loopback0Address" name="ipv4-loopback0-address" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Loopback0 address" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="entitlementResourceUuid" name="entitlement-resource-uuid" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="OBSOLETE -  see child relationships" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.onap.org.v11.PortGroups" />
+                               <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v11.Licenses" />
+                               <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v11.Entitlements" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated." />
+                               <xml-property name="nameProps" value="vnf-name" />
+                               <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id" />
+                               <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2" />
+                               <xml-property name="uniqueProps" value="vnf-id" />
+                               <xml-property name="container" value="vces" />
+                               <xml-property name="namespace" value="network" />
+                               <xml-property name="extends" value="vnf" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="PortGroups">
+                       <xml-root-element name="port-groups" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="portGroup" name="port-group" type="inventory.aai.onap.org.v11.PortGroup" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="PortGroup">
+                       <xml-root-element name="port-group" />
+                       <java-attributes>
+                               <xml-element java-attribute="interfaceId" name="interface-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique ID of the interface" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Neutron network id of this Interface" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="neutronNetworkName" name="neutron-network-name" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Neutron network name of this Interface" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Role assigned to this Interface, should use values as defined in ECOMP Yang models." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="portGroupId" name="port-group-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique ID for port group in vmware" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="portGroupName" name="port-group-name" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Likely to duplicate value of neutron network name" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="switchName" name="switch-name" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="DVS or standard switch name (should be non-null for port groups associated with DVS)" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="orchestrationStatus" name="orchestration-status" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="cvlanTags" name="cvlan-tags" type="inventory.aai.onap.org.v11.CvlanTags" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Used to capture the network interfaces of this VCE" />
+                               <xml-property name="nameProps" value="port-group-name" />
+                               <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,interface-name,switch-name" />
+                               <xml-property name="dependentOn" value="vce" />
+                               <xml-property name="container" value="port-groups" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="CvlanTags">
+                       <xml-root-element name="cvlan-tags" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="cvlanTagEntry" name="cvlan-tag-entry" type="inventory.aai.onap.org.v11.CvlanTagEntry" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="CvlanTagEntry">
+                       <xml-root-element name="cvlan-tag-entry" />
+                       <java-attributes>
+                               <xml-element java-attribute="cvlanTag" name="cvlan-tag" required="true" type="java.lang.Long" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="See mis-na-virtualization-platform.yang" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="dependentOn" value="port-group" />
+                               <xml-property name="indexedProps" value="cvlan-tag" />
+                               <xml-property name="container" value="cvlan-tags" />
+                       </xml-properties>
+               </java-type>
+
+
+
+               <java-type name="Vnfcs">
+                       <xml-properties>
+                               <xml-property name="description" value="virtual network components associated with a vserver from application controller." />
+                       </xml-properties>
+                       <xml-root-element name="vnfcs" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="vnfc" name="vnfc" type="inventory.aai.onap.org.v11.Vnfc" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="Vnfc">
+                       <xml-root-element name="vnfc" />
+                       <java-attributes>
+                               <xml-element java-attribute="vnfcName" name="vnfc-name" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique ID of vnfc." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="nfcNamingCode" name="nfc-naming-code" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Short code that is used in naming instances of the item being modeled" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="nfcFunction" name="nfc-function" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="English description of function that the specific resource deployment is providing. Assigned as part of the customization of a resource in a service" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="prov status of this vnfc" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Orchestration status of this VNF, mastered by APP-C" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ipaddressV4OamVip" name="ipaddress-v4-oam-vip" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Oam V4 vip address of this vnfc" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="defaultValue" value="false"/>
+                                               <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element default-value="false" required="true" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="defaultValue" value="false"/>
+                                               <xml-property name="description" value="used to indicate whether closed loop function is enabled on this node" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="groupNotation" name="group-notation" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Group notation of VNFC" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC model id for this resource or service model." />
+                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="requires" value="model-version-id" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="requires" value="model-invariant-id" />
+                                       </xml-properties>
+                               </xml-element>                          
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v11.L3InterfaceIpv4AddressList" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v11.L3InterfaceIpv6AddressList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="indexedProps" value="vnfc-name,prov-status,nfc-function,nfc-naming-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation,model-invariant-id,model-version-id" />
+                               <xml-property name="searchable" value="vnfc-name" />
+                               <xml-property name="container" value="vnfcs" />
+                               <xml-property name="namespace" value="network" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="L3Networks">
+                       <xml-root-element name="l3-networks" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="l3Network" name="l3-network" type="inventory.aai.onap.org.v11.L3Network" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="L3Network">
+                       <xml-root-element name="l3-network" />
+                       <java-attributes>
+                               <xml-element java-attribute="networkId" name="network-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Network ID, should be uuid. Unique across A&amp;AI." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="networkName" name="network-name" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Name of the network, governed by some naming convention.." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="networkType" name="network-type" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Type of the network - who defines these values?" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="networkRole" name="network-role" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Role the network plans - who defines these values?" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="networkTechnology" name="network-technology" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Network technology - who defines these values?" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Neutron network id of this Interface" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element default-value="false" required="true" java-attribute="isBoundToVpn" name="is-bound-to-vpn" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="defaultValue" value="false"/>
+                                               <xml-property name="description" value="Set to true if bound to VPN" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="serviceId" name="service-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique identifier of service from ASDC.  Does not strictly map to ASDC services.  SOON TO BE DEPRECATED" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="networkRoleInstance" name="network-role-instance" type="java.lang.Long">
+                                       <xml-properties>
+                                               <xml-property name="description" value="network role instance" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="contrailNetworkFqdn" name="contrail-network-fqdn" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Contrail FQDN for the network" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC model id for this resource or service model." />
+                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="requires" value="model-version-id" />
+                                               <xml-property name="dbAlias" value="model-invariant-id-local" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="requires" value="model-invariant-id" />
+                                               <xml-property name="dbAlias" value="model-version-id-local" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                                               <xml-property name="visibility" value="internal" />
+                                               <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="physicalNetworkName" name="physical-network-name" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Name associated with the physical network." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="isProviderNetwork" name="is-provider-network" required="true" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="defaultValue" value="false"/>
+                                               <xml-property name="description" value="boolean indicatating whether or not network is a provider network." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="isSharedNetwork" name="is-shared-network" required="true" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="defaultValue" value="false"/>
+                                               <xml-property name="description" value="boolean indicatating whether or not network is a shared network." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="isExternalNetwork" name="is-external-network" required="true" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="defaultValue" value="false"/>
+                                               <xml-property name="description" value="boolean indicatating whether or not network is an external network." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Path to the controller object." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Indicator for whether the resource is considered operational." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="subnets" name="subnets" type="inventory.aai.onap.org.v11.Subnets" />
+                               <xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.onap.org.v11.CtagAssignments" />
+                               <xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.onap.org.v11.SegmentationAssignments" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" >
+                                       <xml-properties>
+                                               <xml-property name="description" value="Relates to tenant (or is it a child of tenant), complex, service, vpn-binding" />
+                                       </xml-properties>
+                               </xml-element>
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Generic network definition" />
+                               <xml-property name="nameProps" value="network-name" />
+                               <xml-property name="indexedProps" value="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role" />
+                               <xml-property name="searchable" value="network-id,network-name" />
+                               <xml-property name="uniqueProps" value="network-id" />
+                               <xml-property name="container" value="l3-networks" />
+                               <xml-property name="namespace" value="network" />
+                       </xml-properties>
+               </java-type>
+               <java-type name="NetworkPolicies">
+                       <xml-root-element name="network-policies" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="networkPolicy" name="network-policy" type="inventory.aai.onap.org.v11.NetworkPolicy" />
+                       </java-attributes>
+               </java-type>
+               <java-type name="NetworkPolicy">
+                       <xml-root-element name="network-policy" />
+                       <java-attributes>
+                               <xml-element java-attribute="networkPolicyId" name="network-policy-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="UUID representing unique key to this instance" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="networkPolicyFqdn" name="network-policy-fqdn" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Contrail FQDN for the policy" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="ID for the openStack Heat instance" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="nameProps" value="network-policy-fqdn" />
+                               <xml-property name="indexedProps" value="network-policy-id,network-policy-fqdn" />
+                               <xml-property name="searchable" value="network-policy-id,network-policy-fqdn" />
+                               <xml-property name="uniqueProps" value="network-policy-id" />
+                               <xml-property name="container" value="network-policies" />
+                               <xml-property name="namespace" value="network" />
+                       </xml-properties>
+               </java-type>
+               <java-type name="CtagAssignments">
+                       <xml-root-element name="ctag-assignments" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="ctagAssignment" name="ctag-assignment" type="inventory.aai.onap.org.v11.CtagAssignment" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="CtagAssignment">
+                       <xml-root-element name="ctag-assignment" />
+                       <java-attributes>
+                               <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" required="true" type="java.lang.Long" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="id." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="indexedProps" value="vlan-id-inner" />
+                               <xml-property name="dependentOn" value="l3-network" />
+                               <xml-property name="container" value="ctag-assignments" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="Subnets">
+                       <xml-root-element name="subnets" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="subnet" name="subnet" type="inventory.aai.onap.org.v11.Subnet" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="Subnet">
+                       <xml-root-element name="subnet" />
+                       <java-attributes>
+                               <xml-element java-attribute="subnetId" name="subnet-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Subnet ID, should be UUID." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="subnetName" name="subnet-name" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Name associated with the subnet." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Neutron id of this subnet" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="gatewayAddress" name="gateway-address" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="gateway ip address" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="networkStartAddress" name="network-start-address" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="network start address" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="cidrMask" name="cidr-mask" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="cidr mask" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="ip version" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element default-value="false" required="true" java-attribute="dhcpEnabled" name="dhcp-enabled" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="defaultValue" value="false"/>
+                                               <xml-property name="description" value="dhcp enabled" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="dhcpStart" name="dhcp-start" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the start address reserved for use by dhcp" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="dhcpEnd" name="dhcp-end" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the last address reserved for use by dhcp" />
+                                       </xml-properties>
+                               </xml-element>
+                                       <xml-element java-attribute="subnetRole" name="subnet-role" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="role of the subnet, referenced when assigning IPs" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ipAssignmentDirection" name="ip-assignment-direction" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="ip address assignment direction of the subnet" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="subnetSequence" name="subnet-sequence" type="java.lang.Integer">
+                                       <xml-properties>
+                                               <xml-property name="description" value="sequence of the subnet" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="hostRoutes" name="host-routes" type="inventory.aai.onap.org.v11.HostRoutes" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="indexedProps" value="subnet-id,subnet-name" />
+                               <xml-property name="nameProps" value="subnet-name" />
+                               <xml-property name="uniqueProps" value="subnet-id" />
+                               <xml-property name="dependentOn" value="l3-network" />
+                               <xml-property name="container" value="subnets" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="GenericVnfs">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of VNFs" />
+                       </xml-properties>
+                       <xml-root-element name="generic-vnfs" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.onap.org.v11.GenericVnf" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="maximumDepth" value="0" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="GenericVnf">
+                       <xml-root-element name="generic-vnf" />
+                       <java-attributes>
+                               <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique id of VNF.  This is unique across the graph." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Name of VNF." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Alternate name of VNF." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="serviceId" name="service-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique identifier of service, does not necessarily map to ASDC service models.  SOON TO BE DEPRECATED" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="regionalResourceZone" name="regional-resource-zone" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Regional way of organizing pservers, source of truth should define values" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." />
+                                               <xml-property name="suggestibleOnSearch" value="true"/>
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Indicator for whether the resource is considered operational.  Valid values are in-service-path and out-of-service-path." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="OBSOLETE -  do not use" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Client should send valid enumerated value" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Orchestration status of this VNF, used by MSO." />
+                                               <xml-property name="suggestibleOnSearch" value="true"/>
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="identifier of managed by ATT or customer" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by generic-vnf." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ipv4Loopback0Address" name="ipv4-loopback0-address" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="v4 Loopback0 address" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="nmLanV6Address" name="nm-lan-v6-address" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="v6 Loopback address" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="managementV6Address" name="management-v6-address" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="v6 management address" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vcpu" name="vcpu" type="java.lang.Long">
+                                       <xml-properties>
+                                               <xml-property name="description" value="number of vcpus ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only by uCPE" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vcpuUnits" name="vcpu-units" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="units associated with vcpu, used for VNFs with no vservers/flavors, to be used only by uCPE" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vmemory" name="vmemory" type="java.lang.Long">
+                                       <xml-properties>
+                                               <xml-property name="description" value="number of GB of memory ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only by uCPE" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vmemoryUnits" name="vmemory-units" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="units associated with vmemory, used for VNFs with no vservers/flavors, to be used only by uCPE" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vdisk" name="vdisk" type="java.lang.Long">
+                                       <xml-properties>
+                                               <xml-property name="description" value="number of vdisks ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only uCPE" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vdiskUnits" name="vdisk-units" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="units associated with vdisk, used for VNFs with no vservers/flavors, to be used only by uCPE" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="defaultValue" value="false"/>
+                                               <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element default-value="false" required="true" java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="defaultValue" value="false"/>
+                                               <xml-property name="description" value="used to indicate whether closed loop function is enabled on this node" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="summaryStatus" name="summary-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="details regarding the generic-vnf operation, PLEASE DISCONTINUE USE OF THIS FIELD." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="encryptedAccessFlag" name="encrypted-access-flag" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="description" value="indicates whether generic-vnf access uses SSH" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="entitlementAssignmentGroupUuid" name="entitlement-assignment-group-uuid" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="UUID of the Entitlement group used for licensing VNFs, OBSOLETE -  See child relationships." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="entitlementResourceUuid" name="entitlement-resource-uuid" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="UUID of the specific entitlement resource.  OBSOLETE -  See child relationships." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="licenseAssignmentGroupUuid" name="license-assignment-group-uuid" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="UUID of the license assignment group.  OBSOLETE -  See child relationships." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="licenseKeyUuid" name="license-key-uuid" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="UUID of the actual license resource.  OBSOLETE -  See child relationships." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC model id for this resource or service model." />
+                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="requires" value="model-version-id" />
+                                               <xml-property name="dbAlias" value="model-invariant-id-local" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="requires" value="model-invariant-id" />
+                                               <xml-property name="dbAlias" value="model-version-id-local" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                                               <xml-property name="visibility" value="internal" />
+                                               <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="asNumber" name="as-number" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="as-number of the VNF" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="regionalResourceSubzone" name="regional-resource-subzone" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="represents sub zone of the rr plane" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="nfType" name="nf-type" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Generic description of the type of NF" />
+                                               <xml-property name="suggestibleOnSearch" value="true"/>
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="nfFunction" name="nf-function" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="English description of Network function that the specific VNF deployment is providing" />
+                                       </xml-properties>
+                               </xml-element>  
+                               <xml-element java-attribute="nfRole" name="nf-role" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="role in the network that this model will be providing" />
+                                               <xml-property name="suggestibleOnSearch" value="true"/>
+                                       </xml-properties>
+                               </xml-element>  
+                               <xml-element java-attribute="nfNamingCode" name="nf-naming-code" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="string assigned to this model used for naming purposes" />
+                                       </xml-properties>
+                               </xml-element>  
+                               <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Path to the controller object." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ipv4OamGatewayAddress" name="ipv4-oam-gateway-address" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Gateway address" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ipv4OamGatewayAddressPrefixLength" name="ipv4-oam-gateway-address-prefix-length" type="java.lang.Integer">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Prefix length for oam-address" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Temporary location for S-TAG to get to VCE" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="nmProfileName" name="nm-profile-name" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Network Management profile of this VNF" />
+                                       </xml-properties>
+                               </xml-element>                  
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                               <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" />
+                               <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v11.LagInterfaces" />
+                               <xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.onap.org.v11.VfModules" />
+                               <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v11.Licenses" />
+                               <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v11.Entitlements" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="General purpose VNF" />
+                               <xml-property name="nameProps" value="vnf-name" />
+                               <xml-property name="indexedProps" value="is-closed-loop-disabled,vnf-name2,vnf-type,heat-stack-id,in-maint,vnf-name,vnf-id,regional-resource-zone,prov-status,service-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,nf-type,nf-function,nf-naming-code,nf-role" />
+                               <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2" />
+                               <xml-property name="uniqueProps" value="vnf-id" />
+                               <xml-property name="container" value="generic-vnfs" />
+                               <xml-property name="namespace" value="network" />
+                               <xml-property name="extends" value="vnf" />
+                               <xml-property name="containsSuggestibleProps" value="true"/>
+                               <xml-property name="suggestionAliases" value="VNFs"/>
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="VfModules">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of vf-modules, a deployment unit of VNFCs" />
+                       </xml-properties>
+                       <xml-root-element name="vf-modules" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="vfModule" name="vf-module" type="inventory.aai.onap.org.v11.VfModule" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="VfModule">
+                       <xml-root-element name="vf-module" />
+                       <java-attributes>
+                               <xml-element java-attribute="vfModuleId" name="vf-module-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique ID of vf-module." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vfModuleName" name="vf-module-name" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Name of vf-module" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Heat stack id corresponding to this instance." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="orchestration status of this vf-module, mastered by MSO" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element default-value="false" required="true" java-attribute="isBaseVfModule" name="is-base-vf-module" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="defaultValue" value="false"/>
+                                               <xml-property name="description" value="used to indicate whether or not this object is base vf module" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC model id for this resource or service model." />
+                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="requires" value="model-version-id" />
+                                               <xml-property name="dbAlias" value="model-invariant-id-local" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="requires" value="model-invariant-id" />
+                                               <xml-property name="dbAlias" value="model-version-id-local" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                                               <xml-property name="visibility" value="internal" />
+                                               <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="contrailServiceInstanceFqdn" name="contrail-service-instance-fqdn" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the Contrail unique ID for a service-instance" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="moduleIndex" name="module-index" type="java.lang.Integer">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the index will track the number of modules of a given type that have been deployed in a VNF, starting with 0, and always choosing the lowest available digit" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Path to the controller object." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="a deployment unit of VNFCs" />
+                               <xml-property name="indexedProps" value="vf-module-id,vf-module-name,heat-stack-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-service-instance-fqdn" />
+                               <xml-property name="searchable" value="vf-module-id,vf-module-name" />
+                               <xml-property name="dependentOn" value="generic-vnf" />
+                               <xml-property name="container" value="vf-modules" />
+                       </xml-properties>
+               </java-type>
+
+
+               <java-type name="LagLinks">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of link aggregation connections" />
+                       </xml-properties>
+                       <xml-root-element name="lag-links" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="lagLink" name="lag-link" type="inventory.aai.onap.org.v11.LagLink" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="LagLink">
+                       <xml-root-element name="lag-link" />
+                       <java-attributes>
+                               <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Alphabetical concatenation of lag-interface names" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="LAG links can connect lag-interfaces" />
+                               <xml-property name="indexedProps" value="link-name" />
+                               <xml-property name="container" value="lag-links" />
+                               <xml-property name="namespace" value="network" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="Newvces">
+                       <xml-properties>
+                               <xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce." />
+                       </xml-properties>
+                       <xml-root-element name="newvces" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="newvce" name="newvce" type="inventory.aai.onap.org.v11.Newvce" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="Newvce">
+                       <xml-root-element name="newvce" />
+                       <java-attributes>
+                               <xml-element java-attribute="vnfId2" name="vnf-id2" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique id of VNF, can't use same attribute name right now until we promote this new object" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vnfName" name="vnf-name" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Name of VNF." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Alternate name of VNF." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vnfType" name="vnf-type" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Indicator for whether the resource is considered operational" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="OBSOLETE -  do not use" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Client should send valid enumerated value." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ipv4Loopback0Address" name="ipv4-loopback0-address" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="v4 Loopback0 address" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                               <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce." />
+                               <xml-property name="nameProps" value="vnf-name" />
+                               <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2" />
+                               <xml-property name="searchable" value="vnf-id2,vnf-name,vnf-name2" />
+                               <xml-property name="uniqueProps" value="vnf-id2" />
+                               <xml-property name="container" value="newvces" />
+                               <xml-property name="namespace" value="network" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="Pnfs">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of Physical Network Functions." />
+                       </xml-properties>
+                       <xml-root-element name="pnfs" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.onap.org.v11.Pnf" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="maximumDepth" value="0" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="Pnf">
+                       <xml-root-element name="pnf" />
+                       <java-attributes>
+                               <xml-element java-attribute="pnfName" name="pnf-name" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="unique name of Physical Network Function." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="pnfName2" name="pnf-name2" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="name of Physical Network Function." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="pnfName2Source" name="pnf-name2-source" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="source of name2" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="pnfId" name="pnf-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="id of pnf" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="equipType" name="equip-type" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Equipment type.  Source of truth should define valid values." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="equipVendor" name="equip-vendor" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Equipment vendor.  Source of truth should define valid values." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="equipModel" name="equip-model" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Equipment model.  Source of truth should define valid values." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="identifier of managed by ATT or customer" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ipaddressV4Oam" name="ipaddress-v4-oam" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="ipv4-oam-address with new naming convention for IP addresses" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="swVersion" name="sw-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="sw-version is the version of SW for the hosted application on the PNF." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="defaultValue" value="false"/>
+                                               <xml-property name="description" value="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="frameId" name="frame-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="ID of the physical frame (relay rack) where pnf is installed." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="serialNumber" name="serial-number" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Serial number of the device" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ipaddressV4Loopback0" name="ipaddress-v4-loopback-0" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="IPV4 Loopback 0 address" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ipaddressV6Loopback0" name="ipaddress-v6-loopback-0" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="IPV6 Loopback 0 address" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ipaddressV4Aim" name="ipaddress-v4-aim" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="IPV4 AIM address" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ipaddressV6Aim" name="ipaddress-v6-aim" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="IPV6 AIM address" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ipaddressV6Oam" name="ipaddress-v6-oam" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="IPV6 OAM address" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="invStatus" name="inv-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="nfRole" name="nf-role" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Nf Role is the role performed by this instance in the network." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                               <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v11.PInterfaces" />
+                               <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v11.LagInterfaces" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE." />
+                               <xml-property name="indexedProps" value="pnf-name,orchestration-status,inv-status" />
+                               <xml-property name="searchable" value="pnf-name" />
+                               <xml-property name="uniqueProps" value="pnf-name" />
+                               <xml-property name="container" value="pnfs" />
+                               <xml-property name="namespace" value="network" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="PhysicalLinks">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of physical connections, typically between p-interfaces" />
+                       </xml-properties>
+                       <xml-root-element name="physical-links" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.onap.org.v11.PhysicalLink" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="maximumDepth" value="0" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="PhysicalLink">
+                       <xml-root-element name="physical-link" />
+                       <java-attributes>
+                               <xml-element java-attribute="linkName" name="link-name" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="e.g., hostnameA_p-connection_nameA_hostnameZ+p_connection-nameZ" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Captures the numeric part of the speed" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Captures the units corresponding to the speed" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Circuit it" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="dualMode" name="dual-mode" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Dual access mode (e.g., primary, secondary" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="To provide information on who manages this circuit. A&amp;AI or 3rd party transport provider" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="serviceProviderName" name="service-provider-name" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Name of the service Provider on this link." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="serviceProviderBandwidthUpValue" name="service-provider-bandwidth-up-value" type="java.lang.Integer">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Upstream Bandwidth value agreed with the service provider" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="serviceProviderBandwidthUpUnits" name="service-provider-bandwidth-up-units" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Units for the upstream BW value" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="serviceProviderBandwidthDownValue" name="service-provider-bandwidth-down-value" type="java.lang.Integer">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Downstream Bandwidth value agreed with the service provider" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="serviceProviderBandwidthDownUnits" name="service-provider-bandwidth-down-units" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Units for downstream BW value" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of physical connections, typically between p-interfaces" />
+                               <xml-property name="indexedProps" value="circuit-id,link-name" />
+                               <xml-property name="alternateKeys1" value="circuit-id" />
+                               <xml-property name="container" value="physical-links" />
+                               <xml-property name="namespace" value="network" />
+                               <xml-property name="searchable" value="link-name,circuit-id" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="VigServers">
+                       <xml-root-element name="vig-servers" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="vigServer" name="vig-server" type="inventory.aai.onap.org.v11.VigServer" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="VigServer">
+                       <xml-root-element name="vig-server" />
+                       <java-attributes>
+                               <xml-element java-attribute="vigAddressType" name="vig-address-type" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="indicates whether the VIG is for AVPN or INTERNET" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="ipaddressV4Vig" name="ipaddress-v4-vig" type="java.lang.String" >
+                                       <xml-properties>
+                                               <xml-property name="description" value="v4 IP of the vig server" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="ipaddressV6Vig" name="ipaddress-v6-vig" type="java.lang.String" >
+                                       <xml-properties>
+                                               <xml-property name="description" value="v6 IP of the vig server" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607" />
+                               <xml-property name="indexedProps" value="vig-address-type" />
+                               <xml-property name="dependentOn" value="ipsec-configuration" />
+                               <xml-property name="container" value="vig-servers" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="IpsecConfigurations">
+                       <xml-root-element name="ipsec-configurations" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="ipsecConfiguration" name="ipsec-configuration" type="inventory.aai.onap.org.v11.IpsecConfiguration" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="IpsecConfiguration">
+                       <xml-root-element name="ipsec-configuration" />
+                       <java-attributes>
+                               <xml-element java-attribute="ipsecConfigurationId" name="ipsec-configuration-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="UUID of this configuration" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="requestedVigAddressType" name="requested-vig-address-type" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Indicate the type of VIG server like AVPN, INTERNET, BOTH" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="requestedEncryptionStrength" name="requested-encryption-strength" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Encryption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="requestedDmzType" name="requested-dmz-type" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="ATT can offer a shared DMZ or a DMZ specific to a customer" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="sharedDmzNetworkAddress" name="shared-dmz-network-address" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Network address of shared DMZ" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="requestedCustomerName" name="requested-customer-name" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="If the DMZ is a custom DMZ, this field will indicate the customer information" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ikeVersion" name="ike-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="can be 1 or 2" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ikev1Authentication" name="ikev1-authentication" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Contains values like md5, sha1, sha256, sha384" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ikev1Encryption" name="ikev1-encryption" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ikev1DhGroup" name="ikev1-dh-group" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Diffie-Hellman group like DH-GROUP2, DH-GROUP5, DH-GROUP14" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ikev1AmGroupId" name="ikev1-am-group-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Group name defined in VIG for clients using aggressive mode" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ikev1AmPassword" name="ikev1-am-password" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="pre-shared key for the above group name " />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ikev1SaLifetime" name="ikev1-sa-lifetime" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Lifetime for IKEv1 SA" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ipsecAuthentication" name="ipsec-authentication" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="md5, sha1, sha256, sha384" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ipsecEncryption" name="ipsec-encryption" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ipsecSaLifetime" name="ipsec-sa-lifetime" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Life time for IPSec SA" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ipsecPfs" name="ipsec-pfs" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="enable PFS or not" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="xauthUserId" name="xauth-userid" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="user ID for xAuth, sm-user,ucpeHostName,nmteHostName" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="xauthUserPassword" name="xauth-user-password" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Encrypted using the Juniper $9$ algorithm" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="dpdInterval" name="dpd-interval" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="The time between DPD probe" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="dpdFrequency" name="dpd-frequency" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Maximum number of DPD before claiming the tunnel is down" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                               <xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.onap.org.v11.VigServers" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C" />
+                               <xml-property name="indexedProps" value="ipsec-configuration-id" />
+                               <xml-property name="uniqueProps" value="ipsec-configuration-id" />
+                               <xml-property name="container" value="ipsec-configurations" />
+                               <xml-property name="namespace" value="network" />
+                       </xml-properties>
+               </java-type>
+
+
+               <java-type name="NotificationEvent">
+                       <xml-root-element name="notification-event" />
+                       <java-attributes>
+                               <xml-element java-attribute="cambriaPartition" name="cambria.partition" type="java.lang.String" />
+                               <xml-element java-attribute="eventHeader" name="event-header" type="inventory.aai.onap.org.v11.NotificationEventHeader" />
+                               <xml-any-element java-attribute="entity" />
+                       </java-attributes>
+               </java-type>
+               <java-type name="NotificationEventHeader">
+                       <xml-root-element name="notification-event-header" />
+                       <java-attributes>
+                               <xml-element java-attribute="id" name="id" type="java.lang.String" />
+                               <xml-element java-attribute="timestamp" name="timestamp" type="java.lang.String" />
+                               <xml-element java-attribute="sourceName" name="source-name" type="java.lang.String" />
+                               <xml-element java-attribute="domain" name="domain" type="java.lang.String" />
+                               <xml-element java-attribute="sequenceNumber" name="sequence-number" type="java.lang.String" />
+                               <xml-element java-attribute="severity" name="severity" type="java.lang.String" />
+                               <xml-element java-attribute="eventType" name="event-type" type="java.lang.String" />
+                               <xml-element java-attribute="version" name="version" type="java.lang.String" />
+                               <xml-element java-attribute="action" name="action" type="java.lang.String" />
+                               <xml-element java-attribute="entityType" name="entity-type" type="java.lang.String" />
+                               <xml-element java-attribute="topEntityType" name="top-entity-type" type="java.lang.String" />
+                               <xml-element java-attribute="entityLink" name="entity-link" type="java.lang.String" />
+                               <xml-element java-attribute="status" name="status" type="java.lang.String" />
+                       </java-attributes>
+               </java-type>
+               <java-type name="AaiInternal">
+                       <xml-root-element name="aai-internal" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="reservedPropNames" name="reserved-prop-names" type="inventory.aai.onap.org.v11.ReservedPropNames" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.onap.org.v11.EdgePropNames" />
+                       </java-attributes>
+               </java-type>
+               <java-type name="ReservedPropNames">
+                       <xml-properties>
+                               <xml-property name="description" value="Internal map to define some reserved properties of a vertex" />
+                               <xml-property name="uniqueProps" value="aai-unique-key" />
+                               <xml-property name="indexedProps" value="aai-unique-key,source-of-truth,aai-node-type,aai-uri" />
+                       </xml-properties>
+                       <xml-root-element name="reserved-prop-names" />
+                       <java-attributes>
+                               <xml-element java-attribute="lastModSourceOfTruth" name="last-mod-source-of-truth" type="java.lang.String" />
+                               <xml-element java-attribute="aaiNodeType" name="aai-node-type" type="java.lang.String" />
+                               <xml-element java-attribute="aaiCreatedTs" name="aai-created-ts" type="java.lang.Long" />
+                               <xml-element java-attribute="aaiUniqueKey" name="aai-unique-key" type="java.lang.String" />
+                               <xml-element java-attribute="aaiLastModTs" name="aai-last-mod-ts" type="java.lang.Long" />
+                               <xml-element java-attribute="sourceOfTruth" name="source-of-truth" type="java.lang.String" />
+                               <xml-element java-attribute="aaiUri" name="aai-uri" type="java.lang.String" />
+                       </java-attributes>
+               </java-type>
+               <java-type name="EdgePropNames">
+                       <!-- NOTE that the names of these properties are not consistent and are in mixed case and hyphen case for now -->
+                       <xml-properties>
+                               <xml-property name="description" value="Internal map to define the properties of an edge and interpret the map EdgeRules" />
+                               <xml-property name="edgeInfo" value="edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV" />
+                       </xml-properties>
+                       <xml-root-element name="edge-prop-names" />
+                       <java-attributes>
+                               <xml-element java-attribute="edgeLabel" name="edgeLabel" type="java.lang.String" />
+                               <xml-element java-attribute="direction" name="direction" type="java.lang.String" />
+                               <xml-element java-attribute="multiplicityRule" name="multiplicityRule" type="java.lang.String" />
+                               <xml-element java-attribute="containsOtherV" name="contains-other-v" type="java.lang.String" />
+                               <xml-element java-attribute="deleteOtherV" name="delete-other-v" type="java.lang.String" />
+                               <xml-element java-attribute="svcinfra" name="SVC-INFRA" type="java.lang.String" />
+                               <xml-element java-attribute="preventDelete" name="prevent-delete" type="java.lang.String" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="Models">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of subgraph definitions provided by ASDC to describe the inventory assets and their connections related to ASDC models" />
+                       </xml-properties>
+                       <xml-root-element name="models" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="model" name="model" type="inventory.aai.onap.org.v11.Model" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="Model">
+                       <xml-root-element name="model" />
+                       <xml-properties>
+                               <xml-property name="description" value="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version" />
+                               <xml-property name="nameProps" value="model-type" />
+                               <xml-property name="indexedProps" value="model-invariant-id,model-type" />
+                               <xml-property name="uniqueProps" value="model-invariant-id" />
+                               <xml-property name="container" value="models" />
+                               <xml-property name="namespace" value="service-design-and-creation" />
+                       </xml-properties>
+                       <java-attributes>
+                               <xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique identifier corresponding to the main definition of a model in ASDC" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelType" name="model-type" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Type of the model, e.g., service, resource, widget, etc." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.onap.org.v11.ModelVers" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+               </java-type>
+
+
+               <java-type name="ModelVers">
+                       <xml-root-element name="model-vers" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="modelVer" name="model-ver" type="inventory.aai.onap.org.v11.ModelVer" />
+                       </java-attributes>
+               </java-type>
+               
+               <java-type name="ModelVer">
+                       <xml-root-element name="model-ver" />
+                       <xml-properties>
+                               <xml-property name="description" value="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models" />
+                               <xml-property name="nameProps" value="model-name" />
+                               <xml-property name="indexedProps" value="model-version-id,model-name,model-version" />
+                               <xml-property name="uniqueProps" value="model-version-id" />
+                               <xml-property name="container" value="model-vers" />
+                       </xml-properties>
+                       <java-attributes>
+                               <xml-element java-attribute="modelVersionId" name="model-version-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique identifier corresponding to one version of a model in ASDC" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelName" name="model-name" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Name of the model, which can change from version to version." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelVersion" name="model-version" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Version" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelDescription" name="model-description" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Description" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v11.ModelElements" />
+                               <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v11.Metadata" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="ModelElements">
+                       <xml-root-element name="model-elements" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="modelElement" name="model-element" type="inventory.aai.onap.org.v11.ModelElement" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="ModelElement">
+                       <xml-properties>
+                               <xml-property name="description" value="Defines how other models combine to make up a higher-level model." />
+                               <xml-property name="uniqueProps" value="model-element-uuid" />
+                               <xml-property name="indexedProps" value="model-element-uuid" />
+                               <xml-property name="allowDirectRead" value="true" />
+                               <xml-property name="allowDirectWrite" value="false" />
+                               <xml-property name="container" value="model-elements" />
+                       </xml-properties>
+                       <xml-root-element name="model-element" />
+                       <java-attributes>
+                               <xml-element java-attribute="modelElementUuid" name="model-element-uuid" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="autoGenerateUuid" value="true" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="newDataDelFlag" name="new-data-del-flag" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Indicates whether this element was created as part of instantiation from this model" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="cardinality" name="cardinality" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="How many of this type of element are required/allowed" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="linkagePoints" name="linkage-points" type="java.lang.String" >
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v11.ModelElements">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Defines how other models combine to make up a higher-level model" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelConstraints" name="model-constraints" type="inventory.aai.onap.org.v11.ModelConstraints">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Describes new constraints on this model element that are not part of that model's definition" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="ModelConstraints">
+                       <xml-root-element name="model-constraints" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="modelConstraint" name="model-constraint" type="inventory.aai.onap.org.v11.ModelConstraint" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="ModelConstraint">
+                       <xml-properties>
+                               <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements." />
+                               <xml-property name="uniqueProps" value="model-constraint-uuid" />
+                               <xml-property name="indexedProps" value="model-constraint-uuid" />
+                               <xml-property name="allowDirectRead" value="true" />
+                               <xml-property name="allowDirectWrite" value="false" />
+                               <xml-property name="container" value="model-constraints" />
+                       </xml-properties>
+                       <xml-root-element name="model-constraint" />
+                       <java-attributes>
+                               <xml-element java-attribute="modelConstraintUuid" name="model-constraint-uuid" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="autoGenerateUuid" value="true" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="constrainedElementSetUuidToReplace" name="constrained-element-set-uuid-to-replace" required="true" type="java.lang.String" />
+                               <xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.onap.org.v11.ConstrainedElementSets" />
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="ConstrainedElementSets">
+                       <xml-root-element name="constrained-element-sets" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="constrainedElementSet" name="constrained-element-set" type="inventory.aai.onap.org.v11.ConstrainedElementSet" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="ConstrainedElementSet">
+                       <xml-properties>
+                               <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements." />
+                               <xml-property name="uniqueProps" value="constrained-element-set-uuid" />
+                               <xml-property name="indexedProps" value="constrained-element-set-uuid" />
+                               <xml-property name="allowDirectRead" value="true" />
+                               <xml-property name="allowDirectWrite" value="false" />
+                               <xml-property name="container" value="constrained-element-sets" />
+                       </xml-properties>
+                       <xml-root-element name="constrained-element-set" />
+                       <java-attributes>
+                               <xml-element java-attribute="constrainedElementSetUuid" name="constrained-element-set-uuid" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="autoGenerateUuid" value="true" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String" />
+                               <xml-element java-attribute="checkType" name="check-type" required="true" type="java.lang.String" />
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
+                               <xml-element java-attribute="elementChoiceSets" name="element-choice-sets" type="inventory.aai.onap.org.v11.ElementChoiceSets" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="ElementChoiceSets">
+                       <xml-root-element name="element-choice-sets" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="elementChoiceSet" name="element-choice-set" type="inventory.aai.onap.org.v11.ElementChoiceSet" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="ElementChoiceSet">
+                       <xml-properties>
+                               <xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements." />
+                               <xml-property name="uniqueProps" value="element-choice-set-uuid" />
+                               <xml-property name="indexedProps" value="element-choice-set-uuid" />
+                               <xml-property name="allowDirectRead" value="true" />
+                               <xml-property name="allowDirectWrite" value="false" />
+                               <xml-property name="container" value="element-choice-sets" />
+                       </xml-properties>
+                       <xml-root-element name="element-choice-set" />
+                       <java-attributes>
+                               <xml-element java-attribute="elementChoiceSetUuid" name="element-choice-set-uuid" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="autoGenerateUuid" value="true" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="elementChoiceSetName" name="element-choice-set-name" required="true" type="java.lang.String" />
+                               <xml-element java-attribute="cardinality" name="cardinality" type="java.lang.String" />
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
+                               <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v11.ModelElements" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="NamedQueries">
+                       <xml-root-element name="named-queries" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v11.NamedQuery" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="NamedQuery">
+                       <xml-properties>
+                               <xml-property name="description" value="TBD" />
+                               <xml-property name="nameProps" value="named-query-name" />
+                               <xml-property name="uniqueProps" value="named-query-uuid" />
+                               <xml-property name="indexedProps" value="named-query-uuid,named-query-name" />
+                               <xml-property name="container" value="named-queries" />
+                               <xml-property name="namespace" value="service-design-and-creation" />
+                       </xml-properties>
+                       <xml-root-element name="named-query" />
+                       <java-attributes>
+                               <xml-element java-attribute="namedQueryUuid" name="named-query-uuid" required="true" type="java.lang.String" xml-key="true" />
+                               <xml-element java-attribute="namedQueryName" name="named-query-name" required="true" type="java.lang.String" />
+                               <xml-element java-attribute="namedQueryVersion" name="named-query-version" required="true" type="java.lang.String" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="requiredInputParams" name="required-input-param" type="java.lang.String" >
+                                       <xml-element-wrapper name="required-input-params" />
+                               </xml-element>
+                               <xml-element java-attribute="description" name="description" type="java.lang.String" />
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
+                               <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v11.NamedQueryElements" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="NamedQueryElements">
+                       <xml-root-element name="named-query-elements" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="namedQueryElement" name="named-query-element" type="inventory.aai.onap.org.v11.NamedQueryElement" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="NamedQueryElement">
+                       <xml-properties>
+                               <xml-property name="description" value="TBD" />
+                               <xml-property name="uniqueProps" value="named-query-element-uuid" />
+                               <xml-property name="indexedProps" value="named-query-element-uuid" />
+                               <xml-property name="allowDirectRead" value="true" />
+                               <xml-property name="allowDirectWrite" value="false" />
+                               <xml-property name="container" value="named-query-elements" />
+                       </xml-properties>
+                       <xml-root-element name="named-query-element" />
+                       <java-attributes>
+                               <xml-element java-attribute="namedQueryElementUuid" name="named-query-element-uuid" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="autoGenerateUuid" value="true" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="propertyCollectList" name="property-collect-list" type="java.lang.String" />
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
+                               <xml-element java-attribute="propertyLimitDesc" name="property-limit-desc" type="java.lang.String" />
+                               <xml-element java-attribute="doNotOutput" name="do-not-output" type="java.lang.String" />
+                               <xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v11.NamedQueryElements" />
+                               <xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.onap.org.v11.RelatedLookups" />
+                               <xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.onap.org.v11.PropertyConstraints" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="RelatedLookups">
+                       <xml-root-element name="related-lookups" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="relatedLookup" name="related-lookup" type="inventory.aai.onap.org.v11.RelatedLookup" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="RelatedLookup">
+                       <xml-properties>
+                               <xml-property name="description" value="TBD" />
+                               <xml-property name="uniqueProps" value="related-lookup-uuid" />
+                               <xml-property name="indexedProps" value="related-lookup-uuid" />
+                               <xml-property name="allowDirectRead" value="true" />
+                               <xml-property name="allowDirectWrite" value="false" />
+                               <xml-property name="container" value="related-lookups" />
+                       </xml-properties>
+                       <xml-root-element name="related-lookup" />
+                       <java-attributes>
+                               <xml-element java-attribute="relatedLookupUuid" name="related-lookup-uuid" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="autoGenerateUuid" value="true" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="sourceNodeType" name="source-node-type" required="true" type="java.lang.String" />
+                               <xml-element java-attribute="sourceNodeProperty" name="source-node-property" required="true" type="java.lang.String" />
+                               <xml-element java-attribute="targetNodeType" name="target-node-type" required="true" type="java.lang.String" />
+                               <xml-element java-attribute="targetNodeProperty" name="target-node-property" required="true" type="java.lang.String" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="propertyCollectList" name="property-collect-list" type="java.lang.String" />
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="PropertyConstraints">
+                       <xml-root-element name="property-constraints" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="propertyConstraint" name="property-constraint" type="inventory.aai.onap.org.v11.PropertyConstraint" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="PropertyConstraint">
+                       <xml-properties>
+                               <xml-property name="description" value="TBD" />
+                               <xml-property name="uniqueProps" value="property-constraint-uuid" />
+                               <xml-property name="indexedProps" value="property-constraint-uuid" />
+                               <xml-property name="allowDirectRead" value="true" />
+                               <xml-property name="allowDirectWrite" value="false" />
+                               <xml-property name="container" value="property-constraints" />
+                       </xml-properties>
+                       <xml-root-element name="property-constraint" />
+                       <java-attributes>
+                               <xml-element java-attribute="propertyConstraintUuid" name="property-constraint-uuid" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="autoGenerateUuid" value="true" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String" />
+                               <xml-element java-attribute="propertyName" name="property-name" required="true" type="java.lang.String" />
+                               <xml-element java-attribute="propertyValue" name="property-value" required="true" type="java.lang.String" />
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="ModelAndNamedQuerySearch">
+                       <xml-properties>
+                               <xml-property name="description" value="ModelAndNamedQuerySearch holds query-parameters and instance-properties for performing a named-query or model query" />
+                       </xml-properties>
+                       <xml-root-element name="model-and-named-query-search" />
+                       <java-attributes>
+                               <xml-element java-attribute="queryParameters" name="query-parameters" type="inventory.aai.onap.org.v11.QueryParameters" />
+                               <xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.onap.org.v11.InstanceFilters" />
+                               <xml-element java-attribute="secondaryFilts" name="secondary-filts" type="inventory.aai.onap.org.v11.SecondaryFilts" />
+                               <xml-element java-attribute="topNodeType" name="top-node-type" type="java.lang.String" />
+                               <xml-element java-attribute="secondaryFilterCutPoint" name="secondary-filter-cut-point" type="java.lang.String" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="QueryParameters">
+                       <xml-properties>
+                               <xml-property name="description" value="QueryParameters for performing a named-query or model query" />
+                       </xml-properties>
+                       <xml-root-element name="query-parameters" />
+                       <java-attributes>
+                               <xml-element java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v11.NamedQuery" />
+                               <xml-element java-attribute="model" name="model" type="inventory.aai.onap.org.v11.OverloadedModel" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="OverloadedModel">
+                       <xml-root-element name="overloaded-model" />
+                       <xml-properties>
+                               <xml-property name="description" value="Allows for legacy POST of old-style and new-style models" />
+                       </xml-properties>
+                       <java-attributes>
+                               <xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique identifier corresponding to the main definition of a model in ASDC" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelNameVersionId" name="model-name-version-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique identifier corresponding to one version of a model in ASDC" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelType" name="model-type" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Type of the model, e.g., service, resource, widget, etc." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelName" name="model-name" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Name of the model, which can change from version to version." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelId" name="model-id" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Invariant unique ID which does not change from version to version" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelVersion" name="model-version" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Version" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelDescription" name="model-description" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Description" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.onap.org.v11.ModelVers" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="InstanceFilters">
+                       <xml-properties>
+                               <xml-property name="description" value="InstanceFilters for performing a named-query or model query" />
+                       </xml-properties>
+                       <xml-root-element name="instance-filters" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="instanceFilter" name="instance-filter" type="inventory.aai.onap.org.v11.InstanceFilter" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="InstanceFilter">
+                       <xml-properties>
+                               <xml-property name="description" value="InstanceFilter for performing a named-query or model query" />
+                               <xml-property name="container" value="instance-filters" />
+                       </xml-properties>
+                       <xml-root-element name="instance-filter" />
+                       <java-attributes>
+                               <xml-any-element container-type="java.util.ArrayList" java-attribute="any" lax="true" name="any" />
+                       </java-attributes>
+               </java-type>
+               
+               <java-type name="SecondaryFilts">
+                       <xml-properties>
+                               <xml-property name="description" value="SecondaryFilts for performing a named-query or model query" />
+                       </xml-properties>
+                       <xml-root-element name="secondary-filts" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilt" name="secondary-filt" type="inventory.aai.onap.org.v11.SecondaryFilt" />
+                       </java-attributes>
+               </java-type>
+               
+               <java-type name="SecondaryFilt">
+                       <xml-properties>
+                               <xml-property name="description" value="SecondaryFilt for performing a named-query or model query" />
+                       </xml-properties>
+                       <xml-root-element name="secondary-filt" />
+                       <java-attributes>
+                               <xml-any-element container-type="java.util.ArrayList" java-attribute="any" lax="true" name="any" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="Properties">
+                       <xml-properties>
+                               <xml-property name="description" value="Property holder for query properties or instance properties" />
+                       </xml-properties>
+                       <xml-root-element name="properties" />
+                       <java-attributes>
+                               <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" />
+                               <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="ResponseList">
+                       <xml-properties>
+                               <xml-property name="description" value="Response container for the results of a named-query or model query" />
+                       </xml-properties>
+                       <xml-root-element name="response-list" />
+                       <java-attributes>
+                               <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v11.InventoryResponseItems" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="InventoryResponseItems">
+                       <xml-properties>
+                               <xml-property name="description" value="Container for inventory items in response list" />
+                               <xml-property name="container" value="response-list" />
+                       </xml-properties>
+                       <xml-root-element name="inventory-response-items" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="inventoryResponseItem" name="inventory-response-item" type="inventory.aai.onap.org.v11.InventoryResponseItem" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="InventoryResponseItem">
+                       <xml-properties>
+                               <xml-property name="description" value="Inventory item for response list" />
+                               <xml-property name="container" value="inventory-response-items" />
+                       </xml-properties>
+                       <xml-root-element name="inventory-response-item" />
+                       <java-attributes>
+                               <xml-element java-attribute="modelName" name="model-name" type="java.lang.String" />
+                               <xml-any-element java-attribute="item" />
+                               <xml-element java-attribute="extraProperties" name="extra-properties" type="inventory.aai.onap.org.v11.ExtraProperties" />
+                               <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v11.InventoryResponseItems" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="ExtraProperties">
+                       <xml-properties>
+                               <xml-property name="description" value="Extra properties for inventory item for response list" />
+                       </xml-properties>
+                       <xml-root-element name="extra-properties" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.onap.org.v11.ExtraProperty" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="ExtraProperty">
+                       <xml-root-element name="extra-property" />
+                       <java-attributes>
+                               <xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" />
+                               <xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" />
+                       </java-attributes>
+               </java-type>
+               
+               <java-type name="RouteTableReferences">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of openstack route table references" />
+                       </xml-properties>
+                       <xml-root-element name="route-table-references" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="routeTableReference" name="route-table-reference" type="inventory.aai.onap.org.v11.RouteTableReference" />
+                       </java-attributes>
+               </java-type>
+               
+               <java-type name="RouteTableReference">
+                       <xml-root-element name="route-table-reference" />
+                       <java-attributes>
+                               <xml-element java-attribute="routeTableReferenceId" name="route-table-reference-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Route Table Reference id, UUID assigned to this instance." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="routeTableReferenceFqdn" name="route-table-reference-fqdn" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="FQDN entry in the route table." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Concurrency value" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       
+                       <xml-properties>
+                               <xml-property name="description" value="Openstack route table reference." />
+                               <xml-property name="nameProps" value="route-table-reference-fqdn" />
+                               <xml-property name="uniqueProps" value="route-table-reference-id" />
+                               <xml-property name="indexedProps" value="route-table-reference-id,route-table-reference-fqdn" />
+                               <xml-property name="container" value="route-table-references" />
+                               <xml-property name="namespace" value="network" />
+                       </xml-properties>
+               </java-type>
+               
+               <java-type name="InstanceGroups">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of openstack route table references" />
+                       </xml-properties>
+                       <xml-root-element name="instance-groups" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="instanceGroup" name="instance-group" type="inventory.aai.onap.org.v11.InstanceGroup" />
+                       </java-attributes>
+               </java-type>
+               
+               <java-type name="InstanceGroup">
+                       <xml-root-element name="instance-group" />
+                       <java-attributes>
+                               <xml-element java-attribute="instanceGroupRole" name="instance-group-role" required="false" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="role of the instance group." />
+                                       </xml-properties>
+                               </xml-element>
+
+                               <xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="false" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="ASDC model id for this resource or service model." />
+                                       </xml-properties>
+                               </xml-element>
+
+                               <xml-element java-attribute="modelVersionId" name="model-version-id" required="false" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="ASDC model version uid for this resource model." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Instance Group ID, UUID assigned to this instance." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="description" name="description" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Descriptive text to help identify the usage of this instance-group" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="type" name="type" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Only valid value today is lower case ha for high availability" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="subType" name="sub-type"  type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Valid values for ha type are [geo-activeactive, geo-activestandby, local-activeactive, local-activestandby]" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Concurrency value" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       
+                       <xml-properties>
+                               <xml-property name="description" value="General mechanism for grouping instances" />
+                               <xml-property name="nameProps" value="description" />
+                               <xml-property name="uniqueProps" value="id" />
+                               <xml-property name="searchable" value="id,description"/>
+                               <xml-property name="indexedProps" value="id,description,type,sub-type" />
+                               <xml-property name="container" value="instance-groups" />
+                               <xml-property name="namespace" value="network" />
+                       </xml-properties>
+               </java-type>
+               
+
+               <java-type name="SegmentationAssignments">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of openstack segmentation assignments" />
+                       </xml-properties>
+                       <xml-root-element name="segmentation-assignments" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="segmentationAssignment" name="segmentation-assignment" type="inventory.aai.onap.org.v11.SegmentationAssignment" />
+                       </java-attributes>
+               </java-type>
+                               
+               <java-type name="SegmentationAssignment">
+                       <xml-root-element name="segmentation-assignment" />
+                       <java-attributes>
+                               <xml-element java-attribute="segmentationId" name="segmentation-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Route Table Reference id, UUID assigned to this instance." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Concurrency value" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Openstack segmentation assignment." />
+                               <xml-property name="indexedProps" value="segmentation-id" />
+                               <xml-property name="dependentOn" value="l3-network" />
+                               <xml-property name="container" value="segmentation-assignments" />
+                       </xml-properties>
+               </java-type>
+               
+               <java-type name="AllottedResources">
+                       <xml-properties>
+                               <xml-property name="description" value="This object is used to store slices of services being offered" />
+                       </xml-properties>
+                       <xml-root-element name="allotted-resources" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="allottedResource" name="allotted-resource" type="inventory.aai.onap.org.v11.AllottedResource" />
+                       </java-attributes>
+               </java-type>
+               
+               <java-type name="AllottedResource">
+                       <xml-root-element name="allotted-resource" />
+                       <java-attributes>
+                               <xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Allotted Resource id UUID assigned to this instance." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="description" name="description" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="The descriptive information assigned to this allotted resource instance" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Link back to more information in the controller" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC model id for this resource or service model." />
+                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="requires" value="model-version-id" />
+                                               <xml-property name="dbAlias" value="model-invariant-id-local" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                                               <xml-property name="visibility" value="deployment" />
+                                               <xml-property name="requires" value="model-invariant-id" />
+                                               <xml-property name="dbAlias" value="model-version-id-local" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                                               <xml-property name="visibility" value="internal" />
+                                               <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Concurrency value" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Orchestration status" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Indicator for whether the resource is considered operational" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="type" name="type" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Generic description of the type of allotted resource." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="role" name="role" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="role in the network that this resource will be providing." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.onap.org.v11.TunnelXconnects" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       
+                       <xml-properties>
+                               <xml-property name="description" value="Represents a slice or partial piece of a resource that gets separately allotted" />
+                               <xml-property name="nameProps" value="description" />
+                               <xml-property name="uniqueProps" value="id" />
+                               <xml-property name="indexedProps" value="id,model-invariant-id,model-version-id,type,role" />
+                               <xml-property name="dependentOn" value="service-instance" />
+                               <xml-property name="container" value="allotted-resources" />
+                               <!--  <xml-property name="namespace" value="network" /> -->
+                       </xml-properties>
+               </java-type>    
+               
+               <java-type name="TunnelXconnects">
+                       <xml-properties>
+                               <xml-property name="description" value="This object is used to store the specific tunnel cross connect aspects of an allotted resource" />
+                       </xml-properties>
+                       <xml-root-element name="tunnel-xconnects" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="tunnelXconnect" name="tunnel-xconnect" type="inventory.aai.onap.org.v11.TunnelXconnect" />
+                       </java-attributes>
+               </java-type>
+               
+               <java-type name="TunnelXconnect">
+                       <xml-root-element name="tunnel-xconnect" />
+                       <java-attributes>
+                               <xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Allotted Resource id UUID assigned to this instance." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="bandwidthUpWan1" name="bandwidth-up-wan1" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="The WAN uplink bandwidth for WAN1" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="bandwidthDownWan1" name="bandwidth-down-wan1" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="The WAN downlink bandwidth for WAN1" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="bandwidthUpWan2" name="bandwidth-up-wan2" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="The WAN uplink bandwidth for WAN2" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="bandwidthDownWan2" name="bandwidth-down-wan2" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="The WAN downlink bandwidth for WAN2" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Concurrency value" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       
+                       <xml-properties>
+                               <xml-property name="description" value="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted" />
+                               <xml-property name="uniqueProps" value="id" />
+                               <xml-property name="indexedProps" value="id" />
+                               <xml-property name="dependentOn" value="allotted-resource" />
+                               <xml-property name="container" value="tunnel-xconnects" />
+                               <!--  <xml-property name="namespace" value="network" /> -->
+                       </xml-properties>
+               </java-type>
+               
+               <java-type name="Entitlements">
+                       <xml-properties>
+                               <xml-property name="description" value="Entitlements, keyed by group-uuid and resource-uuid, related to license management" />
+                       </xml-properties>
+                       <xml-root-element name="entitlements" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="entitlement" name="entitlement" type="inventory.aai.onap.org.v11.Entitlement" />
+                       </java-attributes>
+               </java-type>
+                               
+               <java-type name="Entitlement">
+                       <xml-root-element name="entitlement" />
+                       <java-attributes>
+                               <xml-element java-attribute="groupUuid" name="group-uuid" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique ID for the entitlement group the resource comes from, should be uuid." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceUuid" name="resource-uuid" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique ID of an entitlement resource. " />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Concurrency value" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Metadata for entitlement group." />
+                               <xml-property name="indexedProps" value="group-uuid,resource-uuid" />
+                               <xml-property name="dependentOn" value="generic-vnf,vce" />
+                               <xml-property name="container" value="entitlements" />
+                       </xml-properties>
+               </java-type>
+               
+               
+               <java-type name="Licenses">
+                       <xml-properties>
+                               <xml-property name="description" value="Licenses to be allocated across resources, keyed by group-uuid and resource-uuid, related to license management" />
+                       </xml-properties>
+                       <xml-root-element name="licenses" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="license" name="license" type="inventory.aai.onap.org.v11.License" />
+                       </java-attributes>
+               </java-type>
+                               
+               <java-type name="License">
+                       <xml-root-element name="license" />
+                       <java-attributes>
+                               <xml-element java-attribute="groupUuid" name="group-uuid" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique ID for the license group the resource belongs to, should be uuid." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceUuid" name="resource-uuid" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique ID of a license resource. " />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Concurrency value" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Metadata for license group." />
+                               <xml-property name="indexedProps" value="group-uuid,resource-uuid" />
+                               <xml-property name="dependentOn" value="generic-vnf,vce" />
+                               <xml-property name="container" value="licenses" />
+                       </xml-properties>
+               </java-type>
+               
+               <java-type name="Vnf">
+                       <xml-root-element name="vnf"/>
+                       <java-attributes>
+                               <xml-element java-attribute="vnfId" name="vnf-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique id of VNF.  This is unique across the graph." />
+                                       </xml-properties>
+                               </xml-element>
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Abstract vnf class" />
+                               <xml-property name="indexedProps" value="vnf-id" />
+                               <xml-property name="uniqueProps" value="vnf-id" />
+                               <xml-property name="inheritors" value="vce,generic-vnf" />
+                               <xml-property name="abstract" value="true" />
+                       </xml-properties>
+               </java-type>
+               
+               <java-type name="Zones">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of zones" />
+                       </xml-properties>
+                       <xml-root-element name="zones" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="zone" name="zone" type="inventory.aai.onap.org.v11.Zone" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="Zone">
+                       <xml-root-element name="zone" />
+                       <java-attributes>
+                               <xml-element java-attribute="zoneId" name="zone-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Code assigned by AIC to the zone" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="zoneName" name="zone-name" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="English name associated with the zone" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="designType" name="design-type" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Design of zone [Medium/Large?]" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="zoneContext" name="zone-context" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Context of zone [production/test]" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="status" name="status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Status of a zone." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Concurrency value" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="A zone is a grouping of assets in a location homing to the same connections into the CBB" />
+                               <xml-property name="nameProps" value="zone-name" />
+                               <xml-property name="indexedProps" value="zone-id,design-type,zone-context" />
+                               <xml-property name="uniqueProps" value="zone-id" />
+                               <xml-property name="container" value="zones" />
+                               <xml-property name="namespace" value="network" />
+                       </xml-properties>
+               </java-type>
+               <java-type name="RouteTargets">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of route target information" />
+                       </xml-properties>
+                       <xml-root-element name="route-targets" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="routeTarget" name="route-target" type="inventory.aai.onap.org.v11.RouteTarget" />
+                       </java-attributes>
+               </java-type>
+               <java-type name="RouteTarget">
+                       <xml-root-element name="route-target" />
+                       <java-attributes>
+                               <xml-element java-attribute="globalRouteTarget" name="global-route-target" required="true" xml-key="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Number used to identify an RT, globally unique in the network" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="routeTargetRole" name="route-target-role" required="true" xml-key="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Role assigned to this route target" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Route target information" />
+                               <xml-property name="container" value="route-targets" />
+                               <xml-property name="dependentOn" value="vpn-binding" />
+                               <xml-property name="canBeLinked" value="true" />
+                       </xml-properties>
+               </java-type>
+                                               
+               <java-type name="SriovPfs">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of SR-IOV Physical Functions." />
+                       </xml-properties>
+                       <xml-root-element name="sriov-pfs" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="sriovPf" name="sriov-pf" type="inventory.aai.onap.org.v11.SriovPf" />
+                       </java-attributes>
+               </java-type>
+               <java-type name="SriovPf">
+                       <xml-root-element name="sriov-pf" />
+                       <java-attributes>
+                               <xml-element java-attribute="pfPciId" name="pf-pci-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Identifier for the sriov-pf" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="SR-IOV Physical Function" />
+                               <xml-property name="indexedProps" value="pf-pci-id" />
+                               <xml-property name="dependentOn" value="p-interface" />
+                               <xml-property name="container" value="sriov-pfs" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="HostRoutes">
+                       <xml-root-element name="host-routes" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="hostRoute" name="host-route" type="inventory.aai.onap.org.v11.HostRoute" />
+                       </java-attributes>
+               </java-type>
+               <java-type name="HostRoute">
+                       <xml-root-element name="host-route" />
+                       <java-attributes>
+                               <xml-element java-attribute="hostRouteId" name="host-route-id" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="host-route id" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="routePrefix" name="route-prefix" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="subnet prefix" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="nextHop" name="next-hop" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Could be ip-address, hostname, or service-instance" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="nextHopType" name="next-hop-type" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Should be ip-address, hostname, or service-instance to match next-hop" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="indexedProps" value="host-route-id" />
+                               <xml-property name="dependentOn" value="subnet" />
+                               <xml-property name="container" value="host-routes" />
+                       </xml-properties>
+               </java-type>
+               <java-type name="VipIpv4AddressList">
+                       <xml-root-element name="vip-ipv4-address-list" />
+                       <java-attributes>
+                               <xml-element java-attribute="vipIpv4Address" name="vip-ipv4-address" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="IP address" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vipIpv4PrefixLength" name="vip-ipv4-prefix-length" type="java.lang.Long">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Prefix length, 32 for single address" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Inner VLAN tag" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Outer VLAN tag" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Indicator of fixed or floating address" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Neutron network id of the interface that address belongs to" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Neutron id of subnet that address belongs to" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="IPv4 Address Range" />
+                               <xml-property name="indexedProps" value="vip-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id" />
+                               <xml-property name="dependentOn" value="cloud-region" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="VipIpv6AddressList">
+                       <xml-root-element name="vip-ipv6-address-list" />
+                       <java-attributes>
+                               <xml-element java-attribute="vipIpv6Address" name="vip-ipv6-address" required="true" type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="IP address" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vipIpv6PrefixLength" name="vip-ipv6-prefix-length" type="java.lang.Long">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Prefix length, 128 for single address" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Inner VLAN tag" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Outer VLAN tag" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Indicator of fixed or floating address" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Neutron network id of the interface that address belongs to" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Neutron id of subnet that address belongs to" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="IPv6 Address Range" />
+                               <xml-property name="indexedProps" value="vip-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id" />
+                               <xml-property name="dependentOn" value="cloud-region" />
+                       </xml-properties>
+               </java-type>
+       </java-types>
+</xml-bindings>
diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/mr-dmaap-health.json b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/mr-dmaap-health.json
new file mode 100644 (file)
index 0000000..bd01bc5
--- /dev/null
@@ -0,0 +1,10 @@
+{
+  "service": {
+    "name": "Health Check: Message Router - DMaaP",
+    "check": {
+      "http": "http://dmaap.onap-message-router:3904/topics",
+      "interval": "30s",
+      "timeout": "1s"
+    }
+  }
+}
diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/mr-kafka-health.json b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/mr-kafka-health.json
new file mode 100644 (file)
index 0000000..128cf94
--- /dev/null
@@ -0,0 +1,10 @@
+{
+ "service": {
+   "name": "Health Check: Message Router - Kafka",
+   "check": {
+     "script": "/consul/config/scripts/mr-kafka-health.sh",
+     "interval": "30s",
+     "timeout": "1s"
+   }
+ }
+}
diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/mr-zookeeper-health.json b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/mr-zookeeper-health.json
new file mode 100644 (file)
index 0000000..5268747
--- /dev/null
@@ -0,0 +1,10 @@
+{
+ "service": {
+   "name": "Health Check: Message Router - ZooKeeper",
+   "check": {
+     "script": "/consul/config/scripts/mr-zookeeper-health.sh",
+     "interval": "30s",
+     "timeout": "1s"
+   }
+ }
+}
diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/mso-health.json b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/mso-health.json
new file mode 100644 (file)
index 0000000..354cd9e
--- /dev/null
@@ -0,0 +1,28 @@
+{
+  "service": {
+    "name": "Health Check: MSO",
+    "checks": [
+      {
+        "id": "mso-api-healthcheck",
+        "name": "MSO API Health Check",
+        "script": "/consul/config/scripts/mso-api-script.sh",
+        "interval": "10s",
+        "timeout": "1s"
+      },
+      {
+        "id": "mso-camunda-healthcheck",
+        "name": "MSO Camunda Health Check",
+        "script": "/consul/config/scripts/mso-camunda-script.sh",
+        "interval": "10s",
+        "timeout": "1s"
+      },
+      {
+        "id": "mso-jra-healthcheck",
+        "name": "MSO JRA Health Check",
+        "script": "/consul/config/scripts/mso-jra-script.sh",
+        "interval": "10s",
+        "timeout": "1s"
+      }
+    ]
+  }
+}
diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mr-kafka-health.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mr-kafka-health.sh
new file mode 100644 (file)
index 0000000..317c2a6
--- /dev/null
@@ -0,0 +1,13 @@
+kafkapod=$(/consul/config/bin/kubectl -n onap-message-router get pod | grep -o "global-kafka-[^[:space:]]*")
+if [ -n "$kafkapod" ]; then
+   if /consul/config/bin/kubectl -n onap-message-router exec -it $kafkapod -- ps ef | grep -i kafka; then
+      echo Success. Kafka process is running. 2>&1
+      exit 0
+   else
+      echo Failed. Kafka is not running. 2>&1
+      exit 1
+   fi
+else
+   echo Failed. Kafka container is offline. 2>&1
+   exit 1
+fi
diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mr-zookeeper-health.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mr-zookeeper-health.sh
new file mode 100644 (file)
index 0000000..3da456c
--- /dev/null
@@ -0,0 +1,13 @@
+zkpod=$(/consul/config/bin/kubectl -n onap-message-router get pod | grep -o "zookeeper-[^[:space:]]*")
+if [ -n "$zkpod" ]; then
+   if /consul/config/bin/kubectl -n onap-message-router exec -it $zkpod -- ps ef | grep -i zookeeper; then
+      echo Success. Zookeeper process is running. 2>&1
+      exit 0
+   else
+      echo Failed. Zookeeper is not running. 2>&1
+      exit 1
+   fi
+else
+   echo Failed. Zookeeper container is offline. 2>&1
+   exit 1
+fi
diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-api-script.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-api-script.sh
new file mode 100644 (file)
index 0000000..ba0afc0
--- /dev/null
@@ -0,0 +1,15 @@
+## Query the health check API.
+HEALTH_CHECK_ENDPOINT="http://mso.onap-mso.svc.cluster.local:8080/ecomp/mso/infra/healthcheck"
+HEALTH_CHECK_RESPONSE=$(curl -s $HEALTH_CHECK_ENDPOINT)
+
+READY=$(echo $HEALTH_CHECK_RESPONSE | grep "Application ready")
+
+if [ -n $READY ]; then
+  echo "Query against health check endpoint: $HEALTH_CHECK_ENDPOINT"
+  echo "Produces response: $HEALTH_CHECK_RESPONSE"
+  echo "Application is not in an available state"
+  return 2
+else
+  echo "Application is available."
+  return 0
+fi
diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-camunda-script.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-camunda-script.sh
new file mode 100644 (file)
index 0000000..254a044
--- /dev/null
@@ -0,0 +1,15 @@
+## Query the health check API.
+HEALTH_CHECK_ENDPOINT="http://mso.onap-mso.svc.cluster.local:8080/mso/healthcheck"
+HEALTH_CHECK_RESPONSE=$(curl -s $HEALTH_CHECK_ENDPOINT)
+
+READY=$(echo $HEALTH_CHECK_RESPONSE | grep "Application ready")
+
+if [ -n $READY ]; then
+  echo "Query against health check endpoint: $HEALTH_CHECK_ENDPOINT"
+  echo "Produces response: $HEALTH_CHECK_RESPONSE"
+  echo "Application is not in an available state"
+  return 2
+else
+  echo "Application is available."
+  return 0
+fi
diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-jra-script.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-jra-script.sh
new file mode 100644 (file)
index 0000000..29ffd8f
--- /dev/null
@@ -0,0 +1,15 @@
+## Query the health check API.
+HEALTH_CHECK_ENDPOINT="http://mso.onap-mso.svc.cluster.local:8080/networks/rest/healthcheck"
+HEALTH_CHECK_RESPONSE=$(curl -s $HEALTH_CHECK_ENDPOINT)
+
+READY=$(echo $HEALTH_CHECK_RESPONSE | grep "Application ready")
+
+if [ -n $READY ]; then
+  echo "Query against health check endpoint: $HEALTH_CHECK_ENDPOINT"
+  echo "Produces response: $HEALTH_CHECK_RESPONSE"
+  echo "Application is not in an available state"
+  return 2
+else
+  echo "Application is available."
+  return 0
+fi
diff --git a/kubernetes/config/docker/init/src/config/mso/docker-files/chef-configs/solo.rb b/kubernetes/config/docker/init/src/config/mso/docker-files/chef-configs/solo.rb
deleted file mode 100644 (file)
index 5e82475..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-current_dir = File.dirname(__FILE__)
-log_level :info
-log_location STDOUT
-node_name "mso"
-syntax_check_cache_path "#{current_dir}/syntaxcache"
-cookbook_path ["/var/berks-cookbooks"]
-environment_path "/var/berks-cookbooks/CHEF_REPO_NAME_TO_REPLACE/environments"
-environment "mso-docker"
-
diff --git a/kubernetes/config/docker/init/src/config/mso/docker-files/jboss-configs/configuration/application-roles.properties b/kubernetes/config/docker/init/src/config/mso/docker-files/jboss-configs/configuration/application-roles.properties
deleted file mode 100644 (file)
index de9b0aa..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Properties declaration of users roles for the realm 'ApplicationRealm' which is the default realm
-# for application services on a new installation.
-#
-# This includes the following protocols: remote ejb, remote jndi, web, remote jms
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# The format of this file is as follows: -
-# username=role1,role2,role3
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-#  bin/add-user.sh
-#
-# - Windows
-#  bin\add-user.bat
-#
-# The following illustrates how an admin user could be defined.
-#
-#admin=PowerUser,BillingAdmin,
-#guest=guest
-CSIClient=CSI-Client
-CCDClient=CCD-Client
-GUIClient=GUI-Client
-BPMNClient=BPMN-Client
-InfraPortalClient=InfraPortal-Client
-MSOClient=MSO-Client
-sitecontrol=SiteControl-Client
-MSO=AAIEmul-Client
-BPELClient=BPEL-Client
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/mso/docker-files/jboss-configs/configuration/application-users.properties b/kubernetes/config/docker/init/src/config/mso/docker-files/jboss-configs/configuration/application-users.properties
deleted file mode 100644 (file)
index a04d222..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Properties declaration of users for the realm 'ApplicationRealm' which is the default realm
-# for application services on a new installation.
-#
-# This includes the following protocols: remote ejb, remote jndi, web, remote jms
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# The format of this realm is as follows: -
-# username=HEX( MD5( username ':' realm ':' password))
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-#  bin/add-user.sh
-#
-# - Windows
-#  bin\add-user.bat
-#
-#$REALM_NAME=ApplicationRealm$ This line is used by the add-user utility to identify the realm name already used in this file.
-#
-# The following illustrates how an admin user could be defined, this
-# is for illustration only and does not correspond to a usable password.
-#
-#admin=2a0923285184943425d1f53ddd58ec7a
-CSIClient=0024f53a4ec012c22d9575a3710ed362
-CCDClient=c5e97286d4251605d8ef72f727ac1da6
-GUIClient=583075cf28c7c69c3a8b08356830b856
-BPMNClient=42b98ca2e0cc976d91a26c1495ecd529
-InfraPortalClient=e5077b432685a94babe332893337f6fc
-MSOClient=72bc85031ae67afe67014c7663ae1033
-sitecontrol=9a3a360d86758f69ec9508725c017335
-MSO=a05cb60a04f41f750ce1fc60a2633534
-BPELClient=f2b4ce8ae1964050c0ad7e69bd88fd62
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/mso/docker-files/jboss-configs/configuration/mgmt-groups.properties b/kubernetes/config/docker/init/src/config/mso/docker-files/jboss-configs/configuration/mgmt-groups.properties
deleted file mode 100644 (file)
index 44742a8..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Properties declaration of users groups for the realm 'ManagementRealm'.
-#
-# This is used for domain management, users groups membership information is used to assign the user
-# specific management roles.
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# The format of this file is as follows: -
-# username=role1,role2,role3
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-#  bin/add-user.sh
-#
-# - Windows
-#  bin\add-user.bat
-#
-# The following illustrates how an admin user could be defined.
-#
-#admin=PowerUser,BillingAdmin,
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/mso/docker-files/jboss-configs/configuration/mgmt-users.properties b/kubernetes/config/docker/init/src/config/mso/docker-files/jboss-configs/configuration/mgmt-users.properties
deleted file mode 100644 (file)
index 1576e76..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Properties declaration of users for the realm 'ManagementRealm' which is the default realm
-# for new installations. Further authentication mechanism can be configured
-# as part of the <management /> in standalone.xml.
-#
-# Users can be added to this properties file at any time, updates after the server has started
-# will be automatically detected.
-#
-# By default the properties realm expects the entries to be in the format: -
-# username=HEX( MD5( username ':' realm ':' password))
-#
-# A utility script is provided which can be executed from the bin folder to add the users: -
-# - Linux
-#  bin/add-user.sh
-#
-# - Windows
-#  bin\add-user.bat
-# On start-up the server will also automatically add a user $local - this user is specifically
-# for local tools running against this AS installation.
-#
-# The following illustrates how an admin user could be defined, this
-# is for illustration only and does not correspond to a usable password.
-#
-admin=281905e1b4420050a7f07eecba66ee68
-#
-#$REALM_NAME=ManagementRealm$ This line is used by the add-user utility to identify the realm name already used in this file.
-#
diff --git a/kubernetes/config/docker/init/src/config/mso/docker-files/jboss-configs/configuration/standalone-full-ha.xml b/kubernetes/config/docker/init/src/config/mso/docker-files/jboss-configs/configuration/standalone-full-ha.xml
deleted file mode 100644 (file)
index cface7f..0000000
+++ /dev/null
@@ -1,609 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<server xmlns="urn:jboss:domain:4.2">
-
-    <extensions>
-        <extension module="org.jboss.as.clustering.infinispan"/>
-        <extension module="org.jboss.as.clustering.jgroups"/>
-        <extension module="org.jboss.as.connector"/>
-        <extension module="org.jboss.as.deployment-scanner"/>
-        <extension module="org.jboss.as.ee"/>
-        <extension module="org.jboss.as.ejb3"/>
-        <extension module="org.jboss.as.jaxrs"/>
-        <extension module="org.jboss.as.jdr"/>
-        <extension module="org.jboss.as.jmx"/>
-        <extension module="org.jboss.as.jpa"/>
-        <extension module="org.jboss.as.jsf"/>
-        <extension module="org.jboss.as.jsr77"/>
-        <extension module="org.jboss.as.logging"/>
-        <extension module="org.jboss.as.mail"/>
-        <extension module="org.jboss.as.modcluster"/>
-        <extension module="org.jboss.as.naming"/>
-        <extension module="org.jboss.as.pojo"/>
-        <extension module="org.jboss.as.remoting"/>
-        <extension module="org.jboss.as.sar"/>
-        <extension module="org.jboss.as.security"/>
-        <extension module="org.jboss.as.transactions"/>
-        <extension module="org.jboss.as.webservices"/>
-        <extension module="org.jboss.as.weld"/>
-        <extension module="org.wildfly.extension.batch.jberet"/>
-        <extension module="org.wildfly.extension.bean-validation"/>
-        <extension module="org.wildfly.extension.clustering.singleton"/>
-        <extension module="org.wildfly.extension.io"/>
-        <extension module="org.wildfly.extension.messaging-activemq"/>
-        <extension module="org.wildfly.extension.request-controller"/>
-        <extension module="org.wildfly.extension.security.manager"/>
-        <extension module="org.wildfly.extension.undertow"/>
-        <extension module="org.wildfly.iiop-openjdk"/>
-    </extensions>
-
-
-    <management>
-        <security-realms>
-            <security-realm name="ManagementRealm">
-                <authentication>
-                    <local default-user="$local" skip-group-loading="true"/>
-                    <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
-                </authentication>
-                <authorization map-groups-to-roles="false">
-                    <properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
-                </authorization>
-            </security-realm>
-            <security-realm name="ApplicationRealm">
-                <server-identities>
-                    <ssl>
-                        <keystore path="application.keystore" relative-to="jboss.server.config.dir" keystore-password="password" alias="server" key-password="password" generate-self-signed-certificate-host="localhost"/>
-                    </ssl>
-                </server-identities>
-                <authentication>
-                    <local default-user="$local" allowed-users="*" skip-group-loading="true"/>
-                    <properties path="application-users.properties" relative-to="jboss.server.config.dir"/>
-                </authentication>
-                <authorization>
-                    <properties path="application-roles.properties" relative-to="jboss.server.config.dir"/>
-                </authorization>
-            </security-realm>
-        </security-realms>
-        <audit-log>
-            <formatters>
-                <json-formatter name="json-formatter"/>
-            </formatters>
-            <handlers>
-                <file-handler name="file" formatter="json-formatter" path="audit-log.log" relative-to="jboss.server.data.dir"/>
-            </handlers>
-            <logger log-boot="true" log-read-only="false" enabled="false">
-                <handlers>
-                    <handler name="file"/>
-                </handlers>
-            </logger>
-        </audit-log>
-        <management-interfaces>
-            <http-interface security-realm="ManagementRealm" http-upgrade-enabled="true">
-                <socket-binding http="management-http"/>
-            </http-interface>
-        </management-interfaces>
-        <access-control provider="simple">
-            <role-mapping>
-                <role name="SuperUser">
-                    <include>
-                        <user name="$local"/>
-                    </include>
-                </role>
-            </role-mapping>
-        </access-control>
-    </management>
-
-    <profile>
-        <subsystem xmlns="urn:jboss:domain:logging:3.0">
-            <console-handler name="CONSOLE">
-                <level name="INFO"/>
-                <formatter>
-                    <named-formatter name="COLOR-PATTERN"/>
-                </formatter>
-            </console-handler>
-            <periodic-rotating-file-handler name="FILE" autoflush="true">
-                <formatter>
-                    <named-formatter name="PATTERN"/>
-                </formatter>
-                <file relative-to="jboss.server.log.dir" path="server.log"/>
-                <suffix value=".yyyy-MM-dd"/>
-                <append value="true"/>
-            </periodic-rotating-file-handler>
-            <logger category="com.arjuna">
-                <level name="WARN"/>
-            </logger>
-            <logger category="org.jboss.as.config">
-                <level name="DEBUG"/>
-            </logger>
-            <logger category="sun.rmi">
-                <level name="WARN"/>
-            </logger>
-            <root-logger>
-                <level name="INFO"/>
-                <handlers>
-                    <handler name="CONSOLE"/>
-                    <handler name="FILE"/>
-                </handlers>
-            </root-logger>
-            <formatter name="PATTERN">
-                <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n"/>
-            </formatter>
-            <formatter name="COLOR-PATTERN">
-                <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n"/>
-            </formatter>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:batch-jberet:1.0">
-            <default-job-repository name="in-memory"/>
-            <default-thread-pool name="batch"/>
-            <job-repository name="in-memory">
-                <in-memory/>
-            </job-repository>
-            <thread-pool name="batch">
-                <max-threads count="10"/>
-                <keepalive-time time="30" unit="seconds"/>
-            </thread-pool>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:bean-validation:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:datasources:4.0">
-            <datasources>
-                <datasource jndi-name="java:jboss/datasources/mso-requests" pool-name="mso-requests" enabled="true" use-ccm="true">
-                    <connection-url>jdbc:mariadb://mariadb:3306/mso_requests?autoReconnect=true&amp;connectTimeout=60000&amp;socketTimeout=60000</connection-url>
-                    <driver>mariadb</driver>
-                    <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>
-                    <pool>
-                        <min-pool-size>10</min-pool-size>
-                        <max-pool-size>100</max-pool-size>
-                        <prefill>true</prefill>
-                        <use-strict-min>false</use-strict-min>
-                        <flush-strategy>FailingConnectionOnly</flush-strategy>
-                    </pool>
-                    <security>
-                        <user-name>mso</user-name>
-                        <password>mso123</password>
-                    </security>
-                    <validation>
-                        <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLValidConnectionChecker"/>
-                        <validate-on-match>false</validate-on-match>
-                        <background-validation>true</background-validation>
-                        <background-validation-millis>20000</background-validation-millis>
-                        <use-fast-fail>true</use-fast-fail>
-                        <exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLExceptionSorter"/>
-                    </validation>
-                    <timeout>
-                        <idle-timeout-minutes>15</idle-timeout-minutes>
-                        <query-timeout>30</query-timeout>
-                        <allocation-retry>1</allocation-retry>
-                        <allocation-retry-wait-millis>3000</allocation-retry-wait-millis>
-                    </timeout>
-                </datasource>
-                <datasource jndi-name="java:jboss/datasources/mso-catalog" pool-name="mso-catalog" enabled="true" use-ccm="true">
-                    <connection-url>jdbc:mariadb://mariadb:3306/mso_catalog?autoReconnect=true&amp;connectTimeout=60000&amp;socketTimeout=60000</connection-url>
-                    <driver>mariadb</driver>
-                    <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>
-                    <pool>
-                        <min-pool-size>10</min-pool-size>
-                        <max-pool-size>100</max-pool-size>
-                        <prefill>true</prefill>
-                        <use-strict-min>false</use-strict-min>
-                        <flush-strategy>FailingConnectionOnly</flush-strategy>
-                    </pool>
-                    <security>
-                        <user-name>catalog</user-name>
-                        <password>catalog123</password>
-                    </security>
-                    <validation>
-                        <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLValidConnectionChecker"/>
-                        <validate-on-match>false</validate-on-match>
-                        <background-validation>true</background-validation>
-                        <background-validation-millis>20000</background-validation-millis>
-                        <use-fast-fail>true</use-fast-fail>
-                        <exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLExceptionSorter"/>
-                    </validation>
-                    <timeout>
-                        <idle-timeout-minutes>15</idle-timeout-minutes>
-                        <query-timeout>30</query-timeout>
-                        <allocation-retry>1</allocation-retry>
-                        <allocation-retry-wait-millis>3000</allocation-retry-wait-millis>
-                    </timeout>
-                </datasource>
-                <datasource jta="true" jndi-name="java:jboss/datasources/ProcessEngine" pool-name="ProcessEngine" enabled="true" use-java-context="true" use-ccm="true">
-                    <connection-url>jdbc:mariadb://mariadb:3306/camundabpmn?autoReconnect=true&amp;connectTimeout=60000&amp;socketTimeout=60000</connection-url>
-                    <driver>mariadb</driver>
-                    <new-connection-sql>set autocommit=1</new-connection-sql>
-                    <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>
-                    <pool>
-                        <min-pool-size>10</min-pool-size>
-                        <max-pool-size>100</max-pool-size>
-                        <prefill>true</prefill>
-                        <use-strict-min>false</use-strict-min>
-                        <flush-strategy>FailingConnectionOnly</flush-strategy>
-                    </pool>
-                    <security>
-                        <user-name>camunda</user-name>
-                        <password>camunda123</password>
-                    </security>
-                    <validation>
-                        <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLValidConnectionChecker"/>
-                        <exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLExceptionSorter"/>
-                    </validation>
-                    <statement>
-                        <prepared-statement-cache-size>32</prepared-statement-cache-size>
-                        <share-prepared-statements>true</share-prepared-statements>
-                    </statement>
-                </datasource>
-                <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
-                    <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
-                    <driver>h2</driver>
-                    <security>
-                        <user-name>sa</user-name>
-                        <password>sa</password>
-                    </security>
-                </datasource>
-                <drivers>
-                    <driver name="h2" module="com.h2database.h2">
-                        <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
-                    </driver>
-                    <driver name="mariadb" module="mariadb">
-                        <xa-datasource-class>org.mariadb.jdbc.MySQLDataSource</xa-datasource-class>
-                    </driver>
-                </drivers>
-            </datasources>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
-            <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:ee:4.0">
-            <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
-            <concurrent>
-                <context-services>
-                    <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" use-transaction-setup-provider="true"/>
-                </context-services>
-                <managed-thread-factories>
-                    <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
-                </managed-thread-factories>
-                <managed-executor-services>
-                    <managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-threshold="60000" keepalive-time="5000"/>
-                </managed-executor-services>
-                <managed-scheduled-executor-services>
-                    <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" keepalive-time="3000"/>
-                </managed-scheduled-executor-services>
-            </concurrent>
-            <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" jms-connection-factory="java:jboss/DefaultJMSConnectionFactory" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:ejb3:4.0">
-            <session-bean>
-                <stateless>
-                    <bean-instance-pool-ref pool-name="slsb-strict-max-pool"/>
-                </stateless>
-                <stateful default-access-timeout="5000" cache-ref="distributable" passivation-disabled-cache-ref="simple"/>
-                <singleton default-access-timeout="5000"/>
-            </session-bean>
-            <mdb>
-                <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/>
-                <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
-            </mdb>
-            <pools>
-                <bean-instance-pools>
-                    <strict-max-pool name="slsb-strict-max-pool" derive-size="from-worker-pools" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
-                    <strict-max-pool name="mdb-strict-max-pool" derive-size="from-cpu-count" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
-                </bean-instance-pools>
-            </pools>
-            <caches>
-                <cache name="simple"/>
-                <cache name="distributable" passivation-store-ref="infinispan" aliases="passivating clustered"/>
-            </caches>
-            <passivation-stores>
-                <passivation-store name="infinispan" cache-container="ejb" max-size="10000"/>
-            </passivation-stores>
-            <async thread-pool-name="default"/>
-            <timer-service thread-pool-name="default" default-data-store="default-file-store">
-                <data-stores>
-                    <file-data-store name="default-file-store" path="timer-service-data" relative-to="jboss.server.data.dir"/>
-                </data-stores>
-            </timer-service>
-            <remote connector-ref="http-remoting-connector" thread-pool-name="default"/>
-            <thread-pools>
-                <thread-pool name="default">
-                    <max-threads count="10"/>
-                    <keepalive-time time="100" unit="milliseconds"/>
-                </thread-pool>
-            </thread-pools>
-            <iiop enable-by-default="false" use-qualified-name="false"/>
-            <default-security-domain value="other"/>
-            <default-missing-method-permissions-deny-access value="true"/>
-            <log-system-exceptions value="true"/>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:io:1.1">
-            <worker name="default"/>
-            <buffer-pool name="default"/>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:infinispan:4.0">
-            <cache-container name="server" aliases="singleton cluster" default-cache="default" module="org.wildfly.clustering.server">
-                <transport lock-timeout="60000"/>
-                <replicated-cache name="default" mode="SYNC">
-                    <transaction mode="BATCH"/>
-                </replicated-cache>
-            </cache-container>
-            <cache-container name="web" default-cache="dist" module="org.wildfly.clustering.web.infinispan">
-                <transport lock-timeout="60000"/>
-                <distributed-cache name="dist" mode="ASYNC" l1-lifespan="0" owners="2">
-                    <locking isolation="REPEATABLE_READ"/>
-                    <transaction mode="BATCH"/>
-                    <file-store/>
-                </distributed-cache>
-                <distributed-cache name="concurrent" mode="SYNC" l1-lifespan="0" owners="2">
-                    <file-store/>
-                </distributed-cache>
-            </cache-container>
-            <cache-container name="ejb" aliases="sfsb" default-cache="dist" module="org.wildfly.clustering.ejb.infinispan">
-                <transport lock-timeout="60000"/>
-                <distributed-cache name="dist" mode="ASYNC" l1-lifespan="0" owners="2">
-                    <locking isolation="REPEATABLE_READ"/>
-                    <transaction mode="BATCH"/>
-                    <file-store/>
-                </distributed-cache>
-            </cache-container>
-            <cache-container name="hibernate" default-cache="local-query" module="org.hibernate.infinispan">
-                <transport lock-timeout="60000"/>
-                <local-cache name="local-query">
-                    <eviction strategy="LRU" max-entries="10000"/>
-                    <expiration max-idle="100000"/>
-                </local-cache>
-                <invalidation-cache name="entity" mode="SYNC">
-                    <transaction mode="NON_XA"/>
-                    <eviction strategy="LRU" max-entries="10000"/>
-                    <expiration max-idle="100000"/>
-                </invalidation-cache>
-                <replicated-cache name="timestamps" mode="ASYNC"/>
-            </cache-container>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:iiop-openjdk:1.0">
-            <orb socket-binding="iiop" ssl-socket-binding="iiop-ssl"/>
-            <initializers security="identity" transactions="spec"/>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:jca:4.0">
-            <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
-            <bean-validation enabled="true"/>
-            <default-workmanager>
-                <short-running-threads>
-                    <core-threads count="50"/>
-                    <queue-length count="50"/>
-                    <max-threads count="50"/>
-                    <keepalive-time time="10" unit="seconds"/>
-                </short-running-threads>
-                <long-running-threads>
-                    <core-threads count="50"/>
-                    <queue-length count="50"/>
-                    <max-threads count="50"/>
-                    <keepalive-time time="10" unit="seconds"/>
-                </long-running-threads>
-            </default-workmanager>
-            <cached-connection-manager/>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:jgroups:4.0">
-            <channels default="ee">
-                <channel name="ee" stack="udp"/>
-            </channels>
-            <stacks>
-                <stack name="udp">
-                    <transport type="UDP" socket-binding="jgroups-udp"/>
-                    <protocol type="PING"/>
-                    <protocol type="MERGE3"/>
-                    <protocol type="FD_SOCK" socket-binding="jgroups-udp-fd"/>
-                    <protocol type="FD_ALL"/>
-                    <protocol type="VERIFY_SUSPECT"/>
-                    <protocol type="pbcast.NAKACK2"/>
-                    <protocol type="UNICAST3"/>
-                    <protocol type="pbcast.STABLE"/>
-                    <protocol type="pbcast.GMS"/>
-                    <protocol type="UFC"/>
-                    <protocol type="MFC"/>
-                    <protocol type="FRAG2"/>
-                </stack>
-                <stack name="tcp">
-                    <transport type="TCP" socket-binding="jgroups-tcp"/>
-                    <protocol type="MPING" socket-binding="jgroups-mping"/>
-                    <protocol type="MERGE3"/>
-                    <protocol type="FD_SOCK" socket-binding="jgroups-tcp-fd"/>
-                    <protocol type="FD"/>
-                    <protocol type="VERIFY_SUSPECT"/>
-                    <protocol type="pbcast.NAKACK2"/>
-                    <protocol type="UNICAST3"/>
-                    <protocol type="pbcast.STABLE"/>
-                    <protocol type="pbcast.GMS"/>
-                    <protocol type="MFC"/>
-                    <protocol type="FRAG2"/>
-                </stack>
-            </stacks>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:jmx:1.3">
-            <expose-resolved-model/>
-            <expose-expression-model/>
-            <remoting-connector/>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:jpa:1.1">
-            <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:jsf:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:jsr77:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:mail:2.0">
-            <mail-session name="default" jndi-name="java:jboss/mail/Default">
-                <smtp-server outbound-socket-binding-ref="mail-smtp"/>
-            </mail-session>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:messaging-activemq:1.0">
-            <server name="default">
-                <cluster password="${jboss.messaging.cluster.password:CHANGE ME!!}"/>
-                <security-setting name="#">
-                    <role name="guest" send="true" consume="true" create-non-durable-queue="true" delete-non-durable-queue="true"/>
-                </security-setting>
-                <address-setting name="#" dead-letter-address="jms.queue.DLQ" expiry-address="jms.queue.ExpiryQueue" max-size-bytes="10485760" page-size-bytes="2097152" message-counter-history-day-limit="10" redistribution-delay="1000"/>
-                <http-connector name="http-connector" socket-binding="http" endpoint="http-acceptor"/>
-                <http-connector name="http-connector-throughput" socket-binding="http" endpoint="http-acceptor-throughput">
-                    <param name="batch-delay" value="50"/>
-                </http-connector>
-                <in-vm-connector name="in-vm" server-id="0"/>
-                <http-acceptor name="http-acceptor" http-listener="default"/>
-                <http-acceptor name="http-acceptor-throughput" http-listener="default">
-                    <param name="batch-delay" value="50"/>
-                    <param name="direct-deliver" value="false"/>
-                </http-acceptor>
-                <in-vm-acceptor name="in-vm" server-id="0"/>
-                <broadcast-group name="bg-group1" jgroups-channel="activemq-cluster" connectors="http-connector"/>
-                <discovery-group name="dg-group1" jgroups-channel="activemq-cluster"/>
-                <cluster-connection name="my-cluster" address="jms" connector-name="http-connector" discovery-group="dg-group1"/>
-                <jms-queue name="ExpiryQueue" entries="java:/jms/queue/ExpiryQueue"/>
-                <jms-queue name="DLQ" entries="java:/jms/queue/DLQ"/>
-                <connection-factory name="InVmConnectionFactory" entries="java:/ConnectionFactory" connectors="in-vm"/>
-                <connection-factory name="RemoteConnectionFactory" entries="java:jboss/exported/jms/RemoteConnectionFactory" connectors="http-connector" ha="true" block-on-acknowledge="true" reconnect-attempts="-1"/>
-                <pooled-connection-factory name="activemq-ra" entries="java:/JmsXA java:jboss/DefaultJMSConnectionFactory" connectors="in-vm" transaction="xa"/>
-            </server>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:modcluster:2.0">
-            <mod-cluster-config advertise-socket="modcluster" connector="ajp">
-                <dynamic-load-provider>
-                    <load-metric type="cpu"/>
-                </dynamic-load-provider>
-            </mod-cluster-config>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:naming:2.0">
-            <remote-naming/>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:remoting:3.0">
-            <endpoint/>
-            <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:resource-adapters:4.0"/>
-        <subsystem xmlns="urn:jboss:domain:request-controller:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
-        <subsystem xmlns="urn:jboss:domain:security-manager:1.0">
-            <deployment-permissions>
-                <maximum-set>
-                    <permission class="java.security.AllPermission"/>
-                </maximum-set>
-            </deployment-permissions>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:security:1.2">
-            <security-domains>
-                <security-domain name="other" cache-type="default">
-                    <authentication>
-                        <login-module code="Remoting" flag="optional">
-                            <module-option name="password-stacking" value="useFirstPass"/>
-                        </login-module>
-                        <login-module code="RealmDirect" flag="required">
-                            <module-option name="password-stacking" value="useFirstPass"/>
-                        </login-module>
-                    </authentication>
-                </security-domain>
-                <security-domain name="jboss-web-policy" cache-type="default">
-                    <authorization>
-                        <policy-module code="Delegating" flag="required"/>
-                    </authorization>
-                </security-domain>
-                <security-domain name="jboss-ejb-policy" cache-type="default">
-                    <authorization>
-                        <policy-module code="Delegating" flag="required"/>
-                    </authorization>
-                </security-domain>
-                <security-domain name="jaspitest" cache-type="default">
-                    <authentication-jaspi>
-                        <login-module-stack name="dummy">
-                            <login-module code="Dummy" flag="optional"/>
-                        </login-module-stack>
-                        <auth-module code="Dummy"/>
-                    </authentication-jaspi>
-                </security-domain>
-            </security-domains>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:singleton:1.0">
-            <singleton-policies default="default">
-                <singleton-policy name="default" cache-container="server">
-                    <simple-election-policy/>
-                </singleton-policy>
-            </singleton-policies>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:transactions:3.0">
-            <core-environment>
-                <process-id>
-                    <uuid/>
-                </process-id>
-            </core-environment>
-            <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:undertow:3.1">
-            <buffer-cache name="default"/>
-            <server name="default-server">
-                <ajp-listener name="ajp" socket-binding="ajp"/>
-                <http-listener name="default" socket-binding="http" enable-http2="true"/>
-                <https-listener name="https" socket-binding="https" security-realm="ApplicationRealm" enable-http2="true"/>
-                <host name="default-host" alias="localhost">
-                    <location name="/" handler="welcome-content"/>
-                    <filter-ref name="server-header"/>
-                    <filter-ref name="x-powered-by-header"/>
-                </host>
-            </server>
-            <servlet-container name="default">
-                <jsp-config/>
-                <websockets/>
-            </servlet-container>
-            <handlers>
-                <file name="welcome-content" path="${jboss.home.dir}/welcome-content"/>
-            </handlers>
-            <filters>
-                <response-header name="server-header" header-name="Server" header-value="WildFly/10"/>
-                <response-header name="x-powered-by-header" header-name="X-Powered-By" header-value="Undertow/1"/>
-            </filters>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:webservices:2.0">
-            <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
-            <endpoint-config name="Standard-Endpoint-Config"/>
-            <endpoint-config name="Recording-Endpoint-Config">
-                <pre-handler-chain name="recording-handlers" protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM">
-                    <handler name="RecordingHandler" class="org.jboss.ws.common.invocation.RecordingServerHandler"/>
-                </pre-handler-chain>
-            </endpoint-config>
-            <client-config name="Standard-Client-Config"/>
-        </subsystem>
-        <subsystem xmlns="urn:jboss:domain:weld:3.0"/>
-    </profile>
-
-    <interfaces>
-        <interface name="management">
-            <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
-        </interface>
-        <interface name="public">
-            <inet-address value="${jboss.bind.address:127.0.0.1}"/>
-        </interface>
-        <interface name="private">
-            <inet-address value="${jboss.bind.address.private:127.0.0.1}"/>
-        </interface>
-        <interface name="unsecure">
-            <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}"/>
-        </interface>
-    </interfaces>
-
-    <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
-        <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
-        <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9993}"/>
-        <socket-binding name="ajp" port="${jboss.ajp.port:8009}"/>
-        <socket-binding name="http" port="${jboss.http.port:8080}"/>
-        <socket-binding name="https" port="${jboss.https.port:8443}"/>
-        <socket-binding name="iiop" interface="unsecure" port="3528"/>
-        <socket-binding name="iiop-ssl" interface="unsecure" port="3529"/>
-        <socket-binding name="jgroups-mping" interface="private" port="0" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45700"/>
-        <socket-binding name="jgroups-tcp" interface="private" port="7600"/>
-        <socket-binding name="jgroups-tcp-fd" interface="private" port="57600"/>
-        <socket-binding name="jgroups-udp" interface="private" port="55200" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45688"/>
-        <socket-binding name="jgroups-udp-fd" interface="private" port="54200"/>
-        <socket-binding name="modcluster" port="0" multicast-address="224.0.1.105" multicast-port="23364"/>
-        <socket-binding name="txn-recovery-environment" port="4712"/>
-        <socket-binding name="txn-status-manager" port="4713"/>
-        <outbound-socket-binding name="mail-smtp">
-            <remote-destination host="localhost" port="25"/>
-        </outbound-socket-binding>
-    </socket-binding-group>
-
-</server>
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/mso/docker-files/jboss-configs/modules/mariadb/main/module.xml b/kubernetes/config/docker/init/src/config/mso/docker-files/jboss-configs/modules/mariadb/main/module.xml
deleted file mode 100644 (file)
index 1b12735..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xmlversion="1.0"encoding="UTF-8"?>
-
-<module xmlns="urn:jboss:module:1.0" name="mariadb">
-  <resources>
-     <resource-root path="mariadb-java-client-1.5.4.jar"/>              
-  </resources>
-  <dependencies>
-     <module name="javax.api"/>
-     <module name="javax.transaction.api"/>
-  </dependencies>
-</module>
\ No newline at end of file
old mode 100755 (executable)
new mode 100644 (file)
index a4c8c3d..39ed022
-# MariaDB database server configuration file.
+# Example MySQL config file for medium systems.
 #
-# You can copy this file to one of:
-# - "/etc/mysql/my.cnf" to set global options,
-# - "~/.my.cnf" to set user-specific options.
+# This is for a system with memory 8G where MySQL plays
+# an important part, or systems up to 128M where MySQL is used together with
+# other programs (such as a web server)
 #
-# One can use all long options that the program supports.
-# Run program with --help to get a list of available options and with
-# --print-defaults to see which it would actually understand and use.
-#
-# For explanations see
-# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
-
-# This will be passed to all mysql clients
-# It has been reported that passwords should be enclosed with ticks/quotes
-# escpecially if they contain "#" chars...
-# Remember to edit /etc/mysql/debian.cnf when changing the socket location.
-[client]
-port            = 3306
-socket          = /var/run/mysqld/mysqld.sock
+# In this file, you can use all long options that a program supports.
+# If you want to know which options a program supports, run the program
+# with the "--help" option.
 
-# Here is entries for some specific programs
-# The following values assume you have at least 32M ram
+# The following options will be passed to all MySQL clients
+##[client]
+##user            = root
+##port            = 3306
+##socket          = //opt/app/mysql/mysql.sock
 
-# This was formally known as [safe_mysqld]. Both versions are currently parsed.
-[mysqld_safe]
-socket          = /var/run/mysqld/mysqld.sock
-nice            = 0
+# Here follows entries for some specific programs
 
+# The MySQL server
 [mysqld]
-skip-host-cache
-skip-name-resolve
-#
-# * Basic Settings
-#
-#user           = mysql
-pid-file        = /var/run/mysqld/mysqld.pid
-socket          = /var/run/mysqld/mysqld.sock
-port            = 3306
-basedir         = /usr
-datadir         = /var/lib/mysql
-tmpdir          = /tmp
-lc_messages_dir = /usr/share/mysql
-lc_messages     = en_US
-lower_case_table_names = 1 
+##performance_schema
+
+slow_query_log =ON
+long_query_time =2
+slow_query_log_file =//var/lib/mysql/slow_query.log
+
 skip-external-locking
+explicit_defaults_for_timestamp = true
+skip-symbolic-links
+local-infile = 0
+key_buffer_size = 16M
+max_allowed_packet = 4M
+table_open_cache = 100
+sort_buffer_size = 512K
+net_buffer_length = 8K
+read_buffer_size = 256K
+read_rnd_buffer_size = 512K
+myisam_sort_buffer_size = 8M
+max_connections = 500
+lower_case_table_names = 1
+thread_stack = 256K
+thread_cache_size = 25
+query_cache_size = 8M
+query_cache_type = 0
+query_prealloc_size = 512K
+query_cache_limit = 1M
+
+# Password validation
+##plugin-load-add=simple_password_check.so
+##simple_password_check_other_characters=0
+
+# Audit Log settings
+plugin-load-add=server_audit.so
+server_audit=FORCE_PLUS_PERMANENT
+server_audit_file_path=//var/lib/mysql/audit.log
+server_audit_file_rotate_size=50M
+server_audit_events=CONNECT,QUERY,TABLE
+server_audit_logging=on
+
+# Don't listen on a TCP/IP port at all. This can be a security enhancement,
+# if all processes that need to connect to mysqld run on the same host.
+# All interaction with mysqld must be made via Unix sockets or named pipes.
+# Note that using this option without enabling named pipes on Windows
+# (via the "enable-named-pipe" option) will render mysqld useless!
+#
+#skip-networking
+
+# Replication Master Server (default)
+# binary logging is required for replication
+##log-bin=//var/lib/mysql/mysql-bin
+
+# binary logging format - mixed recommended
+binlog_format=row
+
+# required unique id between 1 and 2^32 - 1
+# defaults to 1 if master-host is not set
+# but will not function as a master if omitted
+
+# Replication Slave (comment out master section to use this)
+#
+# To configure this host as a replication slave, you can choose between
+# two methods :
+#
+# 1) Use the CHANGE MASTER TO command (fully described in our manual) -
+#    the syntax is:
+#
+#    CHANGE MASTER TO MASTER_HOST=<host>, MASTER_PORT=<port>,
+#    MASTER_USER=<user>, MASTER_PASSWORD=<password> ;
 #
-# Instead of skip-networking the default is now to listen only on
-# localhost which is more compatible and is not less secure.
-#bind-address           = 127.0.0.1
-#
-# * Fine Tuning
-#
-max_connections         = 100
-connect_timeout         = 5
-wait_timeout            = 600
-max_allowed_packet      = 16M
-thread_cache_size       = 128
-sort_buffer_size        = 4M
-bulk_insert_buffer_size = 16M
-tmp_table_size          = 32M
-max_heap_table_size     = 32M
-#
-# * MyISAM
-#
-# This replaces the startup script and checks MyISAM tables if needed
-# the first time they are touched. On error, make copy and try a repair.
-myisam_recover_options = BACKUP
-key_buffer_size         = 128M
-#open-files-limit       = 2000
-table_open_cache        = 400
-myisam_sort_buffer_size = 512M
-concurrent_insert       = 2
-read_buffer_size        = 2M
-read_rnd_buffer_size    = 1M
-#
-# * Query Cache Configuration
-#
-# Cache only tiny result sets, so we can fit more in the query cache.
-query_cache_limit               = 128K
-query_cache_size                = 64M
-# for more write intensive setups, set to DEMAND or OFF
-#query_cache_type               = DEMAND
-#
-# * Logging and Replication
-#
-# Both location gets rotated by the cronjob.
-# Be aware that this log type is a performance killer.
-# As of 5.1 you can enable the log at runtime!
-#general_log_file        = /var/log/mysql/mysql.log
-#general_log             = 1
-#
-# Error logging goes to syslog due to /etc/mysql/conf.d/mysqld_safe_syslog.cnf.
-#
-# we do want to know about network errors and such
-#log_warnings           = 2
-#
-# Enable the slow query log to see queries with especially long duration
-#slow_query_log[={0|1}]
-slow_query_log_file     = /var/log/mysql/mariadb-slow.log
-long_query_time = 10
-#log_slow_rate_limit    = 1000
-#log_slow_verbosity     = query_plan
-
-#log-queries-not-using-indexes
-#log_slow_admin_statements
-#
-# The following can be used as easy to replay backup logs or for replication.
-# note: if you are setting up a replication slave, see README.Debian about
-#       other settings you may need to change.
-#server-id              = 1
-#report_host            = master1
-#auto_increment_increment = 2
-#auto_increment_offset  = 1
-#log_bin                        = /var/log/mysql/mariadb-bin
-#log_bin_index          = /var/log/mysql/mariadb-bin.index
-# not fab for performance, but safer
-#sync_binlog            = 1
-expire_logs_days        = 10
-max_binlog_size         = 100M
-# slaves
-#relay_log              = /var/log/mysql/relay-bin
-#relay_log_index        = /var/log/mysql/relay-bin.index
-#relay_log_info_file    = /var/log/mysql/relay-bin.info
-#log_slave_updates
-#read_only
-#
-# If applications support it, this stricter sql_mode prevents some
-# mistakes like inserting invalid dates etc.
-#sql_mode               = NO_ENGINE_SUBSTITUTION,TRADITIONAL
-#
-# * InnoDB
-#
-# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
-# Read the manual for more InnoDB related options. There are many!
-default_storage_engine  = InnoDB
-# you can't just change log file size, requires special procedure
-#innodb_log_file_size   = 50M
-innodb_buffer_pool_size = 256M
-innodb_log_buffer_size  = 8M
-innodb_file_per_table   = 1
-innodb_open_files       = 400
-innodb_io_capacity      = 400
-innodb_flush_method     = O_DIRECT
-#
-# * Security Features
-#
-# Read the manual, too, if you want chroot!
-# chroot = /var/lib/mysql/
-#
-# For generating SSL certificates I recommend the OpenSSL GUI "tinyca".
-#
-# ssl-ca=/etc/mysql/cacert.pem
-# ssl-cert=/etc/mysql/server-cert.pem
-# ssl-key=/etc/mysql/server-key.pem
-
-#
-# * Galera-related settings
-#
-[galera]
-# Mandatory settings
-#wsrep_on=ON
-#wsrep_provider=
-#wsrep_cluster_address=
-#binlog_format=row
-#default_storage_engine=InnoDB
-#innodb_autoinc_lock_mode=2
-#
-# Allow server to accept connections on all interfaces.
-#
-#bind-address=0.0.0.0
-#
-# Optional setting
-#wsrep_slave_threads=1
-#innodb_flush_log_at_trx_commit=0
+#    where you replace <host>, <user>, <password> by quoted strings and
+#    <port> by the master's port number (3306 by default).
+#
+#    Example:
+#
+#    CHANGE MASTER TO MASTER_HOST='125.564.12.1', MASTER_PORT=3306,
+#    MASTER_USER='joe', MASTER_PASSWORD='secret';
+#
+# OR
+#
+# 2) Set the variables below. However, in case you choose this method, then
+#    start replication for the first time (even unsuccessfully, for example
+#    if you mistyped the password in master-password and the slave fails to
+#    connect), the slave will create a master.info file, and any later
+#    change in this file to the variables' values below will be ignored and
+#    overridden by the content of the master.info file, unless you shutdown
+#    the slave server, delete master.info and restart the slaver server.
+#    For that reason, you may want to leave the lines below untouched
+#    (commented) and instead use CHANGE MASTER TO (see above)
+#
+# required unique id between 2 and 2^32 - 1
+# (and different from the master)
+# defaults to 2 if master-host is set
+# but will not function as a slave if omitted
+#server-id       = 2
+#
+# The replication master for this slave - required
+#master-host     =   <hostname>
+#
+# The username the slave will use for authentication when connecting
+# to the master - required
+#master-user     =   <username>
+#
+# The password the slave will authenticate with when connecting to
+# the master - required
+#master-password =   <password>
+#
+# The port the master is listening on.
+# optional - defaults to 3306
+#master-port     =  <port>
+#
+# binary logging - not required for slaves, but recommended
+#log-bin=mysql-bin
+
+# Uncomment the following if you are using InnoDB tables
+##innodb_data_home_dir = //opt/app/mysql/data
+##innodb_data_file_path = ibdata1:20M:autoextend:max:32G
+##innodb_log_group_home_dir = //opt/app/mysql/iblogs
+# You can set .._buffer_pool_size up to 50 - 80 %
+# of RAM but beware of setting memory usage too high
+#innodb_buffer_pool_size = 6380M
+#innodb_additional_mem_pool_size = 2M
+# Set .._log_file_size to 25 % of buffer pool size
+innodb_log_file_size = 150M
+innodb_log_files_in_group = 3
+innodb_log_buffer_size = 8M
+#innodb_flush_log_at_trx_commit = 1
+innodb_lock_wait_timeout = 50
+innodb_autoextend_increment = 100
+expire_logs_days = 8
+open_files_limit = 2000
+transaction-isolation=READ-COMMITTED
+####### Galera parameters #######
+## Galera Provider configuration
+wsrep_provider=/usr/lib/galera/libgalera_smm.so
+wsrep_provider_options="gcache.size=2G; gcache.page_size=1G"
+## Galera Cluster configuration
+wsrep_cluster_name="MSO-automated-tests-cluster"
+wsrep_cluster_address="gcomm://"
+#wsrep_cluster_address="gcomm://mariadb1,mariadb2,mariadb3"
+##wsrep_cluster_address="gcomm://192.169.3.184,192.169.3.185,192.169.3.186"
+## Galera Synchronization configuration
+wsrep_sst_method=rsync
+#wsrep_sst_method=xtrabackup-v2
+#wsrep_sst_auth="sstuser:Mon#2o!6"
+## Galera Node configuration
+wsrep_node_name="mariadb1"
+##wsrep_node_address="192.169.3.184"
+wsrep_on=ON
+## Status notification
+#wsrep_notify_cmd=/opt/app/mysql/bin/wsrep_notify
+#######
+
 
 [mysqldump]
 quick
-quote-names
-max_allowed_packet      = 16M
+max_allowed_packet = 16M
 
 [mysql]
-#no-auto-rehash # faster start of mysql but no tab completion
+no-auto-rehash
+# Remove the next comment character if you are not familiar with SQL
+#safe-updates
 
-[isamchk]
-key_buffer              = 16M
+[myisamchk]
+key_buffer_size = 20971520
 
-#
-# * IMPORTANT: Additional settings that can override those from this file!
-#   The files must end with '.cnf', otherwise they'll be ignored.
-#
-#!includedir /etc/mysql/conf.d/
+##[mysqlhotcopy]
+##interactive-timeout
+##[mysqld_safe]
+##malloc-lib=//opt/app/mysql/local/lib/libjemalloc.so.1
+##log-error=//opt/app/mysql/log/mysqld.log
+
+general_log_file        = /var/log/mysql/mysql.log
+general_log             = 1
diff --git a/kubernetes/config/docker/init/src/config/mso/mariadb/conf.d/mariadb1.cnf.example b/kubernetes/config/docker/init/src/config/mso/mariadb/conf.d/mariadb1.cnf.example
deleted file mode 100644 (file)
index 39ed022..0000000
+++ /dev/null
@@ -1,193 +0,0 @@
-# Example MySQL config file for medium systems.
-#
-# This is for a system with memory 8G where MySQL plays
-# an important part, or systems up to 128M where MySQL is used together with
-# other programs (such as a web server)
-#
-# In this file, you can use all long options that a program supports.
-# If you want to know which options a program supports, run the program
-# with the "--help" option.
-
-# The following options will be passed to all MySQL clients
-##[client]
-##user            = root
-##port            = 3306
-##socket          = //opt/app/mysql/mysql.sock
-
-# Here follows entries for some specific programs
-
-# The MySQL server
-[mysqld]
-##performance_schema
-
-slow_query_log =ON
-long_query_time =2
-slow_query_log_file =//var/lib/mysql/slow_query.log
-
-skip-external-locking
-explicit_defaults_for_timestamp = true
-skip-symbolic-links
-local-infile = 0
-key_buffer_size = 16M
-max_allowed_packet = 4M
-table_open_cache = 100
-sort_buffer_size = 512K
-net_buffer_length = 8K
-read_buffer_size = 256K
-read_rnd_buffer_size = 512K
-myisam_sort_buffer_size = 8M
-max_connections = 500
-lower_case_table_names = 1
-thread_stack = 256K
-thread_cache_size = 25
-query_cache_size = 8M
-query_cache_type = 0
-query_prealloc_size = 512K
-query_cache_limit = 1M
-
-# Password validation
-##plugin-load-add=simple_password_check.so
-##simple_password_check_other_characters=0
-
-# Audit Log settings
-plugin-load-add=server_audit.so
-server_audit=FORCE_PLUS_PERMANENT
-server_audit_file_path=//var/lib/mysql/audit.log
-server_audit_file_rotate_size=50M
-server_audit_events=CONNECT,QUERY,TABLE
-server_audit_logging=on
-
-# Don't listen on a TCP/IP port at all. This can be a security enhancement,
-# if all processes that need to connect to mysqld run on the same host.
-# All interaction with mysqld must be made via Unix sockets or named pipes.
-# Note that using this option without enabling named pipes on Windows
-# (via the "enable-named-pipe" option) will render mysqld useless!
-#
-#skip-networking
-
-# Replication Master Server (default)
-# binary logging is required for replication
-##log-bin=//var/lib/mysql/mysql-bin
-
-# binary logging format - mixed recommended
-binlog_format=row
-
-# required unique id between 1 and 2^32 - 1
-# defaults to 1 if master-host is not set
-# but will not function as a master if omitted
-
-# Replication Slave (comment out master section to use this)
-#
-# To configure this host as a replication slave, you can choose between
-# two methods :
-#
-# 1) Use the CHANGE MASTER TO command (fully described in our manual) -
-#    the syntax is:
-#
-#    CHANGE MASTER TO MASTER_HOST=<host>, MASTER_PORT=<port>,
-#    MASTER_USER=<user>, MASTER_PASSWORD=<password> ;
-#
-#    where you replace <host>, <user>, <password> by quoted strings and
-#    <port> by the master's port number (3306 by default).
-#
-#    Example:
-#
-#    CHANGE MASTER TO MASTER_HOST='125.564.12.1', MASTER_PORT=3306,
-#    MASTER_USER='joe', MASTER_PASSWORD='secret';
-#
-# OR
-#
-# 2) Set the variables below. However, in case you choose this method, then
-#    start replication for the first time (even unsuccessfully, for example
-#    if you mistyped the password in master-password and the slave fails to
-#    connect), the slave will create a master.info file, and any later
-#    change in this file to the variables' values below will be ignored and
-#    overridden by the content of the master.info file, unless you shutdown
-#    the slave server, delete master.info and restart the slaver server.
-#    For that reason, you may want to leave the lines below untouched
-#    (commented) and instead use CHANGE MASTER TO (see above)
-#
-# required unique id between 2 and 2^32 - 1
-# (and different from the master)
-# defaults to 2 if master-host is set
-# but will not function as a slave if omitted
-#server-id       = 2
-#
-# The replication master for this slave - required
-#master-host     =   <hostname>
-#
-# The username the slave will use for authentication when connecting
-# to the master - required
-#master-user     =   <username>
-#
-# The password the slave will authenticate with when connecting to
-# the master - required
-#master-password =   <password>
-#
-# The port the master is listening on.
-# optional - defaults to 3306
-#master-port     =  <port>
-#
-# binary logging - not required for slaves, but recommended
-#log-bin=mysql-bin
-
-# Uncomment the following if you are using InnoDB tables
-##innodb_data_home_dir = //opt/app/mysql/data
-##innodb_data_file_path = ibdata1:20M:autoextend:max:32G
-##innodb_log_group_home_dir = //opt/app/mysql/iblogs
-# You can set .._buffer_pool_size up to 50 - 80 %
-# of RAM but beware of setting memory usage too high
-#innodb_buffer_pool_size = 6380M
-#innodb_additional_mem_pool_size = 2M
-# Set .._log_file_size to 25 % of buffer pool size
-innodb_log_file_size = 150M
-innodb_log_files_in_group = 3
-innodb_log_buffer_size = 8M
-#innodb_flush_log_at_trx_commit = 1
-innodb_lock_wait_timeout = 50
-innodb_autoextend_increment = 100
-expire_logs_days = 8
-open_files_limit = 2000
-transaction-isolation=READ-COMMITTED
-####### Galera parameters #######
-## Galera Provider configuration
-wsrep_provider=/usr/lib/galera/libgalera_smm.so
-wsrep_provider_options="gcache.size=2G; gcache.page_size=1G"
-## Galera Cluster configuration
-wsrep_cluster_name="MSO-automated-tests-cluster"
-wsrep_cluster_address="gcomm://"
-#wsrep_cluster_address="gcomm://mariadb1,mariadb2,mariadb3"
-##wsrep_cluster_address="gcomm://192.169.3.184,192.169.3.185,192.169.3.186"
-## Galera Synchronization configuration
-wsrep_sst_method=rsync
-#wsrep_sst_method=xtrabackup-v2
-#wsrep_sst_auth="sstuser:Mon#2o!6"
-## Galera Node configuration
-wsrep_node_name="mariadb1"
-##wsrep_node_address="192.169.3.184"
-wsrep_on=ON
-## Status notification
-#wsrep_notify_cmd=/opt/app/mysql/bin/wsrep_notify
-#######
-
-
-[mysqldump]
-quick
-max_allowed_packet = 16M
-
-[mysql]
-no-auto-rehash
-# Remove the next comment character if you are not familiar with SQL
-#safe-updates
-
-[myisamchk]
-key_buffer_size = 20971520
-
-##[mysqlhotcopy]
-##interactive-timeout
-##[mysqld_safe]
-##malloc-lib=//opt/app/mysql/local/lib/libjemalloc.so.1
-##log-error=//opt/app/mysql/log/mysqld.log
-
-general_log_file        = /var/log/mysql/mysql.log
-general_log             = 1
index c018ca0..a163801 100644 (file)
@@ -21,4 +21,7 @@
 # and service marks of AT&T Intellectual Property.
 #
 #
-mysql -uroot -p$MYSQL_ROOT_PASSWORD -e "UPDATE heat_environment SET ENVIRONMENT='parameters:\n  vfw_image_name: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)\n  vfw_flavor_name: 4 GB General Purpose v1\n  public_net_id: 00000000-0000-0000-0000-000000000000\n  unprotected_private_net_id: zdfw1fwl01_unprotected\n  protected_private_net_id: zdfw1fwl01_protected\n  ecomp_private_net_id: oam_ecomp\n  unprotected_private_net_cidr: 192.168.10.0/24\n  protected_private_net_cidr: 192.168.20.0/24\n  ecomp_private_net_cidr: 192.168.9.0/24\n  vfw_private_ip_0: 192.168.10.100\n  vfw_private_ip_1: 192.168.20.100\n  vfw_private_ip_2: 192.168.9.100\n  vpg_private_ip_0: 192.168.10.200\n  vpg_private_ip_1: 192.168.9.200\n  vsn_private_ip_0: 192.168.20.250\n  vsn_private_ip_1: 192.168.9.250\n  vfw_name_0: zdfw1fwl01fwl01\n  vpg_name_0: zdfw1fwl01pgn01\n  vsn_name_0: zdfw1fwl01snk01\n  vnf_id: vFirewall_demo_app\n  vf_module_id: vFirewall\n  webserver_ip: 162.242.237.182\n  dcae_collector_ip: 192.168.9.1\n  key_name: vfw_key\n  pub_key: INSERT YOUR PUBLIC KEY HERE' where id=5;" mso_catalog
\ No newline at end of file
+
+# TODO: update this script to work with the new DB schema
+
+# mysql -uroot -p$MYSQL_ROOT_PASSWORD -e "UPDATE heat_environment SET ENVIRONMENT='parameters:\n  vfw_image_name: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)\n  vfw_flavor_name: 4 GB General Purpose v1\n  public_net_id: 00000000-0000-0000-0000-000000000000\n  unprotected_private_net_id: zdfw1fwl01_unprotected\n  protected_private_net_id: zdfw1fwl01_protected\n  ecomp_private_net_id: oam_ecomp\n  unprotected_private_net_cidr: 192.168.10.0/24\n  protected_private_net_cidr: 192.168.20.0/24\n  ecomp_private_net_cidr: 192.168.9.0/24\n  vfw_private_ip_0: 192.168.10.100\n  vfw_private_ip_1: 192.168.20.100\n  vfw_private_ip_2: 192.168.9.100\n  vpg_private_ip_0: 192.168.10.200\n  vpg_private_ip_1: 192.168.9.200\n  vsn_private_ip_0: 192.168.20.250\n  vsn_private_ip_1: 192.168.9.250\n  vfw_name_0: zdfw1fwl01fwl01\n  vpg_name_0: zdfw1fwl01pgn01\n  vsn_name_0: zdfw1fwl01snk01\n  vnf_id: vFirewall_demo_app\n  vf_module_id: vFirewall\n  webserver_ip: 162.242.237.182\n  dcae_collector_ip: 192.168.9.1\n  key_name: vfw_key\n  pub_key: INSERT YOUR PUBLIC KEY HERE' where id=5;" mso_catalog
index 3b824b8..7df7e29 100644 (file)
@@ -1,5 +1,4 @@
-SOURCE ../../camunda/mariadb_engine_7.6.0.sql
-SOURCE ../../camunda/mariadb_identity_7.6.0.sql
+SOURCE ../../camunda/mariadb_engine_7.7.3-ee.sql
 
 --
 -- Create an admin user automatically for the cockpit
@@ -17,8 +16,6 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mso_requests` /*!40100 DEFAULT CHARACT
 USE `mso_requests`;
 
 SOURCE ../../main-schemas/MySQL-Requests-schema.sql
-SOURCE ../../sub-sql-files/site_status_updated_timestamp.sql
-
 
 --
 -- Current Database: `mso_catalog`
@@ -31,8 +28,6 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `mso_catalog` /*!40100 DEFAULT CHARACTE
 USE `mso_catalog`;
 
 SOURCE ../../main-schemas/MySQL-Catalog-schema.sql
-SOURCE ../../sub-sql-files/catalog_timestamp_mso_db.sql
-SOURCE ../../sub-sql-files/catalog_add_constraints.sql
 
 LOCK TABLES `NETWORK_RECIPE` WRITE;
 /*!40000 ALTER TABLE `NETWORK_RECIPE` DISABLE KEYS */;
index e61abae..fd540ab 100644 (file)
@@ -12,62 +12,64 @@ CREATE USER 'catalog';
 GRANT ALL on mso_catalog.* to 'catalog' identified by 'catalog123' with GRANT OPTION;
 FLUSH PRIVILEGES;
 
-LOCK TABLES `heat_environment` WRITE;
-/*!40000 ALTER TABLE `heat_environment` DISABLE KEYS */;
-INSERT INTO `heat_environment` VALUES (5,'base_vfw.env','1.0','vfw-service/VFWResource-1','base_vfw ENV file','parameters:\n  vfw_image_name: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)\n  vfw_flavor_name: 4 GB General Purpose v1\n  public_net_id: 00000000-0000-0000-0000-000000000000\n  unprotected_private_net_id: zdfw1fwl01_unprotected\n  protected_private_net_id: zdfw1fwl01_protected\n  ecomp_private_net_id: oam_ecomp\n  unprotected_private_net_cidr: 192.168.10.0/24\n  protected_private_net_cidr: 192.168.20.0/24\n  ecomp_private_net_cidr: 192.168.9.0/24\n  vfw_private_ip_0: 192.168.10.100\n  vfw_private_ip_1: 192.168.20.100\n  vfw_private_ip_2: 192.168.9.100\n  vpg_private_ip_0: 192.168.10.200\n  vpg_private_ip_1: 192.168.9.200\n  vsn_private_ip_0: 192.168.20.250\n  vsn_private_ip_1: 192.168.9.250\n  vfw_name_0: zdfw1fwl01fwl01\n  vpg_name_0: zdfw1fwl01pgn01\n  vsn_name_0: zdfw1fwl01snk01\n  vnf_id: vFirewall_demo_app\n  vf_module_id: vFirewall\n  webserver_ip: 162.242.237.182\n  dcae_collector_ip: 192.168.9.1\n  key_name: vfw_key\n  pub_key: INSERT YOUR PUBLIC KEY HERE','2016-11-14 13:04:07','EnvArtifact-UUID3','Label');
-/*!40000 ALTER TABLE `heat_environment` ENABLE KEYS */;
-UNLOCK TABLES;
+# TODO: update this script to work with the new DB schema
 
-LOCK TABLES `heat_template` WRITE;
-/*!40000 ALTER TABLE `heat_template` DISABLE KEYS */;
-INSERT INTO `heat_template` VALUES (8,'base_vfw.yaml','1.0','VFWResource','base_vfw.yaml','heat_template_version: 2013-05-23\n\ndescription: Heat template to deploy vFirewall demo app for OpenECOMP\n\nparameters:\n  vfw_image_name:\n    type: string\n    label: Image name or ID\n    description: Image to be used for compute instance\n  vfw_flavor_name:\n    type: string\n    label: Flavor\n    description: Type of instance (flavor) to be used\n  public_net_id:\n    type: string\n    label: Public network name or ID\n    description: Public network that enables remote connection to VNF\n  unprotected_private_net_id:\n    type: string\n    label: Unprotected private network name or ID\n    description: Private network that connects vPacketGenerator with vFirewall\n  protected_private_net_id:\n    type: string\n    label: Protected private network name or ID\n    description: Private network that connects vFirewall with vSink\n  ecomp_private_net_id:\n    type: string\n    label: ECOMP management network name or ID\n    description: Private network that connects ECOMP component and the VNF\n  unprotected_private_net_cidr:\n    type: string\n    label: Unprotected private network CIDR\n    description: The CIDR of the unprotected private network\n  protected_private_net_cidr:\n    type: string\n    label: Protected private network CIDR\n    description: The CIDR of the protected private network\n  ecomp_private_net_cidr:\n    type: string\n    label: ECOMP private network CIDR\n    description: The CIDR of the protected private network\n  vfw_private_ip_0:\n    type: string\n    label: vFirewall private IP address towards the unprotected network\n    description: Private IP address that is assigned to the vFirewall to communicate with the vPacketGenerator\n  vfw_private_ip_1:\n    type: string\n    label: vFirewall private IP address towards the protected network\n    description: Private IP address that is assigned to the vFirewall to communicate with the vSink\n  vfw_private_ip_2:\n    type: string\n    label: vFirewall private IP address towards the ECOMP management network\n    description: Private IP address that is assigned to the vFirewall to communicate with ECOMP components\n  vpg_private_ip_0:\n    type: string\n    label: vPacketGenerator private IP address towards the unprotected network\n    description: Private IP address that is assigned to the vPacketGenerator to communicate with the vFirewall\n  vpg_private_ip_1:\n    type: string\n    label: vPacketGenerator private IP address towards the ECOMP management network\n    description: Private IP address that is assigned to the vPacketGenerator to communicate with ECOMP components\n  vsn_private_ip_0:\n    type: string\n    label: vSink private IP address towards the protected network\n    description: Private IP address that is assigned to the vSink to communicate with the vFirewall\n  vsn_private_ip_1:\n    type: string\n    label: vSink private IP address towards the ECOMP management network\n    description: Private IP address that is assigned to the vSink to communicate with ECOMP components\n  vfw_name_0:\n    type: string\n    label: vFirewall name\n    description: Name of the vFirewall\n  vpg_name_0:\n    type: string\n    label: vPacketGenerator name\n    description: Name of the vPacketGenerator\n  vsn_name_0:\n    type: string\n    label: vSink name\n    description: Name of the vSink\n  vnf_id:\n    type: string\n    label: VNF ID\n    description: The VNF ID is provided by ECOMP\n  vf_module_id:\n    type: string\n    label: vFirewall module ID\n    description: The vFirewall Module ID is provided by ECOMP\n  webserver_ip:\n    type: string\n    label: Webserver IP address\n    description: IP address of the webserver that hosts the source code and binaries\n  dcae_collector_ip:\n    type: string\n    label: DCAE collector IP address\n    description: IP address of the DCAE collector\n  key_name:\n    type: string\n    label: Key pair name\n    description: Public/Private key pair name\n  pub_key:\n    type: string\n    label: Public key\n    description: Public key to be installed on the compute instance\n\nresources:\n  my_keypair:\n    type: OS::Nova::KeyPair\n    properties:\n      name: { get_param: key_name }\n      public_key: { get_param: pub_key }\n      save_private_key: false\n\n  unprotected_private_network:\n    type: OS::Neutron::Net\n    properties:\n      name: { get_param: unprotected_private_net_id }\n\n  protected_private_network:\n    type: OS::Neutron::Net\n    properties:\n      name: { get_param: protected_private_net_id }\n\n  unprotected_private_subnet:\n    type: OS::Neutron::Subnet\n    properties:\n      network_id: { get_resource: unprotected_private_network }\n      cidr: { get_param: unprotected_private_net_cidr }\n\n  protected_private_subnet:\n    type: OS::Neutron::Subnet\n    properties:\n      network_id: { get_resource: protected_private_network }\n      cidr: { get_param: protected_private_net_cidr }\n\n  vfw_0:\n    type: OS::Nova::Server\n    properties:\n      image: { get_param: vfw_image_name }\n      flavor: { get_param: vfw_flavor_name }\n      name: { get_param: vfw_name_0 }\n      key_name: { get_resource: my_keypair }\n      networks:\n        - network: { get_param: public_net_id }\n        - port: { get_resource: vfw_private_0_port }\n        - port: { get_resource: vfw_private_1_port }\n        - port: { get_resource: vfw_private_2_port }\n      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}\n      user_data_format: RAW\n      user_data:\n        str_replace:\n          params:\n            __webserver__: { get_param: webserver_ip }\n            __dcae_collector_ip__ : { get_param: dcae_collector_ip }\n          template: |\n            #!/bin/bash\n\n            WEBSERVER_IP=__webserver__\n            DCAE_COLLECTOR_IP=__dcae_collector_ip__\n\n            mkdir /opt/config\n            cd /opt\n            wget http://$WEBSERVER_IP/demo_repo/v_firewall_init.sh\n            wget http://$WEBSERVER_IP/demo_repo/vfirewall.sh\n            chmod +x v_firewall_init.sh\n            chmod +x vfirewall.sh\n            echo $WEBSERVER_IP > config/webserver_ip.txt\n            echo $DCAE_COLLECTOR_IP > config/dcae_collector_ip.txt\n            echo "no" > config/install.txt\n            mv vfirewall.sh /etc/init.d\n            sudo update-rc.d vfirewall.sh defaults\n            ./v_firewall_init.sh\n\n  vfw_private_0_port:\n    type: OS::Neutron::Port\n    properties:\n      network: { get_resource: unprotected_private_network }\n      fixed_ips: [{"subnet": { get_resource: unprotected_private_subnet }, "ip_address": { get_param: vfw_private_ip_0 }}]\n\n  vfw_private_1_port:\n    type: OS::Neutron::Port\n    properties:\n      network: { get_resource: protected_private_network }\n      fixed_ips: [{"subnet": { get_resource: protected_private_subnet }, "ip_address": { get_param: vfw_private_ip_1 }}]\n\n  vfw_private_2_port:\n    type: OS::Neutron::Port\n    properties:\n      network: { get_param: ecomp_private_net_id }\n      fixed_ips: [{"subnet": { get_param: ecomp_private_net_id }, "ip_address": { get_param: vfw_private_ip_2 }}]\n\n  vpg_0:\n    type: OS::Nova::Server\n    properties:\n      image: { get_param: vfw_image_name }\n      flavor: { get_param: vfw_flavor_name }\n      name: { get_param: vpg_name_0 }\n      key_name: { get_resource: my_keypair }\n      networks:\n        - network: { get_param: public_net_id }\n        - port: { get_resource: vpg_private_0_port }\n        - port: { get_resource: vpg_private_1_port }\n      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}\n      user_data_format: RAW\n      user_data:\n        str_replace:\n          params:\n            __webserver__: { get_param: webserver_ip }\n            __fw_ipaddr__: { get_param: vfw_private_ip_0 }\n            __protected_net_cidr__: { get_param: protected_private_net_cidr }\n            __sink_ipaddr__: { get_param: vsn_private_ip_0 }\n          template: |\n            #!/bin/bash\n\n            WEBSERVER_IP=__webserver__\n            FW_IPADDR=__fw_ipaddr__\n            PROTECTED_NET_CIDR=__protected_net_cidr__\n            SINK_IPADDR=__sink_ipaddr__\n\n            mkdir /opt/config\n            cd /opt\n            wget http://$WEBSERVER_IP/demo_repo/v_packetgen_init.sh\n            wget http://$WEBSERVER_IP/demo_repo/vpacketgen.sh\n            chmod +x v_packetgen_init.sh\n            chmod +x vpacketgen.sh\n            echo $WEBSERVER_IP > config/webserver_ip.txt\n            echo $FW_IPADDR > config/fw_ipaddr.txt\n            echo $PROTECTED_NET_CIDR > config/protected_net_cidr.txt\n            echo $SINK_IPADDR > config/sink_ipaddr.txt\n            echo "no" > config/install.txt\n            mv vpacketgen.sh /etc/init.d\n            sudo update-rc.d vpacketgen.sh defaults\n            ./v_packetgen_init.sh\n\n  vpg_private_0_port:\n    type: OS::Neutron::Port\n    properties:\n      network: { get_resource: unprotected_private_network }\n      fixed_ips: [{"subnet": { get_resource: unprotected_private_subnet }, "ip_address": { get_param: vpg_private_ip_0 }}]\n\n  vpg_private_1_port:\n    type: OS::Neutron::Port\n    properties:\n      network: { get_param: ecomp_private_net_id }\n      fixed_ips: [{"subnet": { get_param: ecomp_private_net_id }, "ip_address": { get_param: vpg_private_ip_1 }}]\n\n  vsn_0:\n    type: OS::Nova::Server\n    properties:\n      image: { get_param: vfw_image_name }\n      flavor: { get_param: vfw_flavor_name }\n      name: { get_param: vsn_name_0 }\n      key_name: { get_resource: my_keypair }\n      networks:\n        - network: { get_param: public_net_id }\n        - port: { get_resource: vsn_private_0_port }\n        - port: { get_resource: vsn_private_1_port }\n      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}\n      user_data_format: RAW\n      user_data:\n        str_replace:\n          params:\n            __webserver__: { get_param: webserver_ip }\n            __protected_net_gw__: { get_param: vfw_private_ip_1 }\n            __unprotected_net__: { get_param: unprotected_private_net_cidr }\n          template: |\n            #!/bin/bash\n\n            WEBSERVER_IP=__webserver__\n            PROTECTED_NET_GW=__protected_net_gw__\n            UNPROTECTED_NET=__unprotected_net__\n            UNPROTECTED_NET=$(echo $UNPROTECTED_NET | cut -d\'/\' -f1)\n\n            mkdir /opt/config\n            cd /opt\n            wget http://$WEBSERVER_IP/demo_repo/v_sink_init.sh\n            wget http://$WEBSERVER_IP/demo_repo/vsink.sh\n            chmod +x v_sink_init.sh\n            chmod +x vsink.sh\n            echo $PROTECTED_NET_GW > config/protected_net_gw.txt\n            echo $UNPROTECTED_NET > config/unprotected_net.txt\n            echo "no" > config/install.txt\n            mv vsink.sh /etc/init.d\n            sudo update-rc.d vsink.sh defaults\n            ./v_sink_init.sh\n\n  vsn_private_0_port:\n    type: OS::Neutron::Port\n    properties:\n      network: { get_resource: protected_private_network }\n      fixed_ips: [{"subnet": { get_resource: protected_private_subnet }, "ip_address": { get_param: vsn_private_ip_0 }}]\n\n  vsn_private_1_port:\n    type: OS::Neutron::Port\n    properties:\n      network: { get_param: ecomp_private_net_id }\n      fixed_ips: [{"subnet": { get_param: ecomp_private_net_id }, "ip_address": { get_param: vsn_private_ip_1 }}]\n \n',300,'Artifact-UUID3','Base VFW Heat','label','2016-11-14 13:04:07',NULL);
-/*!40000 ALTER TABLE `heat_template` ENABLE KEYS */;
-UNLOCK TABLES;
-
-LOCK TABLES `heat_template_params` WRITE;
-/*!40000 ALTER TABLE `heat_template_params` DISABLE KEYS */;
-INSERT INTO `heat_template_params` VALUES (144,8,'vsn_private_ip_1','\1','string',NULL);
-INSERT INTO `heat_template_params` VALUES (145,8,'ecomp_private_net_cidr','\1','string',NULL);
-INSERT INTO `heat_template_params` VALUES (146,8,'public_net_id','\1','string',NULL);
-INSERT INTO `heat_template_params` VALUES (147,8,'unprotected_private_net_id','\1','string',NULL);
-INSERT INTO `heat_template_params` VALUES (148,8,'webserver_ip','\1','string',NULL);
-INSERT INTO `heat_template_params` VALUES (149,8,'vfw_image_name','\1','string',NULL);
-INSERT INTO `heat_template_params` VALUES (150,8,'vnf_id','\1','string',NULL);
-INSERT INTO `heat_template_params` VALUES (151,8,'dcae_collector_ip','\1','string',NULL);
-INSERT INTO `heat_template_params` VALUES (152,8,'protected_private_net_cidr','\1','string',NULL);
-INSERT INTO `heat_template_params` VALUES (153,8,'vsn_private_ip_0','\1','string',NULL);
-INSERT INTO `heat_template_params` VALUES (154,8,'vfw_private_ip_0','\1','string',NULL);
-INSERT INTO `heat_template_params` VALUES (155,8,'vfw_private_ip_1','\1','string',NULL);
-INSERT INTO `heat_template_params` VALUES (156,8,'vfw_private_ip_2','\1','string',NULL);
-INSERT INTO `heat_template_params` VALUES (157,8,'unprotected_private_net_cidr','\1','string',NULL);
-INSERT INTO `heat_template_params` VALUES (158,8,'vsn_name_0','\1','string',NULL);
-INSERT INTO `heat_template_params` VALUES (159,8,'ecomp_private_net_id','\1','string',NULL);
-INSERT INTO `heat_template_params` VALUES (160,8,'vpg_private_ip_1','\1','string',NULL);
-INSERT INTO `heat_template_params` VALUES (161,8,'vpg_name_0','\1','string',NULL);
-INSERT INTO `heat_template_params` VALUES (162,8,'vf_module_id','\1','string',NULL);
-INSERT INTO `heat_template_params` VALUES (163,8,'pub_key','\1','string',NULL);
-INSERT INTO `heat_template_params` VALUES (164,8,'protected_private_net_id','\1','string',NULL);
-INSERT INTO `heat_template_params` VALUES (165,8,'key_name','\1','string',NULL);
-INSERT INTO `heat_template_params` VALUES (166,8,'vfw_flavor_name','\1','string',NULL);
-INSERT INTO `heat_template_params` VALUES (167,8,'vpg_private_ip_0','\1','string',NULL);
-INSERT INTO `heat_template_params` VALUES (168,8,'vfw_name_0','\1','string',NULL);
-/*!40000 ALTER TABLE `heat_template_params` ENABLE KEYS */;
-UNLOCK TABLES;
-
-LOCK TABLES `service` WRITE;
-/*!40000 ALTER TABLE `service` DISABLE KEYS */;
-INSERT INTO `service` VALUES (11,'vfw-service','1.0','VFW service','2e34774e-715e-4fd5-bd09-7b654622f35i',NULL,NULL,'2016-11-14 13:04:07','585822c7-4027-4f84-ba50-e9248606f112');
-/*!40000 ALTER TABLE `service` ENABLE KEYS */;
-UNLOCK TABLES;
-
-LOCK TABLES `vf_module` WRITE;
-/*!40000 ALTER TABLE `vf_module` DISABLE KEYS */;
-INSERT INTO `vf_module` VALUES (9,'vfw-service/VFWResource-1::VF_RI1_VFW::module-1','1.0','VF_RI1_VFW::module-1','1.0','1e34774e-715e-4fd5-bd08-7b654622f33f.VF_RI1_VFW::module-1::module-1.group',NULL,8,1,'2016-11-14 13:04:07',NULL,NULL,7,5,'585822c7-4027-4f84-ba50-e9248606f134');
-/*!40000 ALTER TABLE `vf_module` ENABLE KEYS */;
-UNLOCK TABLES;
-
-LOCK TABLES `vnf_resource` WRITE;
-/*!40000 ALTER TABLE `vnf_resource` DISABLE KEYS */;
-INSERT INTO `vnf_resource` VALUES (7,'vfw-service/VFWResource-1','1.0','HEAT','VFW service',NULL,NULL,'2016-11-14 13:04:07','685822c7-4027-4f84-ba50-e9248606f132',NULL,NULL,'585822c7-4027-4f84-ba50-e9248606f113','1.0','VFWResource-1','VFWResource','585822c7-4027-4f84-ba50-e9248606f112');
-/*!40000 ALTER TABLE `vnf_resource` ENABLE KEYS */;
-UNLOCK TABLES;
\ No newline at end of file
+# LOCK TABLES `heat_environment` WRITE;
+# /*!40000 ALTER TABLE `heat_environment` DISABLE KEYS */;
+# INSERT INTO `heat_environment` VALUES (5,'base_vfw.env','1.0','vfw-service/VFWResource-1','base_vfw ENV file','parameters:\n  vfw_image_name: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)\n  vfw_flavor_name: 4 GB General Purpose v1\n  public_net_id: 00000000-0000-0000-0000-000000000000\n  unprotected_private_net_id: zdfw1fwl01_unprotected\n  protected_private_net_id: zdfw1fwl01_protected\n  ecomp_private_net_id: oam_ecomp\n  unprotected_private_net_cidr: 192.168.10.0/24\n  protected_private_net_cidr: 192.168.20.0/24\n  ecomp_private_net_cidr: 192.168.9.0/24\n  vfw_private_ip_0: 192.168.10.100\n  vfw_private_ip_1: 192.168.20.100\n  vfw_private_ip_2: 192.168.9.100\n  vpg_private_ip_0: 192.168.10.200\n  vpg_private_ip_1: 192.168.9.200\n  vsn_private_ip_0: 192.168.20.250\n  vsn_private_ip_1: 192.168.9.250\n  vfw_name_0: zdfw1fwl01fwl01\n  vpg_name_0: zdfw1fwl01pgn01\n  vsn_name_0: zdfw1fwl01snk01\n  vnf_id: vFirewall_demo_app\n  vf_module_id: vFirewall\n  webserver_ip: 162.242.237.182\n  dcae_collector_ip: 192.168.9.1\n  key_name: vfw_key\n  pub_key: INSERT YOUR PUBLIC KEY HERE','2016-11-14 13:04:07','EnvArtifact-UUID3','Label');
+# /*!40000 ALTER TABLE `heat_environment` ENABLE KEYS */;
+# UNLOCK TABLES;
+# 
+# LOCK TABLES `heat_template` WRITE;
+# /*!40000 ALTER TABLE `heat_template` DISABLE KEYS */;
+# INSERT INTO `heat_template` VALUES (8,'base_vfw.yaml','1.0','VFWResource','base_vfw.yaml','heat_template_version: 2013-05-23\n\ndescription: Heat template to deploy vFirewall demo app for OpenECOMP\n\nparameters:\n  vfw_image_name:\n    type: string\n    label: Image name or ID\n    description: Image to be used for compute instance\n  vfw_flavor_name:\n    type: string\n    label: Flavor\n    description: Type of instance (flavor) to be used\n  public_net_id:\n    type: string\n    label: Public network name or ID\n    description: Public network that enables remote connection to VNF\n  unprotected_private_net_id:\n    type: string\n    label: Unprotected private network name or ID\n    description: Private network that connects vPacketGenerator with vFirewall\n  protected_private_net_id:\n    type: string\n    label: Protected private network name or ID\n    description: Private network that connects vFirewall with vSink\n  ecomp_private_net_id:\n    type: string\n    label: ECOMP management network name or ID\n    description: Private network that connects ECOMP component and the VNF\n  unprotected_private_net_cidr:\n    type: string\n    label: Unprotected private network CIDR\n    description: The CIDR of the unprotected private network\n  protected_private_net_cidr:\n    type: string\n    label: Protected private network CIDR\n    description: The CIDR of the protected private network\n  ecomp_private_net_cidr:\n    type: string\n    label: ECOMP private network CIDR\n    description: The CIDR of the protected private network\n  vfw_private_ip_0:\n    type: string\n    label: vFirewall private IP address towards the unprotected network\n    description: Private IP address that is assigned to the vFirewall to communicate with the vPacketGenerator\n  vfw_private_ip_1:\n    type: string\n    label: vFirewall private IP address towards the protected network\n    description: Private IP address that is assigned to the vFirewall to communicate with the vSink\n  vfw_private_ip_2:\n    type: string\n    label: vFirewall private IP address towards the ECOMP management network\n    description: Private IP address that is assigned to the vFirewall to communicate with ECOMP components\n  vpg_private_ip_0:\n    type: string\n    label: vPacketGenerator private IP address towards the unprotected network\n    description: Private IP address that is assigned to the vPacketGenerator to communicate with the vFirewall\n  vpg_private_ip_1:\n    type: string\n    label: vPacketGenerator private IP address towards the ECOMP management network\n    description: Private IP address that is assigned to the vPacketGenerator to communicate with ECOMP components\n  vsn_private_ip_0:\n    type: string\n    label: vSink private IP address towards the protected network\n    description: Private IP address that is assigned to the vSink to communicate with the vFirewall\n  vsn_private_ip_1:\n    type: string\n    label: vSink private IP address towards the ECOMP management network\n    description: Private IP address that is assigned to the vSink to communicate with ECOMP components\n  vfw_name_0:\n    type: string\n    label: vFirewall name\n    description: Name of the vFirewall\n  vpg_name_0:\n    type: string\n    label: vPacketGenerator name\n    description: Name of the vPacketGenerator\n  vsn_name_0:\n    type: string\n    label: vSink name\n    description: Name of the vSink\n  vnf_id:\n    type: string\n    label: VNF ID\n    description: The VNF ID is provided by ECOMP\n  vf_module_id:\n    type: string\n    label: vFirewall module ID\n    description: The vFirewall Module ID is provided by ECOMP\n  webserver_ip:\n    type: string\n    label: Webserver IP address\n    description: IP address of the webserver that hosts the source code and binaries\n  dcae_collector_ip:\n    type: string\n    label: DCAE collector IP address\n    description: IP address of the DCAE collector\n  key_name:\n    type: string\n    label: Key pair name\n    description: Public/Private key pair name\n  pub_key:\n    type: string\n    label: Public key\n    description: Public key to be installed on the compute instance\n\nresources:\n  my_keypair:\n    type: OS::Nova::KeyPair\n    properties:\n      name: { get_param: key_name }\n      public_key: { get_param: pub_key }\n      save_private_key: false\n\n  unprotected_private_network:\n    type: OS::Neutron::Net\n    properties:\n      name: { get_param: unprotected_private_net_id }\n\n  protected_private_network:\n    type: OS::Neutron::Net\n    properties:\n      name: { get_param: protected_private_net_id }\n\n  unprotected_private_subnet:\n    type: OS::Neutron::Subnet\n    properties:\n      network_id: { get_resource: unprotected_private_network }\n      cidr: { get_param: unprotected_private_net_cidr }\n\n  protected_private_subnet:\n    type: OS::Neutron::Subnet\n    properties:\n      network_id: { get_resource: protected_private_network }\n      cidr: { get_param: protected_private_net_cidr }\n\n  vfw_0:\n    type: OS::Nova::Server\n    properties:\n      image: { get_param: vfw_image_name }\n      flavor: { get_param: vfw_flavor_name }\n      name: { get_param: vfw_name_0 }\n      key_name: { get_resource: my_keypair }\n      networks:\n        - network: { get_param: public_net_id }\n        - port: { get_resource: vfw_private_0_port }\n        - port: { get_resource: vfw_private_1_port }\n        - port: { get_resource: vfw_private_2_port }\n      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}\n      user_data_format: RAW\n      user_data:\n        str_replace:\n          params:\n            __webserver__: { get_param: webserver_ip }\n            __dcae_collector_ip__ : { get_param: dcae_collector_ip }\n          template: |\n            #!/bin/bash\n\n            WEBSERVER_IP=__webserver__\n            DCAE_COLLECTOR_IP=__dcae_collector_ip__\n\n            mkdir /opt/config\n            cd /opt\n            wget http://$WEBSERVER_IP/demo_repo/v_firewall_init.sh\n            wget http://$WEBSERVER_IP/demo_repo/vfirewall.sh\n            chmod +x v_firewall_init.sh\n            chmod +x vfirewall.sh\n            echo $WEBSERVER_IP > config/webserver_ip.txt\n            echo $DCAE_COLLECTOR_IP > config/dcae_collector_ip.txt\n            echo "no" > config/install.txt\n            mv vfirewall.sh /etc/init.d\n            sudo update-rc.d vfirewall.sh defaults\n            ./v_firewall_init.sh\n\n  vfw_private_0_port:\n    type: OS::Neutron::Port\n    properties:\n      network: { get_resource: unprotected_private_network }\n      fixed_ips: [{"subnet": { get_resource: unprotected_private_subnet }, "ip_address": { get_param: vfw_private_ip_0 }}]\n\n  vfw_private_1_port:\n    type: OS::Neutron::Port\n    properties:\n      network: { get_resource: protected_private_network }\n      fixed_ips: [{"subnet": { get_resource: protected_private_subnet }, "ip_address": { get_param: vfw_private_ip_1 }}]\n\n  vfw_private_2_port:\n    type: OS::Neutron::Port\n    properties:\n      network: { get_param: ecomp_private_net_id }\n      fixed_ips: [{"subnet": { get_param: ecomp_private_net_id }, "ip_address": { get_param: vfw_private_ip_2 }}]\n\n  vpg_0:\n    type: OS::Nova::Server\n    properties:\n      image: { get_param: vfw_image_name }\n      flavor: { get_param: vfw_flavor_name }\n      name: { get_param: vpg_name_0 }\n      key_name: { get_resource: my_keypair }\n      networks:\n        - network: { get_param: public_net_id }\n        - port: { get_resource: vpg_private_0_port }\n        - port: { get_resource: vpg_private_1_port }\n      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}\n      user_data_format: RAW\n      user_data:\n        str_replace:\n          params:\n            __webserver__: { get_param: webserver_ip }\n            __fw_ipaddr__: { get_param: vfw_private_ip_0 }\n            __protected_net_cidr__: { get_param: protected_private_net_cidr }\n            __sink_ipaddr__: { get_param: vsn_private_ip_0 }\n          template: |\n            #!/bin/bash\n\n            WEBSERVER_IP=__webserver__\n            FW_IPADDR=__fw_ipaddr__\n            PROTECTED_NET_CIDR=__protected_net_cidr__\n            SINK_IPADDR=__sink_ipaddr__\n\n            mkdir /opt/config\n            cd /opt\n            wget http://$WEBSERVER_IP/demo_repo/v_packetgen_init.sh\n            wget http://$WEBSERVER_IP/demo_repo/vpacketgen.sh\n            chmod +x v_packetgen_init.sh\n            chmod +x vpacketgen.sh\n            echo $WEBSERVER_IP > config/webserver_ip.txt\n            echo $FW_IPADDR > config/fw_ipaddr.txt\n            echo $PROTECTED_NET_CIDR > config/protected_net_cidr.txt\n            echo $SINK_IPADDR > config/sink_ipaddr.txt\n            echo "no" > config/install.txt\n            mv vpacketgen.sh /etc/init.d\n            sudo update-rc.d vpacketgen.sh defaults\n            ./v_packetgen_init.sh\n\n  vpg_private_0_port:\n    type: OS::Neutron::Port\n    properties:\n      network: { get_resource: unprotected_private_network }\n      fixed_ips: [{"subnet": { get_resource: unprotected_private_subnet }, "ip_address": { get_param: vpg_private_ip_0 }}]\n\n  vpg_private_1_port:\n    type: OS::Neutron::Port\n    properties:\n      network: { get_param: ecomp_private_net_id }\n      fixed_ips: [{"subnet": { get_param: ecomp_private_net_id }, "ip_address": { get_param: vpg_private_ip_1 }}]\n\n  vsn_0:\n    type: OS::Nova::Server\n    properties:\n      image: { get_param: vfw_image_name }\n      flavor: { get_param: vfw_flavor_name }\n      name: { get_param: vsn_name_0 }\n      key_name: { get_resource: my_keypair }\n      networks:\n        - network: { get_param: public_net_id }\n        - port: { get_resource: vsn_private_0_port }\n        - port: { get_resource: vsn_private_1_port }\n      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}\n      user_data_format: RAW\n      user_data:\n        str_replace:\n          params:\n            __webserver__: { get_param: webserver_ip }\n            __protected_net_gw__: { get_param: vfw_private_ip_1 }\n            __unprotected_net__: { get_param: unprotected_private_net_cidr }\n          template: |\n            #!/bin/bash\n\n            WEBSERVER_IP=__webserver__\n            PROTECTED_NET_GW=__protected_net_gw__\n            UNPROTECTED_NET=__unprotected_net__\n            UNPROTECTED_NET=$(echo $UNPROTECTED_NET | cut -d\'/\' -f1)\n\n            mkdir /opt/config\n            cd /opt\n            wget http://$WEBSERVER_IP/demo_repo/v_sink_init.sh\n            wget http://$WEBSERVER_IP/demo_repo/vsink.sh\n            chmod +x v_sink_init.sh\n            chmod +x vsink.sh\n            echo $PROTECTED_NET_GW > config/protected_net_gw.txt\n            echo $UNPROTECTED_NET > config/unprotected_net.txt\n            echo "no" > config/install.txt\n            mv vsink.sh /etc/init.d\n            sudo update-rc.d vsink.sh defaults\n            ./v_sink_init.sh\n\n  vsn_private_0_port:\n    type: OS::Neutron::Port\n    properties:\n      network: { get_resource: protected_private_network }\n      fixed_ips: [{"subnet": { get_resource: protected_private_subnet }, "ip_address": { get_param: vsn_private_ip_0 }}]\n\n  vsn_private_1_port:\n    type: OS::Neutron::Port\n    properties:\n      network: { get_param: ecomp_private_net_id }\n      fixed_ips: [{"subnet": { get_param: ecomp_private_net_id }, "ip_address": { get_param: vsn_private_ip_1 }}]\n \n',300,'Artifact-UUID3','Base VFW Heat','label','2016-11-14 13:04:07',NULL);
+# /*!40000 ALTER TABLE `heat_template` ENABLE KEYS */;
+# UNLOCK TABLES;
+# 
+# LOCK TABLES `heat_template_params` WRITE;
+# /*!40000 ALTER TABLE `heat_template_params` DISABLE KEYS */;
+# INSERT INTO `heat_template_params` VALUES (144,8,'vsn_private_ip_1','\1','string',NULL);
+# INSERT INTO `heat_template_params` VALUES (145,8,'ecomp_private_net_cidr','\1','string',NULL);
+# INSERT INTO `heat_template_params` VALUES (146,8,'public_net_id','\1','string',NULL);
+# INSERT INTO `heat_template_params` VALUES (147,8,'unprotected_private_net_id','\1','string',NULL);
+# INSERT INTO `heat_template_params` VALUES (148,8,'webserver_ip','\1','string',NULL);
+# INSERT INTO `heat_template_params` VALUES (149,8,'vfw_image_name','\1','string',NULL);
+# INSERT INTO `heat_template_params` VALUES (150,8,'vnf_id','\1','string',NULL);
+# INSERT INTO `heat_template_params` VALUES (151,8,'dcae_collector_ip','\1','string',NULL);
+# INSERT INTO `heat_template_params` VALUES (152,8,'protected_private_net_cidr','\1','string',NULL);
+# INSERT INTO `heat_template_params` VALUES (153,8,'vsn_private_ip_0','\1','string',NULL);
+# INSERT INTO `heat_template_params` VALUES (154,8,'vfw_private_ip_0','\1','string',NULL);
+# INSERT INTO `heat_template_params` VALUES (155,8,'vfw_private_ip_1','\1','string',NULL);
+# INSERT INTO `heat_template_params` VALUES (156,8,'vfw_private_ip_2','\1','string',NULL);
+# INSERT INTO `heat_template_params` VALUES (157,8,'unprotected_private_net_cidr','\1','string',NULL);
+# INSERT INTO `heat_template_params` VALUES (158,8,'vsn_name_0','\1','string',NULL);
+# INSERT INTO `heat_template_params` VALUES (159,8,'ecomp_private_net_id','\1','string',NULL);
+# INSERT INTO `heat_template_params` VALUES (160,8,'vpg_private_ip_1','\1','string',NULL);
+# INSERT INTO `heat_template_params` VALUES (161,8,'vpg_name_0','\1','string',NULL);
+# INSERT INTO `heat_template_params` VALUES (162,8,'vf_module_id','\1','string',NULL);
+# INSERT INTO `heat_template_params` VALUES (163,8,'pub_key','\1','string',NULL);
+# INSERT INTO `heat_template_params` VALUES (164,8,'protected_private_net_id','\1','string',NULL);
+# INSERT INTO `heat_template_params` VALUES (165,8,'key_name','\1','string',NULL);
+# INSERT INTO `heat_template_params` VALUES (166,8,'vfw_flavor_name','\1','string',NULL);
+# INSERT INTO `heat_template_params` VALUES (167,8,'vpg_private_ip_0','\1','string',NULL);
+# INSERT INTO `heat_template_params` VALUES (168,8,'vfw_name_0','\1','string',NULL);
+# /*!40000 ALTER TABLE `heat_template_params` ENABLE KEYS */;
+# UNLOCK TABLES;
+# 
+# LOCK TABLES `service` WRITE;
+# /*!40000 ALTER TABLE `service` DISABLE KEYS */;
+# INSERT INTO `service` VALUES (11,'vfw-service','1.0','VFW service','2e34774e-715e-4fd5-bd09-7b654622f35i',NULL,NULL,'2016-11-14 13:04:07','585822c7-4027-4f84-ba50-e9248606f112');
+# /*!40000 ALTER TABLE `service` ENABLE KEYS */;
+# UNLOCK TABLES;
+# 
+# LOCK TABLES `vf_module` WRITE;
+# /*!40000 ALTER TABLE `vf_module` DISABLE KEYS */;
+# INSERT INTO `vf_module` VALUES (9,'vfw-service/VFWResource-1::VF_RI1_VFW::module-1','1.0','VF_RI1_VFW::module-1','1.0','1e34774e-715e-4fd5-bd08-7b654622f33f.VF_RI1_VFW::module-1::module-1.group',NULL,8,1,'2016-11-14 13:04:07',NULL,NULL,7,5,'585822c7-4027-4f84-ba50-e9248606f134');
+# /*!40000 ALTER TABLE `vf_module` ENABLE KEYS */;
+# UNLOCK TABLES;
+# 
+# LOCK TABLES `vnf_resource` WRITE;
+# /*!40000 ALTER TABLE `vnf_resource` DISABLE KEYS */;
+# INSERT INTO `vnf_resource` VALUES (7,'vfw-service/VFWResource-1','1.0','HEAT','VFW service',NULL,NULL,'2016-11-14 13:04:07','685822c7-4027-4f84-ba50-e9248606f132',NULL,NULL,'585822c7-4027-4f84-ba50-e9248606f113','1.0','VFWResource-1','VFWResource','585822c7-4027-4f84-ba50-e9248606f112');
+# /*!40000 ALTER TABLE `vnf_resource` ENABLE KEYS */;
+# UNLOCK TABLES;
@@ -1,7 +1,6 @@
-# Start of Statements added for MSO
 DROP DATABASE IF EXISTS `camundabpmn`;
 
-CREATE DATABASE /*!32312 IF NOT EXISTS*/ `camundabpmn` /*!40100 DEFAULT CHARACTER SET latin1 */;
+CREATE DATABASE `camundabpmn`;
 
 USE `camundabpmn`;
 
@@ -10,7 +9,8 @@ delete from mysql.user where User='camunda';
 CREATE USER 'camunda';
 GRANT ALL on camundabpmn.* to 'camunda' identified by 'camunda123' with GRANT OPTION;
 FLUSH PRIVILEGES;
-# End of Statements added for MSO
+
+USE `camundabpmn`;
 
 create table ACT_GE_PROPERTY (
     NAME_ varchar(64),
@@ -31,6 +31,9 @@ values ('next.dbid', '1', 1);
 insert into ACT_GE_PROPERTY
 values ('deployment.lock', '0', 1);
 
+insert into ACT_GE_PROPERTY
+values ('history.cleanup.job.lock', '0', 1);
+
 create table ACT_GE_BYTEARRAY (
     ID_ varchar(64),
     REV_ integer,
@@ -129,6 +132,7 @@ create table ACT_RE_PROCDEF (
     SUSPENSION_STATE_ integer,
     TENANT_ID_ varchar(64),
     VERSION_TAG_ varchar(64),
+    HISTORY_TTL_ integer,
     primary key (ID_)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
 
@@ -182,8 +186,8 @@ create table ACT_RU_VARIABLE (
     BYTEARRAY_ID_ varchar(64),
     DOUBLE_ double,
     LONG_ bigint,
-    TEXT_ varchar(4000),
-    TEXT2_ varchar(4000),
+    TEXT_ LONGBLOB NULL,
+    TEXT2_ LONGBLOB NULL,
     VAR_SCOPE_ varchar(64) not null,
     SEQUENCE_COUNTER_ bigint,
     IS_CONCURRENT_LOCAL_ TINYINT,
@@ -198,7 +202,7 @@ create table ACT_RU_EVENT_SUBSCR (
     EVENT_NAME_ varchar(255),
     EXECUTION_ID_ varchar(64),
     PROC_INST_ID_ varchar(64),
-    ACTIVITY_ID_ varchar(64),
+    ACTIVITY_ID_ varchar(255),
     CONFIGURATION_ varchar(255),
     CREATED_ timestamp(3) not null,
     TENANT_ID_ varchar(64),
@@ -328,6 +332,7 @@ CREATE INDEX ACT_IDX_METER_LOG ON ACT_RU_METER_LOG(NAME_, TIMESTAMP_);
 create index ACT_IDX_EXT_TASK_TOPIC on ACT_RU_EXT_TASK(TOPIC_NAME_);
 create index ACT_IDX_EXT_TASK_TENANT_ID on ACT_RU_EXT_TASK(TENANT_ID_);
 create index ACT_IDX_EXT_TASK_PRIORITY ON ACT_RU_EXT_TASK(PRIORITY_);
+create index ACT_IDX_EXT_TASK_ERR_DETAILS ON ACT_RU_EXT_TASK(ERROR_DETAILS_ID_);
 create index ACT_IDX_AUTH_GROUP_ID ON ACT_RU_AUTHORIZATION(GROUP_ID_);
 create index ACT_IDX_JOB_JOB_DEF_ID on ACT_RU_JOB(JOB_DEF_ID_);
 
@@ -510,6 +515,7 @@ create table ACT_RE_CASE_DEF (
     RESOURCE_NAME_ varchar(4000),
     DGRM_RESOURCE_NAME_ varchar(4000),
     TENANT_ID_ varchar(64),
+    HISTORY_TTL_ integer,
     primary key (ID_)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
 
@@ -618,6 +624,7 @@ create table ACT_RE_DECISION_DEF (
     DEC_REQ_ID_ varchar(64),
     DEC_REQ_KEY_ varchar(255),
     TENANT_ID_ varchar(64),
+    HISTORY_TTL_ integer,
     primary key (ID_)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
 
@@ -735,8 +742,8 @@ create table ACT_HI_VARINST (
     BYTEARRAY_ID_ varchar(64),
     DOUBLE_ double,
     LONG_ bigint,
-    TEXT_ varchar(4000),
-    TEXT2_ varchar(4000),
+    TEXT_ LONGBLOB NULL,
+    TEXT2_ LONGBLOB NULL,
     TENANT_ID_ varchar(64),
     primary key (ID_)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
@@ -762,10 +769,11 @@ create table ACT_HI_DETAIL (
     BYTEARRAY_ID_ varchar(64),
     DOUBLE_ double,
     LONG_ bigint,
-    TEXT_ varchar(4000),
-    TEXT2_ varchar(4000),
+    TEXT_ LONGBLOB NULL,
+    TEXT2_ LONGBLOB NULL,
     SEQUENCE_COUNTER_ bigint,
     TENANT_ID_ varchar(64),
+    OPERATION_ID_ varchar(64),
     primary key (ID_)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
 
@@ -898,6 +906,27 @@ create table ACT_HI_BATCH (
     primary key (ID_)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
 
+create table ACT_HI_EXT_TASK_LOG (
+    ID_ varchar(64) not null,
+    TIMESTAMP_ timestamp(3) not null,
+    EXT_TASK_ID_ varchar(64) not null,
+    RETRIES_ integer,
+    TOPIC_NAME_ varchar(255),
+    WORKER_ID_ varchar(255),
+    PRIORITY_ bigint NOT NULL DEFAULT 0,
+    ERROR_MSG_ varchar(4000),
+    ERROR_DETAILS_ID_ varchar(64),
+    ACT_ID_ varchar(255),
+    ACT_INST_ID_ varchar(64),
+    EXECUTION_ID_ varchar(64),
+    PROC_INST_ID_ varchar(64),
+    PROC_DEF_ID_ varchar(64),
+    PROC_DEF_KEY_ varchar(255),
+    TENANT_ID_ varchar(64),
+    STATE_ integer,
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
 create index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST(END_TIME_);
 create index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST(BUSINESS_KEY_);
 create index ACT_IDX_HI_PRO_INST_TENANT_ID on ACT_HI_PROCINST(TENANT_ID_);
@@ -944,6 +973,11 @@ create index ACT_IDX_HI_JOB_LOG_TENANT_ID on ACT_HI_JOB_LOG(TENANT_ID_);
 create index ACT_IDX_HI_JOB_LOG_JOB_DEF_ID on ACT_HI_JOB_LOG(JOB_DEF_ID_);
 create index ACT_IDX_HI_JOB_LOG_PROC_DEF_KEY on ACT_HI_JOB_LOG(PROCESS_DEF_KEY_);
 
+create index ACT_HI_EXT_TASK_LOG_PROCINST on ACT_HI_EXT_TASK_LOG(PROC_INST_ID_);
+create index ACT_HI_EXT_TASK_LOG_PROCDEF on ACT_HI_EXT_TASK_LOG(PROC_DEF_ID_);
+create index ACT_HI_EXT_TASK_LOG_PROC_DEF_KEY on ACT_HI_EXT_TASK_LOG(PROC_DEF_KEY_);
+create index ACT_HI_EXT_TASK_LOG_TENANT_ID on ACT_HI_EXT_TASK_LOG(TENANT_ID_);
+
 create index ACT_IDX_HI_OP_LOG_PROCINST on ACT_HI_OP_LOG(PROC_INST_ID_);
 create index ACT_IDX_HI_OP_LOG_PROCDEF on ACT_HI_OP_LOG(PROC_DEF_ID_);
 create table ACT_HI_CASEINST (
@@ -1025,8 +1059,8 @@ create table ACT_HI_DEC_IN (
     BYTEARRAY_ID_ varchar(64),
     DOUBLE_ double,
     LONG_ bigint,
-    TEXT_ varchar(4000),
-    TEXT2_ varchar(4000),
+    TEXT_ LONGBLOB NULL,
+    TEXT2_ LONGBLOB NULL,
     TENANT_ID_ varchar(64),
     primary key (ID_)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
@@ -1044,8 +1078,8 @@ create table ACT_HI_DEC_OUT (
     BYTEARRAY_ID_ varchar(64),
     DOUBLE_ double,
     LONG_ bigint,
-    TEXT_ varchar(4000),
-    TEXT2_ varchar(4000),
+    TEXT_ LONGBLOB NULL,
+    TEXT2_ LONGBLOB NULL,
     TENANT_ID_ varchar(64),
     primary key (ID_)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
@@ -1069,3 +1103,93 @@ create index ACT_IDX_HI_DEC_IN_CLAUSE on ACT_HI_DEC_IN(DEC_INST_ID_, CLAUSE_ID_)
 
 create index ACT_IDX_HI_DEC_OUT_INST on ACT_HI_DEC_OUT(DEC_INST_ID_);
 create index ACT_IDX_HI_DEC_OUT_RULE on ACT_HI_DEC_OUT(RULE_ORDER_, CLAUSE_ID_);
+
+
+-- mariadb identity:
+
+create table ACT_ID_GROUP (
+    ID_ varchar(64),
+    REV_ integer,
+    NAME_ varchar(255),
+    TYPE_ varchar(255),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_ID_MEMBERSHIP (
+    USER_ID_ varchar(64),
+    GROUP_ID_ varchar(64),
+    primary key (USER_ID_, GROUP_ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_ID_USER (
+    ID_ varchar(64),
+    REV_ integer,
+    FIRST_ varchar(255),
+    LAST_ varchar(255),
+    EMAIL_ varchar(255),
+    PWD_ varchar(255),
+    SALT_ varchar(255),
+    PICTURE_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_ID_INFO (
+    ID_ varchar(64),
+    REV_ integer,
+    USER_ID_ varchar(64),
+    TYPE_ varchar(64),
+    KEY_ varchar(255),
+    VALUE_ varchar(255),
+    PASSWORD_ LONGBLOB,
+    PARENT_ID_ varchar(255),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_ID_TENANT (
+    ID_ varchar(64),
+    REV_ integer,
+    NAME_ varchar(255),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+create table ACT_ID_TENANT_MEMBER (
+    ID_ varchar(64) not null,
+    TENANT_ID_ varchar(64) not null,
+    USER_ID_ varchar(64),
+    GROUP_ID_ varchar(64),
+    primary key (ID_)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
+
+alter table ACT_ID_MEMBERSHIP
+    add constraint ACT_FK_MEMB_GROUP
+    foreign key (GROUP_ID_)
+    references ACT_ID_GROUP (ID_);
+
+alter table ACT_ID_MEMBERSHIP
+    add constraint ACT_FK_MEMB_USER
+    foreign key (USER_ID_)
+    references ACT_ID_USER (ID_);
+
+alter table ACT_ID_TENANT_MEMBER
+    add constraint ACT_UNIQ_TENANT_MEMB_USER
+    unique (TENANT_ID_, USER_ID_);
+
+alter table ACT_ID_TENANT_MEMBER
+    add constraint ACT_UNIQ_TENANT_MEMB_GROUP
+    unique (TENANT_ID_, GROUP_ID_);
+
+alter table ACT_ID_TENANT_MEMBER
+    add constraint ACT_FK_TENANT_MEMB
+    foreign key (TENANT_ID_)
+    references ACT_ID_TENANT (ID_);
+
+alter table ACT_ID_TENANT_MEMBER
+    add constraint ACT_FK_TENANT_MEMB_USER
+    foreign key (USER_ID_)
+    references ACT_ID_USER (ID_);
+
+alter table ACT_ID_TENANT_MEMBER
+    add constraint ACT_FK_TENANT_MEMB_GROUP
+    foreign key (GROUP_ID_)
+    references ACT_ID_GROUP (ID_);
+
diff --git a/kubernetes/config/docker/init/src/config/mso/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/camunda/mariadb_identity_7.6.0.sql b/kubernetes/config/docker/init/src/config/mso/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/camunda/mariadb_identity_7.6.0.sql
deleted file mode 100644 (file)
index e4a81e4..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-# Start of statements added for MSO
-USE `camundabpmn`;
-# End of statements added for MSO
-
-create table ACT_ID_GROUP (
-    ID_ varchar(64),
-    REV_ integer,
-    NAME_ varchar(255),
-    TYPE_ varchar(255),
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_ID_MEMBERSHIP (
-    USER_ID_ varchar(64),
-    GROUP_ID_ varchar(64),
-    primary key (USER_ID_, GROUP_ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_ID_USER (
-    ID_ varchar(64),
-    REV_ integer,
-    FIRST_ varchar(255),
-    LAST_ varchar(255),
-    EMAIL_ varchar(255),
-    PWD_ varchar(255),
-    PICTURE_ID_ varchar(64),
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_ID_INFO (
-    ID_ varchar(64),
-    REV_ integer,
-    USER_ID_ varchar(64),
-    TYPE_ varchar(64),
-    KEY_ varchar(255),
-    VALUE_ varchar(255),
-    PASSWORD_ LONGBLOB,
-    PARENT_ID_ varchar(255),
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_ID_TENANT (
-    ID_ varchar(64),
-    REV_ integer,
-    NAME_ varchar(255),
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_ID_TENANT_MEMBER (
-    ID_ varchar(64) not null,
-    TENANT_ID_ varchar(64) not null,
-    USER_ID_ varchar(64),
-    GROUP_ID_ varchar(64),
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-alter table ACT_ID_MEMBERSHIP
-    add constraint ACT_FK_MEMB_GROUP
-    foreign key (GROUP_ID_)
-    references ACT_ID_GROUP (ID_);
-
-alter table ACT_ID_MEMBERSHIP
-    add constraint ACT_FK_MEMB_USER
-    foreign key (USER_ID_)
-    references ACT_ID_USER (ID_);
-
-alter table ACT_ID_TENANT_MEMBER
-    add constraint ACT_UNIQ_TENANT_MEMB_USER
-    unique (TENANT_ID_, USER_ID_);
-
-alter table ACT_ID_TENANT_MEMBER
-    add constraint ACT_UNIQ_TENANT_MEMB_GROUP
-    unique (TENANT_ID_, GROUP_ID_);
-
-alter table ACT_ID_TENANT_MEMBER
-    add constraint ACT_FK_TENANT_MEMB
-    foreign key (TENANT_ID_)
-    references ACT_ID_TENANT (ID_);
-
-alter table ACT_ID_TENANT_MEMBER
-    add constraint ACT_FK_TENANT_MEMB_USER
-    foreign key (USER_ID_)
-    references ACT_ID_USER (ID_);
-
-alter table ACT_ID_TENANT_MEMBER
-    add constraint ACT_FK_TENANT_MEMB_GROUP
-    foreign key (GROUP_ID_)
-    references ACT_ID_GROUP (ID_);
index 3beeaf1..c550304 100644 (file)
@@ -1,9 +1,26 @@
 USE camundabpmn;\r
 \r
-INSERT INTO `act_id_user` VALUES ('admin',1,'admin','user','camundaadmin@openecomp.org','{SHA}Y7MVubSDgzJeaulJRLN2dFyNCyc=',NULL);\r
+INSERT INTO `act_id_group` (`ID_`, `REV_`, `NAME_`, `TYPE_`) VALUES ('camunda-admin',1,'camunda BPM Administrators','SYSTEM');\r
 \r
-INSERT INTO `act_id_group` VALUES ('camunda-admin',1,'camunda BPM Administrators','SYSTEM');\r
+INSERT INTO `act_id_user` (`ID_`, `REV_`, `FIRST_`, `LAST_`, `EMAIL_`, `PWD_`, `SALT_`, `PICTURE_ID_`) VALUES ('admin',1,'admin','user','camundaadmin@onap.org','{SHA-512}p9Y4lC0X70X5ihfqGTNz/NDuWRbAgtnlEfjbYLMHLp0tMl//B7ujc80MLcHWlJ+jIG14uWTI6AqQYp6PykCxZg==','2vEsAj7cap7XEidkrd4BVg==',NULL);\r
 \r
-INSERT INTO `act_id_membership` VALUES ('admin','camunda-admin');\r
+INSERT INTO `act_id_membership` (`USER_ID_`, `GROUP_ID_`) VALUES ('admin','camunda-admin');\r
+\r
+INSERT INTO `act_ru_authorization` (`ID_`, `REV_`, `TYPE_`, `GROUP_ID_`, `USER_ID_`, `RESOURCE_TYPE_`, `RESOURCE_ID_`, `PERMS_`) VALUES ('68bc7a75-9cdc-11e7-a63d-0242ac120003',1,1,NULL,'admin',1,'admin',2147483647);\r
+INSERT INTO `act_ru_authorization` (`ID_`, `REV_`, `TYPE_`, `GROUP_ID_`, `USER_ID_`, `RESOURCE_TYPE_`, `RESOURCE_ID_`, `PERMS_`) VALUES ('68c13566-9cdc-11e7-a63d-0242ac120003',1,1,'camunda-admin',NULL,2,'camunda-admin',2);\r
+INSERT INTO `act_ru_authorization` (`ID_`, `REV_`, `TYPE_`, `GROUP_ID_`, `USER_ID_`, `RESOURCE_TYPE_`, `RESOURCE_ID_`, `PERMS_`) VALUES ('68c4dee7-9cdc-11e7-a63d-0242ac120003',1,1,'camunda-admin',NULL,0,'*',2147483647);\r
+INSERT INTO `act_ru_authorization` (`ID_`, `REV_`, `TYPE_`, `GROUP_ID_`, `USER_ID_`, `RESOURCE_TYPE_`, `RESOURCE_ID_`, `PERMS_`) VALUES ('68ca5d28-9cdc-11e7-a63d-0242ac120003',1,1,'camunda-admin',NULL,1,'*',2147483647);\r
+INSERT INTO `act_ru_authorization` (`ID_`, `REV_`, `TYPE_`, `GROUP_ID_`, `USER_ID_`, `RESOURCE_TYPE_`, `RESOURCE_ID_`, `PERMS_`) VALUES ('68cd9179-9cdc-11e7-a63d-0242ac120003',1,1,'camunda-admin',NULL,2,'*',2147483647);\r
+INSERT INTO `act_ru_authorization` (`ID_`, `REV_`, `TYPE_`, `GROUP_ID_`, `USER_ID_`, `RESOURCE_TYPE_`, `RESOURCE_ID_`, `PERMS_`) VALUES ('68d0ecda-9cdc-11e7-a63d-0242ac120003',1,1,'camunda-admin',NULL,3,'*',2147483647);\r
+INSERT INTO `act_ru_authorization` (`ID_`, `REV_`, `TYPE_`, `GROUP_ID_`, `USER_ID_`, `RESOURCE_TYPE_`, `RESOURCE_ID_`, `PERMS_`) VALUES ('68d384eb-9cdc-11e7-a63d-0242ac120003',1,1,'camunda-admin',NULL,4,'*',2147483647);\r
+INSERT INTO `act_ru_authorization` (`ID_`, `REV_`, `TYPE_`, `GROUP_ID_`, `USER_ID_`, `RESOURCE_TYPE_`, `RESOURCE_ID_`, `PERMS_`) VALUES ('68d5a7cc-9cdc-11e7-a63d-0242ac120003',1,1,'camunda-admin',NULL,5,'*',2147483647);\r
+INSERT INTO `act_ru_authorization` (`ID_`, `REV_`, `TYPE_`, `GROUP_ID_`, `USER_ID_`, `RESOURCE_TYPE_`, `RESOURCE_ID_`, `PERMS_`) VALUES ('68d83fdd-9cdc-11e7-a63d-0242ac120003',1,1,'camunda-admin',NULL,6,'*',2147483647);\r
+INSERT INTO `act_ru_authorization` (`ID_`, `REV_`, `TYPE_`, `GROUP_ID_`, `USER_ID_`, `RESOURCE_TYPE_`, `RESOURCE_ID_`, `PERMS_`) VALUES ('68dad7ee-9cdc-11e7-a63d-0242ac120003',1,1,'camunda-admin',NULL,7,'*',2147483647);\r
+INSERT INTO `act_ru_authorization` (`ID_`, `REV_`, `TYPE_`, `GROUP_ID_`, `USER_ID_`, `RESOURCE_TYPE_`, `RESOURCE_ID_`, `PERMS_`) VALUES ('68dd48ef-9cdc-11e7-a63d-0242ac120003',1,1,'camunda-admin',NULL,8,'*',2147483647);\r
+INSERT INTO `act_ru_authorization` (`ID_`, `REV_`, `TYPE_`, `GROUP_ID_`, `USER_ID_`, `RESOURCE_TYPE_`, `RESOURCE_ID_`, `PERMS_`) VALUES ('68e0a450-9cdc-11e7-a63d-0242ac120003',1,1,'camunda-admin',NULL,9,'*',2147483647);\r
+INSERT INTO `act_ru_authorization` (`ID_`, `REV_`, `TYPE_`, `GROUP_ID_`, `USER_ID_`, `RESOURCE_TYPE_`, `RESOURCE_ID_`, `PERMS_`) VALUES ('68e31551-9cdc-11e7-a63d-0242ac120003',1,1,'camunda-admin',NULL,10,'*',2147483647);\r
+INSERT INTO `act_ru_authorization` (`ID_`, `REV_`, `TYPE_`, `GROUP_ID_`, `USER_ID_`, `RESOURCE_TYPE_`, `RESOURCE_ID_`, `PERMS_`) VALUES ('68e5ad62-9cdc-11e7-a63d-0242ac120003',1,1,'camunda-admin',NULL,11,'*',2147483647);\r
+INSERT INTO `act_ru_authorization` (`ID_`, `REV_`, `TYPE_`, `GROUP_ID_`, `USER_ID_`, `RESOURCE_TYPE_`, `RESOURCE_ID_`, `PERMS_`) VALUES ('68e908c3-9cdc-11e7-a63d-0242ac120003',1,1,'camunda-admin',NULL,12,'*',2147483647);\r
+INSERT INTO `act_ru_authorization` (`ID_`, `REV_`, `TYPE_`, `GROUP_ID_`, `USER_ID_`, `RESOURCE_TYPE_`, `RESOURCE_ID_`, `PERMS_`) VALUES ('68eb52b4-9cdc-11e7-a63d-0242ac120003',1,1,'camunda-admin',NULL,13,'*',2147483647);\r
+INSERT INTO `act_ru_authorization` (`ID_`, `REV_`, `TYPE_`, `GROUP_ID_`, `USER_ID_`, `RESOURCE_TYPE_`, `RESOURCE_ID_`, `PERMS_`) VALUES ('68edeac5-9cdc-11e7-a63d-0242ac120003',1,1,'camunda-admin',NULL,14,'*',2147483647);\r
 \r
-INSERT INTO `act_ru_authorization` VALUES ('4ca68335-b7c5-11e6-b411-0242ac110003',1,1,NULL,'admin',1,'admin',2147483647),('4ca91b46-b7c5-11e6-b411-0242ac110003',1,1,'camunda-admin',NULL,2,'camunda-admin',2),('4cab3e27-b7c5-11e6-b411-0242ac110003',1,1,'camunda-admin',NULL,0,'*',2147483647),('4cadd638-b7c5-11e6-b411-0242ac110003',1,1,'camunda-admin',NULL,1,'*',2147483647),('4caf0eb9-b7c5-11e6-b411-0242ac110003',1,1,'camunda-admin',NULL,2,'*',2147483647),('4caff91a-b7c5-11e6-b411-0242ac110003',1,1,'camunda-admin',NULL,3,'*',2147483647),('4cb10a8b-b7c5-11e6-b411-0242ac110003',1,1,'camunda-admin',NULL,4,'*',2147483647),('4cb2430c-b7c5-11e6-b411-0242ac110003',1,1,'camunda-admin',NULL,5,'*',2147483647),('4cb32d6d-b7c5-11e6-b411-0242ac110003',1,1,'camunda-admin',NULL,6,'*',2147483647),('4cb43ede-b7c5-11e6-b411-0242ac110003',1,1,'camunda-admin',NULL,7,'*',2147483647),('4cb5293f-b7c5-11e6-b411-0242ac110003',1,1,'camunda-admin',NULL,8,'*',2147483647),('4cb5ec90-b7c5-11e6-b411-0242ac110003',1,1,'camunda-admin',NULL,9,'*',2147483647);\r
diff --git a/kubernetes/config/docker/init/src/config/mso/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/camunda/mysql_engine_7.3.0.sql b/kubernetes/config/docker/init/src/config/mso/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/camunda/mysql_engine_7.3.0.sql
deleted file mode 100644 (file)
index c25acf1..0000000
+++ /dev/null
@@ -1,748 +0,0 @@
-# Start of Statements added for MSO
-DROP DATABASE IF EXISTS `camundabpmn`;
-
-CREATE DATABASE /*!32312 IF NOT EXISTS*/ `camundabpmn` /*!40100 DEFAULT CHARACTER SET latin1 */;
-
-USE `camundabpmn`;
-
-# DROP USER IF EXISTS 'camunda';
-delete from mysql.user where User='camunda';
-CREATE USER 'camunda';
-GRANT ALL on camundabpmn.* to 'camunda' identified by 'camunda123' with GRANT OPTION;
-FLUSH PRIVILEGES;
-# End of Statements added for MSO
-
-create table ACT_GE_PROPERTY (
-    NAME_ varchar(64),
-    VALUE_ varchar(300),
-    REV_ integer,
-    primary key (NAME_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-insert into ACT_GE_PROPERTY
-values ('schema.version', 'fox', 1);
-
-insert into ACT_GE_PROPERTY
-values ('schema.history', 'create(fox)', 1);
-
-insert into ACT_GE_PROPERTY
-values ('next.dbid', '1', 1);
-
-insert into ACT_GE_PROPERTY
-values ('deployment.lock', '0', 1);
-
-create table ACT_GE_BYTEARRAY (
-    ID_ varchar(64),
-    REV_ integer,
-    NAME_ varchar(255),
-    DEPLOYMENT_ID_ varchar(64),
-    BYTES_ LONGBLOB,
-    GENERATED_ TINYINT,
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_RE_DEPLOYMENT (
-    ID_ varchar(64),
-    NAME_ varchar(255),
-    DEPLOY_TIME_ timestamp,
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_RU_EXECUTION (
-    ID_ varchar(64),
-    REV_ integer,
-    PROC_INST_ID_ varchar(64),
-    BUSINESS_KEY_ varchar(255),
-    PARENT_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    SUPER_EXEC_ varchar(64),
-    SUPER_CASE_EXEC_ varchar(64),
-    CASE_INST_ID_ varchar(64),
-    ACT_ID_ varchar(255),
-    ACT_INST_ID_ varchar(64),
-    IS_ACTIVE_ TINYINT,
-    IS_CONCURRENT_ TINYINT,
-    IS_SCOPE_ TINYINT,
-    IS_EVENT_SCOPE_ TINYINT,
-    SUSPENSION_STATE_ integer,
-    CACHED_ENT_STATE_ integer,
-    SEQUENCE_COUNTER_ bigint,
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_RU_JOB (
-    ID_ varchar(64) NOT NULL,
-       REV_ integer,
-    TYPE_ varchar(255) NOT NULL,
-    LOCK_EXP_TIME_ timestamp NULL,
-    LOCK_OWNER_ varchar(255),
-    EXCLUSIVE_ boolean,
-    EXECUTION_ID_ varchar(64),
-    PROCESS_INSTANCE_ID_ varchar(64),
-    PROCESS_DEF_ID_ varchar(64),
-    PROCESS_DEF_KEY_ varchar(64),
-    RETRIES_ integer,
-    EXCEPTION_STACK_ID_ varchar(64),
-    EXCEPTION_MSG_ varchar(4000),
-    DUEDATE_ timestamp NULL,
-    REPEAT_ varchar(255),
-    HANDLER_TYPE_ varchar(255),
-    HANDLER_CFG_ varchar(4000),
-    DEPLOYMENT_ID_ varchar(64),
-    SUSPENSION_STATE_ integer,
-    JOB_DEF_ID_ varchar(64),
-    SEQUENCE_COUNTER_ bigint,
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_RU_JOBDEF (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    PROC_DEF_ID_ varchar(64) NOT NULL,
-    PROC_DEF_KEY_ varchar(255) NOT NULL,
-    ACT_ID_ varchar(255) NOT NULL,
-    JOB_TYPE_ varchar(255) NOT NULL,
-    JOB_CONFIGURATION_ varchar(255),
-    SUSPENSION_STATE_ integer,
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_RE_PROCDEF (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    NAME_ varchar(255),
-    KEY_ varchar(255) not null,
-    VERSION_ integer not null,
-    DEPLOYMENT_ID_ varchar(64),
-    RESOURCE_NAME_ varchar(4000),
-    DGRM_RESOURCE_NAME_ varchar(4000),
-    HAS_START_FORM_KEY_ TINYINT,
-    SUSPENSION_STATE_ integer,
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_RU_TASK (
-    ID_ varchar(64),
-    REV_ integer,
-    EXECUTION_ID_ varchar(64),
-    PROC_INST_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    CASE_EXECUTION_ID_ varchar(64),
-    CASE_INST_ID_ varchar(64),
-    CASE_DEF_ID_ varchar(64),
-    NAME_ varchar(255),
-    PARENT_TASK_ID_ varchar(64),
-    DESCRIPTION_ varchar(4000),
-    TASK_DEF_KEY_ varchar(255),
-    OWNER_ varchar(255),
-    ASSIGNEE_ varchar(255),
-    DELEGATION_ varchar(64),
-    PRIORITY_ integer,
-    CREATE_TIME_ timestamp,
-    DUE_DATE_ datetime,
-    FOLLOW_UP_DATE_ datetime,
-    SUSPENSION_STATE_ integer,
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_RU_IDENTITYLINK (
-    ID_ varchar(64),
-    REV_ integer,
-    GROUP_ID_ varchar(255),
-    TYPE_ varchar(255),
-    USER_ID_ varchar(255),
-    TASK_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_RU_VARIABLE (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    TYPE_ varchar(255) not null,
-    NAME_ varchar(255) not null,
-    EXECUTION_ID_ varchar(64),
-    PROC_INST_ID_ varchar(64),
-    CASE_EXECUTION_ID_ varchar(64),
-    CASE_INST_ID_ varchar(64),
-    TASK_ID_ varchar(64),
-    BYTEARRAY_ID_ varchar(64),
-    DOUBLE_ double,
-    LONG_ bigint,
-    TEXT_ varchar(4000),
-    TEXT2_ varchar(4000),
-    VAR_SCOPE_ varchar(64) not null,
-    SEQUENCE_COUNTER_ bigint,
-    IS_CONCURRENT_LOCAL_ TINYINT,
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_RU_EVENT_SUBSCR (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    EVENT_TYPE_ varchar(255) not null,
-    EVENT_NAME_ varchar(255),
-    EXECUTION_ID_ varchar(64),
-    PROC_INST_ID_ varchar(64),
-    ACTIVITY_ID_ varchar(64),
-    CONFIGURATION_ varchar(255),
-    CREATED_ timestamp not null,
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_RU_INCIDENT (
-  ID_ varchar(64) not null,
-  REV_ integer not null,
-  INCIDENT_TIMESTAMP_ timestamp not null,
-  INCIDENT_MSG_ varchar(4000),
-  INCIDENT_TYPE_ varchar(255) not null,
-  EXECUTION_ID_ varchar(64),
-  ACTIVITY_ID_ varchar(255),
-  PROC_INST_ID_ varchar(64),
-  PROC_DEF_ID_ varchar(64),
-  CAUSE_INCIDENT_ID_ varchar(64),
-  ROOT_CAUSE_INCIDENT_ID_ varchar(64),
-  CONFIGURATION_ varchar(255),
-  primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_RU_AUTHORIZATION (
-  ID_ varchar(64) not null,
-  REV_ integer not null,
-  TYPE_ integer not null,
-  GROUP_ID_ varchar(255),
-  USER_ID_ varchar(255),
-  RESOURCE_TYPE_ integer not null,
-  RESOURCE_ID_ varchar(64),
-  PERMS_ integer,
-  primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_RU_FILTER (
-  ID_ varchar(64) not null,
-  REV_ integer not null,
-  RESOURCE_TYPE_ varchar(255) not null,
-  NAME_ varchar(255) not null,
-  OWNER_ varchar(255),
-  QUERY_ LONGTEXT not null,
-  PROPERTIES_ LONGTEXT,
-  primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_RU_METER_LOG (
-  ID_ varchar(64) not null,
-  NAME_ varchar(64) not null,
-  VALUE_ bigint,
-  TIMESTAMP_ timestamp not null,
-  primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create index ACT_IDX_EXEC_BUSKEY on ACT_RU_EXECUTION(BUSINESS_KEY_);
-create index ACT_IDX_TASK_CREATE on ACT_RU_TASK(CREATE_TIME_);
-create index ACT_IDX_TASK_ASSIGNEE on ACT_RU_TASK(ASSIGNEE_);
-create index ACT_IDX_IDENT_LNK_USER on ACT_RU_IDENTITYLINK(USER_ID_);
-create index ACT_IDX_IDENT_LNK_GROUP on ACT_RU_IDENTITYLINK(GROUP_ID_);
-create index ACT_IDX_EVENT_SUBSCR_CONFIG_ on ACT_RU_EVENT_SUBSCR(CONFIGURATION_);
-create index ACT_IDX_VARIABLE_TASK_ID on ACT_RU_VARIABLE(TASK_ID_);
-create index ACT_IDX_ATHRZ_PROCEDEF on ACT_RU_IDENTITYLINK(PROC_DEF_ID_);
-create index ACT_IDX_INC_CONFIGURATION on ACT_RU_INCIDENT(CONFIGURATION_);
-create index ACT_IDX_JOB_PROCINST on ACT_RU_JOB(PROCESS_INSTANCE_ID_);
-create index ACT_IDX_METER_LOG on ACT_RU_METER_LOG(NAME_,TIMESTAMP_);
-
-alter table ACT_GE_BYTEARRAY
-    add constraint ACT_FK_BYTEARR_DEPL
-    foreign key (DEPLOYMENT_ID_)
-    references ACT_RE_DEPLOYMENT (ID_);
-
-alter table ACT_RE_PROCDEF
-    add constraint ACT_UNIQ_PROCDEF
-    unique (KEY_,VERSION_);
-
-alter table ACT_RU_EXECUTION
-    add constraint ACT_FK_EXE_PROCINST
-    foreign key (PROC_INST_ID_)
-    references ACT_RU_EXECUTION (ID_) on delete cascade on update cascade;
-
-alter table ACT_RU_EXECUTION
-    add constraint ACT_FK_EXE_PARENT
-    foreign key (PARENT_ID_)
-    references ACT_RU_EXECUTION (ID_);
-
-alter table ACT_RU_EXECUTION
-    add constraint ACT_FK_EXE_SUPER
-    foreign key (SUPER_EXEC_)
-    references ACT_RU_EXECUTION (ID_);
-
-alter table ACT_RU_EXECUTION
-    add constraint ACT_FK_EXE_PROCDEF
-    foreign key (PROC_DEF_ID_)
-    references ACT_RE_PROCDEF (ID_);
-
-alter table ACT_RU_IDENTITYLINK
-    add constraint ACT_FK_TSKASS_TASK
-    foreign key (TASK_ID_)
-    references ACT_RU_TASK (ID_);
-
-alter table ACT_RU_IDENTITYLINK
-    add constraint ACT_FK_ATHRZ_PROCEDEF
-    foreign key (PROC_DEF_ID_)
-    references ACT_RE_PROCDEF(ID_);
-
-alter table ACT_RU_TASK
-    add constraint ACT_FK_TASK_EXE
-    foreign key (EXECUTION_ID_)
-    references ACT_RU_EXECUTION (ID_);
-
-alter table ACT_RU_TASK
-    add constraint ACT_FK_TASK_PROCINST
-    foreign key (PROC_INST_ID_)
-    references ACT_RU_EXECUTION (ID_);
-
-alter table ACT_RU_TASK
-  add constraint ACT_FK_TASK_PROCDEF
-  foreign key (PROC_DEF_ID_)
-  references ACT_RE_PROCDEF (ID_);
-
-alter table ACT_RU_VARIABLE
-    add constraint ACT_FK_VAR_EXE
-    foreign key (EXECUTION_ID_)
-    references ACT_RU_EXECUTION (ID_);
-
-alter table ACT_RU_VARIABLE
-    add constraint ACT_FK_VAR_PROCINST
-    foreign key (PROC_INST_ID_)
-    references ACT_RU_EXECUTION(ID_);
-
-alter table ACT_RU_VARIABLE
-    add constraint ACT_FK_VAR_BYTEARRAY
-    foreign key (BYTEARRAY_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_JOB
-    add constraint ACT_FK_JOB_EXCEPTION
-    foreign key (EXCEPTION_STACK_ID_)
-    references ACT_GE_BYTEARRAY (ID_);
-
-alter table ACT_RU_EVENT_SUBSCR
-    add constraint ACT_FK_EVENT_EXEC
-    foreign key (EXECUTION_ID_)
-    references ACT_RU_EXECUTION(ID_);
-
-alter table ACT_RU_INCIDENT
-    add constraint ACT_FK_INC_EXE
-    foreign key (EXECUTION_ID_)
-    references ACT_RU_EXECUTION (ID_);
-
-alter table ACT_RU_INCIDENT
-    add constraint ACT_FK_INC_PROCINST
-    foreign key (PROC_INST_ID_)
-    references ACT_RU_EXECUTION (ID_);
-
-alter table ACT_RU_INCIDENT
-    add constraint ACT_FK_INC_PROCDEF
-    foreign key (PROC_DEF_ID_)
-    references ACT_RE_PROCDEF (ID_);
-
-alter table ACT_RU_INCIDENT
-    add constraint ACT_FK_INC_CAUSE
-    foreign key (CAUSE_INCIDENT_ID_)
-    references ACT_RU_INCIDENT (ID_) on delete cascade on update cascade;
-
-alter table ACT_RU_INCIDENT
-    add constraint ACT_FK_INC_RCAUSE
-    foreign key (ROOT_CAUSE_INCIDENT_ID_)
-    references ACT_RU_INCIDENT (ID_) on delete cascade on update cascade;
-
-alter table ACT_RU_AUTHORIZATION
-    add constraint ACT_UNIQ_AUTH_USER
-    unique (USER_ID_,TYPE_,RESOURCE_TYPE_,RESOURCE_ID_);
-
-alter table ACT_RU_AUTHORIZATION
-    add constraint ACT_UNIQ_AUTH_GROUP
-    unique (GROUP_ID_,TYPE_,RESOURCE_TYPE_,RESOURCE_ID_);
-
-alter table ACT_RU_VARIABLE
-    add constraint ACT_UNIQ_VARIABLE
-    unique (VAR_SCOPE_, NAME_);
-
--- indexes for deadlock problems - https://app.camunda.com/jira/browse/CAM-2567 --
-create index ACT_IDX_INC_CAUSEINCID on ACT_RU_INCIDENT(CAUSE_INCIDENT_ID_);
-create index ACT_IDX_INC_EXID on ACT_RU_INCIDENT(EXECUTION_ID_);
-create index ACT_IDX_INC_PROCDEFID on ACT_RU_INCIDENT(PROC_DEF_ID_);
-create index ACT_IDX_INC_PROCINSTID on ACT_RU_INCIDENT(PROC_INST_ID_);
-create index ACT_IDX_INC_ROOTCAUSEINCID on ACT_RU_INCIDENT(ROOT_CAUSE_INCIDENT_ID_);
--- create case definition table --
-create table ACT_RE_CASE_DEF (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    NAME_ varchar(255),
-    KEY_ varchar(255) not null,
-    VERSION_ integer not null,
-    DEPLOYMENT_ID_ varchar(64),
-    RESOURCE_NAME_ varchar(4000),
-    DGRM_RESOURCE_NAME_ varchar(4000),
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
--- create case execution table --
-create table ACT_RU_CASE_EXECUTION (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    CASE_INST_ID_ varchar(64),
-    SUPER_CASE_EXEC_ varchar(64),
-    SUPER_EXEC_ varchar(64),
-    BUSINESS_KEY_ varchar(255),
-    PARENT_ID_ varchar(64),
-    CASE_DEF_ID_ varchar(64),
-    ACT_ID_ varchar(255),
-    PREV_STATE_ integer,
-    CURRENT_STATE_ integer,
-    REQUIRED_ boolean,
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
--- create case sentry part table --
-
-create table ACT_RU_CASE_SENTRY_PART (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    CASE_INST_ID_ varchar(64),
-    CASE_EXEC_ID_ varchar(64),
-    SENTRY_ID_ varchar(255),
-    TYPE_ varchar(255),
-    SOURCE_CASE_EXEC_ID_ varchar(64),
-    STANDARD_EVENT_ varchar(255),
-    SATISFIED_ boolean,
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
--- create unique constraint on ACT_RE_CASE_DEF --
-alter table ACT_RE_CASE_DEF
-    add constraint ACT_UNIQ_CASE_DEF
-    unique (KEY_,VERSION_);
-
--- create index on business key --
-create index ACT_IDX_CASE_EXEC_BUSKEY on ACT_RU_CASE_EXECUTION(BUSINESS_KEY_);
-
--- create foreign key constraints on ACT_RU_CASE_EXECUTION --
-alter table ACT_RU_CASE_EXECUTION
-    add constraint ACT_FK_CASE_EXE_CASE_INST
-    foreign key (CASE_INST_ID_)
-    references ACT_RU_CASE_EXECUTION(ID_) on delete cascade on update cascade;
-
-alter table ACT_RU_CASE_EXECUTION
-    add constraint ACT_FK_CASE_EXE_PARENT
-    foreign key (PARENT_ID_)
-    references ACT_RU_CASE_EXECUTION(ID_);
-
-alter table ACT_RU_CASE_EXECUTION
-    add constraint ACT_FK_CASE_EXE_CASE_DEF
-    foreign key (CASE_DEF_ID_)
-    references ACT_RE_CASE_DEF(ID_);
-
--- create foreign key constraints on ACT_RU_VARIABLE --
-alter table ACT_RU_VARIABLE
-    add constraint ACT_FK_VAR_CASE_EXE
-    foreign key (CASE_EXECUTION_ID_)
-    references ACT_RU_CASE_EXECUTION(ID_);
-
-alter table ACT_RU_VARIABLE
-    add constraint ACT_FK_VAR_CASE_INST
-    foreign key (CASE_INST_ID_)
-    references ACT_RU_CASE_EXECUTION(ID_);
-
--- create foreign key constraints on ACT_RU_TASK --
-alter table ACT_RU_TASK
-    add constraint ACT_FK_TASK_CASE_EXE
-    foreign key (CASE_EXECUTION_ID_)
-    references ACT_RU_CASE_EXECUTION(ID_);
-
-alter table ACT_RU_TASK
-  add constraint ACT_FK_TASK_CASE_DEF
-  foreign key (CASE_DEF_ID_)
-  references ACT_RE_CASE_DEF(ID_);
-
--- create foreign key constraints on ACT_RU_CASE_SENTRY_PART --
-alter table ACT_RU_CASE_SENTRY_PART
-    add constraint ACT_FK_CASE_SENTRY_CASE_INST
-    foreign key (CASE_INST_ID_)
-    references ACT_RU_CASE_EXECUTION(ID_);
-
-alter table ACT_RU_CASE_SENTRY_PART
-    add constraint ACT_FK_CASE_SENTRY_CASE_EXEC
-    foreign key (CASE_EXEC_ID_)
-    references ACT_RU_CASE_EXECUTION(ID_);
-create table ACT_HI_PROCINST (
-    ID_ varchar(64) not null,
-    PROC_INST_ID_ varchar(64) not null,
-    BUSINESS_KEY_ varchar(255),
-    PROC_DEF_KEY_ varchar(255),
-    PROC_DEF_ID_ varchar(64) not null,
-    START_TIME_ datetime not null,
-    END_TIME_ datetime,
-    DURATION_ bigint,
-    START_USER_ID_ varchar(255),
-    START_ACT_ID_ varchar(255),
-    END_ACT_ID_ varchar(255),
-    SUPER_PROCESS_INSTANCE_ID_ varchar(64),
-    SUPER_CASE_INSTANCE_ID_ varchar(64),
-    CASE_INST_ID_ varchar(64),
-    DELETE_REASON_ varchar(4000),
-    primary key (ID_),
-    unique (PROC_INST_ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_HI_ACTINST (
-    ID_ varchar(64) not null,
-    PARENT_ACT_INST_ID_ varchar(64),
-    PROC_DEF_KEY_ varchar(255),
-    PROC_DEF_ID_ varchar(64) not null,
-    PROC_INST_ID_ varchar(64) not null,
-    EXECUTION_ID_ varchar(64) not null,
-    ACT_ID_ varchar(255) not null,
-    TASK_ID_ varchar(64),
-    CALL_PROC_INST_ID_ varchar(64),
-    CALL_CASE_INST_ID_ varchar(64),
-    ACT_NAME_ varchar(255),
-    ACT_TYPE_ varchar(255) not null,
-    ASSIGNEE_ varchar(64),
-    START_TIME_ datetime not null,
-    END_TIME_ datetime,
-    DURATION_ bigint,
-    ACT_INST_STATE_ integer,
-    SEQUENCE_COUNTER_ bigint,
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_HI_TASKINST (
-    ID_ varchar(64) not null,
-    TASK_DEF_KEY_ varchar(255),
-    PROC_DEF_KEY_ varchar(255),
-    PROC_DEF_ID_ varchar(64),
-    PROC_INST_ID_ varchar(64),
-    EXECUTION_ID_ varchar(64),
-    CASE_DEF_KEY_ varchar(255),
-    CASE_DEF_ID_ varchar(64),
-    CASE_INST_ID_ varchar(64),
-    CASE_EXECUTION_ID_ varchar(64),
-    ACT_INST_ID_ varchar(64),
-    NAME_ varchar(255),
-    PARENT_TASK_ID_ varchar(64),
-    DESCRIPTION_ varchar(4000),
-    OWNER_ varchar(255),
-    ASSIGNEE_ varchar(255),
-    START_TIME_ datetime not null,
-    END_TIME_ datetime,
-    DURATION_ bigint,
-    DELETE_REASON_ varchar(4000),
-    PRIORITY_ integer,
-    DUE_DATE_ datetime,
-    FOLLOW_UP_DATE_ datetime,
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_HI_VARINST (
-    ID_ varchar(64) not null,
-    PROC_DEF_KEY_ varchar(255),
-    PROC_DEF_ID_ varchar(64),
-    PROC_INST_ID_ varchar(64),
-    EXECUTION_ID_ varchar(64),
-    ACT_INST_ID_ varchar(64),
-    CASE_DEF_KEY_ varchar(255),
-    CASE_DEF_ID_ varchar(64),
-    CASE_INST_ID_ varchar(64),
-    CASE_EXECUTION_ID_ varchar(64),
-    TASK_ID_ varchar(64),
-    NAME_ varchar(255) not null,
-    VAR_TYPE_ varchar(100),
-    REV_ integer,
-    BYTEARRAY_ID_ varchar(64),
-    DOUBLE_ double,
-    LONG_ bigint,
-    TEXT_ varchar(4000),
-    TEXT2_ varchar(4000),
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_HI_DETAIL (
-    ID_ varchar(64) not null,
-    TYPE_ varchar(255) not null,
-    PROC_DEF_KEY_ varchar(255),
-    PROC_DEF_ID_ varchar(64),
-    PROC_INST_ID_ varchar(64),
-    EXECUTION_ID_ varchar(64),
-    CASE_DEF_KEY_ varchar(255),
-    CASE_DEF_ID_ varchar(64),
-    CASE_INST_ID_ varchar(64),
-    CASE_EXECUTION_ID_ varchar(64),
-    TASK_ID_ varchar(64),
-    ACT_INST_ID_ varchar(64),
-    VAR_INST_ID_ varchar(64),
-    NAME_ varchar(255) not null,
-    VAR_TYPE_ varchar(255),
-    REV_ integer,
-    TIME_ datetime not null,
-    BYTEARRAY_ID_ varchar(64),
-    DOUBLE_ double,
-    LONG_ bigint,
-    TEXT_ varchar(4000),
-    TEXT2_ varchar(4000),
-    SEQUENCE_COUNTER_ bigint,
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_HI_COMMENT (
-    ID_ varchar(64) not null,
-    TYPE_ varchar(255),
-    TIME_ datetime not null,
-    USER_ID_ varchar(255),
-    TASK_ID_ varchar(64),
-    PROC_INST_ID_ varchar(64),
-    ACTION_ varchar(255),
-    MESSAGE_ varchar(4000),
-    FULL_MSG_ LONGBLOB,
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_HI_ATTACHMENT (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    USER_ID_ varchar(255),
-    NAME_ varchar(255),
-    DESCRIPTION_ varchar(4000),
-    TYPE_ varchar(255),
-    TASK_ID_ varchar(64),
-    PROC_INST_ID_ varchar(64),
-    URL_ varchar(4000),
-    CONTENT_ID_ varchar(64),
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_HI_OP_LOG (
-    ID_ varchar(64) not null,
-    PROC_DEF_ID_ varchar(64),
-    PROC_DEF_KEY_ varchar(255),
-    PROC_INST_ID_ varchar(64),
-    EXECUTION_ID_ varchar(64),
-    CASE_DEF_ID_ varchar(64),
-    CASE_INST_ID_ varchar(64),
-    CASE_EXECUTION_ID_ varchar(64),
-    TASK_ID_ varchar(64),
-    JOB_ID_ varchar(64),
-    JOB_DEF_ID_ varchar(64),
-    USER_ID_ varchar(255),
-    TIMESTAMP_ timestamp not null,
-    OPERATION_TYPE_ varchar(64),
-    OPERATION_ID_ varchar(64),
-    ENTITY_TYPE_ varchar(30),
-    PROPERTY_ varchar(64),
-    ORG_VALUE_ varchar(4000),
-    NEW_VALUE_ varchar(4000),
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_HI_INCIDENT (
-  ID_ varchar(64) not null,
-  PROC_DEF_KEY_ varchar(255),
-  PROC_DEF_ID_ varchar(64),
-  PROC_INST_ID_ varchar(64),
-  EXECUTION_ID_ varchar(64),
-  CREATE_TIME_ timestamp not null,
-  END_TIME_ timestamp null,
-  INCIDENT_MSG_ varchar(4000),
-  INCIDENT_TYPE_ varchar(255) not null,
-  ACTIVITY_ID_ varchar(255),
-  CAUSE_INCIDENT_ID_ varchar(64),
-  ROOT_CAUSE_INCIDENT_ID_ varchar(64),
-  CONFIGURATION_ varchar(255),
-  INCIDENT_STATE_ integer,
-  primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_HI_JOB_LOG (
-    ID_ varchar(64) not null,
-    TIMESTAMP_ timestamp not null,
-    JOB_ID_ varchar(64) not null,
-    JOB_DUEDATE_ timestamp NULL,
-    JOB_RETRIES_ integer,
-    JOB_EXCEPTION_MSG_ varchar(4000),
-    JOB_EXCEPTION_STACK_ID_ varchar(64),
-    JOB_STATE_ integer,
-    JOB_DEF_ID_ varchar(64),
-    JOB_DEF_TYPE_ varchar(255),
-    JOB_DEF_CONFIGURATION_ varchar(255),
-    ACT_ID_ varchar(255),
-    EXECUTION_ID_ varchar(64),
-    PROCESS_INSTANCE_ID_ varchar(64),
-    PROCESS_DEF_ID_ varchar(64),
-    PROCESS_DEF_KEY_ varchar(255),
-    DEPLOYMENT_ID_ varchar(64),
-    SEQUENCE_COUNTER_ bigint,
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create index ACT_IDX_HI_PRO_INST_END on ACT_HI_PROCINST(END_TIME_);
-create index ACT_IDX_HI_PRO_I_BUSKEY on ACT_HI_PROCINST(BUSINESS_KEY_);
-
-create index ACT_IDX_HI_ACT_INST_START on ACT_HI_ACTINST(START_TIME_);
-create index ACT_IDX_HI_ACT_INST_END on ACT_HI_ACTINST(END_TIME_);
-create index ACT_IDX_HI_ACT_INST_COMP on ACT_HI_ACTINST(EXECUTION_ID_, ACT_ID_, END_TIME_, ID_);
-create index ACT_IDX_HI_ACT_INST_PROCINST on ACT_HI_ACTINST(PROC_INST_ID_, ACT_ID_);
-
-create index ACT_IDX_HI_DETAIL_PROC_INST on ACT_HI_DETAIL(PROC_INST_ID_);
-create index ACT_IDX_HI_DETAIL_ACT_INST on ACT_HI_DETAIL(ACT_INST_ID_);
-create index ACT_IDX_HI_DETAIL_CASE_INST on ACT_HI_DETAIL(CASE_INST_ID_);
-create index ACT_IDX_HI_DETAIL_CASE_EXEC on ACT_HI_DETAIL(CASE_EXECUTION_ID_);
-create index ACT_IDX_HI_DETAIL_TIME on ACT_HI_DETAIL(TIME_);
-create index ACT_IDX_HI_DETAIL_NAME on ACT_HI_DETAIL(NAME_);
-create index ACT_IDX_HI_DETAIL_TASK_ID on ACT_HI_DETAIL(TASK_ID_);
-
-create index ACT_IDX_HI_PROCVAR_PROC_INST on ACT_HI_VARINST(PROC_INST_ID_);
-create index ACT_IDX_HI_CASEVAR_CASE_INST on ACT_HI_VARINST(CASE_INST_ID_);
-create index ACT_IDX_HI_PROCVAR_NAME_TYPE on ACT_HI_VARINST(NAME_, VAR_TYPE_);
-
-create index ACT_IDX_HI_JOB_LOG_PROCINST on ACT_HI_JOB_LOG(PROCESS_INSTANCE_ID_);
-create index ACT_IDX_HI_JOB_LOG_PROCDEF on ACT_HI_JOB_LOG(PROCESS_DEF_ID_);
-create table ACT_HI_CASEINST (
-    ID_ varchar(64) not null,
-    CASE_INST_ID_ varchar(64) not null,
-    BUSINESS_KEY_ varchar(255),
-    CASE_DEF_ID_ varchar(64) not null,
-    CREATE_TIME_ datetime not null,
-    CLOSE_TIME_ datetime,
-    DURATION_ bigint,
-    STATE_ integer,
-    CREATE_USER_ID_ varchar(255),
-    SUPER_CASE_INSTANCE_ID_ varchar(64),
-    SUPER_PROCESS_INSTANCE_ID_ varchar(64),
-    primary key (ID_),
-    unique (CASE_INST_ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_HI_CASEACTINST (
-    ID_ varchar(64) not null,
-    PARENT_ACT_INST_ID_ varchar(64),
-    CASE_DEF_ID_ varchar(64) not null,
-    CASE_INST_ID_ varchar(64) not null,
-    CASE_ACT_ID_ varchar(255) not null,
-    TASK_ID_ varchar(64),
-    CALL_PROC_INST_ID_ varchar(64),
-    CALL_CASE_INST_ID_ varchar(64),
-    CASE_ACT_NAME_ varchar(255),
-    CASE_ACT_TYPE_ varchar(255),
-    CREATE_TIME_ datetime not null,
-    END_TIME_ datetime,
-    DURATION_ bigint,
-    STATE_ integer,
-    REQUIRED_ boolean,
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create index ACT_IDX_HI_CAS_I_CLOSE on ACT_HI_CASEINST(CLOSE_TIME_);
-create index ACT_IDX_HI_CAS_I_BUSKEY on ACT_HI_CASEINST(BUSINESS_KEY_);
-create index ACT_IDX_HI_CAS_A_I_CREATE on ACT_HI_CASEACTINST(CREATE_TIME_);
-create index ACT_IDX_HI_CAS_A_I_END on ACT_HI_CASEACTINST(END_TIME_);
-create index ACT_IDX_HI_CAS_A_I_COMP on ACT_HI_CASEACTINST(CASE_ACT_ID_, END_TIME_, ID_);
-create index ACT_IDX_HI_CAS_A_I_CASEINST on ACT_HI_CASEACTINST(CASE_INST_ID_, CASE_ACT_ID_);
diff --git a/kubernetes/config/docker/init/src/config/mso/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/camunda/mysql_identity_7.3.0.sql b/kubernetes/config/docker/init/src/config/mso/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/camunda/mysql_identity_7.3.0.sql
deleted file mode 100644 (file)
index dc72917..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-# Start of statements added for MSO
-USE `camundabpmn`;
-# End of statements added for MSO
-
-create table ACT_ID_GROUP (
-    ID_ varchar(64),
-    REV_ integer,
-    NAME_ varchar(255),
-    TYPE_ varchar(255),
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_ID_MEMBERSHIP (
-    USER_ID_ varchar(64),
-    GROUP_ID_ varchar(64),
-    primary key (USER_ID_, GROUP_ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_ID_USER (
-    ID_ varchar(64),
-    REV_ integer,
-    FIRST_ varchar(255),
-    LAST_ varchar(255),
-    EMAIL_ varchar(255),
-    PWD_ varchar(255),
-    PICTURE_ID_ varchar(64),
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_ID_INFO (
-    ID_ varchar(64),
-    REV_ integer,
-    USER_ID_ varchar(64),
-    TYPE_ varchar(64),
-    KEY_ varchar(255),
-    VALUE_ varchar(255),
-    PASSWORD_ LONGBLOB,
-    PARENT_ID_ varchar(255),
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-alter table ACT_ID_MEMBERSHIP 
-    add constraint ACT_FK_MEMB_GROUP 
-    foreign key (GROUP_ID_) 
-    references ACT_ID_GROUP (ID_);
-
-alter table ACT_ID_MEMBERSHIP 
-    add constraint ACT_FK_MEMB_USER 
-    foreign key (USER_ID_) 
-    references ACT_ID_USER (ID_);
diff --git a/kubernetes/config/docker/init/src/config/mso/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/camunda/mysql_updates_7.3.0.sql b/kubernetes/config/docker/init/src/config/mso/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/camunda/mysql_updates_7.3.0.sql
deleted file mode 100644 (file)
index 09c53ea..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# MSO updates to the default camunda schema.
-USE `camundabpmn`;
-ALTER TABLE ACT_HI_VARINST MODIFY TEXT_ LONGTEXT;
-
-ALTER TABLE ACT_HI_DETAIL MODIFY TEXT_ LONGTEXT;
-
-ALTER TABLE ACT_RU_VARIABLE MODIFY TEXT_ LONGTEXT;
-
-INSERT INTO ACT_GE_PROPERTY VALUES ('historyLevel','3',1) ON DUPLICATE KEY UPDATE VALUE_='3';
-
-CREATE TABLE IF NOT EXISTS ATT_URN_MAPPING AS SELECT * FROM ACT_GE_PROPERTY WHERE NAME_='-';
diff --git a/kubernetes/config/docker/init/src/config/mso/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/camunda/mysql_updates_7.3.0_to_7.6.0.sql b/kubernetes/config/docker/init/src/config/mso/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/camunda/mysql_updates_7.3.0_to_7.6.0.sql
deleted file mode 100644 (file)
index cd607aa..0000000
+++ /dev/null
@@ -1,699 +0,0 @@
-# MSO updates to the default camunda schema.
-USE `camundabpmn`;
-
-ALTER TABLE ACT_RU_METER_LOG
-  ADD REPORTER_ varchar(255);
-  
--- job prioritization --
-  
-ALTER TABLE ACT_RU_JOB
-  ADD PRIORITY_ bigint NOT NULL
-  DEFAULT 0;
-  
-ALTER TABLE ACT_RU_JOBDEF
-  ADD JOB_PRIORITY_ bigint;
-  
-ALTER TABLE ACT_HI_JOB_LOG
-  ADD JOB_PRIORITY_ bigint NOT NULL
-  DEFAULT 0;
-
--- create decision definition table --
-create table ACT_RE_DECISION_DEF (
-    ID_ varchar(64) not null,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    NAME_ varchar(255),
-    KEY_ varchar(255) not null,
-    VERSION_ integer not null,
-    DEPLOYMENT_ID_ varchar(64),
-    RESOURCE_NAME_ varchar(4000),
-    DGRM_RESOURCE_NAME_ varchar(4000),
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
--- create unique constraint on ACT_RE_DECISION_DEF --
-alter table ACT_RE_DECISION_DEF
-    add constraint ACT_UNIQ_DECISION_DEF
-    unique (KEY_,VERSION_);
-
--- case sentry part source --
-
-ALTER TABLE ACT_RU_CASE_SENTRY_PART
-  ADD SOURCE_ varchar(255);
-  
--- create history decision instance table --
-create table ACT_HI_DECINST (
-    ID_ varchar(64) NOT NULL,
-    DEC_DEF_ID_ varchar(64) NOT NULL,
-    DEC_DEF_KEY_ varchar(255) NOT NULL,
-    DEC_DEF_NAME_ varchar(255),
-    PROC_DEF_KEY_ varchar(255),
-    PROC_DEF_ID_ varchar(64),
-    PROC_INST_ID_ varchar(64),
-    CASE_DEF_KEY_ varchar(255),
-    CASE_DEF_ID_ varchar(64),
-    CASE_INST_ID_ varchar(64),
-    ACT_INST_ID_ varchar(64),
-    ACT_ID_ varchar(255),
-    EVAL_TIME_ datetime not null,
-    COLLECT_VALUE_ double,
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
--- create history decision input table --
-create table ACT_HI_DEC_IN (
-    ID_ varchar(64) NOT NULL,
-    DEC_INST_ID_ varchar(64) NOT NULL,      
-    CLAUSE_ID_ varchar(64) NOT NULL,
-    CLAUSE_NAME_ varchar(255),
-    VAR_TYPE_ varchar(100),               
-    BYTEARRAY_ID_ varchar(64),
-    DOUBLE_ double,
-    LONG_ bigint,
-    TEXT_ LONGBLOB NULL,
-    TEXT2_ LONGBLOB NULL,    
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
--- create history decision output table --
-create table ACT_HI_DEC_OUT (
-    ID_ varchar(64) NOT NULL,
-    DEC_INST_ID_ varchar(64) NOT NULL,         
-    CLAUSE_ID_ varchar(64) NOT NULL,
-    CLAUSE_NAME_ varchar(255),
-    RULE_ID_ varchar(64) NOT NULL,
-    RULE_ORDER_ integer,
-    VAR_NAME_ varchar(255),
-    VAR_TYPE_ varchar(100),               
-    BYTEARRAY_ID_ varchar(64),
-    DOUBLE_ double,
-    LONG_ bigint,
-    TEXT_ LONGBLOB NULL,
-    TEXT2_ LONGBLOB NULL,
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
--- create indexes for historic decision tables
-create index ACT_IDX_HI_DEC_INST_ID on ACT_HI_DECINST(DEC_DEF_ID_);
-create index ACT_IDX_HI_DEC_INST_KEY on ACT_HI_DECINST(DEC_DEF_KEY_);
-create index ACT_IDX_HI_DEC_INST_PI on ACT_HI_DECINST(PROC_INST_ID_);
-create index ACT_IDX_HI_DEC_INST_CI on ACT_HI_DECINST(CASE_INST_ID_);
-create index ACT_IDX_HI_DEC_INST_ACT on ACT_HI_DECINST(ACT_ID_);
-create index ACT_IDX_HI_DEC_INST_ACT_INST on ACT_HI_DECINST(ACT_INST_ID_);
-create index ACT_IDX_HI_DEC_INST_TIME on ACT_HI_DECINST(EVAL_TIME_);
-
-create index ACT_IDX_HI_DEC_IN_INST on ACT_HI_DEC_IN(DEC_INST_ID_);
-create index ACT_IDX_HI_DEC_IN_CLAUSE on ACT_HI_DEC_IN(DEC_INST_ID_, CLAUSE_ID_);
-
-create index ACT_IDX_HI_DEC_OUT_INST on ACT_HI_DEC_OUT(DEC_INST_ID_);
-create index ACT_IDX_HI_DEC_OUT_RULE on ACT_HI_DEC_OUT(RULE_ORDER_, CLAUSE_ID_);
-
--- add grant authorization for group camunda-admin:
-INSERT INTO
-  ACT_RU_AUTHORIZATION (ID_, TYPE_, GROUP_ID_, RESOURCE_TYPE_, RESOURCE_ID_, PERMS_, REV_)
-VALUES
-  ('camunda-admin-grant-decision-definition', 1, 'camunda-admin', 10, '*', 2147483647, 1);
-  
--- external tasks --
-
-create table ACT_RU_EXT_TASK (
-  ID_ varchar(64) not null,
-  REV_ integer not null,
-  WORKER_ID_ varchar(255),
-  TOPIC_NAME_ varchar(255),
-  RETRIES_ integer,
-  ERROR_MSG_ varchar(4000),
-  LOCK_EXP_TIME_ timestamp NULL,
-  SUSPENSION_STATE_ integer,
-  EXECUTION_ID_ varchar(64),
-  PROC_INST_ID_ varchar(64),
-  PROC_DEF_ID_ varchar(64),
-  PROC_DEF_KEY_ varchar(255),
-  ACT_ID_ varchar(255),
-  ACT_INST_ID_ varchar(64),
-  primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-alter table ACT_RU_EXT_TASK
-    add constraint ACT_FK_EXT_TASK_EXE 
-    foreign key (EXECUTION_ID_) 
-    references ACT_RU_EXECUTION (ID_);
-
-create index ACT_IDX_EXT_TASK_TOPIC on ACT_RU_EXT_TASK(TOPIC_NAME_);
-
--- deployment --
-
-ALTER TABLE ACT_RE_DEPLOYMENT 
-  ADD SOURCE_ varchar(255);
-
-ALTER TABLE ACT_HI_OP_LOG
-  ADD DEPLOYMENT_ID_ varchar(64);
-  
--- job suspension state
-
-ALTER TABLE ACT_RU_JOB
-  MODIFY COLUMN SUSPENSION_STATE_ integer
-  DEFAULT 1;
-
-  -- relevant for jobs created in Camunda 7.0
-UPDATE ACT_RU_JOB
-  SET SUSPENSION_STATE_ = 1
-  WHERE SUSPENSION_STATE_ IS NULL;
-  
-ALTER TABLE ACT_RU_JOB
-  MODIFY COLUMN SUSPENSION_STATE_ integer
-  NOT NULL DEFAULT 1;
-
-  
--- mariadb_engine_7.4_patch_7.4.5_to_7.4.6
--- INCREASE process def key column size https://app.camunda.com/jira/browse/CAM-4328 --
-alter table ACT_RU_JOB
-  MODIFY COLUMN PROCESS_DEF_KEY_ varchar(255);
-  
--- mariadb_engine_7.4_to_7.5
--- set datetime precision --
-
-ALTER TABLE ACT_HI_CASEINST
-  MODIFY COLUMN CREATE_TIME_ datetime(3) not null;
-
-ALTER TABLE ACT_HI_CASEINST
-  MODIFY COLUMN CLOSE_TIME_ datetime(3);
-
-ALTER TABLE ACT_HI_CASEACTINST
-  MODIFY COLUMN CREATE_TIME_ datetime(3) not null;
-
-ALTER TABLE ACT_HI_CASEACTINST
-  MODIFY COLUMN END_TIME_ datetime(3);
-
-ALTER TABLE ACT_HI_DECINST
-  MODIFY COLUMN EVAL_TIME_ datetime(3) not null;
-
-ALTER TABLE ACT_RU_TASK
-  MODIFY COLUMN DUE_DATE_ datetime(3);
-
-ALTER TABLE ACT_RU_TASK
-  MODIFY COLUMN FOLLOW_UP_DATE_ datetime(3);
-
-ALTER TABLE ACT_HI_PROCINST
-  MODIFY COLUMN START_TIME_ datetime(3) not null;
-
-ALTER TABLE ACT_HI_PROCINST
-  MODIFY COLUMN END_TIME_ datetime(3);
-
-ALTER TABLE ACT_HI_ACTINST
-  MODIFY COLUMN START_TIME_ datetime(3) not null;
-
-ALTER TABLE ACT_HI_ACTINST
-  MODIFY COLUMN END_TIME_ datetime(3);
-
-ALTER TABLE ACT_HI_TASKINST
-  MODIFY COLUMN START_TIME_ datetime(3) not null;
-
-ALTER TABLE ACT_HI_TASKINST
-  MODIFY COLUMN END_TIME_ datetime(3);
-
-ALTER TABLE ACT_HI_TASKINST
-  MODIFY COLUMN DUE_DATE_ datetime(3);
-
-ALTER TABLE ACT_HI_TASKINST
-  MODIFY COLUMN FOLLOW_UP_DATE_ datetime(3);
-
-ALTER TABLE ACT_HI_DETAIL
-  MODIFY COLUMN TIME_ datetime(3) not null;
-
-ALTER TABLE ACT_HI_COMMENT
-  MODIFY COLUMN TIME_ datetime(3) not null;
-
--- set timestamp precision --
-
-ALTER TABLE ACT_RE_DEPLOYMENT
-  MODIFY COLUMN DEPLOY_TIME_ timestamp(3);
-
-ALTER TABLE ACT_RU_JOB
-  MODIFY COLUMN LOCK_EXP_TIME_ timestamp(3) NULL;
-
-ALTER TABLE ACT_RU_JOB
-  MODIFY COLUMN DUEDATE_ timestamp(3) NULL;
-
-ALTER TABLE ACT_RU_TASK
-  MODIFY COLUMN CREATE_TIME_ timestamp(3);
-
-ALTER TABLE ACT_RU_EVENT_SUBSCR
-  MODIFY COLUMN CREATED_ timestamp(3) NOT NULL;
-
-ALTER TABLE ACT_RU_INCIDENT
-  MODIFY COLUMN INCIDENT_TIMESTAMP_ timestamp(3) NOT NULL;
-
-ALTER TABLE ACT_RU_METER_LOG
-  MODIFY COLUMN TIMESTAMP_ timestamp(3) NOT NULL;
-
-ALTER TABLE ACT_RU_EXT_TASK
-  MODIFY COLUMN LOCK_EXP_TIME_ timestamp(3) NULL;
-
-ALTER TABLE ACT_HI_OP_LOG
-  MODIFY COLUMN TIMESTAMP_ timestamp(3) NOT NULL;
-
-ALTER TABLE ACT_HI_INCIDENT
-  MODIFY COLUMN CREATE_TIME_ timestamp(3) NOT NULL;
-
-ALTER TABLE ACT_HI_INCIDENT
-  MODIFY COLUMN END_TIME_ timestamp(3) NULL;
-
-ALTER TABLE ACT_HI_JOB_LOG
-  MODIFY COLUMN TIMESTAMP_ timestamp(3) NOT NULL;
-
-ALTER TABLE ACT_HI_JOB_LOG
-  MODIFY COLUMN JOB_DUEDATE_ timestamp(3) NULL;
-
--- semantic version --
-
-ALTER TABLE ACT_RE_PROCDEF
-  ADD VERSION_TAG_ varchar(64);
-
-create index ACT_IDX_PROCDEF_VER_TAG on ACT_RE_PROCDEF(VERSION_TAG_);
-
--- tenant id --
-
-ALTER TABLE ACT_RE_DEPLOYMENT
-  ADD TENANT_ID_ varchar(64);
-
-create index ACT_IDX_DEPLOYMENT_TENANT_ID on ACT_RE_DEPLOYMENT(TENANT_ID_);
-
-ALTER TABLE ACT_RE_PROCDEF
-  ADD TENANT_ID_ varchar(64);
-
-ALTER TABLE ACT_RE_PROCDEF
-   DROP INDEX ACT_UNIQ_PROCDEF;
-
-create index ACT_IDX_PROCDEF_TENANT_ID ON ACT_RE_PROCDEF(TENANT_ID_);
-
-ALTER TABLE ACT_RU_EXECUTION
-  ADD TENANT_ID_ varchar(64);
-
-create index ACT_IDX_EXEC_TENANT_ID on ACT_RU_EXECUTION(TENANT_ID_);
-
-ALTER TABLE ACT_RU_TASK
-  ADD TENANT_ID_ varchar(64);
-
-create index ACT_IDX_TASK_TENANT_ID on ACT_RU_TASK(TENANT_ID_);
-
-ALTER TABLE ACT_RU_VARIABLE
-  ADD TENANT_ID_ varchar(64);
-
-create index ACT_IDX_VARIABLE_TENANT_ID on ACT_RU_VARIABLE(TENANT_ID_);
-
-ALTER TABLE ACT_RU_EVENT_SUBSCR
-  ADD TENANT_ID_ varchar(64);
-
-create index ACT_IDX_EVENT_SUBSCR_TENANT_ID on ACT_RU_EVENT_SUBSCR(TENANT_ID_);
-
-ALTER TABLE ACT_RU_JOB
-  ADD TENANT_ID_ varchar(64);
-
-create index ACT_IDX_JOB_TENANT_ID on ACT_RU_JOB(TENANT_ID_);
-
-ALTER TABLE ACT_RU_JOBDEF
-  ADD TENANT_ID_ varchar(64);
-
-create index ACT_IDX_JOBDEF_TENANT_ID on ACT_RU_JOBDEF(TENANT_ID_);
-
-ALTER TABLE ACT_RU_INCIDENT
-  ADD TENANT_ID_ varchar(64);
-  
-ALTER TABLE ACT_RU_IDENTITYLINK
-  ADD TENANT_ID_ varchar(64);
-
-create index ACT_IDX_INC_TENANT_ID on ACT_RU_INCIDENT(TENANT_ID_);
-
-ALTER TABLE ACT_RU_EXT_TASK
-  ADD TENANT_ID_ varchar(64);
-
-create index ACT_IDX_EXT_TASK_TENANT_ID on ACT_RU_EXT_TASK(TENANT_ID_);
-
-ALTER TABLE ACT_RE_DECISION_DEF
-       DROP INDEX ACT_UNIQ_DECISION_DEF;
-
-ALTER TABLE ACT_RE_DECISION_DEF
-  ADD TENANT_ID_ varchar(64);
-
-create index ACT_IDX_DEC_DEF_TENANT_ID on ACT_RE_DECISION_DEF(TENANT_ID_);
-
-ALTER TABLE ACT_RE_CASE_DEF
-       DROP INDEX ACT_UNIQ_CASE_DEF;
-
-ALTER TABLE ACT_RE_CASE_DEF
-  ADD TENANT_ID_ varchar(64);
-
-create index ACT_IDX_CASE_DEF_TENANT_ID on ACT_RE_CASE_DEF(TENANT_ID_);
-
-ALTER TABLE ACT_GE_BYTEARRAY
-  ADD TENANT_ID_ varchar(64);
-
-ALTER TABLE ACT_RU_CASE_EXECUTION
-  ADD TENANT_ID_ varchar(64);
-
-create index ACT_IDX_CASE_EXEC_TENANT_ID on ACT_RU_CASE_EXECUTION(TENANT_ID_);
-
-ALTER TABLE ACT_RU_CASE_SENTRY_PART
-  ADD TENANT_ID_ varchar(64);
-
--- user on historic decision instance --
-
-ALTER TABLE ACT_HI_DECINST
-  ADD USER_ID_ varchar(255);
-
--- tenant id on history --
-
-ALTER TABLE ACT_HI_PROCINST
-  ADD TENANT_ID_ varchar(64);
-
-create index ACT_IDX_HI_PRO_INST_TENANT_ID on ACT_HI_PROCINST(TENANT_ID_);
-
-ALTER TABLE ACT_HI_ACTINST
-  ADD TENANT_ID_ varchar(64);
-
-create index ACT_IDX_HI_ACT_INST_TENANT_ID on ACT_HI_ACTINST(TENANT_ID_);
-
-ALTER TABLE ACT_HI_TASKINST
-  ADD TENANT_ID_ varchar(64);
-
-create index ACT_IDX_HI_TASK_INST_TENANT_ID on ACT_HI_TASKINST(TENANT_ID_);
-
-ALTER TABLE ACT_HI_VARINST
-  ADD TENANT_ID_ varchar(64);
-
-create index ACT_IDX_HI_VAR_INST_TENANT_ID on ACT_HI_VARINST(TENANT_ID_);
-
-ALTER TABLE ACT_HI_DETAIL
-  ADD TENANT_ID_ varchar(64);
-
-create index ACT_IDX_HI_DETAIL_TENANT_ID on ACT_HI_DETAIL(TENANT_ID_);
-
-ALTER TABLE ACT_HI_INCIDENT
-  ADD TENANT_ID_ varchar(64);
-
-create index ACT_IDX_HI_INCIDENT_TENANT_ID on ACT_HI_INCIDENT(TENANT_ID_);
-
-ALTER TABLE ACT_HI_JOB_LOG
-  ADD TENANT_ID_ varchar(64);
-
-create index ACT_IDX_HI_JOB_LOG_TENANT_ID on ACT_HI_JOB_LOG(TENANT_ID_);
-
-ALTER TABLE ACT_HI_COMMENT
-  ADD TENANT_ID_ varchar(64);
-
-ALTER TABLE ACT_HI_ATTACHMENT
-  ADD TENANT_ID_ varchar(64);
-
-ALTER TABLE ACT_HI_OP_LOG
-  ADD TENANT_ID_ varchar(64);
-
-ALTER TABLE ACT_HI_DEC_IN
-  ADD TENANT_ID_ varchar(64);
-
-ALTER TABLE ACT_HI_DEC_OUT
-  ADD TENANT_ID_ varchar(64);
-
-ALTER TABLE ACT_HI_DECINST
-  ADD TENANT_ID_ varchar(64);
-
-create index ACT_IDX_HI_DEC_INST_TENANT_ID on ACT_HI_DECINST(TENANT_ID_);
-
-ALTER TABLE ACT_HI_CASEINST
-  ADD TENANT_ID_ varchar(64);
-
-create index ACT_IDX_HI_CAS_I_TENANT_ID on ACT_HI_CASEINST(TENANT_ID_);
-
-ALTER TABLE ACT_HI_CASEACTINST
-  ADD TENANT_ID_ varchar(64);
-
-create index ACT_IDX_HI_CAS_A_I_TENANT_ID on ACT_HI_CASEACTINST(TENANT_ID_);
-
--- AUTHORIZATION --
-
--- add grant authorizations for group camunda-admin:
-INSERT INTO
-  ACT_RU_AUTHORIZATION (ID_, TYPE_, GROUP_ID_, RESOURCE_TYPE_, RESOURCE_ID_, PERMS_, REV_)
-VALUES
-  ('camunda-admin-grant-tenant', 1, 'camunda-admin', 11, '*', 2147483647, 1),
-  ('camunda-admin-grant-tenant-membership', 1, 'camunda-admin', 12, '*', 2147483647, 1),
-  ('camunda-admin-grant-batch', 1, 'camunda-admin', 13, '*', 2147483647, 1);
-
--- tenant table
-
-create table ACT_ID_TENANT (
-    ID_ varchar(64),
-    REV_ integer,
-    NAME_ varchar(255),
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_ID_TENANT_MEMBER (
-    ID_ varchar(64) not null,
-    TENANT_ID_ varchar(64) not null,
-    USER_ID_ varchar(64),
-    GROUP_ID_ varchar(64),
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-alter table ACT_ID_TENANT_MEMBER
-    add constraint ACT_UNIQ_TENANT_MEMB_USER
-    unique (TENANT_ID_, USER_ID_);
-
-alter table ACT_ID_TENANT_MEMBER
-    add constraint ACT_UNIQ_TENANT_MEMB_GROUP
-    unique (TENANT_ID_, GROUP_ID_);    
-    
-alter table ACT_ID_TENANT_MEMBER
-    add constraint ACT_FK_TENANT_MEMB
-    foreign key (TENANT_ID_)
-    references ACT_ID_TENANT (ID_);  
-    
-alter table ACT_ID_TENANT_MEMBER
-    add constraint ACT_FK_TENANT_MEMB_USER
-    foreign key (USER_ID_)
-    references ACT_ID_USER (ID_);    
-    
-alter table ACT_ID_TENANT_MEMBER
-    add constraint ACT_FK_TENANT_MEMB_GROUP
-    foreign key (GROUP_ID_)
-    references ACT_ID_GROUP (ID_);
-
--- BATCH --
-
--- remove not null from job definition table --
-alter table ACT_RU_JOBDEF
-       modify PROC_DEF_ID_ varchar(64),
-       modify PROC_DEF_KEY_ varchar(255),
-       modify ACT_ID_ varchar(255);
-
-create table ACT_RU_BATCH (
-  ID_ varchar(64) not null,
-  REV_ integer not null,
-  TYPE_ varchar(255),
-  TOTAL_JOBS_ integer,
-  JOBS_CREATED_ integer,
-  JOBS_PER_SEED_ integer,
-  INVOCATIONS_PER_JOB_ integer,
-  SEED_JOB_DEF_ID_ varchar(64),
-  BATCH_JOB_DEF_ID_ varchar(64),
-  MONITOR_JOB_DEF_ID_ varchar(64),
-  SUSPENSION_STATE_ integer,
-  CONFIGURATION_ varchar(255),
-  TENANT_ID_ varchar(64),
-  primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_HI_BATCH (
-    ID_ varchar(64) not null,
-    TYPE_ varchar(255),
-    TOTAL_JOBS_ integer,
-    JOBS_PER_SEED_ integer,
-    INVOCATIONS_PER_JOB_ integer,
-    SEED_JOB_DEF_ID_ varchar(64),
-    MONITOR_JOB_DEF_ID_ varchar(64),
-    BATCH_JOB_DEF_ID_ varchar(64),
-    TENANT_ID_  varchar(64),
-    START_TIME_ datetime(3) not null,
-    END_TIME_ datetime(3),
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create table ACT_HI_IDENTITYLINK (
-    ID_ varchar(64) not null,
-    TIMESTAMP_ timestamp(3) not null,
-    TYPE_ varchar(255),
-    USER_ID_ varchar(255),
-    GROUP_ID_ varchar(255),
-    TASK_ID_ varchar(64),
-    PROC_DEF_ID_ varchar(64),
-    OPERATION_TYPE_ varchar(64),
-    ASSIGNER_ID_ varchar(64),
-    PROC_DEF_KEY_ varchar(255),
-    TENANT_ID_ varchar(64),
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
-
-create index ACT_IDX_HI_IDENT_LNK_USER on ACT_HI_IDENTITYLINK(USER_ID_);
-create index ACT_IDX_HI_IDENT_LNK_GROUP on ACT_HI_IDENTITYLINK(GROUP_ID_);
-create index ACT_IDX_HI_IDENT_LNK_TENANT_ID on ACT_HI_IDENTITYLINK(TENANT_ID_);
-
-create index ACT_IDX_JOB_JOB_DEF_ID on ACT_RU_JOB(JOB_DEF_ID_);
-create index ACT_IDX_HI_JOB_LOG_JOB_DEF_ID on ACT_HI_JOB_LOG(JOB_DEF_ID_);
-
-create index ACT_IDX_BATCH_SEED_JOB_DEF ON ACT_RU_BATCH(SEED_JOB_DEF_ID_);
-alter table ACT_RU_BATCH
-    add constraint ACT_FK_BATCH_SEED_JOB_DEF
-    foreign key (SEED_JOB_DEF_ID_)
-    references ACT_RU_JOBDEF (ID_);
-
-create index ACT_IDX_BATCH_MONITOR_JOB_DEF ON ACT_RU_BATCH(MONITOR_JOB_DEF_ID_);
-alter table ACT_RU_BATCH
-    add constraint ACT_FK_BATCH_MONITOR_JOB_DEF
-    foreign key (MONITOR_JOB_DEF_ID_)
-    references ACT_RU_JOBDEF (ID_);
-
-create index ACT_IDX_BATCH_JOB_DEF ON ACT_RU_BATCH(BATCH_JOB_DEF_ID_);
-alter table ACT_RU_BATCH
-    add constraint ACT_FK_BATCH_JOB_DEF
-    foreign key (BATCH_JOB_DEF_ID_)
-    references ACT_RU_JOBDEF (ID_);
-
--- TASK PRIORITY --
-
-ALTER TABLE ACT_RU_EXT_TASK
-  ADD PRIORITY_ bigint NOT NULL DEFAULT 0;
-
-create index ACT_IDX_EXT_TASK_PRIORITY ON ACT_RU_EXT_TASK(PRIORITY_);
-
--- HI OP PROC INDECIES --
-
-create index ACT_IDX_HI_OP_LOG_PROCINST on ACT_HI_OP_LOG(PROC_INST_ID_);
-create index ACT_IDX_HI_OP_LOG_PROCDEF on ACT_HI_OP_LOG(PROC_DEF_ID_);
-
--- JOB_DEF_ID_ on INCIDENTS --
-ALTER TABLE ACT_RU_INCIDENT
-  ADD JOB_DEF_ID_ varchar(64);
-
-create index ACT_IDX_INC_JOB_DEF on ACT_RU_INCIDENT(JOB_DEF_ID_);
-alter table ACT_RU_INCIDENT
-    add constraint ACT_FK_INC_JOB_DEF
-    foreign key (JOB_DEF_ID_)
-    references ACT_RU_JOBDEF (ID_);
-
-ALTER TABLE ACT_HI_INCIDENT
-  ADD JOB_DEF_ID_ varchar(64);
-
--- BATCH_ID_ on ACT_HI_OP_LOG --
-ALTER TABLE ACT_HI_OP_LOG
-  ADD BATCH_ID_ varchar(64);
-  
- -- add indexes on PROC_DEF_KEY_ columns in history tables CAM-6679
-create index ACT_IDX_HI_ACT_INST_PROC_DEF_KEY on ACT_HI_ACTINST(PROC_DEF_KEY_);
-create index ACT_IDX_HI_DETAIL_PROC_DEF_KEY on ACT_HI_DETAIL(PROC_DEF_KEY_);
-create index ACT_IDX_HI_IDENT_LNK_PROC_DEF_KEY on ACT_HI_IDENTITYLINK(PROC_DEF_KEY_);
-create index ACT_IDX_HI_INCIDENT_PROC_DEF_KEY on ACT_HI_INCIDENT(PROC_DEF_KEY_);
-create index ACT_IDX_HI_JOB_LOG_PROC_DEF_KEY on ACT_HI_JOB_LOG(PROCESS_DEF_KEY_);
-create index ACT_IDX_HI_PRO_INST_PROC_DEF_KEY on ACT_HI_PROCINST(PROC_DEF_KEY_);
-create index ACT_IDX_HI_TASK_INST_PROC_DEF_KEY on ACT_HI_TASKINST(PROC_DEF_KEY_);
-create index ACT_IDX_HI_VAR_INST_PROC_DEF_KEY on ACT_HI_VARINST(PROC_DEF_KEY_);
-
--- 7.5.8 to 7.6.2 upgrade
--- AUTHORIZATION --
-
--- add grant authorizations for group camunda-admin:
-INSERT INTO
-  ACT_RU_AUTHORIZATION (ID_, TYPE_, GROUP_ID_, RESOURCE_TYPE_, RESOURCE_ID_, PERMS_, REV_)
-VALUES
-  ('camunda-admin-grant-drd', 1, 'camunda-admin', 14, '*', 2147483647, 1);
-
--- decision requirements definition --
-
-ALTER TABLE ACT_RE_DECISION_DEF
-  ADD DEC_REQ_ID_ varchar(64);
-
-ALTER TABLE ACT_RE_DECISION_DEF
-  ADD DEC_REQ_KEY_ varchar(255);
-
-ALTER TABLE ACT_RU_CASE_SENTRY_PART
-  ADD VARIABLE_EVENT_ varchar(255);
-
-ALTER TABLE ACT_RU_CASE_SENTRY_PART
-  ADD VARIABLE_NAME_ varchar(255);
-
-create table ACT_RE_DECISION_REQ_DEF (
-    ID_ varchar(64) NOT NULL,
-    REV_ integer,
-    CATEGORY_ varchar(255),
-    NAME_ varchar(255),
-    KEY_ varchar(255) NOT NULL,
-    VERSION_ integer NOT NULL,
-    DEPLOYMENT_ID_ varchar(64),
-    RESOURCE_NAME_ varchar(4000),
-    DGRM_RESOURCE_NAME_ varchar(4000),
-    TENANT_ID_ varchar(64),
-    primary key (ID_)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;;
-
-alter table ACT_RE_DECISION_DEF
-    add constraint ACT_FK_DEC_REQ
-    foreign key (DEC_REQ_ID_)
-    references ACT_RE_DECISION_REQ_DEF(ID_);
-
-create index ACT_IDX_DEC_DEF_REQ_ID on ACT_RE_DECISION_DEF(DEC_REQ_ID_);
-create index ACT_IDX_DEC_REQ_DEF_TENANT_ID on ACT_RE_DECISION_REQ_DEF(TENANT_ID_);
-
-ALTER TABLE ACT_HI_DECINST
-  ADD ROOT_DEC_INST_ID_ varchar(64);
-
-ALTER TABLE ACT_HI_DECINST
-  ADD DEC_REQ_ID_ varchar(64);
-
-ALTER TABLE ACT_HI_DECINST
-  ADD DEC_REQ_KEY_ varchar(255);
-
-create index ACT_IDX_HI_DEC_INST_ROOT_ID on ACT_HI_DECINST(ROOT_DEC_INST_ID_);
-create index ACT_IDX_HI_DEC_INST_REQ_ID on ACT_HI_DECINST(DEC_REQ_ID_);
-create index ACT_IDX_HI_DEC_INST_REQ_KEY on ACT_HI_DECINST(DEC_REQ_KEY_);
-
--- remove not null from ACT_HI_DEC tables --
-alter table ACT_HI_DEC_OUT
-  modify CLAUSE_ID_ varchar(64),
-  modify RULE_ID_ varchar(64);
-
-alter table ACT_HI_DEC_IN
-  modify CLAUSE_ID_ varchar(64);
-
--- CAM-5914
-create index ACT_IDX_JOB_EXECUTION_ID on ACT_RU_JOB(EXECUTION_ID_);
-
-ALTER TABLE ACT_RU_EXT_TASK
-  ADD ERROR_DETAILS_ID_ varchar(64);
-
-alter table ACT_RU_EXT_TASK
-  add constraint ACT_FK_EXT_TASK_ERROR_DETAILS
-  foreign key (ERROR_DETAILS_ID_)
-  references ACT_GE_BYTEARRAY (ID_);
-
-ALTER TABLE ACT_HI_PROCINST
-  ADD STATE_ varchar(255);
-
-update ACT_HI_PROCINST set STATE_ = 'ACTIVE' where END_TIME_ is null;
-update ACT_HI_PROCINST set STATE_ = 'COMPLETED' where END_TIME_ is not null;
-
--- CAM-6725
-ALTER TABLE ACT_RU_METER_LOG
- ADD MILLISECONDS_ bigint DEFAULT 0;
-
-alter table ACT_RU_METER_LOG
-  modify TIMESTAMP_ TIMESTAMP(3);
-
-CREATE INDEX ACT_IDX_METER_LOG_MS ON ACT_RU_METER_LOG(MILLISECONDS_);
-CREATE INDEX ACT_IDX_METER_LOG_REPORT ON ACT_RU_METER_LOG(NAME_, REPORTER_, MILLISECONDS_);
-CREATE INDEX ACT_IDX_METER_LOG_NAME_MS ON ACT_RU_METER_LOG(NAME_, MILLISECONDS_);
-
--- old metric timestamp column
-CREATE INDEX ACT_IDX_METER_LOG_TIME ON ACT_RU_METER_LOG(TIMESTAMP_);
-
--- CAM-6938
-create index ACT_IDX_JOB_HANDLER on ACT_RU_JOB(HANDLER_TYPE_(100),HANDLER_CFG_(155));
\ No newline at end of file
index 3816374..b825361 100644 (file)
@@ -1,19 +1,37 @@
 
-    alter table HEAT_TEMPLATE 
-        drop 
-        foreign key FK_ek5sot1q07taorbdmkvnveu98;
-
     alter table HEAT_TEMPLATE_PARAMS 
         drop 
-        foreign key FK_8sxvm215cw3tjfh3wni2y3myx;
+        foreign key FK_p3ol1xcvp831glqohrlu6o07o;
 
     alter table MODEL_RECIPE 
         drop 
         foreign key FK_c23r0puyqug6n44jg39dutm1c;
 
+    alter table SERVICE 
+        drop 
+        foreign key FK_l3qy594u2xr1tfpmma3uigsna;
+
     alter table SERVICE_RECIPE 
         drop 
-        foreign key FK_kv13yx013qtqkn94d5gkwbu3s;
+        foreign key FK_i3r1b8j6e7dg9hkp49evnnm5y;
+
+    alter table SERVICE_TO_RESOURCE_CUSTOMIZATIONS 
+        drop 
+        foreign key FK_kiddaay6cfe0aob1f1jaio1bb;
+
+    alter table VF_MODULE 
+        drop 
+        foreign key FK_12jptc9it7gs3pru08skobxxc;
+
+    alter table VNF_RESOURCE_CUSTOMIZATION 
+        drop 
+        foreign key FK_iff1ayhb1hrp5jhea3vvikuni;
+
+    alter table VNF_RES_CUSTOM_TO_VF_MODULE_CUSTOM 
+        drop 
+        foreign key FK_6tdyg2ib5eguh4k2qgofh4fj7;
+
+    drop table if exists ALLOTTED_RESOURCE;
 
     drop table if exists ALLOTTED_RESOURCE_CUSTOMIZATION;
 
 
     drop table if exists SERVICE_TO_NETWORKS;
 
+    drop table if exists SERVICE_TO_RESOURCE_CUSTOMIZATIONS;
+
+    drop table if exists TEMP_NETWORK_HEAT_TEMPLATE_LOOKUP;
+
+    drop table if exists TOSCA_CSAR;
+
     drop table if exists VF_MODULE;
 
+    drop table if exists VF_MODULE_CUSTOMIZATION;
+
     drop table if exists VF_MODULE_TO_HEAT_FILES;
 
     drop table if exists VNF_COMPONENTS;
 
     drop table if exists VNF_RESOURCE;
 
+    drop table if exists VNF_RESOURCE_CUSTOMIZATION;
+
+    drop table if exists VNF_RES_CUSTOM_TO_VF_MODULE_CUSTOM;
+
+    create table ALLOTTED_RESOURCE (
+        MODEL_UUID varchar(255) not null,
+        MODEL_INVARIANT_UUID varchar(255),
+        MODEL_VERSION varchar(255),
+        MODEL_NAME varchar(255),
+        TOSCA_NODE_TYPE varchar(255),
+        SUBCATEGORY varchar(255),
+        DESCRIPTION varchar(255),
+        CREATION_TIMESTAMP datetime not null,
+        primary key (MODEL_UUID)
+    );
+
     create table ALLOTTED_RESOURCE_CUSTOMIZATION (
         MODEL_CUSTOMIZATION_UUID varchar(200) not null,
-        MODEL_VERSION varchar(20) not null,
-        MODEL_UUID varchar(200) not null,
-        MODEL_NAME varchar(200) not null,
-        MODEL_INSTANCE_NAME varchar(200) not null,
+        MODEL_INSTANCE_NAME varchar(255),
+        AR_MODEL_UUID varchar(255),
+        PROVIDING_SERVICE_MODEL_INVARIANT_UUID varchar(255),
+        TARGET_NETWORK_ROLE varchar(255),
+        NF_FUNCTION varchar(255),
+        NF_TYPE varchar(255),
+        NF_ROLE varchar(255),
+        NF_NAMING_CODE varchar(255),
+        MIN_INSTANCES integer,
+        MAX_INSTANCES integer,
         CREATION_TIMESTAMP datetime not null,
-        DESCRIPTION varchar(200) default null,
-        MODEL_INVARIANT_UUID varchar(200) not null,
         primary key (MODEL_CUSTOMIZATION_UUID)
     );
 
     create table HEAT_ENVIRONMENT (
-        id integer not null auto_increment,
+        ARTIFACT_UUID varchar(200) not null,
         NAME varchar(100) not null,
         VERSION varchar(20) not null,
-        ASDC_RESOURCE_NAME varchar(100) default 'MANUAL RECORD' not null,
-        ASDC_UUID varchar(200) default 'MANUAL RECORD' not null,
         DESCRIPTION varchar(1200),
-        ENVIRONMENT longtext not null,
+        BODY longtext not null,
         CREATION_TIMESTAMP datetime not null,
-        ASDC_LABEL varchar(200),
-        ARTIFACT_CHECKSUM varchar(200) default 'MANUAL RECORD' not null,
-        primary key (id)
+        ARTIFACT_CHECKSUM varchar(200) default 'MANUAL RECORD',
+        primary key (ARTIFACT_UUID)
     );
 
     create table HEAT_FILES (
-        id integer not null auto_increment,
-        DESCRIPTION varchar(1200) default null,
-        FILE_NAME varchar(200) not null,
-        ASDC_RESOURCE_NAME varchar(100) not null,
-        VERSION varchar(20) not null,
-        ASDC_UUID varchar(200) default 'MANUAL RECORD',
-        FILE_BODY longtext not null,
-        VNF_RESOURCE_ID integer default null,
+        ARTIFACT_UUID varchar(255) not null,
+        DESCRIPTION varchar(255),
+        NAME varchar(255),
+        VERSION varchar(255),
+        BODY varchar(255),
         CREATION_TIMESTAMP datetime not null,
-        ASDC_LABEL varchar(200),
-        ARTIFACT_CHECKSUM varchar(200) default 'MANUAL RECORD' not null,
-        primary key (id)
+        ARTIFACT_CHECKSUM varchar(255),
+        primary key (ARTIFACT_UUID)
     );
 
     create table HEAT_NESTED_TEMPLATE (
-        PARENT_TEMPLATE_ID integer not null,
-        CHILD_TEMPLATE_ID integer not null,
+        PARENT_HEAT_TEMPLATE_UUID varchar(200) not null,
+        CHILD_HEAT_TEMPLATE_UUID varchar(200) not null,
         PROVIDER_RESOURCE_FILE varchar(100),
-        primary key (PARENT_TEMPLATE_ID, CHILD_TEMPLATE_ID)
+        primary key (PARENT_HEAT_TEMPLATE_UUID, CHILD_HEAT_TEMPLATE_UUID)
     );
 
     create table HEAT_TEMPLATE (
-        id integer not null auto_increment,
-        TEMPLATE_NAME varchar(200) not null,
+        ARTIFACT_UUID varchar(200) not null,
+        NAME varchar(200) not null,
         VERSION varchar(20) not null,
-        ASDC_RESOURCE_NAME varchar(100) default 'MANUAL RECORD' not null,
-        ASDC_UUID varchar(200) default 'MANUAL RECORD' not null,
-        TEMPLATE_PATH varchar(100),
-        TEMPLATE_BODY longtext not null,
+        BODY longtext not null,
         TIMEOUT_MINUTES integer,
         DESCRIPTION varchar(1200),
-        ASDC_LABEL varchar(200),
-        ARTIFACT_CHECKSUM varchar(200) default 'MANUAL RECORD' not null,
         CREATION_TIMESTAMP datetime not null,
-        CHILD_TEMPLATE_ID integer,
-        primary key (id)
+        ARTIFACT_CHECKSUM varchar(200) default 'MANUAL RECORD' not null,
+        primary key (ARTIFACT_UUID)
     );
 
     create table HEAT_TEMPLATE_PARAMS (
-        id integer not null auto_increment,
-        HEAT_TEMPLATE_ID integer not null,
-        PARAM_NAME varchar(100) not null,
+        HEAT_TEMPLATE_ARTIFACT_UUID varchar(255) not null,
+        PARAM_NAME varchar(255) not null,
         IS_REQUIRED bit not null,
         PARAM_TYPE varchar(20),
         PARAM_ALIAS varchar(45),
-        primary key (id)
+        primary key (HEAT_TEMPLATE_ARTIFACT_UUID, PARAM_NAME)
     );
 
     create table MODEL (
 
     create table NETWORK_RECIPE (
         id integer not null auto_increment,
-        NETWORK_TYPE varchar(20) not null,
+        MODEL_NAME varchar(20) not null,
         ACTION varchar(20) not null,
         VERSION_STR varchar(20) not null,
+        SERVICE_TYPE varchar(45),
         DESCRIPTION varchar(1200),
         ORCHESTRATION_URI varchar(256) not null,
         NETWORK_PARAM_XSD varchar(2048),
         RECIPE_TIMEOUT integer,
-        SERVICE_TYPE varchar(45) default null,
         CREATION_TIMESTAMP datetime not null,
         primary key (id)
     );
 
     create table NETWORK_RESOURCE (
-        id integer not null,
-        NETWORK_TYPE varchar(45) not null,
-        VERSION_STR varchar(20) not null,
-        ORCHESTRATION_MODE varchar(20),
+        MODEL_UUID varchar(200) not null,
+        MODEL_NAME varchar(200) not null,
+        MODEL_INVARIANT_UUID varchar(20),
+        MODEL_VERSION varchar(20),
+        TOSCA_NODE_TYPE varchar(200),
+        NEUTRON_NETWORK_TYPE varchar(20),
         DESCRIPTION varchar(1200),
-        TEMPLATE_ID integer,
-        NEUTRON_NETWORK_TYPE varchar(20) default null,
+        ORCHESTRATION_MODE varchar(20),
+        HEAT_TEMPLATE_ARTIFACT_UUID varchar(200) not null,
+        AIC_VERSION_MIN varchar(20) default 2.5 not null,
+        AIC_VERSION_MAX varchar(20) default 2.5,
         CREATION_TIMESTAMP datetime not null,
-        AIC_VERSION_MIN varchar(20) not null,
-        AIC_VERSION_MAX varchar(20) default null,
-        primary key (id)
+        primary key (MODEL_UUID)
     );
 
     create table NETWORK_RESOURCE_CUSTOMIZATION (
         MODEL_CUSTOMIZATION_UUID varchar(200) not null,
-        NETWORK_RESOURCE_ID integer default null,
-        MODEL_UUID varchar(200) not null,
-        MODEL_NAME varchar(200) not null,
-        MODEL_INSTANCE_NAME varchar(200) not null,
-        MODEL_VERSION varchar(20) not null,
-        MODEL_INVARIANT_UUID varchar(200) not null,
+        NETWORK_RESOURCE_MODEL_UUID varchar(200) not null,
+        MODEL_INSTANCE_NAME varchar(255),
+        NETWORK_TECHNOLOGY varchar(255),
+        NETWORK_TYPE varchar(255),
+        NETWORK_SCOPE varchar(255),
+        NETWORK_ROLE varchar(255),
         CREATION_TIMESTAMP datetime not null,
-        primary key (MODEL_CUSTOMIZATION_UUID, NETWORK_RESOURCE_ID)
+        primary key (MODEL_CUSTOMIZATION_UUID)
     );
 
     create table SERVICE (
-        id integer not null auto_increment,
-        SERVICE_NAME_VERSION_ID varchar(50) default 'MANUAL_RECORD' not null,
-        SERVICE_NAME varchar(40),
-        VERSION_STR varchar(20) not null,
+        MODEL_UUID varchar(200) not null,
+        MODEL_NAME varchar(200) not null,
+        MODEL_VERSION varchar(20) not null,
         DESCRIPTION varchar(1200),
-        SERVICE_VERSION varchar(10),
-        HTTP_METHOD varchar(50),
+        TOSCA_CSAR_ARTIFACT_UUID varchar(200),
         CREATION_TIMESTAMP datetime not null,
         MODEL_INVARIANT_UUID varchar(200) default 'MANUAL_RECORD' not null,
-        primary key (id)
+        SERVICE_TYPE varchar(20),
+        SERVICE_ROLE varchar(20),
+        primary key (MODEL_UUID)
     );
 
     create table SERVICE_RECIPE (
         id integer not null auto_increment,
-        SERVICE_ID integer not null,
+        SERVICE_MODEL_UUID varchar(200) not null,
         ACTION varchar(40) not null,
-        VERSION_STR varchar(20) default null,
-        DESCRIPTION varchar(1200),
         ORCHESTRATION_URI varchar(256) not null,
+        CREATION_TIMESTAMP datetime not null,
+        VERSION_STR varchar(20),
+        DESCRIPTION varchar(1200),
         SERVICE_PARAM_XSD varchar(2048),
         RECIPE_TIMEOUT integer,
         SERVICE_TIMEOUT_INTERIM integer,
-        CREATION_TIMESTAMP datetime not null,
         primary key (id)
     );
 
         primary key (SERVICE_MODEL_UUID, NETWORK_MODEL_CUSTOMIZATION_UUID)
     );
 
+    create table SERVICE_TO_RESOURCE_CUSTOMIZATIONS (
+        MODEL_TYPE varchar(20) not null,
+        RESOURCE_MODEL_CUSTOMIZATION_UUID varchar(200) not null,
+        CREATION_TIMESTAMP datetime not null,
+        SERVICE_MODEL_UUID varchar(200) not null,
+        primary key (MODEL_TYPE, RESOURCE_MODEL_CUSTOMIZATION_UUID)
+    );
+
+    create table TEMP_NETWORK_HEAT_TEMPLATE_LOOKUP (
+        NETWORK_RESOURCE_MODEL_NAME varchar(200) not null,
+        HEAT_TEMPLATE_ARTIFACT_UUID varchar(200) not null,
+        AIC_VERSION_MIN varchar(20) not null,
+        AIC_VERSION_MAX varchar(20),
+        primary key (NETWORK_RESOURCE_MODEL_NAME)
+    );
+
+    create table TOSCA_CSAR (
+        ARTIFACT_UUID varchar(200) not null,
+        NAME varchar(200) not null,
+        VERSION varchar(20) not null,
+        ARTIFACT_CHECKSUM varchar(200) not null,
+        URL varchar(200) not null,
+        DESCRIPTION varchar(1200),
+        CREATION_TIMESTAMP datetime not null,
+        primary key (ARTIFACT_UUID)
+    );
+
     create table VF_MODULE (
-        id integer not null auto_increment,
-        ASDC_UUID varchar(200) default null,
-        VOL_ENVIRONMENT_ID integer default null,
-        TYPE varchar(200) not null,
-        ASDC_SERVICE_MODEL_VERSION varchar(20) not null,
-        MODEL_CUSTOMIZATION_UUID varchar(200),
-        MODEL_NAME varchar(200) not null,
+        MODEL_UUID varchar(200) not null,
+        VNF_RESOURCE_MODEL_UUID varchar(200),
+        MODEL_INVARIANT_UUID varchar(200),
         MODEL_VERSION varchar(20) not null,
-        CREATION_TIMESTAMP datetime not null,
-        DESCRIPTION varchar(255) default null,
-        VOL_TEMPLATE_ID integer default null,
-        TEMPLATE_ID integer default null,
-        VNF_RESOURCE_ID integer not null,
+        MODEL_NAME varchar(200) not null,
+        DESCRIPTION varchar(1200),
         IS_BASE integer not null,
-        ENVIRONMENT_ID integer,
-        MODEL_INVARIANT_UUID varchar(200) default null,
-        MIN_INSTANCES integer default 0,
-        MAX_INSTANCES integer default null,
-        INITIAL_COUNT integer default 0,
-        LABEL varchar(200) default null,
-        primary key (id)
+        HEAT_TEMPLATE_ARTIFACT_UUID varchar(200) not null,
+        VOL_HEAT_TEMPLATE_ARTIFACT_UUID varchar(200),
+        CREATION_TIMESTAMP datetime not null,
+        primary key (MODEL_UUID)
+    );
+
+    create table VF_MODULE_CUSTOMIZATION (
+        MODEL_CUSTOMIZATION_UUID varchar(200) not null,
+        VF_MODULE_MODEL_UUID varchar(200) not null,
+        VOL_ENVIRONMENT_ARTIFACT_UUID varchar(200),
+        CREATION_TIMESTAMP datetime not null,
+        HEAT_ENVIRONMENT_ARTIFACT_UUID varchar(200),
+        MIN_INSTANCES integer,
+        MAX_INSTANCES integer,
+        INITIAL_COUNT integer,
+        AVAILABILITY_ZONE_COUNT integer,
+        LABEL varchar(200),
+        primary key (MODEL_CUSTOMIZATION_UUID)
     );
 
     create table VF_MODULE_TO_HEAT_FILES (
-        VF_MODULE_ID integer not null,
-        HEAT_FILES_ID integer not null,
-        primary key (VF_MODULE_ID, HEAT_FILES_ID)
+        VF_MODULE_MODEL_UUID varchar(200) not null,
+        HEAT_FILES_ARTIFACT_UUID varchar(200) not null,
+        primary key (VF_MODULE_MODEL_UUID, HEAT_FILES_ARTIFACT_UUID)
     );
 
     create table VNF_COMPONENTS (
     create table VNF_COMPONENTS_RECIPE (
         id integer not null auto_increment,
         VNF_TYPE varchar(200),
+        VF_MODULE_MODEL_UUID varchar(100),
         VNF_COMPONENT_TYPE varchar(45) not null,
-        VF_MODULE_ID varchar(100),
         ACTION varchar(20) not null,
-        SERVICE_TYPE varchar(45) default null,
+        SERVICE_TYPE varchar(45),
         VERSION varchar(20),
         DESCRIPTION varchar(1200),
         ORCHESTRATION_URI varchar(256) not null,
     );
 
     create table VNF_RESOURCE (
-        id integer not null auto_increment,
-        VNF_TYPE varchar(200) not null,
-        ASDC_SERVICE_MODEL_VERSION varchar(20) not null,
-        SERVICE_MODEL_INVARIANT_UUID varchar(200),
-        MODEL_CUSTOMIZATION_NAME varchar(200),
-        ORCHESTRATION_MODE varchar(20) not null,
-        DESCRIPTION varchar(1200),
-        TEMPLATE_ID integer,
-        ENVIRONMENT_ID integer,
-        CREATION_TIMESTAMP datetime not null,
-        ASDC_UUID varchar(200),
-        AIC_VERSION_MIN varchar(20),
-        AIC_VERSION_MAX varchar(20),
+        MODEL_UUID varchar(200) not null,
         MODEL_INVARIANT_UUID varchar(200),
         MODEL_VERSION varchar(20) not null,
         MODEL_NAME varchar(200),
-        MODEL_CUSTOMIZATION_UUID varchar(255),
-        primary key (id)
+        TOSCA_NODE_TYPE varchar(200),
+        DESCRIPTION varchar(1200),
+        ORCHESTRATION_MODE varchar(20) not null,
+        AIC_VERSION_MIN varchar(20),
+        AIC_VERSION_MAX varchar(20),
+        HEAT_TEMPLATE_ARTIFACT_UUID varchar(200),
+        CREATION_TIMESTAMP datetime not null,
+        primary key (MODEL_UUID)
     );
 
-    alter table HEAT_ENVIRONMENT 
-        add constraint UK_5wd9texshmrbg5ou83a5p70uk  unique (NAME, VERSION, ASDC_RESOURCE_NAME, ASDC_UUID);
-
-    alter table HEAT_FILES 
-        add constraint UK_d3ctpcskoryvei0o24ib3dhj2  unique (FILE_NAME, ASDC_RESOURCE_NAME, VERSION, ASDC_UUID);
-
-    alter table HEAT_TEMPLATE 
-        add constraint UK_rpbyrb4spcnldds0evbyvucvi  unique (TEMPLATE_NAME, VERSION, ASDC_RESOURCE_NAME, ASDC_UUID);
+    create table VNF_RESOURCE_CUSTOMIZATION (
+        MODEL_CUSTOMIZATION_UUID varchar(200) not null,
+        MODEL_INSTANCE_NAME varchar(200) not null,
+        MIN_INSTANCES integer,
+        MAX_INSTANCES integer,
+        AVAILABILITY_ZONE_MAX_COUNT integer,
+        NF_FUNCTION varchar(200),
+        NF_TYPE varchar(200),
+        NF_ROLE varchar(200),
+        NF_NAMING_CODE varchar(200),
+        VNF_RESOURCE_MODEL_UUID varchar(200) not null,
+        CREATION_TIMESTAMP datetime not null,
+        primary key (MODEL_CUSTOMIZATION_UUID)
+    );
 
-    alter table HEAT_TEMPLATE_PARAMS 
-        add constraint UK_pj3cwbmewecf0joqv2mvmbvw3  unique (HEAT_TEMPLATE_ID, PARAM_NAME);
+    create table VNF_RES_CUSTOM_TO_VF_MODULE_CUSTOM (
+        VNF_RESOURCE_CUST_MODEL_CUSTOMIZATION_UUID varchar(200) not null,
+        VF_MODULE_CUST_MODEL_CUSTOMIZATION_UUID varchar(200) not null,
+        CREATION_TIMESTAMP datetime not null,
+        VNF_RESOURCE_MODEL_UUID varchar(200) not null,
+        primary key (VNF_RESOURCE_CUST_MODEL_CUSTOMIZATION_UUID, VF_MODULE_CUST_MODEL_CUSTOMIZATION_UUID)
+    );
 
     alter table MODEL 
         add constraint UK_rra00f1rk6eyy7g00k9raxh2v  unique (MODEL_TYPE, MODEL_VERSION_ID);
         add constraint UK_b4g8j9wtqrkxfycyi3ursk7gb  unique (MODEL_ID, ACTION);
 
     alter table NETWORK_RECIPE 
-        add constraint UK_rl4f296i0p8lyokxveaiwkayi  unique (NETWORK_TYPE, ACTION, VERSION_STR);
-
-    alter table NETWORK_RESOURCE 
-        add constraint UK_i4hpdnu3rmdsit3m6fw1ynguq  unique (NETWORK_TYPE, VERSION_STR);
-
-    alter table SERVICE 
-        add constraint UK_iopodavyy29kj79umla8oarak  unique (SERVICE_NAME_VERSION_ID, SERVICE_NAME);
+        add constraint UK_pbsa8i44m8p10f9529jdgfuk9  unique (MODEL_NAME, ACTION, VERSION_STR);
 
     alter table SERVICE_RECIPE 
-        add constraint UK_7fav5dkux2v8g9d2i5ymudlgc  unique (SERVICE_ID, ACTION);
-
-    alter table VF_MODULE 
-        add constraint UK_o3bvdqspginaxlp4gxqohd44l  unique (TYPE, ASDC_SERVICE_MODEL_VERSION);
+        add constraint UK_2lr377dpqnvl5aqlp5dtj2fcp  unique (SERVICE_MODEL_UUID, ACTION);
 
     alter table VNF_COMPONENTS_RECIPE 
-        add constraint UK_4dpdwddaaclhc11wxsb7h59ma  unique (VNF_TYPE, VNF_COMPONENT_TYPE, VF_MODULE_ID, ACTION, SERVICE_TYPE, VERSION);
+        add constraint UK_g3je95aaxxiuest25f0qoy2u8  unique (VNF_TYPE, VF_MODULE_MODEL_UUID, VNF_COMPONENT_TYPE, ACTION, SERVICE_TYPE, VERSION);
 
     alter table VNF_RECIPE 
         add constraint UK_f3tvqau498vrifq3cr8qnigkr  unique (VF_MODULE_ID, ACTION, VERSION_STR);
 
-    alter table VNF_RESOURCE 
-        add constraint UK_peslcm0k3yojkrj6cvdv1rttb  unique (VNF_TYPE, ASDC_SERVICE_MODEL_VERSION, SERVICE_MODEL_INVARIANT_UUID);
-
-    alter table HEAT_TEMPLATE 
-        add constraint FK_ek5sot1q07taorbdmkvnveu98 
-        foreign key (CHILD_TEMPLATE_ID) 
-        references HEAT_TEMPLATE (id);
-
     alter table HEAT_TEMPLATE_PARAMS 
-        add constraint FK_8sxvm215cw3tjfh3wni2y3myx 
-        foreign key (HEAT_TEMPLATE_ID) 
-        references HEAT_TEMPLATE (id);
+        add constraint FK_p3ol1xcvp831glqohrlu6o07o 
+        foreign key (HEAT_TEMPLATE_ARTIFACT_UUID) 
+        references HEAT_TEMPLATE (ARTIFACT_UUID);
 
     alter table MODEL_RECIPE 
         add constraint FK_c23r0puyqug6n44jg39dutm1c 
         foreign key (MODEL_ID) 
         references MODEL (id);
 
+    alter table SERVICE 
+        add constraint FK_l3qy594u2xr1tfpmma3uigsna 
+        foreign key (TOSCA_CSAR_ARTIFACT_UUID) 
+        references TOSCA_CSAR (ARTIFACT_UUID);
+
     alter table SERVICE_RECIPE 
-        add constraint FK_kv13yx013qtqkn94d5gkwbu3s 
-        foreign key (SERVICE_ID) 
-        references SERVICE (id);
+        add constraint FK_i3r1b8j6e7dg9hkp49evnnm5y 
+        foreign key (SERVICE_MODEL_UUID) 
+        references SERVICE (MODEL_UUID);
+
+    alter table SERVICE_TO_RESOURCE_CUSTOMIZATIONS 
+        add constraint FK_kiddaay6cfe0aob1f1jaio1bb 
+        foreign key (SERVICE_MODEL_UUID) 
+        references SERVICE (MODEL_UUID);
+
+    alter table VF_MODULE 
+        add constraint FK_12jptc9it7gs3pru08skobxxc 
+        foreign key (VNF_RESOURCE_MODEL_UUID) 
+        references VNF_RESOURCE (MODEL_UUID);
+
+    alter table VNF_RESOURCE_CUSTOMIZATION 
+        add constraint FK_iff1ayhb1hrp5jhea3vvikuni 
+        foreign key (VNF_RESOURCE_MODEL_UUID) 
+        references VNF_RESOURCE (MODEL_UUID);
+
+    alter table VNF_RES_CUSTOM_TO_VF_MODULE_CUSTOM 
+        add constraint FK_6tdyg2ib5eguh4k2qgofh4fj7 
+        foreign key (VNF_RESOURCE_MODEL_UUID) 
+        references VNF_RESOURCE_CUSTOMIZATION (MODEL_CUSTOMIZATION_UUID);
diff --git a/kubernetes/config/docker/init/src/config/mso/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/sub-sql-files/catalog_add_constraints.sql b/kubernetes/config/docker/init/src/config/mso/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/sub-sql-files/catalog_add_constraints.sql
deleted file mode 100644 (file)
index a5e9834..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-USE `mso_catalog`;
-
-ALTER TABLE  `mso_catalog`.`service_to_allotted_resources`
-  ADD INDEX `fk_service_to_allotted_resources__service_model_uuid_idx` (`SERVICE_MODEL_UUID` ASC),
-  ADD INDEX `fk_service_to_allotted_resources__allotted_resource_customiz_idx` (`AR_MODEL_CUSTOMIZATION_UUID` ASC),
-  ADD CONSTRAINT `fk_service_to_allotted_resources__service__service_name_ver_id`
-    FOREIGN KEY (`SERVICE_MODEL_UUID`)
-    REFERENCES `mso_catalog`.`service` (`SERVICE_NAME_VERSION_ID`)
-    ON DELETE CASCADE
-    ON UPDATE CASCADE,
-  ADD CONSTRAINT `fk_service_to_allotted_resources__allotted_resource_customizat1`
-    FOREIGN KEY (`AR_MODEL_CUSTOMIZATION_UUID`)
-    REFERENCES `mso_catalog`.`allotted_resource_customization` (`MODEL_CUSTOMIZATION_UUID`)
-    ON DELETE CASCADE
-    ON UPDATE CASCADE;
-
-
-ALTER TABLE `mso_catalog`.`service_to_networks`
-  ADD INDEX `fk_service_to_networks__service_model_uuid_idx` (`SERVICE_MODEL_UUID` ASC),
-  ADD INDEX `fk_service_to_networks__network_resource_customization1_idx` (`NETWORK_MODEL_CUSTOMIZATION_UUID` ASC),
-  ADD CONSTRAINT `fk_service_to_networks__service__service_name_version_id`
-    FOREIGN KEY (`SERVICE_MODEL_UUID`)
-    REFERENCES `mso_catalog`.`service` (`SERVICE_NAME_VERSION_ID`)
-    ON DELETE CASCADE
-    ON UPDATE CASCADE,
-  ADD CONSTRAINT `fk_service_to_networks__network_resource_customization1`
-    FOREIGN KEY (`NETWORK_MODEL_CUSTOMIZATION_UUID`)
-    REFERENCES `mso_catalog`.`network_resource_customization` (`MODEL_CUSTOMIZATION_UUID`)
-    ON DELETE CASCADE
-    ON UPDATE CASCADE;
-
-
-ALTER TABLE `mso_catalog`.`vf_module`
-  ADD INDEX `UK_model_customization_uuid__asdc_service_model_version` (`MODEL_CUSTOMIZATION_UUID` ASC, `ASDC_SERVICE_MODEL_VERSION` ASC);
-
-ALTER TABLE `mso_catalog`.`vnf_resource`
-  ADD UNIQUE INDEX `UK_model_customization_uuid__asdc_service_model_version` (`MODEL_CUSTOMIZATION_UUID` ASC, `ASDC_SERVICE_MODEL_VERSION` ASC);
-
-ALTER TABLE `mso_catalog`.`network_resource_customization`
-  ADD INDEX `fk_network_resource_customization__network_resource_id_idx` (`NETWORK_RESOURCE_ID` ASC),
-  ADD  CONSTRAINT `fk_network_resource_customization__network_resource__id`
-    FOREIGN KEY (`NETWORK_RESOURCE_ID`)
-    REFERENCES `mso_catalog`.`network_resource` (`id`)
-    ON DELETE CASCADE
-    ON UPDATE CASCADE;
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/mso/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/sub-sql-files/catalog_timestamp_mso_db.sql b/kubernetes/config/docker/init/src/config/mso/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/sub-sql-files/catalog_timestamp_mso_db.sql
deleted file mode 100644 (file)
index bc88adc..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-USE `mso_catalog`;
-
-ALTER TABLE HEAT_ENVIRONMENT MODIFY COLUMN CREATION_TIMESTAMP DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL;
-ALTER TABLE NETWORK_RECIPE MODIFY COLUMN CREATION_TIMESTAMP DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL;
-ALTER TABLE NETWORK_RESOURCE MODIFY COLUMN CREATION_TIMESTAMP DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL;
-ALTER TABLE SERVICE MODIFY COLUMN CREATION_TIMESTAMP DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL;
-ALTER TABLE VNF_COMPONENTS MODIFY COLUMN CREATION_TIMESTAMP DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL;
-ALTER TABLE VNF_COMPONENTS_RECIPE MODIFY COLUMN CREATION_TIMESTAMP DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL;
-ALTER TABLE VNF_RECIPE MODIFY COLUMN CREATION_TIMESTAMP DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL;
-ALTER TABLE VNF_RESOURCE MODIFY COLUMN CREATION_TIMESTAMP DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL;
-ALTER TABLE HEAT_FILES MODIFY COLUMN CREATION_TIMESTAMP DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL;
-ALTER TABLE HEAT_TEMPLATE MODIFY COLUMN CREATION_TIMESTAMP DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL;
-ALTER TABLE VF_MODULE MODIFY COLUMN CREATION_TIMESTAMP datetime DEFAULT CURRENT_TIMESTAMP NOT NULL;
-ALTER TABLE SERVICE_RECIPE MODIFY COLUMN CREATION_TIMESTAMP datetime DEFAULT CURRENT_TIMESTAMP NOT NULL;
-ALTER TABLE NETWORK_RESOURCE_CUSTOMIZATION MODIFY COLUMN CREATION_TIMESTAMP datetime DEFAULT CURRENT_TIMESTAMP NOT NULL;
-ALTER TABLE ALLOTTED_RESOURCE_CUSTOMIZATION MODIFY COLUMN CREATION_TIMESTAMP datetime DEFAULT CURRENT_TIMESTAMP NOT NULL;
-ALTER TABLE SERVICE_TO_ALLOTTED_RESOURCES MODIFY COLUMN CREATION_TIMESTAMP datetime DEFAULT CURRENT_TIMESTAMP NOT NULL;
-ALTER TABLE SERVICE_TO_NETWORKS MODIFY COLUMN CREATION_TIMESTAMP datetime DEFAULT CURRENT_TIMESTAMP NOT NULL;
-
diff --git a/kubernetes/config/docker/init/src/config/mso/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/sub-sql-files/site_status_updated_timestamp.sql b/kubernetes/config/docker/init/src/config/mso/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/sub-sql-files/site_status_updated_timestamp.sql
deleted file mode 100644 (file)
index 3b2de4c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE SITE_STATUS MODIFY COLUMN CREATION_TIMESTAMP datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
index 1b6d708..1b28858 100755 (executable)
 {
+  "name": "mso-docker",
+  "description": "MSO Docker Images",
   "chef_type": "environment",
-  "cookbook_versions": {
-    "mso-config": "~> 1.0.0"
-  },
-  "default_attributes": {
-    "asdc-connections": {
-      "asdc-controller1": {
-        "activateServerTLSAuth": "false",
-        "asdcAddress": "sdc-be.onap-sdc.svc.cluster.local:8443",
+  "json_class": "Chef::Environment",
+  "default_attributes":
+  {
+    "mso_config_path": "/etc/mso/config.d/",
+
+    "mso-api-handler-infra-config":
+    {
+      "bpelURL": "http://mso.onap-mso.svc.cluster.local:8080",
+      "bpelAuth": "786864AA53D0DCD881AED1154230C0C3058D58B9339D2EFB6193A0F0D82530E1",
+      "camundaURL": "http://mso.onap-mso.svc.cluster.local:8080",
+      "camundaAuth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1"
+    },
+
+    "asdc-connections":
+    {
+      "asdc-controller1":
+      {
+        "user": "mso",
         "consumerGroup": "sdc-OpenSource-Env1",
         "consumerId": "sdc-COpenSource-Env11",
         "environmentName": "DMAAP_TOPIC_HERE",
-        "keyStorePassword": "",
-        "keyStorePath": "",
+        "asdcAddress": "sdc-be.onap-sdc.svc.cluster.local:8443",
         "password": "613AF3483E695524F9857643B697FA51C7A9A0951094F53791485BF3458F9EADA37DBACCCEBD0CB242B85B4062745247",
         "pollingInterval": 60,
         "pollingTimeout": 60,
         "relevantArtifactTypes": "HEAT,HEAT_ENV,HEAT_VOL",
-        "user": "mso"
+        "activateServerTLSAuth": "false",
+        "keyStorePassword": "",
+        "keyStorePath": ""
+      },
+
+      "asdc-controller2":
+      {
+        "user": "user",
+        "consumerGroup": "mso",
+        "consumerId": "mso",
+        "environmentName": "PROD",
+        "asdcAddress": "asdc_hostname2:8443",
+        "password": "f3895035812addbf115bfaf7d2dc850e",
+        "pollingInterval": 60,
+        "pollingTimeout": 60,
+        "relevantArtifactTypes": "HEAT,HEAT_ENV,HEAT_VOL",
+        "activateServerTLSAuth": "false",
+        "keyStorePassword": "",
+        "keyStorePath": ""
       }
     },
-    "mso-api-handler-infra-config": {
-      "bpelAuth": "786864AA53D0DCD881AED1154230C0C3058D58B9339D2EFB6193A0F0D82530E1",
-      "bpelURL": "http://mso:8080",
-      "camundaAuth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1",
-      "camundaURL": "http://mso:8080"
+
+    "mso-sdnc-adapter-config":
+    {
+      "sdncurls":
+      [
+        "http://sdnhost.onap-sdnc.svc.cluster.local:8282/restconf/operations/L3SDN-API:",
+        "http://sdnhost.onap-sdnc.svc.cluster.local:8282/restconf/config/L3SDN-API:",
+        "http://sdnhost.onap-sdnc.svc.cluster.local:8282/restconf/operations/Firewall-API:",
+        "http://sdnhost.onap-sdnc.svc.cluster.local:8282/restconf/config",
+        "http://sdnhost.onap-sdnc.svc.cluster.local:8282/restconf/operations/VNF-API:",
+        "http://sdnhost.onap-sdnc.svc.cluster.local:8282/restconf/operations/NBNC-API:",
+        "http://sdnhost.onap-sdnc.svc.cluster.local:8282/restconf/operations/NORTHBOUND-API:service-topology-operation",
+        "http://sdnhost.onap-sdnc.svc.cluster.local:8282/restconf/operations/GENERIC-RESOURCE-API:",
+        "http://sdnhost.onap-sdnc.svc.cluster.local:8282/restconf/operations/VNFTOPOLOGYAIC-API:"
+      ],
+
+      "bpelurl": "http://mso.onap-mso.svc.cluster.local:8080/mso/SDNCAdapterCallbackService",
+      "restbpelurl": "http://mso.onap-mso.svc.cluster.local:8080/mso/WorkflowMessage",
+      "myurl": "http://mso.onap-mso.svc.cluster.local:8080/adapters/rest/SDNCNotify",
+      "sdncauth": "263f7d5f944d4d0c76db74b4148bec67d0bc796a874bc0d2a2a12aae89a866aa69133f700f391f784719a37f6a68d29bf5a2fbae1dab0402db7788c800c5ba73",
+      "bpelauth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1",
+      "sdncconnecttime": "5000"
     },
-    "mso-bpmn-config": {
+    "mso-po-adapter-config":
+    {
+      "identity_services":
+      [
+        {
+          "dcp_clli": "DEFAULT_KEYSTONE",
+          "identity_url": "OPENSTACK_KEYSTONE_IP_HERE/v2.0",
+          "mso_id": "OPENSTACK_USERNAME_HERE",
+          "mso_pass": "OPENSTACK_ENCRYPTED_PASSWORD_HERE",
+          "admin_tenant": "OPENSTACK_SERVICE_TENANT_NAME_HERE",
+          "member_role": "admin",
+          "tenant_metadata": "true",
+          "identity_server_type": "KEYSTONE",
+          "identity_authentication_type": "USERNAME_PASSWORD"
+        }
+      ],
+
+      "cloud_sites":
+      [
+        {
+          "id": "OPENSTACK_REGION_HERE",
+          "aic_version": "2.5",
+          "lcp_clli": "OPENSTACK_REGION_HERE",
+          "region_id": "OPENSTACK_REGION_HERE",
+          "identity_service_id": "DEFAULT_KEYSTONE"
+        }
+      ],
+
+      "vnfbpelauth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1",
+      "checkrequiredparameters": "true",
+      "nwbpelauth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1"
+    },
+
+    "mso-bpmn-config":
+    {
       "urnFileSystemLoadingEnabled": "true"
     },
-    "mso-bpmn-urn-config": {
-      "aaiAuth": "2630606608347B7124C244AB0FE34F6F",
-      "aaiEndpoint": "https://aai-service.onap-aai.svc.cluster.local:8443",
-      "adaptersCompletemsoprocessEndpoint": "http://mso:8080/CompleteMsoProcess",
-      "adaptersDbEndpoint": "http://mso:8080/dbadapters/RequestsDbAdapter",
-      "catalogDbEndpoint": "http://mso:8080/ecomp/mso/catalog",
-      "adaptersNetworkEndpoint": "http://mso:8080/networks/NetworkAdapter",
-      "adaptersNetworkRestEndpoint": "http://mso:8080/networks/rest/v1/networks",
-      "adaptersPoAuth": "6B0E6863FB8EE010AB6F191B3C0489437601E81DC7C86305CB92DB98AFC53D74",
-      "adaptersSdncEndpoint": "http://mso:8080/adapters/SDNCAdapter",
-      "adaptersSdncRestEndpoint": "http://mso:8080/adapters/rest/v1/sdnc",
-      "adaptersTenantEndpoint": "http://mso:8080/tenants/TenantAdapter",
-      "adaptersVnfAsyncEndpoint": "http://mso:8080/vnfs/VnfAdapterAsync",
-      "adaptersVnfRestEndpoint": "http://mso:8080/vnfs/rest/v1/vnfs",
-      "adaptersDbAuth": "6B0E6863FB8EE010AB6F191B3C0489437601E81DC7C86305CB92DB98AFC53D74",
-      "workflowMessageEndpoint": "http://mso:8080/mso/WorkflowMessage",
-      "workflowSdncAdapterCallback": "http://mso:8080/mso/SDNCAdapterCallbackService",
-      "callbackRetryAttempts": "30",
-      "callbackRetrySleepTime": "1000",
-      "logDebugAsyncQueryAAICustomer": "false",
-      "logDebugChangeFeatureActivateV1": "false",
-      "logDebugChangeLayer3ServiceActivateV1": "false",
-      "logDebugChangeLayer3ServiceProvV1": "false",
-      "logDebugCompleteMsoProcess": "false",
-      "logDebugCreateCinderVolumeV1": "false",
-      "logDebugCreateCustomerV1": "false",
-      "logDebugCreateNetworkInstanceInfra": "false",
-      "logDebugCreateNetworkV1": "false",
-      "logDebugCreateServiceInstanceInfra": "false",
-      "logDebugCreateTenantV1": "false",
-      "logDebugCreateVfModuleVolumeInfraV1": "false",
-      "logDebugDeleteCinderVolumeV1": "false",
-      "logDebugDeleteGenericVNFV1": "false",
-      "logDebugDeleteNetworkInstanceInfra": "false",
-      "logDebugDeleteNetworkV1": "false",
-      "logDebugDeleteServiceInstanceInfra": "false",
-      "logDebugDeleteTenantV1": "false",
-      "logDebugDeleteVCEV1": "false",
-      "logDebugDeleteVfModuleVolumeInfraV1": "false",
-      "logDebugDisconnectLayer3Service": "false",
-      "logDebugGetLayer3ServiceDetailsV1": "false",
-      "logDebugL3ToHigherLayerAddBonding": "false",
-      "logDebugL3ToHigherLayerDeleteBonding": "false",
-      "logDebugLayer3ServiceActivateV1": "false",
-      "logDebugLayer3TestAndTurnUpV1": "false",
-      "logDebugQueryAAICustomer": "false",
-      "logDebugQueryTenantInfo": "false",
-      "logDebugRemoveLayer3Service": "false",
-      "logDebugSdncAdapter": "false",
-      "logDebugUpdateCinderVolumeV1": "false",
-      "logDebugUpdateNetworkInstanceInfra": "false",
-      "logDebugUpdateNetworkV2": "false",
-      "logDebugUpdateVfModuleVolumeInfraV1": "true",
-      "logDebugVnfAdapterCreateV1": "true",
-      "logDebugVnfAdapterDeleteV1": "true",
-      "logDebugVnfAdapterQueryV1": "true",
-      "logDebugVnfAdapterRollbackV1": "true",
+
+    "mso-bpmn-urn-config":
+    {
       "debug":"false",
       "invariantIdL3ToHigherLayerDeleteBonding": "50359538-066f-4a8d-807f-f2bc8eaa79dc",
       "versionIdL3ToHigherLayerDeleteBonding": "52dbec20-47aa-42e4-936c-331d8e350d44",
       "infraCustomerId": "21014aa2-526b-11e6-beb8-9e71128cae77",
       "sniroAuth": "test:testpwd",
-      "sniroCallback": "https://mso:8080/adapters/rest/SDNCNotify/SNIROResponse",
+      "sniroCallback": "https://mso.onap-mso.svc.cluster.local:8080/adapters/rest/SDNCNotify/SNIROResponse",
       "sniroEndpoint": "https://TODO.att.c om:14699/sniro/api/v1/placement",
       "sniroTimeout": "PT30M",
       "sniroPoliciesDHV2vvig": "SNIRO.DistanceToLocationPolicy_vhngw,SNIRO.VNFPolicy_vhngatewayprimary1_v1,SNIRO.ResourceInstancePolicy_hngateway,SNIRO.ResourceRegionPolicy_hngateway_v1,SNIRO.VNFPolicy_vhngatewaysecondary1_v1,SNIRO.ZonePolicy_vhngw,SNIRO.PlacementOptimizationPolicy_dhv_v3,SNIRO.VNFPolicy_vhnportal_primary1_v1,SNIRO.ResourceInstancePolicy_vhnportal_v3,SNIRO.ResourceRegionPolicy_vhnportal_v1,SNIRO.VNFPolicy_vhnportalsecondary1_v1,SNIRO.ZonePolicy_vhnportal,SNIRO.DistanceToLocationPolicy_vvig,SNIRO.InventoryGroupPolicy_vvig,SNIRO.VNFPolicy_vvigprimary1_v1,SNIRO.ResourceInstancePolicy_vvig,SNIRO.VNFPolicy_vvigsecondary1_v1",
       "mso.sniro.endpoint": "/optimizationInstance/V1/create",
       "mso.sniro.callback": "/adapters/rest/SDNCNotify/SNIROResponse",
       "mso.infra.customer.id": "21014aa2-526b-11e6-beb8-9e71128cae77",
+      "aaiEndpoint": "https://aai-service.onap-aai.svc.cluster.local:8443",
+      "aaiAuth": "2630606608347B7124C244AB0FE34F6F",
+      "adaptersNamespace": "http://org.openecomp.mso",
+      "adaptersCompletemsoprocessEndpoint": "http://mso.onap-mso.svc.cluster.local:8080/CompleteMsoProcess",
+      "adaptersDbEndpoint": "http://mso.onap-mso.svc.cluster.local:8080/dbadapters/RequestsDbAdapter",
+      "catalogDbEndpoint": "http://mso.onap-mso.svc.cluster.local:8080/ecomp/mso/catalog",
+      "adaptersSdncEndpoint": "http://mso.onap-mso.svc.cluster.local:8080/adapters/SDNCAdapter",
+      "adaptersSdncRestEndpoint": "http://mso.onap-mso.svc.cluster.local:8080/adapters/rest/v1/sdnc",
+      "adaptersTenantEndpoint": "http://mso.onap-mso.svc.cluster.local:8080/tenants/TenantAdapter",
+      "adaptersDbAuth": "6B0E6863FB8EE010AB6F191B3C0489437601E81DC7C86305CB92DB98AFC53D74",
+      "workflowMessageEndpoint": "http://mso.onap-mso.svc.cluster.local:8080/mso/WorkflowMessage",
+      "workflowSdncAdapterCallback": "http://mso.onap-mso.svc.cluster.local:8080/mso/SDNCAdapterCallbackService",
       "msoKey": "07a7159d3bf51a0e53be7a8f89699be7",
-      "poTimeout": "PT5M",
+      "adaptersPoAuth": "6B0E6863FB8EE010AB6F191B3C0489437601E81DC7C86305CB92DB98AFC53D74",
+      "sdncTimeout": "PT5M",
       "rollback": "true",
+      "adaptersNetworkEndpoint": "http://mso.onap-mso.svc.cluster.local:8080/networks/NetworkAdapter",
+      "adaptersNetworkRestEndpoint": "http://mso.onap-mso.svc.cluster.local:8080/networks/rest/v1/networks",
+      "adaptersVnfAsyncEndpoint": "http://mso.onap-mso.svc.cluster.local:8080/vnfs/VnfAdapterAsync",
+      "workflowVnfAdapterDeleteCallback": "http://mso.onap-mso.svc.cluster.local:8080/mso/vnfAdapterNotify",
+      "workflowVnfAdapterCreateCallback": "http://mso.onap-mso.svc.cluster.local:8080/mso/vnfAdapterNotify",
+      "adaptersVnfRestEndpoint": "http://mso.onap-mso.svc.cluster.local:8080/vnfs/rest/v1/vnfs",
+      "workflowVnfAdapterRestCallback": "http://mso.onap-mso.svc.cluster.local:8080/mso/vnfAdapterRestNotify",
+      "poTimeout": "PT5M",
       "sdncFirewallYangModel": "http://com/att/svc/mis/firewall-lite-gui",
       "sdncFirewallYangModelVersion": "2015-05-15",
-      "sdncTimeout": "PT5M",
       "sdncTimeoutFirewall": "20",
-      "workflowSdncadapterCallback": "http://mso:8080/mso/SDNCAdapterCallbackService",
-      "workflowVnfAdapterCreateCallback": "http://mso:8080/mso/vnfAdapterNotify",
-      "workflowVnfAdapterDeleteCallback": "http://mso:8080/mso/vnfAdapterNotify",
-      "workflowVnfAdapterRestCallback": "http://mso:8080/mso/vnfAdapterRestNotify",
+      "callbackRetryAttempts": "30",
+      "callbackRetrySleepTime": "1000",
       "workflowL3ToHigherLayerAddBondingModelName" : "WAN Bonding",
       "workflowL3ToHigherLayerAddBondingModelVersion" : "2.0"
-    },
-    "mso-po-adapter-config": {
-      "checkrequiredparameters": "true",
-      "cloud_sites": [{
-        "aic_version": "2.5",
-        "id": "OPENSTACK_REGION_HERE",
-        "identity_service_id": "DEFAULT_KEYSTONE",
-        "lcp_clli": "OPENSTACK_REGION_HERE",
-        "region_id": "OPENSTACK_REGION_HERE"
-      }],
-      "identity_services": [{
-        "admin_tenant": "OPENSTACK_SERVICE_TENANT_NAME_HERE",
-        "dcp_clli": "DEFAULT_KEYSTONE",
-        "identity_authentication_type": "USERNAME_PASSWORD",
-        "identity_server_type": "KEYSTONE",
-        "identity_url": "OPENSTACK_KEYSTONE_IP_HERE/v2.0",
-        "member_role": "admin",
-        "mso_id": "OPENSTACK_USERNAME_HERE",
-        "mso_pass": "OPENSTACK_ENCRYPTED_PASSWORD_HERE",
-        "tenant_metadata": "true"
-      }],
-      "nwbpelauth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1",
-      "vnfbpelauth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1"
-    },
-    "mso-sdnc-adapter-config": {
-      "bpelauth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1",
-      "bpelurl": "http://mso.onap-mso.svc.cluster.local:8080/mso/SDNCAdapterCallbackService",
-      "restbpelurl": "http://mso.onap-mso.svc.cluster.local:8080/mso/WorkflowMessage",
-      "myurl": "http://mso.onap-mso.svc.cluster.local:8080/adapters/rest/SDNCNotify",
-      "sdncauth": "263f7d5f944d4d0c76db74b4148bec67d0bc796a874bc0d2a2a12aae89a866aa69133f700f391f784719a37f6a68d29bf5a2fbae1dab0402db7788c800c5ba73",
-      "sdncconnecttime": "5000",
-      "sdncurls": [
-        "http://sdnhost.onap-sdnc.svc.cluster.local:8282/restconf/operations/L3SDN-API:",
-        "http://sdnhost.onap-sdnc.svc.cluster.local:8282/restconf/config/L3SDN-API:",
-        "http://sdnhost.onap-sdnc.svc.cluster.local:8282/restconf/operations/Firewall-API:",
-        "http://sdnhost.onap-sdnc.svc.cluster.local:8282/restconf/config",
-        "http://sdnhost.onap-sdnc.svc.cluster.local:8282/restconf/operations/VNF-API:",
-        "http://sdnhost.onap-sdnc.svc.cluster.local:8282/restconf/operations/NBNC-API:",
-        "http://sdnhost.onap-sdnc.svc.cluster.local:8282/restconf/operations/NORTHBOUND-API:service-topology-operation",
-        "http://sdnhost.onap-sdnc.svc.cluster.local:8282/restconf/operations/GENERIC-RESOURCE-API:",
-        "http://sdnhost.onap-sdnc.svc.cluster.local:8282/restconf/operations/VNFTOPOLOGYAIC-API:"
-      ]
-    },
-    "mso_config_path": "/etc/mso/config.d/"
+    }
   },
-  "description": "MSO Docker Images",
-  "json_class": "Chef::Environment",
-  "name": "mso-docker",
-  "override_attributes": {}
+
+  "override_attributes":
+  {
+  },
+
+  "cookbook_versions":
+  {
+    "mso-config": "~> 1.0.0"
+  }
 }
diff --git a/kubernetes/dcaegen2/.helmignore b/kubernetes/dcaegen2/.helmignore
new file mode 100644 (file)
index 0000000..a7adb75
--- /dev/null
@@ -0,0 +1,22 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+dcae-parameters-sample.yaml
\ No newline at end of file
diff --git a/kubernetes/dcaegen2/Chart.yaml b/kubernetes/dcaegen2/Chart.yaml
new file mode 100644 (file)
index 0000000..4ab4f85
--- /dev/null
@@ -0,0 +1,4 @@
+apiVersion: v1
+description: DCAE Generation 2 bootstrap container
+name: dcaegen2
+version: 1.1.0
diff --git a/kubernetes/dcaegen2/dcae-parameters-sample.yaml b/kubernetes/dcaegen2/dcae-parameters-sample.yaml
new file mode 100644 (file)
index 0000000..b2cffae
--- /dev/null
@@ -0,0 +1,41 @@
+# UUID of the OpenStack"s CentOS 7 cloud VM image
+# If your Openstack does not have a CentOS 7 cloud image, you will have to add one.
+centos7image_id: "52d4ea09-cc69-4a9a-9961-938a3282d209"
+# UUID of the OpenStack"s Ubuntu 16.04 VM image
+# If your Openstack does not have a buntu 16.04 cloud image, you will have to add one.
+ubuntu1604image_id: "97bbe637-5d42-419a-a2c7-beff33ffa23c"
+# ID of the OpenStack"s VM flavor to be used by DCAEGEN2 VMs (m1.medium/m1.large)
+flavor_id: "4"
+# UUID of the OpenStack"s security group to be used for DCAEGEN2 VMs
+security_group: "abc0687d-34ab-4d37-8fe8-4b544d94ba71"
+# The name of the OpenStack network where public IP addresses and floating IPs are allocated from
+# This must use the name and not the UUID.  The name must be unique otherwise the installer fails
+public_net: "public"
+# The name of the OpenStack network where private IP addresses are allocated from
+private_net: "onap_oam"
+# Group header for OpenStack Keystone parameters
+openstack:
+  # User name
+  username: "dev"
+  # Password
+  password: "dev"
+  # Name of the OpenStack tenant/project where DCAEGEN2 VMs are deployed
+  tenant_name: "dev"
+  # Openstack authentication API URL, for example "https://horizon.playground.onap.org:5000/v2.0"
+  auth_url: "http://1.2.3.4:5000/v2.0"
+  # Name of the OpenStack region where DCAEGEN2 VMs are deployed, for example "RegionOne"
+  region: "RegionOne"
+# Name of the public key uploaded to OpenStack in the Prepration step
+keypair: "dcae-g2"
+# Path to the private key within the conatiner (!! Do not change!!)
+key_filename: "/opt/dcae/key"
+# Prefix (location code) of all DCAEGEN2 VMs
+location_prefix: "onapr1"
+# Domain name of the OpenStack tenant "onapr1.playground.onap.org"
+location_domain: "onap-dcaegen2"
+# Location of the raw artifact repo hosting additional boot scripts called by DCAEGEN2 VMs" cloud-init, for example: "https://nexus.onap.org/service/local/repositories/raw/content"
+codesource_url: "https://nexus.onap.org/content/sites/raw"
+# Path to the boot scripts within the raw artifact repo, for example: "org.onap.dcaegen2.deployments.scripts/releases/" 
+codesource_version: "org.onap.dcaegen2.deployments/releases/scripts/"
+
+
diff --git a/kubernetes/dcaegen2/templates/pod.yaml b/kubernetes/dcaegen2/templates/pod.yaml
new file mode 100644 (file)
index 0000000..e275ff6
--- /dev/null
@@ -0,0 +1,28 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: {{ .Chart.Name }}
+  namespace: "{{ .Values.nsPrefix }}-dcaegen2"
+spec:
+  containers:
+    - name: {{ .Chart.Name }}
+      image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+      imagePullPolicy: {{ .Values.image.pullPolicy }}
+      volumeMounts:
+      - name: installer-config-mount
+        mountPath: /opt/app/installer/config
+        readOnly: true
+      env:
+      - name: LOCATION
+        value: "{{ .Values.location }}"
+  volumes:
+  - name: installer-config-mount
+    projected:
+      sources:
+      - secret:
+          name: "{{ .Chart.Name }}-openstack-ssh-private-key"
+      - configMap:
+          name: "{{ .Chart.Name }}-config-inputs"
+  imagePullSecrets:
+  - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+  restartPolicy: Never
\ No newline at end of file
diff --git a/kubernetes/dcaegen2/values.yaml b/kubernetes/dcaegen2/values.yaml
new file mode 100644 (file)
index 0000000..5d446c8
--- /dev/null
@@ -0,0 +1,6 @@
+nsPrefix: onap
+location: dg2
+image:
+  repository: nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.bootstrap
+  tag: 1.1-latest
+  pullPolicy: Always
\ No newline at end of file
index 4722c4a..d105744 100644 (file)
@@ -4,7 +4,6 @@ metadata:
   name: mariadb
   namespace: "{{ .Values.nsPrefix }}-mso"
 spec:
-  replicas: 1
   selector:
     matchLabels:
       app: mariadb
@@ -23,10 +22,6 @@ spec:
         env:
           - name: MYSQL_ROOT_PASSWORD
             value: password
-          - name: MARIADB_MAJOR
-            value: "10.1"
-          - name: MARIADB_VERSION
-            value: "10.1.11+maria-1~jessie"
         volumeMounts:
         - mountPath: /etc/localtime
           name: localtime
index 8973db3..862f572 100644 (file)
@@ -42,7 +42,7 @@ spec:
     spec:
       containers:
       - command:
-        - /docker-files/scripts/start-jboss-server.sh
+        - /tmp/start-jboss-server.sh
         image: {{ .Values.image.mso }}
         imagePullPolicy: {{ .Values.pullPolicy }}
         name: mso
@@ -52,7 +52,7 @@ spec:
           readOnly: true
         - mountPath: /shared
           name: mso
-        - mountPath: /docker-files
+        - mountPath: /tmp/start-jboss-server.sh
           name: mso-docker-files
         env:
         - name: JBOSS_DEBUG
@@ -77,6 +77,6 @@ spec:
             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/mso/mso
         - name: mso-docker-files
           hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/mso/docker-files
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/mso/docker-files/scripts/start-jboss-server.sh
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
index afe71af..c8810aa 100755 (executable)
@@ -39,11 +39,46 @@ create_registry_key() {
   check_return_code $cmd
 }
 
+configure_dcaegen2() {
+  if [ ! -s "$OPENSTACK_PRIVATE_KEY_PATH" ]
+  then
+    echo "ERROR: $OPENSTACK_PRIVATE_KEY_PATH does not exist or is empty.  Cannot launch dcae gen2."
+    return 1
+  fi
+
+  cmd=`echo kubectl --namespace $1-$2 create secret generic $2-openstack-ssh-private-key --from-file=key=${OPENSTACK_PRIVATE_KEY_PATH}`
+  eval ${cmd}
+  check_return_code $cmd
+
+  if [ ! -s "$DCAEGEN2_CONFIG_INPUT_FILE_PATH" ]
+  then
+    echo "ERROR: $DCAEGEN2_CONFIG_INPUT_FILE_PATH does not exist or is empty.  Cannot launch dcae gen2."
+    return 1
+  fi
+
+  cmd=`echo kubectl --namespace $1-$2 create configmap $2-config-inputs --from-file=inputs.yaml=${DCAEGEN2_CONFIG_INPUT_FILE_PATH}`
+  eval ${cmd}
+  check_return_code $cmd
+}
+
 create_onap_helm() {
   HELM_VALUES_ADDITION=""
   if [[ ! -z $HELM_VALUES_FILEPATH ]]; then
     HELM_VALUES_ADDITION="--values=$HELM_VALUES_FILEPATH"
   fi
+  # Have to put a check for dcaegen2 because it requires external files to helm
+  # which should not be part of the Chart.
+  if [ "$2" = "dcaegen2" ];
+  then
+    configure_dcaegen2 $1 $2
+    local result=$?
+    if [ $result -ne 0 ]
+    then
+      echo "ERROR: dcaegen2 failed to configure: Pre-requisites not met.  Skipping deploying it and continue"
+      return
+    fi
+  fi
+
   cmd=`echo helm install $LOCATION/$2/ --name $1-$2 --namespace $1 --set nsPrefix=$1,nodePortPrefix=$3 ${HELM_VALUES_ADDITION}`
   eval ${cmd}
   check_return_code $cmd
index a1aba3d..6dfd948 100644 (file)
@@ -1,8 +1,15 @@
 #!/bin/bash
 
 # Deploying MSB first and kube2msb last will ensure all the ONAP services can be registered to MSB
-HELM_APPS=('consul' 'msb' 'mso' 'message-router' 'sdnc' 'vid' 'robot' 'portal' 'policy' 'appc' 'aai' 'sdc' 'dcae' 'log' 'cli' 'multicloud' 'clamp' 'kube2msb')
+HELM_APPS=('consul' 'msb' 'mso' 'message-router' 'sdnc' 'vid' 'robot' 'portal' 'policy' 'appc' 'aai' 'sdc' 'dcaegen2' 'log' 'cli' 'multicloud' 'clamp' 'kube2msb')
 ONAP_DOCKER_REGISTRY=${ONAP_DOCKER_REGISTRY:-nexus3.onap.org:10001}
 ONAP_DOCKER_USER=${ONAP_DOCKER_USER:-docker}
 ONAP_DOCKER_PASS=${ONAP_DOCKER_PASS:-docker}
 ONAP_DOCKER_MAIL=${ONAP_DOCKER_MAIL:-$USERNAME@$USERDOMAIN}
+# Openstack key pair private key file location required to enable dcaegen2 installer CRUD operations in your Openstack
+# Ensure you set the name of your keypair in the dcae-parameters.yaml entry "keypair: "dcae-g2"
+# example: export OPENSTACK_PRIVATE_KEY_PATH=/home/user/Downloads/dcae-g2.pem
+OPENSTACK_PRIVATE_KEY_PATH=${OPENSTACK_PRIVATE_KEY_PATH:-~/.ssh/onap_rsa}
+# dcaegen2 bootstrap configuration input yaml file.  Start from the sample, and set your environments real values:
+# example: export DCAEGEN2_CONFIG_INPUT_FILE_PATH=/tmp/dcae-parameters.yaml
+DCAEGEN2_CONFIG_INPUT_FILE_PATH=${DCAEGEN2_CONFIG_INPUT_FILE_PATH:-../dcaegen2/dcae-parameters-sample.yaml}
\ No newline at end of file