Merge "Policy 1.1 in Kubernetes"
authorMandeep Khinda <Mandeep.Khinda@amdocs.com>
Fri, 8 Sep 2017 15:33:28 +0000 (15:33 +0000)
committerGerrit Code Review <gerrit@onap.org>
Fri, 8 Sep 2017 15:33:28 +0000 (15:33 +0000)
461 files changed:
cloudify/scripts/onap/configure_docker_secret_workaround.py [new file with mode: 0644]
cloudify/scripts/onap/create_init_pod.py [new file with mode: 0644]
cloudify/scripts/onap/create_namespace.py [new file with mode: 0644]
cloudify/scripts/onap/create_resources_services.py [new file with mode: 0644]
cloudify/scripts/onap/delete_init_pod.py [new file with mode: 0644]
cloudify/scripts/onap/delete_namespace.py [new file with mode: 0644]
cloudify/scripts/onap/delete_resources_services.py [new file with mode: 0644]
cloudify/scripts/onap/patch_definitions.py [deleted file]
cloudify/scripts/onap/provision_definitions.py [deleted file]
cloudify/scripts/onap/read_definitions.py [deleted file]
cloudify/types/onap.yaml
kubernetes/aai/templates/aai-deployment.yaml
kubernetes/aai/templates/aai-resources-deployment.yaml [new file with mode: 0644]
kubernetes/aai/templates/aai-traversal-deployment.yaml [new file with mode: 0644]
kubernetes/aai/templates/all-services.yaml
kubernetes/aai/templates/data-router-deployment.yaml [new file with mode: 0644]
kubernetes/aai/templates/elasticsearch-deployment.yaml [new file with mode: 0644]
kubernetes/aai/templates/gremlin-deployment.yaml [new file with mode: 0644]
kubernetes/aai/templates/hbase-deployment.yaml
kubernetes/aai/templates/modelloader-deployment.yaml
kubernetes/aai/templates/search-data-service-deployment.yaml [new file with mode: 0644]
kubernetes/aai/templates/sparky-be-deployment.yaml [new file with mode: 0644]
kubernetes/aai/values.yaml
kubernetes/appc/templates/all-services.yaml
kubernetes/appc/templates/appc-pv-pvc.yaml [new file with mode: 0644]
kubernetes/appc/templates/db-deployment.yaml
kubernetes/appc/values.yaml
kubernetes/config/docker/init/Dockerfile
kubernetes/config/docker/init/config-init.sh
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/README.md [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-auth/CHANGELOG.md [moved from kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-auth/CHANGELOG.md with 70% similarity, mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-auth/README.md [moved from kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-auth/README.md with 91% similarity, mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-auth/files/default/aai_keystore-dev [moved from kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-auth/files/default/aai_keystore-dev with 100% similarity, mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-auth/metadata.rb [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-auth/recipes/aai-resources-aai-keystore.rb [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/CHANGELOG.md [moved from kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/CHANGELOG.md with 93% similarity, mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/README.md [moved from kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/README.md with 93% similarity, mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/attributes/aai-resources-config.rb [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/attributes/aaiEventDMaaPPublisher.rb [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/attributes/preferredRoute.rb [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/attributes/titan-cached.rb [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/attributes/titan-realtime.rb [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/metadata.rb [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/recipes/aai-preferredRoute.rb [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/recipes/aai-resources-config.rb [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/recipes/aaiEventDMaaPPublisher.rb [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/recipes/createConfigDirectories.rb [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/recipes/titan-cached.rb [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/recipes/titan-realtime.rb [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/templates/default/aai-resources-config/aaiEventDMaaPPublisher.properties [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/templates/default/aai-resources-config/aaiconfig.properties [moved from kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/templates/default/aai-app-config/aaiconfig.properties with 66% similarity, mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/templates/default/aai-resources-config/preferredRoute.txt [moved from kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/templates/default/aai-app-config/preferredRoute.txt with 100% similarity, mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/templates/default/aai-resources-config/titan-cached.properties [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/templates/default/aai-resources-config/titan-realtime.properties [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/runlist-aai-resources.json [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-auth/CHANGELOG.md [moved from kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-auth/CHANGELOG.md with 70% similarity, mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-auth/README.md [moved from kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-auth/README.md with 91% similarity, mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-auth/files/default/aai_keystore-dev [moved from kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-auth/files/default/aai_keystore-dev with 100% similarity, mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-auth/metadata.rb [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-auth/recipes/aai-traversal-aai-keystore.rb [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/CHANGELOG.md [moved from kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/CHANGELOG.md with 93% similarity, mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/README.md [moved from kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/README.md with 93% similarity, mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/attributes/aai-traversal-config.rb [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/attributes/aaiEventDMaaPPublisher.rb [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/attributes/gremlin-server-config.rb [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/attributes/preferredRoute.rb [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/attributes/titan-cached.rb [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/attributes/titan-realtime.rb [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/metadata.rb [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/recipes/aai-preferredRoute.rb [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/recipes/aai-traversal-config.rb [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/recipes/aaiEventDMaaPPublisher.rb [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/recipes/createConfigDirectories.rb [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/recipes/gremlin-server-config.rb [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/recipes/titan-cached.rb [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/recipes/titan-realtime.rb [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/templates/default/aai-traversal-app-config/aaiEventDMaaPPublisher.properties [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/templates/default/aai-traversal-app-config/aaiconfig.properties [moved from kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/templates/default/aai-app-config/aaiconfig.properties with 64% similarity, mode: 0644]
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 [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/templates/default/aai-traversal-app-config/preferredRoute.txt [moved from kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/templates/default/aai-app-config/preferredRoute.txt with 100% similarity, mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/templates/default/aai-traversal-app-config/titan-cached.properties [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/templates/default/aai-traversal-app-config/titan-realtime.properties [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/runlist-aai-traversal.json [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-auth/files/default/aai_keystore-int [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-auth/files/default/aai_keystore-local [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-auth/files/default/aai_keystore-simpledemo [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-auth/files/default/aai_keystore-solo [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-auth/metadata.rb [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-auth/recipes/aai-keystore.rb [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/attributes/aaiWorkloadConsumer.properties.rb [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/attributes/aaiWorkloadPublisher.properties.rb [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/attributes/aaiWorkloadStatusPublisher.properties.rb [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/attributes/aaiconfig-properties.rb [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/attributes/logback.rb [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/attributes/preferredRoute.rb [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/metadata.rb [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/recipes/aai-config.rb [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/recipes/aai-logback.rb [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/recipes/aai-preferredRoute.rb [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/recipes/aaiWorkloadConsumer.rb [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/recipes/aaiWorkloadPublisher.rb [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/recipes/aaiWorkloadStatusPublisher.rb [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/recipes/createConfigDirectories.rb [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/templates/default/aai-app-config/aaiWorkloadConsumer.properties [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/templates/default/aai-app-config/aaiWorkloadPublisher.properties [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/templates/default/aai-app-config/aaiWorkloadStatusPublisher.properties [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/templates/default/aai-app-config/aft.properties [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/templates/default/aai-app-config/logback.erb [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/runlist-app-server.json [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/user/CHANGELOG.md [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/user/README.md [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/user/metadata.rb [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/user/recipes/default.rb [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-config/nodes/chef-node.json [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadConsumer.properties.chef-20170515203437.982525 [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadConsumer.properties.chef-20170515203837.892657 [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadConsumer.properties.chef-20170516140802.742329 [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadConsumer.properties.chef-20170517001516.702925 [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadConsumer.properties.chef-20170525061506.737483 [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadPublisher.properties.chef-20170515203438.032572 [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadPublisher.properties.chef-20170515203837.951256 [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadPublisher.properties.chef-20170516140802.804576 [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadPublisher.properties.chef-20170517001516.745487 [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadPublisher.properties.chef-20170525061506.748871 [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadStatusPublisher.properties.chef-20170515203438.078258 [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadStatusPublisher.properties.chef-20170515203838.004779 [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadStatusPublisher.properties.chef-20170516140802.862105 [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadStatusPublisher.properties.chef-20170517001516.777254 [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadStatusPublisher.properties.chef-20170525061506.760273 [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiconfig.properties.chef-20170515203437.872136 [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiconfig.properties.chef-20170515203837.770006 [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiconfig.properties.chef-20170516140802.582503 [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiconfig.properties.chef-20170517001516.603242 [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiconfig.properties.chef-20170525061506.695621 [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/logback.xml.chef-20170515203437.939967 [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/logback.xml.chef-20170515203837.834264 [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/logback.xml.chef-20170516140802.653662 [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/logback.xml.chef-20170517001516.659345 [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/logback.xml.chef-20170525061506.717614 [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/chef-client-running.pid [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-auth/files/default/aai_keystore-int [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-auth/files/default/aai_keystore-local [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-auth/files/default/aai_keystore-simpledemo [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-auth/files/default/aai_keystore-solo [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-auth/metadata.rb [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-auth/recipes/aai-keystore.rb [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/attributes/aaiWorkloadConsumer.properties.rb [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/attributes/aaiWorkloadPublisher.properties.rb [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/attributes/aaiWorkloadStatusPublisher.properties.rb [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/attributes/aaiconfig-properties.rb [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/attributes/logback.rb [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/attributes/preferredRoute.rb [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/metadata.rb [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/recipes/aai-config.rb [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/recipes/aai-logback.rb [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/recipes/aai-preferredRoute.rb [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/recipes/aaiWorkloadConsumer.rb [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/recipes/aaiWorkloadPublisher.rb [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/recipes/aaiWorkloadStatusPublisher.rb [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/recipes/createConfigDirectories.rb [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/templates/default/aai-app-config/aaiWorkloadConsumer.properties [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/templates/default/aai-app-config/aaiWorkloadPublisher.properties [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/templates/default/aai-app-config/aaiWorkloadStatusPublisher.properties [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/templates/default/aai-app-config/aft.properties [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/templates/default/aai-app-config/logback.erb [deleted file]
kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/solo.rb [changed mode: 0755->0644]
kubernetes/config/docker/init/src/config/aai/aai-data/environments/README.md [changed mode: 0755->0644]
kubernetes/config/docker/init/src/config/aai/aai-data/environments/simpledemo.json [changed mode: 0755->0644]
kubernetes/config/docker/init/src/config/aai/aai-data/environments/solo.json [changed mode: 0755->0644]
kubernetes/config/docker/init/src/config/aai/aai-resources/docker-entrypoint.sh [new file with mode: 0755]
kubernetes/config/docker/init/src/config/aai/aai-traversal/docker-entrypoint.sh [new file with mode: 0755]
kubernetes/config/docker/init/src/config/aai/data-router/appconfig/auth/client-cert-onap.p12 [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/data-router/appconfig/auth/data-router_policy.json [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/data-router/appconfig/auth/tomcat_keystore [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/data-router/appconfig/data-router.properties [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/data-router/appconfig/model/aai_oxm_v10.xml [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/data-router/appconfig/model/aai_oxm_v8.xml [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/data-router/appconfig/model/aai_oxm_v9.xml [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/data-router/dynamic/conf/entity-event-policy.xml [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/data-router/dynamic/routes/entity-event.route [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/elasticsearch/config/elasticsearch.yml [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/haproxy/haproxy.cfg [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/model-loader/appconfig/auth/aai-os-cert.p12 [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/model-loader/appconfig/model-loader.properties [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/search-data-service/appconfig/analysis-config.json [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/search-data-service/appconfig/auth/search_policy.json [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/search-data-service/appconfig/auth/tomcat_keystore [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/search-data-service/appconfig/elastic-search.properties [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/search-data-service/appconfig/filter-config.json [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/aai.properties [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/auth/aai-os-cert.p12 [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/auth/client-cert-onap.p12 [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/auth/inventory-ui-keystore [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/elasticsearch.properties [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/model/aai_oxm_v9.xml [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/portal/portal-authentication.properties [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/portal/portal.properties [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/roles.config [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/search-service.properties [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/suggestive-search.properties [new file with mode: 0644]
kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/synchronizer.properties [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/APPC-CL-0/00000000000000000000.index [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/APPC-CL-0/00000000000000000000.log [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/APPC-CL-1/00000000000000000000.index [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/APPC-CL-1/00000000000000000000.log [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/APPC-TEST1-0/00000000000000000000.index [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/APPC-TEST1-0/00000000000000000000.log [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/APPC-TEST2-0/00000000000000000000.index [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/APPC-TEST2-0/00000000000000000000.log [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/APPC-TEST2-1/00000000000000000000.index [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/APPC-TEST2-1/00000000000000000000.log [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/DCAE-CL-EVENT-0/00000000000000000000.index [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/DCAE-CL-EVENT-0/00000000000000000000.log [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/DCAE-CL-EVENT-1/00000000000000000000.index [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/DCAE-CL-EVENT-1/00000000000000000000.log [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-INBOX-0/00000000000000000000.index [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-INBOX-0/00000000000000000000.log [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-APP1-0/00000000000000000000.index [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-APP1-0/00000000000000000000.log [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-DBC1-0/00000000000000000000.index [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-DBC1-0/00000000000000000000.log [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-POL1-0/00000000000000000000.index [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-POL1-0/00000000000000000000.log [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-SDC1-0/00000000000000000000.index [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-SDC1-0/00000000000000000000.log [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-VID1-0/00000000000000000000.index [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-VID1-0/00000000000000000000.log [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/PDPD-CONFIGURATION-0/00000000000000000000.index [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/PDPD-CONFIGURATION-0/00000000000000000000.log [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/PDPD-CONFIGURATION-1/00000000000000000000.index [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/PDPD-CONFIGURATION-1/00000000000000000000.log [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/POLICY-CL-MGT-0/00000000000000000000.index [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/POLICY-CL-MGT-0/00000000000000000000.log [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/POLICY-CL-MGT-1/00000000000000000000.index [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/POLICY-CL-MGT-1/00000000000000000000.log [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/SDC-DISTR-NOTIF-TOPIC-SDC-OPENSOURCE-ENV1-0/00000000000000000000.index [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/SDC-DISTR-NOTIF-TOPIC-SDC-OPENSOURCE-ENV1-0/00000000000000000000.log [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/SDC-DISTR-STATUS-TOPIC-SDC-OPENSOURCE-ENV1-0/00000000000000000000.index [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/SDC-DISTR-STATUS-TOPIC-SDC-OPENSOURCE-ENV1-0/00000000000000000000.log [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/msgrtr.apinode.metrics.dmaap-0/00000000000000000000.index [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/msgrtr.apinode.metrics.dmaap-0/00000000000000000000.log [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/msgrtr.apinode.metrics.dmaap-1/00000000000000000000.index [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/msgrtr.apinode.metrics.dmaap-1/00000000000000000000.log [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/recovery-point-offset-checkpoint [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/replication-offset-checkpoint [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/unauthenticated.SEC_MEASUREMENT_OUTPUT-0/00000000000000000000.index [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/unauthenticated.SEC_MEASUREMENT_OUTPUT-0/00000000000000000000.log [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/unauthenticated.SEC_MEASUREMENT_OUTPUT-1/00000000000000000000.index [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/unauthenticated.SEC_MEASUREMENT_OUTPUT-1/00000000000000000000.log [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/unauthenticated.TCA_EVENT_OUTPUT-0/00000000000000000000.index [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/unauthenticated.TCA_EVENT_OUTPUT-0/00000000000000000000.log [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/unauthenticated.TCA_EVENT_OUTPUT-1/00000000000000000000.index [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/unauthenticated.TCA_EVENT_OUTPUT-1/00000000000000000000.log [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-zookeeper/version-2/log.1 [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-zookeeper/version-2/log.103 [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-zookeeper/version-2/log.125 [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/start-kafka.sh [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dmaap/MsgRtrApi.properties [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dmaap/cadi.properties [new file with mode: 0644]
kubernetes/config/docker/init/src/config/dcae/message-router/dmaap/mykey [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/aria_log.00000001 [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/aria_log_control [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/debian-10.0.flag [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/firstrun [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/ib_logfile0 [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/ib_logfile1 [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/ibdata1 [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/log/db.opt [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/multi-master.info [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/column_stats.MYD [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/column_stats.MYI [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/column_stats.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/columns_priv.MYD [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/columns_priv.MYI [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/columns_priv.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/db.MYD [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/db.MYI [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/db.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/event.MYD [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/event.MYI [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/event.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/func.MYD [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/func.MYI [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/func.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/general_log.CSM [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/general_log.CSV [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/general_log.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/gtid_slave_pos.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/gtid_slave_pos.ibd [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_category.MYD [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_category.MYI [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_category.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_keyword.MYD [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_keyword.MYI [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_keyword.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_relation.MYD [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_relation.MYI [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_relation.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_topic.MYD [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_topic.MYI [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_topic.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/host.MYD [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/host.MYI [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/host.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/index_stats.MYD [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/index_stats.MYI [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/index_stats.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/innodb_index_stats.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/innodb_index_stats.ibd [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/innodb_table_stats.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/innodb_table_stats.ibd [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/plugin.MYD [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/plugin.MYI [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/plugin.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/proc.MYD [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/proc.MYI [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/proc.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/procs_priv.MYD [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/procs_priv.MYI [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/procs_priv.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/proxies_priv.MYD [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/proxies_priv.MYI [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/proxies_priv.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/roles_mapping.MYD [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/roles_mapping.MYI [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/roles_mapping.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/servers.MYD [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/servers.MYI [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/servers.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/slow_log.CSM [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/slow_log.CSV [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/slow_log.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/table_stats.MYD [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/table_stats.MYI [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/table_stats.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/tables_priv.MYD [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/tables_priv.MYI [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/tables_priv.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone.MYD [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone.MYI [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone_leap_second.MYD [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone_leap_second.MYI [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone_leap_second.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone_name.MYD [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone_name.MYI [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone_name.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone_transition.MYD [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone_transition.MYI [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone_transition.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone_transition_type.MYD [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone_transition_type.MYI [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone_transition_type.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/user.MYD [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/user.MYI [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/user.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/accounts.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/cond_instances.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/db.opt [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_stages_current.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_stages_history.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_stages_history_long.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_stages_summary_by_account_by_event_name.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_stages_summary_by_host_by_event_name.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_stages_summary_by_thread_by_event_name.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_stages_summary_by_user_by_event_name.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_stages_summary_global_by_event_name.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_statements_current.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_statements_history.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_statements_history_long.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_statements_summary_by_account_by_event_name.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_statements_summary_by_digest.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_statements_summary_by_host_by_event_name.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_statements_summary_by_thread_by_event_name.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_statements_summary_by_user_by_event_name.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_statements_summary_global_by_event_name.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_waits_current.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_waits_history.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_waits_history_long.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_waits_summary_by_account_by_event_name.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_waits_summary_by_host_by_event_name.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_waits_summary_by_instance.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_waits_summary_by_thread_by_event_name.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_waits_summary_by_user_by_event_name.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_waits_summary_global_by_event_name.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/file_instances.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/file_summary_by_event_name.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/file_summary_by_instance.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/host_cache.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/hosts.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/mutex_instances.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/objects_summary_global_by_type.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/performance_timers.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/rwlock_instances.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/session_account_connect_attrs.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/session_connect_attrs.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/setup_actors.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/setup_consumers.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/setup_instruments.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/setup_objects.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/setup_timers.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/socket_instances.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/socket_summary_by_event_name.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/socket_summary_by_instance.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/table_io_waits_summary_by_index_usage.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/table_io_waits_summary_by_table.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/table_lock_waits_summary_by_table.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/threads.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/users.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/support/db.opt [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/support/db_version.frm [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/support/db_version.ibd [new file with mode: 0644]
kubernetes/config/docker/init/src/config/policy/mariadb/data/xacml/db.opt [new file with mode: 0644]
kubernetes/config/docker/init/src/config/sdc/jetty/keystore [deleted file]
kubernetes/message-router/templates/all-services.yaml
kubernetes/message-router/templates/message-router-kafka.yaml
kubernetes/message-router/templates/message-router-pv-pvc.yaml [new file with mode: 0644]
kubernetes/message-router/templates/message-router-zookeeper.yaml
kubernetes/message-router/values.yaml
kubernetes/msb/templates/all-services.yaml
kubernetes/msb/templates/msb-consul-deployment.yaml
kubernetes/msb/templates/msb-discovery-deployment.yaml
kubernetes/msb/templates/msb-eag-deployment.yaml
kubernetes/msb/templates/msb-iag-deployment.yaml
kubernetes/msb/values.yaml
kubernetes/mso/templates/all-services.yaml
kubernetes/mso/templates/db-deployment.yaml
kubernetes/mso/templates/mso-pv-pvc.yaml [new file with mode: 0644]
kubernetes/mso/values.yaml
kubernetes/oneclick/createAll.bash
kubernetes/oneclick/deleteAll.bash
kubernetes/oom/Chart.yaml [new file with mode: 0644]
kubernetes/oom/templates/oom-registrator-deployment.yaml [new file with mode: 0644]
kubernetes/oom/values.yaml [new file with mode: 0644]
kubernetes/policy/templates/all-services.yaml
kubernetes/policy/templates/dep-maria.yaml
kubernetes/policy/templates/policy-pv-pvc.yaml [new file with mode: 0644]
kubernetes/policy/values.yaml
kubernetes/portal/templates/all-services.yaml
kubernetes/portal/templates/portal-mariadb-deployment.yaml
kubernetes/portal/templates/portal-pv-pvc.yaml [new file with mode: 0644]
kubernetes/portal/templates/portal-vnc-dep.yaml
kubernetes/portal/values.yaml
kubernetes/robot/all-services.yaml
kubernetes/robot/templates/all-services.yaml
kubernetes/robot/values.yaml
kubernetes/sdc/templates/all-services.yaml
kubernetes/sdc/templates/sdc-be.yaml
kubernetes/sdc/templates/sdc-cs.yaml
kubernetes/sdc/templates/sdc-fe.yaml
kubernetes/sdc/templates/sdc-pv-pvc.yaml [new file with mode: 0644]
kubernetes/sdc/values.yaml
kubernetes/sdnc/templates/all-services.yaml
kubernetes/sdnc/templates/db-deployment.yaml
kubernetes/sdnc/templates/sdnc-pv-pvc.yaml [new file with mode: 0644]
kubernetes/sdnc/values.yaml
kubernetes/vid/templates/all-services.yaml
kubernetes/vid/templates/vid-mariadb-deployment.yaml
kubernetes/vid/templates/vid-pv-pvc.yaml [new file with mode: 0644]
kubernetes/vid/values.yaml
onap-blueprint.yaml

diff --git a/cloudify/scripts/onap/configure_docker_secret_workaround.py b/cloudify/scripts/onap/configure_docker_secret_workaround.py
new file mode 100644 (file)
index 0000000..6e9deff
--- /dev/null
@@ -0,0 +1,40 @@
+from fabric.api import run
+
+from cloudify import ctx
+from cloudify.exceptions import NonRecoverableError
+
+
+def _retrieve_namespace():
+    namespace = ctx.node.properties.get(
+        'namespace',
+        ctx.node.properties
+            .get('options', {})
+            .get('namespace', None)
+    )
+
+    if not namespace:
+        raise NonRecoverableError(
+            'Namespace is not defined (node={})'.format(ctx.node.name)
+        )
+
+    return namespace
+
+
+def configure_secret():
+    namespace = _retrieve_namespace()
+    ctx.logger.info(
+        'Configuring docker secrets for namespace: {0}'.format(namespace)
+    )
+
+    command = 'kubectl create secret ' \
+              'docker-registry onap-docker-registry-key ' \
+              '--docker-server=nexus3.onap.org:10001 ' \
+              '--docker-username=docker ' \
+              '--docker-password=docker ' \
+              '--docker-email=email@email.com ' \
+              '--namespace={0}'.format(namespace)
+
+    ctx.logger.info('Command "{0}" will be executed'.format(command))
+    run(command)
+
+    ctx.logger.info('Docker secrets configured successfully')
diff --git a/cloudify/scripts/onap/create_init_pod.py b/cloudify/scripts/onap/create_init_pod.py
new file mode 100644 (file)
index 0000000..c82172d
--- /dev/null
@@ -0,0 +1,65 @@
+import pip
+
+from cloudify import ctx
+from cloudify.exceptions import NonRecoverableError
+
+
+SERVICES_FILE_PARTS_SEPARATOR = '---'
+
+
+def _import_or_install():
+    try:
+        import yaml
+    except ImportError:
+        pip.main(["install", "pyaml"])
+
+    try:
+        import cloudify_kubernetes.tasks as kubernetes_plugin
+    except ImportError:
+        pip.main([
+            "install",
+            "https://github.com/cloudify-incubator/cloudify-kubernetes-plugin/archive/1.2.1rc1.zip"
+        ])
+
+    import yaml
+    import cloudify_kubernetes.tasks as kubernetes_plugin
+
+    return yaml, kubernetes_plugin
+
+
+def _retrieve_path():
+    return ctx.node.properties.get('init_pod', None)
+
+
+def _save_deployment_result(key):
+    result = ctx.instance.runtime_properties['kubernetes']
+    ctx.instance.runtime_properties[key] = result
+    ctx.instance.runtime_properties['kubernetes'] = {}
+
+
+def _do_create_init_pod(kubernetes_plugin, yaml):
+    ctx.logger.info('Creating init pod')
+    init_pod_file_path = _retrieve_path()
+
+    if not init_pod_file_path:
+        raise NonRecoverableError('Init pod file is not defined.')
+
+    temp_file_path = ctx.download_resource_and_render(
+        init_pod_file_path
+    )
+
+    with open(temp_file_path) as temp_file:
+        init_pod_file_content = temp_file.read()
+        init_pod_yaml_content = yaml.load(init_pod_file_content)
+
+        kubernetes_plugin.resource_create(definition=init_pod_yaml_content)
+        _save_deployment_result('init_pod')
+
+    ctx.logger.info('Init pod created successfully')
+
+
+if __name__ == '__main__':
+    yaml, kubernetes_plugin = _import_or_install()
+
+    _do_create_init_pod(kubernetes_plugin, yaml)
+
diff --git a/cloudify/scripts/onap/create_namespace.py b/cloudify/scripts/onap/create_namespace.py
new file mode 100644 (file)
index 0000000..c0f1f19
--- /dev/null
@@ -0,0 +1,101 @@
+import pip
+
+from cloudify import ctx
+from cloudify.exceptions import NonRecoverableError
+
+
+def _import_or_install():
+    try:
+        import yaml
+    except ImportError:
+        pip.main(["install", "pyaml"])
+
+    try:
+        import cloudify_kubernetes.tasks as kubernetes_plugin
+    except ImportError:
+        pip.main([
+            "install",
+            "https://github.com/cloudify-incubator/cloudify-kubernetes-plugin/archive/1.2.1rc1.zip"
+        ])
+
+    import yaml
+    import cloudify_kubernetes.tasks as kubernetes_plugin
+
+    return yaml, kubernetes_plugin
+
+
+def _retrieve_namespace():
+    namespace = ctx.node.properties.get(
+        'namespace',
+        ctx.node.properties
+            .get('options', {})
+            .get('namespace', None)
+    )
+
+    if not namespace:
+        raise NonRecoverableError(
+            'Namespace is not defined (node={})'.format(ctx.node.name)
+        )
+
+    return namespace
+
+
+def _prepare_namespace_resource_template(name):
+    return {
+        'definition': {
+            'apiVersion': 'v1',
+            'kind': 'Namespace',
+            'metadata': {
+                'name': name,
+                'labels': {
+                    'name': name
+                },
+            },
+        },
+        'api_mapping': {
+            'create': {
+                'api': 'CoreV1Api',
+                'method': 'create_namespace',
+                'payload': 'V1Namespace'
+            },
+            'read': {
+                'api': 'CoreV1Api',
+                'method': 'read_namespace',
+            },
+            'delete': {
+                'api': 'CoreV1Api',
+                'method': 'delete_namespace',
+                'payload': 'V1DeleteOptions'
+            }
+        }
+    }
+
+
+def _save_deployment_result(key):
+    result = ctx.instance.runtime_properties['kubernetes']
+    ctx.instance.runtime_properties[key] = result
+    ctx.instance.runtime_properties['kubernetes'] = {}
+
+
+def _do_create_namespace(kubernetes_plugin):
+    namespace = _retrieve_namespace()
+    ctx.logger.info('Creating namespace: {0}'.format(namespace))
+
+    namespace_resource_template = _prepare_namespace_resource_template(
+        namespace
+    )
+
+    ctx.logger.debug(
+        'Kubernetes object which will be deployed: {0}'
+            .format(namespace_resource_template)
+    )
+
+    kubernetes_plugin.custom_resource_create(**namespace_resource_template)
+    _save_deployment_result('namespace')
+    ctx.logger.info('Namespace created successfully')
+
+
+if __name__ == '__main__':
+    _, kubernetes_plugin = _import_or_install()
+
+    _do_create_namespace(kubernetes_plugin)
diff --git a/cloudify/scripts/onap/create_resources_services.py b/cloudify/scripts/onap/create_resources_services.py
new file mode 100644 (file)
index 0000000..8548e29
--- /dev/null
@@ -0,0 +1,131 @@
+import pip
+
+from cloudify import ctx
+
+
+SERVICES_FILE_PARTS_SEPARATOR = '---'
+
+
+def _import_or_install():
+    try:
+        import yaml
+    except ImportError:
+        pip.main(["install", "pyaml"])
+
+    try:
+        import cloudify_kubernetes.tasks as kubernetes_plugin
+    except ImportError:
+        pip.main([
+            "install",
+            "https://github.com/cloudify-incubator/cloudify-kubernetes-plugin/archive/1.2.1rc1.zip"
+        ])
+
+    try:
+        import jinja2
+    except ImportError:
+        pip.main(["install", "jinja2"])
+
+    import yaml
+    import jinja2
+    import cloudify_kubernetes.tasks as kubernetes_plugin
+
+    return yaml, kubernetes_plugin, jinja2
+
+
+def _init_jinja(jinja2):
+    return jinja2.Environment(
+        loader=jinja2.BaseLoader()
+    )
+
+
+def _render_template(jinja_env, template_content, values):
+    template_content = template_content.replace('.Values', 'Values')
+
+    template = jinja_env.from_string(template_content)
+    rendered_template = template.render(Values=values)
+    return rendered_template
+
+
+def _retrieve_resources_paths():
+    return ctx.node.properties.get('resources', [])
+
+
+def _retrieve_services_paths():
+    return ctx.node.properties.get('services', None)
+
+
+def _retrieve_values(yaml):
+    values_file_path = ctx.node.properties.get('values', None)
+
+    if values_file_path:
+        return yaml.load(ctx.get_resource(values_file_path))
+
+    ctx.logger.warn('Values file not found')
+
+
+def _save_deployment_result(key):
+    result = ctx.instance.runtime_properties['kubernetes']
+    ctx.instance.runtime_properties[key] = result
+    ctx.instance.runtime_properties['kubernetes'] = {}
+
+
+def _do_create_resources(kubernetes_plugin, yaml, jinja_env, values):
+    for path in _retrieve_resources_paths():
+        ctx.logger.info('Creating resource defined in: {0}'.format(path))
+
+        template_content = ctx.get_resource(path)
+        yaml_content = _render_template(
+            jinja_env,
+            template_content,
+            values
+        )
+        content = yaml.load(yaml_content)
+
+        kubernetes_plugin.resource_create(definition=content)
+        _save_deployment_result(
+            'resource_{0}'.format(content['metadata']['name'])
+        )
+
+    ctx.logger.info('Resources created successfully')
+
+
+def _do_create_services(kubernetes_plugin, yaml, jinja_env, values):
+    ctx.logger.info('Creating services')
+    services_file_path = _retrieve_services_paths()
+
+    if not services_file_path:
+        ctx.logger.warn(
+            'Service file is not defined. Skipping services provisioning !'
+        )
+
+        return
+
+    template_content = ctx.get_resource(services_file_path)
+    yaml_content = _render_template(
+        jinja_env,
+        template_content,
+        values
+    )
+
+    yaml_content_parts = \
+        yaml_content.split(SERVICES_FILE_PARTS_SEPARATOR)
+
+    for yaml_content_part in yaml_content_parts:
+        content = yaml.load(yaml_content_part)
+
+        kubernetes_plugin.resource_create(definition=content)
+        _save_deployment_result(
+            'service_{0}'.format(content['metadata']['name'])
+        )
+
+    ctx.logger.info('Services created successfully')
+
+
+if __name__ == '__main__':
+    yaml, kubernetes_plugin, jinja2 = _import_or_install()
+    jinja_env = _init_jinja(jinja2)
+    values = _retrieve_values(yaml)
+
+    _do_create_resources(kubernetes_plugin, yaml, jinja_env, values)
+    _do_create_services(kubernetes_plugin, yaml, jinja_env, values)
+
diff --git a/cloudify/scripts/onap/delete_init_pod.py b/cloudify/scripts/onap/delete_init_pod.py
new file mode 100644 (file)
index 0000000..1da805b
--- /dev/null
@@ -0,0 +1,64 @@
+import pip
+
+from cloudify import ctx
+from cloudify.exceptions import NonRecoverableError
+
+
+SERVICES_FILE_PARTS_SEPARATOR = '---'
+
+
+def _import_or_install():
+    try:
+        import yaml
+    except ImportError:
+        pip.main(["install", "pyaml"])
+
+    try:
+        import cloudify_kubernetes.tasks as kubernetes_plugin
+    except ImportError:
+        pip.main([
+            "install",
+            "https://github.com/cloudify-incubator/cloudify-kubernetes-plugin/archive/1.2.1rc1.zip"
+        ])
+
+    import yaml
+    import cloudify_kubernetes.tasks as kubernetes_plugin
+
+    return yaml, kubernetes_plugin
+
+
+def _retrieve_path():
+    return ctx.node.properties.get('init_pod', None)
+
+
+def _set_deployment_result(key):
+    result = ctx.instance.runtime_properties.pop(key)
+    ctx.instance.runtime_properties['kubernetes'] = result
+
+
+def _do_delete_init_pod(kubernetes_plugin, yaml):
+    ctx.logger.info('Deleting init pod')
+    init_pod_file_path = _retrieve_path()
+
+    if not init_pod_file_path:
+        raise NonRecoverableError('Init pod file is not defined.')
+
+    temp_file_path = ctx.download_resource_and_render(
+        init_pod_file_path
+    )
+
+    with open(temp_file_path) as temp_file:
+        init_pod_file_content = temp_file.read()
+        init_pod_yaml_content = yaml.load(init_pod_file_content)
+
+        _set_deployment_result('init_pod')
+        kubernetes_plugin.resource_delete(definition=init_pod_yaml_content)
+
+    ctx.logger.info('Init pod deleted successfully')
+
+
+if __name__ == '__main__':
+    yaml, kubernetes_plugin = _import_or_install()
+
+    _do_delete_init_pod(kubernetes_plugin, yaml)
+
diff --git a/cloudify/scripts/onap/delete_namespace.py b/cloudify/scripts/onap/delete_namespace.py
new file mode 100644 (file)
index 0000000..6973e59
--- /dev/null
@@ -0,0 +1,101 @@
+import pip
+
+from cloudify import ctx
+from cloudify.exceptions import NonRecoverableError
+
+
+def _import_or_install():
+    try:
+        import yaml
+    except ImportError:
+        pip.main(["install", "pyaml"])
+
+    try:
+        import cloudify_kubernetes.tasks as kubernetes_plugin
+    except ImportError:
+        pip.main([
+            "install",
+            "https://github.com/cloudify-incubator/cloudify-kubernetes-plugin/archive/1.2.1rc1.zip"
+        ])
+
+    import yaml
+    import cloudify_kubernetes.tasks as kubernetes_plugin
+
+    return yaml, kubernetes_plugin
+
+
+def _retrieve_namespace():
+    namespace = ctx.node.properties.get(
+        'namespace',
+        ctx.node.properties
+            .get('options', {})
+            .get('namespace', None)
+    )
+
+    if not namespace:
+        raise NonRecoverableError(
+            'Namespace is not defined (node={})'.format(ctx.node.name)
+        )
+
+    return namespace
+
+
+def _prepare_namespace_resource_template(name):
+    return {
+        'definition': {
+            'apiVersion': 'v1',
+            'kind': 'Namespace',
+            'metadata': {
+                'name': name,
+                'labels': {
+                    'name': name
+                },
+            },
+        },
+        'api_mapping': {
+            'create': {
+                'api': 'CoreV1Api',
+                'method': 'create_namespace',
+                'payload': 'V1Namespace'
+            },
+            'read': {
+                'api': 'CoreV1Api',
+                'method': 'read_namespace',
+            },
+            'delete': {
+                'api': 'CoreV1Api',
+                'method': 'delete_namespace',
+                'payload': 'V1DeleteOptions'
+            }
+        }
+    }
+
+
+def _set_deployment_result(key):
+    result = ctx.instance.runtime_properties.pop(key)
+    ctx.instance.runtime_properties['kubernetes'] = result
+
+
+def _do_delete_namespace(kubernetes_plugin):
+    namespace = _retrieve_namespace()
+    ctx.logger.info('Deleting namespace: {0}'.format(namespace))
+
+    namespace_resource_template = _prepare_namespace_resource_template(
+        namespace
+    )
+
+    ctx.logger.debug(
+        'Kubernetes object which will be deleted: {0}'
+            .format(namespace_resource_template)
+    )
+
+    _set_deployment_result('namespace')
+    kubernetes_plugin.custom_resource_delete(**namespace_resource_template)
+    ctx.logger.info('Namespace deleted successfully')
+
+
+if __name__ == '__main__':
+    _, kubernetes_plugin = _import_or_install()
+
+    _do_delete_namespace(kubernetes_plugin)
+
diff --git a/cloudify/scripts/onap/delete_resources_services.py b/cloudify/scripts/onap/delete_resources_services.py
new file mode 100644 (file)
index 0000000..305a748
--- /dev/null
@@ -0,0 +1,132 @@
+import pip
+
+from cloudify import ctx
+from cloudify.exceptions import NonRecoverableError
+
+
+SERVICES_FILE_PARTS_SEPARATOR = '---'
+
+
+def _import_or_install():
+    try:
+        import yaml
+    except ImportError:
+        pip.main(["install", "pyaml"])
+
+    try:
+        import cloudify_kubernetes.tasks as kubernetes_plugin
+    except ImportError:
+        pip.main([
+            "install",
+            "https://github.com/cloudify-incubator/cloudify-kubernetes-plugin/archive/1.2.1rc1.zip"
+        ])
+
+    try:
+        import jinja2
+    except ImportError:
+        pip.main(["install", "jinja2"])
+
+    import yaml
+    import jinja2
+    import cloudify_kubernetes.tasks as kubernetes_plugin
+
+    return yaml, kubernetes_plugin, jinja2
+
+
+def _init_jinja(jinja2):
+    return jinja2.Environment(
+        loader=jinja2.BaseLoader()
+    )
+
+
+def _render_template(jinja_env, template_content, values):
+    template_content = template_content.replace('.Values', 'Values')
+
+    template = jinja_env.from_string(template_content)
+    rendered_template = template.render(Values=values)
+    return rendered_template
+
+
+def _retrieve_resources_paths():
+    return ctx.node.properties.get('resources', [])
+
+
+def _retrieve_services_paths():
+    return ctx.node.properties.get('services', None)
+
+
+def _retrieve_values(yaml):
+    values_file_path = ctx.node.properties.get('values', None)
+
+    if values_file_path:
+        return yaml.load(ctx.get_resource(values_file_path))
+
+    ctx.logger.warn('Values file not found')
+
+
+def _set_deployment_result(key):
+    result = ctx.instance.runtime_properties.pop(key)
+    ctx.instance.runtime_properties['kubernetes'] = result
+
+
+def _do_delete_resources(kubernetes_plugin, yaml, jinja_env, values):
+    for path in _retrieve_resources_paths():
+        ctx.logger.info('Deleting resource defined in: {0}'.format(path))
+
+        template_content = ctx.get_resource(path)
+        yaml_content = _render_template(
+            jinja_env,
+            template_content,
+            values
+        )
+        content = yaml.load(yaml_content)
+
+        _set_deployment_result(
+            'resource_{0}'.format(content['metadata']['name'])
+        )
+        kubernetes_plugin.resource_delete(definition=content)
+
+    ctx.logger.info('Resources deleted successfully')
+
+
+def _do_delete_services(kubernetes_plugin, yaml, jinja_env, values):
+    ctx.logger.info('Deleting services')
+    services_file_path = _retrieve_services_paths()
+
+    if not services_file_path:
+        ctx.logger.warn(
+            'Service file is not defined. Skipping services provisioning !'
+        )
+
+        return
+
+    template_content = ctx.get_resource(services_file_path)
+    yaml_content = _render_template(
+        jinja_env,
+        template_content,
+        values
+    )
+
+    yaml_content_parts = \
+        yaml_content.split(SERVICES_FILE_PARTS_SEPARATOR)
+
+    for yaml_content_part in yaml_content_parts:
+        content = yaml.load(yaml_content_part)
+
+        _set_deployment_result(
+            'service_{0}'.format(content['metadata']['name'])
+        )
+        kubernetes_plugin.resource_delete(definition=content)
+
+    ctx.logger.info('Services deleted successfully')
+
+
+if __name__ == '__main__':
+    yaml, kubernetes_plugin, jinja2 = _import_or_install()
+    jinja_env = _init_jinja(jinja2)
+    values = _retrieve_values(yaml)
+
+    _do_delete_services(kubernetes_plugin, yaml, jinja_env, values)
+    _do_delete_resources(kubernetes_plugin, yaml, jinja_env, values)
+
+
diff --git a/cloudify/scripts/onap/patch_definitions.py b/cloudify/scripts/onap/patch_definitions.py
deleted file mode 100644 (file)
index d43e921..0000000
+++ /dev/null
@@ -1 +0,0 @@
-from cloudify import ctx
diff --git a/cloudify/scripts/onap/provision_definitions.py b/cloudify/scripts/onap/provision_definitions.py
deleted file mode 100644 (file)
index d43e921..0000000
+++ /dev/null
@@ -1 +0,0 @@
-from cloudify import ctx
diff --git a/cloudify/scripts/onap/read_definitions.py b/cloudify/scripts/onap/read_definitions.py
deleted file mode 100644 (file)
index d43e921..0000000
+++ /dev/null
@@ -1 +0,0 @@
-from cloudify import ctx
index 20ef33f..7e9b834 100644 (file)
@@ -1,4 +1,33 @@
 node_types:
+  cloudify.onap.kubernetes.Environment:
+    derived_from: cloudify.nodes.Root
+    properties:
+      namespace:
+        type: string
+      init_pod:
+        type: string
+        description: >
+          Path to init pod YAML file
+      options:
+        description: >
+          For compatibility with kubernetes plugin.
+          To be removed in the future.
+        default: {}
+    interfaces:
+      cloudify.interfaces.lifecycle:
+        create:
+          implementation: cloudify/scripts/onap/create_namespace.py
+          executor: central_deployment_agent
+        start:
+          implementation: cloudify/scripts/onap/create_init_pod.py
+          executor: central_deployment_agent
+        stop:
+          implementation: cloudify/scripts/onap/delete_init_pod.py
+          executor: central_deployment_agent
+        delete:
+          implementation: cloudify/scripts/onap/delete_namespace.py
+          executor: central_deployment_agent
+
   cloudify.onap.kubernetes.App:
     derived_from: cloudify.nodes.Root
     properties:
@@ -6,6 +35,11 @@ node_types:
         type: string
         description: >
           Name of ONAP app
+      values:
+        type: string
+        description: >
+          Paths (relative, blueprint prespective) to values.yaml file
+        required: false
       resources:
         description: >
           List of paths (relative, blueprint prespective)
@@ -21,14 +55,35 @@ node_types:
         description: >
           Parameters required to create kubernetes resources for each app
         default: {}
+      options:
+        description: >
+          For compatibility with kubernetes plugin.
+          To be removed in the future.
+        default: {}
     interfaces:
       cloudify.interfaces.lifecycle:
         create:
-          implementation: cloudify/scripts/onap/read_definitions.py
+          implementation: cloudify/scripts/onap/create_namespace.py
           executor: central_deployment_agent
         configure:
-          implementation: cloudify/scripts/onap/patch_definitions.py
+          implementation: fabric.fabric_plugin.tasks.run_task
           executor: central_deployment_agent
+          inputs:
+            tasks_file:
+              default: cloudify/scripts/onap/configure_docker_secret_workaround.py
+            task_name:
+              default: configure_secret
+            fabric_env:
+              default:
+                host_string: { get_secret: kubernetes_master_ip }
+                user: { get_secret: agent_user }
+                key: { get_secret: agent_key_private }
         start:
-          implementation: cloudify/scripts/onap/provision_definitions.py
+          implementation: cloudify/scripts/onap/create_resources_services.py
+          executor: central_deployment_agent
+        stop:
+          implementation: cloudify/scripts/onap/delete_resources_services.py
+          executor: central_deployment_agent
+        delete:
+          implementation: cloudify/scripts/onap/delete_namespace.py
           executor: central_deployment_agent
index 162fb99..9b55d4e 100644 (file)
@@ -13,58 +13,37 @@ spec:
         app: aai-service
       name: aai-service
       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": "aai-service-readiness"
-          }
-          ]'
+        pod.beta.kubernetes.io/init-containers: '[{
+            "args": [
+                "--container-name", "aai-resources",
+                "--container-name", "aai-traversal"
+            ],
+            "command": [
+                "/root/ready.py"
+            ],
+            "env": [{
+                "name": "NAMESPACE",
+                "valueFrom": {
+                    "fieldRef": {
+                        "apiVersion": "v1",
+                        "fieldPath": "metadata.namespace"
+                    }
+                }
+            }],
+            "image": "{{ .Values.image.readiness }}",
+            "imagePullPolicy": "{{ .Values.pullPolicy }}",
+            "name": "aai-service-readiness"
+          }]'
     spec:
       containers:
-      - env:
-        - name: AAI_REPO_PATH
-          value: r/aai
-        - name: AAI_CHEF_ENV
-          value: simpledemo
-        - name: AAI_CHEF_LOC
-          value: /var/chef/aai-data/environments
-        - name: docker_gitbranch
-          value: release-1.0.0
-        - name: DEBIAN_FRONTEND
-          value: noninteractive
-        - name: JAVA_HOME
-          value: /usr/lib/jvm/java-8-openjdk-amd64
-        image: {{ .Values.image.ajscAai }}
+      - name: aai-service
+        image: "{{ .Values.image.aaiProxy }}:{{ .Values.image.aaiProxyVersion}}"
         imagePullPolicy: {{ .Values.pullPolicy }}
-        name: aai-service
         volumeMounts:
-        - mountPath: /etc/ssl/certs/
-          name: aai-service-certs
-        - mountPath: /opt/aai/logroot/
-          name: aai-service-logroot
-        - mountPath: /var/chef/aai-config/
-          name: aai-config
-        - mountPath: /var/chef/aai-data/
-          name: aai-data
+        - mountPath: /dev/log
+          name: aai-service-log
+        - mountPath: /usr/local/etc/haproxy/haproxy.cfg
+          name: haproxy-cfg
         ports:
         - containerPort: 8080
         - containerPort: 8443
@@ -74,18 +53,12 @@ spec:
           initialDelaySeconds: 5
           periodSeconds: 10
       volumes:
-        - name: aai-service-certs
+        - name: aai-service-log
           hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aai/etc/ssl/certs/
-        - name: aai-service-logroot
+            path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/haproxy/log/"
+        - name: haproxy-cfg
           hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aai/opt/aai/logroot/
-        - name: aai-config
-          hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-config/
-        - name: aai-data
-          hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-data/
+            path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/haproxy/haproxy.cfg"
       restartPolicy: Always
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/aai/templates/aai-resources-deployment.yaml b/kubernetes/aai/templates/aai-resources-deployment.yaml
new file mode 100644 (file)
index 0000000..1aff10b
--- /dev/null
@@ -0,0 +1,83 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: aai-resources
+  namespace: "{{ .Values.nsPrefix }}-aai"
+spec:
+  selector:
+    matchLabels:
+      app: aai-resources
+  template:
+    metadata:
+      labels:
+        app: aai-resources
+      name: aai-resources
+      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": "aai-resources-readiness"
+          }
+        ]'      
+    spec:
+      containers:
+      - name: aai-resources
+        image: "{{ .Values.image.aaiResourcesImage }}:{{ .Values.image.aaiResourcesVersion}}"
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        env:
+        - name: CHEF_BRANCH
+          value: master
+        - name: AAI_CHEF_ENV
+          value: simpledemo
+        - name: AAI_CORE_VERSION
+          value: 1.1.0-SNAPSHOT
+        - name: AAI_CHEF_LOC
+          value: /var/chef/aai-data/environments
+        - name: CHEF_GIT_URL
+          value: http://gerrit.onap.org/r/aai
+        volumeMounts:
+        - mountPath: /opt/aai/logroot/
+          name: aai-resources-logs
+        - mountPath: /var/chef/aai-data/
+          name: aai-data
+        - mountPath: /docker-entrypoint.sh
+          name: entrypoint-override
+        ports:
+        - containerPort: 8447
+        readinessProbe:
+          tcpSocket:
+            port: 8447
+          initialDelaySeconds: 5
+          periodSeconds: 10
+      volumes:
+      - name: aai-resources-logs
+        hostPath:
+          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-resources/logs/"
+      - 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"
diff --git a/kubernetes/aai/templates/aai-traversal-deployment.yaml b/kubernetes/aai/templates/aai-traversal-deployment.yaml
new file mode 100644 (file)
index 0000000..debd1f6
--- /dev/null
@@ -0,0 +1,85 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: aai-traversal
+  namespace: "{{ .Values.nsPrefix }}-aai"
+spec:
+  selector:
+    matchLabels:
+      app: aai-traversal
+  template:
+    metadata:
+      labels:
+        app: aai-traversal
+      name: aai-traversal
+      annotations:
+        pod.beta.kubernetes.io/init-containers: '[
+          {
+              "args": [
+                  "--container-name",
+                  "hbase",
+                  "--container-name",
+                  "aai-resources"
+              ],
+              "command": [
+                  "/root/ready.py"
+              ],
+              "env": [
+                  {
+                      "name": "NAMESPACE",
+                      "valueFrom": {
+                          "fieldRef": {
+                              "apiVersion": "v1",
+                              "fieldPath": "metadata.namespace"
+                          }
+                      }
+                  }
+              ],
+              "image": "{{ .Values.image.readiness }}",
+              "imagePullPolicy": "{{ .Values.pullPolicy }}",
+              "name": "aai-traversal-readiness"
+          }
+        ]'      
+    spec:
+      containers:
+      - name: aai-traversal
+        image: "{{ .Values.image.aaiTraversalImage }}:{{ .Values.image.aaiTraversalVersion }}"
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        env:
+        - name: CHEF_BRANCH
+          value: master
+        - name: AAI_CHEF_ENV
+          value: simpledemo
+        - name: AAI_CORE_VERSION
+          value: 1.1.0-SNAPSHOT
+        - name: AAI_CHEF_LOC
+          value: /var/chef/aai-data/environments
+        - name: CHEF_GIT_URL
+          value: http://gerrit.onap.org/r/aai
+        volumeMounts:
+        - mountPath: /opt/aai/logroot/
+          name: aai-traversal-logs
+        - mountPath: /var/chef/aai-data/
+          name: aai-data
+        - mountPath: /docker-entrypoint.sh
+          name: entrypoint-override
+        ports:
+        - containerPort: 8446
+        readinessProbe:
+          tcpSocket:
+            port: 8446
+          initialDelaySeconds: 5
+          periodSeconds: 10
+      volumes:
+      - name: aai-traversal-logs
+        hostPath:
+          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-traversal/logs/"
+      - 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"
index 2c0fbc4..01e24e8 100644 (file)
@@ -7,8 +7,20 @@ metadata:
     app: hbase
 spec:
   ports:
-  - name: "hbase-port"
-    port: 8020
+  - name: "hbase-port-1"
+    port: 2181
+  - name: "hbase-port-2"
+    port: 8080
+  - name: "hbase-port-3"
+    port: 8085
+  - name: "hbase-port-4"
+    port: 9090
+  - name: "hbase-port-5"
+    port: 16000
+  - name: "hbase-port-6"
+    port: 16010
+  - name: "hbase-port-7"
+    port: 16201
   selector:
     app: hbase
   clusterIP: None
@@ -20,16 +32,133 @@ metadata:
   namespace: "{{ .Values.nsPrefix }}-aai"
   labels:
     app: aai-service
+  annotations:
+    msb.onap.org/service-info: '[
+      {
+          "serviceName": "aai-cloudInfrastructure",
+          "version": "v11",
+          "url": "/aai/v11/cloud-infrastructure",
+          "protocol": "REST",
+          "port": "8443",
+          "enable_ssl":"True",
+          "visualRange":"1"
+      },
+      {
+          "serviceName": "aai-cloudInfrastructure-deprecated",
+          "version": "v11",
+          "url": "/aai/v11/cloud-infrastructure",
+          "protocol": "REST",
+          "port": "8443",
+          "enable_ssl":"True",
+          "visualRange":"1",
+          "path":"/aai/v11/cloud-infrastructure"
+      },
+      {
+          "serviceName": "aai-business",
+          "version": "v11",
+          "url": "/aai/v11/business",
+          "protocol": "REST",
+          "port": "8443",
+          "enable_ssl":"True",
+          "visualRange":"1"
+      },
+      {
+          "serviceName": "aai-business-deprecated",
+          "version": "v11",
+          "url": "/aai/v11/business",
+          "protocol": "REST",
+          "port": "8443",
+          "enable_ssl":"True",
+          "visualRange":"1",
+          "path":"/aai/v11/business"
+      },
+      {
+          "serviceName": "aai-search",
+          "version": "v11",
+          "url": "/aai/v11/search",
+          "protocol": "REST",
+          "port": "8443",
+          "enable_ssl":"True",
+          "visualRange":"1"
+      },
+      {
+          "serviceName": "aai-search-deprecated",
+          "version": "v11",
+          "url": "/aai/v11/search",
+          "protocol": "REST",
+          "port": "8443",
+          "enable_ssl":"True",
+          "visualRange":"1",
+          "path":"/aai/v11/search"
+      },
+      {
+          "serviceName": "aai-actions",
+          "version": "v11",
+          "url": "/aai/v11/actions",
+          "protocol": "REST",
+          "port": "8443",
+          "enable_ssl":"True",
+          "visualRange":"1"
+      },
+      {
+          "serviceName": "aai-actions-deprecated",
+          "version": "v11",
+          "url": "/aai/v11/actions",
+          "protocol": "REST",
+          "port": "8443",
+          "enable_ssl":"True",
+          "visualRange":"1",
+          "path":"/aai/v11/actions"
+      },
+      {
+          "serviceName": "aai-service-design-and-creation",
+          "version": "v11",
+          "url": "/aai/v11/service-design-and-creation",
+          "protocol": "REST",
+          "port": "8443",
+          "enable_ssl":"True",
+          "visualRange":"1"
+      },
+      {
+          "serviceName": "aai-service-design-and-creation-deprecated",
+          "version": "v11",
+          "url": "/aai/v11/service-design-and-creation",
+          "protocol": "REST",
+          "port": "8443",
+          "enable_ssl":"True",
+          "visualRange":"1",
+          "path":"/aai/v11/service-design-and-creation"
+      },
+      {
+          "serviceName": "aai-network",
+          "version": "v11",
+          "url": "/aai/v11/network",
+          "protocol": "REST",
+          "port": "8443",
+          "enable_ssl":"True",
+          "visualRange":"1"
+      },
+      {
+          "serviceName": "aai-network-deprecated",
+          "version": "v11",
+          "url": "/aai/v11/network",
+          "protocol": "REST",
+          "port": "8443",
+          "enable_ssl":"True",
+          "visualRange":"1",
+          "path":"/aai/v11/network"
+      }
+      ]'
 spec:
   ports:
   - name: "aai-service-port-8443"
     port: 8443
     targetPort: 8443
-    nodePort: 30233
+    nodePort: {{ .Values.nodePortPrefix }}33
   - name: "aai-service-port-8080"
     port: 8080
     targetPort: 8080
-    nodePort: 30232
+    nodePort: {{ .Values.nodePortPrefix }}32
   type: NodePort
   selector:
     app: aai-service
@@ -45,10 +174,104 @@ spec:
   ports:
   - name: "model-loader-service-port-8443"
     port: 8443
-    nodePort: 30229
+    nodePort: {{ .Values.nodePortPrefix }}29
   - name: "model-loader-service-port-8080"
     port: 8080
-    nodePort: 30210
+    nodePort: {{ .Values.nodePortPrefix }}10
   type: NodePort
   selector:
     app: model-loader-service
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: gremlin
+  namespace: "{{ .Values.nsPrefix }}-aai"
+  labels:
+    app: gremlin
+spec:
+  ports:
+  - name: "gremlin-port"
+    port: 8182
+  selector:
+    app: gremlin
+  clusterIP: None
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: elasticsearch
+  namespace: "{{ .Values.nsPrefix }}-aai"
+  labels:
+    app: elasticsearch
+spec:
+  ports:
+  - name: "elasticsearch-port"
+    port: 9200
+  selector:
+    app: elasticsearch
+  clusterIP: None
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: search-data-service
+  namespace: "{{ .Values.nsPrefix }}-aai"
+  labels:
+    app: search-data-service
+spec:
+  ports:
+  - name: "search-data-service-port-9509"
+    port: 9509
+  selector:
+    app: search-data-service
+  clusterIP: None
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: aai-traversal
+  namespace: "{{ .Values.nsPrefix }}-aai"
+  labels:
+    app: aai-traversal
+spec:
+  ports:
+  - name: "aai-traversal-port-8446"
+    port: 8446
+  - name: aai-traversal-port-debug
+    port: 5005
+  selector:
+    app: aai-traversal
+  clusterIP: None
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: aai-resources
+  namespace: "{{ .Values.nsPrefix }}-aai"
+  labels:
+    app: aai-resources
+spec:
+  ports:
+  - name: "aai-resources-port-8447"
+    port: 8447
+  - name: aai-resources-port-debug
+    port: 5005
+  selector:
+    app: aai-resources
+  clusterIP: None
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: sparky-be
+  namespace: "{{ .Values.nsPrefix }}-aai"
+  labels:
+    app: sparky-be
+spec:
+  ports:
+  - name: "sparky-be-port-9517"
+    port: 9517
+  selector:
+    app: sparky-be
+  clusterIP: None  
\ No newline at end of file
diff --git a/kubernetes/aai/templates/data-router-deployment.yaml b/kubernetes/aai/templates/data-router-deployment.yaml
new file mode 100644 (file)
index 0000000..f823061
--- /dev/null
@@ -0,0 +1,61 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: data-router
+  namespace: "{{ .Values.nsPrefix }}-aai"
+spec:
+  selector:
+    matchLabels:
+      app: data-router
+  template:
+    metadata:
+      labels:
+        app: data-router
+      name: data-router
+    spec:
+      containers:
+      - name: data-router
+        image: "{{ .Values.image.dataRouterImage }}:{{ .Values.image.dataRouterVersion }}"
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        env:
+        - name: SERVICE_BEANS
+          value: /opt/app/data-router/dynamic/conf
+        - name: CONFIG_HOME
+          value: /opt/app/data-router/config/
+        - name: KEY_STORE_PASSWORD
+          value: OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
+        - name: DYNAMIC_ROUTES
+          value: /opt/app/data-router/dynamic/routes
+        - name: KEY_MANAGER_PASSWORD
+          value: OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
+        - name: PATH
+          value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+        - name: JAVA_HOME
+          value: usr/lib/jvm/java-8-openjdk-amd64
+        volumeMounts:
+        - mountPath: /opt/app/data-router/config/
+          name: data-router-config
+        - mountPath: /opt/app/data-router/dynamic/
+          name: data-router-dynamic
+        - mountPath: /logs/
+          name: data-router-logs
+        ports:
+        - containerPort: 9502
+        readinessProbe:
+          tcpSocket:
+            port: 9502
+          initialDelaySeconds: 5
+          periodSeconds: 10
+      volumes:
+      - name: data-router-config
+        hostPath:
+          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/data-router/appconfig/"
+      - name: data-router-dynamic
+        hostPath:
+          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/data-router/dynamic/"
+      - name: data-router-logs
+        hostPath:
+          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/data-router/logs/"
+      restartPolicy: Always
+      imagePullSecrets:
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/aai/templates/elasticsearch-deployment.yaml b/kubernetes/aai/templates/elasticsearch-deployment.yaml
new file mode 100644 (file)
index 0000000..1c2a2ad
--- /dev/null
@@ -0,0 +1,41 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: elasticsearch
+  namespace: "{{ .Values.nsPrefix }}-aai"
+spec:
+  selector:
+    matchLabels:
+      app: elasticsearch
+  template:
+    metadata:
+      labels:
+        app: elasticsearch
+      name: elasticsearch
+    spec:
+      hostname: elasticsearch
+      containers:
+      - name: elasticsearch
+        image: "{{ .Values.image.elasticsearchImage }}:{{ .Values.image.elasticsearchVersion }}"
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        ports:
+        - containerPort: 9200
+        readinessProbe:
+          tcpSocket:
+            port: 9200
+          initialDelaySeconds: 5
+          periodSeconds: 10
+        volumeMounts:
+        - name: elasticsearch-config
+          mountPath: /usr/share/elasticsearch/config/elasticsearch.yml
+        - name: elasticsearch-data
+          mountPath: /usr/share/elasticsearch/data
+      volumes:
+      - name: elasticsearch-config
+        hostPath:
+          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/elasticsearch/config/elasticsearch.yml"
+      - name: elasticsearch-data
+        hostPath:
+          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/elasticsearch/es-data"
+      imagePullSecrets:
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/aai/templates/gremlin-deployment.yaml b/kubernetes/aai/templates/gremlin-deployment.yaml
new file mode 100644 (file)
index 0000000..d28b286
--- /dev/null
@@ -0,0 +1,62 @@
+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
+      imagePullSecrets:
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
index 79983eb..98c3882 100644 (file)
@@ -16,13 +16,19 @@ spec:
       hostname: hbase
       containers:
       - name: hbase
-        image: {{ .Values.image.aaiHbase }}
+        image: "{{ .Values.image.aaiHbaseImage }}:{{ .Values.image.aaiHbaseVersion }}"
         imagePullPolicy: {{ .Values.pullPolicy }}
         ports:
-        - containerPort: 8020
+        - containerPort: 2181
+        - containerPort: 8080
+        - containerPort: 8085
+        - containerPort: 9090
+        - containerPort: 16000
+        - containerPort: 16010
+        - containerPort: 16201
         readinessProbe:
           tcpSocket:
-            port: 8020
+            port: 2181
           initialDelaySeconds: 5
           periodSeconds: 10
       imagePullSecrets:
index f7d855b..5391273 100644 (file)
@@ -12,88 +12,29 @@ spec:
       labels:
         app: model-loader-service
       name: model-loader-service
-      annotations:
-        pod.beta.kubernetes.io/init-containers: '[
-          {
-              "args": [
-                  "--container-name",
-                  "aai-service"
-              ],
-              "command": [
-                  "/root/ready.py"
-              ],
-              "env": [
-                  {
-                      "name": "NAMESPACE",
-                      "valueFrom": {
-                          "fieldRef": {
-                              "apiVersion": "v1",
-                              "fieldPath": "metadata.namespace"
-                          }
-                      }
-                  }
-              ],
-              "image": "{{ .Values.image.readiness }}",
-              "imagePullPolicy": "{{ .Values.pullPolicy }}",
-              "name": "model-loader-readiness"
-          },
-          {
-              "args": [
-                  "--container-name",
-                  "sdc-es",
-                  "--container-name",
-                  "sdc-cs",
-                  "--container-name",
-                  "sdc-kb",
-                  "--container-name",
-                  "sdc-be",
-                  "--container-name",
-                  "sdc-fe"
-              ],
-              "command": [
-                  "/root/ready.py"
-              ],
-              "env": [
-                  {
-                      "name": "NAMESPACE",
-                      "value": "{{ .Values.nsPrefix }}-sdc"
-                  }
-              ],
-              "image": "{{ .Values.image.readiness }}",
-              "imagePullPolicy": "{{ .Values.pullPolicy }}",
-              "name": "model-loader-sdc-readiness"
-          }
-          ]'
     spec:
       containers:
       - env:
-        - name: DISTR_CLIENT_ASDC_ADDRESS
-          value: sdc-be.{{ .Values.nsPrefix }}-sdc:8443
-        - name: DISTR_CLIENT_ENVIRONMENT_NAME
-          value: AUTO
-        - name: DISTR_CLIENT_USER
-          value: aai
-        - name: DISTR_CLIENT_PASSWORD
-          value: OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go21hnj1y0k1mli1sop1k8o1j651vu91mxw1vun1mze1vv11j8x1k5i1sp11mjc1y161hlr1gm41m111nkj1z781pw31kku1r4p1e391r571pbm1o741l4x1ksp
-        - name: APP_SERVER_BASE_URL
-          value: https://aai-service.{{ .Values.nsPrefix }}-aai:8443
-        - name: APP_SERVER_KEYSTORE_PASSWORD
-          value: OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o
-        - name: APP_SERVER_AUTH_USER
-          value: ModelLoader
-        - name: APP_SERVER_AUTH_PASSWORD
-          value: OBF:1qvu1v2h1sov1sar1wfw1j7j1wg21saj1sov1v1x1qxw
-        image: {{ .Values.image.modelLoader }}
+        - name: CONFIG_HOME
+          value: /opt/app/model-loader/config/
+        volumeMounts:
+        - mountPath: /opt/app/model-loader/config/
+          name: aai-model-loader-config
+        - mountPath: /logs/
+          name: aai-model-loader-logs
+        image: "{{ .Values.image.modelLoaderImage }}:{{ .Values.image.modelLoaderVersion }}"
         imagePullPolicy: {{ .Values.pullPolicy }}
         name: model-loader-service
         ports:
         - containerPort: 8080
         - containerPort: 8443
-        readinessProbe:
-          tcpSocket:
-            port: 8080
-          initialDelaySeconds: 5
-          periodSeconds: 10
+      volumes:
+      - name: aai-model-loader-config
+        hostPath:
+          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/model-loader/appconfig/"
+      - name: aai-model-loader-logs
+        hostPath:
+          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/model-loader/logs/"
       restartPolicy: Always
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/aai/templates/search-data-service-deployment.yaml b/kubernetes/aai/templates/search-data-service-deployment.yaml
new file mode 100644 (file)
index 0000000..f2db937
--- /dev/null
@@ -0,0 +1,48 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: search-data-service
+  namespace: "{{ .Values.nsPrefix }}-aai"
+spec:
+  selector:
+    matchLabels:
+      app: search-data-service
+  template:
+    metadata:
+      labels:
+        app: search-data-service
+      name: search-data-service
+    spec:
+      containers:
+      - name: search-data-service
+        image: "{{ .Values.image.searchDataImage }}:{{ .Values.image.searchDataVersion }}"
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        env:
+        - name: CONFIG_HOME
+          value: /opt/app/search-data-service/config/
+        - name: KEY_STORE_PASSWORD
+          value: OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
+        - name: KEY_MANAGER_PASSWORD
+          value: OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
+        volumeMounts:
+        - mountPath: /opt/app/search-data-service/config/
+          name: aai-search-data-service-config
+        - mountPath: /logs/
+          name: aai-search-data-service-logs
+        ports:
+        - containerPort: 9509
+        readinessProbe:
+          tcpSocket:
+            port: 9509
+          initialDelaySeconds: 5
+          periodSeconds: 10
+      volumes:
+      - name: aai-search-data-service-config
+        hostPath:
+          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/search-data-service/appconfig/"
+      - name: aai-search-data-service-logs
+        hostPath:
+          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/search-data-service/logs/"
+      restartPolicy: Always
+      imagePullSecrets:
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/aai/templates/sparky-be-deployment.yaml b/kubernetes/aai/templates/sparky-be-deployment.yaml
new file mode 100644 (file)
index 0000000..6a8ff93
--- /dev/null
@@ -0,0 +1,48 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: sparky-be
+  namespace: "{{ .Values.nsPrefix }}-aai"
+spec:
+  selector:
+    matchLabels:
+      app: sparky-be
+  template:
+    metadata:
+      labels:
+        app: sparky-be
+      name: sparky-be
+    spec:
+      containers:
+      - name: sparky-be
+        image: "{{ .Values.image.sparkyBeImage }}:{{ .Values.image.sparkyBeVersion }}"
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        env:
+        - name: CONFIG_HOME
+          value: /opt/app/sparky/config/
+        - name: KEY_MANAGER_PASSWORD
+          value: OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o
+        - name: KEY_STORE_PASSWORD
+          value: OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o
+        volumeMounts:
+        - mountPath: /opt/app/sparky/config/
+          name: aai-sparky-be-config
+        - mountPath: /logs/
+          name: aai-sparky-be-logs
+        ports:
+        - containerPort: 9517
+        readinessProbe:
+          tcpSocket:
+            port: 9517
+          initialDelaySeconds: 5
+          periodSeconds: 10
+      volumes:
+      - name: aai-sparky-be-config
+        hostPath:
+          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/sparky-be/appconfig/"
+      - name: aai-sparky-be-logs
+        hostPath:
+          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/sparky-be/logs/"
+      restartPolicy: Always
+      imagePullSecrets:
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
index 3c6894c..1504b40 100644 (file)
@@ -1,7 +1,24 @@
 nsPrefix: onap
 pullPolicy: Always
+nodePortPrefix: 302
 image:
   readiness: oomk8s/readiness-check:1.0.0
-  ajscAai: nexus3.onap.org:10001/openecomp/ajsc-aai:1.0-STAGING-latest
-  aaiHbase: aaidocker/aai-hbase-1.2.3:latest
-  modelLoader: nexus3.onap.org:10001/openecomp/model-loader:1.0-STAGING-latest
+  aaiProxy: aaionap/haproxy
+  aaiProxyVersion: latest
+  aaiHbaseImage: harisekhon/hbase
+  aaiHbaseVersion: latest
+  modelLoaderImage: nexus3.onap.org:10001/openecomp/model-loader
+  modelLoaderVersion: 1.1-STAGING-latest
+  aaiResourcesImage: nexus3.onap.org:10001/openecomp/aai-resources
+  aaiResourcesVersion: 1.1-STAGING-latest
+  aaiTraversalImage: nexus3.onap.org:10001/openecomp/aai-traversal
+  aaiTraversalVersion: 1.1-STAGING-latest
+  dataRouterImage: nexus3.onap.org:10001/openecomp/data-router
+  dataRouterVersion: 1.1-STAGING-latest
+  elasticsearchImage: elasticsearch
+  elasticsearchVersion: 2.4.1
+  searchDataImage: nexus3.onap.org:10001/openecomp/search-data-service
+  searchDataVersion: 1.1-STAGING-latest
+  sparkyBeImage: nexus3.onap.org:10001/openecomp/sparky-be
+  sparkyBeVersion: 1.1-STAGING-latest
+  gremlinServerImage: aaionap/gremlin-server
index 9547231..5c42d72 100644 (file)
@@ -53,10 +53,10 @@ spec:
   - name: "appc-port-8282"
     port: 8282
     targetPort: 8181
-    nodePort: 30230
+    nodePort: {{ .Values.nodePortPrefix }}30
   - name: "appc-port-1830"
     port: 1830
-    nodePort: 30231
+    nodePort: {{ .Values.nodePortPrefix }}31
   type: NodePort
   selector:
     app: appc
@@ -73,7 +73,7 @@ spec:
   - name: "appc-dgbuilder-port"
     port: 3000
     targetPort: 3100
-    nodePort: 30228
+    nodePort: {{ .Values.nodePortPrefix }}28
   type: NodePort
   selector:
     app: appc-dgbuilder
diff --git a/kubernetes/appc/templates/appc-pv-pvc.yaml b/kubernetes/appc/templates/appc-pv-pvc.yaml
new file mode 100644 (file)
index 0000000..51392f7
--- /dev/null
@@ -0,0 +1,30 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: appc-db
+  namespace: "{{ .Values.nsPrefix }}-appc"
+  labels:
+    name: appc-db
+spec:
+  capacity:
+    storage: 2Gi
+  accessModes:
+    - ReadWriteMany
+  persistentVolumeReclaimPolicy: Retain
+  hostPath:
+    path: /dockerdata-nfs/{{ .Values.nsPrefix }}/appc/data
+---
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: appc-db
+  namespace: "{{ .Values.nsPrefix }}-appc"
+spec:
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: 2Gi
+  selector:
+    matchLabels:
+      name: appc-db
index 239d76f..542f8f4 100644 (file)
@@ -34,7 +34,7 @@ spec:
       restartPolicy: Always
       volumes:
       - name: appc-data
-        hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/appc/data
+        persistentVolumeClaim:
+          claimName: appc-db
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
index 74b189f..7916b73 100644 (file)
@@ -1,5 +1,6 @@
 nsPrefix: onap
 pullPolicy: Always
+nodePortPrefix: 302
 image:
   readiness: oomk8s/readiness-check:1.0.0
   appc: nexus3.onap.org:10001/openecomp/appc-image:1.1-STAGING-latest
index 9f6a363..a1eb021 100644 (file)
@@ -1,7 +1,6 @@
 from ubuntu:16.04
 
 RUN mkdir -p /opt/config/src/
-VOLUME /config-init/
 
 COPY onap-cfg.tar.gz /tmp/
 RUN tar -zxvf /tmp/onap-cfg.tar.gz -C /opt/config/src/
index 5597527..15b4181 100755 (executable)
@@ -20,12 +20,31 @@ mkdir -p /config-init/$NAMESPACE/sdc/logs/ASDC/ASDC-KB/
 mkdir -p /config-init/$NAMESPACE/sdc/logs/ASDC/ASDC-BE/
 mkdir -p /config-init/$NAMESPACE/sdc/logs/ASDC/ASDC-FE/
 mkdir -p /config-init/$NAMESPACE/aai/opt/aai/logroot/
+mkdir -p /config-init/$NAMESPACE/aai/model-loader/logs/
+mkdir -p /config-init/$NAMESPACE/aai/haproxy/log/
+mkdir -p /config-init/$NAMESPACE/aai/aai-traversal/logs/
+mkdir -p /config-init/$NAMESPACE/aai/aai-resources/logs/
+mkdir -p /config-init/$NAMESPACE/aai/sparky-be/logs/
+mkdir -p /config-init/$NAMESPACE/aai/elasticsearch/es-data/
+mkdir -p /config-init/$NAMESPACE/aai/search-data-service/logs/
+mkdir -p /config-init/$NAMESPACE/aai/data-router/logs/
+mkdir -p /config-init/$NAMESPACE/mso/mariadb/data
 
 chmod -R 777 /config-init/$NAMESPACE/sdc/logs/
 chmod -R 777 /config-init/$NAMESPACE/portal/logs/
 chmod -R 777 /config-init/$NAMESPACE/aai/aai-config/
 chmod -R 777 /config-init/$NAMESPACE/aai/aai-data/
 chmod -R 777 /config-init/$NAMESPACE/aai/opt/aai/logroot/
+chmod -R 777 /config-init/$NAMESPACE/aai/model-loader/logs/
+chmod -R 777 /config-init/$NAMESPACE/aai/haproxy/log/
+chmod -R 777 /config-init/$NAMESPACE/aai/aai-traversal/logs/
+chmod -R 777 /config-init/$NAMESPACE/aai/aai-resources/logs/
+chmod -R 777 /config-init/$NAMESPACE/aai/sparky-be/logs/
+chmod -R 777 /config-init/$NAMESPACE/aai/elasticsearch/es-data/
+chmod -R 777 /config-init/$NAMESPACE/aai/search-data-service/logs/
+chmod -R 777 /config-init/$NAMESPACE/aai/data-router/logs/
+chmod -R 777 /config-init/$NAMESPACE/policy/mariadb/
+
 
 # replace the default 'onap' namespace qualification of K8s hostnames within the config files
-find /config-init/$NAMESPACE/ -type f -exec sed -i -e "s/onap-/$NAMESPACE-/g" {} \;
+find /config-init/$NAMESPACE/ -type f -exec sed -i -e "s/\.onap-/\.$NAMESPACE-/g" {} \;
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/README.md b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/README.md
deleted file mode 100755 (executable)
index c7ec3b0..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-This directory contains the cookbooks used to configure systems in your infrastructure with Chef.
-
-Knife needs to be configured to know where the cookbooks are located with the `cookbook_path` setting. If this is not set, then several cookbook operations will fail to work properly.
-
-    cookbook_path ["./cookbooks"]
-
-This setting tells knife to look for the cookbooks directory in the present working directory. This means the knife cookbook subcommands need to be run in the `chef-repo` directory itself. To make sure that the cookbooks can be found elsewhere inside the repository, use an absolute path. This is a Ruby file, so something like the following can be used:
-
-    current_dir = File.dirname(__FILE__)
-    cookbook_path ["#{current_dir}/../cookbooks"]
-
-Which will set `current_dir` to the location of the knife.rb file itself (e.g. `~/chef-repo/.chef/knife.rb`).
-
-Configure knife to use your preferred copyright holder, email contact and license. Add the following lines to `.chef/knife.rb`.
-
-    cookbook_copyright "Example, Com."
-    cookbook_email     "cookbooks@example.com"
-    cookbook_license   "apachev2"
-
-Supported values for `cookbook_license` are "apachev2", "mit","gplv2","gplv3",  or "none". These settings are used to prefill comments in the default recipe, and the corresponding values in the metadata.rb. You are free to change the the comments in those files.
-
-Create new cookbooks in this directory with Knife.
-
-    knife cookbook create COOKBOOK
-
-This will create all the cookbook directory components. You don't need to use them all, and can delete the ones you don't need. It also creates a README file, metadata.rb and default recipe.
-
-You can also download cookbooks directly from the Opscode Cookbook Site. There are two subcommands to help with this depending on what your preference is.
-
-The first and recommended method is to use a vendor branch if you're using Git. This is automatically handled with Knife.
-
-    knife cookbook site install COOKBOOK
-
-This will:
-
-* Download the cookbook tarball from the Chef Supermarket.
-* Ensure its on the git master branch.
-* Checks for an existing vendor branch, and creates if it doesn't.
-* Checks out the vendor branch (chef-vendor-COOKBOOK).
-* Removes the existing (old) version.
-* Untars the cookbook tarball it downloaded in the first step.
-* Adds the cookbook files to the git index and commits.
-* Creates a tag for the version downloaded.
-* Checks out the master branch again.
-* Merges the cookbook into master.
-* Repeats the above for all the cookbooks dependencies, downloading them from the community site
-
-The last step will ensure that any local changes or modifications you have made to the cookbook are preserved, so you can keep your changes through upstream updates.
-
-If you're not using Git, use the site download subcommand to download the tarball.
-
-    knife cookbook site download COOKBOOK
-
-This creates the COOKBOOK.tar.gz from in the current directory (e.g., `~/chef-repo`). We recommend following a workflow similar to the above for your version control tool.
@@ -1,11 +1,11 @@
 ajsc-aai-auth CHANGELOG
 =======================
 
-This file is used to list changes made in each version of the ajsc-aai-auth cookbook.
+This file is used to list changes made in each version of the aai-resources-auth cookbook.
 
 0.1.0
 -----
-- [your_name] - Initial release of ajsc-aai-auth
+- [your_name] - Initial release of aai-resources-auth
 
 - - -
 Check the [Markdown Syntax Guide](http://daringfireball.net/projects/markdown/syntax) for help with Markdown.
@@ -1,4 +1,4 @@
-ajsc-aai-auth Cookbook
+aai-resources-auth Cookbook
 ======================
 TODO: Enter the cookbook description here.
 
@@ -36,11 +36,11 @@ e.g.
 
 Usage
 -----
-#### ajsc-aai-auth::default
+#### aai-resources-auth::default
 TODO: Write usage instructions for each cookbook.
 
 e.g.
-Just include `ajsc-aai-auth` in your node's `run_list`:
+Just include `aai-resources-auth` in your node's `run_list`:
 
 ```json
 {
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-auth/metadata.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-auth/metadata.rb
new file mode 100644 (file)
index 0000000..6b940b8
--- /dev/null
@@ -0,0 +1,7 @@
+name             'aai-resources-auth'
+maintainer       'ATT'
+maintainer_email ''
+license          'All rights reserved'
+description      'Installs/Configures aai-resources-auth'
+long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+version          '1.0.0'
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-auth/recipes/aai-resources-aai-keystore.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-auth/recipes/aai-resources-aai-keystore.rb
new file mode 100644 (file)
index 0000000..3c55162
--- /dev/null
@@ -0,0 +1,8 @@
+cookbook_file "#{node['aai-resources-config']['PROJECT_HOME']}/bundleconfig/etc/auth/aai_keystore" do
+  source "aai_keystore-#{node['aai-resources-config']['AAIENV']}"
+  owner 'aaiadmin'
+  group 'aaiadmin'
+  mode '0755'
+  action :create
+end
+
@@ -1,4 +1,4 @@
-ajsc-aai-config Cookbook
+aai-resources-config Cookbook
 ========================
 TODO: Enter the cookbook description here.
 
@@ -11,7 +11,7 @@ TODO: List your cookbook requirements. Be sure to include any requirements this
 
 e.g.
 #### packages
-- `toaster` - ajsc-aai-config needs toaster to brown your bagel.
+- `toaster` - aai-resources-config needs toaster to brown your bagel.
 
 Attributes
 ----------
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/attributes/aai-resources-config.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/attributes/aai-resources-config.rb
new file mode 100644 (file)
index 0000000..9d000ae
--- /dev/null
@@ -0,0 +1,15 @@
+node.default["aai-resources-config"]["AAIENV"] = 'devINT1'
+node.default["aai-resources-config"]["PROJECT_HOME"] = '/opt/app/aai-resources'
+node.default["aai-resources-config"]["LOGROOT"] = '/opt/aai/logroot'
+node.default["aai-resources-config"]["JAVA_HOME"] = '/usr/lib/jvm/java-8-openjdk-amd64'
+node.default["aai-resources-config"]["AAI_SERVER_URL_BASE"] = 'https://localhost:8443/aai/'
+node.default["aai-resources-config"]["AAI_SERVER_URL"] = 'https://localhost:8443/aai/v11/'
+node.default["aai-resources-config"]["AAI_GLOBAL_CALLBACK_URL"] = 'https://localhost:8443/aai/'
+node.default["aai-resources-config"]["AAI_TRUSTSTORE_FILENAME"] = 'aai_keystore'
+node.default["aai-resources-config"]["AAI_TRUSTSTORE_PASSWD_X"] = 'OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0'
+node.default["aai-resources-config"]["AAI_KEYSTORE_FILENAME"] = 'aai_keystore'
+node.default["aai-resources-config"]["AAI_KEYSTORE_PASSWD_X"] = 'OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0'
+node.default["aai-resources-config"]["TXN_HBASE_TABLE_NAME"] = 'aailogging.dev'
+node.default["aai-resources-config"]["TXN_ZOOKEEPER_QUORUM"] = 'localhost'
+node.default["aai-resources-config"]["TXN_ZOOKEEPER_PROPERTY_CLIENTPORT"] = '2181'
+node.default["aai-resources-config"]["TXN_HBASE_ZOOKEEPER_ZNODE_PARENT"] = '/hbase'
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/attributes/aaiEventDMaaPPublisher.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/attributes/aaiEventDMaaPPublisher.rb
new file mode 100644 (file)
index 0000000..91bc7bb
--- /dev/null
@@ -0,0 +1,3 @@
+node.default["aai-resources-config"]["AAI_DMAAP_PROTOCOL"] = 'http'
+node.default["aai-resources-config"]["AAI_DMAAP_HOST_PORT"] = 'localhost:3904'
+node.default["aai-resources-config"]["AAI_DMAAP_TOPIC_NAME"] = 'AAI-EVENT'
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/attributes/preferredRoute.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/attributes/preferredRoute.rb
new file mode 100644 (file)
index 0000000..21eb295
--- /dev/null
@@ -0,0 +1 @@
+node.default["aai-resources-config"]["AAI_WORKLOAD_PREFERRED_ROUTE_KEY"] = 'MR1'
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/attributes/titan-cached.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/attributes/titan-cached.rb
new file mode 100644 (file)
index 0000000..103583b
--- /dev/null
@@ -0,0 +1,6 @@
+node.default["aai-resources-config"]["STORAGE_HOSTNAME"] = 'localhost'
+node.default["aai-resources-config"]["STORAGE_HBASE_TABLE"] = 'aaigraph.dev'
+node.default["aai-resources-config"]["STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT"] = '/hbase'
+node.default["aai-resources-config"]["DB_CACHE_CLEAN_WAIT"] = 20
+node.default["aai-resources-config"]["DB_CACHE_TIME"] = 180000
+node.default["aai-resources-config"]["DB_CACHE_SIZE"] = 0.3
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/attributes/titan-realtime.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/attributes/titan-realtime.rb
new file mode 100644 (file)
index 0000000..c289a63
--- /dev/null
@@ -0,0 +1,3 @@
+node.default["aai-resources-config"]["STORAGE_HOSTNAME"] = 'localhost'
+node.default["aai-resources-config"]["STORAGE_HBASE_TABLE"] = 'aaigraph.dev'
+node.default["aai-resources-config"]["STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT"] = '/hbase'
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/metadata.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/metadata.rb
new file mode 100644 (file)
index 0000000..d32f4cf
--- /dev/null
@@ -0,0 +1,7 @@
+name             'aai-resources-config'
+maintainer       'ATT'
+maintainer_email ''
+license          'All rights reserved'
+description      'Installs/Configures aai-resources-config'
+long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+version          '1.0.0'
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/recipes/aai-preferredRoute.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/recipes/aai-preferredRoute.rb
new file mode 100644 (file)
index 0000000..b018237
--- /dev/null
@@ -0,0 +1,11 @@
+['preferredRoute.txt'].each do |file|
+  template "#{node['aai-resources-config']['PROJECT_HOME']}/bundleconfig/etc/appprops/#{file}" do
+    source "aai-resources-config/preferredRoute.txt"
+    owner "aaiadmin"
+    group "aaiadmin"
+    mode "0644"
+    variables(
+:AAI_WORKLOAD_PREFERRED_ROUTE_KEY => node["aai-resources-config"]["AAI_WORKLOAD_PREFERRED_ROUTE_KEY"]
+      )
+  end
+end
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/recipes/aai-resources-config.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/recipes/aai-resources-config.rb
new file mode 100644 (file)
index 0000000..13f34c2
--- /dev/null
@@ -0,0 +1,78 @@
+################
+# Update aaiResourcesConfig.properties 
+################
+include_recipe 'aai-resources-config::createConfigDirectories'
+  
+['aaiconfig.properties'].each do |file|
+  template "#{node['aai-resources-config']['PROJECT_HOME']}/bundleconfig/etc/appprops/#{file}" do
+    source "aai-resources-config/aaiconfig.properties"
+    owner "aaiadmin"
+    group "aaiadmin"
+    mode "0644"
+    variables(
+:AAI_SERVER_URL_BASE => node["aai-resources-config"]["AAI_SERVER_URL_BASE"],
+:AAI_SERVER_URL => node["aai-resources-config"]["AAI_SERVER_URL"],
+:AAI_GLOBAL_CALLBACK_URL => node["aai-resources-config"]["AAI_GLOBAL_CALLBACK_URL"],
+:AAI_TRUSTSTORE_FILENAME => node["aai-resources-config"]["AAI_TRUSTSTORE_FILENAME"],
+:AAI_TRUSTSTORE_PASSWD_X => node["aai-resources-config"]["AAI_TRUSTSTORE_PASSWD_X"],
+:AAI_KEYSTORE_FILENAME => node["aai-resources-config"]["AAI_KEYSTORE_FILENAME"],
+:AAI_KEYSTORE_PASSWD_X => node["aai-resources-config"]["AAI_KEYSTORE_PASSWD_X"],
+:APPLICATION_SERVERS => node["aai-resources-config"]["APPLICATION_SERVERS"],
+:TXN_HBASE_TABLE_NAME => node["aai-resources-config"]["TXN_HBASE_TABLE_NAME"],
+:TXN_ZOOKEEPER_QUORUM => node["aai-resources-config"]["TXN_ZOOKEEPER_QUORUM"],
+:TXN_ZOOKEEPER_PROPERTY_CLIENTPORT => node["aai-resources-config"]["TXN_ZOOKEEPER_PROPERTY_CLIENTPORT"],
+:TXN_HBASE_ZOOKEEPER_ZNODE_PARENT => node["aai-resources-config"]["TXN_HBASE_ZOOKEEPER_ZNODE_PARENT"],
+:RESOURCE_VERSION_ENABLE_FLAG => node["aai-resources-config"]["RESOURCE_VERSION_ENABLE_FLAG"],
+    :AAI_NOTIFICATION_CURRENT_PACKAGE => node["aai-resources-config"]["AAI_NOTIFICATION_CURRENT_PACKAGE"],
+    :AAI_NOTIFICATION_CURRENT_VERSION => node["aai-resources-config"]["AAI_NOTIFICATION_CURRENT_VERSION"],
+    :AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS => node["aai-resources-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS"],
+    :AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_TYPE => node["aai-resources-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_TYPE"],
+    :AAI_NOTIFICATION_EVENT_DEFAULT_DOMAIN => node["aai-resources-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_DOMAIN"],
+    :AAI_NOTIFICATION_EVENT_DEFAULT_SOURCE_NAME => node["aai-resources-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_SOURCE_NAME"],
+    :AAI_NOTIFICATION_EVENT_DEFAULT_SEQUENCE_NUMBER => node["aai-resources-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_SEQUENCE_NUMBER"],
+    :AAI_NOTIFICATION_EVENT_DEFAULT_SEVERITY => node["aai-resources-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_SEVERITY"],
+    :AAI_NOTIFICATION_EVENT_DEFAULT_VERSION => node["aai-resources-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_VERSION"],
+:AAI_DEFAULT_API_VERSION => node["aai-resources-config"]["AAI_DEFAULT_API_VERSION"]
+      )
+  end
+end
+
+#remote_directory "/opt/mso/etc/ecomp/mso/config/" do
+#  source "mso-asdc-controller-config"
+#  #cookbook "default is current"
+#  files_mode "0700"
+#  files_owner "jboss"
+#  files_group "jboss"
+#  mode "0755"
+#  owner "jboss"
+#  group "jboss"
+#  overwrite true
+#  recursive true
+#  action :create
+#end
+
+
+################
+# Alternative example1
+# This updates all the timestamps
+# Seting preserve never changes the timestamp when the file is changed
+######
+# ruby_block "copy_recurse" do
+#   block do
+#     FileUtils.cp_r("#{Chef::Config[:file_cache_path]}/cookbooks/mso-config/files/default/mso-api-handler-config/.",\
+#       "/opt/mso/etc/ecomp/mso/config/", :preserve => true)  
+#   end
+#   action :run
+# end
+
+################
+# Alternative example2
+######
+# Dir.glob("#{Chef::Config[:file_cache_path]}/cookbooks/mso-config/files/default/mso-api-handler-config/*").sort.each do |entry|
+#   cookbook_file "/opt/mso/etc/ecomp/mso/config/#{entry}" do
+#     source entry
+#     owner "root"
+#     group "root"
+#     mode 0755
+#   end
+# end 
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/recipes/aaiEventDMaaPPublisher.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/recipes/aaiEventDMaaPPublisher.rb
new file mode 100644 (file)
index 0000000..1e626db
--- /dev/null
@@ -0,0 +1,14 @@
+['aaiEventDMaaPPublisher.properties'].each do |file|
+  template "#{node['aai-resources-config']['PROJECT_HOME']}/bundleconfig/etc/appprops/#{file}" do
+    source "aai-resources-config/aaiEventDMaaPPublisher.properties"
+    owner "aaiadmin"
+    group "aaiadmin"
+    mode "0644"
+    variables(
+:AAI_DMAAP_PROTOCOL => node["aai-resources-config"]["AAI_DMAAP_PROTOCOL"],
+:AAI_DMAAP_HOST_PORT => node["aai-resources-config"]["AAI_DMAAP_HOST_PORT"],
+:AAI_DMAAP_TOPIC_NAME => node["aai-resources-config"]["AAI_DMAAP_TOPIC_NAME"]
+      )
+  end
+end
+
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/recipes/createConfigDirectories.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/recipes/createConfigDirectories.rb
new file mode 100644 (file)
index 0000000..e944195
--- /dev/null
@@ -0,0 +1,44 @@
+# Create or update the needed directories/links.
+# If the directory already exists, it is updated to match
+# 
+# LOGROOT should already be created by the SWM installation script
+# It needs to run as root 
+
+[ 
+       "#{node['aai-resources-config']['LOGROOT']}/AAI-RES",
+  "#{node['aai-resources-config']['LOGROOT']}/AAI-RES/data",
+       "#{node['aai-resources-config']['LOGROOT']}/AAI-RES/misc",
+  "#{node['aai-resources-config']['LOGROOT']}/AAI-RES/ajsc-jetty" ].each do |path|
+  directory path do
+    owner 'aaiadmin'
+    group 'aaiadmin'
+    mode '0755'
+    recursive=true
+    action :create
+  end
+end
+
+[ "#{node['aai-resources-config']['PROJECT_HOME']}/bundleconfig/etc/auth" ].each do |path|
+  directory path do
+    owner 'aaiadmin'
+    group 'aaiadmin'
+    mode '0777'
+    recursive=true
+    action :create
+  end
+end
+#Application logs
+link "#{node['aai-resources-config']['PROJECT_HOME']}/logs" do
+  to "#{node['aai-resources-config']['LOGROOT']}/AAI-RES"
+  owner 'aaiadmin'
+  group 'aaiadmin'
+  mode '0755'
+end
+
+#Make a link from /opt/app/aai-resources/scripts to /opt/app/aai-resources/bin
+link "#{node['aai-resources-config']['PROJECT_HOME']}/scripts" do
+  to "#{node['aai-resources-config']['PROJECT_HOME']}/bin"
+  owner 'aaiadmin'
+  group 'aaiadmin'
+  mode '0755'
+end
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/recipes/titan-cached.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/recipes/titan-cached.rb
new file mode 100644 (file)
index 0000000..53ada49
--- /dev/null
@@ -0,0 +1,17 @@
+['titan-cached.properties'].each do |file|
+  template "#{node['aai-resources-config']['PROJECT_HOME']}/bundleconfig/etc/appprops/#{file}" do
+    source "aai-resources-config/titan-cached.properties"
+    owner "aaiadmin"
+    group "aaiadmin"
+    mode "0644"
+    variables(
+:STORAGE_HOSTNAME => node["aai-resources-config"]["STORAGE_HOSTNAME"],
+:STORAGE_HBASE_TABLE => node["aai-resources-config"]["STORAGE_HBASE_TABLE"],
+:STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT => node["aai-resources-config"]["STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT"],
+:DB_CACHE_CLEAN_WAIT => node["aai-resources-config"]["DB_CACHE_CLEAN_WAIT"],
+:DB_CACHE_TIME => node["aai-resources-config"]["DB_CACHE_TIME"],
+:DB_CACHE_SIZE => node["aai-resources-config"]["DB_CACHE_SIZE"]
+      )
+  end
+end
+
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/recipes/titan-realtime.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/recipes/titan-realtime.rb
new file mode 100644 (file)
index 0000000..c456eb3
--- /dev/null
@@ -0,0 +1,14 @@
+['titan-realtime.properties'].each do |file|
+  template "#{node['aai-resources-config']['PROJECT_HOME']}/bundleconfig/etc/appprops/#{file}" do
+    source "aai-resources-config/titan-realtime.properties"
+    owner "aaiadmin"
+    group "aaiadmin"
+    mode "0644"
+    variables(
+:STORAGE_HOSTNAME => node["aai-resources-config"]["STORAGE_HOSTNAME"],
+:STORAGE_HBASE_TABLE => node["aai-resources-config"]["STORAGE_HBASE_TABLE"],
+:STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT => node["aai-resources-config"]["STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT"]
+      )
+  end
+end
+
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/templates/default/aai-resources-config/aaiEventDMaaPPublisher.properties b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/templates/default/aai-resources-config/aaiEventDMaaPPublisher.properties
new file mode 100644 (file)
index 0000000..8ad92cd
--- /dev/null
@@ -0,0 +1,4 @@
+Protocol=<%= @AAI_DMAAP_PROTOCOL %>
+contenttype=application/json
+host=<%= @AAI_DMAAP_HOST_PORT %>
+topic=<%= @AAI_DMAAP_TOPIC_NAME %>
@@ -8,61 +8,24 @@ aai.config.checktime=1000
 # this could come from siteconfig.pl?
 aai.config.nodename=AutomaticallyOverwritten
 
-aai.logging.hbase.interceptor=false
-aai.logging.hbase.enabled=false
-aai.logging.hbase.logrequest=false
-aai.logging.hbase.logresponse=false
 
-aai.logging.trace.enabled=true
-aai.logging.trace.logrequest=false
-aai.logging.trace.logresponse=false
-
-aai.tools.enableBasicAuth=true
-aai.tools.username=AAI
-aai.tools.password=AAI
 
 aai.auth.cspcookies_on=false
 aai.dbmodel.filename=ex5.json
+
 aai.server.url.base=<%= @AAI_SERVER_URL_BASE %>
 aai.server.url=<%= @AAI_SERVER_URL %>
 aai.global.callback.url=<%= @AAI_GLOBAL_CALLBACK_URL %>
+
+aai.tools.enableBasicAuth=true
+aai.tools.username=AAI
+aai.tools.password=AAI
+
 aai.truststore.filename=<%= @AAI_TRUSTSTORE_FILENAME %>
 aai.truststore.passwd.x=<%= @AAI_TRUSTSTORE_PASSWD_X %>
 aai.keystore.filename=<%= @AAI_KEYSTORE_FILENAME %>
 aai.keystore.passwd.x=<%= @AAI_KEYSTORE_PASSWD_X %>
 
-# the following parameters are not reloaded automatically and require a manual bounce
-storage.backend=<%= @STORAGE_BACKEND %>
-storage.hostname=<%= @STORAGE_HOSTNAME %>
-#schema.default=none
-storage.lock.wait-time=300
-storage.hbase.table=<%= @STORAGE_HBASE_TABLE %>
-storage.hbase.ext.zookeeper.znode.parent=<%= @STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT %>
-# Setting db-cache to false ensure the fastest propagation of changes across servers
-cache.db-cache = false
-#cache.db-cache-clean-wait = 20
-#cache.db-cache-time = 180000
-#cache.db-cache-size = 0.5
-
-# for transaction log
-hbase.table.name=<%= @TXN_HBASE_TABLE_NAME %>
-hbase.table.timestamp.format=YYYYMMdd-HH:mm:ss:SSS
-hbase.zookeeper.quorum=<%= @TXN_ZOOKEEPER_QUORUM %>
-hbase.zookeeper.property.clientPort=<%= @TXN_ZOOKEEPER_PROPERTY_CLIENTPORT %>
-hbase.zookeeper.znode.parent=<%= @TXN_HBASE_ZOOKEEPER_ZNODE_PARENT %>
-hbase.column.ttl.days=<%= @HBASE_COLUMN_TTL_DAYS %>
-
-# single primary server
-aai.primary.filetransfer.serverlist=<%= @APPLICATION_SERVERS %>
-aai.primary.filetransfer.primarycheck=echo:8443/aai/util/echo
-aai.primary.filetransfer.pingtimeout=5000
-aai.primary.filetransfer.pingcount=5
-
-#rsync properties
-aai.rsync.command=rsync
-aai.rsync.options.list=-v|-t
-aai.rsync.remote.user=aaiadmin
-aai.rsync.enabled=y
 
 aai.notification.current.version=<%= @AAI_NOTIFICATION_CURRENT_VERSION %>
 aai.notificationEvent.default.status=<%= @AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS %>
@@ -77,16 +40,40 @@ aai.resourceversion.enableflag=<%= @RESOURCE_VERSION_ENABLE_FLAG %>
 aai.logging.maxStackTraceEntries=10
 aai.default.api.version=<%= @AAI_DEFAULT_API_VERSION %>
 
+
+
 # Used by Model-processing code
 aai.model.delete.sleep.per.vtx.msec=500
-aai.model.query.resultset.maxcount=30
+aai.model.query.resultset.maxcount=50
 aai.model.query.timeout.sec=90
  
 # Used by Data Grooming
-aai.grooming.default.max.fix=150
+aai.grooming.default.max.file=150
 aai.grooming.default.sleep.minutes=7
 
 aai.model.proc.max.levels=50
 aai.edgeTag.proc.max.levels=50
 
-aai.dmaap.workload.enableEventProcessing=<%= @AAI_DMAPP_WORKLOAD_ENABLE_EVENT_PROCESSING %>
\ No newline at end of file
+# for transaction log
+aai.logging.hbase.interceptor=true
+aai.logging.hbase.enabled=true
+aai.logging.hbase.logrequest=true
+aai.logging.hbase.logresponse=true
+
+# for gremlin server
+aai.server.rebind=g
+hbase.table.name=<%= @TXN_HBASE_TABLE_NAME %>
+hbase.table.timestamp.format=YYYYMMdd-HH:mm:ss:SSS
+hbase.zookeeper.quorum=<%= @TXN_ZOOKEEPER_QUORUM %>
+hbase.zookeeper.property.clientPort=<%= @TXN_ZOOKEEPER_PROPERTY_CLIENTPORT %>
+hbase.zookeeper.znode.parent=<%= @TXN_HBASE_ZOOKEEPER_ZNODE_PARENT %>
+
+aai.logging.trace.enabled=true
+aai.logging.trace.logrequest=false
+aai.logging.trace.logresponse=false
+
+
+aai.transaction.logging=true
+aai.transaction.logging.get=false
+aai.transaction.logging.post=false
+
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/templates/default/aai-resources-config/titan-cached.properties b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/templates/default/aai-resources-config/titan-cached.properties
new file mode 100644 (file)
index 0000000..d6c9c2d
--- /dev/null
@@ -0,0 +1,13 @@
+# the following parameters are not reloaded automatically and require a manual bounce
+query.fast-property=true
+storage.backend=hbase
+storage.hostname=<%= @STORAGE_HOSTNAME %>
+#schema.default=none
+storage.lock.wait-time=300
+storage.hbase.table=<%= @STORAGE_HBASE_TABLE %>
+storage.hbase.ext.zookeeper.znode.parent=<%= @STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT %>
+#caching on
+cache.db-cache = true
+cache.db-cache-clean-wait = <%= @DB_CACHE_CLEAN_WAIT %>
+cache.db-cache-time = <%= @DB_CACHE_TIME %>
+cache.db-cache-size = <%= @DB_CACHE_SIZE %>
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/templates/default/aai-resources-config/titan-realtime.properties b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/aai-resources-config/templates/default/aai-resources-config/titan-realtime.properties
new file mode 100644 (file)
index 0000000..2935cc1
--- /dev/null
@@ -0,0 +1,13 @@
+# the following parameters are not reloaded automatically and require a manual bounce
+query.fast-property=true
+storage.backend=hbase
+storage.hostname=<%= @STORAGE_HOSTNAME %>
+#schema.default=none
+storage.lock.wait-time=300
+storage.hbase.table=<%= @STORAGE_HBASE_TABLE %>
+storage.hbase.ext.zookeeper.znode.parent=<%= @STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT %>
+# Setting db-cache to false ensure the fastest propagation of changes across servers
+cache.db-cache = false
+#cache.db-cache-clean-wait = 20
+#cache.db-cache-time = 180000
+#cache.db-cache-size = 0.5
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/runlist-aai-resources.json b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-resources/runlist-aai-resources.json
new file mode 100644 (file)
index 0000000..92c493d
--- /dev/null
@@ -0,0 +1,11 @@
+{
+  "run_list": [
+    "recipe[aai-resources-config::createConfigDirectories]",
+    "recipe[aai-resources-auth::aai-resources-aai-keystore]",
+    "recipe[aai-resources-config::aaiEventDMaaPPublisher]",
+    "recipe[aai-resources-config::aai-resources-config]",
+    "recipe[aai-resources-config::titan-cached]",
+    "recipe[aai-resources-config::titan-realtime]",
+    "recipe[aai-resources-config::aai-preferredRoute]"
+  ]
+}
@@ -1,11 +1,11 @@
 ajsc-aai-auth CHANGELOG
 =======================
 
-This file is used to list changes made in each version of the ajsc-aai-auth cookbook.
+This file is used to list changes made in each version of the aai-traversal-auth cookbook.
 
 0.1.0
 -----
-- [your_name] - Initial release of ajsc-aai-auth
+- [your_name] - Initial release of aai-traversal-auth
 
 - - -
 Check the [Markdown Syntax Guide](http://daringfireball.net/projects/markdown/syntax) for help with Markdown.
@@ -1,4 +1,4 @@
-ajsc-aai-auth Cookbook
+aai-traversal-auth Cookbook
 ======================
 TODO: Enter the cookbook description here.
 
@@ -36,11 +36,11 @@ e.g.
 
 Usage
 -----
-#### ajsc-aai-auth::default
+#### aai-traversal-auth::default
 TODO: Write usage instructions for each cookbook.
 
 e.g.
-Just include `ajsc-aai-auth` in your node's `run_list`:
+Just include `aai-traversal-auth` in your node's `run_list`:
 
 ```json
 {
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-auth/metadata.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-auth/metadata.rb
new file mode 100644 (file)
index 0000000..e653749
--- /dev/null
@@ -0,0 +1,7 @@
+name             'aai-traversal-auth'
+maintainer       'ATT'
+maintainer_email ''
+license          'All rights reserved'
+description      'Installs/Configures aai-traversal-auth'
+long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+version          '1.0.0'
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-auth/recipes/aai-traversal-aai-keystore.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-auth/recipes/aai-traversal-aai-keystore.rb
new file mode 100644 (file)
index 0000000..c1b3f28
--- /dev/null
@@ -0,0 +1,8 @@
+cookbook_file "#{node['aai-traversal-config']['PROJECT_HOME']}/bundleconfig/etc/auth/aai_keystore" do
+  source "aai_keystore-#{node['aai-traversal-config']['AAIENV']}"
+  owner 'aaiadmin'
+  group 'aaiadmin'
+  mode '0755'
+  action :create
+end
+
@@ -1,4 +1,4 @@
-ajsc-aai-config Cookbook
+aai-traversal-config Cookbook
 ========================
 TODO: Enter the cookbook description here.
 
@@ -11,7 +11,7 @@ TODO: List your cookbook requirements. Be sure to include any requirements this
 
 e.g.
 #### packages
-- `toaster` - ajsc-aai-config needs toaster to brown your bagel.
+- `toaster` - aai-traversal-config needs toaster to brown your bagel.
 
 Attributes
 ----------
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/attributes/aai-traversal-config.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/attributes/aai-traversal-config.rb
new file mode 100644 (file)
index 0000000..33d3eb2
--- /dev/null
@@ -0,0 +1,15 @@
+node.default["aai-traversal-config"]["AAIENV"] = 'solo'
+node.default["aai-traversal-config"]["PROJECT_HOME"] = '/opt/app/aai-traversal'
+node.default["aai-traversal-config"]["LOGROOT"] = '/opt/aai/logroot'
+node.default["aai-traversal-config"]["JAVA_HOME"] = '/usr/lib/jvm/java-8-openjdk-amd64'
+node.default["aai-traversal-config"]["AAI_SERVER_URL_BASE"] = 'https://localhost:8443/aai/'
+node.default["aai-traversal-config"]["AAI_SERVER_URL"] = 'https://localhost:8443/aai/v11/'
+node.default["aai-traversal-config"]["AAI_GLOBAL_CALLBACK_URL"] = 'https://localhost:8443/aai/'
+node.default["aai-traversal-config"]["AAI_TRUSTSTORE_FILENAME"] = 'aai_keystore'
+node.default["aai-traversal-config"]["AAI_TRUSTSTORE_PASSWD_X"] = 'OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0'
+node.default["aai-traversal-config"]["AAI_KEYSTORE_FILENAME"] = 'aai_keystore'
+node.default["aai-traversal-config"]["AAI_KEYSTORE_PASSWD_X"] = 'OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0'
+node.default["aai-traversal-config"]["TXN_HBASE_TABLE_NAME"] = 'aailogging.dev'
+node.default["aai-traversal-config"]["TXN_ZOOKEEPER_QUORUM"] = 'localhost'
+node.default["aai-traversal-config"]["TXN_ZOOKEEPER_PROPERTY_CLIENTPORT"] = '2181'
+node.default["aai-traversal-config"]["TXN_HBASE_ZOOKEEPER_ZNODE_PARENT"] = '/hbase'
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/attributes/aaiEventDMaaPPublisher.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/attributes/aaiEventDMaaPPublisher.rb
new file mode 100644 (file)
index 0000000..7d20b30
--- /dev/null
@@ -0,0 +1,3 @@
+node.default["aai-traversal-config"]["AAI_DMAAP_PROTOCOL"] = 'http'
+node.default["aai-traversal-config"]["AAI_DMAAP_HOST_PORT"] = 'localhost:3904'
+node.default["aai-traversal-config"]["AAI_DMAAP_TOPIC_NAME"] = 'AAI-EVENT'
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
new file mode 100644 (file)
index 0000000..97fa6fd
--- /dev/null
@@ -0,0 +1 @@
+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/attributes/preferredRoute.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/attributes/preferredRoute.rb
new file mode 100644 (file)
index 0000000..21af672
--- /dev/null
@@ -0,0 +1 @@
+node.default["aai-traversal-config"]["AAI_WORKLOAD_PREFERRED_ROUTE_KEY"] = 'MR1'
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/attributes/titan-cached.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/attributes/titan-cached.rb
new file mode 100644 (file)
index 0000000..cb88f3c
--- /dev/null
@@ -0,0 +1,6 @@
+node.default["aai-traversal-config"]["STORAGE_HOSTNAME"] = 'localhost'
+node.default["aai-traversal-config"]["STORAGE_HBASE_TABLE"] = 'aaigraph.dev'
+node.default["aai-traversal-config"]["STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT"] = '/hbase'
+node.default["aai-traversal-config"]["DB_CACHE_CLEAN_WAIT"] = 20
+node.default["aai-traversal-config"]["DB_CACHE_TIME"] = 180000
+node.default["aai-traversal-config"]["DB_CACHE_SIZE"] = 0.3
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/attributes/titan-realtime.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/attributes/titan-realtime.rb
new file mode 100644 (file)
index 0000000..f67c646
--- /dev/null
@@ -0,0 +1,3 @@
+node.default["aai-traversal-config"]["STORAGE_HOSTNAME"] = 'localhost'
+node.default["aai-traversal-config"]["STORAGE_HBASE_TABLE"] = 'aaigraph.dev'
+node.default["aai-traversal-config"]["STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT"] = '/hbase'
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/metadata.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/metadata.rb
new file mode 100644 (file)
index 0000000..fd654fa
--- /dev/null
@@ -0,0 +1,7 @@
+name             'aai-traversal-config'
+maintainer       'ATT'
+maintainer_email ''
+license          'All rights reserved'
+description      'Installs/Configures aai-traversal-config'
+long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+version          '1.0.0'
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/recipes/aai-preferredRoute.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/recipes/aai-preferredRoute.rb
new file mode 100644 (file)
index 0000000..2672e9b
--- /dev/null
@@ -0,0 +1,11 @@
+['preferredRoute.txt'].each do |file|
+  template "#{node['aai-traversal-config']['PROJECT_HOME']}/bundleconfig/etc/appprops/#{file}" do
+    source "aai-traversal-app-config/preferredRoute.txt"
+    owner "aaiadmin"
+    group "aaiadmin"
+    mode "0644"
+    variables(
+:AAI_WORKLOAD_PREFERRED_ROUTE_KEY => node["aai-traversal-config"]["AAI_WORKLOAD_PREFERRED_ROUTE_KEY"]
+      )
+  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/recipes/aai-traversal-config.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/recipes/aai-traversal-config.rb
new file mode 100644 (file)
index 0000000..aae12d0
--- /dev/null
@@ -0,0 +1,77 @@
+################
+# Update aaiGraphQueryConfig.properties 
+################
+include_recipe 'aai-traversal-config::createConfigDirectories'
+  
+['aaiconfig.properties'].each do |file|
+  template "#{node['aai-traversal-config']['PROJECT_HOME']}/bundleconfig/etc/appprops/#{file}" do
+    source "aai-traversal-app-config/aaiconfig.properties"
+    owner "aaiadmin"
+    group "aaiadmin"
+    mode "0644"
+    variables(
+:AAI_SERVER_URL_BASE => node["aai-traversal-config"]["AAI_SERVER_URL_BASE"],
+:AAI_SERVER_URL => node["aai-traversal-config"]["AAI_SERVER_URL"],
+:AAI_GLOBAL_CALLBACK_URL => node["aai-traversal-config"]["AAI_GLOBAL_CALLBACK_URL"],
+:AAI_TRUSTSTORE_FILENAME => node["aai-traversal-config"]["AAI_TRUSTSTORE_FILENAME"],
+:AAI_TRUSTSTORE_PASSWD_X => node["aai-traversal-config"]["AAI_TRUSTSTORE_PASSWD_X"],
+:AAI_KEYSTORE_FILENAME => node["aai-traversal-config"]["AAI_KEYSTORE_FILENAME"],
+:AAI_KEYSTORE_PASSWD_X => node["aai-traversal-config"]["AAI_KEYSTORE_PASSWD_X"],
+:APPLICATION_SERVERS => node["aai-traversal-config"]["APPLICATION_SERVERS"], 
+:TXN_HBASE_TABLE_NAME => node["aai-traversal-config"]["TXN_HBASE_TABLE_NAME"],
+:TXN_ZOOKEEPER_QUORUM => node["aai-traversal-config"]["TXN_ZOOKEEPER_QUORUM"],
+:TXN_ZOOKEEPER_PROPERTY_CLIENTPORT => node["aai-traversal-config"]["TXN_ZOOKEEPER_PROPERTY_CLIENTPORT"],
+:TXN_HBASE_ZOOKEEPER_ZNODE_PARENT => node["aai-traversal-config"]["TXN_HBASE_ZOOKEEPER_ZNODE_PARENT"],
+:RESOURCE_VERSION_ENABLE_FLAG => node["aai-traversal-config"]["RESOURCE_VERSION_ENABLE_FLAG"],
+    :AAI_NOTIFICATION_CURRENT_VERSION => node["aai-traversal-config"]["AAI_NOTIFICATION_CURRENT_VERSION"],
+    :AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS => node["aai-traversal-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS"],
+    :AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_TYPE => node["aai-traversal-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_TYPE"],
+    :AAI_NOTIFICATION_EVENT_DEFAULT_DOMAIN => node["aai-traversal-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_DOMAIN"],
+    :AAI_NOTIFICATION_EVENT_DEFAULT_SOURCE_NAME => node["aai-traversal-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_SOURCE_NAME"],
+    :AAI_NOTIFICATION_EVENT_DEFAULT_SEQUENCE_NUMBER => node["aai-traversal-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_SEQUENCE_NUMBER"],
+    :AAI_NOTIFICATION_EVENT_DEFAULT_SEVERITY => node["aai-traversal-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_SEVERITY"],
+    :AAI_NOTIFICATION_EVENT_DEFAULT_VERSION => node["aai-traversal-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_VERSION"],
+:AAI_DEFAULT_API_VERSION => node["aai-traversal-config"]["AAI_DEFAULT_API_VERSION"]
+      )
+  end
+end
+
+#remote_directory "/opt/mso/etc/ecomp/mso/config/" do
+#  source "mso-asdc-controller-config"
+#  #cookbook "default is current"
+#  files_mode "0700"
+#  files_owner "jboss"
+#  files_group "jboss"
+#  mode "0755"
+#  owner "jboss"
+#  group "jboss"
+#  overwrite true
+#  recursive true
+#  action :create
+#end
+
+
+################
+# Alternative example1
+# This updates all the timestamps
+# Seting preserve never changes the timestamp when the file is changed
+######
+# ruby_block "copy_recurse" do
+#   block do
+#     FileUtils.cp_r("#{Chef::Config[:file_cache_path]}/cookbooks/mso-config/files/default/mso-api-handler-config/.",\
+#       "/opt/mso/etc/ecomp/mso/config/", :preserve => true)  
+#   end
+#   action :run
+# end
+
+################
+# Alternative example2
+######
+# Dir.glob("#{Chef::Config[:file_cache_path]}/cookbooks/mso-config/files/default/mso-api-handler-config/*").sort.each do |entry|
+#   cookbook_file "/opt/mso/etc/ecomp/mso/config/#{entry}" do
+#     source entry
+#     owner "root"
+#     group "root"
+#     mode 0755
+#   end
+# end 
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/recipes/aaiEventDMaaPPublisher.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/recipes/aaiEventDMaaPPublisher.rb
new file mode 100644 (file)
index 0000000..6b66a6d
--- /dev/null
@@ -0,0 +1,14 @@
+['aaiEventDMaaPPublisher.properties'].each do |file|
+  template "#{node['aai-traversal-config']['PROJECT_HOME']}/bundleconfig/etc/appprops/#{file}" do
+    source "aai-traversal-app-config/aaiEventDMaaPPublisher.properties"
+    owner "aaiadmin"
+    group "aaiadmin"
+    mode "0644"
+    variables(
+:AAI_DMAAP_PROTOCOL => node["aai-traversal-config"]["AAI_DMAAP_PROTOCOL"],
+:AAI_DMAAP_HOST_PORT => node["aai-traversal-config"]["AAI_DMAAP_HOST_PORT"],
+:AAI_DMAAP_TOPIC_NAME => node["aai-traversal-config"]["AAI_DMAAP_TOPIC_NAME"]
+      )
+  end
+end
+
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/recipes/createConfigDirectories.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/recipes/createConfigDirectories.rb
new file mode 100644 (file)
index 0000000..9739c1a
--- /dev/null
@@ -0,0 +1,44 @@
+# Create or update the needed directories/links.
+# If the directory already exists, it is updated to match
+# 
+# LOGROOT should already be created by the SWM installation script
+# It needs to run as root 
+
+[ 
+       "#{node['aai-traversal-config']['LOGROOT']}/AAI-GQ",
+  "#{node['aai-traversal-config']['LOGROOT']}/AAI-GQ/data",
+       "#{node['aai-traversal-config']['LOGROOT']}/AAI-GQ/misc",
+  "#{node['aai-traversal-config']['LOGROOT']}/AAI-GQ/ajsc-jetty" ].each do |path|
+  directory path do
+    owner 'aaiadmin'
+    group 'aaiadmin'
+    mode '0755'
+    recursive=true
+    action :create
+  end
+end
+
+[ "#{node['aai-traversal-config']['PROJECT_HOME']}/bundleconfig/etc/auth" ].each do |path|
+  directory path do
+    owner 'aaiadmin'
+    group 'aaiadmin'
+    mode '0777'
+    recursive=true
+    action :create
+  end
+end
+#Application logs
+link "#{node['aai-traversal-config']['PROJECT_HOME']}/logs" do
+  to "#{node['aai-traversal-config']['LOGROOT']}/AAI-GQ"
+  owner 'aaiadmin'
+  group 'aaiadmin'
+  mode '0755'
+end
+
+#Make a link from /opt/app/aai-traversal/scripts to /opt/app/aai-traversal/bin
+link "#{node['aai-traversal-config']['PROJECT_HOME']}/scripts" do
+  to "#{node['aai-traversal-config']['PROJECT_HOME']}/bin"
+  owner 'aaiadmin'
+  group 'aaiadmin'
+  mode '0755'
+end
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
new file mode 100644 (file)
index 0000000..2af775b
--- /dev/null
@@ -0,0 +1,11 @@
+['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/recipes/titan-cached.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/recipes/titan-cached.rb
new file mode 100644 (file)
index 0000000..b00e6ba
--- /dev/null
@@ -0,0 +1,17 @@
+['titan-cached.properties'].each do |file|
+  template "#{node['aai-traversal-config']['PROJECT_HOME']}/bundleconfig/etc/appprops/#{file}" do
+    source "aai-traversal-app-config/titan-cached.properties"
+    owner "aaiadmin"
+    group "aaiadmin"
+    mode "0644"
+    variables(
+:STORAGE_HOSTNAME => node["aai-traversal-config"]["STORAGE_HOSTNAME"],
+:STORAGE_HBASE_TABLE => node["aai-traversal-config"]["STORAGE_HBASE_TABLE"],
+:STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT => node["aai-traversal-config"]["STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT"],
+:DB_CACHE_CLEAN_WAIT => node["aai-traversal-config"]["DB_CACHE_CLEAN_WAIT"],
+:DB_CACHE_TIME => node["aai-traversal-config"]["DB_CACHE_TIME"],
+:DB_CACHE_SIZE => node["aai-traversal-config"]["DB_CACHE_SIZE"]
+      )
+  end
+end
+
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/recipes/titan-realtime.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/recipes/titan-realtime.rb
new file mode 100644 (file)
index 0000000..cd6686a
--- /dev/null
@@ -0,0 +1,14 @@
+['titan-realtime.properties'].each do |file|
+  template "#{node['aai-traversal-config']['PROJECT_HOME']}/bundleconfig/etc/appprops/#{file}" do
+    source "aai-traversal-app-config/titan-realtime.properties"
+    owner "aaiadmin"
+    group "aaiadmin"
+    mode "0644"
+    variables(
+:STORAGE_HOSTNAME => node["aai-traversal-config"]["STORAGE_HOSTNAME"],
+:STORAGE_HBASE_TABLE => node["aai-traversal-config"]["STORAGE_HBASE_TABLE"],
+:STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT => node["aai-traversal-config"]["STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT"]
+      )
+  end
+end
+
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/templates/default/aai-traversal-app-config/aaiEventDMaaPPublisher.properties b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/templates/default/aai-traversal-app-config/aaiEventDMaaPPublisher.properties
new file mode 100644 (file)
index 0000000..8ad92cd
--- /dev/null
@@ -0,0 +1,4 @@
+Protocol=<%= @AAI_DMAAP_PROTOCOL %>
+contenttype=application/json
+host=<%= @AAI_DMAAP_HOST_PORT %>
+topic=<%= @AAI_DMAAP_TOPIC_NAME %>
@@ -8,61 +8,23 @@ aai.config.checktime=1000
 # this could come from siteconfig.pl?
 aai.config.nodename=AutomaticallyOverwritten
 
-aai.logging.hbase.interceptor=false
-aai.logging.hbase.enabled=false
-aai.logging.hbase.logrequest=false
-aai.logging.hbase.logresponse=false
-
-aai.logging.trace.enabled=true
-aai.logging.trace.logrequest=false
-aai.logging.trace.logresponse=false
-
 aai.tools.enableBasicAuth=true
 aai.tools.username=AAI
 aai.tools.password=AAI
 
 aai.auth.cspcookies_on=false
 aai.dbmodel.filename=ex5.json
+
 aai.server.url.base=<%= @AAI_SERVER_URL_BASE %>
 aai.server.url=<%= @AAI_SERVER_URL %>
 aai.global.callback.url=<%= @AAI_GLOBAL_CALLBACK_URL %>
+
+
 aai.truststore.filename=<%= @AAI_TRUSTSTORE_FILENAME %>
 aai.truststore.passwd.x=<%= @AAI_TRUSTSTORE_PASSWD_X %>
 aai.keystore.filename=<%= @AAI_KEYSTORE_FILENAME %>
 aai.keystore.passwd.x=<%= @AAI_KEYSTORE_PASSWD_X %>
 
-# the following parameters are not reloaded automatically and require a manual bounce
-storage.backend=<%= @STORAGE_BACKEND %>
-storage.hostname=<%= @STORAGE_HOSTNAME %>
-#schema.default=none
-storage.lock.wait-time=300
-storage.hbase.table=<%= @STORAGE_HBASE_TABLE %>
-storage.hbase.ext.zookeeper.znode.parent=<%= @STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT %>
-# Setting db-cache to false ensure the fastest propagation of changes across servers
-cache.db-cache = false
-#cache.db-cache-clean-wait = 20
-#cache.db-cache-time = 180000
-#cache.db-cache-size = 0.5
-
-# for transaction log
-hbase.table.name=<%= @TXN_HBASE_TABLE_NAME %>
-hbase.table.timestamp.format=YYYYMMdd-HH:mm:ss:SSS
-hbase.zookeeper.quorum=<%= @TXN_ZOOKEEPER_QUORUM %>
-hbase.zookeeper.property.clientPort=<%= @TXN_ZOOKEEPER_PROPERTY_CLIENTPORT %>
-hbase.zookeeper.znode.parent=<%= @TXN_HBASE_ZOOKEEPER_ZNODE_PARENT %>
-hbase.column.ttl.days=<%= @HBASE_COLUMN_TTL_DAYS %>
-
-# single primary server
-aai.primary.filetransfer.serverlist=<%= @APPLICATION_SERVERS %>
-aai.primary.filetransfer.primarycheck=echo:8443/aai/util/echo
-aai.primary.filetransfer.pingtimeout=5000
-aai.primary.filetransfer.pingcount=5
-
-#rsync properties
-aai.rsync.command=rsync
-aai.rsync.options.list=-v|-t
-aai.rsync.remote.user=aaiadmin
-aai.rsync.enabled=y
 
 aai.notification.current.version=<%= @AAI_NOTIFICATION_CURRENT_VERSION %>
 aai.notificationEvent.default.status=<%= @AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS %>
@@ -79,14 +41,35 @@ aai.default.api.version=<%= @AAI_DEFAULT_API_VERSION %>
 
 # Used by Model-processing code
 aai.model.delete.sleep.per.vtx.msec=500
-aai.model.query.resultset.maxcount=30
+aai.model.query.resultset.maxcount=50
 aai.model.query.timeout.sec=90
  
-# Used by Data Grooming
-aai.grooming.default.max.fix=150
-aai.grooming.default.sleep.minutes=7
 
 aai.model.proc.max.levels=50
 aai.edgeTag.proc.max.levels=50
 
-aai.dmaap.workload.enableEventProcessing=<%= @AAI_DMAPP_WORKLOAD_ENABLE_EVENT_PROCESSING %>
\ No newline at end of file
+# for transaction log
+aai.logging.hbase.interceptor=true
+aai.logging.hbase.enabled=true
+aai.logging.hbase.logrequest=true
+aai.logging.hbase.logresponse=true
+
+# for gremlin server
+aai.server.rebind=g
+hbase.table.name=<%= @TXN_HBASE_TABLE_NAME %>
+hbase.table.timestamp.format=YYYYMMdd-HH:mm:ss:SSS
+hbase.zookeeper.quorum=<%= @TXN_ZOOKEEPER_QUORUM %>
+hbase.zookeeper.property.clientPort=<%= @TXN_ZOOKEEPER_PROPERTY_CLIENTPORT %>
+hbase.zookeeper.znode.parent=<%= @TXN_HBASE_ZOOKEEPER_ZNODE_PARENT %>
+
+
+aai.logging.trace.enabled=true
+aai.logging.trace.logrequest=false
+aai.logging.trace.logresponse=false
+
+
+aai.transaction.logging=true
+aai.transaction.logging.get=false
+aai.transaction.logging.post=false
+
+
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
new file mode 100644 (file)
index 0000000..23637a8
--- /dev/null
@@ -0,0 +1,3 @@
+hosts: <%= @AAI_GREMLIN_SERVER_CONFIG_HOST_LIST %>
+port: 8182
+serializer: { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0 }
\ 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/titan-cached.properties b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/templates/default/aai-traversal-app-config/titan-cached.properties
new file mode 100644 (file)
index 0000000..d6c9c2d
--- /dev/null
@@ -0,0 +1,13 @@
+# the following parameters are not reloaded automatically and require a manual bounce
+query.fast-property=true
+storage.backend=hbase
+storage.hostname=<%= @STORAGE_HOSTNAME %>
+#schema.default=none
+storage.lock.wait-time=300
+storage.hbase.table=<%= @STORAGE_HBASE_TABLE %>
+storage.hbase.ext.zookeeper.znode.parent=<%= @STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT %>
+#caching on
+cache.db-cache = true
+cache.db-cache-clean-wait = <%= @DB_CACHE_CLEAN_WAIT %>
+cache.db-cache-time = <%= @DB_CACHE_TIME %>
+cache.db-cache-size = <%= @DB_CACHE_SIZE %>
\ 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/titan-realtime.properties b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/aai-traversal-config/templates/default/aai-traversal-app-config/titan-realtime.properties
new file mode 100644 (file)
index 0000000..2935cc1
--- /dev/null
@@ -0,0 +1,13 @@
+# the following parameters are not reloaded automatically and require a manual bounce
+query.fast-property=true
+storage.backend=hbase
+storage.hostname=<%= @STORAGE_HOSTNAME %>
+#schema.default=none
+storage.lock.wait-time=300
+storage.hbase.table=<%= @STORAGE_HBASE_TABLE %>
+storage.hbase.ext.zookeeper.znode.parent=<%= @STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT %>
+# Setting db-cache to false ensure the fastest propagation of changes across servers
+cache.db-cache = false
+#cache.db-cache-clean-wait = 20
+#cache.db-cache-time = 180000
+#cache.db-cache-size = 0.5
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/runlist-aai-traversal.json b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/aai-traversal/runlist-aai-traversal.json
new file mode 100644 (file)
index 0000000..8baa3e4
--- /dev/null
@@ -0,0 +1,12 @@
+{
+  "run_list": [
+    "recipe[aai-traversal-config::createConfigDirectories]",
+    "recipe[aai-traversal-auth::aai-traversal-aai-keystore]",
+    "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]"
+  ]
+}
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-auth/files/default/aai_keystore-int b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-auth/files/default/aai_keystore-int
deleted file mode 100755 (executable)
index 3eef135..0000000
Binary files a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-auth/files/default/aai_keystore-int and /dev/null differ
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-auth/files/default/aai_keystore-local b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-auth/files/default/aai_keystore-local
deleted file mode 100755 (executable)
index 3eef135..0000000
Binary files a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-auth/files/default/aai_keystore-local and /dev/null differ
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-auth/files/default/aai_keystore-simpledemo b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-auth/files/default/aai_keystore-simpledemo
deleted file mode 100755 (executable)
index 3eef135..0000000
Binary files a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-auth/files/default/aai_keystore-simpledemo and /dev/null differ
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-auth/files/default/aai_keystore-solo b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-auth/files/default/aai_keystore-solo
deleted file mode 100755 (executable)
index 3eef135..0000000
Binary files a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-auth/files/default/aai_keystore-solo and /dev/null differ
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-auth/metadata.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-auth/metadata.rb
deleted file mode 100755 (executable)
index 1cf7e82..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-name             'ajsc-aai-auth'
-maintainer       'YOUR_COMPANY_NAME'
-maintainer_email 'YOUR_EMAIL'
-license          'All rights reserved'
-description      'Installs/Configures ajsc-aai-auth'
-long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.2.0'
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-auth/recipes/aai-keystore.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-auth/recipes/aai-keystore.rb
deleted file mode 100755 (executable)
index e5c0599..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-cookbook_file "#{node['aai-app-config']['PROJECT_HOME']}/bundleconfig/etc/auth/aai_keystore" do
-  source "aai_keystore-#{node['aai-app-config']['AAIENV']}"
-  owner 'aaiadmin'
-  group 'aaiadmin'
-  mode '0755'
-  action :create
-end
-
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/attributes/aaiWorkloadConsumer.properties.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/attributes/aaiWorkloadConsumer.properties.rb
deleted file mode 100755 (executable)
index 2736249..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-node.default["aai-app-config"]["AAI_WORKLOAD_SERVICE_NAME"] = ''
-node.default["aai-app-config"]["AAI_WORKLOAD_ENVIRONMENT"] = 'TEST'
-node.default["aai-app-config"]["AAI_WORKLOAD_USERNAME"] = ''
-node.default["aai-app-config"]["AAI_WORKLOAD_PASSWORD"] = ''
-node.default["aai-app-config"]["AAI_WORKLOAD_HOST"] = ''
-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EXCHANGE_REQUEST_HANDLERS"] = ''
-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EXCHANGE_REPLY_HANDLERS"] = ''
-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_REQ_TRACE_ON"] = 'true'
-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_ENVIRONMENT"] = 'AFTUAT'
-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EP_CONN_TIMEOUT"] = '15000'
-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_ROUNDTRIP_TIMEOUT_MS"] = '240000'
-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EP_READ_TIMEOUT_MS"] = '50000'
-node.default["aai-app-config"]["AAI_WORKLOAD_SESSION_STICKINESS_REQUIRED"] = 'no'
-node.default["aai-app-config"]["AAI_WORKLOAD_DME2_PREFERRED_ROUTER_FILE_PATH"] = '/opt/app/aai/bundleconfig/etc/appprops/preferredRoute.txt'
-node.default["aai-app-config"]["AAI_WORKLOAD_PARTNER"] = 'BOT_R'
-node.default["aai-app-config"]["AAI_WORKLOAD_ROUTE_OFFER"] = 'MR1'
-node.default["aai-app-config"]["AAI_WORKLOAD_PROTOCOL"] = 'http'
-node.default["aai-app-config"]["AAI_WORKLOAD_TOPIC"] = ''
-node.default["aai-app-config"]["AAI_WORKLOAD_ID"] = 'aaiConsumerId'
-node.default["aai-app-config"]["AAI_WORKLOAD_TIMEOUT"] = '15000'
-node.default["aai-app-config"]["AAI_WORKLOAD_LIMIT"] = '1000'
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/attributes/aaiWorkloadPublisher.properties.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/attributes/aaiWorkloadPublisher.properties.rb
deleted file mode 100755 (executable)
index 024ea07..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-node.default["aai-app-config"]["AAI_WORKLOAD_SERVICE_NAME"] = ''
-node.default["aai-app-config"]["AAI_WORKLOAD_ENVIRONMENT"] = 'TEST'
-node.default["aai-app-config"]["AAI_WORKLOAD_USERNAME"] = ''
-node.default["aai-app-config"]["AAI_WORKLOAD_PASSWORD"] = ''
-node.default["aai-app-config"]["AAI_WORKLOAD_HOST"] = ''
-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EXCHANGE_REQUEST_HANDLERS"] = ''
-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EXCHANGE_REPLY_HANDLERS"] = ''
-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_REQ_TRACE_ON"] = 'true'
-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_ENVIRONMENT"] = 'AFTUAT'
-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EP_CONN_TIMEOUT"] = '15000'
-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_ROUNDTRIP_TIMEOUT_MS"] = '240000'
-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EP_READ_TIMEOUT_MS"] = '50000'
-node.default["aai-app-config"]["AAI_WORKLOAD_SESSION_STICKINESS_REQUIRED"] = 'no'
-node.default["aai-app-config"]["AAI_WORKLOAD_DME2_PREFERRED_ROUTER_FILE_PATH"] = '/opt/app/aai/bundleconfig/etc/appprops/preferredRoute.txt'
-node.default["aai-app-config"]["AAI_WORKLOAD_PARTNER"] = 'BOT_R'
-node.default["aai-app-config"]["AAI_WORKLOAD_ROUTE_OFFER"] = 'MR1'
-node.default["aai-app-config"]["AAI_WORKLOAD_PROTOCOL"] = 'http'
-node.default["aai-app-config"]["AAI_WORKLOAD_TOPIC"] = ''
-node.default["aai-app-config"]["AAI_WORKLOAD_MAX_BATCH_SIZE"] = '100'
-node.default["aai-app-config"]["AAI_WORKLOAD_MAX_AGE_MS"] = '250'
-node.default["aai-app-config"]["AAI_WORKLOAD_MESSAGE_SENT_THREAD_OCCURANCE"] = '50'
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/attributes/aaiWorkloadStatusPublisher.properties.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/attributes/aaiWorkloadStatusPublisher.properties.rb
deleted file mode 100755 (executable)
index 90ecf6f..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-node.default["aai-app-config"]["AAI_WORKLOAD_SERVICE_NAME"] = ''
-node.default["aai-app-config"]["AAI_WORKLOAD_ENVIRONMENT"] = 'TEST'
-node.default["aai-app-config"]["AAI_WORKLOAD_USERNAME"] = ''
-node.default["aai-app-config"]["AAI_WORKLOAD_PASSWORD"] = ''
-node.default["aai-app-config"]["AAI_WORKLOAD_HOST"] = ''
-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EXCHANGE_REQUEST_HANDLERS"] = ''
-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EXCHANGE_REPLY_HANDLERS"] = ''
-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_REQ_TRACE_ON"] = 'true'
-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_ENVIRONMENT"] = 'AFTUAT'
-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EP_CONN_TIMEOUT"] = '15000'
-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_ROUNDTRIP_TIMEOUT_MS"] = '240000'
-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EP_READ_TIMEOUT_MS"] = '50000'
-node.default["aai-app-config"]["AAI_WORKLOAD_SESSION_STICKINESS_REQUIRED"] = 'no'
-node.default["aai-app-config"]["AAI_WORKLOAD_DME2_PREFERRED_ROUTER_FILE_PATH"] = '/opt/app/aai/bundleconfig/etc/appprops/preferredRoute.txt'
-node.default["aai-app-config"]["AAI_WORKLOAD_PARTNER"] = 'BOT_R'
-node.default["aai-app-config"]["AAI_WORKLOAD_ROUTE_OFFER"] = 'MR1'
-node.default["aai-app-config"]["AAI_WORKLOAD_PROTOCOL"] = 'http'
-node.default["aai-app-config"]["AAI_WORKLOAD_STATUS_PUBLISHER_TOPIC"] = ''
-node.default["aai-app-config"]["AAI_WORKLOAD_MAX_BATCH_SIZE"] = '100'
-node.default["aai-app-config"]["AAI_WORKLOAD_MAX_AGE_MS"] = '250'
-node.default["aai-app-config"]["AAI_WORKLOAD_MESSAGE_SENT_THREAD_OCCURANCE"] = '50'
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/attributes/aaiconfig-properties.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/attributes/aaiconfig-properties.rb
deleted file mode 100755 (executable)
index a6df800..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-node.default["aai-app-config"]["AAIENV"] = 'solo'
-node.default["aai-app-config"]["PROJECT_HOME"] = '/opt/app/aai'
-#CATALINA_BASE is PROJECT_HOME + /servers/aai
-node.default["aai-app-config"]["CATALINA_BASE"] = '/servers/aai'
-node.default["aai-app-config"]["LOGROOT"] = '/opt/aai/logroot'
-node.default["aai-app-config"]["JAVA_HOME"] = '/usr/lib/jvm/java-8-openjdk-amd64'
-node.default["aai-app-config"]["TOMCAT_SHUTDOWN_PORT_1"] = '8005'
-node.default["aai-app-config"]["TOMCAT_HTTP_SERVER_PORT_1"] = '8080'
-node.default["aai-app-config"]["TOMCAT_HTTPS_SERVER_PORT_1"] = '8443'
-node.default["aai-app-config"]["TOMCAT_AJP13_CONNECTOR_PORT_1"] = '8009'
-node.default["aai-app-config"]["AAI_SERVER_URL_BASE"] = 'https://localhost:8443/aai/'
-node.default["aai-app-config"]["AAI_SERVER_URL"] = 'https://localhost:8443/aai/v8/'
-node.default["aai-app-config"]["AAI_GLOBAL_CALLBACK_URL"] = 'https://localhost:8443/aai/'
-node.default["aai-app-config"]["AAI_TRUSTSTORE_FILENAME"] = 'aai_keystore'
-node.default["aai-app-config"]["AAI_TRUSTSTORE_PASSWD_X"] = 'OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o'
-node.default["aai-app-config"]["STORAGE_HOSTNAME"] = 'localhost'
-node.default["aai-app-config"]["STORAGE_HBASE_TABLE"] = 'aaigraph.dev'
-node.default["aai-app-config"]["STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT"] = '/hbase-unsecure'
-node.default["aai-app-config"]["TXN_HBASE_TABLE_NAME"] = 'aailogging.dev'
-node.default["aai-app-config"]["TXN_ZOOKEEPER_QUORUM"] = 'localhost'
-node.default["aai-app-config"]["TXN_ZOOKEEPER_PROPERTY_CLIENTPORT"] = '2181'
-node.default["aai-app-config"]["TXN_HBASE_ZOOKEEPER_ZNODE_PARENT"] = '/hbase-unsecure'
-node.default["aai-app-config"]["APPLICATION_SERVERS"] = 'localhost'
-node.default["aai-app-config"]["AAI_NOTIFICATION_CURRENT_VERSION"] = 'v8'
-node.default["aai-app-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS"] = 'UNPROCESSED'
-node.default["aai-app-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_TYPE"] = 'AAI-EVENT'
-node.default["aai-app-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_DOMAIN"] = 'application'
-node.default["aai-app-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_SOURCE_NAME"] = 'aai'
-node.default["aai-app-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_SEQUENCE_NUMBER"] = '0'
-node.default["aai-app-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_SEVERITY"] = 'NORMAL'
-node.default["aai-app-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_VERSION"] = 'v1'
-node.default["aai-app-config"]["AAI_DEFAULT_API_VERSION"] = 'v8'
-node.default["aai-app-config"]["AAI_DMAPP_WORKLOAD_ENABLE_EVENT_PROCESSING"] = 'false'
-node.default["aai-app-config"]["HBASE_COLUMN_TTL_DAYS"] = '15'
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/attributes/logback.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/attributes/logback.rb
deleted file mode 100755 (executable)
index 58ecdf3..0000000
+++ /dev/null
@@ -1 +0,0 @@
-node.default["aai-app-config"]["ORG_OPENECOMP_AAI_LEVEL"] = 'INFO'
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/attributes/preferredRoute.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/attributes/preferredRoute.rb
deleted file mode 100755 (executable)
index dec40c7..0000000
+++ /dev/null
@@ -1 +0,0 @@
-node.default["aai-app-config"]["AAI_WORKLOAD_PREFERRED_ROUTE_KEY"] = 'MR1'
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/metadata.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/metadata.rb
deleted file mode 100755 (executable)
index 26a76d5..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-name             'ajsc-aai-config'
-maintainer       'YOUR_COMPANY_NAME'
-maintainer_email 'YOUR_EMAIL'
-license          'All rights reserved'
-description      'Installs/Configures ajsc-aai-config'
-long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.2.2'
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/recipes/aai-config.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/recipes/aai-config.rb
deleted file mode 100755 (executable)
index 7cbae3a..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-################
-# Update aaiconfig.properties 
-######
-include_recipe 'ajsc-aai-config::createConfigDirectories'
-  
-['aaiconfig.properties'].each do |file|
-  template "#{node['aai-app-config']['PROJECT_HOME']}/bundleconfig/etc/appprops/#{file}" do
-    source "aai-app-config/#{file}"
-    owner "aaiadmin"
-    group "aaiadmin"
-    mode "0644"
-    variables(
-:TOMCAT_SHUTDOWN_PORT_1 => node["aai-app-config"]["TOMCAT_SHUTDOWN_PORT_1"],
-:TOMCAT_HTTP_SERVER_PORT_1 => node["aai-app-config"]["TOMCAT_HTTP_SERVER_PORT_1"],
-:TOMCAT_HTTPS_SERVER_PORT_1 => node["aai-app-config"]["TOMCAT_HTTPS_SERVER_PORT_1"],
-:TOMCAT_AJP13_CONNECTOR_PORT_1 => node["aai-app-config"]["TOMCAT_AJP13_CONNECTOR_PORT_1"],
-:AAI_SERVER_URL_BASE => node["aai-app-config"]["AAI_SERVER_URL_BASE"],
-:AAI_SERVER_URL => node["aai-app-config"]["AAI_SERVER_URL"],
-:AAI_OLDSERVER_URL => node["aai-app-config"]["AAI_OLDSERVER_URL"],
-:AAI_GLOBAL_CALLBACK_URL => node["aai-app-config"]["AAI_GLOBAL_CALLBACK_URL"],
-:AAI_TRUSTSTORE_FILENAME => node["aai-app-config"]["AAI_TRUSTSTORE_FILENAME"],
-:AAI_TRUSTSTORE_PASSWD_X => node["aai-app-config"]["AAI_TRUSTSTORE_PASSWD_X"],
-:AAI_KEYSTORE_FILENAME => node["aai-app-config"]["AAI_KEYSTORE_FILENAME"],
-:AAI_KEYSTORE_PASSWD_X => node["aai-app-config"]["AAI_KEYSTORE_PASSWD_X"],
-:STORAGE_HOSTNAME => node["aai-app-config"]["STORAGE_HOSTNAME"],
-:STORAGE_BACKEND => node["aai-app-config"]["STORAGE_BACKEND"],
-:STORAGE_HBASE_TABLE => node["aai-app-config"]["STORAGE_HBASE_TABLE"],
-:STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT => node["aai-app-config"]["STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT"],
-:HBASE_COLUMN_TTL_DAYS => node["aai-app-config"]["HBASE_COLUMN_TTL_DAYS"],
-:TXN_HBASE_TABLE_NAME => node["aai-app-config"]["TXN_HBASE_TABLE_NAME"],
-:TXN_ZOOKEEPER_QUORUM => node["aai-app-config"]["TXN_ZOOKEEPER_QUORUM"],
-:TXN_ZOOKEEPER_PROPERTY_CLIENTPORT => node["aai-app-config"]["TXN_ZOOKEEPER_PROPERTY_CLIENTPORT"],
-:TXN_HBASE_ZOOKEEPER_ZNODE_PARENT => node["aai-app-config"]["TXN_HBASE_ZOOKEEPER_ZNODE_PARENT"],
-:NOTIFICATION_HBASE_TABLE_NAME => node["aai-app-config"]["NOTIFICATION_HBASE_TABLE_NAME"],
-:APPLICATION_SERVERS => node["aai-app-config"]["APPLICATION_SERVERS"],
-:AAI_NOTIFICATION_CURRENT_VERSION => node["aai-app-config"]["AAI_NOTIFICATION_CURRENT_VERSION"],
-:AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS => node["aai-app-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS"],
-:AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_TYPE => node["aai-app-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_TYPE"],
-:AAI_NOTIFICATION_EVENT_DEFAULT_DOMAIN => node["aai-app-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_DOMAIN"],
-:AAI_NOTIFICATION_EVENT_DEFAULT_SOURCE_NAME => node["aai-app-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_SOURCE_NAME"],
-:AAI_NOTIFICATION_EVENT_DEFAULT_SEQUENCE_NUMBER => node["aai-app-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_SEQUENCE_NUMBER"],
-:AAI_NOTIFICATION_EVENT_DEFAULT_SEVERITY => node["aai-app-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_SEVERITY"],
-:AAI_NOTIFICATION_EVENT_DEFAULT_VERSION => node["aai-app-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_VERSION"],
-:RESOURCE_VERSION_ENABLE_FLAG => node["aai-app-config"]["RESOURCE_VERSION_ENABLE_FLAG"],
-:AAI_DEFAULT_API_VERSION => node["aai-app-config"]["AAI_DEFAULT_API_VERSION"],
-:AAI_DMAPP_WORKLOAD_ENABLE_EVENT_PROCESSING => node["aai-app-config"]["AAI_DMAPP_WORKLOAD_ENABLE_EVENT_PROCESSING"]
-      )
-  end
-end
-
-#remote_directory "/opt/mso/etc/ecomp/mso/config/" do
-#  source "mso-asdc-controller-config"
-#  #cookbook "default is current"
-#  files_mode "0700"
-#  files_owner "jboss"
-#  files_group "jboss"
-#  mode "0755"
-#  owner "jboss"
-#  group "jboss"
-#  overwrite true
-#  recursive true
-#  action :create
-#end
-
-
-################
-# Alternative example1
-# This updates all the timestamps
-# Seting preserve never changes the timestamp when the file is changed
-######
-# ruby_block "copy_recurse" do
-#   block do
-#     FileUtils.cp_r("#{Chef::Config[:file_cache_path]}/cookbooks/mso-config/files/default/mso-api-handler-config/.",\
-#       "/opt/mso/etc/ecomp/mso/config/", :preserve => true)  
-#   end
-#   action :run
-# end
-
-################
-# Alternative example2
-######
-# Dir.glob("#{Chef::Config[:file_cache_path]}/cookbooks/mso-config/files/default/mso-api-handler-config/*").sort.each do |entry|
-#   cookbook_file "/opt/mso/etc/ecomp/mso/config/#{entry}" do
-#     source entry
-#     owner "root"
-#     group "root"
-#     mode 0755
-#   end
-# end 
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/recipes/aai-logback.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/recipes/aai-logback.rb
deleted file mode 100755 (executable)
index 505c44a..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-################
-# Update logback.xml
-######
-  
-['logback.xml'].each do |file|
-  template "#{node['aai-app-config']['PROJECT_HOME']}/bundleconfig/etc/#{file}" do
-    source "aai-app-config/logback.erb"
-    owner "aaiadmin"
-    group "aaiadmin"
-    mode "0777"
-    variables(
-:ORG_OPENECOMP_AAI_LEVEL => node["aai-app-config"]["ORG_OPENECOMP_AAI_LEVEL"]
-      )
-  end
-end
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/recipes/aai-preferredRoute.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/recipes/aai-preferredRoute.rb
deleted file mode 100755 (executable)
index c9f4887..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-['preferredRoute.txt'].each do |file|
-  template "#{node['aai-app-config']['PROJECT_HOME']}/bundleconfig/etc/appprops/#{file}" do
-    source "aai-app-config/preferredRoute.txt"
-    owner "aaiadmin"
-    group "aaiadmin"
-    mode "0644"
-    variables(
-:AAI_WORKLOAD_PREFERRED_ROUTE_KEY => node["aai-app-config"]["AAI_WORKLOAD_PREFERRED_ROUTE_KEY"]
-      )
-  end
-end
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/recipes/aaiWorkloadConsumer.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/recipes/aaiWorkloadConsumer.rb
deleted file mode 100755 (executable)
index 676e5ce..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-['aaiWorkloadConsumer.properties'].each do |file|
-  template "#{node['aai-app-config']['PROJECT_HOME']}/bundleconfig/etc/appprops/#{file}" do
-    source "aai-app-config/aaiWorkloadConsumer.properties"
-    owner "aaiadmin"
-    group "aaiadmin"
-    mode "0644"
-    variables(
-:AAI_WORKLOAD_SERVICE_NAME => node["aai-app-config"]["AAI_WORKLOAD_SERVICE_NAME"],
-:AAI_WORKLOAD_ENVIRONMENT => node["aai-app-config"]["AAI_WORKLOAD_ENVIRONMENT"],
-:AAI_WORKLOAD_USERNAME => node["aai-app-config"]["AAI_WORKLOAD_USERNAME"],
-:AAI_WORKLOAD_PASSWORD => node["aai-app-config"]["AAI_WORKLOAD_PASSWORD"],
-:AAI_WORKLOAD_HOST => node["aai-app-config"]["AAI_WORKLOAD_HOST"],
-:AAI_WORKLOAD_AFT_DME2_EXCHANGE_REQUEST_HANDLERS => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EXCHANGE_REQUEST_HANDLERS"],
-:AAI_WORKLOAD_AFT_DME2_EXCHANGE_REPLY_HANDLERS => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EXCHANGE_REPLY_HANDLERS"],
-:AAI_WORKLOAD_AFT_DME2_REQ_TRACE_ON => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_REQ_TRACE_ON"],
-:AAI_WORKLOAD_AFT_ENVIRONMENT => node["aai-app-config"]["AAI_WORKLOAD_AFT_ENVIRONMENT"],
-:AAI_WORKLOAD_AFT_DME2_EP_CONN_TIMEOUT => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EP_CONN_TIMEOUT"],
-:AAI_WORKLOAD_AFT_DME2_ROUNDTRIP_TIMEOUT_MS => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_ROUNDTRIP_TIMEOUT_MS"],
-:AAI_WORKLOAD_AFT_DME2_EP_READ_TIMEOUT_MS => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EP_READ_TIMEOUT_MS"],
-:AAI_WORKLOAD_SESSION_STICKINESS_REQUIRED => node["aai-app-config"]["AAI_WORKLOAD_SESSION_STICKINESS_REQUIRED"],
-:AAI_WORKLOAD_DME2_PREFERRED_ROUTER_FILE_PATH => node["aai-app-config"]["AAI_WORKLOAD_DME2_PREFERRED_ROUTER_FILE_PATH"],
-:AAI_WORKLOAD_PARTNER => node["aai-app-config"]["AAI_WORKLOAD_PARTNER"], 
-:AAI_WORKLOAD_ROUTE_OFFER => node["aai-app-config"]["AAI_WORKLOAD_ROUTE_OFFER"], 
-:AAI_WORKLOAD_PROTOCOL => node["aai-app-config"]["AAI_WORKLOAD_PROTOCOL"],
-:AAI_WORKLOAD_FILTER => node["aai-app-config"]["AAI_WORKLOAD_FILTER"],
-:AAI_WORKLOAD_TOPIC => node["aai-app-config"]["AAI_WORKLOAD_TOPIC"],
-:AAI_WORKLOAD_ID => node["aai-app-config"]["AAI_WORKLOAD_ID"],
-:AAI_WORKLOAD_TIMEOUT => node["aai-app-config"]["AAI_WORKLOAD_TIMEOUT"],
-:AAI_WORKLOAD_LIMIT => node["aai-app-config"]["AAI_WORKLOAD_LIMIT"]
-      )
-  end
-end
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/recipes/aaiWorkloadPublisher.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/recipes/aaiWorkloadPublisher.rb
deleted file mode 100755 (executable)
index 815f29c..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-['aaiWorkloadPublisher.properties'].each do |file|
-  template "#{node['aai-app-config']['PROJECT_HOME']}/bundleconfig/etc/appprops/#{file}" do
-    source "aai-app-config/aaiWorkloadPublisher.properties"
-    owner "aaiadmin"
-    group "aaiadmin"
-    mode "0644"
-    variables(
-:AAI_WORKLOAD_SERVICE_NAME => node["aai-app-config"]["AAI_WORKLOAD_SERVICE_NAME"],
-:AAI_WORKLOAD_ENVIRONMENT => node["aai-app-config"]["AAI_WORKLOAD_ENVIRONMENT"],
-:AAI_WORKLOAD_USERNAME => node["aai-app-config"]["AAI_WORKLOAD_USERNAME"],
-:AAI_WORKLOAD_PASSWORD => node["aai-app-config"]["AAI_WORKLOAD_PASSWORD"],
-:AAI_WORKLOAD_HOST => node["aai-app-config"]["AAI_WORKLOAD_HOST"],
-:AAI_WORKLOAD_AFT_DME2_EXCHANGE_REQUEST_HANDLERS => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EXCHANGE_REQUEST_HANDLERS"],
-:AAI_WORKLOAD_AFT_DME2_EXCHANGE_REPLY_HANDLERS => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EXCHANGE_REPLY_HANDLERS"],
-:AAI_WORKLOAD_AFT_DME2_REQ_TRACE_ON => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_REQ_TRACE_ON"],
-:AAI_WORKLOAD_AFT_ENVIRONMENT => node["aai-app-config"]["AAI_WORKLOAD_AFT_ENVIRONMENT"],
-:AAI_WORKLOAD_AFT_DME2_EP_CONN_TIMEOUT => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EP_CONN_TIMEOUT"],
-:AAI_WORKLOAD_AFT_DME2_ROUNDTRIP_TIMEOUT_MS => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_ROUNDTRIP_TIMEOUT_MS"],
-:AAI_WORKLOAD_AFT_DME2_EP_READ_TIMEOUT_MS => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EP_READ_TIMEOUT_MS"],
-:AAI_WORKLOAD_SESSION_STICKINESS_REQUIRED => node["aai-app-config"]["AAI_WORKLOAD_SESSION_STICKINESS_REQUIRED"],
-:AAI_WORKLOAD_DME2_PREFERRED_ROUTER_FILE_PATH => node["aai-app-config"]["AAI_WORKLOAD_DME2_PREFERRED_ROUTER_FILE_PATH"],
-:AAI_WORKLOAD_PARTNER => node["aai-app-config"]["AAI_WORKLOAD_PARTNER"], 
-:AAI_WORKLOAD_ROUTE_OFFER => node["aai-app-config"]["AAI_WORKLOAD_ROUTE_OFFER"], 
-:AAI_WORKLOAD_PROTOCOL => node["aai-app-config"]["AAI_WORKLOAD_PROTOCOL"],
-:AAI_WORKLOAD_TOPIC => node["aai-app-config"]["AAI_WORKLOAD_TOPIC"],
-:AAI_WORKLOAD_MAX_BATCH_SIZE => node["aai-app-config"]["AAI_WORKLOAD_MAX_BATCH_SIZE"],
-:AAI_WORKLOAD_MAX_AGE_MS => node["aai-app-config"]["AAI_WORKLOAD_MAX_AGE_MS"],
-:AAI_WORKLOAD_MESSAGE_SENT_THREAD_OCCURANCE => node["aai-app-config"]["AAI_WORKLOAD_MESSAGE_SENT_THREAD_OCCURANCE"]
-      )
-  end
-end
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/recipes/aaiWorkloadStatusPublisher.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/recipes/aaiWorkloadStatusPublisher.rb
deleted file mode 100755 (executable)
index 032737e..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-['aaiWorkloadStatusPublisher.properties'].each do |file|
-  template "#{node['aai-app-config']['PROJECT_HOME']}/bundleconfig/etc/appprops/#{file}" do
-    source "aai-app-config/aaiWorkloadStatusPublisher.properties"
-    owner "aaiadmin"
-    group "aaiadmin"
-    mode "0644"
-    variables(
-:AAI_WORKLOAD_SERVICE_NAME => node["aai-app-config"]["AAI_WORKLOAD_SERVICE_NAME"],
-:AAI_WORKLOAD_ENVIRONMENT => node["aai-app-config"]["AAI_WORKLOAD_ENVIRONMENT"],
-:AAI_WORKLOAD_USERNAME => node["aai-app-config"]["AAI_WORKLOAD_USERNAME"],
-:AAI_WORKLOAD_PASSWORD => node["aai-app-config"]["AAI_WORKLOAD_PASSWORD"],
-:AAI_WORKLOAD_HOST => node["aai-app-config"]["AAI_WORKLOAD_HOST"],
-:AAI_WORKLOAD_AFT_DME2_EXCHANGE_REQUEST_HANDLERS => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EXCHANGE_REQUEST_HANDLERS"],
-:AAI_WORKLOAD_AFT_DME2_EXCHANGE_REPLY_HANDLERS => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EXCHANGE_REPLY_HANDLERS"],
-:AAI_WORKLOAD_AFT_DME2_REQ_TRACE_ON => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_REQ_TRACE_ON"],
-:AAI_WORKLOAD_AFT_ENVIRONMENT => node["aai-app-config"]["AAI_WORKLOAD_AFT_ENVIRONMENT"],
-:AAI_WORKLOAD_AFT_DME2_EP_CONN_TIMEOUT => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EP_CONN_TIMEOUT"],
-:AAI_WORKLOAD_AFT_DME2_ROUNDTRIP_TIMEOUT_MS => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_ROUNDTRIP_TIMEOUT_MS"],
-:AAI_WORKLOAD_AFT_DME2_EP_READ_TIMEOUT_MS => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EP_READ_TIMEOUT_MS"],
-:AAI_WORKLOAD_SESSION_STICKINESS_REQUIRED => node["aai-app-config"]["AAI_WORKLOAD_SESSION_STICKINESS_REQUIRED"],
-:AAI_WORKLOAD_DME2_PREFERRED_ROUTER_FILE_PATH => node["aai-app-config"]["AAI_WORKLOAD_DME2_PREFERRED_ROUTER_FILE_PATH"],
-:AAI_WORKLOAD_PARTNER => node["aai-app-config"]["AAI_WORKLOAD_PARTNER"], 
-:AAI_WORKLOAD_ROUTE_OFFER => node["aai-app-config"]["AAI_WORKLOAD_ROUTE_OFFER"], 
-:AAI_WORKLOAD_PROTOCOL => node["aai-app-config"]["AAI_WORKLOAD_PROTOCOL"],
-:AAI_WORKLOAD_MAX_BATCH_SIZE => node["aai-app-config"]["AAI_WORKLOAD_MAX_BATCH_SIZE"],
-:AAI_WORKLOAD_MAX_AGE_MS => node["aai-app-config"]["AAI_WORKLOAD_MAX_AGE_MS"],
-:AAI_WORKLOAD_MESSAGE_SENT_THREAD_OCCURANCE => node["aai-app-config"]["AAI_WORKLOAD_MESSAGE_SENT_THREAD_OCCURANCE"],
-:AAI_WORKLOAD_STATUS_PUBLISHER_TOPIC => node["aai-app-config"]["AAI_WORKLOAD_STATUS_PUBLISHER_TOPIC"]
-      )
-  end
-end
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/recipes/createConfigDirectories.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/recipes/createConfigDirectories.rb
deleted file mode 100755 (executable)
index eac5cd1..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# Create or update the needed directories/links.
-# If the directory already exists, it is updated to match
-# 
-# LOGROOT should already be created by the SWM installation script
-# It needs to run as root 
-
-execute "mv logs logs.bak" do
-    only_if { ::File.directory?("#{node['aai-app-config']['PROJECT_HOME']}/logs") }
-    user 'aaiadmin'
-    group 'aaiadmin'
-    cwd "#{node['aai-app-config']['PROJECT_HOME']}"
-end
-
-[ 
-       "#{node['aai-app-config']['LOGROOT']}/AAI",
-  "#{node['aai-app-config']['LOGROOT']}/AAI/data",
-       "#{node['aai-app-config']['LOGROOT']}/AAI/misc",
-  "#{node['aai-app-config']['LOGROOT']}/AAI/ajsc-jetty" ].each do |path|
-  directory path do
-    owner 'aaiadmin'
-    group 'aaiadmin'
-    mode '0755'
-    recursive=true
-    action :create
-  end
-end
-
-[ "#{node['aai-app-config']['PROJECT_HOME']}/bundleconfig/etc/auth" ].each do |path|
-  directory path do
-    owner 'aaiadmin'
-    group 'aaiadmin'
-    mode '0777'
-    recursive=true
-    action :create
-  end
-end
-#Application logs
-link "#{node['aai-app-config']['PROJECT_HOME']}/logs" do
-  to "#{node['aai-app-config']['LOGROOT']}/AAI"
-  owner 'aaiadmin'
-  group 'aaiadmin'
-  mode '0755'
-end
-
-#Make a link from /opt/app/aai/scripts to /opt/app/aai/bin
-link "#{node['aai-app-config']['PROJECT_HOME']}/scripts" do
-  to "#{node['aai-app-config']['PROJECT_HOME']}/bin"
-  owner 'aaiadmin'
-  group 'aaiadmin'
-  mode '0755'
-end
-
-#Process logs??
-#ln -s ${LOGROOT}/aai/servers/${server}/logs ${TRUE_PROJECT_HOME}/servers/${server}/logs
-#link "#{node['aai-app-config']['PROJECT_HOME']}/servers/aai/logs" do
-# to "#{node['aai-app-config']['LOGROOT']}/aai/servers/aai/logs"
-#  owner 'aaiadmin'
-# group 'aaiadmin'
-#  mode '0755'
-#end
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/templates/default/aai-app-config/aaiWorkloadConsumer.properties b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/templates/default/aai-app-config/aaiWorkloadConsumer.properties
deleted file mode 100755 (executable)
index 81b0e30..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-TransportType=DME2
-Latitude=47.778998
-Longitude=-122.182883
-Version=1.0
-ServiceName=<%= @AAI_WORKLOAD_SERVICE_NAME %>
-Environment=<%= @AAI_WORKLOAD_ENVIRONMENT %>
-Partner=<%= @AAI_WORKLOAD_PARTNER %>
-routeOffer=<%= @AAI_WORKLOAD_ROUTE_OFFER %>
-SubContextPath=/
-Protocol=<%= @AAI_WORKLOAD_PROTOCOL %>
-MethodType=GET
-username=<%= @AAI_WORKLOAD_USERNAME %>
-password=<%= @AAI_WORKLOAD_PASSWORD %>
-contenttype=application/json
-host=<%= @AAI_WORKLOAD_HOST %>
-topic=<%= @AAI_WORKLOAD_TOPIC %>
-group=aaiWorkloadConsumer
-id=<%= @AAI_WORKLOAD_ID %>
-timeout=<%= @AAI_WORKLOAD_TIMEOUT %>
-limit=<%= @AAI_WORKLOAD_LIMIT %>
-filter=<%= @AAI_WORKLOAD_FILTER %>
-AFT_DME2_EXCHANGE_REQUEST_HANDLERS=<%= @AAI_WORKLOAD_AFT_DME2_EXCHANGE_REQUEST_HANDLERS %>
-AFT_DME2_EXCHANGE_REPLY_HANDLERS=<%= @AAI_WORKLOAD_AFT_DME2_EXCHANGE_REPLY_HANDLERS %>
-AFT_DME2_REQ_TRACE_ON=<%= @AAI_WORKLOAD_AFT_DME2_REQ_TRACE_ON %>
-AFT_ENVIRONMENT=<%= @AAI_WORKLOAD_AFT_ENVIRONMENT %>
-AFT_DME2_EP_CONN_TIMEOUT=<%= @AAI_WORKLOAD_AFT_DME2_EP_CONN_TIMEOUT %>
-AFT_DME2_ROUNDTRIP_TIMEOUT_MS=<%= @AAI_WORKLOAD_AFT_DME2_ROUNDTRIP_TIMEOUT_MS %>
-AFT_DME2_EP_READ_TIMEOUT_MS=<%= @AAI_WORKLOAD_AFT_DME2_EP_READ_TIMEOUT_MS %>
-sessionstickinessrequired=<%= @AAI_WORKLOAD_SESSION_STICKINESS_REQUIRED %>
-DME2preferredRouterFilePath=<%= @AAI_WORKLOAD_DME2_PREFERRED_ROUTER_FILE_PATH %>
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/templates/default/aai-app-config/aaiWorkloadPublisher.properties b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/templates/default/aai-app-config/aaiWorkloadPublisher.properties
deleted file mode 100755 (executable)
index 87a47bc..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-TransportType=DME2
-Latitude=47.778998
-Longitude=-122.182883
-Version=1.0
-ServiceName=<%= @AAI_WORKLOAD_SERVICE_NAME %>
-Environment=<%= @AAI_WORKLOAD_ENVIRONMENT %>
-Partner=<%= @AAI_WORKLOAD_PARTNER %>
-routeOffer=<%= @AAI_WORKLOAD_ROUTE_OFFER %>
-SubContextPath=/
-Protocol=<%= @AAI_WORKLOAD_PROTOCOL %>
-MethodType=POST
-username=<%= @AAI_WORKLOAD_USERNAME %>
-password=<%= @AAI_WORKLOAD_PASSWORD %>
-contenttype=application/json
-host=<%= @AAI_WORKLOAD_HOST %>
-topic=<%= @AAI_WORKLOAD_TOPIC %>
-partition=AAI_WORKLOAD
-maxBatchSize=<%= @AAI_WORKLOAD_MAX_BATCH_SIZE %>
-maxAgeMs=<%= @AAI_WORKLOAD_MAX_AGE_MS %>
-AFT_DME2_EXCHANGE_REQUEST_HANDLERS=<%= @AAI_WORKLOAD_AFT_DME2_EXCHANGE_REQUEST_HANDLERS %>
-AFT_DME2_EXCHANGE_REPLY_HANDLERS=<%= @AAI_WORKLOAD_AFT_DME2_EXCHANGE_REPLY_HANDLERS %>
-AFT_DME2_REQ_TRACE_ON=<%= @AAI_WORKLOAD_AFT_DME2_REQ_TRACE_ON %>
-AFT_ENVIRONMENT=<%= @AAI_WORKLOAD_AFT_ENVIRONMENT %>
-AFT_DME2_EP_CONN_TIMEOUT=<%= @AAI_WORKLOAD_AFT_DME2_EP_CONN_TIMEOUT %>
-AFT_DME2_ROUNDTRIP_TIMEOUT_MS=<%= @AAI_WORKLOAD_AFT_DME2_ROUNDTRIP_TIMEOUT_MS %>
-AFT_DME2_EP_READ_TIMEOUT_MS=<%= @AAI_WORKLOAD_AFT_DME2_EP_READ_TIMEOUT_MS %>
-sessionstickinessrequired=<%= @AAI_WORKLOAD_SESSION_STICKINESS_REQUIRED %>
-DME2preferredRouterFilePath=<%= @AAI_WORKLOAD_DME2_PREFERRED_ROUTER_FILE_PATH %>
-MessageSentThreadOccurance=<%= @AAI_WORKLOAD_MESSAGE_SENT_THREAD_OCCURANCE %>
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/templates/default/aai-app-config/aaiWorkloadStatusPublisher.properties b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/templates/default/aai-app-config/aaiWorkloadStatusPublisher.properties
deleted file mode 100755 (executable)
index 73cc1c9..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-TransportType=DME2
-Latitude=47.778998
-Longitude=-122.182883
-Version=1.0
-ServiceName=<%= @AAI_WORKLOAD_SERVICE_NAME %>
-Environment=<%= @AAI_WORKLOAD_ENVIRONMENT %>
-Partner=<%= @AAI_WORKLOAD_PARTNER %>
-routeOffer=<%= @AAI_WORKLOAD_ROUTE_OFFER %>
-SubContextPath=/
-Protocol=<%= @AAI_WORKLOAD_PROTOCOL %>
-MethodType=POST
-username=<%= @AAI_WORKLOAD_USERNAME %>
-password=<%= @AAI_WORKLOAD_PASSWORD %>
-contenttype=application/json
-host=<%= @AAI_WORKLOAD_HOST %>
-topic=<%= @AAI_WORKLOAD_STATUS_PUBLISHER_TOPIC %>
-partition=AAI_WORKLOAD
-maxBatchSize=<%= @AAI_WORKLOAD_MAX_BATCH_SIZE %>
-maxAgeMs=<%= @AAI_WORKLOAD_MAX_AGE_MS %>
-AFT_DME2_EXCHANGE_REQUEST_HANDLERS=<%= @AAI_WORKLOAD_AFT_DME2_EXCHANGE_REQUEST_HANDLERS %>
-AFT_DME2_EXCHANGE_REPLY_HANDLERS=<%= @AAI_WORKLOAD_AFT_DME2_EXCHANGE_REPLY_HANDLERS %>
-AFT_DME2_REQ_TRACE_ON=<%= @AAI_WORKLOAD_AFT_DME2_REQ_TRACE_ON %>
-AFT_ENVIRONMENT=<%= @AAI_WORKLOAD_AFT_ENVIRONMENT %>
-AFT_DME2_EP_CONN_TIMEOUT=<%= @AAI_WORKLOAD_AFT_DME2_EP_CONN_TIMEOUT %>
-AFT_DME2_ROUNDTRIP_TIMEOUT_MS=<%= @AAI_WORKLOAD_AFT_DME2_ROUNDTRIP_TIMEOUT_MS %>
-AFT_DME2_EP_READ_TIMEOUT_MS=<%= @AAI_WORKLOAD_AFT_DME2_EP_READ_TIMEOUT_MS %>
-sessionstickinessrequired=<%= @AAI_WORKLOAD_SESSION_STICKINESS_REQUIRED %>
-DME2preferredRouterFilePath=<%= @AAI_WORKLOAD_DME2_PREFERRED_ROUTER_FILE_PATH %>
-MessageSentThreadOccurance=<%= @AAI_WORKLOAD_MESSAGE_SENT_THREAD_OCCURANCE %>
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/templates/default/aai-app-config/aft.properties b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/templates/default/aai-app-config/aft.properties
deleted file mode 100755 (executable)
index d3165d2..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-com.att.aft.discovery.client.environment=<%= @COM_ATT_AFT_DISCOVERY_CLIENT_ENVIRONMENT %>
-com.att.aft.discovery.client.latitude=<%= @COM_ATT_AFT_DISCOVERY_CLIENT_LATITUDE %>
-com.att.aft.discovery.client.longitude=<%= @COM_ATT_AFT_DISCOVERY_CLIENT_LONGITUDE %>
-com.att.aft.alias=ecomp-aai
-com.att.aft.keyStore=/opt/app/aai/bundleconfig/etc/m04353t.jks
-com.att.aft.keyStorePassword=<%= @COM_ATT_AFT_KEY_STORE_PASSWORD %>
-com.att.aft.trustStore=/opt/app/aai/bundleconfig/etc/m04353t.jks
-com.att.aft.trustStorePassword=<%= @COM_ATT_AFT_TRUST_STORE_PASSWORD %>
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/templates/default/aai-app-config/logback.erb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/ajsc-aai-config/templates/default/aai-app-config/logback.erb
deleted file mode 100755 (executable)
index e438b89..0000000
+++ /dev/null
@@ -1,298 +0,0 @@
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-       <contextName>${module.ajsc.namespace.name}</contextName>
-       <jmxConfigurator />
-       <property name="logDirectory" value="${AJSC_HOME}/logs" />
-       
-       <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-               <filter class="ch.qos.logback.classic.filter.LevelFilter">
-                       <level>ERROR</level>
-                       <onMatch>ACCEPT</onMatch>
-                       <onMismatch>DENY</onMismatch>
-               </filter>
-               <encoder>
-                       <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n</pattern>
-               </encoder>
-       </appender>
-       
-       <appender name="METRIC" class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.LevelFilter">
-                       <level>INFO</level>
-                       <onMatch>ACCEPT</onMatch>
-                       <onMismatch>DENY</onMismatch>
-               </filter>
-               <file>${logDirectory}/rest/metrics.log</file>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/rest/metrics.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       <appender name="asyncMETRIC" class="ch.qos.logback.classic.AsyncAppender">
-               <queueSize>1000</queueSize>
-               <appender-ref ref="METRIC" />
-       </appender>
-       
-       <appender name="DEBUG"  class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.LevelFilter">
-                       <level>DEBUG</level>
-                       <onMatch>ACCEPT</onMatch>
-                       <onMismatch>DENY</onMismatch>
-               </filter>
-               <file>${logDirectory}/rest/debug.log</file>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/rest/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       <appender name="asyncDEBUG" class="ch.qos.logback.classic.AsyncAppender">
-               <queueSize>1000</queueSize>
-               <appender-ref ref="DEBUG" />
-       </appender>
-       
-       <appender name="ERROR"  class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-                       <level>WARN</level>
-               </filter>
-               <file>${logDirectory}/rest/error.log</file>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/rest/error.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       <appender name="asyncERROR" class="ch.qos.logback.classic.AsyncAppender">
-               <queueSize>1000</queueSize>
-               <appender-ref ref="ERROR" />
-       </appender>
-       
-       <appender name="AUDIT"  class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <file>${logDirectory}/rest/audit.log</file>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/rest/audit.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       <appender name="asyncAUDIT" class="ch.qos.logback.classic.AsyncAppender">
-               <queueSize>1000</queueSize>
-               <appender-ref ref="AUDIT" />
-       </appender>
-       
-       <appender name="dmaapAAIWorkloadConsumer"       class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-                       <level>WARN</level>
-               </filter>
-               <File>${logDirectory}/dmaapAAIWorkloadConsumer/error.log</File>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/dmaapAAIWorkloadConsumer/error.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       
-       <appender name="dmaapAAIWorkloadConsumerdebug"  class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.LevelFilter">
-                       <level>DEBUG</level>
-                       <onMatch>ACCEPT</onMatch>
-                       <onMismatch>DENY</onMismatch>
-               </filter>
-               <File>${logDirectory}/dmaapAAIWorkloadConsumer/debug.log</File>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/dmaapAAIWorkloadConsumer/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       <appender name="dmaapAAIWorkloadConsumermetric" class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.LevelFilter">
-                       <level>INFO</level>
-                       <onMatch>ACCEPT</onMatch>
-                       <onMismatch>DENY</onMismatch>
-               </filter>
-               <File>${logDirectory}/dmaapAAIWorkloadConsumer/metrics.log</File>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/dmaapAAIWorkloadConsumer/metrics.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       
-       <!-- Spring related loggers -->
-       <logger name="org.springframework" level="WARN" />
-       <logger name="org.springframework.beans" level="WARN" />
-       <logger name="org.springframework.web" level="WARN" />
-       <logger name="com.blog.spring.jms" level="WARN" />
-       
-       <!-- AJSC Services (bootstrap services) -->
-       <logger name="ajsc" level="WARN" />
-       <logger name="ajsc.RouteMgmtService" level="WARN" />
-       <logger name="ajsc.ComputeService" level="WARN" />
-       <logger name="ajsc.VandelayService" level="WARN" />
-       <logger name="ajsc.FilePersistenceService" level="WARN" />
-       <logger name="ajsc.UserDefinedJarService" level="WARN" />
-       <logger name="ajsc.UserDefinedBeansDefService" level="WARN" />
-       <logger name="ajsc.LoggingConfigurationService" level="WARN" />
-       
-       <!-- AJSC related loggers (DME2 Registration, csi logging, restlet, servlet     logging) -->
-       <logger name="ajsc.utils" level="WARN" />
-       <logger name="ajsc.utils.DME2Helper" level="WARN" />
-       <logger name="ajsc.filters" level="WARN" />
-       <logger name="ajsc.beans.interceptors" level="WARN" />
-       <logger name="ajsc.restlet" level="WARN" />
-       <logger name="ajsc.servlet" level="WARN" />
-       <logger name="com.att.ajsc" level="WARN" />
-       <logger name="com.att.ajsc.csi.logging" level="WARN" />
-       <logger name="com.att.ajsc.filemonitor" level="WARN" />
-       
-       <!-- Other Loggers that may help troubleshoot -->
-       <logger name="net.sf" level="WARN" />
-       <logger name="org.apache.commons.httpclient" level="WARN" />
-       <logger name="org.apache.commons" level="WARN" />
-       <logger name="org.apache.coyote" level="WARN" />
-       <logger name="org.apache.jasper" level="WARN" />
-       
-       <!-- Camel Related Loggers (including restlet/servlet/jaxrs/cxf logging.        May aid in troubleshooting) -->
-       <logger name="org.apache.camel" level="WARN" />
-       <logger name="org.apache.cxf" level="WARN" />
-       <logger name="org.apache.camel.processor.interceptor" level="WARN" />
-       <logger name="org.apache.cxf.jaxrs.interceptor" level="WARN" />
-       <logger name="org.apache.cxf.service" level="WARN" />
-       <logger name="org.restlet" level="WARN" />
-       <logger name="org.apache.camel.component.restlet" level="WARN" />
-       
-       <!-- logback internals logging -->
-       <logger name="ch.qos.logback.classic" level="WARN" />
-       <logger name="ch.qos.logback.core" level="WARN" />
-       
-       <!-- logback jms appenders & loggers definition starts here -->
-       <appender name="auditLogs"      class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.ThresholdFilter"/>
-               <file>${logDirectory}/perf-audit/Audit-${lrmRVer}-${lrmRO}-${Pid}.log</file>
-               <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-                       <fileNamePattern>${logDirectory}/perf-audit/Audit-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip</fileNamePattern>
-                       <minIndex>1</minIndex>
-                       <maxIndex>9</maxIndex>
-               </rollingPolicy>
-               <triggeringPolicy       class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-                       <maxFileSize>5MB</maxFileSize>
-               </triggeringPolicy>
-               <encoder>
-                       <pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern>
-               </encoder>
-       </appender>
-       <appender name="perfLogs"       class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.ThresholdFilter"/>
-               <file>${logDirectory}/perf-audit/Perform-${lrmRVer}-${lrmRO}-${Pid}.log</file>
-               <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-                       <fileNamePattern>${logDirectory}/perf-audit/Perform-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip</fileNamePattern>
-                       <minIndex>1</minIndex>
-                       <maxIndex>9</maxIndex>
-               </rollingPolicy>
-               <triggeringPolicy       class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-                       <maxFileSize>5MB</maxFileSize>
-               </triggeringPolicy>
-               <encoder>
-                       <pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern>
-               </encoder>
-       </appender>
-<!--   <if condition='property("JMS_BROKER").contains("WMQ")'>
-               <then>
-                       <appender name="Audit-Record-Queue" class="ajsc.JMSQueueAppender">
-                               <param name="InitialContextFactoryName" value="${JMS_WMQ_INITIAL_CONNECTION_FACTORY_NAME}" />
-                               <param name="ProviderURL" value="${JMS_WMQ_PROVIDER_URL}" />
-                               <param name="DestinationName" value="${JMS_WMQ_AUDIT_DESTINATION_NAME}" />
-                               <param name="ConnectionFactoryName" value="${JMS_WMQ_CONNECTION_FACTORY_NAME}" />
-                       </appender>
-                       <appender name="Performance-Tracker-Queue" class="ajsc.JMSQueueAppender">
-                               <param name="InitialContextFactoryName" value="${JMS_WMQ_INITIAL_CONNECTION_FACTORY_NAME}" />
-                               <param name="ProviderURL" value="${JMS_WMQ_PROVIDER_URL}" />
-                               <param name="DestinationName" value="${JMS_WMQ_PERF_DESTINATION_NAME}" />
-                               <param name="ConnectionFactoryName" value="${JMS_WMQ_CONNECTION_FACTORY_NAME}" />
-                       </appender>
-               </then>
-               <else>-->
-                       <!-- logback jms appenders definition starts here -->
-<!--                   <appender name="Audit-Record-Queue" class="ajsc.JMSQueueAppender">
-                               <param name="InitialContextFactoryName" value="com.tibco.tibjms.naming.TibjmsInitialContextFactory" />
-                               <param name="ProviderURL" value="${JMS_TIBCO_PROVIDER_URL}" />
-                               <param name="userName" value="${JMS_LOGGER_USER_NAME}" />
-                               <param name="password" value="${JMS_LOGGER_PASSWORD}" />
-                               <QueueBindingName>${JMS_LOGGER_AUDIT_QUEUE_BINDING}</QueueBindingName>
-                       </appender>
-                       <appender name="Performance-Tracker-Queue" class="ajsc.JMSQueueAppender">
-                               <param name="InitialContextFactoryName" value="com.tibco.tibjms.naming.TibjmsInitialContextFactory" />
-                               <param name="ProviderURL" value="${JMS_TIBCO_PROVIDER_URL}" />
-                               <param name="userName" value="${JMS_LOGGER_USER_NAME}" />
-                               <param name="password" value="${JMS_LOGGER_PASSWORD}" />
-                               <QueueBindingName>${JMS_LOGGER_PERF_QUEUE_BINDING}</QueueBindingName>
-                       </appender>
-               </else>
-       </if> -->
-       <appender name="ASYNC-audit" class="ch.qos.logback.classic.AsyncAppender">
-               <queueSize>1000</queueSize>
-               <discardingThreshold>0</discardingThreshold>
-               <appender-ref ref="Audit-Record-Queue" />
-       </appender>
-       <logger name="AuditRecord" level="INFO" additivity="false">
-               <appender-ref ref="ASYNC-audit" />
-               <appender-ref ref="auditLogs" />
-       </logger>
-       <logger name="AuditRecord_DirectCall" level="INFO" additivity="false">
-               <appender-ref ref="ASYNC-audit" />
-               <appender-ref ref="auditLogs" />
-       </logger>
-       <appender name="ASYNC-perf" class="ch.qos.logback.classic.AsyncAppender">
-               <queueSize>1000</queueSize>
-               <discardingThreshold>0</discardingThreshold>
-               <appender-ref ref="Performance-Tracker-Queue" />
-       </appender>
-       <logger name="PerfTrackerRecord" level="INFO" additivity="false">
-               <appender-ref ref="ASYNC-perf" />
-               <appender-ref ref="perfLogs" />
-       </logger>
-       <!-- logback jms appenders & loggers definition ends here -->
-       
-       <logger name="org.openecomp.aai.dmaap" level="DEBUG" additivity="false">
-               <appender-ref ref="dmaapAAIWorkloadConsumer" />
-               <appender-ref ref="dmaapAAIWorkloadConsumerdebug" />
-               <appender-ref ref="dmaapAAIWorkloadConsumermetric" />
-       </logger>
-       
-       <logger name="org.openecomp.aai" level="<%= @ORG_OPENECOMP_AAI_LEVEL %>" additivity="false">
-               <appender-ref ref="asyncDEBUG" />
-               <appender-ref ref="asyncERROR" />
-               <appender-ref ref="asyncMETRIC" />
-       </logger>
-       <logger name="org.openecomp.aai.AUDITLOGGER" level="INFO" additivity="false">
-                       <appender-ref ref="asyncAUDIT" /> 
-    </logger>
-    
-       <logger name="org.apache" level="WARN" />
-       <logger name="org.zookeeper" level="WARN" />
-       <logger name="com.thinkaurelius" level="WARN" />
-       
-       <!-- ============================================================================ -->
-       <!-- General EELF logger -->
-       <!-- ============================================================================ -->
-       <logger name="com.att.eelf" level="WARN" additivity="false">
-               <appender-ref ref="asyncDEBUG" />
-               <appender-ref ref="asyncERROR" />
-               <appender-ref ref="asyncMETRIC" />
-               <appender-ref ref="asyncAUDIT" />
-       </logger>
-       
-       <root level="WARN">
-               <appender-ref ref="asyncDEBUG" />
-               <appender-ref ref="asyncERROR" />
-               <appender-ref ref="asyncMETRIC" />
-               <appender-ref ref="asyncAUDIT" />
-       </root>
-</configuration>
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/runlist-app-server.json b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/runlist-app-server.json
deleted file mode 100755 (executable)
index a15ddbf..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "run_list": [
-    "recipe[ajsc-aai-config::aai-config]",
-    "recipe[ajsc-aai-config::aai-logback]",
-    "recipe[ajsc-aai-config::aai-preferredRoute]",
-    "recipe[ajsc-aai-config::aaiWorkloadConsumer]",
-    "recipe[ajsc-aai-config::aaiWorkloadPublisher]",
-    "recipe[ajsc-aai-config::aaiWorkloadStatusPublisher]",
-    "recipe[ajsc-aai-config::createConfigDirectories]",
-    "recipe[ajsc-aai-auth::aai-keystore]"
-  ]
-}
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/user/CHANGELOG.md b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/user/CHANGELOG.md
deleted file mode 100755 (executable)
index dec3520..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-user CHANGELOG
-==============
-
-This file is used to list changes made in each version of the user cookbook.
-
-0.1.0
------
-- [your_name] - Initial release of user
-
-- - -
-Check the [Markdown Syntax Guide](http://daringfireball.net/projects/markdown/syntax) for help with Markdown.
-
-The [Github Flavored Markdown page](http://github.github.com/github-flavored-markdown/) describes the differences between markdown on github and standard markdown.
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/user/README.md b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/user/README.md
deleted file mode 100755 (executable)
index 7d85a9f..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-user Cookbook
-=============
-Configures users and mechids
-
-Requirements
-------------
-
-Attributes
-----------
-#### user::mech_users
-<table>
-  <tr>
-    <th>Key</th>
-    <th>Type</th>
-    <th>Description</th>
-    <th>Default</th>
-  </tr>
-  <tr>
-    <td><tt>['aai-app-config']['mech-ids']</tt></td>
-    <td>Hash</td>
-    <td>Mech ID, is the mech ID enabled?, shoud the cookbook update the key?</td>
-    <td><tt>true</tt></td>
-  </tr>
-</table>
-
-Usage
------
-#### user::default
-Just include `user` in your node's `run_list`:
-
-```json
-{
-  "name":"my_node",
-  "run_list": [
-    "recipe[user]"
-  ]
-}
-```
-
-License and Authors
--------------------
-Authors: AT&T A&AI
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/user/metadata.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/user/metadata.rb
deleted file mode 100755 (executable)
index 9a97b5f..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-name             'user'
-maintainer       'AT&T'
-maintainer_email 'id@xxx.com'
-license          'All rights reserved'
-description      'Configures Users and Mech Ids'
-long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.1.9'
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/user/recipes/default.rb b/kubernetes/config/docker/init/src/config/aai/aai-config/cookbooks/user/recipes/default.rb
deleted file mode 100755 (executable)
index 20c5ac3..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Cookbook Name:: user
-# Recipe:: default
-#
-# Copyright 2015, AT&T
-#
-# All rights reserved - Do Not Redistribute
-#
-group 'aaiadmin' do
-  append                     true
-#gid                        492381
-  members                   members ['aaiadmin']
-  action                    :create
-end
-
-user 'aaiadmin' do
-  comment                    "A&AI Application User"
-  gid                        "aaiadmin"
-  home                       "/opt/aaihome/aaiadmin"
-  manage_home                true
-  non_unique                 false
-  shell                      "/bin/ksh"
-#uid                        341790
-  username                   "aaiadmin"
-  ignore_failure             true 
-  action                     :create
-end
-directory "/opt/aaihome/aaiadmin" do 
-  owner 'aaiadmin'
-  group 'aaiadmin'
-       mode            "0755"
-       ignore_failure  true
-end
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-config/nodes/chef-node.json b/kubernetes/config/docker/init/src/config/aai/aai-config/nodes/chef-node.json
deleted file mode 100755 (executable)
index a73f636..0000000
+++ /dev/null
@@ -1,6798 +0,0 @@
-{
-  "name": "chef-node",
-  "chef_environment": "simpledemo",
-  "normal": {
-    "tags": [
-
-    ]
-  },
-  "default": {
-    "aai-app-config": {
-      "AAI_WORKLOAD_SERVICE_NAME": "",
-      "AAI_WORKLOAD_ENVIRONMENT": "TEST",
-      "AAI_WORKLOAD_USERNAME": "",
-      "AAI_WORKLOAD_PASSWORD": "",
-      "AAI_WORKLOAD_HOST": "",
-      "AAI_WORKLOAD_AFT_DME2_EXCHANGE_REQUEST_HANDLERS": "",
-      "AAI_WORKLOAD_AFT_DME2_EXCHANGE_REPLY_HANDLERS": "",
-      "AAI_WORKLOAD_AFT_DME2_REQ_TRACE_ON": "true",
-      "AAI_WORKLOAD_AFT_ENVIRONMENT": "AFTUAT",
-      "AAI_WORKLOAD_AFT_DME2_EP_CONN_TIMEOUT": "15000",
-      "AAI_WORKLOAD_AFT_DME2_ROUNDTRIP_TIMEOUT_MS": "240000",
-      "AAI_WORKLOAD_AFT_DME2_EP_READ_TIMEOUT_MS": "50000",
-      "AAI_WORKLOAD_SESSION_STICKINESS_REQUIRED": "no",
-      "AAI_WORKLOAD_DME2_PREFERRED_ROUTER_FILE_PATH": "/opt/app/aai/bundleconfig/etc/appprops/preferredRoute.txt",
-      "AAI_WORKLOAD_PARTNER": "BOT_R",
-      "AAI_WORKLOAD_ROUTE_OFFER": "MR1",
-      "AAI_WORKLOAD_PROTOCOL": "http",
-      "AAI_WORKLOAD_TOPIC": "",
-      "AAI_WORKLOAD_ID": "aaiConsumerId",
-      "AAI_WORKLOAD_TIMEOUT": "15000",
-      "AAI_WORKLOAD_LIMIT": "1000",
-      "AAI_WORKLOAD_MAX_BATCH_SIZE": "100",
-      "AAI_WORKLOAD_MAX_AGE_MS": "250",
-      "AAI_WORKLOAD_MESSAGE_SENT_THREAD_OCCURANCE": "50",
-      "AAI_WORKLOAD_STATUS_PUBLISHER_TOPIC": "",
-      "AAIENV": "simpledemo",
-      "PROJECT_HOME": "/opt/app/aai",
-      "CATALINA_BASE": "/servers/aai",
-      "LOGROOT": "/opt/aai/logroot",
-      "JAVA_HOME": "/usr/lib/jvm/java-8-openjdk-amd64",
-      "TOMCAT_SHUTDOWN_PORT_1": "8005",
-      "TOMCAT_HTTP_SERVER_PORT_1": "8080",
-      "TOMCAT_HTTPS_SERVER_PORT_1": "8443",
-      "TOMCAT_AJP13_CONNECTOR_PORT_1": "8009",
-      "AAI_SERVER_URL_BASE": "https://aai-service.onap-aai:8443/aai/",
-      "AAI_SERVER_URL": "https://aai-service.onap-aai:8443/aai/v8/",
-      "AAI_GLOBAL_CALLBACK_URL": "https://aai-service.onap-aai:8443/aai/",
-      "AAI_TRUSTSTORE_FILENAME": "aai_keystore",
-      "AAI_TRUSTSTORE_PASSWD_X": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
-      "STORAGE_HOSTNAME": "hbase",
-      "STORAGE_HBASE_TABLE": "aaigraph.dev",
-      "STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT": "/hbase",
-      "TXN_HBASE_TABLE_NAME": "aailogging.dev",
-      "TXN_ZOOKEEPER_QUORUM": "hbase",
-      "TXN_ZOOKEEPER_PROPERTY_CLIENTPORT": "2181",
-      "TXN_HBASE_ZOOKEEPER_ZNODE_PARENT": "/hbase",
-      "APPLICATION_SERVERS": "aai-service.onap-aai",
-      "AAI_NOTIFICATION_CURRENT_VERSION": "v8",
-      "AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS": "UNPROCESSED",
-      "AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_TYPE": "AAI-EVENT",
-      "AAI_NOTIFICATION_EVENT_DEFAULT_DOMAIN": "dev",
-      "AAI_NOTIFICATION_EVENT_DEFAULT_SOURCE_NAME": "aai",
-      "AAI_NOTIFICATION_EVENT_DEFAULT_SEQUENCE_NUMBER": "0",
-      "AAI_NOTIFICATION_EVENT_DEFAULT_SEVERITY": "NORMAL",
-      "AAI_NOTIFICATION_EVENT_DEFAULT_VERSION": "v8",
-      "AAI_DEFAULT_API_VERSION": "v8",
-      "AAI_DMAPP_WORKLOAD_ENABLE_EVENT_PROCESSING": "false",
-      "HBASE_COLUMN_TTL_DAYS": "15",
-      "ORG_OPENECOMP_AAI_LEVEL": "INFO",
-      "AAI_WORKLOAD_PREFERRED_ROUTE_KEY": "MR1",
-      "SERVICE_API_VERSION": "1.0.1",
-      "SOA_CLOUD_NAMESPACE": "org.openecomp.aai",
-      "AJSC_SERVICE_NAMESPACE": "ActiveAndAvailableInventory-CloudNetwork",
-      "AFTSWM_ACTION_ARTIFACT_NAME": "ajsc-aai",
-      "AJSC_JETTY_ThreadCount_MAX": "500",
-      "AJSC_JETTY_ThreadCount_MIN": "10",
-      "AJSC_SSL_PORT": "8443",
-      "AJSC_SVC_PORT": "8080",
-      "KEY_MANAGER_PASSWORD": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
-      "KEY_STORE_PASSWORD": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
-      "MAX_HEAP_SIZE": "2056m",
-      "MAX_PERM_SIZE": "512M",
-      "MIN_HEAP_SIZE": "2056m",
-      "PERM_SIZE": "512M",
-      "PRE_JVM_ARGS": "-XX:+UnlockDiagnosticVMOptions -XX:+UnsyncloadClass -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=70 -XX:+ScavengeBeforeFullGC -XX:+CMSScavengeBeforeRemark -XX:-HeapDumpOnOutOfMemoryError -XX:+UseParNewGC -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps",
-      "AAI_KEYSTORE_FILENAME": "aai_keystore",
-      "AAI_KEYSTORE_PASSWD_X": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
-      "STORAGE_BACKEND": "hbase",
-      "RESOURCE_VERSION_ENABLE_FLAG": "true"
-    }
-  },
-  "automatic": {
-    "cpu": {
-      "0": {
-        "vendor_id": "GenuineIntel",
-        "family": "6",
-        "model": "44",
-        "model_name": "Intel(R) Xeon(R) CPU           E5645  @ 2.40GHz",
-        "stepping": "2",
-        "mhz": "2394.000",
-        "cache_size": "12288 KB",
-        "physical_id": "0",
-        "core_id": "0",
-        "cores": "6",
-        "flags": [
-          "fpu",
-          "vme",
-          "de",
-          "pse",
-          "tsc",
-          "msr",
-          "pae",
-          "mce",
-          "cx8",
-          "apic",
-          "sep",
-          "mtrr",
-          "pge",
-          "mca",
-          "cmov",
-          "pat",
-          "pse36",
-          "clflush",
-          "dts",
-          "acpi",
-          "mmx",
-          "fxsr",
-          "sse",
-          "sse2",
-          "ss",
-          "ht",
-          "tm",
-          "pbe",
-          "syscall",
-          "nx",
-          "pdpe1gb",
-          "rdtscp",
-          "lm",
-          "constant_tsc",
-          "arch_perfmon",
-          "pebs",
-          "bts",
-          "rep_good",
-          "nopl",
-          "xtopology",
-          "nonstop_tsc",
-          "aperfmperf",
-          "pni",
-          "pclmulqdq",
-          "dtes64",
-          "monitor",
-          "ds_cpl",
-          "vmx",
-          "smx",
-          "est",
-          "tm2",
-          "ssse3",
-          "cx16",
-          "xtpr",
-          "pdcm",
-          "pcid",
-          "dca",
-          "sse4_1",
-          "sse4_2",
-          "popcnt",
-          "aes",
-          "lahf_lm",
-          "arat",
-          "epb",
-          "dtherm",
-          "tpr_shadow",
-          "vnmi",
-          "flexpriority",
-          "ept",
-          "vpid"
-        ]
-      },
-      "1": {
-        "vendor_id": "GenuineIntel",
-        "family": "6",
-        "model": "44",
-        "model_name": "Intel(R) Xeon(R) CPU           E5645  @ 2.40GHz",
-        "stepping": "2",
-        "mhz": "2394.000",
-        "cache_size": "12288 KB",
-        "physical_id": "0",
-        "core_id": "1",
-        "cores": "6",
-        "flags": [
-          "fpu",
-          "vme",
-          "de",
-          "pse",
-          "tsc",
-          "msr",
-          "pae",
-          "mce",
-          "cx8",
-          "apic",
-          "sep",
-          "mtrr",
-          "pge",
-          "mca",
-          "cmov",
-          "pat",
-          "pse36",
-          "clflush",
-          "dts",
-          "acpi",
-          "mmx",
-          "fxsr",
-          "sse",
-          "sse2",
-          "ss",
-          "ht",
-          "tm",
-          "pbe",
-          "syscall",
-          "nx",
-          "pdpe1gb",
-          "rdtscp",
-          "lm",
-          "constant_tsc",
-          "arch_perfmon",
-          "pebs",
-          "bts",
-          "rep_good",
-          "nopl",
-          "xtopology",
-          "nonstop_tsc",
-          "aperfmperf",
-          "pni",
-          "pclmulqdq",
-          "dtes64",
-          "monitor",
-          "ds_cpl",
-          "vmx",
-          "smx",
-          "est",
-          "tm2",
-          "ssse3",
-          "cx16",
-          "xtpr",
-          "pdcm",
-          "pcid",
-          "dca",
-          "sse4_1",
-          "sse4_2",
-          "popcnt",
-          "aes",
-          "lahf_lm",
-          "arat",
-          "epb",
-          "dtherm",
-          "tpr_shadow",
-          "vnmi",
-          "flexpriority",
-          "ept",
-          "vpid"
-        ]
-      },
-      "2": {
-        "vendor_id": "GenuineIntel",
-        "family": "6",
-        "model": "44",
-        "model_name": "Intel(R) Xeon(R) CPU           E5645  @ 2.40GHz",
-        "stepping": "2",
-        "mhz": "2394.000",
-        "cache_size": "12288 KB",
-        "physical_id": "0",
-        "core_id": "2",
-        "cores": "6",
-        "flags": [
-          "fpu",
-          "vme",
-          "de",
-          "pse",
-          "tsc",
-          "msr",
-          "pae",
-          "mce",
-          "cx8",
-          "apic",
-          "sep",
-          "mtrr",
-          "pge",
-          "mca",
-          "cmov",
-          "pat",
-          "pse36",
-          "clflush",
-          "dts",
-          "acpi",
-          "mmx",
-          "fxsr",
-          "sse",
-          "sse2",
-          "ss",
-          "ht",
-          "tm",
-          "pbe",
-          "syscall",
-          "nx",
-          "pdpe1gb",
-          "rdtscp",
-          "lm",
-          "constant_tsc",
-          "arch_perfmon",
-          "pebs",
-          "bts",
-          "rep_good",
-          "nopl",
-          "xtopology",
-          "nonstop_tsc",
-          "aperfmperf",
-          "pni",
-          "pclmulqdq",
-          "dtes64",
-          "monitor",
-          "ds_cpl",
-          "vmx",
-          "smx",
-          "est",
-          "tm2",
-          "ssse3",
-          "cx16",
-          "xtpr",
-          "pdcm",
-          "pcid",
-          "dca",
-          "sse4_1",
-          "sse4_2",
-          "popcnt",
-          "aes",
-          "lahf_lm",
-          "arat",
-          "epb",
-          "dtherm",
-          "tpr_shadow",
-          "vnmi",
-          "flexpriority",
-          "ept",
-          "vpid"
-        ]
-      },
-      "3": {
-        "vendor_id": "GenuineIntel",
-        "family": "6",
-        "model": "44",
-        "model_name": "Intel(R) Xeon(R) CPU           E5645  @ 2.40GHz",
-        "stepping": "2",
-        "mhz": "2394.000",
-        "cache_size": "12288 KB",
-        "physical_id": "0",
-        "core_id": "8",
-        "cores": "6",
-        "flags": [
-          "fpu",
-          "vme",
-          "de",
-          "pse",
-          "tsc",
-          "msr",
-          "pae",
-          "mce",
-          "cx8",
-          "apic",
-          "sep",
-          "mtrr",
-          "pge",
-          "mca",
-          "cmov",
-          "pat",
-          "pse36",
-          "clflush",
-          "dts",
-          "acpi",
-          "mmx",
-          "fxsr",
-          "sse",
-          "sse2",
-          "ss",
-          "ht",
-          "tm",
-          "pbe",
-          "syscall",
-          "nx",
-          "pdpe1gb",
-          "rdtscp",
-          "lm",
-          "constant_tsc",
-          "arch_perfmon",
-          "pebs",
-          "bts",
-          "rep_good",
-          "nopl",
-          "xtopology",
-          "nonstop_tsc",
-          "aperfmperf",
-          "pni",
-          "pclmulqdq",
-          "dtes64",
-          "monitor",
-          "ds_cpl",
-          "vmx",
-          "smx",
-          "est",
-          "tm2",
-          "ssse3",
-          "cx16",
-          "xtpr",
-          "pdcm",
-          "pcid",
-          "dca",
-          "sse4_1",
-          "sse4_2",
-          "popcnt",
-          "aes",
-          "lahf_lm",
-          "arat",
-          "epb",
-          "dtherm",
-          "tpr_shadow",
-          "vnmi",
-          "flexpriority",
-          "ept",
-          "vpid"
-        ]
-      },
-      "4": {
-        "vendor_id": "GenuineIntel",
-        "family": "6",
-        "model": "44",
-        "model_name": "Intel(R) Xeon(R) CPU           E5645  @ 2.40GHz",
-        "stepping": "2",
-        "mhz": "2394.000",
-        "cache_size": "12288 KB",
-        "physical_id": "0",
-        "core_id": "9",
-        "cores": "6",
-        "flags": [
-          "fpu",
-          "vme",
-          "de",
-          "pse",
-          "tsc",
-          "msr",
-          "pae",
-          "mce",
-          "cx8",
-          "apic",
-          "sep",
-          "mtrr",
-          "pge",
-          "mca",
-          "cmov",
-          "pat",
-          "pse36",
-          "clflush",
-          "dts",
-          "acpi",
-          "mmx",
-          "fxsr",
-          "sse",
-          "sse2",
-          "ss",
-          "ht",
-          "tm",
-          "pbe",
-          "syscall",
-          "nx",
-          "pdpe1gb",
-          "rdtscp",
-          "lm",
-          "constant_tsc",
-          "arch_perfmon",
-          "pebs",
-          "bts",
-          "rep_good",
-          "nopl",
-          "xtopology",
-          "nonstop_tsc",
-          "aperfmperf",
-          "pni",
-          "pclmulqdq",
-          "dtes64",
-          "monitor",
-          "ds_cpl",
-          "vmx",
-          "smx",
-          "est",
-          "tm2",
-          "ssse3",
-          "cx16",
-          "xtpr",
-          "pdcm",
-          "pcid",
-          "dca",
-          "sse4_1",
-          "sse4_2",
-          "popcnt",
-          "aes",
-          "lahf_lm",
-          "arat",
-          "epb",
-          "dtherm",
-          "tpr_shadow",
-          "vnmi",
-          "flexpriority",
-          "ept",
-          "vpid"
-        ]
-      },
-      "5": {
-        "vendor_id": "GenuineIntel",
-        "family": "6",
-        "model": "44",
-        "model_name": "Intel(R) Xeon(R) CPU           E5645  @ 2.40GHz",
-        "stepping": "2",
-        "mhz": "2394.000",
-        "cache_size": "12288 KB",
-        "physical_id": "0",
-        "core_id": "10",
-        "cores": "6",
-        "flags": [
-          "fpu",
-          "vme",
-          "de",
-          "pse",
-          "tsc",
-          "msr",
-          "pae",
-          "mce",
-          "cx8",
-          "apic",
-          "sep",
-          "mtrr",
-          "pge",
-          "mca",
-          "cmov",
-          "pat",
-          "pse36",
-          "clflush",
-          "dts",
-          "acpi",
-          "mmx",
-          "fxsr",
-          "sse",
-          "sse2",
-          "ss",
-          "ht",
-          "tm",
-          "pbe",
-          "syscall",
-          "nx",
-          "pdpe1gb",
-          "rdtscp",
-          "lm",
-          "constant_tsc",
-          "arch_perfmon",
-          "pebs",
-          "bts",
-          "rep_good",
-          "nopl",
-          "xtopology",
-          "nonstop_tsc",
-          "aperfmperf",
-          "pni",
-          "pclmulqdq",
-          "dtes64",
-          "monitor",
-          "ds_cpl",
-          "vmx",
-          "smx",
-          "est",
-          "tm2",
-          "ssse3",
-          "cx16",
-          "xtpr",
-          "pdcm",
-          "pcid",
-          "dca",
-          "sse4_1",
-          "sse4_2",
-          "popcnt",
-          "aes",
-          "lahf_lm",
-          "arat",
-          "epb",
-          "dtherm",
-          "tpr_shadow",
-          "vnmi",
-          "flexpriority",
-          "ept",
-          "vpid"
-        ]
-      },
-      "6": {
-        "vendor_id": "GenuineIntel",
-        "family": "6",
-        "model": "44",
-        "model_name": "Intel(R) Xeon(R) CPU           E5645  @ 2.40GHz",
-        "stepping": "2",
-        "mhz": "2394.000",
-        "cache_size": "12288 KB",
-        "physical_id": "1",
-        "core_id": "0",
-        "cores": "6",
-        "flags": [
-          "fpu",
-          "vme",
-          "de",
-          "pse",
-          "tsc",
-          "msr",
-          "pae",
-          "mce",
-          "cx8",
-          "apic",
-          "sep",
-          "mtrr",
-          "pge",
-          "mca",
-          "cmov",
-          "pat",
-          "pse36",
-          "clflush",
-          "dts",
-          "acpi",
-          "mmx",
-          "fxsr",
-          "sse",
-          "sse2",
-          "ss",
-          "ht",
-          "tm",
-          "pbe",
-          "syscall",
-          "nx",
-          "pdpe1gb",
-          "rdtscp",
-          "lm",
-          "constant_tsc",
-          "arch_perfmon",
-          "pebs",
-          "bts",
-          "rep_good",
-          "nopl",
-          "xtopology",
-          "nonstop_tsc",
-          "aperfmperf",
-          "pni",
-          "pclmulqdq",
-          "dtes64",
-          "monitor",
-          "ds_cpl",
-          "vmx",
-          "smx",
-          "est",
-          "tm2",
-          "ssse3",
-          "cx16",
-          "xtpr",
-          "pdcm",
-          "pcid",
-          "dca",
-          "sse4_1",
-          "sse4_2",
-          "popcnt",
-          "aes",
-          "lahf_lm",
-          "arat",
-          "epb",
-          "dtherm",
-          "tpr_shadow",
-          "vnmi",
-          "flexpriority",
-          "ept",
-          "vpid"
-        ]
-      },
-      "7": {
-        "vendor_id": "GenuineIntel",
-        "family": "6",
-        "model": "44",
-        "model_name": "Intel(R) Xeon(R) CPU           E5645  @ 2.40GHz",
-        "stepping": "2",
-        "mhz": "2394.000",
-        "cache_size": "12288 KB",
-        "physical_id": "1",
-        "core_id": "1",
-        "cores": "6",
-        "flags": [
-          "fpu",
-          "vme",
-          "de",
-          "pse",
-          "tsc",
-          "msr",
-          "pae",
-          "mce",
-          "cx8",
-          "apic",
-          "sep",
-          "mtrr",
-          "pge",
-          "mca",
-          "cmov",
-          "pat",
-          "pse36",
-          "clflush",
-          "dts",
-          "acpi",
-          "mmx",
-          "fxsr",
-          "sse",
-          "sse2",
-          "ss",
-          "ht",
-          "tm",
-          "pbe",
-          "syscall",
-          "nx",
-          "pdpe1gb",
-          "rdtscp",
-          "lm",
-          "constant_tsc",
-          "arch_perfmon",
-          "pebs",
-          "bts",
-          "rep_good",
-          "nopl",
-          "xtopology",
-          "nonstop_tsc",
-          "aperfmperf",
-          "pni",
-          "pclmulqdq",
-          "dtes64",
-          "monitor",
-          "ds_cpl",
-          "vmx",
-          "smx",
-          "est",
-          "tm2",
-          "ssse3",
-          "cx16",
-          "xtpr",
-          "pdcm",
-          "pcid",
-          "dca",
-          "sse4_1",
-          "sse4_2",
-          "popcnt",
-          "aes",
-          "lahf_lm",
-          "arat",
-          "epb",
-          "dtherm",
-          "tpr_shadow",
-          "vnmi",
-          "flexpriority",
-          "ept",
-          "vpid"
-        ]
-      },
-      "8": {
-        "vendor_id": "GenuineIntel",
-        "family": "6",
-        "model": "44",
-        "model_name": "Intel(R) Xeon(R) CPU           E5645  @ 2.40GHz",
-        "stepping": "2",
-        "mhz": "2394.000",
-        "cache_size": "12288 KB",
-        "physical_id": "1",
-        "core_id": "2",
-        "cores": "6",
-        "flags": [
-          "fpu",
-          "vme",
-          "de",
-          "pse",
-          "tsc",
-          "msr",
-          "pae",
-          "mce",
-          "cx8",
-          "apic",
-          "sep",
-          "mtrr",
-          "pge",
-          "mca",
-          "cmov",
-          "pat",
-          "pse36",
-          "clflush",
-          "dts",
-          "acpi",
-          "mmx",
-          "fxsr",
-          "sse",
-          "sse2",
-          "ss",
-          "ht",
-          "tm",
-          "pbe",
-          "syscall",
-          "nx",
-          "pdpe1gb",
-          "rdtscp",
-          "lm",
-          "constant_tsc",
-          "arch_perfmon",
-          "pebs",
-          "bts",
-          "rep_good",
-          "nopl",
-          "xtopology",
-          "nonstop_tsc",
-          "aperfmperf",
-          "pni",
-          "pclmulqdq",
-          "dtes64",
-          "monitor",
-          "ds_cpl",
-          "vmx",
-          "smx",
-          "est",
-          "tm2",
-          "ssse3",
-          "cx16",
-          "xtpr",
-          "pdcm",
-          "pcid",
-          "dca",
-          "sse4_1",
-          "sse4_2",
-          "popcnt",
-          "aes",
-          "lahf_lm",
-          "arat",
-          "epb",
-          "dtherm",
-          "tpr_shadow",
-          "vnmi",
-          "flexpriority",
-          "ept",
-          "vpid"
-        ]
-      },
-      "9": {
-        "vendor_id": "GenuineIntel",
-        "family": "6",
-        "model": "44",
-        "model_name": "Intel(R) Xeon(R) CPU           E5645  @ 2.40GHz",
-        "stepping": "2",
-        "mhz": "2394.000",
-        "cache_size": "12288 KB",
-        "physical_id": "1",
-        "core_id": "8",
-        "cores": "6",
-        "flags": [
-          "fpu",
-          "vme",
-          "de",
-          "pse",
-          "tsc",
-          "msr",
-          "pae",
-          "mce",
-          "cx8",
-          "apic",
-          "sep",
-          "mtrr",
-          "pge",
-          "mca",
-          "cmov",
-          "pat",
-          "pse36",
-          "clflush",
-          "dts",
-          "acpi",
-          "mmx",
-          "fxsr",
-          "sse",
-          "sse2",
-          "ss",
-          "ht",
-          "tm",
-          "pbe",
-          "syscall",
-          "nx",
-          "pdpe1gb",
-          "rdtscp",
-          "lm",
-          "constant_tsc",
-          "arch_perfmon",
-          "pebs",
-          "bts",
-          "rep_good",
-          "nopl",
-          "xtopology",
-          "nonstop_tsc",
-          "aperfmperf",
-          "pni",
-          "pclmulqdq",
-          "dtes64",
-          "monitor",
-          "ds_cpl",
-          "vmx",
-          "smx",
-          "est",
-          "tm2",
-          "ssse3",
-          "cx16",
-          "xtpr",
-          "pdcm",
-          "pcid",
-          "dca",
-          "sse4_1",
-          "sse4_2",
-          "popcnt",
-          "aes",
-          "lahf_lm",
-          "arat",
-          "epb",
-          "dtherm",
-          "tpr_shadow",
-          "vnmi",
-          "flexpriority",
-          "ept",
-          "vpid"
-        ]
-      },
-      "10": {
-        "vendor_id": "GenuineIntel",
-        "family": "6",
-        "model": "44",
-        "model_name": "Intel(R) Xeon(R) CPU           E5645  @ 2.40GHz",
-        "stepping": "2",
-        "mhz": "2394.000",
-        "cache_size": "12288 KB",
-        "physical_id": "1",
-        "core_id": "9",
-        "cores": "6",
-        "flags": [
-          "fpu",
-          "vme",
-          "de",
-          "pse",
-          "tsc",
-          "msr",
-          "pae",
-          "mce",
-          "cx8",
-          "apic",
-          "sep",
-          "mtrr",
-          "pge",
-          "mca",
-          "cmov",
-          "pat",
-          "pse36",
-          "clflush",
-          "dts",
-          "acpi",
-          "mmx",
-          "fxsr",
-          "sse",
-          "sse2",
-          "ss",
-          "ht",
-          "tm",
-          "pbe",
-          "syscall",
-          "nx",
-          "pdpe1gb",
-          "rdtscp",
-          "lm",
-          "constant_tsc",
-          "arch_perfmon",
-          "pebs",
-          "bts",
-          "rep_good",
-          "nopl",
-          "xtopology",
-          "nonstop_tsc",
-          "aperfmperf",
-          "pni",
-          "pclmulqdq",
-          "dtes64",
-          "monitor",
-          "ds_cpl",
-          "vmx",
-          "smx",
-          "est",
-          "tm2",
-          "ssse3",
-          "cx16",
-          "xtpr",
-          "pdcm",
-          "pcid",
-          "dca",
-          "sse4_1",
-          "sse4_2",
-          "popcnt",
-          "aes",
-          "lahf_lm",
-          "arat",
-          "epb",
-          "dtherm",
-          "tpr_shadow",
-          "vnmi",
-          "flexpriority",
-          "ept",
-          "vpid"
-        ]
-      },
-      "11": {
-        "vendor_id": "GenuineIntel",
-        "family": "6",
-        "model": "44",
-        "model_name": "Intel(R) Xeon(R) CPU           E5645  @ 2.40GHz",
-        "stepping": "2",
-        "mhz": "2394.000",
-        "cache_size": "12288 KB",
-        "physical_id": "1",
-        "core_id": "10",
-        "cores": "6",
-        "flags": [
-          "fpu",
-          "vme",
-          "de",
-          "pse",
-          "tsc",
-          "msr",
-          "pae",
-          "mce",
-          "cx8",
-          "apic",
-          "sep",
-          "mtrr",
-          "pge",
-          "mca",
-          "cmov",
-          "pat",
-          "pse36",
-          "clflush",
-          "dts",
-          "acpi",
-          "mmx",
-          "fxsr",
-          "sse",
-          "sse2",
-          "ss",
-          "ht",
-          "tm",
-          "pbe",
-          "syscall",
-          "nx",
-          "pdpe1gb",
-          "rdtscp",
-          "lm",
-          "constant_tsc",
-          "arch_perfmon",
-          "pebs",
-          "bts",
-          "rep_good",
-          "nopl",
-          "xtopology",
-          "nonstop_tsc",
-          "aperfmperf",
-          "pni",
-          "pclmulqdq",
-          "dtes64",
-          "monitor",
-          "ds_cpl",
-          "vmx",
-          "smx",
-          "est",
-          "tm2",
-          "ssse3",
-          "cx16",
-          "xtpr",
-          "pdcm",
-          "pcid",
-          "dca",
-          "sse4_1",
-          "sse4_2",
-          "popcnt",
-          "aes",
-          "lahf_lm",
-          "arat",
-          "epb",
-          "dtherm",
-          "tpr_shadow",
-          "vnmi",
-          "flexpriority",
-          "ept",
-          "vpid"
-        ]
-      },
-      "12": {
-        "vendor_id": "GenuineIntel",
-        "family": "6",
-        "model": "44",
-        "model_name": "Intel(R) Xeon(R) CPU           E5645  @ 2.40GHz",
-        "stepping": "2",
-        "mhz": "2394.000",
-        "cache_size": "12288 KB",
-        "physical_id": "0",
-        "core_id": "0",
-        "cores": "6",
-        "flags": [
-          "fpu",
-          "vme",
-          "de",
-          "pse",
-          "tsc",
-          "msr",
-          "pae",
-          "mce",
-          "cx8",
-          "apic",
-          "sep",
-          "mtrr",
-          "pge",
-          "mca",
-          "cmov",
-          "pat",
-          "pse36",
-          "clflush",
-          "dts",
-          "acpi",
-          "mmx",
-          "fxsr",
-          "sse",
-          "sse2",
-          "ss",
-          "ht",
-          "tm",
-          "pbe",
-          "syscall",
-          "nx",
-          "pdpe1gb",
-          "rdtscp",
-          "lm",
-          "constant_tsc",
-          "arch_perfmon",
-          "pebs",
-          "bts",
-          "rep_good",
-          "nopl",
-          "xtopology",
-          "nonstop_tsc",
-          "aperfmperf",
-          "pni",
-          "pclmulqdq",
-          "dtes64",
-          "monitor",
-          "ds_cpl",
-          "vmx",
-          "smx",
-          "est",
-          "tm2",
-          "ssse3",
-          "cx16",
-          "xtpr",
-          "pdcm",
-          "pcid",
-          "dca",
-          "sse4_1",
-          "sse4_2",
-          "popcnt",
-          "aes",
-          "lahf_lm",
-          "arat",
-          "epb",
-          "dtherm",
-          "tpr_shadow",
-          "vnmi",
-          "flexpriority",
-          "ept",
-          "vpid"
-        ]
-      },
-      "13": {
-        "vendor_id": "GenuineIntel",
-        "family": "6",
-        "model": "44",
-        "model_name": "Intel(R) Xeon(R) CPU           E5645  @ 2.40GHz",
-        "stepping": "2",
-        "mhz": "2394.000",
-        "cache_size": "12288 KB",
-        "physical_id": "0",
-        "core_id": "1",
-        "cores": "6",
-        "flags": [
-          "fpu",
-          "vme",
-          "de",
-          "pse",
-          "tsc",
-          "msr",
-          "pae",
-          "mce",
-          "cx8",
-          "apic",
-          "sep",
-          "mtrr",
-          "pge",
-          "mca",
-          "cmov",
-          "pat",
-          "pse36",
-          "clflush",
-          "dts",
-          "acpi",
-          "mmx",
-          "fxsr",
-          "sse",
-          "sse2",
-          "ss",
-          "ht",
-          "tm",
-          "pbe",
-          "syscall",
-          "nx",
-          "pdpe1gb",
-          "rdtscp",
-          "lm",
-          "constant_tsc",
-          "arch_perfmon",
-          "pebs",
-          "bts",
-          "rep_good",
-          "nopl",
-          "xtopology",
-          "nonstop_tsc",
-          "aperfmperf",
-          "pni",
-          "pclmulqdq",
-          "dtes64",
-          "monitor",
-          "ds_cpl",
-          "vmx",
-          "smx",
-          "est",
-          "tm2",
-          "ssse3",
-          "cx16",
-          "xtpr",
-          "pdcm",
-          "pcid",
-          "dca",
-          "sse4_1",
-          "sse4_2",
-          "popcnt",
-          "aes",
-          "lahf_lm",
-          "arat",
-          "epb",
-          "dtherm",
-          "tpr_shadow",
-          "vnmi",
-          "flexpriority",
-          "ept",
-          "vpid"
-        ]
-      },
-      "14": {
-        "vendor_id": "GenuineIntel",
-        "family": "6",
-        "model": "44",
-        "model_name": "Intel(R) Xeon(R) CPU           E5645  @ 2.40GHz",
-        "stepping": "2",
-        "mhz": "2394.000",
-        "cache_size": "12288 KB",
-        "physical_id": "0",
-        "core_id": "2",
-        "cores": "6",
-        "flags": [
-          "fpu",
-          "vme",
-          "de",
-          "pse",
-          "tsc",
-          "msr",
-          "pae",
-          "mce",
-          "cx8",
-          "apic",
-          "sep",
-          "mtrr",
-          "pge",
-          "mca",
-          "cmov",
-          "pat",
-          "pse36",
-          "clflush",
-          "dts",
-          "acpi",
-          "mmx",
-          "fxsr",
-          "sse",
-          "sse2",
-          "ss",
-          "ht",
-          "tm",
-          "pbe",
-          "syscall",
-          "nx",
-          "pdpe1gb",
-          "rdtscp",
-          "lm",
-          "constant_tsc",
-          "arch_perfmon",
-          "pebs",
-          "bts",
-          "rep_good",
-          "nopl",
-          "xtopology",
-          "nonstop_tsc",
-          "aperfmperf",
-          "pni",
-          "pclmulqdq",
-          "dtes64",
-          "monitor",
-          "ds_cpl",
-          "vmx",
-          "smx",
-          "est",
-          "tm2",
-          "ssse3",
-          "cx16",
-          "xtpr",
-          "pdcm",
-          "pcid",
-          "dca",
-          "sse4_1",
-          "sse4_2",
-          "popcnt",
-          "aes",
-          "lahf_lm",
-          "arat",
-          "epb",
-          "dtherm",
-          "tpr_shadow",
-          "vnmi",
-          "flexpriority",
-          "ept",
-          "vpid"
-        ]
-      },
-      "15": {
-        "vendor_id": "GenuineIntel",
-        "family": "6",
-        "model": "44",
-        "model_name": "Intel(R) Xeon(R) CPU           E5645  @ 2.40GHz",
-        "stepping": "2",
-        "mhz": "2394.000",
-        "cache_size": "12288 KB",
-        "physical_id": "0",
-        "core_id": "8",
-        "cores": "6",
-        "flags": [
-          "fpu",
-          "vme",
-          "de",
-          "pse",
-          "tsc",
-          "msr",
-          "pae",
-          "mce",
-          "cx8",
-          "apic",
-          "sep",
-          "mtrr",
-          "pge",
-          "mca",
-          "cmov",
-          "pat",
-          "pse36",
-          "clflush",
-          "dts",
-          "acpi",
-          "mmx",
-          "fxsr",
-          "sse",
-          "sse2",
-          "ss",
-          "ht",
-          "tm",
-          "pbe",
-          "syscall",
-          "nx",
-          "pdpe1gb",
-          "rdtscp",
-          "lm",
-          "constant_tsc",
-          "arch_perfmon",
-          "pebs",
-          "bts",
-          "rep_good",
-          "nopl",
-          "xtopology",
-          "nonstop_tsc",
-          "aperfmperf",
-          "pni",
-          "pclmulqdq",
-          "dtes64",
-          "monitor",
-          "ds_cpl",
-          "vmx",
-          "smx",
-          "est",
-          "tm2",
-          "ssse3",
-          "cx16",
-          "xtpr",
-          "pdcm",
-          "pcid",
-          "dca",
-          "sse4_1",
-          "sse4_2",
-          "popcnt",
-          "aes",
-          "lahf_lm",
-          "arat",
-          "epb",
-          "dtherm",
-          "tpr_shadow",
-          "vnmi",
-          "flexpriority",
-          "ept",
-          "vpid"
-        ]
-      },
-      "16": {
-        "vendor_id": "GenuineIntel",
-        "family": "6",
-        "model": "44",
-        "model_name": "Intel(R) Xeon(R) CPU           E5645  @ 2.40GHz",
-        "stepping": "2",
-        "mhz": "2394.000",
-        "cache_size": "12288 KB",
-        "physical_id": "0",
-        "core_id": "9",
-        "cores": "6",
-        "flags": [
-          "fpu",
-          "vme",
-          "de",
-          "pse",
-          "tsc",
-          "msr",
-          "pae",
-          "mce",
-          "cx8",
-          "apic",
-          "sep",
-          "mtrr",
-          "pge",
-          "mca",
-          "cmov",
-          "pat",
-          "pse36",
-          "clflush",
-          "dts",
-          "acpi",
-          "mmx",
-          "fxsr",
-          "sse",
-          "sse2",
-          "ss",
-          "ht",
-          "tm",
-          "pbe",
-          "syscall",
-          "nx",
-          "pdpe1gb",
-          "rdtscp",
-          "lm",
-          "constant_tsc",
-          "arch_perfmon",
-          "pebs",
-          "bts",
-          "rep_good",
-          "nopl",
-          "xtopology",
-          "nonstop_tsc",
-          "aperfmperf",
-          "pni",
-          "pclmulqdq",
-          "dtes64",
-          "monitor",
-          "ds_cpl",
-          "vmx",
-          "smx",
-          "est",
-          "tm2",
-          "ssse3",
-          "cx16",
-          "xtpr",
-          "pdcm",
-          "pcid",
-          "dca",
-          "sse4_1",
-          "sse4_2",
-          "popcnt",
-          "aes",
-          "lahf_lm",
-          "arat",
-          "epb",
-          "dtherm",
-          "tpr_shadow",
-          "vnmi",
-          "flexpriority",
-          "ept",
-          "vpid"
-        ]
-      },
-      "17": {
-        "vendor_id": "GenuineIntel",
-        "family": "6",
-        "model": "44",
-        "model_name": "Intel(R) Xeon(R) CPU           E5645  @ 2.40GHz",
-        "stepping": "2",
-        "mhz": "2394.000",
-        "cache_size": "12288 KB",
-        "physical_id": "0",
-        "core_id": "10",
-        "cores": "6",
-        "flags": [
-          "fpu",
-          "vme",
-          "de",
-          "pse",
-          "tsc",
-          "msr",
-          "pae",
-          "mce",
-          "cx8",
-          "apic",
-          "sep",
-          "mtrr",
-          "pge",
-          "mca",
-          "cmov",
-          "pat",
-          "pse36",
-          "clflush",
-          "dts",
-          "acpi",
-          "mmx",
-          "fxsr",
-          "sse",
-          "sse2",
-          "ss",
-          "ht",
-          "tm",
-          "pbe",
-          "syscall",
-          "nx",
-          "pdpe1gb",
-          "rdtscp",
-          "lm",
-          "constant_tsc",
-          "arch_perfmon",
-          "pebs",
-          "bts",
-          "rep_good",
-          "nopl",
-          "xtopology",
-          "nonstop_tsc",
-          "aperfmperf",
-          "pni",
-          "pclmulqdq",
-          "dtes64",
-          "monitor",
-          "ds_cpl",
-          "vmx",
-          "smx",
-          "est",
-          "tm2",
-          "ssse3",
-          "cx16",
-          "xtpr",
-          "pdcm",
-          "pcid",
-          "dca",
-          "sse4_1",
-          "sse4_2",
-          "popcnt",
-          "aes",
-          "lahf_lm",
-          "arat",
-          "epb",
-          "dtherm",
-          "tpr_shadow",
-          "vnmi",
-          "flexpriority",
-          "ept",
-          "vpid"
-        ]
-      },
-      "18": {
-        "vendor_id": "GenuineIntel",
-        "family": "6",
-        "model": "44",
-        "model_name": "Intel(R) Xeon(R) CPU           E5645  @ 2.40GHz",
-        "stepping": "2",
-        "mhz": "2394.000",
-        "cache_size": "12288 KB",
-        "physical_id": "1",
-        "core_id": "0",
-        "cores": "6",
-        "flags": [
-          "fpu",
-          "vme",
-          "de",
-          "pse",
-          "tsc",
-          "msr",
-          "pae",
-          "mce",
-          "cx8",
-          "apic",
-          "sep",
-          "mtrr",
-          "pge",
-          "mca",
-          "cmov",
-          "pat",
-          "pse36",
-          "clflush",
-          "dts",
-          "acpi",
-          "mmx",
-          "fxsr",
-          "sse",
-          "sse2",
-          "ss",
-          "ht",
-          "tm",
-          "pbe",
-          "syscall",
-          "nx",
-          "pdpe1gb",
-          "rdtscp",
-          "lm",
-          "constant_tsc",
-          "arch_perfmon",
-          "pebs",
-          "bts",
-          "rep_good",
-          "nopl",
-          "xtopology",
-          "nonstop_tsc",
-          "aperfmperf",
-          "pni",
-          "pclmulqdq",
-          "dtes64",
-          "monitor",
-          "ds_cpl",
-          "vmx",
-          "smx",
-          "est",
-          "tm2",
-          "ssse3",
-          "cx16",
-          "xtpr",
-          "pdcm",
-          "pcid",
-          "dca",
-          "sse4_1",
-          "sse4_2",
-          "popcnt",
-          "aes",
-          "lahf_lm",
-          "arat",
-          "epb",
-          "dtherm",
-          "tpr_shadow",
-          "vnmi",
-          "flexpriority",
-          "ept",
-          "vpid"
-        ]
-      },
-      "19": {
-        "vendor_id": "GenuineIntel",
-        "family": "6",
-        "model": "44",
-        "model_name": "Intel(R) Xeon(R) CPU           E5645  @ 2.40GHz",
-        "stepping": "2",
-        "mhz": "2394.000",
-        "cache_size": "12288 KB",
-        "physical_id": "1",
-        "core_id": "1",
-        "cores": "6",
-        "flags": [
-          "fpu",
-          "vme",
-          "de",
-          "pse",
-          "tsc",
-          "msr",
-          "pae",
-          "mce",
-          "cx8",
-          "apic",
-          "sep",
-          "mtrr",
-          "pge",
-          "mca",
-          "cmov",
-          "pat",
-          "pse36",
-          "clflush",
-          "dts",
-          "acpi",
-          "mmx",
-          "fxsr",
-          "sse",
-          "sse2",
-          "ss",
-          "ht",
-          "tm",
-          "pbe",
-          "syscall",
-          "nx",
-          "pdpe1gb",
-          "rdtscp",
-          "lm",
-          "constant_tsc",
-          "arch_perfmon",
-          "pebs",
-          "bts",
-          "rep_good",
-          "nopl",
-          "xtopology",
-          "nonstop_tsc",
-          "aperfmperf",
-          "pni",
-          "pclmulqdq",
-          "dtes64",
-          "monitor",
-          "ds_cpl",
-          "vmx",
-          "smx",
-          "est",
-          "tm2",
-          "ssse3",
-          "cx16",
-          "xtpr",
-          "pdcm",
-          "pcid",
-          "dca",
-          "sse4_1",
-          "sse4_2",
-          "popcnt",
-          "aes",
-          "lahf_lm",
-          "arat",
-          "epb",
-          "dtherm",
-          "tpr_shadow",
-          "vnmi",
-          "flexpriority",
-          "ept",
-          "vpid"
-        ]
-      },
-      "20": {
-        "vendor_id": "GenuineIntel",
-        "family": "6",
-        "model": "44",
-        "model_name": "Intel(R) Xeon(R) CPU           E5645  @ 2.40GHz",
-        "stepping": "2",
-        "mhz": "2394.000",
-        "cache_size": "12288 KB",
-        "physical_id": "1",
-        "core_id": "2",
-        "cores": "6",
-        "flags": [
-          "fpu",
-          "vme",
-          "de",
-          "pse",
-          "tsc",
-          "msr",
-          "pae",
-          "mce",
-          "cx8",
-          "apic",
-          "sep",
-          "mtrr",
-          "pge",
-          "mca",
-          "cmov",
-          "pat",
-          "pse36",
-          "clflush",
-          "dts",
-          "acpi",
-          "mmx",
-          "fxsr",
-          "sse",
-          "sse2",
-          "ss",
-          "ht",
-          "tm",
-          "pbe",
-          "syscall",
-          "nx",
-          "pdpe1gb",
-          "rdtscp",
-          "lm",
-          "constant_tsc",
-          "arch_perfmon",
-          "pebs",
-          "bts",
-          "rep_good",
-          "nopl",
-          "xtopology",
-          "nonstop_tsc",
-          "aperfmperf",
-          "pni",
-          "pclmulqdq",
-          "dtes64",
-          "monitor",
-          "ds_cpl",
-          "vmx",
-          "smx",
-          "est",
-          "tm2",
-          "ssse3",
-          "cx16",
-          "xtpr",
-          "pdcm",
-          "pcid",
-          "dca",
-          "sse4_1",
-          "sse4_2",
-          "popcnt",
-          "aes",
-          "lahf_lm",
-          "arat",
-          "epb",
-          "dtherm",
-          "tpr_shadow",
-          "vnmi",
-          "flexpriority",
-          "ept",
-          "vpid"
-        ]
-      },
-      "21": {
-        "vendor_id": "GenuineIntel",
-        "family": "6",
-        "model": "44",
-        "model_name": "Intel(R) Xeon(R) CPU           E5645  @ 2.40GHz",
-        "stepping": "2",
-        "mhz": "2394.000",
-        "cache_size": "12288 KB",
-        "physical_id": "1",
-        "core_id": "8",
-        "cores": "6",
-        "flags": [
-          "fpu",
-          "vme",
-          "de",
-          "pse",
-          "tsc",
-          "msr",
-          "pae",
-          "mce",
-          "cx8",
-          "apic",
-          "sep",
-          "mtrr",
-          "pge",
-          "mca",
-          "cmov",
-          "pat",
-          "pse36",
-          "clflush",
-          "dts",
-          "acpi",
-          "mmx",
-          "fxsr",
-          "sse",
-          "sse2",
-          "ss",
-          "ht",
-          "tm",
-          "pbe",
-          "syscall",
-          "nx",
-          "pdpe1gb",
-          "rdtscp",
-          "lm",
-          "constant_tsc",
-          "arch_perfmon",
-          "pebs",
-          "bts",
-          "rep_good",
-          "nopl",
-          "xtopology",
-          "nonstop_tsc",
-          "aperfmperf",
-          "pni",
-          "pclmulqdq",
-          "dtes64",
-          "monitor",
-          "ds_cpl",
-          "vmx",
-          "smx",
-          "est",
-          "tm2",
-          "ssse3",
-          "cx16",
-          "xtpr",
-          "pdcm",
-          "pcid",
-          "dca",
-          "sse4_1",
-          "sse4_2",
-          "popcnt",
-          "aes",
-          "lahf_lm",
-          "arat",
-          "epb",
-          "dtherm",
-          "tpr_shadow",
-          "vnmi",
-          "flexpriority",
-          "ept",
-          "vpid"
-        ]
-      },
-      "22": {
-        "vendor_id": "GenuineIntel",
-        "family": "6",
-        "model": "44",
-        "model_name": "Intel(R) Xeon(R) CPU           E5645  @ 2.40GHz",
-        "stepping": "2",
-        "mhz": "2394.000",
-        "cache_size": "12288 KB",
-        "physical_id": "1",
-        "core_id": "9",
-        "cores": "6",
-        "flags": [
-          "fpu",
-          "vme",
-          "de",
-          "pse",
-          "tsc",
-          "msr",
-          "pae",
-          "mce",
-          "cx8",
-          "apic",
-          "sep",
-          "mtrr",
-          "pge",
-          "mca",
-          "cmov",
-          "pat",
-          "pse36",
-          "clflush",
-          "dts",
-          "acpi",
-          "mmx",
-          "fxsr",
-          "sse",
-          "sse2",
-          "ss",
-          "ht",
-          "tm",
-          "pbe",
-          "syscall",
-          "nx",
-          "pdpe1gb",
-          "rdtscp",
-          "lm",
-          "constant_tsc",
-          "arch_perfmon",
-          "pebs",
-          "bts",
-          "rep_good",
-          "nopl",
-          "xtopology",
-          "nonstop_tsc",
-          "aperfmperf",
-          "pni",
-          "pclmulqdq",
-          "dtes64",
-          "monitor",
-          "ds_cpl",
-          "vmx",
-          "smx",
-          "est",
-          "tm2",
-          "ssse3",
-          "cx16",
-          "xtpr",
-          "pdcm",
-          "pcid",
-          "dca",
-          "sse4_1",
-          "sse4_2",
-          "popcnt",
-          "aes",
-          "lahf_lm",
-          "arat",
-          "epb",
-          "dtherm",
-          "tpr_shadow",
-          "vnmi",
-          "flexpriority",
-          "ept",
-          "vpid"
-        ]
-      },
-      "23": {
-        "vendor_id": "GenuineIntel",
-        "family": "6",
-        "model": "44",
-        "model_name": "Intel(R) Xeon(R) CPU           E5645  @ 2.40GHz",
-        "stepping": "2",
-        "mhz": "2394.000",
-        "cache_size": "12288 KB",
-        "physical_id": "1",
-        "core_id": "10",
-        "cores": "6",
-        "flags": [
-          "fpu",
-          "vme",
-          "de",
-          "pse",
-          "tsc",
-          "msr",
-          "pae",
-          "mce",
-          "cx8",
-          "apic",
-          "sep",
-          "mtrr",
-          "pge",
-          "mca",
-          "cmov",
-          "pat",
-          "pse36",
-          "clflush",
-          "dts",
-          "acpi",
-          "mmx",
-          "fxsr",
-          "sse",
-          "sse2",
-          "ss",
-          "ht",
-          "tm",
-          "pbe",
-          "syscall",
-          "nx",
-          "pdpe1gb",
-          "rdtscp",
-          "lm",
-          "constant_tsc",
-          "arch_perfmon",
-          "pebs",
-          "bts",
-          "rep_good",
-          "nopl",
-          "xtopology",
-          "nonstop_tsc",
-          "aperfmperf",
-          "pni",
-          "pclmulqdq",
-          "dtes64",
-          "monitor",
-          "ds_cpl",
-          "vmx",
-          "smx",
-          "est",
-          "tm2",
-          "ssse3",
-          "cx16",
-          "xtpr",
-          "pdcm",
-          "pcid",
-          "dca",
-          "sse4_1",
-          "sse4_2",
-          "popcnt",
-          "aes",
-          "lahf_lm",
-          "arat",
-          "epb",
-          "dtherm",
-          "tpr_shadow",
-          "vnmi",
-          "flexpriority",
-          "ept",
-          "vpid"
-        ]
-      },
-      "total": 24,
-      "real": 2,
-      "cores": 12
-    },
-    "filesystem": {
-      "/dev/mapper/docker-253:0-270022137-aee52a2bccbb70b9e9c431c27c5b8ed9e848a4159ac289080b3a273f484b52e2": {
-        "kb_size": "10474496",
-        "kb_used": "1206940",
-        "kb_available": "9267556",
-        "percent_used": "12%",
-        "mount": "/",
-        "total_inodes": "10484736",
-        "inodes_used": "63867",
-        "inodes_available": "10420869",
-        "inodes_percent_used": "1%",
-        "fs_type": "xfs",
-        "mount_options": [
-          "rw",
-          "relatime",
-          "nouuid",
-          "attr2",
-          "inode64",
-          "logbsize=64k",
-          "sunit=128",
-          "swidth=128",
-          "noquota"
-        ]
-      },
-      "tmpfs": {
-        "kb_size": "16384128",
-        "kb_used": "12",
-        "kb_available": "16384116",
-        "percent_used": "1%",
-        "mount": "/proc/sched_debug",
-        "total_inodes": "4096032",
-        "inodes_used": "9",
-        "inodes_available": "4096023",
-        "inodes_percent_used": "1%",
-        "fs_type": "tmpfs",
-        "mount_options": [
-          "rw",
-          "nosuid",
-          "mode=755"
-        ]
-      },
-      "/dev/mapper/VolGroup00-root": {
-        "kb_size": "124944788",
-        "kb_used": "46038512",
-        "kb_available": "78906276",
-        "percent_used": "37%",
-        "mount": "/opt/aai/logroot/AAI",
-        "total_inodes": "125005824",
-        "inodes_used": "59710",
-        "inodes_available": "124946114",
-        "inodes_percent_used": "1%",
-        "fs_type": "xfs",
-        "mount_options": [
-          "rw",
-          "relatime",
-          "attr2",
-          "inode64",
-          "noquota"
-        ]
-      },
-      "shm": {
-        "kb_size": "65536",
-        "kb_used": "0",
-        "kb_available": "65536",
-        "percent_used": "0%",
-        "mount": "/dev/shm",
-        "total_inodes": "4096032",
-        "inodes_used": "1",
-        "inodes_available": "4096031",
-        "inodes_percent_used": "1%",
-        "fs_type": "tmpfs",
-        "mount_options": [
-          "rw",
-          "nosuid",
-          "nodev",
-          "noexec",
-          "relatime",
-          "size=65536k"
-        ]
-      },
-      "proc": {
-        "mount": "/proc/sysrq-trigger",
-        "fs_type": "proc",
-        "mount_options": [
-          "ro",
-          "nosuid",
-          "nodev",
-          "noexec",
-          "relatime"
-        ]
-      },
-      "devpts": {
-        "mount": "/dev/pts",
-        "fs_type": "devpts",
-        "mount_options": [
-          "rw",
-          "nosuid",
-          "noexec",
-          "relatime",
-          "gid=5",
-          "mode=620",
-          "ptmxmode=666"
-        ]
-      },
-      "sysfs": {
-        "mount": "/sys",
-        "fs_type": "sysfs",
-        "mount_options": [
-          "ro",
-          "nosuid",
-          "nodev",
-          "noexec",
-          "relatime"
-        ]
-      },
-      "cgroup": {
-        "mount": "/sys/fs/cgroup/net_cls",
-        "fs_type": "cgroup",
-        "mount_options": [
-          "ro",
-          "nosuid",
-          "nodev",
-          "noexec",
-          "relatime",
-          "net_cls"
-        ]
-      },
-      "mqueue": {
-        "mount": "/dev/mqueue",
-        "fs_type": "mqueue",
-        "mount_options": [
-          "rw",
-          "nosuid",
-          "nodev",
-          "noexec",
-          "relatime"
-        ]
-      },
-      "rootfs": {
-        "mount": "/",
-        "fs_type": "rootfs",
-        "mount_options": [
-          "rw"
-        ]
-      }
-    },
-    "kernel": {
-      "name": "Linux",
-      "release": "3.10.0-327.el7.x86_64",
-      "version": "#1 SMP Thu Oct 29 17:29:29 EDT 2015",
-      "machine": "x86_64",
-      "processor": "x86_64",
-      "os": "GNU/Linux",
-      "modules": {
-        "nf_log_ipv4": {
-          "size": "12767",
-          "refcount": "1"
-        },
-        "nf_log_common": {
-          "size": "13317",
-          "refcount": "1"
-        },
-        "xt_LOG": {
-          "size": "12690",
-          "refcount": "1"
-        },
-        "nfsv3": {
-          "size": "39436",
-          "refcount": "0"
-        },
-        "binfmt_misc": {
-          "size": "17468",
-          "refcount": "1"
-        },
-        "rpcsec_gss_krb5": {
-          "size": "31477",
-          "refcount": "0"
-        },
-        "nfsv4": {
-          "size": "501078",
-          "refcount": "1"
-        },
-        "dns_resolver": {
-          "size": "13140",
-          "refcount": "1"
-        },
-        "nfs": {
-          "size": "251822",
-          "refcount": "3"
-        },
-        "fscache": {
-          "size": "64987",
-          "refcount": "2"
-        },
-        "xt_recent": {
-          "size": "18542",
-          "refcount": "2"
-        },
-        "xt_comment": {
-          "size": "12504",
-          "refcount": "168"
-        },
-        "nf_conntrack_netlink": {
-          "size": "36150",
-          "refcount": "0"
-        },
-        "nfnetlink": {
-          "size": "14606",
-          "refcount": "1"
-        },
-        "xt_nat": {
-          "size": "12681",
-          "refcount": "13"
-        },
-        "xt_mark": {
-          "size": "12563",
-          "refcount": "8"
-        },
-        "xfrm6_mode_tunnel": {
-          "size": "13227",
-          "refcount": "0"
-        },
-        "xfrm4_mode_tunnel": {
-          "size": "13227",
-          "refcount": "0"
-        },
-        "esp4": {
-          "size": "17175",
-          "refcount": "0"
-        },
-        "drbg": {
-          "size": "30280",
-          "refcount": "1"
-        },
-        "ansi_cprng": {
-          "size": "12989",
-          "refcount": "0"
-        },
-        "iptable_nat": {
-          "size": "12875",
-          "refcount": "2"
-        },
-        "nf_nat_ipv4": {
-          "size": "14115",
-          "refcount": "1"
-        },
-        "iptable_filter": {
-          "size": "12810",
-          "refcount": "1"
-        },
-        "ip_tables": {
-          "size": "27240",
-          "refcount": "2"
-        },
-        "veth": {
-          "size": "13365",
-          "refcount": "0"
-        },
-        "ipt_REJECT": {
-          "size": "12541",
-          "refcount": "35"
-        },
-        "ipt_MASQUERADE": {
-          "size": "12678",
-          "refcount": "9"
-        },
-        "nf_nat_masquerade_ipv4": {
-          "size": "13412",
-          "refcount": "1"
-        },
-        "nf_conntrack_ipv4": {
-          "size": "14862",
-          "refcount": "4"
-        },
-        "nf_defrag_ipv4": {
-          "size": "12729",
-          "refcount": "1"
-        },
-        "xt_addrtype": {
-          "size": "12635",
-          "refcount": "10"
-        },
-        "xt_conntrack": {
-          "size": "12760",
-          "refcount": "3"
-        },
-        "nf_nat": {
-          "size": "26146",
-          "refcount": "3"
-        },
-        "nf_conntrack": {
-          "size": "105745",
-          "refcount": "6"
-        },
-        "bridge": {
-          "size": "119562",
-          "refcount": "0",
-          "version": "2.3"
-        },
-        "stp": {
-          "size": "12976",
-          "refcount": "1"
-        },
-        "llc": {
-          "size": "14552",
-          "refcount": "2"
-        },
-        "dm_thin_pool": {
-          "size": "65489",
-          "refcount": "62"
-        },
-        "dm_persistent_data": {
-          "size": "62805",
-          "refcount": "1"
-        },
-        "dm_bio_prison": {
-          "size": "15907",
-          "refcount": "1"
-        },
-        "dm_bufio": {
-          "size": "28011",
-          "refcount": "1"
-        },
-        "loop": {
-          "size": "28121",
-          "refcount": "4"
-        },
-        "vfat": {
-          "size": "17411",
-          "refcount": "1"
-        },
-        "fat": {
-          "size": "65913",
-          "refcount": "1"
-        },
-        "intel_powerclamp": {
-          "size": "18648",
-          "refcount": "0"
-        },
-        "cdc_ether": {
-          "size": "14351",
-          "refcount": "0"
-        },
-        "ipmi_ssif": {
-          "size": "23695",
-          "refcount": "0"
-        },
-        "usbnet": {
-          "size": "43956",
-          "refcount": "1"
-        },
-        "coretemp": {
-          "size": "13435",
-          "refcount": "0"
-        },
-        "kvm_intel": {
-          "size": "162153",
-          "refcount": "0"
-        },
-        "kvm": {
-          "size": "525259",
-          "refcount": "1"
-        },
-        "pcspkr": {
-          "size": "12718",
-          "refcount": "0"
-        },
-        "mii": {
-          "size": "13934",
-          "refcount": "1"
-        },
-        "crc32_pclmul": {
-          "size": "13113",
-          "refcount": "0"
-        },
-        "ghash_clmulni_intel": {
-          "size": "13259",
-          "refcount": "0"
-        },
-        "aesni_intel": {
-          "size": "69884",
-          "refcount": "1"
-        },
-        "lrw": {
-          "size": "13286",
-          "refcount": "1"
-        },
-        "ipmi_devintf": {
-          "size": "17572",
-          "refcount": "0"
-        },
-        "gf128mul": {
-          "size": "14951",
-          "refcount": "1"
-        },
-        "glue_helper": {
-          "size": "13990",
-          "refcount": "1"
-        },
-        "ablk_helper": {
-          "size": "13597",
-          "refcount": "1"
-        },
-        "sg": {
-          "size": "40721",
-          "refcount": "0",
-          "version": "3.5.36"
-        },
-        "cryptd": {
-          "size": "20359",
-          "refcount": "3"
-        },
-        "iTCO_wdt": {
-          "size": "13480",
-          "refcount": "0",
-          "version": "1.11"
-        },
-        "ioatdma": {
-          "size": "67758",
-          "refcount": "0",
-          "version": "4.00"
-        },
-        "ipmi_si": {
-          "size": "53524",
-          "refcount": "0"
-        },
-        "iTCO_vendor_support": {
-          "size": "13718",
-          "refcount": "1",
-          "version": "1.04"
-        },
-        "ipmi_msghandler": {
-          "size": "46609",
-          "refcount": "3",
-          "version": "39.2"
-        },
-        "i7core_edac": {
-          "size": "24166",
-          "refcount": "0"
-        },
-        "i2c_i801": {
-          "size": "18134",
-          "refcount": "0"
-        },
-        "lpc_ich": {
-          "size": "21073",
-          "refcount": "0"
-        },
-        "edac_core": {
-          "size": "57922",
-          "refcount": "2"
-        },
-        "mfd_core": {
-          "size": "13435",
-          "refcount": "1"
-        },
-        "shpchp": {
-          "size": "37032",
-          "refcount": "0"
-        },
-        "dca": {
-          "size": "15130",
-          "refcount": "1",
-          "version": "1.12.1"
-        },
-        "acpi_cpufreq": {
-          "size": "19393",
-          "refcount": "0"
-        },
-        "nfsd": {
-          "size": "302418",
-          "refcount": "13"
-        },
-        "auth_rpcgss": {
-          "size": "59343",
-          "refcount": "2"
-        },
-        "nfs_acl": {
-          "size": "12837",
-          "refcount": "2"
-        },
-        "lockd": {
-          "size": "93600",
-          "refcount": "3"
-        },
-        "grace": {
-          "size": "13295",
-          "refcount": "2"
-        },
-        "sunrpc": {
-          "size": "300464",
-          "refcount": "29"
-        },
-        "xfs": {
-          "size": "939662",
-          "refcount": "63"
-        },
-        "libcrc32c": {
-          "size": "12644",
-          "refcount": "2"
-        },
-        "sd_mod": {
-          "size": "45497",
-          "refcount": "4"
-        },
-        "crc_t10dif": {
-          "size": "12714",
-          "refcount": "1"
-        },
-        "crct10dif_generic": {
-          "size": "12647",
-          "refcount": "0"
-        },
-        "mgag200": {
-          "size": "41467",
-          "refcount": "1"
-        },
-        "syscopyarea": {
-          "size": "12529",
-          "refcount": "1"
-        },
-        "sysfillrect": {
-          "size": "12701",
-          "refcount": "1"
-        },
-        "sysimgblt": {
-          "size": "12640",
-          "refcount": "1"
-        },
-        "i2c_algo_bit": {
-          "size": "13413",
-          "refcount": "1"
-        },
-        "drm_kms_helper": {
-          "size": "125008",
-          "refcount": "1"
-        },
-        "ttm": {
-          "size": "93441",
-          "refcount": "1"
-        },
-        "crct10dif_pclmul": {
-          "size": "14289",
-          "refcount": "1"
-        },
-        "crct10dif_common": {
-          "size": "12595",
-          "refcount": "3"
-        },
-        "drm": {
-          "size": "349210",
-          "refcount": "4"
-        },
-        "crc32c_intel": {
-          "size": "22079",
-          "refcount": "1"
-        },
-        "mptsas": {
-          "size": "62268",
-          "refcount": "3",
-          "version": "3.04.20"
-        },
-        "serio_raw": {
-          "size": "13462",
-          "refcount": "0"
-        },
-        "scsi_transport_sas": {
-          "size": "41034",
-          "refcount": "1"
-        },
-        "mptscsih": {
-          "size": "40150",
-          "refcount": "1",
-          "version": "3.04.20"
-        },
-        "mptbase": {
-          "size": "105960",
-          "refcount": "2",
-          "version": "3.04.20"
-        },
-        "i2c_core": {
-          "size": "40582",
-          "refcount": "6"
-        },
-        "bnx2": {
-          "size": "89215",
-          "refcount": "0",
-          "version": "2.2.6"
-        },
-        "dm_mirror": {
-          "size": "22135",
-          "refcount": "0"
-        },
-        "dm_region_hash": {
-          "size": "20862",
-          "refcount": "1"
-        },
-        "dm_log": {
-          "size": "18411",
-          "refcount": "2"
-        },
-        "dm_mod": {
-          "size": "113292",
-          "refcount": "136"
-        }
-      }
-    },
-    "memory": {
-      "swap": {
-        "cached": "6084kB",
-        "total": "16809980kB",
-        "free": "16798844kB"
-      },
-      "hugepages": {
-        "total": "0",
-        "free": "0",
-        "reserved": "0",
-        "surplus": "0"
-      },
-      "total": "32768260kB",
-      "free": "13104736kB",
-      "buffers": "1156kB",
-      "cached": "13241476kB",
-      "active": "7816540kB",
-      "inactive": "10018924kB",
-      "dirty": "247552kB",
-      "writeback": "4kB",
-      "anon_pages": "4569208kB",
-      "mapped": "381016kB",
-      "slab": "1003808kB",
-      "slab_reclaimable": "719424kB",
-      "slab_unreclaim": "284384kB",
-      "page_tables": "38108kB",
-      "nfs_unstable": "0kB",
-      "bounce": "0kB",
-      "commit_limit": "33194108kB",
-      "committed_as": "31724736kB",
-      "vmalloc_total": "34359738367kB",
-      "vmalloc_used": "471744kB",
-      "vmalloc_chunk": "34342041528kB",
-      "hugepage_size": "2048kB"
-    },
-    "network": {
-      "interfaces": {
-        "lo": {
-          "mtu": "65536",
-          "flags": [
-            "LOOPBACK",
-            "UP",
-            "LOWER_UP"
-          ],
-          "encapsulation": "Loopback",
-          "addresses": {
-            "127.0.0.1": {
-              "family": "inet",
-              "prefixlen": "8",
-              "netmask": "255.0.0.0",
-              "scope": "Node"
-            },
-            "::1": {
-              "family": "inet6",
-              "prefixlen": "128",
-              "scope": "Node",
-              "tags": [
-
-              ]
-            }
-          },
-          "state": "unknown"
-        },
-        "eth0": {
-          "type": "eth",
-          "number": "0",
-          "mtu": "1402",
-          "flags": [
-            "BROADCAST",
-            "MULTICAST",
-            "UP",
-            "LOWER_UP"
-          ],
-          "encapsulation": "Ethernet",
-          "addresses": {
-            "02:ED:02:D3:02:0F": {
-              "family": "lladdr"
-            },
-            "10.42.48.16": {
-              "family": "inet",
-              "prefixlen": "16",
-              "netmask": "255.255.0.0",
-              "scope": "Global"
-            },
-            "fe80::b8ba:d4ff:fe5d:60f6": {
-              "family": "inet6",
-              "prefixlen": "64",
-              "scope": "Link",
-              "tags": [
-                "tentative",
-                "dadfailed"
-              ]
-            }
-          },
-          "state": "up",
-          "arp": {
-            "10.42.68.233": "02:ed:02:98:77:b4",
-            "10.42.0.1": "02:42:41:72:e1:2f"
-          },
-          "routes": [
-            {
-              "destination": "default",
-              "family": "inet",
-              "via": "10.42.0.1"
-            },
-            {
-              "destination": "10.42.0.0/16",
-              "family": "inet",
-              "scope": "link",
-              "proto": "kernel",
-              "src": "10.42.48.16"
-            },
-            {
-              "destination": "169.254.169.250",
-              "family": "inet",
-              "via": "10.42.0.1"
-            },
-            {
-              "destination": "fe80::/64",
-              "family": "inet6",
-              "metric": "256",
-              "proto": "kernel"
-            }
-          ]
-        }
-      },
-      "default_interface": "eth0",
-      "default_gateway": "10.42.0.1"
-    },
-    "counters": {
-      "network": {
-        "interfaces": {
-          "lo": {
-            "rx": {
-              "bytes": "0",
-              "packets": "0",
-              "errors": "0",
-              "drop": "0",
-              "overrun": "0"
-            },
-            "tx": {
-              "bytes": "0",
-              "packets": "0",
-              "errors": "0",
-              "drop": "0",
-              "carrier": "0",
-              "collisions": "0"
-            }
-          },
-          "eth0": {
-            "rx": {
-              "bytes": "52862",
-              "packets": "62",
-              "errors": "0",
-              "drop": "0",
-              "overrun": "0"
-            },
-            "tx": {
-              "bytes": "5712",
-              "packets": "26",
-              "errors": "0",
-              "drop": "0",
-              "carrier": "0",
-              "collisions": "0"
-            }
-          }
-        }
-      }
-    },
-    "ipaddress": "10.42.48.16",
-    "macaddress": "02:ED:02:D3:02:0F",
-    "ip6address": "fe80::b8ba:d4ff:fe5d:60f6",
-    "os": "linux",
-    "os_version": "3.10.0-327.el7.x86_64",
-    "lsb": {
-      "id": "Ubuntu",
-      "release": "14.04",
-      "codename": "trusty",
-      "description": "Ubuntu 14.04.5 LTS"
-    },
-    "platform": "ubuntu",
-    "platform_version": "14.04",
-    "platform_family": "debian",
-    "uptime_seconds": 3668582,
-    "uptime": "42 days 11 hours 03 minutes 02 seconds",
-    "idletime_seconds": 86056264,
-    "idletime": "996 days 00 hours 31 minutes 04 seconds",
-    "virtualization": {
-      "systems": {
-        "kvm": "host",
-        "docker": "guest"
-      },
-      "system": "docker",
-      "role": "guest"
-    },
-    "languages": {
-      "java": {
-        "version": "1.8.0_111",
-        "runtime": {
-          "name": "OpenJDK Runtime Environment",
-          "build": "1.8.0_111-8u111-b14-3~14.04.1-b14"
-        },
-        "hotspot": {
-          "name": "OpenJDK 64-Bit Server VM",
-          "build": "25.111-b14, mixed mode"
-        }
-      },
-      "perl": {
-        "version": "5.18.2",
-        "archname": "x86_64-linux-gnu-thread-multi"
-      },
-      "ruby": {
-        "platform": "x86_64-linux",
-        "version": "2.1.8",
-        "release_date": "2015-12-16",
-        "target": "x86_64-pc-linux-gnu",
-        "target_cpu": "x86_64",
-        "target_vendor": "pc",
-        "target_os": "linux",
-        "host": "x86_64-pc-linux-gnu",
-        "host_cpu": "x86_64",
-        "host_os": "linux-gnu",
-        "host_vendor": "pc",
-        "bin_dir": "/opt/chefdk/embedded/bin",
-        "ruby_bin": "/opt/chefdk/embedded/bin/ruby",
-        "gems_dir": "/opt/chefdk/embedded/lib/ruby/gems/2.1.0",
-        "gem_bin": "/opt/chefdk/embedded/bin/gem"
-      }
-    },
-    "chef_packages": {
-      "chef": {
-        "version": "12.13.37",
-        "chef_root": "/opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/chef-12.13.37/lib"
-      },
-      "ohai": {
-        "version": "8.19.1",
-        "ohai_root": "/opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/ohai-8.19.1/lib/ohai"
-      }
-    },
-    "dmi": {
-
-    },
-    "etc": {
-      "passwd": {
-        "root": {
-          "dir": "/root",
-          "gid": 0,
-          "uid": 0,
-          "shell": "/bin/bash",
-          "gecos": "root"
-        },
-        "daemon": {
-          "dir": "/usr/sbin",
-          "gid": 1,
-          "uid": 1,
-          "shell": "/usr/sbin/nologin",
-          "gecos": "daemon"
-        },
-        "bin": {
-          "dir": "/bin",
-          "gid": 2,
-          "uid": 2,
-          "shell": "/usr/sbin/nologin",
-          "gecos": "bin"
-        },
-        "sys": {
-          "dir": "/dev",
-          "gid": 3,
-          "uid": 3,
-          "shell": "/usr/sbin/nologin",
-          "gecos": "sys"
-        },
-        "sync": {
-          "dir": "/bin",
-          "gid": 65534,
-          "uid": 4,
-          "shell": "/bin/sync",
-          "gecos": "sync"
-        },
-        "games": {
-          "dir": "/usr/games",
-          "gid": 60,
-          "uid": 5,
-          "shell": "/usr/sbin/nologin",
-          "gecos": "games"
-        },
-        "man": {
-          "dir": "/var/cache/man",
-          "gid": 12,
-          "uid": 6,
-          "shell": "/usr/sbin/nologin",
-          "gecos": "man"
-        },
-        "lp": {
-          "dir": "/var/spool/lpd",
-          "gid": 7,
-          "uid": 7,
-          "shell": "/usr/sbin/nologin",
-          "gecos": "lp"
-        },
-        "mail": {
-          "dir": "/var/mail",
-          "gid": 8,
-          "uid": 8,
-          "shell": "/usr/sbin/nologin",
-          "gecos": "mail"
-        },
-        "news": {
-          "dir": "/var/spool/news",
-          "gid": 9,
-          "uid": 9,
-          "shell": "/usr/sbin/nologin",
-          "gecos": "news"
-        },
-        "uucp": {
-          "dir": "/var/spool/uucp",
-          "gid": 10,
-          "uid": 10,
-          "shell": "/usr/sbin/nologin",
-          "gecos": "uucp"
-        },
-        "proxy": {
-          "dir": "/bin",
-          "gid": 13,
-          "uid": 13,
-          "shell": "/usr/sbin/nologin",
-          "gecos": "proxy"
-        },
-        "www-data": {
-          "dir": "/var/www",
-          "gid": 33,
-          "uid": 33,
-          "shell": "/usr/sbin/nologin",
-          "gecos": "www-data"
-        },
-        "backup": {
-          "dir": "/var/backups",
-          "gid": 34,
-          "uid": 34,
-          "shell": "/usr/sbin/nologin",
-          "gecos": "backup"
-        },
-        "list": {
-          "dir": "/var/list",
-          "gid": 38,
-          "uid": 38,
-          "shell": "/usr/sbin/nologin",
-          "gecos": "Mailing List Manager"
-        },
-        "irc": {
-          "dir": "/var/run/ircd",
-          "gid": 39,
-          "uid": 39,
-          "shell": "/usr/sbin/nologin",
-          "gecos": "ircd"
-        },
-        "gnats": {
-          "dir": "/var/lib/gnats",
-          "gid": 41,
-          "uid": 41,
-          "shell": "/usr/sbin/nologin",
-          "gecos": "Gnats Bug-Reporting System (admin)"
-        },
-        "nobody": {
-          "dir": "/nonexistent",
-          "gid": 65534,
-          "uid": 65534,
-          "shell": "/usr/sbin/nologin",
-          "gecos": "nobody"
-        },
-        "libuuid": {
-          "dir": "/var/lib/libuuid",
-          "gid": 101,
-          "uid": 100,
-          "shell": "",
-          "gecos": ""
-        },
-        "syslog": {
-          "dir": "/home/syslog",
-          "gid": 104,
-          "uid": 101,
-          "shell": "/bin/false",
-          "gecos": ""
-        },
-        "aaiadmin": {
-          "dir": "/opt/aaihome/aaiadmin",
-          "gid": 1000,
-          "uid": 1000,
-          "shell": "/bin/bash",
-          "gecos": ""
-        }
-      },
-      "group": {
-        "root": {
-          "gid": 0,
-          "members": [
-
-          ]
-        },
-        "daemon": {
-          "gid": 1,
-          "members": [
-
-          ]
-        },
-        "bin": {
-          "gid": 2,
-          "members": [
-
-          ]
-        },
-        "sys": {
-          "gid": 3,
-          "members": [
-
-          ]
-        },
-        "adm": {
-          "gid": 4,
-          "members": [
-            "syslog"
-          ]
-        },
-        "tty": {
-          "gid": 5,
-          "members": [
-
-          ]
-        },
-        "disk": {
-          "gid": 6,
-          "members": [
-
-          ]
-        },
-        "lp": {
-          "gid": 7,
-          "members": [
-
-          ]
-        },
-        "mail": {
-          "gid": 8,
-          "members": [
-
-          ]
-        },
-        "news": {
-          "gid": 9,
-          "members": [
-
-          ]
-        },
-        "uucp": {
-          "gid": 10,
-          "members": [
-
-          ]
-        },
-        "man": {
-          "gid": 12,
-          "members": [
-
-          ]
-        },
-        "proxy": {
-          "gid": 13,
-          "members": [
-
-          ]
-        },
-        "kmem": {
-          "gid": 15,
-          "members": [
-
-          ]
-        },
-        "dialout": {
-          "gid": 20,
-          "members": [
-
-          ]
-        },
-        "fax": {
-          "gid": 21,
-          "members": [
-
-          ]
-        },
-        "voice": {
-          "gid": 22,
-          "members": [
-
-          ]
-        },
-        "cdrom": {
-          "gid": 24,
-          "members": [
-
-          ]
-        },
-        "floppy": {
-          "gid": 25,
-          "members": [
-
-          ]
-        },
-        "tape": {
-          "gid": 26,
-          "members": [
-
-          ]
-        },
-        "sudo": {
-          "gid": 27,
-          "members": [
-
-          ]
-        },
-        "audio": {
-          "gid": 29,
-          "members": [
-
-          ]
-        },
-        "dip": {
-          "gid": 30,
-          "members": [
-
-          ]
-        },
-        "www-data": {
-          "gid": 33,
-          "members": [
-
-          ]
-        },
-        "backup": {
-          "gid": 34,
-          "members": [
-
-          ]
-        },
-        "operator": {
-          "gid": 37,
-          "members": [
-
-          ]
-        },
-        "list": {
-          "gid": 38,
-          "members": [
-
-          ]
-        },
-        "irc": {
-          "gid": 39,
-          "members": [
-
-          ]
-        },
-        "src": {
-          "gid": 40,
-          "members": [
-
-          ]
-        },
-        "gnats": {
-          "gid": 41,
-          "members": [
-
-          ]
-        },
-        "shadow": {
-          "gid": 42,
-          "members": [
-
-          ]
-        },
-        "utmp": {
-          "gid": 43,
-          "members": [
-
-          ]
-        },
-        "video": {
-          "gid": 44,
-          "members": [
-
-          ]
-        },
-        "sasl": {
-          "gid": 45,
-          "members": [
-
-          ]
-        },
-        "plugdev": {
-          "gid": 46,
-          "members": [
-
-          ]
-        },
-        "staff": {
-          "gid": 50,
-          "members": [
-
-          ]
-        },
-        "games": {
-          "gid": 60,
-          "members": [
-
-          ]
-        },
-        "users": {
-          "gid": 100,
-          "members": [
-
-          ]
-        },
-        "nogroup": {
-          "gid": 65534,
-          "members": [
-
-          ]
-        },
-        "libuuid": {
-          "gid": 101,
-          "members": [
-
-          ]
-        },
-        "netdev": {
-          "gid": 102,
-          "members": [
-
-          ]
-        },
-        "crontab": {
-          "gid": 103,
-          "members": [
-
-          ]
-        },
-        "syslog": {
-          "gid": 104,
-          "members": [
-
-          ]
-        },
-        "ssh": {
-          "gid": 105,
-          "members": [
-
-          ]
-        },
-        "aaiadmin": {
-          "gid": 1000,
-          "members": [
-
-          ]
-        }
-      }
-    },
-    "current_user": "aaiadmin",
-    "cloud_v2": null,
-    "command": {
-      "ps": "ps -ef"
-    },
-    "filesystem2": {
-      "by_device": {
-        "/dev/mapper/docker-253:0-270022137-aee52a2bccbb70b9e9c431c27c5b8ed9e848a4159ac289080b3a273f484b52e2": {
-          "kb_size": "10474496",
-          "kb_used": "1206940",
-          "kb_available": "9267556",
-          "percent_used": "12%",
-          "total_inodes": "10484736",
-          "inodes_used": "63868",
-          "inodes_available": "10420868",
-          "inodes_percent_used": "1%",
-          "fs_type": "xfs",
-          "mount_options": [
-            "rw",
-            "relatime",
-            "nouuid",
-            "attr2",
-            "inode64",
-            "logbsize=64k",
-            "sunit=128",
-            "swidth=128",
-            "noquota"
-          ],
-          "mounts": [
-            "/"
-          ]
-        },
-        "tmpfs": {
-          "kb_size": "16384128",
-          "kb_used": "12",
-          "kb_available": "16384116",
-          "percent_used": "1%",
-          "total_inodes": "4096032",
-          "inodes_used": "9",
-          "inodes_available": "4096023",
-          "inodes_percent_used": "1%",
-          "fs_type": "tmpfs",
-          "mount_options": [
-            "rw",
-            "nosuid",
-            "mode=755"
-          ],
-          "mounts": [
-            "/dev",
-            "/sys/fs/cgroup",
-            "/run/secrets/kubernetes.io/serviceaccount",
-            "/proc/kcore",
-            "/proc/timer_list",
-            "/proc/timer_stats",
-            "/proc/sched_debug"
-          ]
-        },
-        "/dev/mapper/VolGroup00-root": {
-          "kb_size": "124944788",
-          "kb_used": "46040860",
-          "kb_available": "78903928",
-          "percent_used": "37%",
-          "total_inodes": "125005824",
-          "inodes_used": "59721",
-          "inodes_available": "124946103",
-          "inodes_percent_used": "1%",
-          "fs_type": "xfs",
-          "mount_options": [
-            "rw",
-            "relatime",
-            "attr2",
-            "inode64",
-            "noquota"
-          ],
-          "mounts": [
-            "/var/chef",
-            "/dev/termination-log",
-            "/etc/hosts",
-            "/etc/resolv.conf",
-            "/etc/hostname",
-            "/etc/ssl/certs",
-            "/opt/aai/logroot",
-            "/opt/aai/logroot/AAI"
-          ]
-        },
-        "shm": {
-          "kb_size": "65536",
-          "kb_used": "0",
-          "kb_available": "65536",
-          "percent_used": "0%",
-          "total_inodes": "4096032",
-          "inodes_used": "1",
-          "inodes_available": "4096031",
-          "inodes_percent_used": "1%",
-          "fs_type": "tmpfs",
-          "mount_options": [
-            "rw",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime",
-            "size=65536k"
-          ],
-          "mounts": [
-            "/dev/shm"
-          ]
-        },
-        "proc": {
-          "fs_type": "proc",
-          "mount_options": [
-            "ro",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime"
-          ],
-          "mounts": [
-            "/proc",
-            "/proc/bus",
-            "/proc/fs",
-            "/proc/irq",
-            "/proc/sys",
-            "/proc/sysrq-trigger"
-          ]
-        },
-        "devpts": {
-          "fs_type": "devpts",
-          "mount_options": [
-            "rw",
-            "nosuid",
-            "noexec",
-            "relatime",
-            "gid=5",
-            "mode=620",
-            "ptmxmode=666"
-          ],
-          "mounts": [
-            "/dev/pts"
-          ]
-        },
-        "sysfs": {
-          "fs_type": "sysfs",
-          "mount_options": [
-            "ro",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime"
-          ],
-          "mounts": [
-            "/sys"
-          ]
-        },
-        "cgroup": {
-          "fs_type": "cgroup",
-          "mount_options": [
-            "ro",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime",
-            "net_cls"
-          ],
-          "mounts": [
-            "/sys/fs/cgroup/systemd",
-            "/sys/fs/cgroup/hugetlb",
-            "/sys/fs/cgroup/cpuset",
-            "/sys/fs/cgroup/perf_event",
-            "/sys/fs/cgroup/devices",
-            "/sys/fs/cgroup/memory",
-            "/sys/fs/cgroup/freezer",
-            "/sys/fs/cgroup/cpuacct,cpu",
-            "/sys/fs/cgroup/blkio",
-            "/sys/fs/cgroup/net_cls"
-          ]
-        },
-        "mqueue": {
-          "fs_type": "mqueue",
-          "mount_options": [
-            "rw",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime"
-          ],
-          "mounts": [
-            "/dev/mqueue"
-          ]
-        },
-        "sda": {
-          "mounts": [
-
-          ]
-        },
-        "sda1": {
-          "mounts": [
-
-          ]
-        },
-        "sda2": {
-          "mounts": [
-
-          ]
-        },
-        "sda3": {
-          "mounts": [
-
-          ]
-        },
-        "VolGroup00-root": {
-          "mounts": [
-
-          ]
-        },
-        "VolGroup00-swap": {
-          "mounts": [
-
-          ]
-        },
-        "loop0": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-pool": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-c28b1956606e2362d5973a45b6e4cd449a6e3dfde835051b8189baa07ab90677": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-76ee6f1f15bcf383b12d5700114ab6976ec1ca9ba17e58263f6c283b78999f2d": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-0a8e3f16abf8bcebf54192b6179d5a1b33d9b5a64d9c4f7672d3c3c2bd061695": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-d0cf37f9160f95c1689e1098d0f422e57b42c59bbd3d068b0c845c9fb73cbeab": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-95f4626492d00b64dc651d5a21ebaf8390c95643487dd6e780a6afb8c786793c": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-afcd876e6ad1baf2ef6357b7ae2bdf41e907f87dd51d9028e4b37da20d3b30aa": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-2758942c95b0dfff3e49e95e36aef81bfc0f7dbbcf8e95b33eac58fabe923a1c": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-3f656d48ab6bcf5cd851a63d76d6ddb0f52538864a3798904873a094074ca1aa": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-b11f14bb9de62a6986c071961d7b364b16719571fa7a961eaddd842f9e7acaec": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-6c228fff231eda3fd92083bd5af152c83f86c0e22472ab1406f8dd3dc045be0a": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-bedcab452c8d9a93f45ff84d2bb0bca5470abf2bec8d757425185683eb683477": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-afb725c0d5cda8a67beef1dc153d6a01def460488208b762fb304b20f560d7e2": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-50d30b9365b9e1f5f9ee091b618e3256512a19c37baa6e637097439c0dc8bc12": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-0321e66c14e6a11d3c6b1e7d78068ddaa88d5d20e6ec9c7f79526d7da10074a0": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-49153b02f8582a70d07d12b563a3a7ef49a8e844b41e28125fb196460e7c9c4a": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-c843155e6089bef4e7136834de276e19c0a9dc16f7bd9ca23e98bc23db32160e": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-fdc0370b5d09cc4fe23beac8306a32cee73208b2bc3aee30672a2c2d79ea4a5a": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-89ed109a1620edd5f127974dad0d9c02e03ed291cbbf2c78285841e0d35bc441": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-8f1df8714a43203ba74bf23aa7a119711ec449e4a9df6c52f21252fb7a927eac": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-12b75d459dfcf37fbdc87b7fd9a4823ecea54956c2e3f749952a28607bff0d56": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-466d26293ebb5a1478948472b9981d81642b44d946b4bf90522eee0161d9cd90": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-6074aeabae56b5e95e44edc90b00c5ec810505de2d368e0b4357939fe17fa2b8": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-e1405ddeab4a737954f63912179adccda5e4dad1c77e6e0b4112b84543d18eea": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-e1d7a94a778f6df54062c73ca895087ebd02c2a3b9984c1b1dccf9d9958042cb": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-9b7c1959e4a90323798cc4fee20fb1b81e92b8bd2ea35df98ae3332902a71491": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-0eace81671b726b14466e7f2767223c71d88a53716189747009ae828b9ae7e3e": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-4f956e457e6c870e1134c94ed2972bcba543a792335106e8a5254d9cf97b3ef4": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-3b3db0c5c974df6ff60b4985775f8459b9bf5764a64822abe4f6d3769ae3d67d": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-048ae348b495c7a85ae2e0c0e21431313784fe86253804ea14d1ef602ad83bbd": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-5c2adfd19201c571716d88e5942f0edea703074cdb27d9d487c4f865396f3d05": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-9c983aa29c0e3b1cc03c3b3620249892524dcc0369fbe5523911263cff195ce5": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-e1233e185d0ac54e4eaaab4a1ad25c713a402a99aa9683d34f316d22a2a9bbcb": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-4f12946b146fbcc1f8e77c975a44b0efe1bd38a29ab824b119df3fb2caa94378": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-30045a9ff852a3504751fa28f5506b5be73cb7d4f94c5992add1f4bfefef5a75": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-3d04a1be11f53c7df262d1426b16518719de31133f5e923861709172f8f61d7a": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-8c2ea7ff9288ec11f1982374f0db67cbd5583af49ab7483e583520b1a6f85cb6": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-d9dad51cea1b76714fe907165513d9287b7e89f3d397f100ba2503ee8d3c7866": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-21aaf0451ed738e7c201c08003777b09581c660728c755053d4a42abad9e6139": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-146f353db9eb3c2dbd37c9f41a93b7a81d8b57177b3df4e7513a98ed3d630a6b": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-1d9a89b4068dbb946ab85151b6695bdfa958483a063f911994f0c31ffdf5db70": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-2f000033aba93b933d88110a3b116a1378a349d483a32b4e45c6f6872fc5b3c4": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-ac570f787b70c4d248c478297cbd70f7115eef4a68f9735b83299f04adaa9f4a": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-58fdfec6cd3ddc5aa0aa421d63e8b47e321847ac639494a9cbe3eb9114e05de0": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-1d5992aed495d531ef999895bd7cb43d6a442bbc3717b98dad4d751fc5ff0636": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-5e8723610da9b546387ac9cba7d2464e20913a79d3a1447e87e4f0845c5b16a6": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-7ef59f8ad74ca69b451d96740427f4d246d74bc6c2050b57d4fd2e52d464857c": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-de0fb3a6d35158ccf3fad7843051fb0c998f15bf0a1be6b11ea06b8ad9aac939": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-422ec77dad12966a1eda6349099a4cc558da46eff25c963378455ff5c2371737": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-0dabc92e26b8d7fb6c26ac6583e9a6aaebf9336a614e8b0cc0243fb52d68d6be": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-21c4d1e6b84e2530c3f205b1bce4f4ea604a93f7b41b06b329233fbb1f3c1702": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-438add1cecce211d1d24be7ee9a343617ced70df884d3625acc177dc229055bb": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-1f458384aedf7e4ec4759b201c2b20863d5e683495d925085100fb3c0d83dce8": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-5574392d6bc26cbdf52040f3c5b13775c469aff499a24afd3752689e09e4d315": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-dbfcfadc408852a988a2a7b165a2223c0214f51943d32a9bf547d1dc41a995bd": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-f359b43ccd76bc00cd7a959f8ca0b905a83d637dbc41a97196d9427e549962fc": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-ee7a6b0f6a9b1d21661ab8283beec96f810ad021c15f4bc2bf40e8e4eaa2958f": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-aee52a2bccbb70b9e9c431c27c5b8ed9e848a4159ac289080b3a273f484b52e2": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-795b3da068ebac7a9e5f8cde2be18a50b13534ef3d5b2154b57186e9891cd58d": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-f96d80c322d68ed4db58c1473b55ffb0fa47281658a89c2127d394d2e6074846": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-4793f4f2c5d516224fe9fc4302621bfc824254e08e6682426b1d0e09918773b7": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-70df5a9b03061599ecfdddcd3c87bd989a22937ee6d6fa1d71e53b5fe1b5120e": {
-          "mounts": [
-
-          ]
-        },
-        "docker-253:0-270022137-087636c40f4ed697170f0aea17cf3aa26d5b34cafb043d58aa437d1a11ba36e9": {
-          "mounts": [
-
-          ]
-        },
-        "loop1": {
-          "mounts": [
-
-          ]
-        },
-        "rootfs": {
-          "fs_type": "rootfs",
-          "mount_options": [
-            "rw"
-          ],
-          "mounts": [
-            "/"
-          ]
-        }
-      },
-      "by_mountpoint": {
-        "/": {
-          "kb_size": "10474496",
-          "kb_used": "1206940",
-          "kb_available": "9267556",
-          "percent_used": "12%",
-          "total_inodes": "10484736",
-          "inodes_used": "63868",
-          "inodes_available": "10420868",
-          "inodes_percent_used": "1%",
-          "fs_type": "rootfs",
-          "mount_options": [
-            "rw"
-          ],
-          "devices": [
-            "/dev/mapper/docker-253:0-270022137-aee52a2bccbb70b9e9c431c27c5b8ed9e848a4159ac289080b3a273f484b52e2",
-            "rootfs"
-          ]
-        },
-        "/dev": {
-          "kb_size": "16384128",
-          "kb_used": "0",
-          "kb_available": "16384128",
-          "percent_used": "0%",
-          "total_inodes": "4096032",
-          "inodes_used": "18",
-          "inodes_available": "4096014",
-          "inodes_percent_used": "1%",
-          "fs_type": "tmpfs",
-          "mount_options": [
-            "rw",
-            "nosuid",
-            "mode=755"
-          ],
-          "devices": [
-            "tmpfs"
-          ]
-        },
-        "/sys/fs/cgroup": {
-          "kb_size": "16384128",
-          "kb_used": "0",
-          "kb_available": "16384128",
-          "percent_used": "0%",
-          "total_inodes": "4096032",
-          "inodes_used": "13",
-          "inodes_available": "4096019",
-          "inodes_percent_used": "1%",
-          "fs_type": "tmpfs",
-          "mount_options": [
-            "ro",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime",
-            "mode=755"
-          ],
-          "devices": [
-            "tmpfs"
-          ]
-        },
-        "/var/chef": {
-          "kb_size": "124944788",
-          "kb_used": "46040860",
-          "kb_available": "78903928",
-          "percent_used": "37%",
-          "total_inodes": "125005824",
-          "inodes_used": "59721",
-          "inodes_available": "124946103",
-          "inodes_percent_used": "1%",
-          "fs_type": "xfs",
-          "mount_options": [
-            "rw",
-            "relatime",
-            "attr2",
-            "inode64",
-            "noquota"
-          ],
-          "devices": [
-            "/dev/mapper/VolGroup00-root"
-          ]
-        },
-        "/dev/shm": {
-          "kb_size": "65536",
-          "kb_used": "0",
-          "kb_available": "65536",
-          "percent_used": "0%",
-          "total_inodes": "4096032",
-          "inodes_used": "1",
-          "inodes_available": "4096031",
-          "inodes_percent_used": "1%",
-          "fs_type": "tmpfs",
-          "mount_options": [
-            "rw",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime",
-            "size=65536k"
-          ],
-          "devices": [
-            "shm"
-          ]
-        },
-        "/run/secrets/kubernetes.io/serviceaccount": {
-          "kb_size": "16384128",
-          "kb_used": "12",
-          "kb_available": "16384116",
-          "percent_used": "1%",
-          "total_inodes": "4096032",
-          "inodes_used": "9",
-          "inodes_available": "4096023",
-          "inodes_percent_used": "1%",
-          "fs_type": "tmpfs",
-          "mount_options": [
-            "ro",
-            "relatime"
-          ],
-          "devices": [
-            "tmpfs"
-          ]
-        },
-        "/proc": {
-          "fs_type": "proc",
-          "mount_options": [
-            "rw",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime"
-          ],
-          "devices": [
-            "proc"
-          ]
-        },
-        "/dev/pts": {
-          "fs_type": "devpts",
-          "mount_options": [
-            "rw",
-            "nosuid",
-            "noexec",
-            "relatime",
-            "gid=5",
-            "mode=620",
-            "ptmxmode=666"
-          ],
-          "devices": [
-            "devpts"
-          ]
-        },
-        "/sys": {
-          "fs_type": "sysfs",
-          "mount_options": [
-            "ro",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime"
-          ],
-          "devices": [
-            "sysfs"
-          ]
-        },
-        "/sys/fs/cgroup/systemd": {
-          "fs_type": "cgroup",
-          "mount_options": [
-            "ro",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime",
-            "xattr",
-            "release_agent=/usr/lib/systemd/systemd-cgroups-agent",
-            "name=systemd"
-          ],
-          "devices": [
-            "cgroup"
-          ]
-        },
-        "/sys/fs/cgroup/hugetlb": {
-          "fs_type": "cgroup",
-          "mount_options": [
-            "ro",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime",
-            "hugetlb"
-          ],
-          "devices": [
-            "cgroup"
-          ]
-        },
-        "/sys/fs/cgroup/cpuset": {
-          "fs_type": "cgroup",
-          "mount_options": [
-            "ro",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime",
-            "cpuset"
-          ],
-          "devices": [
-            "cgroup"
-          ]
-        },
-        "/sys/fs/cgroup/perf_event": {
-          "fs_type": "cgroup",
-          "mount_options": [
-            "ro",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime",
-            "perf_event"
-          ],
-          "devices": [
-            "cgroup"
-          ]
-        },
-        "/sys/fs/cgroup/devices": {
-          "fs_type": "cgroup",
-          "mount_options": [
-            "ro",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime",
-            "devices"
-          ],
-          "devices": [
-            "cgroup"
-          ]
-        },
-        "/sys/fs/cgroup/memory": {
-          "fs_type": "cgroup",
-          "mount_options": [
-            "ro",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime",
-            "memory"
-          ],
-          "devices": [
-            "cgroup"
-          ]
-        },
-        "/sys/fs/cgroup/freezer": {
-          "fs_type": "cgroup",
-          "mount_options": [
-            "ro",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime",
-            "freezer"
-          ],
-          "devices": [
-            "cgroup"
-          ]
-        },
-        "/sys/fs/cgroup/cpuacct,cpu": {
-          "fs_type": "cgroup",
-          "mount_options": [
-            "ro",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime",
-            "cpuacct",
-            "cpu"
-          ],
-          "devices": [
-            "cgroup"
-          ]
-        },
-        "/sys/fs/cgroup/blkio": {
-          "fs_type": "cgroup",
-          "mount_options": [
-            "ro",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime",
-            "blkio"
-          ],
-          "devices": [
-            "cgroup"
-          ]
-        },
-        "/sys/fs/cgroup/net_cls": {
-          "fs_type": "cgroup",
-          "mount_options": [
-            "ro",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime",
-            "net_cls"
-          ],
-          "devices": [
-            "cgroup"
-          ]
-        },
-        "/dev/mqueue": {
-          "fs_type": "mqueue",
-          "mount_options": [
-            "rw",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime"
-          ],
-          "devices": [
-            "mqueue"
-          ]
-        },
-        "/dev/termination-log": {
-          "fs_type": "xfs",
-          "mount_options": [
-            "rw",
-            "relatime",
-            "attr2",
-            "inode64",
-            "noquota"
-          ],
-          "devices": [
-            "/dev/mapper/VolGroup00-root"
-          ]
-        },
-        "/etc/hosts": {
-          "fs_type": "xfs",
-          "mount_options": [
-            "rw",
-            "relatime",
-            "attr2",
-            "inode64",
-            "noquota"
-          ],
-          "devices": [
-            "/dev/mapper/VolGroup00-root"
-          ]
-        },
-        "/etc/resolv.conf": {
-          "fs_type": "xfs",
-          "mount_options": [
-            "rw",
-            "relatime",
-            "attr2",
-            "inode64",
-            "noquota"
-          ],
-          "devices": [
-            "/dev/mapper/VolGroup00-root"
-          ]
-        },
-        "/etc/hostname": {
-          "fs_type": "xfs",
-          "mount_options": [
-            "rw",
-            "relatime",
-            "attr2",
-            "inode64",
-            "noquota"
-          ],
-          "devices": [
-            "/dev/mapper/VolGroup00-root"
-          ]
-        },
-        "/etc/ssl/certs": {
-          "fs_type": "xfs",
-          "mount_options": [
-            "rw",
-            "relatime",
-            "attr2",
-            "inode64",
-            "noquota"
-          ],
-          "devices": [
-            "/dev/mapper/VolGroup00-root"
-          ]
-        },
-        "/opt/aai/logroot": {
-          "fs_type": "xfs",
-          "mount_options": [
-            "rw",
-            "relatime",
-            "attr2",
-            "inode64",
-            "noquota"
-          ],
-          "devices": [
-            "/dev/mapper/VolGroup00-root"
-          ]
-        },
-        "/opt/aai/logroot/AAI": {
-          "fs_type": "xfs",
-          "mount_options": [
-            "rw",
-            "relatime",
-            "attr2",
-            "inode64",
-            "noquota"
-          ],
-          "devices": [
-            "/dev/mapper/VolGroup00-root"
-          ]
-        },
-        "/proc/bus": {
-          "fs_type": "proc",
-          "mount_options": [
-            "ro",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime"
-          ],
-          "devices": [
-            "proc"
-          ]
-        },
-        "/proc/fs": {
-          "fs_type": "proc",
-          "mount_options": [
-            "ro",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime"
-          ],
-          "devices": [
-            "proc"
-          ]
-        },
-        "/proc/irq": {
-          "fs_type": "proc",
-          "mount_options": [
-            "ro",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime"
-          ],
-          "devices": [
-            "proc"
-          ]
-        },
-        "/proc/sys": {
-          "fs_type": "proc",
-          "mount_options": [
-            "ro",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime"
-          ],
-          "devices": [
-            "proc"
-          ]
-        },
-        "/proc/sysrq-trigger": {
-          "fs_type": "proc",
-          "mount_options": [
-            "ro",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime"
-          ],
-          "devices": [
-            "proc"
-          ]
-        },
-        "/proc/kcore": {
-          "fs_type": "tmpfs",
-          "mount_options": [
-            "rw",
-            "nosuid",
-            "mode=755"
-          ],
-          "devices": [
-            "tmpfs"
-          ]
-        },
-        "/proc/timer_list": {
-          "fs_type": "tmpfs",
-          "mount_options": [
-            "rw",
-            "nosuid",
-            "mode=755"
-          ],
-          "devices": [
-            "tmpfs"
-          ]
-        },
-        "/proc/timer_stats": {
-          "fs_type": "tmpfs",
-          "mount_options": [
-            "rw",
-            "nosuid",
-            "mode=755"
-          ],
-          "devices": [
-            "tmpfs"
-          ]
-        },
-        "/proc/sched_debug": {
-          "fs_type": "tmpfs",
-          "mount_options": [
-            "rw",
-            "nosuid",
-            "mode=755"
-          ],
-          "devices": [
-            "tmpfs"
-          ]
-        }
-      },
-      "by_pair": {
-        "/dev/mapper/docker-253:0-270022137-aee52a2bccbb70b9e9c431c27c5b8ed9e848a4159ac289080b3a273f484b52e2,/": {
-          "device": "/dev/mapper/docker-253:0-270022137-aee52a2bccbb70b9e9c431c27c5b8ed9e848a4159ac289080b3a273f484b52e2",
-          "kb_size": "10474496",
-          "kb_used": "1206940",
-          "kb_available": "9267556",
-          "percent_used": "12%",
-          "mount": "/",
-          "total_inodes": "10484736",
-          "inodes_used": "63868",
-          "inodes_available": "10420868",
-          "inodes_percent_used": "1%",
-          "fs_type": "xfs",
-          "mount_options": [
-            "rw",
-            "relatime",
-            "nouuid",
-            "attr2",
-            "inode64",
-            "logbsize=64k",
-            "sunit=128",
-            "swidth=128",
-            "noquota"
-          ]
-        },
-        "tmpfs,/dev": {
-          "device": "tmpfs",
-          "kb_size": "16384128",
-          "kb_used": "0",
-          "kb_available": "16384128",
-          "percent_used": "0%",
-          "mount": "/dev",
-          "total_inodes": "4096032",
-          "inodes_used": "18",
-          "inodes_available": "4096014",
-          "inodes_percent_used": "1%",
-          "fs_type": "tmpfs",
-          "mount_options": [
-            "rw",
-            "nosuid",
-            "mode=755"
-          ]
-        },
-        "tmpfs,/sys/fs/cgroup": {
-          "device": "tmpfs",
-          "kb_size": "16384128",
-          "kb_used": "0",
-          "kb_available": "16384128",
-          "percent_used": "0%",
-          "mount": "/sys/fs/cgroup",
-          "total_inodes": "4096032",
-          "inodes_used": "13",
-          "inodes_available": "4096019",
-          "inodes_percent_used": "1%",
-          "fs_type": "tmpfs",
-          "mount_options": [
-            "ro",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime",
-            "mode=755"
-          ]
-        },
-        "/dev/mapper/VolGroup00-root,/var/chef": {
-          "device": "/dev/mapper/VolGroup00-root",
-          "kb_size": "124944788",
-          "kb_used": "46040860",
-          "kb_available": "78903928",
-          "percent_used": "37%",
-          "mount": "/var/chef",
-          "total_inodes": "125005824",
-          "inodes_used": "59721",
-          "inodes_available": "124946103",
-          "inodes_percent_used": "1%",
-          "fs_type": "xfs",
-          "mount_options": [
-            "rw",
-            "relatime",
-            "attr2",
-            "inode64",
-            "noquota"
-          ]
-        },
-        "shm,/dev/shm": {
-          "device": "shm",
-          "kb_size": "65536",
-          "kb_used": "0",
-          "kb_available": "65536",
-          "percent_used": "0%",
-          "mount": "/dev/shm",
-          "total_inodes": "4096032",
-          "inodes_used": "1",
-          "inodes_available": "4096031",
-          "inodes_percent_used": "1%",
-          "fs_type": "tmpfs",
-          "mount_options": [
-            "rw",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime",
-            "size=65536k"
-          ]
-        },
-        "tmpfs,/run/secrets/kubernetes.io/serviceaccount": {
-          "device": "tmpfs",
-          "kb_size": "16384128",
-          "kb_used": "12",
-          "kb_available": "16384116",
-          "percent_used": "1%",
-          "mount": "/run/secrets/kubernetes.io/serviceaccount",
-          "total_inodes": "4096032",
-          "inodes_used": "9",
-          "inodes_available": "4096023",
-          "inodes_percent_used": "1%",
-          "fs_type": "tmpfs",
-          "mount_options": [
-            "ro",
-            "relatime"
-          ]
-        },
-        "proc,/proc": {
-          "device": "proc",
-          "mount": "/proc",
-          "fs_type": "proc",
-          "mount_options": [
-            "rw",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime"
-          ]
-        },
-        "devpts,/dev/pts": {
-          "device": "devpts",
-          "mount": "/dev/pts",
-          "fs_type": "devpts",
-          "mount_options": [
-            "rw",
-            "nosuid",
-            "noexec",
-            "relatime",
-            "gid=5",
-            "mode=620",
-            "ptmxmode=666"
-          ]
-        },
-        "sysfs,/sys": {
-          "device": "sysfs",
-          "mount": "/sys",
-          "fs_type": "sysfs",
-          "mount_options": [
-            "ro",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime"
-          ]
-        },
-        "cgroup,/sys/fs/cgroup/systemd": {
-          "device": "cgroup",
-          "mount": "/sys/fs/cgroup/systemd",
-          "fs_type": "cgroup",
-          "mount_options": [
-            "ro",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime",
-            "xattr",
-            "release_agent=/usr/lib/systemd/systemd-cgroups-agent",
-            "name=systemd"
-          ]
-        },
-        "cgroup,/sys/fs/cgroup/hugetlb": {
-          "device": "cgroup",
-          "mount": "/sys/fs/cgroup/hugetlb",
-          "fs_type": "cgroup",
-          "mount_options": [
-            "ro",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime",
-            "hugetlb"
-          ]
-        },
-        "cgroup,/sys/fs/cgroup/cpuset": {
-          "device": "cgroup",
-          "mount": "/sys/fs/cgroup/cpuset",
-          "fs_type": "cgroup",
-          "mount_options": [
-            "ro",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime",
-            "cpuset"
-          ]
-        },
-        "cgroup,/sys/fs/cgroup/perf_event": {
-          "device": "cgroup",
-          "mount": "/sys/fs/cgroup/perf_event",
-          "fs_type": "cgroup",
-          "mount_options": [
-            "ro",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime",
-            "perf_event"
-          ]
-        },
-        "cgroup,/sys/fs/cgroup/devices": {
-          "device": "cgroup",
-          "mount": "/sys/fs/cgroup/devices",
-          "fs_type": "cgroup",
-          "mount_options": [
-            "ro",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime",
-            "devices"
-          ]
-        },
-        "cgroup,/sys/fs/cgroup/memory": {
-          "device": "cgroup",
-          "mount": "/sys/fs/cgroup/memory",
-          "fs_type": "cgroup",
-          "mount_options": [
-            "ro",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime",
-            "memory"
-          ]
-        },
-        "cgroup,/sys/fs/cgroup/freezer": {
-          "device": "cgroup",
-          "mount": "/sys/fs/cgroup/freezer",
-          "fs_type": "cgroup",
-          "mount_options": [
-            "ro",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime",
-            "freezer"
-          ]
-        },
-        "cgroup,/sys/fs/cgroup/cpuacct,cpu": {
-          "device": "cgroup",
-          "mount": "/sys/fs/cgroup/cpuacct,cpu",
-          "fs_type": "cgroup",
-          "mount_options": [
-            "ro",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime",
-            "cpuacct",
-            "cpu"
-          ]
-        },
-        "cgroup,/sys/fs/cgroup/blkio": {
-          "device": "cgroup",
-          "mount": "/sys/fs/cgroup/blkio",
-          "fs_type": "cgroup",
-          "mount_options": [
-            "ro",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime",
-            "blkio"
-          ]
-        },
-        "cgroup,/sys/fs/cgroup/net_cls": {
-          "device": "cgroup",
-          "mount": "/sys/fs/cgroup/net_cls",
-          "fs_type": "cgroup",
-          "mount_options": [
-            "ro",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime",
-            "net_cls"
-          ]
-        },
-        "mqueue,/dev/mqueue": {
-          "device": "mqueue",
-          "mount": "/dev/mqueue",
-          "fs_type": "mqueue",
-          "mount_options": [
-            "rw",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime"
-          ]
-        },
-        "/dev/mapper/VolGroup00-root,/dev/termination-log": {
-          "device": "/dev/mapper/VolGroup00-root",
-          "mount": "/dev/termination-log",
-          "fs_type": "xfs",
-          "mount_options": [
-            "rw",
-            "relatime",
-            "attr2",
-            "inode64",
-            "noquota"
-          ]
-        },
-        "/dev/mapper/VolGroup00-root,/etc/hosts": {
-          "device": "/dev/mapper/VolGroup00-root",
-          "mount": "/etc/hosts",
-          "fs_type": "xfs",
-          "mount_options": [
-            "rw",
-            "relatime",
-            "attr2",
-            "inode64",
-            "noquota"
-          ]
-        },
-        "/dev/mapper/VolGroup00-root,/etc/resolv.conf": {
-          "device": "/dev/mapper/VolGroup00-root",
-          "mount": "/etc/resolv.conf",
-          "fs_type": "xfs",
-          "mount_options": [
-            "rw",
-            "relatime",
-            "attr2",
-            "inode64",
-            "noquota"
-          ]
-        },
-        "/dev/mapper/VolGroup00-root,/etc/hostname": {
-          "device": "/dev/mapper/VolGroup00-root",
-          "mount": "/etc/hostname",
-          "fs_type": "xfs",
-          "mount_options": [
-            "rw",
-            "relatime",
-            "attr2",
-            "inode64",
-            "noquota"
-          ]
-        },
-        "/dev/mapper/VolGroup00-root,/etc/ssl/certs": {
-          "device": "/dev/mapper/VolGroup00-root",
-          "mount": "/etc/ssl/certs",
-          "fs_type": "xfs",
-          "mount_options": [
-            "rw",
-            "relatime",
-            "attr2",
-            "inode64",
-            "noquota"
-          ]
-        },
-        "/dev/mapper/VolGroup00-root,/opt/aai/logroot": {
-          "device": "/dev/mapper/VolGroup00-root",
-          "mount": "/opt/aai/logroot",
-          "fs_type": "xfs",
-          "mount_options": [
-            "rw",
-            "relatime",
-            "attr2",
-            "inode64",
-            "noquota"
-          ]
-        },
-        "/dev/mapper/VolGroup00-root,/opt/aai/logroot/AAI": {
-          "device": "/dev/mapper/VolGroup00-root",
-          "mount": "/opt/aai/logroot/AAI",
-          "fs_type": "xfs",
-          "mount_options": [
-            "rw",
-            "relatime",
-            "attr2",
-            "inode64",
-            "noquota"
-          ]
-        },
-        "proc,/proc/bus": {
-          "device": "proc",
-          "mount": "/proc/bus",
-          "fs_type": "proc",
-          "mount_options": [
-            "ro",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime"
-          ]
-        },
-        "proc,/proc/fs": {
-          "device": "proc",
-          "mount": "/proc/fs",
-          "fs_type": "proc",
-          "mount_options": [
-            "ro",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime"
-          ]
-        },
-        "proc,/proc/irq": {
-          "device": "proc",
-          "mount": "/proc/irq",
-          "fs_type": "proc",
-          "mount_options": [
-            "ro",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime"
-          ]
-        },
-        "proc,/proc/sys": {
-          "device": "proc",
-          "mount": "/proc/sys",
-          "fs_type": "proc",
-          "mount_options": [
-            "ro",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime"
-          ]
-        },
-        "proc,/proc/sysrq-trigger": {
-          "device": "proc",
-          "mount": "/proc/sysrq-trigger",
-          "fs_type": "proc",
-          "mount_options": [
-            "ro",
-            "nosuid",
-            "nodev",
-            "noexec",
-            "relatime"
-          ]
-        },
-        "tmpfs,/proc/kcore": {
-          "device": "tmpfs",
-          "mount": "/proc/kcore",
-          "fs_type": "tmpfs",
-          "mount_options": [
-            "rw",
-            "nosuid",
-            "mode=755"
-          ]
-        },
-        "tmpfs,/proc/timer_list": {
-          "device": "tmpfs",
-          "mount": "/proc/timer_list",
-          "fs_type": "tmpfs",
-          "mount_options": [
-            "rw",
-            "nosuid",
-            "mode=755"
-          ]
-        },
-        "tmpfs,/proc/timer_stats": {
-          "device": "tmpfs",
-          "mount": "/proc/timer_stats",
-          "fs_type": "tmpfs",
-          "mount_options": [
-            "rw",
-            "nosuid",
-            "mode=755"
-          ]
-        },
-        "tmpfs,/proc/sched_debug": {
-          "device": "tmpfs",
-          "mount": "/proc/sched_debug",
-          "fs_type": "tmpfs",
-          "mount_options": [
-            "rw",
-            "nosuid",
-            "mode=755"
-          ]
-        },
-        "sda,": {
-          "device": "sda"
-        },
-        "sda1,": {
-          "device": "sda1"
-        },
-        "sda2,": {
-          "device": "sda2"
-        },
-        "sda3,": {
-          "device": "sda3"
-        },
-        "VolGroup00-root,": {
-          "device": "VolGroup00-root"
-        },
-        "VolGroup00-swap,": {
-          "device": "VolGroup00-swap"
-        },
-        "loop0,": {
-          "device": "loop0"
-        },
-        "docker-253:0-270022137-pool,": {
-          "device": "docker-253:0-270022137-pool"
-        },
-        "docker-253:0-270022137-c28b1956606e2362d5973a45b6e4cd449a6e3dfde835051b8189baa07ab90677,": {
-          "device": "docker-253:0-270022137-c28b1956606e2362d5973a45b6e4cd449a6e3dfde835051b8189baa07ab90677"
-        },
-        "docker-253:0-270022137-76ee6f1f15bcf383b12d5700114ab6976ec1ca9ba17e58263f6c283b78999f2d,": {
-          "device": "docker-253:0-270022137-76ee6f1f15bcf383b12d5700114ab6976ec1ca9ba17e58263f6c283b78999f2d"
-        },
-        "docker-253:0-270022137-0a8e3f16abf8bcebf54192b6179d5a1b33d9b5a64d9c4f7672d3c3c2bd061695,": {
-          "device": "docker-253:0-270022137-0a8e3f16abf8bcebf54192b6179d5a1b33d9b5a64d9c4f7672d3c3c2bd061695"
-        },
-        "docker-253:0-270022137-d0cf37f9160f95c1689e1098d0f422e57b42c59bbd3d068b0c845c9fb73cbeab,": {
-          "device": "docker-253:0-270022137-d0cf37f9160f95c1689e1098d0f422e57b42c59bbd3d068b0c845c9fb73cbeab"
-        },
-        "docker-253:0-270022137-95f4626492d00b64dc651d5a21ebaf8390c95643487dd6e780a6afb8c786793c,": {
-          "device": "docker-253:0-270022137-95f4626492d00b64dc651d5a21ebaf8390c95643487dd6e780a6afb8c786793c"
-        },
-        "docker-253:0-270022137-afcd876e6ad1baf2ef6357b7ae2bdf41e907f87dd51d9028e4b37da20d3b30aa,": {
-          "device": "docker-253:0-270022137-afcd876e6ad1baf2ef6357b7ae2bdf41e907f87dd51d9028e4b37da20d3b30aa"
-        },
-        "docker-253:0-270022137-2758942c95b0dfff3e49e95e36aef81bfc0f7dbbcf8e95b33eac58fabe923a1c,": {
-          "device": "docker-253:0-270022137-2758942c95b0dfff3e49e95e36aef81bfc0f7dbbcf8e95b33eac58fabe923a1c"
-        },
-        "docker-253:0-270022137-3f656d48ab6bcf5cd851a63d76d6ddb0f52538864a3798904873a094074ca1aa,": {
-          "device": "docker-253:0-270022137-3f656d48ab6bcf5cd851a63d76d6ddb0f52538864a3798904873a094074ca1aa"
-        },
-        "docker-253:0-270022137-b11f14bb9de62a6986c071961d7b364b16719571fa7a961eaddd842f9e7acaec,": {
-          "device": "docker-253:0-270022137-b11f14bb9de62a6986c071961d7b364b16719571fa7a961eaddd842f9e7acaec"
-        },
-        "docker-253:0-270022137-6c228fff231eda3fd92083bd5af152c83f86c0e22472ab1406f8dd3dc045be0a,": {
-          "device": "docker-253:0-270022137-6c228fff231eda3fd92083bd5af152c83f86c0e22472ab1406f8dd3dc045be0a"
-        },
-        "docker-253:0-270022137-bedcab452c8d9a93f45ff84d2bb0bca5470abf2bec8d757425185683eb683477,": {
-          "device": "docker-253:0-270022137-bedcab452c8d9a93f45ff84d2bb0bca5470abf2bec8d757425185683eb683477"
-        },
-        "docker-253:0-270022137-afb725c0d5cda8a67beef1dc153d6a01def460488208b762fb304b20f560d7e2,": {
-          "device": "docker-253:0-270022137-afb725c0d5cda8a67beef1dc153d6a01def460488208b762fb304b20f560d7e2"
-        },
-        "docker-253:0-270022137-50d30b9365b9e1f5f9ee091b618e3256512a19c37baa6e637097439c0dc8bc12,": {
-          "device": "docker-253:0-270022137-50d30b9365b9e1f5f9ee091b618e3256512a19c37baa6e637097439c0dc8bc12"
-        },
-        "docker-253:0-270022137-0321e66c14e6a11d3c6b1e7d78068ddaa88d5d20e6ec9c7f79526d7da10074a0,": {
-          "device": "docker-253:0-270022137-0321e66c14e6a11d3c6b1e7d78068ddaa88d5d20e6ec9c7f79526d7da10074a0"
-        },
-        "docker-253:0-270022137-49153b02f8582a70d07d12b563a3a7ef49a8e844b41e28125fb196460e7c9c4a,": {
-          "device": "docker-253:0-270022137-49153b02f8582a70d07d12b563a3a7ef49a8e844b41e28125fb196460e7c9c4a"
-        },
-        "docker-253:0-270022137-c843155e6089bef4e7136834de276e19c0a9dc16f7bd9ca23e98bc23db32160e,": {
-          "device": "docker-253:0-270022137-c843155e6089bef4e7136834de276e19c0a9dc16f7bd9ca23e98bc23db32160e"
-        },
-        "docker-253:0-270022137-fdc0370b5d09cc4fe23beac8306a32cee73208b2bc3aee30672a2c2d79ea4a5a,": {
-          "device": "docker-253:0-270022137-fdc0370b5d09cc4fe23beac8306a32cee73208b2bc3aee30672a2c2d79ea4a5a"
-        },
-        "docker-253:0-270022137-89ed109a1620edd5f127974dad0d9c02e03ed291cbbf2c78285841e0d35bc441,": {
-          "device": "docker-253:0-270022137-89ed109a1620edd5f127974dad0d9c02e03ed291cbbf2c78285841e0d35bc441"
-        },
-        "docker-253:0-270022137-8f1df8714a43203ba74bf23aa7a119711ec449e4a9df6c52f21252fb7a927eac,": {
-          "device": "docker-253:0-270022137-8f1df8714a43203ba74bf23aa7a119711ec449e4a9df6c52f21252fb7a927eac"
-        },
-        "docker-253:0-270022137-12b75d459dfcf37fbdc87b7fd9a4823ecea54956c2e3f749952a28607bff0d56,": {
-          "device": "docker-253:0-270022137-12b75d459dfcf37fbdc87b7fd9a4823ecea54956c2e3f749952a28607bff0d56"
-        },
-        "docker-253:0-270022137-466d26293ebb5a1478948472b9981d81642b44d946b4bf90522eee0161d9cd90,": {
-          "device": "docker-253:0-270022137-466d26293ebb5a1478948472b9981d81642b44d946b4bf90522eee0161d9cd90"
-        },
-        "docker-253:0-270022137-6074aeabae56b5e95e44edc90b00c5ec810505de2d368e0b4357939fe17fa2b8,": {
-          "device": "docker-253:0-270022137-6074aeabae56b5e95e44edc90b00c5ec810505de2d368e0b4357939fe17fa2b8"
-        },
-        "docker-253:0-270022137-e1405ddeab4a737954f63912179adccda5e4dad1c77e6e0b4112b84543d18eea,": {
-          "device": "docker-253:0-270022137-e1405ddeab4a737954f63912179adccda5e4dad1c77e6e0b4112b84543d18eea"
-        },
-        "docker-253:0-270022137-e1d7a94a778f6df54062c73ca895087ebd02c2a3b9984c1b1dccf9d9958042cb,": {
-          "device": "docker-253:0-270022137-e1d7a94a778f6df54062c73ca895087ebd02c2a3b9984c1b1dccf9d9958042cb"
-        },
-        "docker-253:0-270022137-9b7c1959e4a90323798cc4fee20fb1b81e92b8bd2ea35df98ae3332902a71491,": {
-          "device": "docker-253:0-270022137-9b7c1959e4a90323798cc4fee20fb1b81e92b8bd2ea35df98ae3332902a71491"
-        },
-        "docker-253:0-270022137-0eace81671b726b14466e7f2767223c71d88a53716189747009ae828b9ae7e3e,": {
-          "device": "docker-253:0-270022137-0eace81671b726b14466e7f2767223c71d88a53716189747009ae828b9ae7e3e"
-        },
-        "docker-253:0-270022137-4f956e457e6c870e1134c94ed2972bcba543a792335106e8a5254d9cf97b3ef4,": {
-          "device": "docker-253:0-270022137-4f956e457e6c870e1134c94ed2972bcba543a792335106e8a5254d9cf97b3ef4"
-        },
-        "docker-253:0-270022137-3b3db0c5c974df6ff60b4985775f8459b9bf5764a64822abe4f6d3769ae3d67d,": {
-          "device": "docker-253:0-270022137-3b3db0c5c974df6ff60b4985775f8459b9bf5764a64822abe4f6d3769ae3d67d"
-        },
-        "docker-253:0-270022137-048ae348b495c7a85ae2e0c0e21431313784fe86253804ea14d1ef602ad83bbd,": {
-          "device": "docker-253:0-270022137-048ae348b495c7a85ae2e0c0e21431313784fe86253804ea14d1ef602ad83bbd"
-        },
-        "docker-253:0-270022137-5c2adfd19201c571716d88e5942f0edea703074cdb27d9d487c4f865396f3d05,": {
-          "device": "docker-253:0-270022137-5c2adfd19201c571716d88e5942f0edea703074cdb27d9d487c4f865396f3d05"
-        },
-        "docker-253:0-270022137-9c983aa29c0e3b1cc03c3b3620249892524dcc0369fbe5523911263cff195ce5,": {
-          "device": "docker-253:0-270022137-9c983aa29c0e3b1cc03c3b3620249892524dcc0369fbe5523911263cff195ce5"
-        },
-        "docker-253:0-270022137-e1233e185d0ac54e4eaaab4a1ad25c713a402a99aa9683d34f316d22a2a9bbcb,": {
-          "device": "docker-253:0-270022137-e1233e185d0ac54e4eaaab4a1ad25c713a402a99aa9683d34f316d22a2a9bbcb"
-        },
-        "docker-253:0-270022137-4f12946b146fbcc1f8e77c975a44b0efe1bd38a29ab824b119df3fb2caa94378,": {
-          "device": "docker-253:0-270022137-4f12946b146fbcc1f8e77c975a44b0efe1bd38a29ab824b119df3fb2caa94378"
-        },
-        "docker-253:0-270022137-30045a9ff852a3504751fa28f5506b5be73cb7d4f94c5992add1f4bfefef5a75,": {
-          "device": "docker-253:0-270022137-30045a9ff852a3504751fa28f5506b5be73cb7d4f94c5992add1f4bfefef5a75"
-        },
-        "docker-253:0-270022137-3d04a1be11f53c7df262d1426b16518719de31133f5e923861709172f8f61d7a,": {
-          "device": "docker-253:0-270022137-3d04a1be11f53c7df262d1426b16518719de31133f5e923861709172f8f61d7a"
-        },
-        "docker-253:0-270022137-8c2ea7ff9288ec11f1982374f0db67cbd5583af49ab7483e583520b1a6f85cb6,": {
-          "device": "docker-253:0-270022137-8c2ea7ff9288ec11f1982374f0db67cbd5583af49ab7483e583520b1a6f85cb6"
-        },
-        "docker-253:0-270022137-d9dad51cea1b76714fe907165513d9287b7e89f3d397f100ba2503ee8d3c7866,": {
-          "device": "docker-253:0-270022137-d9dad51cea1b76714fe907165513d9287b7e89f3d397f100ba2503ee8d3c7866"
-        },
-        "docker-253:0-270022137-21aaf0451ed738e7c201c08003777b09581c660728c755053d4a42abad9e6139,": {
-          "device": "docker-253:0-270022137-21aaf0451ed738e7c201c08003777b09581c660728c755053d4a42abad9e6139"
-        },
-        "docker-253:0-270022137-146f353db9eb3c2dbd37c9f41a93b7a81d8b57177b3df4e7513a98ed3d630a6b,": {
-          "device": "docker-253:0-270022137-146f353db9eb3c2dbd37c9f41a93b7a81d8b57177b3df4e7513a98ed3d630a6b"
-        },
-        "docker-253:0-270022137-1d9a89b4068dbb946ab85151b6695bdfa958483a063f911994f0c31ffdf5db70,": {
-          "device": "docker-253:0-270022137-1d9a89b4068dbb946ab85151b6695bdfa958483a063f911994f0c31ffdf5db70"
-        },
-        "docker-253:0-270022137-2f000033aba93b933d88110a3b116a1378a349d483a32b4e45c6f6872fc5b3c4,": {
-          "device": "docker-253:0-270022137-2f000033aba93b933d88110a3b116a1378a349d483a32b4e45c6f6872fc5b3c4"
-        },
-        "docker-253:0-270022137-ac570f787b70c4d248c478297cbd70f7115eef4a68f9735b83299f04adaa9f4a,": {
-          "device": "docker-253:0-270022137-ac570f787b70c4d248c478297cbd70f7115eef4a68f9735b83299f04adaa9f4a"
-        },
-        "docker-253:0-270022137-58fdfec6cd3ddc5aa0aa421d63e8b47e321847ac639494a9cbe3eb9114e05de0,": {
-          "device": "docker-253:0-270022137-58fdfec6cd3ddc5aa0aa421d63e8b47e321847ac639494a9cbe3eb9114e05de0"
-        },
-        "docker-253:0-270022137-1d5992aed495d531ef999895bd7cb43d6a442bbc3717b98dad4d751fc5ff0636,": {
-          "device": "docker-253:0-270022137-1d5992aed495d531ef999895bd7cb43d6a442bbc3717b98dad4d751fc5ff0636"
-        },
-        "docker-253:0-270022137-5e8723610da9b546387ac9cba7d2464e20913a79d3a1447e87e4f0845c5b16a6,": {
-          "device": "docker-253:0-270022137-5e8723610da9b546387ac9cba7d2464e20913a79d3a1447e87e4f0845c5b16a6"
-        },
-        "docker-253:0-270022137-7ef59f8ad74ca69b451d96740427f4d246d74bc6c2050b57d4fd2e52d464857c,": {
-          "device": "docker-253:0-270022137-7ef59f8ad74ca69b451d96740427f4d246d74bc6c2050b57d4fd2e52d464857c"
-        },
-        "docker-253:0-270022137-de0fb3a6d35158ccf3fad7843051fb0c998f15bf0a1be6b11ea06b8ad9aac939,": {
-          "device": "docker-253:0-270022137-de0fb3a6d35158ccf3fad7843051fb0c998f15bf0a1be6b11ea06b8ad9aac939"
-        },
-        "docker-253:0-270022137-422ec77dad12966a1eda6349099a4cc558da46eff25c963378455ff5c2371737,": {
-          "device": "docker-253:0-270022137-422ec77dad12966a1eda6349099a4cc558da46eff25c963378455ff5c2371737"
-        },
-        "docker-253:0-270022137-0dabc92e26b8d7fb6c26ac6583e9a6aaebf9336a614e8b0cc0243fb52d68d6be,": {
-          "device": "docker-253:0-270022137-0dabc92e26b8d7fb6c26ac6583e9a6aaebf9336a614e8b0cc0243fb52d68d6be"
-        },
-        "docker-253:0-270022137-21c4d1e6b84e2530c3f205b1bce4f4ea604a93f7b41b06b329233fbb1f3c1702,": {
-          "device": "docker-253:0-270022137-21c4d1e6b84e2530c3f205b1bce4f4ea604a93f7b41b06b329233fbb1f3c1702"
-        },
-        "docker-253:0-270022137-438add1cecce211d1d24be7ee9a343617ced70df884d3625acc177dc229055bb,": {
-          "device": "docker-253:0-270022137-438add1cecce211d1d24be7ee9a343617ced70df884d3625acc177dc229055bb"
-        },
-        "docker-253:0-270022137-1f458384aedf7e4ec4759b201c2b20863d5e683495d925085100fb3c0d83dce8,": {
-          "device": "docker-253:0-270022137-1f458384aedf7e4ec4759b201c2b20863d5e683495d925085100fb3c0d83dce8"
-        },
-        "docker-253:0-270022137-5574392d6bc26cbdf52040f3c5b13775c469aff499a24afd3752689e09e4d315,": {
-          "device": "docker-253:0-270022137-5574392d6bc26cbdf52040f3c5b13775c469aff499a24afd3752689e09e4d315"
-        },
-        "docker-253:0-270022137-dbfcfadc408852a988a2a7b165a2223c0214f51943d32a9bf547d1dc41a995bd,": {
-          "device": "docker-253:0-270022137-dbfcfadc408852a988a2a7b165a2223c0214f51943d32a9bf547d1dc41a995bd"
-        },
-        "docker-253:0-270022137-f359b43ccd76bc00cd7a959f8ca0b905a83d637dbc41a97196d9427e549962fc,": {
-          "device": "docker-253:0-270022137-f359b43ccd76bc00cd7a959f8ca0b905a83d637dbc41a97196d9427e549962fc"
-        },
-        "docker-253:0-270022137-ee7a6b0f6a9b1d21661ab8283beec96f810ad021c15f4bc2bf40e8e4eaa2958f,": {
-          "device": "docker-253:0-270022137-ee7a6b0f6a9b1d21661ab8283beec96f810ad021c15f4bc2bf40e8e4eaa2958f"
-        },
-        "docker-253:0-270022137-aee52a2bccbb70b9e9c431c27c5b8ed9e848a4159ac289080b3a273f484b52e2,": {
-          "device": "docker-253:0-270022137-aee52a2bccbb70b9e9c431c27c5b8ed9e848a4159ac289080b3a273f484b52e2"
-        },
-        "docker-253:0-270022137-795b3da068ebac7a9e5f8cde2be18a50b13534ef3d5b2154b57186e9891cd58d,": {
-          "device": "docker-253:0-270022137-795b3da068ebac7a9e5f8cde2be18a50b13534ef3d5b2154b57186e9891cd58d"
-        },
-        "docker-253:0-270022137-f96d80c322d68ed4db58c1473b55ffb0fa47281658a89c2127d394d2e6074846,": {
-          "device": "docker-253:0-270022137-f96d80c322d68ed4db58c1473b55ffb0fa47281658a89c2127d394d2e6074846"
-        },
-        "docker-253:0-270022137-4793f4f2c5d516224fe9fc4302621bfc824254e08e6682426b1d0e09918773b7,": {
-          "device": "docker-253:0-270022137-4793f4f2c5d516224fe9fc4302621bfc824254e08e6682426b1d0e09918773b7"
-        },
-        "docker-253:0-270022137-70df5a9b03061599ecfdddcd3c87bd989a22937ee6d6fa1d71e53b5fe1b5120e,": {
-          "device": "docker-253:0-270022137-70df5a9b03061599ecfdddcd3c87bd989a22937ee6d6fa1d71e53b5fe1b5120e"
-        },
-        "docker-253:0-270022137-087636c40f4ed697170f0aea17cf3aa26d5b34cafb043d58aa437d1a11ba36e9,": {
-          "device": "docker-253:0-270022137-087636c40f4ed697170f0aea17cf3aa26d5b34cafb043d58aa437d1a11ba36e9"
-        },
-        "loop1,": {
-          "device": "loop1"
-        },
-        "rootfs,/": {
-          "device": "rootfs",
-          "mount": "/",
-          "fs_type": "rootfs",
-          "mount_options": [
-            "rw"
-          ]
-        }
-      }
-    },
-    "hostname": "aai-service-3646348477-v3s3d",
-    "machinename": "aai-service-3646348477-v3s3d",
-    "fqdn": "aai-service-3646348477-v3s3d",
-    "domain": null,
-    "init_package": "sh",
-    "keys": {
-      "ssh": {
-
-      }
-    },
-    "block_device": {
-      "sda": {
-        "size": "285155328",
-        "removable": "0",
-        "model": "Logical Volume",
-        "rev": "3000",
-        "state": "running",
-        "timeout": "30",
-        "vendor": "LSILOGIC",
-        "queue_depth": "64",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-0": {
-        "size": "250011648",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-1": {
-        "size": "33619968",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-2": {
-        "size": "209715200",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-3": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-4": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-5": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-6": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-7": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-8": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-9": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-10": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-11": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-12": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-13": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-14": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-15": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-16": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-17": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-18": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-19": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-20": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-21": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-22": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-23": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-24": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-25": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-26": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-27": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-28": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-29": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-30": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-31": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-32": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-33": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-34": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-35": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-36": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-37": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-38": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-39": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-40": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-41": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-42": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-43": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-44": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-45": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-46": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-47": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-48": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-49": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-50": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-51": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-52": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-53": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-54": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-55": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-56": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-57": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-58": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-59": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-60": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-61": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-62": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-63": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "dm-64": {
-        "size": "20971520",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "loop0": {
-        "size": "209715200",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      },
-      "loop1": {
-        "size": "4194304",
-        "removable": "0",
-        "rotational": "1",
-        "physical_block_size": "512",
-        "logical_block_size": "512"
-      }
-    },
-    "fips": {
-      "kernel": {
-        "enabled": false
-      }
-    },
-    "ohai_time": 1495692906.3241928,
-    "packages": {
-      "adduser": {
-        "version": "3.113+nmu3ubuntu3",
-        "arch": "all"
-      },
-      "apt": {
-        "version": "1.0.1ubuntu2.17",
-        "arch": "amd64"
-      },
-      "apt-utils": {
-        "version": "1.0.1ubuntu2.17",
-        "arch": "amd64"
-      },
-      "base-files": {
-        "version": "7.2ubuntu5.5",
-        "arch": "amd64"
-      },
-      "base-passwd": {
-        "version": "3.5.33",
-        "arch": "amd64"
-      },
-      "bash": {
-        "version": "4.3-7ubuntu1.5",
-        "arch": "amd64"
-      },
-      "bsdutils": {
-        "version": "1:2.20.1-5.1ubuntu20.9",
-        "arch": "amd64"
-      },
-      "busybox-initramfs": {
-        "version": "1:1.21.0-1ubuntu1",
-        "arch": "amd64"
-      },
-      "bzip2": {
-        "version": "1.0.6-5",
-        "arch": "amd64"
-      },
-      "ca-certificates": {
-        "version": "20160104ubuntu0.14.04.1",
-        "arch": "all"
-      },
-      "ca-certificates-java": {
-        "version": "20130815ubuntu1",
-        "arch": "all"
-      },
-      "chefdk": {
-        "version": "0.17.17-1",
-        "arch": "amd64"
-      },
-      "console-setup": {
-        "version": "1.70ubuntu8",
-        "arch": "all"
-      },
-      "coreutils": {
-        "version": "8.21-1ubuntu5.4",
-        "arch": "amd64"
-      },
-      "cpio": {
-        "version": "2.11+dfsg-1ubuntu1.2",
-        "arch": "amd64"
-      },
-      "cron": {
-        "version": "3.0pl1-124ubuntu2",
-        "arch": "amd64"
-      },
-      "curl": {
-        "version": "7.35.0-1ubuntu2.10",
-        "arch": "amd64"
-      },
-      "dash": {
-        "version": "0.5.7-4ubuntu1",
-        "arch": "amd64"
-      },
-      "debconf": {
-        "version": "1.5.51ubuntu2",
-        "arch": "all"
-      },
-      "debconf-i18n": {
-        "version": "1.5.51ubuntu2",
-        "arch": "all"
-      },
-      "debianutils": {
-        "version": "4.4",
-        "arch": "amd64"
-      },
-      "dh-python": {
-        "version": "1.20140128-1ubuntu8.2",
-        "arch": "all"
-      },
-      "diffutils": {
-        "version": "1:3.3-1",
-        "arch": "amd64"
-      },
-      "dmsetup": {
-        "version": "2:1.02.77-6ubuntu2",
-        "arch": "amd64"
-      },
-      "dpkg": {
-        "version": "1.17.5ubuntu5.7",
-        "arch": "amd64"
-      },
-      "e2fslibs": {
-        "version": "1.42.9-3ubuntu1.3",
-        "arch": "amd64"
-      },
-      "e2fsprogs": {
-        "version": "1.42.9-3ubuntu1.3",
-        "arch": "amd64"
-      },
-      "eject": {
-        "version": "2.1.5+deb1+cvs20081104-13.1ubuntu0.14.04.1",
-        "arch": "amd64"
-      },
-      "file": {
-        "version": "1:5.14-2ubuntu3.3",
-        "arch": "amd64"
-      },
-      "findutils": {
-        "version": "4.4.2-7",
-        "arch": "amd64"
-      },
-      "fontconfig-config": {
-        "version": "2.11.0-0ubuntu4.2",
-        "arch": "all"
-      },
-      "fonts-dejavu-core": {
-        "version": "2.34-1ubuntu1",
-        "arch": "all"
-      },
-      "gcc-4.8-base": {
-        "version": "4.8.4-2ubuntu1~14.04.3",
-        "arch": "amd64"
-      },
-      "gcc-4.9-base": {
-        "version": "4.9.3-0ubuntu4",
-        "arch": "amd64"
-      },
-      "gir1.2-glib-2.0": {
-        "version": "1.40.0-1ubuntu0.2",
-        "arch": "amd64"
-      },
-      "git": {
-        "version": "1:1.9.1-1ubuntu0.4",
-        "arch": "amd64"
-      },
-      "git-man": {
-        "version": "1:1.9.1-1ubuntu0.4",
-        "arch": "all"
-      },
-      "gnupg": {
-        "version": "1.4.16-1ubuntu2.4",
-        "arch": "amd64"
-      },
-      "gpgv": {
-        "version": "1.4.16-1ubuntu2.4",
-        "arch": "amd64"
-      },
-      "grep": {
-        "version": "2.16-1",
-        "arch": "amd64"
-      },
-      "gzip": {
-        "version": "1.6-3ubuntu1",
-        "arch": "amd64"
-      },
-      "hostname": {
-        "version": "3.15ubuntu1",
-        "arch": "amd64"
-      },
-      "ifupdown": {
-        "version": "0.7.47.2ubuntu4.4",
-        "arch": "amd64"
-      },
-      "init-system-helpers": {
-        "version": "1.14ubuntu1",
-        "arch": "all"
-      },
-      "initramfs-tools": {
-        "version": "0.103ubuntu4.7",
-        "arch": "all"
-      },
-      "initramfs-tools-bin": {
-        "version": "0.103ubuntu4.7",
-        "arch": "amd64"
-      },
-      "initscripts": {
-        "version": "2.88dsf-41ubuntu6.3",
-        "arch": "amd64"
-      },
-      "insserv": {
-        "version": "1.14.0-5ubuntu2",
-        "arch": "amd64"
-      },
-      "iproute2": {
-        "version": "3.12.0-2ubuntu1",
-        "arch": "amd64"
-      },
-      "iputils-ping": {
-        "version": "3:20121221-4ubuntu1.1",
-        "arch": "amd64"
-      },
-      "isc-dhcp-client": {
-        "version": "4.2.4-7ubuntu12.8",
-        "arch": "amd64"
-      },
-      "isc-dhcp-common": {
-        "version": "4.2.4-7ubuntu12.8",
-        "arch": "amd64"
-      },
-      "iso-codes": {
-        "version": "3.52-1",
-        "arch": "all"
-      },
-      "java-common": {
-        "version": "0.51",
-        "arch": "all"
-      },
-      "kbd": {
-        "version": "1.15.5-1ubuntu1",
-        "arch": "amd64"
-      },
-      "keyboard-configuration": {
-        "version": "1.70ubuntu8",
-        "arch": "all"
-      },
-      "klibc-utils": {
-        "version": "2.0.3-0ubuntu1.14.04.2",
-        "arch": "amd64"
-      },
-      "kmod": {
-        "version": "15-0ubuntu6",
-        "arch": "amd64"
-      },
-      "krb5-locales": {
-        "version": "1.12+dfsg-2ubuntu5.3",
-        "arch": "all"
-      },
-      "ksh": {
-        "version": "93u+20120801-1",
-        "arch": "amd64"
-      },
-      "less": {
-        "version": "458-2",
-        "arch": "amd64"
-      },
-      "libacl1": {
-        "version": "2.2.52-1",
-        "arch": "amd64"
-      },
-      "libapt-inst1.5": {
-        "version": "1.0.1ubuntu2.17",
-        "arch": "amd64"
-      },
-      "libapt-pkg4.12": {
-        "version": "1.0.1ubuntu2.17",
-        "arch": "amd64"
-      },
-      "libarchive-extract-perl": {
-        "version": "0.70-1",
-        "arch": "all"
-      },
-      "libasn1-8-heimdal": {
-        "version": "1.6~git20131207+dfsg-1ubuntu1.1",
-        "arch": "amd64"
-      },
-      "libattr1": {
-        "version": "1:2.4.47-1ubuntu1",
-        "arch": "amd64"
-      },
-      "libaudit-common": {
-        "version": "1:2.3.2-2ubuntu1",
-        "arch": "all"
-      },
-      "libaudit1": {
-        "version": "1:2.3.2-2ubuntu1",
-        "arch": "amd64"
-      },
-      "libavahi-client3": {
-        "version": "0.6.31-4ubuntu1.1",
-        "arch": "amd64"
-      },
-      "libavahi-common-data": {
-        "version": "0.6.31-4ubuntu1.1",
-        "arch": "amd64"
-      },
-      "libavahi-common3": {
-        "version": "0.6.31-4ubuntu1.1",
-        "arch": "amd64"
-      },
-      "libblkid1": {
-        "version": "2.20.1-5.1ubuntu20.9",
-        "arch": "amd64"
-      },
-      "libbsd0": {
-        "version": "0.6.0-2ubuntu1",
-        "arch": "amd64"
-      },
-      "libbz2-1.0": {
-        "version": "1.0.6-5",
-        "arch": "amd64"
-      },
-      "libc-bin": {
-        "version": "2.19-0ubuntu6.11",
-        "arch": "amd64"
-      },
-      "libc6": {
-        "version": "2.19-0ubuntu6.11",
-        "arch": "amd64"
-      },
-      "libcap2": {
-        "version": "1:2.24-0ubuntu2",
-        "arch": "amd64"
-      },
-      "libcap2-bin": {
-        "version": "1:2.24-0ubuntu2",
-        "arch": "amd64"
-      },
-      "libcgmanager0": {
-        "version": "0.24-0ubuntu7.5",
-        "arch": "amd64"
-      },
-      "libcomerr2": {
-        "version": "1.42.9-3ubuntu1.3",
-        "arch": "amd64"
-      },
-      "libcups2": {
-        "version": "1.7.2-0ubuntu1.8",
-        "arch": "amd64"
-      },
-      "libcurl3": {
-        "version": "7.35.0-1ubuntu2.10",
-        "arch": "amd64"
-      },
-      "libcurl3-gnutls": {
-        "version": "7.35.0-1ubuntu2.10",
-        "arch": "amd64"
-      },
-      "libdb5.3": {
-        "version": "5.3.28-3ubuntu3",
-        "arch": "amd64"
-      },
-      "libdbus-1-3": {
-        "version": "1.6.18-0ubuntu4.5",
-        "arch": "amd64"
-      },
-      "libdbus-glib-1-2": {
-        "version": "0.100.2-1",
-        "arch": "amd64"
-      },
-      "libdebconfclient0": {
-        "version": "0.187ubuntu1",
-        "arch": "amd64"
-      },
-      "libdevmapper1.02.1": {
-        "version": "2:1.02.77-6ubuntu2",
-        "arch": "amd64"
-      },
-      "libdrm2": {
-        "version": "2.4.67-1ubuntu0.14.04.1",
-        "arch": "amd64"
-      },
-      "libedit2": {
-        "version": "3.1-20130712-2",
-        "arch": "amd64"
-      },
-      "liberror-perl": {
-        "version": "0.17-1.1",
-        "arch": "all"
-      },
-      "libestr0": {
-        "version": "0.1.9-0ubuntu2",
-        "arch": "amd64"
-      },
-      "libexpat1": {
-        "version": "2.1.0-4ubuntu1.3",
-        "arch": "amd64"
-      },
-      "libffi6": {
-        "version": "3.1~rc1+r3.0.13-12ubuntu0.1",
-        "arch": "amd64"
-      },
-      "libfontconfig1": {
-        "version": "2.11.0-0ubuntu4.2",
-        "arch": "amd64"
-      },
-      "libfreetype6": {
-        "version": "2.5.2-1ubuntu2.7",
-        "arch": "amd64"
-      },
-      "libfribidi0": {
-        "version": "0.19.6-1",
-        "arch": "amd64"
-      },
-      "libgcc1": {
-        "version": "1:4.9.3-0ubuntu4",
-        "arch": "amd64"
-      },
-      "libgcrypt11": {
-        "version": "1.5.3-2ubuntu4.4",
-        "arch": "amd64"
-      },
-      "libgdbm3": {
-        "version": "1.8.3-12build1",
-        "arch": "amd64"
-      },
-      "libgirepository-1.0-1": {
-        "version": "1.40.0-1ubuntu0.2",
-        "arch": "amd64"
-      },
-      "libglib2.0-0": {
-        "version": "2.40.2-0ubuntu1",
-        "arch": "amd64"
-      },
-      "libglib2.0-data": {
-        "version": "2.40.2-0ubuntu1",
-        "arch": "all"
-      },
-      "libgnutls-openssl27": {
-        "version": "2.12.23-12ubuntu2.7",
-        "arch": "amd64"
-      },
-      "libgnutls26": {
-        "version": "2.12.23-12ubuntu2.7",
-        "arch": "amd64"
-      },
-      "libgpg-error0": {
-        "version": "1.12-0.2ubuntu1",
-        "arch": "amd64"
-      },
-      "libgssapi-krb5-2": {
-        "version": "1.12+dfsg-2ubuntu5.3",
-        "arch": "amd64"
-      },
-      "libgssapi3-heimdal": {
-        "version": "1.6~git20131207+dfsg-1ubuntu1.1",
-        "arch": "amd64"
-      },
-      "libhcrypto4-heimdal": {
-        "version": "1.6~git20131207+dfsg-1ubuntu1.1",
-        "arch": "amd64"
-      },
-      "libheimbase1-heimdal": {
-        "version": "1.6~git20131207+dfsg-1ubuntu1.1",
-        "arch": "amd64"
-      },
-      "libheimntlm0-heimdal": {
-        "version": "1.6~git20131207+dfsg-1ubuntu1.1",
-        "arch": "amd64"
-      },
-      "libhx509-5-heimdal": {
-        "version": "1.6~git20131207+dfsg-1ubuntu1.1",
-        "arch": "amd64"
-      },
-      "libidn11": {
-        "version": "1.28-1ubuntu2.1",
-        "arch": "amd64"
-      },
-      "libjpeg-turbo8": {
-        "version": "1.3.0-0ubuntu2",
-        "arch": "amd64"
-      },
-      "libjpeg8": {
-        "version": "8c-2ubuntu8",
-        "arch": "amd64"
-      },
-      "libjson-c2": {
-        "version": "0.11-3ubuntu1.2",
-        "arch": "amd64"
-      },
-      "libjson0": {
-        "version": "0.11-3ubuntu1.2",
-        "arch": "amd64"
-      },
-      "libk5crypto3": {
-        "version": "1.12+dfsg-2ubuntu5.3",
-        "arch": "amd64"
-      },
-      "libkeyutils1": {
-        "version": "1.5.6-1",
-        "arch": "amd64"
-      },
-      "libklibc": {
-        "version": "2.0.3-0ubuntu1.14.04.2",
-        "arch": "amd64"
-      },
-      "libkmod2": {
-        "version": "15-0ubuntu6",
-        "arch": "amd64"
-      },
-      "libkrb5-26-heimdal": {
-        "version": "1.6~git20131207+dfsg-1ubuntu1.1",
-        "arch": "amd64"
-      },
-      "libkrb5-3": {
-        "version": "1.12+dfsg-2ubuntu5.3",
-        "arch": "amd64"
-      },
-      "libkrb5support0": {
-        "version": "1.12+dfsg-2ubuntu5.3",
-        "arch": "amd64"
-      },
-      "liblcms2-2": {
-        "version": "2.5-0ubuntu4.1",
-        "arch": "amd64"
-      },
-      "libldap-2.4-2": {
-        "version": "2.4.31-1+nmu2ubuntu8.3",
-        "arch": "amd64"
-      },
-      "liblocale-gettext-perl": {
-        "version": "1.05-7build3",
-        "arch": "amd64"
-      },
-      "liblockfile-bin": {
-        "version": "1.09-6ubuntu1",
-        "arch": "amd64"
-      },
-      "liblockfile1": {
-        "version": "1.09-6ubuntu1",
-        "arch": "amd64"
-      },
-      "liblog-message-simple-perl": {
-        "version": "0.10-1",
-        "arch": "all"
-      },
-      "liblzma5": {
-        "version": "5.1.1alpha+20120614-2ubuntu2",
-        "arch": "amd64"
-      },
-      "libmagic1": {
-        "version": "1:5.14-2ubuntu3.3",
-        "arch": "amd64"
-      },
-      "libmodule-pluggable-perl": {
-        "version": "5.1-1",
-        "arch": "all"
-      },
-      "libmount1": {
-        "version": "2.20.1-5.1ubuntu20.9",
-        "arch": "amd64"
-      },
-      "libmpdec2": {
-        "version": "2.4.0-6",
-        "arch": "amd64"
-      },
-      "libncurses5": {
-        "version": "5.9+20140118-1ubuntu1",
-        "arch": "amd64"
-      },
-      "libncursesw5": {
-        "version": "5.9+20140118-1ubuntu1",
-        "arch": "amd64"
-      },
-      "libnewt0.52": {
-        "version": "0.52.15-2ubuntu5",
-        "arch": "amd64"
-      },
-      "libnih-dbus1": {
-        "version": "1.0.3-4ubuntu25",
-        "arch": "amd64"
-      },
-      "libnih1": {
-        "version": "1.0.3-4ubuntu25",
-        "arch": "amd64"
-      },
-      "libnspr4": {
-        "version": "2:4.12-0ubuntu0.14.04.1",
-        "arch": "amd64"
-      },
-      "libnss3": {
-        "version": "2:3.26.2-0ubuntu0.14.04.3",
-        "arch": "amd64"
-      },
-      "libnss3-nssdb": {
-        "version": "2:3.26.2-0ubuntu0.14.04.3",
-        "arch": "all"
-      },
-      "libp11-kit0": {
-        "version": "0.20.2-2ubuntu2",
-        "arch": "amd64"
-      },
-      "libpam-cap": {
-        "version": "1:2.24-0ubuntu2",
-        "arch": "amd64"
-      },
-      "libpam-modules": {
-        "version": "1.1.8-1ubuntu2.2",
-        "arch": "amd64"
-      },
-      "libpam-modules-bin": {
-        "version": "1.1.8-1ubuntu2.2",
-        "arch": "amd64"
-      },
-      "libpam-runtime": {
-        "version": "1.1.8-1ubuntu2.2",
-        "arch": "all"
-      },
-      "libpam0g": {
-        "version": "1.1.8-1ubuntu2.2",
-        "arch": "amd64"
-      },
-      "libpcre3": {
-        "version": "1:8.31-2ubuntu2.3",
-        "arch": "amd64"
-      },
-      "libpcsclite1": {
-        "version": "1.8.10-1ubuntu1.1",
-        "arch": "amd64"
-      },
-      "libplymouth2": {
-        "version": "0.8.8-0ubuntu17.1",
-        "arch": "amd64"
-      },
-      "libpng12-0": {
-        "version": "1.2.50-1ubuntu2.14.04.2",
-        "arch": "amd64"
-      },
-      "libpod-latex-perl": {
-        "version": "0.61-1",
-        "arch": "all"
-      },
-      "libpopt0": {
-        "version": "1.16-8ubuntu1",
-        "arch": "amd64"
-      },
-      "libprocps3": {
-        "version": "1:3.3.9-1ubuntu2.2",
-        "arch": "amd64"
-      },
-      "libpython3-stdlib": {
-        "version": "3.4.0-0ubuntu2",
-        "arch": "amd64"
-      },
-      "libpython3.4-minimal": {
-        "version": "3.4.3-1ubuntu1~14.04.5",
-        "arch": "amd64"
-      },
-      "libpython3.4-stdlib": {
-        "version": "3.4.3-1ubuntu1~14.04.5",
-        "arch": "amd64"
-      },
-      "libreadline6": {
-        "version": "6.3-4ubuntu2",
-        "arch": "amd64"
-      },
-      "libroken18-heimdal": {
-        "version": "1.6~git20131207+dfsg-1ubuntu1.1",
-        "arch": "amd64"
-      },
-      "librtmp0": {
-        "version": "2.4+20121230.gitdf6c518-1",
-        "arch": "amd64"
-      },
-      "libsasl2-2": {
-        "version": "2.1.25.dfsg1-17build1",
-        "arch": "amd64"
-      },
-      "libsasl2-modules": {
-        "version": "2.1.25.dfsg1-17build1",
-        "arch": "amd64"
-      },
-      "libsasl2-modules-db": {
-        "version": "2.1.25.dfsg1-17build1",
-        "arch": "amd64"
-      },
-      "libselinux1": {
-        "version": "2.2.2-1ubuntu0.1",
-        "arch": "amd64"
-      },
-      "libsemanage-common": {
-        "version": "2.2-1",
-        "arch": "all"
-      },
-      "libsemanage1": {
-        "version": "2.2-1",
-        "arch": "amd64"
-      },
-      "libsepol1": {
-        "version": "2.2-1ubuntu0.1",
-        "arch": "amd64"
-      },
-      "libslang2": {
-        "version": "2.2.4-15ubuntu1",
-        "arch": "amd64"
-      },
-      "libsqlite3-0": {
-        "version": "3.8.2-1ubuntu2.1",
-        "arch": "amd64"
-      },
-      "libss2": {
-        "version": "1.42.9-3ubuntu1.3",
-        "arch": "amd64"
-      },
-      "libssl1.0.0": {
-        "version": "1.0.1f-1ubuntu2.22",
-        "arch": "amd64"
-      },
-      "libstdc++6": {
-        "version": "4.8.4-2ubuntu1~14.04.3",
-        "arch": "amd64"
-      },
-      "libtasn1-6": {
-        "version": "3.4-3ubuntu0.4",
-        "arch": "amd64"
-      },
-      "libterm-ui-perl": {
-        "version": "0.42-1",
-        "arch": "all"
-      },
-      "libtext-charwidth-perl": {
-        "version": "0.04-7build3",
-        "arch": "amd64"
-      },
-      "libtext-iconv-perl": {
-        "version": "1.7-5build2",
-        "arch": "amd64"
-      },
-      "libtext-soundex-perl": {
-        "version": "3.4-1build1",
-        "arch": "amd64"
-      },
-      "libtext-wrapi18n-perl": {
-        "version": "0.06-7",
-        "arch": "all"
-      },
-      "libtinfo5": {
-        "version": "5.9+20140118-1ubuntu1",
-        "arch": "amd64"
-      },
-      "libudev1": {
-        "version": "204-5ubuntu20.24",
-        "arch": "amd64"
-      },
-      "libusb-0.1-4": {
-        "version": "2:0.1.12-23.3ubuntu1",
-        "arch": "amd64"
-      },
-      "libustr-1.0-1": {
-        "version": "1.0.4-3ubuntu2",
-        "arch": "amd64"
-      },
-      "libuuid1": {
-        "version": "2.20.1-5.1ubuntu20.9",
-        "arch": "amd64"
-      },
-      "libwind0-heimdal": {
-        "version": "1.6~git20131207+dfsg-1ubuntu1.1",
-        "arch": "amd64"
-      },
-      "libx11-6": {
-        "version": "2:1.6.2-1ubuntu2",
-        "arch": "amd64"
-      },
-      "libx11-data": {
-        "version": "2:1.6.2-1ubuntu2",
-        "arch": "all"
-      },
-      "libxau6": {
-        "version": "1:1.0.8-1",
-        "arch": "amd64"
-      },
-      "libxcb1": {
-        "version": "1.10-2ubuntu1",
-        "arch": "amd64"
-      },
-      "libxdmcp6": {
-        "version": "1:1.1.1-1",
-        "arch": "amd64"
-      },
-      "libxext6": {
-        "version": "2:1.3.2-1ubuntu0.0.14.04.1",
-        "arch": "amd64"
-      },
-      "libxi6": {
-        "version": "2:1.7.1.901-1ubuntu1.1",
-        "arch": "amd64"
-      },
-      "libxml2": {
-        "version": "2.9.1+dfsg1-3ubuntu4.9",
-        "arch": "amd64"
-      },
-      "libxmuu1": {
-        "version": "2:1.1.1-1",
-        "arch": "amd64"
-      },
-      "libxrender1": {
-        "version": "1:0.9.8-1build0.14.04.1",
-        "arch": "amd64"
-      },
-      "libxtst6": {
-        "version": "2:1.2.2-1",
-        "arch": "amd64"
-      },
-      "locales": {
-        "version": "2.13+git20120306-12.1",
-        "arch": "all"
-      },
-      "lockfile-progs": {
-        "version": "0.1.17",
-        "arch": "amd64"
-      },
-      "login": {
-        "version": "1:4.1.5.1-1ubuntu9.2",
-        "arch": "amd64"
-      },
-      "logrotate": {
-        "version": "3.8.7-1ubuntu1",
-        "arch": "amd64"
-      },
-      "lsb-base": {
-        "version": "4.1+Debian11ubuntu6.2",
-        "arch": "all"
-      },
-      "lsb-release": {
-        "version": "4.1+Debian11ubuntu6.2",
-        "arch": "all"
-      },
-      "makedev": {
-        "version": "2.3.1-93ubuntu2~ubuntu14.04.1",
-        "arch": "all"
-      },
-      "mawk": {
-        "version": "1.3.3-17ubuntu2",
-        "arch": "amd64"
-      },
-      "mime-support": {
-        "version": "3.54ubuntu1.1",
-        "arch": "all"
-      },
-      "module-init-tools": {
-        "version": "15-0ubuntu6",
-        "arch": "all"
-      },
-      "mount": {
-        "version": "2.20.1-5.1ubuntu20.9",
-        "arch": "amd64"
-      },
-      "mountall": {
-        "version": "2.53",
-        "arch": "amd64"
-      },
-      "multiarch-support": {
-        "version": "2.19-0ubuntu6.11",
-        "arch": "amd64"
-      },
-      "ncurses-base": {
-        "version": "5.9+20140118-1ubuntu1",
-        "arch": "all"
-      },
-      "ncurses-bin": {
-        "version": "5.9+20140118-1ubuntu1",
-        "arch": "amd64"
-      },
-      "net-tools": {
-        "version": "1.60-25ubuntu2.1",
-        "arch": "amd64"
-      },
-      "netbase": {
-        "version": "5.2",
-        "arch": "all"
-      },
-      "netcat-openbsd": {
-        "version": "1.105-7ubuntu1",
-        "arch": "amd64"
-      },
-      "ntpdate": {
-        "version": "1:4.2.6.p5+dfsg-3ubuntu2.14.04.10",
-        "arch": "amd64"
-      },
-      "openjdk-8-jre-headless": {
-        "version": "8u111-b14-3~14.04.1",
-        "arch": "amd64"
-      },
-      "openssh-client": {
-        "version": "1:6.6p1-2ubuntu2.8",
-        "arch": "amd64"
-      },
-      "openssl": {
-        "version": "1.0.1f-1ubuntu2.22",
-        "arch": "amd64"
-      },
-      "passwd": {
-        "version": "1:4.1.5.1-1ubuntu9.2",
-        "arch": "amd64"
-      },
-      "patch": {
-        "version": "2.7.1-4ubuntu2.3",
-        "arch": "amd64"
-      },
-      "perl": {
-        "version": "5.18.2-2ubuntu1.1",
-        "arch": "amd64"
-      },
-      "perl-base": {
-        "version": "5.18.2-2ubuntu1.1",
-        "arch": "amd64"
-      },
-      "perl-modules": {
-        "version": "5.18.2-2ubuntu1.1",
-        "arch": "all"
-      },
-      "plymouth": {
-        "version": "0.8.8-0ubuntu17.1",
-        "arch": "amd64"
-      },
-      "procps": {
-        "version": "1:3.3.9-1ubuntu2.2",
-        "arch": "amd64"
-      },
-      "python-apt-common": {
-        "version": "0.9.3.5ubuntu2",
-        "arch": "all"
-      },
-      "python3": {
-        "version": "3.4.0-0ubuntu2",
-        "arch": "amd64"
-      },
-      "python3-apt": {
-        "version": "0.9.3.5ubuntu2",
-        "arch": "amd64"
-      },
-      "python3-dbus": {
-        "version": "1.2.0-2build2",
-        "arch": "amd64"
-      },
-      "python3-gi": {
-        "version": "3.12.0-1ubuntu1",
-        "arch": "amd64"
-      },
-      "python3-minimal": {
-        "version": "3.4.0-0ubuntu2",
-        "arch": "amd64"
-      },
-      "python3-pycurl": {
-        "version": "7.19.3-0ubuntu3",
-        "arch": "amd64"
-      },
-      "python3-software-properties": {
-        "version": "0.92.37.7",
-        "arch": "all"
-      },
-      "python3.4": {
-        "version": "3.4.3-1ubuntu1~14.04.5",
-        "arch": "amd64"
-      },
-      "python3.4-minimal": {
-        "version": "3.4.3-1ubuntu1~14.04.5",
-        "arch": "amd64"
-      },
-      "readline-common": {
-        "version": "6.3-4ubuntu2",
-        "arch": "all"
-      },
-      "resolvconf": {
-        "version": "1.69ubuntu1.1",
-        "arch": "all"
-      },
-      "rsync": {
-        "version": "3.1.0-2ubuntu0.2",
-        "arch": "amd64"
-      },
-      "rsyslog": {
-        "version": "7.4.4-1ubuntu2.6",
-        "arch": "amd64"
-      },
-      "sed": {
-        "version": "4.2.2-4ubuntu1",
-        "arch": "amd64"
-      },
-      "sensible-utils": {
-        "version": "0.0.9",
-        "arch": "all"
-      },
-      "sgml-base": {
-        "version": "1.26+nmu4ubuntu1",
-        "arch": "all"
-      },
-      "shared-mime-info": {
-        "version": "1.2-0ubuntu3",
-        "arch": "amd64"
-      },
-      "software-properties-common": {
-        "version": "0.92.37.7",
-        "arch": "all"
-      },
-      "sudo": {
-        "version": "1.8.9p5-1ubuntu1.3",
-        "arch": "amd64"
-      },
-      "sysv-rc": {
-        "version": "2.88dsf-41ubuntu6.3",
-        "arch": "all"
-      },
-      "sysvinit-utils": {
-        "version": "2.88dsf-41ubuntu6.3",
-        "arch": "amd64"
-      },
-      "tar": {
-        "version": "1.27.1-1ubuntu0.1",
-        "arch": "amd64"
-      },
-      "tzdata": {
-        "version": "2016j-0ubuntu0.14.04",
-        "arch": "all"
-      },
-      "ubuntu-keyring": {
-        "version": "2012.05.19",
-        "arch": "all"
-      },
-      "ubuntu-minimal": {
-        "version": "1.325",
-        "arch": "amd64"
-      },
-      "ucf": {
-        "version": "3.0027+nmu1",
-        "arch": "all"
-      },
-      "udev": {
-        "version": "204-5ubuntu20.24",
-        "arch": "amd64"
-      },
-      "unattended-upgrades": {
-        "version": "0.82.1ubuntu2.4",
-        "arch": "all"
-      },
-      "upstart": {
-        "version": "1.12.1-0ubuntu4.2",
-        "arch": "amd64"
-      },
-      "ureadahead": {
-        "version": "0.100.0-16",
-        "arch": "amd64"
-      },
-      "util-linux": {
-        "version": "2.20.1-5.1ubuntu20.9",
-        "arch": "amd64"
-      },
-      "vim-common": {
-        "version": "2:7.4.052-1ubuntu3.1",
-        "arch": "amd64"
-      },
-      "vim-tiny": {
-        "version": "2:7.4.052-1ubuntu3.1",
-        "arch": "amd64"
-      },
-      "whiptail": {
-        "version": "0.52.15-2ubuntu5",
-        "arch": "amd64"
-      },
-      "x11-common": {
-        "version": "1:7.7+1ubuntu8.1",
-        "arch": "all"
-      },
-      "xauth": {
-        "version": "1:1.0.7-1ubuntu1",
-        "arch": "amd64"
-      },
-      "xkb-data": {
-        "version": "2.10.1-1ubuntu1",
-        "arch": "all"
-      },
-      "xml-core": {
-        "version": "0.13+nmu2",
-        "arch": "all"
-      },
-      "xz-utils": {
-        "version": "5.1.1alpha+20120614-2ubuntu2",
-        "arch": "amd64"
-      },
-      "zlib1g": {
-        "version": "1:1.2.8.dfsg-1ubuntu1",
-        "arch": "amd64"
-      }
-    },
-    "root_group": "root",
-    "shells": [
-      "/bin/sh",
-      "/bin/dash",
-      "/bin/bash",
-      "/bin/rbash",
-      "/bin/ksh93"
-    ],
-    "time": {
-      "timezone": "UTC"
-    },
-    "recipes": [
-      "ajsc-aai-config::aai-config",
-      "ajsc-aai-config::aai-logback",
-      "ajsc-aai-config::aai-preferredRoute",
-      "ajsc-aai-config::aaiWorkloadConsumer",
-      "ajsc-aai-config::aaiWorkloadPublisher",
-      "ajsc-aai-config::aaiWorkloadStatusPublisher",
-      "ajsc-aai-config::createConfigDirectories",
-      "ajsc-aai-auth::aai-keystore"
-    ],
-    "expanded_run_list": [
-      "ajsc-aai-config::aai-config",
-      "ajsc-aai-config::aai-logback",
-      "ajsc-aai-config::aai-preferredRoute",
-      "ajsc-aai-config::aaiWorkloadConsumer",
-      "ajsc-aai-config::aaiWorkloadPublisher",
-      "ajsc-aai-config::aaiWorkloadStatusPublisher",
-      "ajsc-aai-config::createConfigDirectories",
-      "ajsc-aai-auth::aai-keystore"
-    ],
-    "roles": [
-
-    ],
-    "cookbooks": {
-      "ajsc-aai-config": {
-        "version": "0.2.2"
-      },
-      "ajsc-aai-auth": {
-        "version": "0.2.0"
-      }
-    }
-  },
-  "run_list": [
-    "recipe[ajsc-aai-config::aai-config]",
-    "recipe[ajsc-aai-config::aai-logback]",
-    "recipe[ajsc-aai-config::aai-preferredRoute]",
-    "recipe[ajsc-aai-config::aaiWorkloadConsumer]",
-    "recipe[ajsc-aai-config::aaiWorkloadPublisher]",
-    "recipe[ajsc-aai-config::aaiWorkloadStatusPublisher]",
-    "recipe[ajsc-aai-config::createConfigDirectories]",
-    "recipe[ajsc-aai-auth::aai-keystore]"
-  ]
-}
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadConsumer.properties.chef-20170515203437.982525 b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadConsumer.properties.chef-20170515203437.982525
deleted file mode 100755 (executable)
index 8f03f83..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-TransportType=DME2
-Latitude=47.778998
-Longitude=-122.182883
-Version=1.0
-ServiceName=
-Environment=TEST
-Partner=BOT_R
-routeOffer=MR1
-SubContextPath=/
-Protocol=http
-MethodType=GET
-username=
-password=
-contenttype=application/json
-host=
-topic=
-group=aaiConsumer
-id=dev
-timeout=15000
-limit=1000
-filter=
-AFT_DME2_EXCHANGE_REQUEST_HANDLERS=
-AFT_DME2_EXCHANGE_REPLY_HANDLERS=
-AFT_DME2_REQ_TRACE_ON=true
-AFT_ENVIRONMENT=AFTUAT
-AFT_DME2_EP_CONN_TIMEOUT=15000
-AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000
-AFT_DME2_EP_READ_TIMEOUT_MS=50000
-sessionstickinessrequired=no
-DME2preferredRouterFilePath=preferredRoute.txt
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadConsumer.properties.chef-20170515203837.892657 b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadConsumer.properties.chef-20170515203837.892657
deleted file mode 100755 (executable)
index 8f03f83..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-TransportType=DME2
-Latitude=47.778998
-Longitude=-122.182883
-Version=1.0
-ServiceName=
-Environment=TEST
-Partner=BOT_R
-routeOffer=MR1
-SubContextPath=/
-Protocol=http
-MethodType=GET
-username=
-password=
-contenttype=application/json
-host=
-topic=
-group=aaiConsumer
-id=dev
-timeout=15000
-limit=1000
-filter=
-AFT_DME2_EXCHANGE_REQUEST_HANDLERS=
-AFT_DME2_EXCHANGE_REPLY_HANDLERS=
-AFT_DME2_REQ_TRACE_ON=true
-AFT_ENVIRONMENT=AFTUAT
-AFT_DME2_EP_CONN_TIMEOUT=15000
-AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000
-AFT_DME2_EP_READ_TIMEOUT_MS=50000
-sessionstickinessrequired=no
-DME2preferredRouterFilePath=preferredRoute.txt
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadConsumer.properties.chef-20170516140802.742329 b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadConsumer.properties.chef-20170516140802.742329
deleted file mode 100755 (executable)
index 8f03f83..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-TransportType=DME2
-Latitude=47.778998
-Longitude=-122.182883
-Version=1.0
-ServiceName=
-Environment=TEST
-Partner=BOT_R
-routeOffer=MR1
-SubContextPath=/
-Protocol=http
-MethodType=GET
-username=
-password=
-contenttype=application/json
-host=
-topic=
-group=aaiConsumer
-id=dev
-timeout=15000
-limit=1000
-filter=
-AFT_DME2_EXCHANGE_REQUEST_HANDLERS=
-AFT_DME2_EXCHANGE_REPLY_HANDLERS=
-AFT_DME2_REQ_TRACE_ON=true
-AFT_ENVIRONMENT=AFTUAT
-AFT_DME2_EP_CONN_TIMEOUT=15000
-AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000
-AFT_DME2_EP_READ_TIMEOUT_MS=50000
-sessionstickinessrequired=no
-DME2preferredRouterFilePath=preferredRoute.txt
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadConsumer.properties.chef-20170517001516.702925 b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadConsumer.properties.chef-20170517001516.702925
deleted file mode 100755 (executable)
index 8f03f83..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-TransportType=DME2
-Latitude=47.778998
-Longitude=-122.182883
-Version=1.0
-ServiceName=
-Environment=TEST
-Partner=BOT_R
-routeOffer=MR1
-SubContextPath=/
-Protocol=http
-MethodType=GET
-username=
-password=
-contenttype=application/json
-host=
-topic=
-group=aaiConsumer
-id=dev
-timeout=15000
-limit=1000
-filter=
-AFT_DME2_EXCHANGE_REQUEST_HANDLERS=
-AFT_DME2_EXCHANGE_REPLY_HANDLERS=
-AFT_DME2_REQ_TRACE_ON=true
-AFT_ENVIRONMENT=AFTUAT
-AFT_DME2_EP_CONN_TIMEOUT=15000
-AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000
-AFT_DME2_EP_READ_TIMEOUT_MS=50000
-sessionstickinessrequired=no
-DME2preferredRouterFilePath=preferredRoute.txt
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadConsumer.properties.chef-20170525061506.737483 b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadConsumer.properties.chef-20170525061506.737483
deleted file mode 100644 (file)
index 8f03f83..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-TransportType=DME2
-Latitude=47.778998
-Longitude=-122.182883
-Version=1.0
-ServiceName=
-Environment=TEST
-Partner=BOT_R
-routeOffer=MR1
-SubContextPath=/
-Protocol=http
-MethodType=GET
-username=
-password=
-contenttype=application/json
-host=
-topic=
-group=aaiConsumer
-id=dev
-timeout=15000
-limit=1000
-filter=
-AFT_DME2_EXCHANGE_REQUEST_HANDLERS=
-AFT_DME2_EXCHANGE_REPLY_HANDLERS=
-AFT_DME2_REQ_TRACE_ON=true
-AFT_ENVIRONMENT=AFTUAT
-AFT_DME2_EP_CONN_TIMEOUT=15000
-AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000
-AFT_DME2_EP_READ_TIMEOUT_MS=50000
-sessionstickinessrequired=no
-DME2preferredRouterFilePath=preferredRoute.txt
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadPublisher.properties.chef-20170515203438.032572 b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadPublisher.properties.chef-20170515203438.032572
deleted file mode 100755 (executable)
index 372268a..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-TransportType=DME2
-Latitude=47.778998
-Longitude=-122.182883
-Version=1.0
-ServiceName=
-Environment=TEST
-Partner=BOT_R
-routeOffer=MR1
-SubContextPath=/
-Protocol=http
-MethodType=POST
-username=
-password=
-contenttype=application/json
-host=
-topic=
-partition=AAI_WORKLOAD
-maxBatchSize=100
-maxAgeMs=250
-AFT_DME2_EXCHANGE_REQUEST_HANDLERS=
-AFT_DME2_EXCHANGE_REPLY_HANDLERS=
-AFT_DME2_REQ_TRACE_ON=true
-AFT_ENVIRONMENT=AFTUAT
-AFT_DME2_EP_CONN_TIMEOUT=15000
-AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000
-AFT_DME2_EP_READ_TIMEOUT_MS=50000
-sessionstickinessrequired=NO
-DME2preferredRouterFilePath=preferredRoute.txt
-MessageSentThreadOccurance=50
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadPublisher.properties.chef-20170515203837.951256 b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadPublisher.properties.chef-20170515203837.951256
deleted file mode 100755 (executable)
index 372268a..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-TransportType=DME2
-Latitude=47.778998
-Longitude=-122.182883
-Version=1.0
-ServiceName=
-Environment=TEST
-Partner=BOT_R
-routeOffer=MR1
-SubContextPath=/
-Protocol=http
-MethodType=POST
-username=
-password=
-contenttype=application/json
-host=
-topic=
-partition=AAI_WORKLOAD
-maxBatchSize=100
-maxAgeMs=250
-AFT_DME2_EXCHANGE_REQUEST_HANDLERS=
-AFT_DME2_EXCHANGE_REPLY_HANDLERS=
-AFT_DME2_REQ_TRACE_ON=true
-AFT_ENVIRONMENT=AFTUAT
-AFT_DME2_EP_CONN_TIMEOUT=15000
-AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000
-AFT_DME2_EP_READ_TIMEOUT_MS=50000
-sessionstickinessrequired=NO
-DME2preferredRouterFilePath=preferredRoute.txt
-MessageSentThreadOccurance=50
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadPublisher.properties.chef-20170516140802.804576 b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadPublisher.properties.chef-20170516140802.804576
deleted file mode 100755 (executable)
index 372268a..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-TransportType=DME2
-Latitude=47.778998
-Longitude=-122.182883
-Version=1.0
-ServiceName=
-Environment=TEST
-Partner=BOT_R
-routeOffer=MR1
-SubContextPath=/
-Protocol=http
-MethodType=POST
-username=
-password=
-contenttype=application/json
-host=
-topic=
-partition=AAI_WORKLOAD
-maxBatchSize=100
-maxAgeMs=250
-AFT_DME2_EXCHANGE_REQUEST_HANDLERS=
-AFT_DME2_EXCHANGE_REPLY_HANDLERS=
-AFT_DME2_REQ_TRACE_ON=true
-AFT_ENVIRONMENT=AFTUAT
-AFT_DME2_EP_CONN_TIMEOUT=15000
-AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000
-AFT_DME2_EP_READ_TIMEOUT_MS=50000
-sessionstickinessrequired=NO
-DME2preferredRouterFilePath=preferredRoute.txt
-MessageSentThreadOccurance=50
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadPublisher.properties.chef-20170517001516.745487 b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadPublisher.properties.chef-20170517001516.745487
deleted file mode 100755 (executable)
index 372268a..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-TransportType=DME2
-Latitude=47.778998
-Longitude=-122.182883
-Version=1.0
-ServiceName=
-Environment=TEST
-Partner=BOT_R
-routeOffer=MR1
-SubContextPath=/
-Protocol=http
-MethodType=POST
-username=
-password=
-contenttype=application/json
-host=
-topic=
-partition=AAI_WORKLOAD
-maxBatchSize=100
-maxAgeMs=250
-AFT_DME2_EXCHANGE_REQUEST_HANDLERS=
-AFT_DME2_EXCHANGE_REPLY_HANDLERS=
-AFT_DME2_REQ_TRACE_ON=true
-AFT_ENVIRONMENT=AFTUAT
-AFT_DME2_EP_CONN_TIMEOUT=15000
-AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000
-AFT_DME2_EP_READ_TIMEOUT_MS=50000
-sessionstickinessrequired=NO
-DME2preferredRouterFilePath=preferredRoute.txt
-MessageSentThreadOccurance=50
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadPublisher.properties.chef-20170525061506.748871 b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadPublisher.properties.chef-20170525061506.748871
deleted file mode 100644 (file)
index 372268a..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-TransportType=DME2
-Latitude=47.778998
-Longitude=-122.182883
-Version=1.0
-ServiceName=
-Environment=TEST
-Partner=BOT_R
-routeOffer=MR1
-SubContextPath=/
-Protocol=http
-MethodType=POST
-username=
-password=
-contenttype=application/json
-host=
-topic=
-partition=AAI_WORKLOAD
-maxBatchSize=100
-maxAgeMs=250
-AFT_DME2_EXCHANGE_REQUEST_HANDLERS=
-AFT_DME2_EXCHANGE_REPLY_HANDLERS=
-AFT_DME2_REQ_TRACE_ON=true
-AFT_ENVIRONMENT=AFTUAT
-AFT_DME2_EP_CONN_TIMEOUT=15000
-AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000
-AFT_DME2_EP_READ_TIMEOUT_MS=50000
-sessionstickinessrequired=NO
-DME2preferredRouterFilePath=preferredRoute.txt
-MessageSentThreadOccurance=50
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadStatusPublisher.properties.chef-20170515203438.078258 b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadStatusPublisher.properties.chef-20170515203438.078258
deleted file mode 100755 (executable)
index 49db340..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-TransportType=DME2
-Latitude=47.778998
-Longitude=-122.182883
-Version=1.0
-ServiceName=
-Environment=TEST
-Partner=BOT_R
-routeOffer=MR1
-SubContextPath=/
-Protocol=http
-MethodType=POST
-username=
-password=
-contenttype=application/json
-host=
-topic=
-partition=AAI_WORKLOAD_STATUS
-maxBatchSize=100
-maxAgeMs=250
-AFT_DME2_EXCHANGE_REQUEST_HANDLERS=
-AFT_DME2_EXCHANGE_REPLY_HANDLERS=
-AFT_DME2_REQ_TRACE_ON=true
-AFT_ENVIRONMENT=AFTUAT
-AFT_DME2_EP_CONN_TIMEOUT=15000
-AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000
-AFT_DME2_EP_READ_TIMEOUT_MS=50000
-sessionstickinessrequired=NO
-DME2preferredRouterFilePath=preferredRoute.txt
-MessageSentThreadOccurance=50
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadStatusPublisher.properties.chef-20170515203838.004779 b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadStatusPublisher.properties.chef-20170515203838.004779
deleted file mode 100755 (executable)
index 49db340..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-TransportType=DME2
-Latitude=47.778998
-Longitude=-122.182883
-Version=1.0
-ServiceName=
-Environment=TEST
-Partner=BOT_R
-routeOffer=MR1
-SubContextPath=/
-Protocol=http
-MethodType=POST
-username=
-password=
-contenttype=application/json
-host=
-topic=
-partition=AAI_WORKLOAD_STATUS
-maxBatchSize=100
-maxAgeMs=250
-AFT_DME2_EXCHANGE_REQUEST_HANDLERS=
-AFT_DME2_EXCHANGE_REPLY_HANDLERS=
-AFT_DME2_REQ_TRACE_ON=true
-AFT_ENVIRONMENT=AFTUAT
-AFT_DME2_EP_CONN_TIMEOUT=15000
-AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000
-AFT_DME2_EP_READ_TIMEOUT_MS=50000
-sessionstickinessrequired=NO
-DME2preferredRouterFilePath=preferredRoute.txt
-MessageSentThreadOccurance=50
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadStatusPublisher.properties.chef-20170516140802.862105 b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadStatusPublisher.properties.chef-20170516140802.862105
deleted file mode 100755 (executable)
index 49db340..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-TransportType=DME2
-Latitude=47.778998
-Longitude=-122.182883
-Version=1.0
-ServiceName=
-Environment=TEST
-Partner=BOT_R
-routeOffer=MR1
-SubContextPath=/
-Protocol=http
-MethodType=POST
-username=
-password=
-contenttype=application/json
-host=
-topic=
-partition=AAI_WORKLOAD_STATUS
-maxBatchSize=100
-maxAgeMs=250
-AFT_DME2_EXCHANGE_REQUEST_HANDLERS=
-AFT_DME2_EXCHANGE_REPLY_HANDLERS=
-AFT_DME2_REQ_TRACE_ON=true
-AFT_ENVIRONMENT=AFTUAT
-AFT_DME2_EP_CONN_TIMEOUT=15000
-AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000
-AFT_DME2_EP_READ_TIMEOUT_MS=50000
-sessionstickinessrequired=NO
-DME2preferredRouterFilePath=preferredRoute.txt
-MessageSentThreadOccurance=50
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadStatusPublisher.properties.chef-20170517001516.777254 b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadStatusPublisher.properties.chef-20170517001516.777254
deleted file mode 100755 (executable)
index 49db340..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-TransportType=DME2
-Latitude=47.778998
-Longitude=-122.182883
-Version=1.0
-ServiceName=
-Environment=TEST
-Partner=BOT_R
-routeOffer=MR1
-SubContextPath=/
-Protocol=http
-MethodType=POST
-username=
-password=
-contenttype=application/json
-host=
-topic=
-partition=AAI_WORKLOAD_STATUS
-maxBatchSize=100
-maxAgeMs=250
-AFT_DME2_EXCHANGE_REQUEST_HANDLERS=
-AFT_DME2_EXCHANGE_REPLY_HANDLERS=
-AFT_DME2_REQ_TRACE_ON=true
-AFT_ENVIRONMENT=AFTUAT
-AFT_DME2_EP_CONN_TIMEOUT=15000
-AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000
-AFT_DME2_EP_READ_TIMEOUT_MS=50000
-sessionstickinessrequired=NO
-DME2preferredRouterFilePath=preferredRoute.txt
-MessageSentThreadOccurance=50
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadStatusPublisher.properties.chef-20170525061506.760273 b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiWorkloadStatusPublisher.properties.chef-20170525061506.760273
deleted file mode 100644 (file)
index 49db340..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-TransportType=DME2
-Latitude=47.778998
-Longitude=-122.182883
-Version=1.0
-ServiceName=
-Environment=TEST
-Partner=BOT_R
-routeOffer=MR1
-SubContextPath=/
-Protocol=http
-MethodType=POST
-username=
-password=
-contenttype=application/json
-host=
-topic=
-partition=AAI_WORKLOAD_STATUS
-maxBatchSize=100
-maxAgeMs=250
-AFT_DME2_EXCHANGE_REQUEST_HANDLERS=
-AFT_DME2_EXCHANGE_REPLY_HANDLERS=
-AFT_DME2_REQ_TRACE_ON=true
-AFT_ENVIRONMENT=AFTUAT
-AFT_DME2_EP_CONN_TIMEOUT=15000
-AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000
-AFT_DME2_EP_READ_TIMEOUT_MS=50000
-sessionstickinessrequired=NO
-DME2preferredRouterFilePath=preferredRoute.txt
-MessageSentThreadOccurance=50
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiconfig.properties.chef-20170515203437.872136 b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiconfig.properties.chef-20170515203437.872136
deleted file mode 100755 (executable)
index b1b23fe..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-####################################################################
-#  REMEMBER TO THINK ABOUT ENVIRONMENTAL DIFFERENCES AND CHANGE THE
-#  TEMPLATE AND *ALL* DATAFILES
-####################################################################
-
-aai.config.checktime=1000
-
-# this could come from siteconfig.pl?
-aai.config.nodename=AutomaticallyOverwritten
-
-aai.logging.hbase.interceptor=false
-aai.logging.hbase.enabled=false
-aai.logging.hbase.logrequest=false
-aai.logging.hbase.logresponse=false
-
-aai.logging.trace.enabled=true
-aai.logging.trace.logrequest=false
-aai.logging.trace.logresponse=false
-
-
-aai.tools.enableBasicAuth=true
-aai.tools.username=AAI
-aai.tools.password=AAI
-
-aai.server.url.base=https://localhost:8443/aai/
-aai.server.url=https://localhost:8443/aai/v8/
-aai.global.callback.url=https://localhost:8443/aai/
-
-aai.auth.cspcookies_on=false
-aai.truststore.filename=aai_keystore
-aai.truststore.passwd.x=OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0
-
-# the following parameters are not reloaded automatically and require a manual bounce
-storage.backend=inmemory
-storage.hostname=localhost
-
-#schema.default=none
-storage.lock.wait-time=300
-storage.hbase.table=aaigraph.dev
-storage.hbase.ext.zookeeper.znode.parent=/hbase
-# Setting db-cache to false ensure the fastest propagation of changes across servers
-cache.db-cache = false
-#cache.db-cache-clean-wait = 20
-#cache.db-cache-time = 180000
-#cache.db-cache-size = 0.5
-
-# for transaction log
-hbase.table.name=aailogging.dev
-hbase.table.timestamp.format=YYYYMMdd-HH:mm:ss:SSS
-hbase.zookeeper.quorum=localhost
-hbase.zookeeper.property.clientPort=2181
-hbase.zookeeper.znode.parent=/hbase
-hbase.column.ttl.days=15
-
-
-# single primary server
-aai.primary.filetransfer.serverlist=localhost
-aai.primary.filetransfer.primarycheck=echo:8443/aai/util/echo
-aai.primary.filetransfer.pingtimeout=5000
-aai.primary.filetransfer.pingcount=5
-
-#rsync properties
-aai.rsync.command=rsync
-aai.rsync.options.list=-v|-t
-aai.rsync.remote.user=aaiadmin
-aai.rsync.enabled=y
-
-
-aai.notification.current.version=v8
-aai.notificationEvent.default.status=UNPROCESSED
-aai.notificationEvent.default.eventType=AAI-EVENT
-aai.notificationEvent.default.domain=devINT1
-aai.notificationEvent.default.sourceName=aai
-aai.notificationEvent.default.sequenceNumber=0
-aai.notificationEvent.default.severity=NORMAL
-aai.notificationEvent.default.version=v8
-# This one lets us enable/disable resource-version checking on updates/deletes
-aai.resourceversion.enableflag=true
-aai.logging.maxStackTraceEntries=10
-aai.default.api.version=v8
-
-
-# Used by Model-processing code
-aai.model.delete.sleep.per.vtx.msec=500
-aai.model.query.resultset.maxcount=30
-aai.model.query.timeout.sec=90
-# Used by Data Grooming
-aai.grooming.default.max.fix=150
-aai.grooming.default.sleep.minutes=7
-
-aai.model.proc.max.levels=50
-aai.edgeTag.proc.max.levels=50
-
-aai.dmaap.workload.enableEventProcessing=true
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiconfig.properties.chef-20170515203837.770006 b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiconfig.properties.chef-20170515203837.770006
deleted file mode 100755 (executable)
index b1b23fe..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-####################################################################
-#  REMEMBER TO THINK ABOUT ENVIRONMENTAL DIFFERENCES AND CHANGE THE
-#  TEMPLATE AND *ALL* DATAFILES
-####################################################################
-
-aai.config.checktime=1000
-
-# this could come from siteconfig.pl?
-aai.config.nodename=AutomaticallyOverwritten
-
-aai.logging.hbase.interceptor=false
-aai.logging.hbase.enabled=false
-aai.logging.hbase.logrequest=false
-aai.logging.hbase.logresponse=false
-
-aai.logging.trace.enabled=true
-aai.logging.trace.logrequest=false
-aai.logging.trace.logresponse=false
-
-
-aai.tools.enableBasicAuth=true
-aai.tools.username=AAI
-aai.tools.password=AAI
-
-aai.server.url.base=https://localhost:8443/aai/
-aai.server.url=https://localhost:8443/aai/v8/
-aai.global.callback.url=https://localhost:8443/aai/
-
-aai.auth.cspcookies_on=false
-aai.truststore.filename=aai_keystore
-aai.truststore.passwd.x=OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0
-
-# the following parameters are not reloaded automatically and require a manual bounce
-storage.backend=inmemory
-storage.hostname=localhost
-
-#schema.default=none
-storage.lock.wait-time=300
-storage.hbase.table=aaigraph.dev
-storage.hbase.ext.zookeeper.znode.parent=/hbase
-# Setting db-cache to false ensure the fastest propagation of changes across servers
-cache.db-cache = false
-#cache.db-cache-clean-wait = 20
-#cache.db-cache-time = 180000
-#cache.db-cache-size = 0.5
-
-# for transaction log
-hbase.table.name=aailogging.dev
-hbase.table.timestamp.format=YYYYMMdd-HH:mm:ss:SSS
-hbase.zookeeper.quorum=localhost
-hbase.zookeeper.property.clientPort=2181
-hbase.zookeeper.znode.parent=/hbase
-hbase.column.ttl.days=15
-
-
-# single primary server
-aai.primary.filetransfer.serverlist=localhost
-aai.primary.filetransfer.primarycheck=echo:8443/aai/util/echo
-aai.primary.filetransfer.pingtimeout=5000
-aai.primary.filetransfer.pingcount=5
-
-#rsync properties
-aai.rsync.command=rsync
-aai.rsync.options.list=-v|-t
-aai.rsync.remote.user=aaiadmin
-aai.rsync.enabled=y
-
-
-aai.notification.current.version=v8
-aai.notificationEvent.default.status=UNPROCESSED
-aai.notificationEvent.default.eventType=AAI-EVENT
-aai.notificationEvent.default.domain=devINT1
-aai.notificationEvent.default.sourceName=aai
-aai.notificationEvent.default.sequenceNumber=0
-aai.notificationEvent.default.severity=NORMAL
-aai.notificationEvent.default.version=v8
-# This one lets us enable/disable resource-version checking on updates/deletes
-aai.resourceversion.enableflag=true
-aai.logging.maxStackTraceEntries=10
-aai.default.api.version=v8
-
-
-# Used by Model-processing code
-aai.model.delete.sleep.per.vtx.msec=500
-aai.model.query.resultset.maxcount=30
-aai.model.query.timeout.sec=90
-# Used by Data Grooming
-aai.grooming.default.max.fix=150
-aai.grooming.default.sleep.minutes=7
-
-aai.model.proc.max.levels=50
-aai.edgeTag.proc.max.levels=50
-
-aai.dmaap.workload.enableEventProcessing=true
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiconfig.properties.chef-20170516140802.582503 b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiconfig.properties.chef-20170516140802.582503
deleted file mode 100755 (executable)
index b1b23fe..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-####################################################################
-#  REMEMBER TO THINK ABOUT ENVIRONMENTAL DIFFERENCES AND CHANGE THE
-#  TEMPLATE AND *ALL* DATAFILES
-####################################################################
-
-aai.config.checktime=1000
-
-# this could come from siteconfig.pl?
-aai.config.nodename=AutomaticallyOverwritten
-
-aai.logging.hbase.interceptor=false
-aai.logging.hbase.enabled=false
-aai.logging.hbase.logrequest=false
-aai.logging.hbase.logresponse=false
-
-aai.logging.trace.enabled=true
-aai.logging.trace.logrequest=false
-aai.logging.trace.logresponse=false
-
-
-aai.tools.enableBasicAuth=true
-aai.tools.username=AAI
-aai.tools.password=AAI
-
-aai.server.url.base=https://localhost:8443/aai/
-aai.server.url=https://localhost:8443/aai/v8/
-aai.global.callback.url=https://localhost:8443/aai/
-
-aai.auth.cspcookies_on=false
-aai.truststore.filename=aai_keystore
-aai.truststore.passwd.x=OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0
-
-# the following parameters are not reloaded automatically and require a manual bounce
-storage.backend=inmemory
-storage.hostname=localhost
-
-#schema.default=none
-storage.lock.wait-time=300
-storage.hbase.table=aaigraph.dev
-storage.hbase.ext.zookeeper.znode.parent=/hbase
-# Setting db-cache to false ensure the fastest propagation of changes across servers
-cache.db-cache = false
-#cache.db-cache-clean-wait = 20
-#cache.db-cache-time = 180000
-#cache.db-cache-size = 0.5
-
-# for transaction log
-hbase.table.name=aailogging.dev
-hbase.table.timestamp.format=YYYYMMdd-HH:mm:ss:SSS
-hbase.zookeeper.quorum=localhost
-hbase.zookeeper.property.clientPort=2181
-hbase.zookeeper.znode.parent=/hbase
-hbase.column.ttl.days=15
-
-
-# single primary server
-aai.primary.filetransfer.serverlist=localhost
-aai.primary.filetransfer.primarycheck=echo:8443/aai/util/echo
-aai.primary.filetransfer.pingtimeout=5000
-aai.primary.filetransfer.pingcount=5
-
-#rsync properties
-aai.rsync.command=rsync
-aai.rsync.options.list=-v|-t
-aai.rsync.remote.user=aaiadmin
-aai.rsync.enabled=y
-
-
-aai.notification.current.version=v8
-aai.notificationEvent.default.status=UNPROCESSED
-aai.notificationEvent.default.eventType=AAI-EVENT
-aai.notificationEvent.default.domain=devINT1
-aai.notificationEvent.default.sourceName=aai
-aai.notificationEvent.default.sequenceNumber=0
-aai.notificationEvent.default.severity=NORMAL
-aai.notificationEvent.default.version=v8
-# This one lets us enable/disable resource-version checking on updates/deletes
-aai.resourceversion.enableflag=true
-aai.logging.maxStackTraceEntries=10
-aai.default.api.version=v8
-
-
-# Used by Model-processing code
-aai.model.delete.sleep.per.vtx.msec=500
-aai.model.query.resultset.maxcount=30
-aai.model.query.timeout.sec=90
-# Used by Data Grooming
-aai.grooming.default.max.fix=150
-aai.grooming.default.sleep.minutes=7
-
-aai.model.proc.max.levels=50
-aai.edgeTag.proc.max.levels=50
-
-aai.dmaap.workload.enableEventProcessing=true
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiconfig.properties.chef-20170517001516.603242 b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiconfig.properties.chef-20170517001516.603242
deleted file mode 100755 (executable)
index b1b23fe..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-####################################################################
-#  REMEMBER TO THINK ABOUT ENVIRONMENTAL DIFFERENCES AND CHANGE THE
-#  TEMPLATE AND *ALL* DATAFILES
-####################################################################
-
-aai.config.checktime=1000
-
-# this could come from siteconfig.pl?
-aai.config.nodename=AutomaticallyOverwritten
-
-aai.logging.hbase.interceptor=false
-aai.logging.hbase.enabled=false
-aai.logging.hbase.logrequest=false
-aai.logging.hbase.logresponse=false
-
-aai.logging.trace.enabled=true
-aai.logging.trace.logrequest=false
-aai.logging.trace.logresponse=false
-
-
-aai.tools.enableBasicAuth=true
-aai.tools.username=AAI
-aai.tools.password=AAI
-
-aai.server.url.base=https://localhost:8443/aai/
-aai.server.url=https://localhost:8443/aai/v8/
-aai.global.callback.url=https://localhost:8443/aai/
-
-aai.auth.cspcookies_on=false
-aai.truststore.filename=aai_keystore
-aai.truststore.passwd.x=OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0
-
-# the following parameters are not reloaded automatically and require a manual bounce
-storage.backend=inmemory
-storage.hostname=localhost
-
-#schema.default=none
-storage.lock.wait-time=300
-storage.hbase.table=aaigraph.dev
-storage.hbase.ext.zookeeper.znode.parent=/hbase
-# Setting db-cache to false ensure the fastest propagation of changes across servers
-cache.db-cache = false
-#cache.db-cache-clean-wait = 20
-#cache.db-cache-time = 180000
-#cache.db-cache-size = 0.5
-
-# for transaction log
-hbase.table.name=aailogging.dev
-hbase.table.timestamp.format=YYYYMMdd-HH:mm:ss:SSS
-hbase.zookeeper.quorum=localhost
-hbase.zookeeper.property.clientPort=2181
-hbase.zookeeper.znode.parent=/hbase
-hbase.column.ttl.days=15
-
-
-# single primary server
-aai.primary.filetransfer.serverlist=localhost
-aai.primary.filetransfer.primarycheck=echo:8443/aai/util/echo
-aai.primary.filetransfer.pingtimeout=5000
-aai.primary.filetransfer.pingcount=5
-
-#rsync properties
-aai.rsync.command=rsync
-aai.rsync.options.list=-v|-t
-aai.rsync.remote.user=aaiadmin
-aai.rsync.enabled=y
-
-
-aai.notification.current.version=v8
-aai.notificationEvent.default.status=UNPROCESSED
-aai.notificationEvent.default.eventType=AAI-EVENT
-aai.notificationEvent.default.domain=devINT1
-aai.notificationEvent.default.sourceName=aai
-aai.notificationEvent.default.sequenceNumber=0
-aai.notificationEvent.default.severity=NORMAL
-aai.notificationEvent.default.version=v8
-# This one lets us enable/disable resource-version checking on updates/deletes
-aai.resourceversion.enableflag=true
-aai.logging.maxStackTraceEntries=10
-aai.default.api.version=v8
-
-
-# Used by Model-processing code
-aai.model.delete.sleep.per.vtx.msec=500
-aai.model.query.resultset.maxcount=30
-aai.model.query.timeout.sec=90
-# Used by Data Grooming
-aai.grooming.default.max.fix=150
-aai.grooming.default.sleep.minutes=7
-
-aai.model.proc.max.levels=50
-aai.edgeTag.proc.max.levels=50
-
-aai.dmaap.workload.enableEventProcessing=true
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiconfig.properties.chef-20170525061506.695621 b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/appprops/aaiconfig.properties.chef-20170525061506.695621
deleted file mode 100644 (file)
index b1b23fe..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-####################################################################
-#  REMEMBER TO THINK ABOUT ENVIRONMENTAL DIFFERENCES AND CHANGE THE
-#  TEMPLATE AND *ALL* DATAFILES
-####################################################################
-
-aai.config.checktime=1000
-
-# this could come from siteconfig.pl?
-aai.config.nodename=AutomaticallyOverwritten
-
-aai.logging.hbase.interceptor=false
-aai.logging.hbase.enabled=false
-aai.logging.hbase.logrequest=false
-aai.logging.hbase.logresponse=false
-
-aai.logging.trace.enabled=true
-aai.logging.trace.logrequest=false
-aai.logging.trace.logresponse=false
-
-
-aai.tools.enableBasicAuth=true
-aai.tools.username=AAI
-aai.tools.password=AAI
-
-aai.server.url.base=https://localhost:8443/aai/
-aai.server.url=https://localhost:8443/aai/v8/
-aai.global.callback.url=https://localhost:8443/aai/
-
-aai.auth.cspcookies_on=false
-aai.truststore.filename=aai_keystore
-aai.truststore.passwd.x=OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0
-
-# the following parameters are not reloaded automatically and require a manual bounce
-storage.backend=inmemory
-storage.hostname=localhost
-
-#schema.default=none
-storage.lock.wait-time=300
-storage.hbase.table=aaigraph.dev
-storage.hbase.ext.zookeeper.znode.parent=/hbase
-# Setting db-cache to false ensure the fastest propagation of changes across servers
-cache.db-cache = false
-#cache.db-cache-clean-wait = 20
-#cache.db-cache-time = 180000
-#cache.db-cache-size = 0.5
-
-# for transaction log
-hbase.table.name=aailogging.dev
-hbase.table.timestamp.format=YYYYMMdd-HH:mm:ss:SSS
-hbase.zookeeper.quorum=localhost
-hbase.zookeeper.property.clientPort=2181
-hbase.zookeeper.znode.parent=/hbase
-hbase.column.ttl.days=15
-
-
-# single primary server
-aai.primary.filetransfer.serverlist=localhost
-aai.primary.filetransfer.primarycheck=echo:8443/aai/util/echo
-aai.primary.filetransfer.pingtimeout=5000
-aai.primary.filetransfer.pingcount=5
-
-#rsync properties
-aai.rsync.command=rsync
-aai.rsync.options.list=-v|-t
-aai.rsync.remote.user=aaiadmin
-aai.rsync.enabled=y
-
-
-aai.notification.current.version=v8
-aai.notificationEvent.default.status=UNPROCESSED
-aai.notificationEvent.default.eventType=AAI-EVENT
-aai.notificationEvent.default.domain=devINT1
-aai.notificationEvent.default.sourceName=aai
-aai.notificationEvent.default.sequenceNumber=0
-aai.notificationEvent.default.severity=NORMAL
-aai.notificationEvent.default.version=v8
-# This one lets us enable/disable resource-version checking on updates/deletes
-aai.resourceversion.enableflag=true
-aai.logging.maxStackTraceEntries=10
-aai.default.api.version=v8
-
-
-# Used by Model-processing code
-aai.model.delete.sleep.per.vtx.msec=500
-aai.model.query.resultset.maxcount=30
-aai.model.query.timeout.sec=90
-# Used by Data Grooming
-aai.grooming.default.max.fix=150
-aai.grooming.default.sleep.minutes=7
-
-aai.model.proc.max.levels=50
-aai.edgeTag.proc.max.levels=50
-
-aai.dmaap.workload.enableEventProcessing=true
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/logback.xml.chef-20170515203437.939967 b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/logback.xml.chef-20170515203437.939967
deleted file mode 100755 (executable)
index 103f38f..0000000
+++ /dev/null
@@ -1,296 +0,0 @@
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-       <contextName>${module.ajsc.namespace.name}</contextName>
-       <jmxConfigurator />
-       <property name="logDirectory" value="${AJSC_HOME}/logs" />
-       
-       <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-               <filter class="ch.qos.logback.classic.filter.LevelFilter">
-                       <level>ERROR</level>
-                       <onMatch>ACCEPT</onMatch>
-                       <onMismatch>DENY</onMismatch>
-               </filter>
-               <encoder>
-                       <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n</pattern>
-               </encoder>
-       </appender>
-       
-       <appender name="METRIC" class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.LevelFilter">
-                       <level>INFO</level>
-                       <onMatch>ACCEPT</onMatch>
-                       <onMismatch>DENY</onMismatch>
-               </filter>
-               <file>${logDirectory}/rest/metrics.log</file>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/rest/metrics.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       <appender name="asyncMETRIC" class="ch.qos.logback.classic.AsyncAppender">
-               <queueSize>1000</queueSize>
-               <appender-ref ref="METRIC" />
-       </appender>
-       
-       <appender name="DEBUG"  class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.LevelFilter">
-                       <level>DEBUG</level>
-                       <onMatch>ACCEPT</onMatch>
-                       <onMismatch>DENY</onMismatch>
-               </filter>
-               <file>${logDirectory}/rest/debug.log</file>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/rest/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       <appender name="asyncDEBUG" class="ch.qos.logback.classic.AsyncAppender">
-               <queueSize>1000</queueSize>
-               <appender-ref ref="DEBUG" />
-       </appender>
-       
-       <appender name="ERROR"  class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-                       <level>WARN</level>
-               </filter>
-               <file>${logDirectory}/rest/error.log</file>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/rest/error.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       <appender name="asyncERROR" class="ch.qos.logback.classic.AsyncAppender">
-               <queueSize>1000</queueSize>
-               <appender-ref ref="ERROR" />
-       </appender>
-       
-       <appender name="AUDIT"  class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <file>${logDirectory}/rest/audit.log</file>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/rest/audit.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       <appender name="asyncAUDIT" class="ch.qos.logback.classic.AsyncAppender">
-               <queueSize>1000</queueSize>
-               <appender-ref ref="AUDIT" />
-       </appender>
-       
-       <appender name="dmaapAAIWorkloadConsumer"       class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-                       <level>WARN</level>
-               </filter>
-               <File>${logDirectory}/dmaapAAIWorkloadConsumer/error.log</File>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/dmaapAAIWorkloadConsumer/error.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       
-       <appender name="dmaapAAIWorkloadConsumerdebug"  class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.LevelFilter">
-                       <level>DEBUG</level>
-                       <onMatch>ACCEPT</onMatch>
-                       <onMismatch>DENY</onMismatch>
-               </filter>
-               <File>${logDirectory}/dmaapAAIWorkloadConsumer/debug.log</File>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/dmaapAAIWorkloadConsumer/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       <appender name="dmaapAAIWorkloadConsumermetric" class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.LevelFilter">
-                       <level>INFO</level>
-                       <onMatch>ACCEPT</onMatch>
-                       <onMismatch>DENY</onMismatch>
-               </filter>
-               <File>${logDirectory}/dmaapAAIWorkloadConsumer/metrics.log</File>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/dmaapAAIWorkloadConsumer/metrics.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       
-       <!-- Spring related loggers -->
-       <logger name="org.springframework" level="WARN" />
-       <logger name="org.springframework.beans" level="WARN" />
-       <logger name="org.springframework.web" level="WARN" />
-       <logger name="com.blog.spring.jms" level="WARN" />
-       
-       <!-- AJSC Services (bootstrap services) -->
-       <logger name="ajsc" level="WARN" />
-       <logger name="ajsc.RouteMgmtService" level="WARN" />
-       <logger name="ajsc.ComputeService" level="WARN" />
-       <logger name="ajsc.VandelayService" level="WARN" />
-       <logger name="ajsc.FilePersistenceService" level="WARN" />
-       <logger name="ajsc.UserDefinedJarService" level="WARN" />
-       <logger name="ajsc.UserDefinedBeansDefService" level="WARN" />
-       <logger name="ajsc.LoggingConfigurationService" level="WARN" />
-       
-       <!-- AJSC related loggers (DME2 Registration, csi logging, restlet, servlet     logging) -->
-       <logger name="ajsc.utils" level="WARN" />
-       <logger name="ajsc.utils.DME2Helper" level="WARN" />
-       <logger name="ajsc.filters" level="WARN" />
-       <logger name="ajsc.beans.interceptors" level="WARN" />
-       <logger name="ajsc.restlet" level="WARN" />
-       <logger name="ajsc.servlet" level="WARN" />
-       <logger name="com.att.ajsc" level="WARN" />
-       
-       <!-- Other Loggers that may help troubleshoot -->
-       <logger name="net.sf" level="WARN" />
-       <logger name="org.apache.commons.httpclient" level="WARN" />
-       <logger name="org.apache.commons" level="WARN" />
-       <logger name="org.apache.coyote" level="WARN" />
-       <logger name="org.apache.jasper" level="WARN" />
-       
-       <!-- Camel Related Loggers (including restlet/servlet/jaxrs/cxf logging.        May aid in troubleshooting) -->
-       <logger name="org.apache.camel" level="WARN" />
-       <logger name="org.apache.cxf" level="WARN" />
-       <logger name="org.apache.camel.processor.interceptor" level="WARN" />
-       <logger name="org.apache.cxf.jaxrs.interceptor" level="WARN" />
-       <logger name="org.apache.cxf.service" level="WARN" />
-       <logger name="org.restlet" level="WARN" />
-       <logger name="org.apache.camel.component.restlet" level="WARN" />
-       
-       <!-- logback internals logging -->
-       <logger name="ch.qos.logback.classic" level="WARN" />
-       <logger name="ch.qos.logback.core" level="WARN" />
-       
-       <!-- logback jms appenders & loggers definition starts here -->
-       <appender name="auditLogs"      class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.ThresholdFilter"/>
-               <file>${logDirectory}/perf-audit/Audit-${lrmRVer}-${lrmRO}-${Pid}.log</file>
-               <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-                       <fileNamePattern>${logDirectory}/perf-audit/Audit-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip</fileNamePattern>
-                       <minIndex>1</minIndex>
-                       <maxIndex>9</maxIndex>
-               </rollingPolicy>
-               <triggeringPolicy       class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-                       <maxFileSize>5MB</maxFileSize>
-               </triggeringPolicy>
-               <encoder>
-                       <pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern>
-               </encoder>
-       </appender>
-       <appender name="perfLogs"       class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.ThresholdFilter"/>
-               <file>${logDirectory}/perf-audit/Perform-${lrmRVer}-${lrmRO}-${Pid}.log</file>
-               <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-                       <fileNamePattern>${logDirectory}/perf-audit/Perform-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip</fileNamePattern>
-                       <minIndex>1</minIndex>
-                       <maxIndex>9</maxIndex>
-               </rollingPolicy>
-               <triggeringPolicy       class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-                       <maxFileSize>5MB</maxFileSize>
-               </triggeringPolicy>
-               <encoder>
-                       <pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern>
-               </encoder>
-       </appender>
-<!--   <if condition='property("JMS_BROKER").contains("WMQ")'>
-               <then>
-                       <appender name="Audit-Record-Queue" class="ajsc.JMSQueueAppender">
-                               <param name="InitialContextFactoryName" value="${JMS_WMQ_INITIAL_CONNECTION_FACTORY_NAME}" />
-                               <param name="ProviderURL" value="${JMS_WMQ_PROVIDER_URL}" />
-                               <param name="DestinationName" value="${JMS_WMQ_AUDIT_DESTINATION_NAME}" />
-                               <param name="ConnectionFactoryName" value="${JMS_WMQ_CONNECTION_FACTORY_NAME}" />
-                       </appender>
-                       <appender name="Performance-Tracker-Queue" class="ajsc.JMSQueueAppender">
-                               <param name="InitialContextFactoryName" value="${JMS_WMQ_INITIAL_CONNECTION_FACTORY_NAME}" />
-                               <param name="ProviderURL" value="${JMS_WMQ_PROVIDER_URL}" />
-                               <param name="DestinationName" value="${JMS_WMQ_PERF_DESTINATION_NAME}" />
-                               <param name="ConnectionFactoryName" value="${JMS_WMQ_CONNECTION_FACTORY_NAME}" />
-                       </appender>
-               </then>
-               <else> -->
-                       <!-- logback jms appenders definition starts here -->
-<!--                   <appender name="Audit-Record-Queue" class="ajsc.JMSQueueAppender">
-                               <param name="InitialContextFactoryName" value="com.tibco.tibjms.naming.TibjmsInitialContextFactory" />
-                               <param name="ProviderURL" value="${JMS_TIBCO_PROVIDER_URL}" />
-                               <param name="userName" value="${JMS_LOGGER_USER_NAME}" />
-                               <param name="password" value="${JMS_LOGGER_PASSWORD}" />
-                               <QueueBindingName>${JMS_LOGGER_AUDIT_QUEUE_BINDING}</QueueBindingName>
-                       </appender>
-                       <appender name="Performance-Tracker-Queue" class="ajsc.JMSQueueAppender">
-                               <param name="InitialContextFactoryName" value="com.tibco.tibjms.naming.TibjmsInitialContextFactory" />
-                               <param name="ProviderURL" value="${JMS_TIBCO_PROVIDER_URL}" />
-                               <param name="userName" value="${JMS_LOGGER_USER_NAME}" />
-                               <param name="password" value="${JMS_LOGGER_PASSWORD}" />
-                               <QueueBindingName>${JMS_LOGGER_PERF_QUEUE_BINDING}</QueueBindingName>
-                       </appender>
-               </else>
-       </if> -->
-       <appender name="ASYNC-audit" class="ch.qos.logback.classic.AsyncAppender">
-               <queueSize>1000</queueSize>
-               <discardingThreshold>0</discardingThreshold>
-               <appender-ref ref="Audit-Record-Queue" />
-       </appender>
-       <logger name="AuditRecord" level="INFO" additivity="false">
-               <appender-ref ref="ASYNC-audit" />
-               <appender-ref ref="auditLogs" />
-       </logger>
-       <logger name="AuditRecord_DirectCall" level="INFO" additivity="false">
-               <appender-ref ref="ASYNC-audit" />
-               <appender-ref ref="auditLogs" />
-       </logger>
-       <appender name="ASYNC-perf" class="ch.qos.logback.classic.AsyncAppender">
-               <queueSize>1000</queueSize>
-               <discardingThreshold>0</discardingThreshold>
-               <appender-ref ref="Performance-Tracker-Queue" />
-       </appender>
-       <logger name="PerfTrackerRecord" level="INFO" additivity="false">
-               <appender-ref ref="ASYNC-perf" />
-               <appender-ref ref="perfLogs" />
-       </logger>
-       <!-- logback jms appenders & loggers definition ends here -->
-       
-       <logger name="org.openecomp.aai.dmaap" level="DEBUG" additivity="false">
-               <appender-ref ref="dmaapAAIWorkloadConsumer" />
-               <appender-ref ref="dmaapAAIWorkloadConsumerdebug" />
-               <appender-ref ref="dmaapAAIWorkloadConsumermetric" />
-       </logger>
-       
-       <logger name="org.openecomp.aai" level="INFO" additivity="false">
-               <appender-ref ref="asyncDEBUG" />
-               <appender-ref ref="asyncERROR" />
-               <appender-ref ref="asyncMETRIC" />
-       </logger>
-       <logger name="org.openecomp.aai.AUDITLOGGER" level="INFO" additivity="false">
-                       <appender-ref ref="asyncAUDIT" /> 
-    </logger>
-    
-       <logger name="org.apache" level="WARN" />
-       <logger name="org.zookeeper" level="WARN" />
-       <logger name="com.thinkaurelius" level="WARN" />
-       
-       <!-- ============================================================================ -->
-       <!-- General EELF logger -->
-       <!-- ============================================================================ -->
-       <logger name="com.att.eelf" level="WARN" additivity="false">
-               <appender-ref ref="asyncDEBUG" />
-               <appender-ref ref="asyncERROR" />
-               <appender-ref ref="asyncMETRIC" />
-               <appender-ref ref="asyncAUDIT" />
-       </logger>
-       
-       <root level="WARN">
-               <appender-ref ref="asyncDEBUG" />
-               <appender-ref ref="asyncERROR" />
-               <appender-ref ref="asyncMETRIC" />
-               <appender-ref ref="asyncAUDIT" />
-       </root>
-</configuration>
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/logback.xml.chef-20170515203837.834264 b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/logback.xml.chef-20170515203837.834264
deleted file mode 100755 (executable)
index 103f38f..0000000
+++ /dev/null
@@ -1,296 +0,0 @@
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-       <contextName>${module.ajsc.namespace.name}</contextName>
-       <jmxConfigurator />
-       <property name="logDirectory" value="${AJSC_HOME}/logs" />
-       
-       <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-               <filter class="ch.qos.logback.classic.filter.LevelFilter">
-                       <level>ERROR</level>
-                       <onMatch>ACCEPT</onMatch>
-                       <onMismatch>DENY</onMismatch>
-               </filter>
-               <encoder>
-                       <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n</pattern>
-               </encoder>
-       </appender>
-       
-       <appender name="METRIC" class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.LevelFilter">
-                       <level>INFO</level>
-                       <onMatch>ACCEPT</onMatch>
-                       <onMismatch>DENY</onMismatch>
-               </filter>
-               <file>${logDirectory}/rest/metrics.log</file>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/rest/metrics.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       <appender name="asyncMETRIC" class="ch.qos.logback.classic.AsyncAppender">
-               <queueSize>1000</queueSize>
-               <appender-ref ref="METRIC" />
-       </appender>
-       
-       <appender name="DEBUG"  class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.LevelFilter">
-                       <level>DEBUG</level>
-                       <onMatch>ACCEPT</onMatch>
-                       <onMismatch>DENY</onMismatch>
-               </filter>
-               <file>${logDirectory}/rest/debug.log</file>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/rest/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       <appender name="asyncDEBUG" class="ch.qos.logback.classic.AsyncAppender">
-               <queueSize>1000</queueSize>
-               <appender-ref ref="DEBUG" />
-       </appender>
-       
-       <appender name="ERROR"  class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-                       <level>WARN</level>
-               </filter>
-               <file>${logDirectory}/rest/error.log</file>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/rest/error.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       <appender name="asyncERROR" class="ch.qos.logback.classic.AsyncAppender">
-               <queueSize>1000</queueSize>
-               <appender-ref ref="ERROR" />
-       </appender>
-       
-       <appender name="AUDIT"  class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <file>${logDirectory}/rest/audit.log</file>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/rest/audit.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       <appender name="asyncAUDIT" class="ch.qos.logback.classic.AsyncAppender">
-               <queueSize>1000</queueSize>
-               <appender-ref ref="AUDIT" />
-       </appender>
-       
-       <appender name="dmaapAAIWorkloadConsumer"       class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-                       <level>WARN</level>
-               </filter>
-               <File>${logDirectory}/dmaapAAIWorkloadConsumer/error.log</File>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/dmaapAAIWorkloadConsumer/error.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       
-       <appender name="dmaapAAIWorkloadConsumerdebug"  class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.LevelFilter">
-                       <level>DEBUG</level>
-                       <onMatch>ACCEPT</onMatch>
-                       <onMismatch>DENY</onMismatch>
-               </filter>
-               <File>${logDirectory}/dmaapAAIWorkloadConsumer/debug.log</File>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/dmaapAAIWorkloadConsumer/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       <appender name="dmaapAAIWorkloadConsumermetric" class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.LevelFilter">
-                       <level>INFO</level>
-                       <onMatch>ACCEPT</onMatch>
-                       <onMismatch>DENY</onMismatch>
-               </filter>
-               <File>${logDirectory}/dmaapAAIWorkloadConsumer/metrics.log</File>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/dmaapAAIWorkloadConsumer/metrics.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       
-       <!-- Spring related loggers -->
-       <logger name="org.springframework" level="WARN" />
-       <logger name="org.springframework.beans" level="WARN" />
-       <logger name="org.springframework.web" level="WARN" />
-       <logger name="com.blog.spring.jms" level="WARN" />
-       
-       <!-- AJSC Services (bootstrap services) -->
-       <logger name="ajsc" level="WARN" />
-       <logger name="ajsc.RouteMgmtService" level="WARN" />
-       <logger name="ajsc.ComputeService" level="WARN" />
-       <logger name="ajsc.VandelayService" level="WARN" />
-       <logger name="ajsc.FilePersistenceService" level="WARN" />
-       <logger name="ajsc.UserDefinedJarService" level="WARN" />
-       <logger name="ajsc.UserDefinedBeansDefService" level="WARN" />
-       <logger name="ajsc.LoggingConfigurationService" level="WARN" />
-       
-       <!-- AJSC related loggers (DME2 Registration, csi logging, restlet, servlet     logging) -->
-       <logger name="ajsc.utils" level="WARN" />
-       <logger name="ajsc.utils.DME2Helper" level="WARN" />
-       <logger name="ajsc.filters" level="WARN" />
-       <logger name="ajsc.beans.interceptors" level="WARN" />
-       <logger name="ajsc.restlet" level="WARN" />
-       <logger name="ajsc.servlet" level="WARN" />
-       <logger name="com.att.ajsc" level="WARN" />
-       
-       <!-- Other Loggers that may help troubleshoot -->
-       <logger name="net.sf" level="WARN" />
-       <logger name="org.apache.commons.httpclient" level="WARN" />
-       <logger name="org.apache.commons" level="WARN" />
-       <logger name="org.apache.coyote" level="WARN" />
-       <logger name="org.apache.jasper" level="WARN" />
-       
-       <!-- Camel Related Loggers (including restlet/servlet/jaxrs/cxf logging.        May aid in troubleshooting) -->
-       <logger name="org.apache.camel" level="WARN" />
-       <logger name="org.apache.cxf" level="WARN" />
-       <logger name="org.apache.camel.processor.interceptor" level="WARN" />
-       <logger name="org.apache.cxf.jaxrs.interceptor" level="WARN" />
-       <logger name="org.apache.cxf.service" level="WARN" />
-       <logger name="org.restlet" level="WARN" />
-       <logger name="org.apache.camel.component.restlet" level="WARN" />
-       
-       <!-- logback internals logging -->
-       <logger name="ch.qos.logback.classic" level="WARN" />
-       <logger name="ch.qos.logback.core" level="WARN" />
-       
-       <!-- logback jms appenders & loggers definition starts here -->
-       <appender name="auditLogs"      class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.ThresholdFilter"/>
-               <file>${logDirectory}/perf-audit/Audit-${lrmRVer}-${lrmRO}-${Pid}.log</file>
-               <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-                       <fileNamePattern>${logDirectory}/perf-audit/Audit-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip</fileNamePattern>
-                       <minIndex>1</minIndex>
-                       <maxIndex>9</maxIndex>
-               </rollingPolicy>
-               <triggeringPolicy       class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-                       <maxFileSize>5MB</maxFileSize>
-               </triggeringPolicy>
-               <encoder>
-                       <pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern>
-               </encoder>
-       </appender>
-       <appender name="perfLogs"       class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.ThresholdFilter"/>
-               <file>${logDirectory}/perf-audit/Perform-${lrmRVer}-${lrmRO}-${Pid}.log</file>
-               <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-                       <fileNamePattern>${logDirectory}/perf-audit/Perform-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip</fileNamePattern>
-                       <minIndex>1</minIndex>
-                       <maxIndex>9</maxIndex>
-               </rollingPolicy>
-               <triggeringPolicy       class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-                       <maxFileSize>5MB</maxFileSize>
-               </triggeringPolicy>
-               <encoder>
-                       <pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern>
-               </encoder>
-       </appender>
-<!--   <if condition='property("JMS_BROKER").contains("WMQ")'>
-               <then>
-                       <appender name="Audit-Record-Queue" class="ajsc.JMSQueueAppender">
-                               <param name="InitialContextFactoryName" value="${JMS_WMQ_INITIAL_CONNECTION_FACTORY_NAME}" />
-                               <param name="ProviderURL" value="${JMS_WMQ_PROVIDER_URL}" />
-                               <param name="DestinationName" value="${JMS_WMQ_AUDIT_DESTINATION_NAME}" />
-                               <param name="ConnectionFactoryName" value="${JMS_WMQ_CONNECTION_FACTORY_NAME}" />
-                       </appender>
-                       <appender name="Performance-Tracker-Queue" class="ajsc.JMSQueueAppender">
-                               <param name="InitialContextFactoryName" value="${JMS_WMQ_INITIAL_CONNECTION_FACTORY_NAME}" />
-                               <param name="ProviderURL" value="${JMS_WMQ_PROVIDER_URL}" />
-                               <param name="DestinationName" value="${JMS_WMQ_PERF_DESTINATION_NAME}" />
-                               <param name="ConnectionFactoryName" value="${JMS_WMQ_CONNECTION_FACTORY_NAME}" />
-                       </appender>
-               </then>
-               <else> -->
-                       <!-- logback jms appenders definition starts here -->
-<!--                   <appender name="Audit-Record-Queue" class="ajsc.JMSQueueAppender">
-                               <param name="InitialContextFactoryName" value="com.tibco.tibjms.naming.TibjmsInitialContextFactory" />
-                               <param name="ProviderURL" value="${JMS_TIBCO_PROVIDER_URL}" />
-                               <param name="userName" value="${JMS_LOGGER_USER_NAME}" />
-                               <param name="password" value="${JMS_LOGGER_PASSWORD}" />
-                               <QueueBindingName>${JMS_LOGGER_AUDIT_QUEUE_BINDING}</QueueBindingName>
-                       </appender>
-                       <appender name="Performance-Tracker-Queue" class="ajsc.JMSQueueAppender">
-                               <param name="InitialContextFactoryName" value="com.tibco.tibjms.naming.TibjmsInitialContextFactory" />
-                               <param name="ProviderURL" value="${JMS_TIBCO_PROVIDER_URL}" />
-                               <param name="userName" value="${JMS_LOGGER_USER_NAME}" />
-                               <param name="password" value="${JMS_LOGGER_PASSWORD}" />
-                               <QueueBindingName>${JMS_LOGGER_PERF_QUEUE_BINDING}</QueueBindingName>
-                       </appender>
-               </else>
-       </if> -->
-       <appender name="ASYNC-audit" class="ch.qos.logback.classic.AsyncAppender">
-               <queueSize>1000</queueSize>
-               <discardingThreshold>0</discardingThreshold>
-               <appender-ref ref="Audit-Record-Queue" />
-       </appender>
-       <logger name="AuditRecord" level="INFO" additivity="false">
-               <appender-ref ref="ASYNC-audit" />
-               <appender-ref ref="auditLogs" />
-       </logger>
-       <logger name="AuditRecord_DirectCall" level="INFO" additivity="false">
-               <appender-ref ref="ASYNC-audit" />
-               <appender-ref ref="auditLogs" />
-       </logger>
-       <appender name="ASYNC-perf" class="ch.qos.logback.classic.AsyncAppender">
-               <queueSize>1000</queueSize>
-               <discardingThreshold>0</discardingThreshold>
-               <appender-ref ref="Performance-Tracker-Queue" />
-       </appender>
-       <logger name="PerfTrackerRecord" level="INFO" additivity="false">
-               <appender-ref ref="ASYNC-perf" />
-               <appender-ref ref="perfLogs" />
-       </logger>
-       <!-- logback jms appenders & loggers definition ends here -->
-       
-       <logger name="org.openecomp.aai.dmaap" level="DEBUG" additivity="false">
-               <appender-ref ref="dmaapAAIWorkloadConsumer" />
-               <appender-ref ref="dmaapAAIWorkloadConsumerdebug" />
-               <appender-ref ref="dmaapAAIWorkloadConsumermetric" />
-       </logger>
-       
-       <logger name="org.openecomp.aai" level="INFO" additivity="false">
-               <appender-ref ref="asyncDEBUG" />
-               <appender-ref ref="asyncERROR" />
-               <appender-ref ref="asyncMETRIC" />
-       </logger>
-       <logger name="org.openecomp.aai.AUDITLOGGER" level="INFO" additivity="false">
-                       <appender-ref ref="asyncAUDIT" /> 
-    </logger>
-    
-       <logger name="org.apache" level="WARN" />
-       <logger name="org.zookeeper" level="WARN" />
-       <logger name="com.thinkaurelius" level="WARN" />
-       
-       <!-- ============================================================================ -->
-       <!-- General EELF logger -->
-       <!-- ============================================================================ -->
-       <logger name="com.att.eelf" level="WARN" additivity="false">
-               <appender-ref ref="asyncDEBUG" />
-               <appender-ref ref="asyncERROR" />
-               <appender-ref ref="asyncMETRIC" />
-               <appender-ref ref="asyncAUDIT" />
-       </logger>
-       
-       <root level="WARN">
-               <appender-ref ref="asyncDEBUG" />
-               <appender-ref ref="asyncERROR" />
-               <appender-ref ref="asyncMETRIC" />
-               <appender-ref ref="asyncAUDIT" />
-       </root>
-</configuration>
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/logback.xml.chef-20170516140802.653662 b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/logback.xml.chef-20170516140802.653662
deleted file mode 100755 (executable)
index 103f38f..0000000
+++ /dev/null
@@ -1,296 +0,0 @@
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-       <contextName>${module.ajsc.namespace.name}</contextName>
-       <jmxConfigurator />
-       <property name="logDirectory" value="${AJSC_HOME}/logs" />
-       
-       <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-               <filter class="ch.qos.logback.classic.filter.LevelFilter">
-                       <level>ERROR</level>
-                       <onMatch>ACCEPT</onMatch>
-                       <onMismatch>DENY</onMismatch>
-               </filter>
-               <encoder>
-                       <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n</pattern>
-               </encoder>
-       </appender>
-       
-       <appender name="METRIC" class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.LevelFilter">
-                       <level>INFO</level>
-                       <onMatch>ACCEPT</onMatch>
-                       <onMismatch>DENY</onMismatch>
-               </filter>
-               <file>${logDirectory}/rest/metrics.log</file>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/rest/metrics.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       <appender name="asyncMETRIC" class="ch.qos.logback.classic.AsyncAppender">
-               <queueSize>1000</queueSize>
-               <appender-ref ref="METRIC" />
-       </appender>
-       
-       <appender name="DEBUG"  class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.LevelFilter">
-                       <level>DEBUG</level>
-                       <onMatch>ACCEPT</onMatch>
-                       <onMismatch>DENY</onMismatch>
-               </filter>
-               <file>${logDirectory}/rest/debug.log</file>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/rest/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       <appender name="asyncDEBUG" class="ch.qos.logback.classic.AsyncAppender">
-               <queueSize>1000</queueSize>
-               <appender-ref ref="DEBUG" />
-       </appender>
-       
-       <appender name="ERROR"  class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-                       <level>WARN</level>
-               </filter>
-               <file>${logDirectory}/rest/error.log</file>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/rest/error.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       <appender name="asyncERROR" class="ch.qos.logback.classic.AsyncAppender">
-               <queueSize>1000</queueSize>
-               <appender-ref ref="ERROR" />
-       </appender>
-       
-       <appender name="AUDIT"  class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <file>${logDirectory}/rest/audit.log</file>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/rest/audit.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       <appender name="asyncAUDIT" class="ch.qos.logback.classic.AsyncAppender">
-               <queueSize>1000</queueSize>
-               <appender-ref ref="AUDIT" />
-       </appender>
-       
-       <appender name="dmaapAAIWorkloadConsumer"       class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-                       <level>WARN</level>
-               </filter>
-               <File>${logDirectory}/dmaapAAIWorkloadConsumer/error.log</File>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/dmaapAAIWorkloadConsumer/error.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       
-       <appender name="dmaapAAIWorkloadConsumerdebug"  class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.LevelFilter">
-                       <level>DEBUG</level>
-                       <onMatch>ACCEPT</onMatch>
-                       <onMismatch>DENY</onMismatch>
-               </filter>
-               <File>${logDirectory}/dmaapAAIWorkloadConsumer/debug.log</File>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/dmaapAAIWorkloadConsumer/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       <appender name="dmaapAAIWorkloadConsumermetric" class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.LevelFilter">
-                       <level>INFO</level>
-                       <onMatch>ACCEPT</onMatch>
-                       <onMismatch>DENY</onMismatch>
-               </filter>
-               <File>${logDirectory}/dmaapAAIWorkloadConsumer/metrics.log</File>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/dmaapAAIWorkloadConsumer/metrics.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       
-       <!-- Spring related loggers -->
-       <logger name="org.springframework" level="WARN" />
-       <logger name="org.springframework.beans" level="WARN" />
-       <logger name="org.springframework.web" level="WARN" />
-       <logger name="com.blog.spring.jms" level="WARN" />
-       
-       <!-- AJSC Services (bootstrap services) -->
-       <logger name="ajsc" level="WARN" />
-       <logger name="ajsc.RouteMgmtService" level="WARN" />
-       <logger name="ajsc.ComputeService" level="WARN" />
-       <logger name="ajsc.VandelayService" level="WARN" />
-       <logger name="ajsc.FilePersistenceService" level="WARN" />
-       <logger name="ajsc.UserDefinedJarService" level="WARN" />
-       <logger name="ajsc.UserDefinedBeansDefService" level="WARN" />
-       <logger name="ajsc.LoggingConfigurationService" level="WARN" />
-       
-       <!-- AJSC related loggers (DME2 Registration, csi logging, restlet, servlet     logging) -->
-       <logger name="ajsc.utils" level="WARN" />
-       <logger name="ajsc.utils.DME2Helper" level="WARN" />
-       <logger name="ajsc.filters" level="WARN" />
-       <logger name="ajsc.beans.interceptors" level="WARN" />
-       <logger name="ajsc.restlet" level="WARN" />
-       <logger name="ajsc.servlet" level="WARN" />
-       <logger name="com.att.ajsc" level="WARN" />
-       
-       <!-- Other Loggers that may help troubleshoot -->
-       <logger name="net.sf" level="WARN" />
-       <logger name="org.apache.commons.httpclient" level="WARN" />
-       <logger name="org.apache.commons" level="WARN" />
-       <logger name="org.apache.coyote" level="WARN" />
-       <logger name="org.apache.jasper" level="WARN" />
-       
-       <!-- Camel Related Loggers (including restlet/servlet/jaxrs/cxf logging.        May aid in troubleshooting) -->
-       <logger name="org.apache.camel" level="WARN" />
-       <logger name="org.apache.cxf" level="WARN" />
-       <logger name="org.apache.camel.processor.interceptor" level="WARN" />
-       <logger name="org.apache.cxf.jaxrs.interceptor" level="WARN" />
-       <logger name="org.apache.cxf.service" level="WARN" />
-       <logger name="org.restlet" level="WARN" />
-       <logger name="org.apache.camel.component.restlet" level="WARN" />
-       
-       <!-- logback internals logging -->
-       <logger name="ch.qos.logback.classic" level="WARN" />
-       <logger name="ch.qos.logback.core" level="WARN" />
-       
-       <!-- logback jms appenders & loggers definition starts here -->
-       <appender name="auditLogs"      class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.ThresholdFilter"/>
-               <file>${logDirectory}/perf-audit/Audit-${lrmRVer}-${lrmRO}-${Pid}.log</file>
-               <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-                       <fileNamePattern>${logDirectory}/perf-audit/Audit-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip</fileNamePattern>
-                       <minIndex>1</minIndex>
-                       <maxIndex>9</maxIndex>
-               </rollingPolicy>
-               <triggeringPolicy       class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-                       <maxFileSize>5MB</maxFileSize>
-               </triggeringPolicy>
-               <encoder>
-                       <pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern>
-               </encoder>
-       </appender>
-       <appender name="perfLogs"       class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.ThresholdFilter"/>
-               <file>${logDirectory}/perf-audit/Perform-${lrmRVer}-${lrmRO}-${Pid}.log</file>
-               <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-                       <fileNamePattern>${logDirectory}/perf-audit/Perform-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip</fileNamePattern>
-                       <minIndex>1</minIndex>
-                       <maxIndex>9</maxIndex>
-               </rollingPolicy>
-               <triggeringPolicy       class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-                       <maxFileSize>5MB</maxFileSize>
-               </triggeringPolicy>
-               <encoder>
-                       <pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern>
-               </encoder>
-       </appender>
-<!--   <if condition='property("JMS_BROKER").contains("WMQ")'>
-               <then>
-                       <appender name="Audit-Record-Queue" class="ajsc.JMSQueueAppender">
-                               <param name="InitialContextFactoryName" value="${JMS_WMQ_INITIAL_CONNECTION_FACTORY_NAME}" />
-                               <param name="ProviderURL" value="${JMS_WMQ_PROVIDER_URL}" />
-                               <param name="DestinationName" value="${JMS_WMQ_AUDIT_DESTINATION_NAME}" />
-                               <param name="ConnectionFactoryName" value="${JMS_WMQ_CONNECTION_FACTORY_NAME}" />
-                       </appender>
-                       <appender name="Performance-Tracker-Queue" class="ajsc.JMSQueueAppender">
-                               <param name="InitialContextFactoryName" value="${JMS_WMQ_INITIAL_CONNECTION_FACTORY_NAME}" />
-                               <param name="ProviderURL" value="${JMS_WMQ_PROVIDER_URL}" />
-                               <param name="DestinationName" value="${JMS_WMQ_PERF_DESTINATION_NAME}" />
-                               <param name="ConnectionFactoryName" value="${JMS_WMQ_CONNECTION_FACTORY_NAME}" />
-                       </appender>
-               </then>
-               <else> -->
-                       <!-- logback jms appenders definition starts here -->
-<!--                   <appender name="Audit-Record-Queue" class="ajsc.JMSQueueAppender">
-                               <param name="InitialContextFactoryName" value="com.tibco.tibjms.naming.TibjmsInitialContextFactory" />
-                               <param name="ProviderURL" value="${JMS_TIBCO_PROVIDER_URL}" />
-                               <param name="userName" value="${JMS_LOGGER_USER_NAME}" />
-                               <param name="password" value="${JMS_LOGGER_PASSWORD}" />
-                               <QueueBindingName>${JMS_LOGGER_AUDIT_QUEUE_BINDING}</QueueBindingName>
-                       </appender>
-                       <appender name="Performance-Tracker-Queue" class="ajsc.JMSQueueAppender">
-                               <param name="InitialContextFactoryName" value="com.tibco.tibjms.naming.TibjmsInitialContextFactory" />
-                               <param name="ProviderURL" value="${JMS_TIBCO_PROVIDER_URL}" />
-                               <param name="userName" value="${JMS_LOGGER_USER_NAME}" />
-                               <param name="password" value="${JMS_LOGGER_PASSWORD}" />
-                               <QueueBindingName>${JMS_LOGGER_PERF_QUEUE_BINDING}</QueueBindingName>
-                       </appender>
-               </else>
-       </if> -->
-       <appender name="ASYNC-audit" class="ch.qos.logback.classic.AsyncAppender">
-               <queueSize>1000</queueSize>
-               <discardingThreshold>0</discardingThreshold>
-               <appender-ref ref="Audit-Record-Queue" />
-       </appender>
-       <logger name="AuditRecord" level="INFO" additivity="false">
-               <appender-ref ref="ASYNC-audit" />
-               <appender-ref ref="auditLogs" />
-       </logger>
-       <logger name="AuditRecord_DirectCall" level="INFO" additivity="false">
-               <appender-ref ref="ASYNC-audit" />
-               <appender-ref ref="auditLogs" />
-       </logger>
-       <appender name="ASYNC-perf" class="ch.qos.logback.classic.AsyncAppender">
-               <queueSize>1000</queueSize>
-               <discardingThreshold>0</discardingThreshold>
-               <appender-ref ref="Performance-Tracker-Queue" />
-       </appender>
-       <logger name="PerfTrackerRecord" level="INFO" additivity="false">
-               <appender-ref ref="ASYNC-perf" />
-               <appender-ref ref="perfLogs" />
-       </logger>
-       <!-- logback jms appenders & loggers definition ends here -->
-       
-       <logger name="org.openecomp.aai.dmaap" level="DEBUG" additivity="false">
-               <appender-ref ref="dmaapAAIWorkloadConsumer" />
-               <appender-ref ref="dmaapAAIWorkloadConsumerdebug" />
-               <appender-ref ref="dmaapAAIWorkloadConsumermetric" />
-       </logger>
-       
-       <logger name="org.openecomp.aai" level="INFO" additivity="false">
-               <appender-ref ref="asyncDEBUG" />
-               <appender-ref ref="asyncERROR" />
-               <appender-ref ref="asyncMETRIC" />
-       </logger>
-       <logger name="org.openecomp.aai.AUDITLOGGER" level="INFO" additivity="false">
-                       <appender-ref ref="asyncAUDIT" /> 
-    </logger>
-    
-       <logger name="org.apache" level="WARN" />
-       <logger name="org.zookeeper" level="WARN" />
-       <logger name="com.thinkaurelius" level="WARN" />
-       
-       <!-- ============================================================================ -->
-       <!-- General EELF logger -->
-       <!-- ============================================================================ -->
-       <logger name="com.att.eelf" level="WARN" additivity="false">
-               <appender-ref ref="asyncDEBUG" />
-               <appender-ref ref="asyncERROR" />
-               <appender-ref ref="asyncMETRIC" />
-               <appender-ref ref="asyncAUDIT" />
-       </logger>
-       
-       <root level="WARN">
-               <appender-ref ref="asyncDEBUG" />
-               <appender-ref ref="asyncERROR" />
-               <appender-ref ref="asyncMETRIC" />
-               <appender-ref ref="asyncAUDIT" />
-       </root>
-</configuration>
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/logback.xml.chef-20170517001516.659345 b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/logback.xml.chef-20170517001516.659345
deleted file mode 100755 (executable)
index 103f38f..0000000
+++ /dev/null
@@ -1,296 +0,0 @@
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-       <contextName>${module.ajsc.namespace.name}</contextName>
-       <jmxConfigurator />
-       <property name="logDirectory" value="${AJSC_HOME}/logs" />
-       
-       <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-               <filter class="ch.qos.logback.classic.filter.LevelFilter">
-                       <level>ERROR</level>
-                       <onMatch>ACCEPT</onMatch>
-                       <onMismatch>DENY</onMismatch>
-               </filter>
-               <encoder>
-                       <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n</pattern>
-               </encoder>
-       </appender>
-       
-       <appender name="METRIC" class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.LevelFilter">
-                       <level>INFO</level>
-                       <onMatch>ACCEPT</onMatch>
-                       <onMismatch>DENY</onMismatch>
-               </filter>
-               <file>${logDirectory}/rest/metrics.log</file>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/rest/metrics.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       <appender name="asyncMETRIC" class="ch.qos.logback.classic.AsyncAppender">
-               <queueSize>1000</queueSize>
-               <appender-ref ref="METRIC" />
-       </appender>
-       
-       <appender name="DEBUG"  class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.LevelFilter">
-                       <level>DEBUG</level>
-                       <onMatch>ACCEPT</onMatch>
-                       <onMismatch>DENY</onMismatch>
-               </filter>
-               <file>${logDirectory}/rest/debug.log</file>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/rest/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       <appender name="asyncDEBUG" class="ch.qos.logback.classic.AsyncAppender">
-               <queueSize>1000</queueSize>
-               <appender-ref ref="DEBUG" />
-       </appender>
-       
-       <appender name="ERROR"  class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-                       <level>WARN</level>
-               </filter>
-               <file>${logDirectory}/rest/error.log</file>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/rest/error.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       <appender name="asyncERROR" class="ch.qos.logback.classic.AsyncAppender">
-               <queueSize>1000</queueSize>
-               <appender-ref ref="ERROR" />
-       </appender>
-       
-       <appender name="AUDIT"  class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <file>${logDirectory}/rest/audit.log</file>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/rest/audit.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       <appender name="asyncAUDIT" class="ch.qos.logback.classic.AsyncAppender">
-               <queueSize>1000</queueSize>
-               <appender-ref ref="AUDIT" />
-       </appender>
-       
-       <appender name="dmaapAAIWorkloadConsumer"       class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-                       <level>WARN</level>
-               </filter>
-               <File>${logDirectory}/dmaapAAIWorkloadConsumer/error.log</File>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/dmaapAAIWorkloadConsumer/error.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       
-       <appender name="dmaapAAIWorkloadConsumerdebug"  class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.LevelFilter">
-                       <level>DEBUG</level>
-                       <onMatch>ACCEPT</onMatch>
-                       <onMismatch>DENY</onMismatch>
-               </filter>
-               <File>${logDirectory}/dmaapAAIWorkloadConsumer/debug.log</File>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/dmaapAAIWorkloadConsumer/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       <appender name="dmaapAAIWorkloadConsumermetric" class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.LevelFilter">
-                       <level>INFO</level>
-                       <onMatch>ACCEPT</onMatch>
-                       <onMismatch>DENY</onMismatch>
-               </filter>
-               <File>${logDirectory}/dmaapAAIWorkloadConsumer/metrics.log</File>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/dmaapAAIWorkloadConsumer/metrics.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       
-       <!-- Spring related loggers -->
-       <logger name="org.springframework" level="WARN" />
-       <logger name="org.springframework.beans" level="WARN" />
-       <logger name="org.springframework.web" level="WARN" />
-       <logger name="com.blog.spring.jms" level="WARN" />
-       
-       <!-- AJSC Services (bootstrap services) -->
-       <logger name="ajsc" level="WARN" />
-       <logger name="ajsc.RouteMgmtService" level="WARN" />
-       <logger name="ajsc.ComputeService" level="WARN" />
-       <logger name="ajsc.VandelayService" level="WARN" />
-       <logger name="ajsc.FilePersistenceService" level="WARN" />
-       <logger name="ajsc.UserDefinedJarService" level="WARN" />
-       <logger name="ajsc.UserDefinedBeansDefService" level="WARN" />
-       <logger name="ajsc.LoggingConfigurationService" level="WARN" />
-       
-       <!-- AJSC related loggers (DME2 Registration, csi logging, restlet, servlet     logging) -->
-       <logger name="ajsc.utils" level="WARN" />
-       <logger name="ajsc.utils.DME2Helper" level="WARN" />
-       <logger name="ajsc.filters" level="WARN" />
-       <logger name="ajsc.beans.interceptors" level="WARN" />
-       <logger name="ajsc.restlet" level="WARN" />
-       <logger name="ajsc.servlet" level="WARN" />
-       <logger name="com.att.ajsc" level="WARN" />
-       
-       <!-- Other Loggers that may help troubleshoot -->
-       <logger name="net.sf" level="WARN" />
-       <logger name="org.apache.commons.httpclient" level="WARN" />
-       <logger name="org.apache.commons" level="WARN" />
-       <logger name="org.apache.coyote" level="WARN" />
-       <logger name="org.apache.jasper" level="WARN" />
-       
-       <!-- Camel Related Loggers (including restlet/servlet/jaxrs/cxf logging.        May aid in troubleshooting) -->
-       <logger name="org.apache.camel" level="WARN" />
-       <logger name="org.apache.cxf" level="WARN" />
-       <logger name="org.apache.camel.processor.interceptor" level="WARN" />
-       <logger name="org.apache.cxf.jaxrs.interceptor" level="WARN" />
-       <logger name="org.apache.cxf.service" level="WARN" />
-       <logger name="org.restlet" level="WARN" />
-       <logger name="org.apache.camel.component.restlet" level="WARN" />
-       
-       <!-- logback internals logging -->
-       <logger name="ch.qos.logback.classic" level="WARN" />
-       <logger name="ch.qos.logback.core" level="WARN" />
-       
-       <!-- logback jms appenders & loggers definition starts here -->
-       <appender name="auditLogs"      class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.ThresholdFilter"/>
-               <file>${logDirectory}/perf-audit/Audit-${lrmRVer}-${lrmRO}-${Pid}.log</file>
-               <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-                       <fileNamePattern>${logDirectory}/perf-audit/Audit-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip</fileNamePattern>
-                       <minIndex>1</minIndex>
-                       <maxIndex>9</maxIndex>
-               </rollingPolicy>
-               <triggeringPolicy       class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-                       <maxFileSize>5MB</maxFileSize>
-               </triggeringPolicy>
-               <encoder>
-                       <pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern>
-               </encoder>
-       </appender>
-       <appender name="perfLogs"       class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.ThresholdFilter"/>
-               <file>${logDirectory}/perf-audit/Perform-${lrmRVer}-${lrmRO}-${Pid}.log</file>
-               <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-                       <fileNamePattern>${logDirectory}/perf-audit/Perform-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip</fileNamePattern>
-                       <minIndex>1</minIndex>
-                       <maxIndex>9</maxIndex>
-               </rollingPolicy>
-               <triggeringPolicy       class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-                       <maxFileSize>5MB</maxFileSize>
-               </triggeringPolicy>
-               <encoder>
-                       <pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern>
-               </encoder>
-       </appender>
-<!--   <if condition='property("JMS_BROKER").contains("WMQ")'>
-               <then>
-                       <appender name="Audit-Record-Queue" class="ajsc.JMSQueueAppender">
-                               <param name="InitialContextFactoryName" value="${JMS_WMQ_INITIAL_CONNECTION_FACTORY_NAME}" />
-                               <param name="ProviderURL" value="${JMS_WMQ_PROVIDER_URL}" />
-                               <param name="DestinationName" value="${JMS_WMQ_AUDIT_DESTINATION_NAME}" />
-                               <param name="ConnectionFactoryName" value="${JMS_WMQ_CONNECTION_FACTORY_NAME}" />
-                       </appender>
-                       <appender name="Performance-Tracker-Queue" class="ajsc.JMSQueueAppender">
-                               <param name="InitialContextFactoryName" value="${JMS_WMQ_INITIAL_CONNECTION_FACTORY_NAME}" />
-                               <param name="ProviderURL" value="${JMS_WMQ_PROVIDER_URL}" />
-                               <param name="DestinationName" value="${JMS_WMQ_PERF_DESTINATION_NAME}" />
-                               <param name="ConnectionFactoryName" value="${JMS_WMQ_CONNECTION_FACTORY_NAME}" />
-                       </appender>
-               </then>
-               <else> -->
-                       <!-- logback jms appenders definition starts here -->
-<!--                   <appender name="Audit-Record-Queue" class="ajsc.JMSQueueAppender">
-                               <param name="InitialContextFactoryName" value="com.tibco.tibjms.naming.TibjmsInitialContextFactory" />
-                               <param name="ProviderURL" value="${JMS_TIBCO_PROVIDER_URL}" />
-                               <param name="userName" value="${JMS_LOGGER_USER_NAME}" />
-                               <param name="password" value="${JMS_LOGGER_PASSWORD}" />
-                               <QueueBindingName>${JMS_LOGGER_AUDIT_QUEUE_BINDING}</QueueBindingName>
-                       </appender>
-                       <appender name="Performance-Tracker-Queue" class="ajsc.JMSQueueAppender">
-                               <param name="InitialContextFactoryName" value="com.tibco.tibjms.naming.TibjmsInitialContextFactory" />
-                               <param name="ProviderURL" value="${JMS_TIBCO_PROVIDER_URL}" />
-                               <param name="userName" value="${JMS_LOGGER_USER_NAME}" />
-                               <param name="password" value="${JMS_LOGGER_PASSWORD}" />
-                               <QueueBindingName>${JMS_LOGGER_PERF_QUEUE_BINDING}</QueueBindingName>
-                       </appender>
-               </else>
-       </if> -->
-       <appender name="ASYNC-audit" class="ch.qos.logback.classic.AsyncAppender">
-               <queueSize>1000</queueSize>
-               <discardingThreshold>0</discardingThreshold>
-               <appender-ref ref="Audit-Record-Queue" />
-       </appender>
-       <logger name="AuditRecord" level="INFO" additivity="false">
-               <appender-ref ref="ASYNC-audit" />
-               <appender-ref ref="auditLogs" />
-       </logger>
-       <logger name="AuditRecord_DirectCall" level="INFO" additivity="false">
-               <appender-ref ref="ASYNC-audit" />
-               <appender-ref ref="auditLogs" />
-       </logger>
-       <appender name="ASYNC-perf" class="ch.qos.logback.classic.AsyncAppender">
-               <queueSize>1000</queueSize>
-               <discardingThreshold>0</discardingThreshold>
-               <appender-ref ref="Performance-Tracker-Queue" />
-       </appender>
-       <logger name="PerfTrackerRecord" level="INFO" additivity="false">
-               <appender-ref ref="ASYNC-perf" />
-               <appender-ref ref="perfLogs" />
-       </logger>
-       <!-- logback jms appenders & loggers definition ends here -->
-       
-       <logger name="org.openecomp.aai.dmaap" level="DEBUG" additivity="false">
-               <appender-ref ref="dmaapAAIWorkloadConsumer" />
-               <appender-ref ref="dmaapAAIWorkloadConsumerdebug" />
-               <appender-ref ref="dmaapAAIWorkloadConsumermetric" />
-       </logger>
-       
-       <logger name="org.openecomp.aai" level="INFO" additivity="false">
-               <appender-ref ref="asyncDEBUG" />
-               <appender-ref ref="asyncERROR" />
-               <appender-ref ref="asyncMETRIC" />
-       </logger>
-       <logger name="org.openecomp.aai.AUDITLOGGER" level="INFO" additivity="false">
-                       <appender-ref ref="asyncAUDIT" /> 
-    </logger>
-    
-       <logger name="org.apache" level="WARN" />
-       <logger name="org.zookeeper" level="WARN" />
-       <logger name="com.thinkaurelius" level="WARN" />
-       
-       <!-- ============================================================================ -->
-       <!-- General EELF logger -->
-       <!-- ============================================================================ -->
-       <logger name="com.att.eelf" level="WARN" additivity="false">
-               <appender-ref ref="asyncDEBUG" />
-               <appender-ref ref="asyncERROR" />
-               <appender-ref ref="asyncMETRIC" />
-               <appender-ref ref="asyncAUDIT" />
-       </logger>
-       
-       <root level="WARN">
-               <appender-ref ref="asyncDEBUG" />
-               <appender-ref ref="asyncERROR" />
-               <appender-ref ref="asyncMETRIC" />
-               <appender-ref ref="asyncAUDIT" />
-       </root>
-</configuration>
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/logback.xml.chef-20170525061506.717614 b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/backup/opt/app/aai/bundleconfig/etc/logback.xml.chef-20170525061506.717614
deleted file mode 100644 (file)
index 103f38f..0000000
+++ /dev/null
@@ -1,296 +0,0 @@
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-       <contextName>${module.ajsc.namespace.name}</contextName>
-       <jmxConfigurator />
-       <property name="logDirectory" value="${AJSC_HOME}/logs" />
-       
-       <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-               <filter class="ch.qos.logback.classic.filter.LevelFilter">
-                       <level>ERROR</level>
-                       <onMatch>ACCEPT</onMatch>
-                       <onMismatch>DENY</onMismatch>
-               </filter>
-               <encoder>
-                       <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n</pattern>
-               </encoder>
-       </appender>
-       
-       <appender name="METRIC" class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.LevelFilter">
-                       <level>INFO</level>
-                       <onMatch>ACCEPT</onMatch>
-                       <onMismatch>DENY</onMismatch>
-               </filter>
-               <file>${logDirectory}/rest/metrics.log</file>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/rest/metrics.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       <appender name="asyncMETRIC" class="ch.qos.logback.classic.AsyncAppender">
-               <queueSize>1000</queueSize>
-               <appender-ref ref="METRIC" />
-       </appender>
-       
-       <appender name="DEBUG"  class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.LevelFilter">
-                       <level>DEBUG</level>
-                       <onMatch>ACCEPT</onMatch>
-                       <onMismatch>DENY</onMismatch>
-               </filter>
-               <file>${logDirectory}/rest/debug.log</file>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/rest/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       <appender name="asyncDEBUG" class="ch.qos.logback.classic.AsyncAppender">
-               <queueSize>1000</queueSize>
-               <appender-ref ref="DEBUG" />
-       </appender>
-       
-       <appender name="ERROR"  class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-                       <level>WARN</level>
-               </filter>
-               <file>${logDirectory}/rest/error.log</file>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/rest/error.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       <appender name="asyncERROR" class="ch.qos.logback.classic.AsyncAppender">
-               <queueSize>1000</queueSize>
-               <appender-ref ref="ERROR" />
-       </appender>
-       
-       <appender name="AUDIT"  class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <file>${logDirectory}/rest/audit.log</file>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/rest/audit.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       <appender name="asyncAUDIT" class="ch.qos.logback.classic.AsyncAppender">
-               <queueSize>1000</queueSize>
-               <appender-ref ref="AUDIT" />
-       </appender>
-       
-       <appender name="dmaapAAIWorkloadConsumer"       class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-                       <level>WARN</level>
-               </filter>
-               <File>${logDirectory}/dmaapAAIWorkloadConsumer/error.log</File>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/dmaapAAIWorkloadConsumer/error.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       
-       <appender name="dmaapAAIWorkloadConsumerdebug"  class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.LevelFilter">
-                       <level>DEBUG</level>
-                       <onMatch>ACCEPT</onMatch>
-                       <onMismatch>DENY</onMismatch>
-               </filter>
-               <File>${logDirectory}/dmaapAAIWorkloadConsumer/debug.log</File>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/dmaapAAIWorkloadConsumer/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       <appender name="dmaapAAIWorkloadConsumermetric" class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.LevelFilter">
-                       <level>INFO</level>
-                       <onMatch>ACCEPT</onMatch>
-                       <onMismatch>DENY</onMismatch>
-               </filter>
-               <File>${logDirectory}/dmaapAAIWorkloadConsumer/metrics.log</File>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/dmaapAAIWorkloadConsumer/metrics.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       
-       <!-- Spring related loggers -->
-       <logger name="org.springframework" level="WARN" />
-       <logger name="org.springframework.beans" level="WARN" />
-       <logger name="org.springframework.web" level="WARN" />
-       <logger name="com.blog.spring.jms" level="WARN" />
-       
-       <!-- AJSC Services (bootstrap services) -->
-       <logger name="ajsc" level="WARN" />
-       <logger name="ajsc.RouteMgmtService" level="WARN" />
-       <logger name="ajsc.ComputeService" level="WARN" />
-       <logger name="ajsc.VandelayService" level="WARN" />
-       <logger name="ajsc.FilePersistenceService" level="WARN" />
-       <logger name="ajsc.UserDefinedJarService" level="WARN" />
-       <logger name="ajsc.UserDefinedBeansDefService" level="WARN" />
-       <logger name="ajsc.LoggingConfigurationService" level="WARN" />
-       
-       <!-- AJSC related loggers (DME2 Registration, csi logging, restlet, servlet     logging) -->
-       <logger name="ajsc.utils" level="WARN" />
-       <logger name="ajsc.utils.DME2Helper" level="WARN" />
-       <logger name="ajsc.filters" level="WARN" />
-       <logger name="ajsc.beans.interceptors" level="WARN" />
-       <logger name="ajsc.restlet" level="WARN" />
-       <logger name="ajsc.servlet" level="WARN" />
-       <logger name="com.att.ajsc" level="WARN" />
-       
-       <!-- Other Loggers that may help troubleshoot -->
-       <logger name="net.sf" level="WARN" />
-       <logger name="org.apache.commons.httpclient" level="WARN" />
-       <logger name="org.apache.commons" level="WARN" />
-       <logger name="org.apache.coyote" level="WARN" />
-       <logger name="org.apache.jasper" level="WARN" />
-       
-       <!-- Camel Related Loggers (including restlet/servlet/jaxrs/cxf logging.        May aid in troubleshooting) -->
-       <logger name="org.apache.camel" level="WARN" />
-       <logger name="org.apache.cxf" level="WARN" />
-       <logger name="org.apache.camel.processor.interceptor" level="WARN" />
-       <logger name="org.apache.cxf.jaxrs.interceptor" level="WARN" />
-       <logger name="org.apache.cxf.service" level="WARN" />
-       <logger name="org.restlet" level="WARN" />
-       <logger name="org.apache.camel.component.restlet" level="WARN" />
-       
-       <!-- logback internals logging -->
-       <logger name="ch.qos.logback.classic" level="WARN" />
-       <logger name="ch.qos.logback.core" level="WARN" />
-       
-       <!-- logback jms appenders & loggers definition starts here -->
-       <appender name="auditLogs"      class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.ThresholdFilter"/>
-               <file>${logDirectory}/perf-audit/Audit-${lrmRVer}-${lrmRO}-${Pid}.log</file>
-               <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-                       <fileNamePattern>${logDirectory}/perf-audit/Audit-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip</fileNamePattern>
-                       <minIndex>1</minIndex>
-                       <maxIndex>9</maxIndex>
-               </rollingPolicy>
-               <triggeringPolicy       class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-                       <maxFileSize>5MB</maxFileSize>
-               </triggeringPolicy>
-               <encoder>
-                       <pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern>
-               </encoder>
-       </appender>
-       <appender name="perfLogs"       class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.ThresholdFilter"/>
-               <file>${logDirectory}/perf-audit/Perform-${lrmRVer}-${lrmRO}-${Pid}.log</file>
-               <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-                       <fileNamePattern>${logDirectory}/perf-audit/Perform-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip</fileNamePattern>
-                       <minIndex>1</minIndex>
-                       <maxIndex>9</maxIndex>
-               </rollingPolicy>
-               <triggeringPolicy       class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-                       <maxFileSize>5MB</maxFileSize>
-               </triggeringPolicy>
-               <encoder>
-                       <pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern>
-               </encoder>
-       </appender>
-<!--   <if condition='property("JMS_BROKER").contains("WMQ")'>
-               <then>
-                       <appender name="Audit-Record-Queue" class="ajsc.JMSQueueAppender">
-                               <param name="InitialContextFactoryName" value="${JMS_WMQ_INITIAL_CONNECTION_FACTORY_NAME}" />
-                               <param name="ProviderURL" value="${JMS_WMQ_PROVIDER_URL}" />
-                               <param name="DestinationName" value="${JMS_WMQ_AUDIT_DESTINATION_NAME}" />
-                               <param name="ConnectionFactoryName" value="${JMS_WMQ_CONNECTION_FACTORY_NAME}" />
-                       </appender>
-                       <appender name="Performance-Tracker-Queue" class="ajsc.JMSQueueAppender">
-                               <param name="InitialContextFactoryName" value="${JMS_WMQ_INITIAL_CONNECTION_FACTORY_NAME}" />
-                               <param name="ProviderURL" value="${JMS_WMQ_PROVIDER_URL}" />
-                               <param name="DestinationName" value="${JMS_WMQ_PERF_DESTINATION_NAME}" />
-                               <param name="ConnectionFactoryName" value="${JMS_WMQ_CONNECTION_FACTORY_NAME}" />
-                       </appender>
-               </then>
-               <else> -->
-                       <!-- logback jms appenders definition starts here -->
-<!--                   <appender name="Audit-Record-Queue" class="ajsc.JMSQueueAppender">
-                               <param name="InitialContextFactoryName" value="com.tibco.tibjms.naming.TibjmsInitialContextFactory" />
-                               <param name="ProviderURL" value="${JMS_TIBCO_PROVIDER_URL}" />
-                               <param name="userName" value="${JMS_LOGGER_USER_NAME}" />
-                               <param name="password" value="${JMS_LOGGER_PASSWORD}" />
-                               <QueueBindingName>${JMS_LOGGER_AUDIT_QUEUE_BINDING}</QueueBindingName>
-                       </appender>
-                       <appender name="Performance-Tracker-Queue" class="ajsc.JMSQueueAppender">
-                               <param name="InitialContextFactoryName" value="com.tibco.tibjms.naming.TibjmsInitialContextFactory" />
-                               <param name="ProviderURL" value="${JMS_TIBCO_PROVIDER_URL}" />
-                               <param name="userName" value="${JMS_LOGGER_USER_NAME}" />
-                               <param name="password" value="${JMS_LOGGER_PASSWORD}" />
-                               <QueueBindingName>${JMS_LOGGER_PERF_QUEUE_BINDING}</QueueBindingName>
-                       </appender>
-               </else>
-       </if> -->
-       <appender name="ASYNC-audit" class="ch.qos.logback.classic.AsyncAppender">
-               <queueSize>1000</queueSize>
-               <discardingThreshold>0</discardingThreshold>
-               <appender-ref ref="Audit-Record-Queue" />
-       </appender>
-       <logger name="AuditRecord" level="INFO" additivity="false">
-               <appender-ref ref="ASYNC-audit" />
-               <appender-ref ref="auditLogs" />
-       </logger>
-       <logger name="AuditRecord_DirectCall" level="INFO" additivity="false">
-               <appender-ref ref="ASYNC-audit" />
-               <appender-ref ref="auditLogs" />
-       </logger>
-       <appender name="ASYNC-perf" class="ch.qos.logback.classic.AsyncAppender">
-               <queueSize>1000</queueSize>
-               <discardingThreshold>0</discardingThreshold>
-               <appender-ref ref="Performance-Tracker-Queue" />
-       </appender>
-       <logger name="PerfTrackerRecord" level="INFO" additivity="false">
-               <appender-ref ref="ASYNC-perf" />
-               <appender-ref ref="perfLogs" />
-       </logger>
-       <!-- logback jms appenders & loggers definition ends here -->
-       
-       <logger name="org.openecomp.aai.dmaap" level="DEBUG" additivity="false">
-               <appender-ref ref="dmaapAAIWorkloadConsumer" />
-               <appender-ref ref="dmaapAAIWorkloadConsumerdebug" />
-               <appender-ref ref="dmaapAAIWorkloadConsumermetric" />
-       </logger>
-       
-       <logger name="org.openecomp.aai" level="INFO" additivity="false">
-               <appender-ref ref="asyncDEBUG" />
-               <appender-ref ref="asyncERROR" />
-               <appender-ref ref="asyncMETRIC" />
-       </logger>
-       <logger name="org.openecomp.aai.AUDITLOGGER" level="INFO" additivity="false">
-                       <appender-ref ref="asyncAUDIT" /> 
-    </logger>
-    
-       <logger name="org.apache" level="WARN" />
-       <logger name="org.zookeeper" level="WARN" />
-       <logger name="com.thinkaurelius" level="WARN" />
-       
-       <!-- ============================================================================ -->
-       <!-- General EELF logger -->
-       <!-- ============================================================================ -->
-       <logger name="com.att.eelf" level="WARN" additivity="false">
-               <appender-ref ref="asyncDEBUG" />
-               <appender-ref ref="asyncERROR" />
-               <appender-ref ref="asyncMETRIC" />
-               <appender-ref ref="asyncAUDIT" />
-       </logger>
-       
-       <root level="WARN">
-               <appender-ref ref="asyncDEBUG" />
-               <appender-ref ref="asyncERROR" />
-               <appender-ref ref="asyncMETRIC" />
-               <appender-ref ref="asyncAUDIT" />
-       </root>
-</configuration>
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/chef-client-running.pid b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/chef-client-running.pid
deleted file mode 100755 (executable)
index 368f89c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-28
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-auth/files/default/aai_keystore-int b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-auth/files/default/aai_keystore-int
deleted file mode 100755 (executable)
index 3eef135..0000000
Binary files a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-auth/files/default/aai_keystore-int and /dev/null differ
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-auth/files/default/aai_keystore-local b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-auth/files/default/aai_keystore-local
deleted file mode 100755 (executable)
index 3eef135..0000000
Binary files a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-auth/files/default/aai_keystore-local and /dev/null differ
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-auth/files/default/aai_keystore-simpledemo b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-auth/files/default/aai_keystore-simpledemo
deleted file mode 100755 (executable)
index 3eef135..0000000
Binary files a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-auth/files/default/aai_keystore-simpledemo and /dev/null differ
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-auth/files/default/aai_keystore-solo b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-auth/files/default/aai_keystore-solo
deleted file mode 100755 (executable)
index 3eef135..0000000
Binary files a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-auth/files/default/aai_keystore-solo and /dev/null differ
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-auth/metadata.rb b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-auth/metadata.rb
deleted file mode 100755 (executable)
index 1cf7e82..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-name             'ajsc-aai-auth'
-maintainer       'YOUR_COMPANY_NAME'
-maintainer_email 'YOUR_EMAIL'
-license          'All rights reserved'
-description      'Installs/Configures ajsc-aai-auth'
-long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.2.0'
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-auth/recipes/aai-keystore.rb b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-auth/recipes/aai-keystore.rb
deleted file mode 100755 (executable)
index e5c0599..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-cookbook_file "#{node['aai-app-config']['PROJECT_HOME']}/bundleconfig/etc/auth/aai_keystore" do
-  source "aai_keystore-#{node['aai-app-config']['AAIENV']}"
-  owner 'aaiadmin'
-  group 'aaiadmin'
-  mode '0755'
-  action :create
-end
-
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/attributes/aaiWorkloadConsumer.properties.rb b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/attributes/aaiWorkloadConsumer.properties.rb
deleted file mode 100755 (executable)
index 2736249..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-node.default["aai-app-config"]["AAI_WORKLOAD_SERVICE_NAME"] = ''
-node.default["aai-app-config"]["AAI_WORKLOAD_ENVIRONMENT"] = 'TEST'
-node.default["aai-app-config"]["AAI_WORKLOAD_USERNAME"] = ''
-node.default["aai-app-config"]["AAI_WORKLOAD_PASSWORD"] = ''
-node.default["aai-app-config"]["AAI_WORKLOAD_HOST"] = ''
-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EXCHANGE_REQUEST_HANDLERS"] = ''
-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EXCHANGE_REPLY_HANDLERS"] = ''
-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_REQ_TRACE_ON"] = 'true'
-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_ENVIRONMENT"] = 'AFTUAT'
-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EP_CONN_TIMEOUT"] = '15000'
-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_ROUNDTRIP_TIMEOUT_MS"] = '240000'
-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EP_READ_TIMEOUT_MS"] = '50000'
-node.default["aai-app-config"]["AAI_WORKLOAD_SESSION_STICKINESS_REQUIRED"] = 'no'
-node.default["aai-app-config"]["AAI_WORKLOAD_DME2_PREFERRED_ROUTER_FILE_PATH"] = '/opt/app/aai/bundleconfig/etc/appprops/preferredRoute.txt'
-node.default["aai-app-config"]["AAI_WORKLOAD_PARTNER"] = 'BOT_R'
-node.default["aai-app-config"]["AAI_WORKLOAD_ROUTE_OFFER"] = 'MR1'
-node.default["aai-app-config"]["AAI_WORKLOAD_PROTOCOL"] = 'http'
-node.default["aai-app-config"]["AAI_WORKLOAD_TOPIC"] = ''
-node.default["aai-app-config"]["AAI_WORKLOAD_ID"] = 'aaiConsumerId'
-node.default["aai-app-config"]["AAI_WORKLOAD_TIMEOUT"] = '15000'
-node.default["aai-app-config"]["AAI_WORKLOAD_LIMIT"] = '1000'
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/attributes/aaiWorkloadPublisher.properties.rb b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/attributes/aaiWorkloadPublisher.properties.rb
deleted file mode 100755 (executable)
index 024ea07..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-node.default["aai-app-config"]["AAI_WORKLOAD_SERVICE_NAME"] = ''
-node.default["aai-app-config"]["AAI_WORKLOAD_ENVIRONMENT"] = 'TEST'
-node.default["aai-app-config"]["AAI_WORKLOAD_USERNAME"] = ''
-node.default["aai-app-config"]["AAI_WORKLOAD_PASSWORD"] = ''
-node.default["aai-app-config"]["AAI_WORKLOAD_HOST"] = ''
-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EXCHANGE_REQUEST_HANDLERS"] = ''
-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EXCHANGE_REPLY_HANDLERS"] = ''
-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_REQ_TRACE_ON"] = 'true'
-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_ENVIRONMENT"] = 'AFTUAT'
-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EP_CONN_TIMEOUT"] = '15000'
-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_ROUNDTRIP_TIMEOUT_MS"] = '240000'
-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EP_READ_TIMEOUT_MS"] = '50000'
-node.default["aai-app-config"]["AAI_WORKLOAD_SESSION_STICKINESS_REQUIRED"] = 'no'
-node.default["aai-app-config"]["AAI_WORKLOAD_DME2_PREFERRED_ROUTER_FILE_PATH"] = '/opt/app/aai/bundleconfig/etc/appprops/preferredRoute.txt'
-node.default["aai-app-config"]["AAI_WORKLOAD_PARTNER"] = 'BOT_R'
-node.default["aai-app-config"]["AAI_WORKLOAD_ROUTE_OFFER"] = 'MR1'
-node.default["aai-app-config"]["AAI_WORKLOAD_PROTOCOL"] = 'http'
-node.default["aai-app-config"]["AAI_WORKLOAD_TOPIC"] = ''
-node.default["aai-app-config"]["AAI_WORKLOAD_MAX_BATCH_SIZE"] = '100'
-node.default["aai-app-config"]["AAI_WORKLOAD_MAX_AGE_MS"] = '250'
-node.default["aai-app-config"]["AAI_WORKLOAD_MESSAGE_SENT_THREAD_OCCURANCE"] = '50'
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/attributes/aaiWorkloadStatusPublisher.properties.rb b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/attributes/aaiWorkloadStatusPublisher.properties.rb
deleted file mode 100755 (executable)
index 90ecf6f..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-node.default["aai-app-config"]["AAI_WORKLOAD_SERVICE_NAME"] = ''
-node.default["aai-app-config"]["AAI_WORKLOAD_ENVIRONMENT"] = 'TEST'
-node.default["aai-app-config"]["AAI_WORKLOAD_USERNAME"] = ''
-node.default["aai-app-config"]["AAI_WORKLOAD_PASSWORD"] = ''
-node.default["aai-app-config"]["AAI_WORKLOAD_HOST"] = ''
-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EXCHANGE_REQUEST_HANDLERS"] = ''
-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EXCHANGE_REPLY_HANDLERS"] = ''
-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_REQ_TRACE_ON"] = 'true'
-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_ENVIRONMENT"] = 'AFTUAT'
-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EP_CONN_TIMEOUT"] = '15000'
-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_ROUNDTRIP_TIMEOUT_MS"] = '240000'
-node.default["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EP_READ_TIMEOUT_MS"] = '50000'
-node.default["aai-app-config"]["AAI_WORKLOAD_SESSION_STICKINESS_REQUIRED"] = 'no'
-node.default["aai-app-config"]["AAI_WORKLOAD_DME2_PREFERRED_ROUTER_FILE_PATH"] = '/opt/app/aai/bundleconfig/etc/appprops/preferredRoute.txt'
-node.default["aai-app-config"]["AAI_WORKLOAD_PARTNER"] = 'BOT_R'
-node.default["aai-app-config"]["AAI_WORKLOAD_ROUTE_OFFER"] = 'MR1'
-node.default["aai-app-config"]["AAI_WORKLOAD_PROTOCOL"] = 'http'
-node.default["aai-app-config"]["AAI_WORKLOAD_STATUS_PUBLISHER_TOPIC"] = ''
-node.default["aai-app-config"]["AAI_WORKLOAD_MAX_BATCH_SIZE"] = '100'
-node.default["aai-app-config"]["AAI_WORKLOAD_MAX_AGE_MS"] = '250'
-node.default["aai-app-config"]["AAI_WORKLOAD_MESSAGE_SENT_THREAD_OCCURANCE"] = '50'
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/attributes/aaiconfig-properties.rb b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/attributes/aaiconfig-properties.rb
deleted file mode 100755 (executable)
index a6df800..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-node.default["aai-app-config"]["AAIENV"] = 'solo'
-node.default["aai-app-config"]["PROJECT_HOME"] = '/opt/app/aai'
-#CATALINA_BASE is PROJECT_HOME + /servers/aai
-node.default["aai-app-config"]["CATALINA_BASE"] = '/servers/aai'
-node.default["aai-app-config"]["LOGROOT"] = '/opt/aai/logroot'
-node.default["aai-app-config"]["JAVA_HOME"] = '/usr/lib/jvm/java-8-openjdk-amd64'
-node.default["aai-app-config"]["TOMCAT_SHUTDOWN_PORT_1"] = '8005'
-node.default["aai-app-config"]["TOMCAT_HTTP_SERVER_PORT_1"] = '8080'
-node.default["aai-app-config"]["TOMCAT_HTTPS_SERVER_PORT_1"] = '8443'
-node.default["aai-app-config"]["TOMCAT_AJP13_CONNECTOR_PORT_1"] = '8009'
-node.default["aai-app-config"]["AAI_SERVER_URL_BASE"] = 'https://localhost:8443/aai/'
-node.default["aai-app-config"]["AAI_SERVER_URL"] = 'https://localhost:8443/aai/v8/'
-node.default["aai-app-config"]["AAI_GLOBAL_CALLBACK_URL"] = 'https://localhost:8443/aai/'
-node.default["aai-app-config"]["AAI_TRUSTSTORE_FILENAME"] = 'aai_keystore'
-node.default["aai-app-config"]["AAI_TRUSTSTORE_PASSWD_X"] = 'OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o'
-node.default["aai-app-config"]["STORAGE_HOSTNAME"] = 'localhost'
-node.default["aai-app-config"]["STORAGE_HBASE_TABLE"] = 'aaigraph.dev'
-node.default["aai-app-config"]["STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT"] = '/hbase-unsecure'
-node.default["aai-app-config"]["TXN_HBASE_TABLE_NAME"] = 'aailogging.dev'
-node.default["aai-app-config"]["TXN_ZOOKEEPER_QUORUM"] = 'localhost'
-node.default["aai-app-config"]["TXN_ZOOKEEPER_PROPERTY_CLIENTPORT"] = '2181'
-node.default["aai-app-config"]["TXN_HBASE_ZOOKEEPER_ZNODE_PARENT"] = '/hbase-unsecure'
-node.default["aai-app-config"]["APPLICATION_SERVERS"] = 'localhost'
-node.default["aai-app-config"]["AAI_NOTIFICATION_CURRENT_VERSION"] = 'v8'
-node.default["aai-app-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS"] = 'UNPROCESSED'
-node.default["aai-app-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_TYPE"] = 'AAI-EVENT'
-node.default["aai-app-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_DOMAIN"] = 'application'
-node.default["aai-app-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_SOURCE_NAME"] = 'aai'
-node.default["aai-app-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_SEQUENCE_NUMBER"] = '0'
-node.default["aai-app-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_SEVERITY"] = 'NORMAL'
-node.default["aai-app-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_VERSION"] = 'v1'
-node.default["aai-app-config"]["AAI_DEFAULT_API_VERSION"] = 'v8'
-node.default["aai-app-config"]["AAI_DMAPP_WORKLOAD_ENABLE_EVENT_PROCESSING"] = 'false'
-node.default["aai-app-config"]["HBASE_COLUMN_TTL_DAYS"] = '15'
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/attributes/logback.rb b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/attributes/logback.rb
deleted file mode 100755 (executable)
index 58ecdf3..0000000
+++ /dev/null
@@ -1 +0,0 @@
-node.default["aai-app-config"]["ORG_OPENECOMP_AAI_LEVEL"] = 'INFO'
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/attributes/preferredRoute.rb b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/attributes/preferredRoute.rb
deleted file mode 100755 (executable)
index dec40c7..0000000
+++ /dev/null
@@ -1 +0,0 @@
-node.default["aai-app-config"]["AAI_WORKLOAD_PREFERRED_ROUTE_KEY"] = 'MR1'
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/metadata.rb b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/metadata.rb
deleted file mode 100755 (executable)
index 26a76d5..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-name             'ajsc-aai-config'
-maintainer       'YOUR_COMPANY_NAME'
-maintainer_email 'YOUR_EMAIL'
-license          'All rights reserved'
-description      'Installs/Configures ajsc-aai-config'
-long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.2.2'
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/recipes/aai-config.rb b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/recipes/aai-config.rb
deleted file mode 100755 (executable)
index 7cbae3a..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-################
-# Update aaiconfig.properties 
-######
-include_recipe 'ajsc-aai-config::createConfigDirectories'
-  
-['aaiconfig.properties'].each do |file|
-  template "#{node['aai-app-config']['PROJECT_HOME']}/bundleconfig/etc/appprops/#{file}" do
-    source "aai-app-config/#{file}"
-    owner "aaiadmin"
-    group "aaiadmin"
-    mode "0644"
-    variables(
-:TOMCAT_SHUTDOWN_PORT_1 => node["aai-app-config"]["TOMCAT_SHUTDOWN_PORT_1"],
-:TOMCAT_HTTP_SERVER_PORT_1 => node["aai-app-config"]["TOMCAT_HTTP_SERVER_PORT_1"],
-:TOMCAT_HTTPS_SERVER_PORT_1 => node["aai-app-config"]["TOMCAT_HTTPS_SERVER_PORT_1"],
-:TOMCAT_AJP13_CONNECTOR_PORT_1 => node["aai-app-config"]["TOMCAT_AJP13_CONNECTOR_PORT_1"],
-:AAI_SERVER_URL_BASE => node["aai-app-config"]["AAI_SERVER_URL_BASE"],
-:AAI_SERVER_URL => node["aai-app-config"]["AAI_SERVER_URL"],
-:AAI_OLDSERVER_URL => node["aai-app-config"]["AAI_OLDSERVER_URL"],
-:AAI_GLOBAL_CALLBACK_URL => node["aai-app-config"]["AAI_GLOBAL_CALLBACK_URL"],
-:AAI_TRUSTSTORE_FILENAME => node["aai-app-config"]["AAI_TRUSTSTORE_FILENAME"],
-:AAI_TRUSTSTORE_PASSWD_X => node["aai-app-config"]["AAI_TRUSTSTORE_PASSWD_X"],
-:AAI_KEYSTORE_FILENAME => node["aai-app-config"]["AAI_KEYSTORE_FILENAME"],
-:AAI_KEYSTORE_PASSWD_X => node["aai-app-config"]["AAI_KEYSTORE_PASSWD_X"],
-:STORAGE_HOSTNAME => node["aai-app-config"]["STORAGE_HOSTNAME"],
-:STORAGE_BACKEND => node["aai-app-config"]["STORAGE_BACKEND"],
-:STORAGE_HBASE_TABLE => node["aai-app-config"]["STORAGE_HBASE_TABLE"],
-:STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT => node["aai-app-config"]["STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT"],
-:HBASE_COLUMN_TTL_DAYS => node["aai-app-config"]["HBASE_COLUMN_TTL_DAYS"],
-:TXN_HBASE_TABLE_NAME => node["aai-app-config"]["TXN_HBASE_TABLE_NAME"],
-:TXN_ZOOKEEPER_QUORUM => node["aai-app-config"]["TXN_ZOOKEEPER_QUORUM"],
-:TXN_ZOOKEEPER_PROPERTY_CLIENTPORT => node["aai-app-config"]["TXN_ZOOKEEPER_PROPERTY_CLIENTPORT"],
-:TXN_HBASE_ZOOKEEPER_ZNODE_PARENT => node["aai-app-config"]["TXN_HBASE_ZOOKEEPER_ZNODE_PARENT"],
-:NOTIFICATION_HBASE_TABLE_NAME => node["aai-app-config"]["NOTIFICATION_HBASE_TABLE_NAME"],
-:APPLICATION_SERVERS => node["aai-app-config"]["APPLICATION_SERVERS"],
-:AAI_NOTIFICATION_CURRENT_VERSION => node["aai-app-config"]["AAI_NOTIFICATION_CURRENT_VERSION"],
-:AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS => node["aai-app-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS"],
-:AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_TYPE => node["aai-app-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_TYPE"],
-:AAI_NOTIFICATION_EVENT_DEFAULT_DOMAIN => node["aai-app-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_DOMAIN"],
-:AAI_NOTIFICATION_EVENT_DEFAULT_SOURCE_NAME => node["aai-app-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_SOURCE_NAME"],
-:AAI_NOTIFICATION_EVENT_DEFAULT_SEQUENCE_NUMBER => node["aai-app-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_SEQUENCE_NUMBER"],
-:AAI_NOTIFICATION_EVENT_DEFAULT_SEVERITY => node["aai-app-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_SEVERITY"],
-:AAI_NOTIFICATION_EVENT_DEFAULT_VERSION => node["aai-app-config"]["AAI_NOTIFICATION_EVENT_DEFAULT_VERSION"],
-:RESOURCE_VERSION_ENABLE_FLAG => node["aai-app-config"]["RESOURCE_VERSION_ENABLE_FLAG"],
-:AAI_DEFAULT_API_VERSION => node["aai-app-config"]["AAI_DEFAULT_API_VERSION"],
-:AAI_DMAPP_WORKLOAD_ENABLE_EVENT_PROCESSING => node["aai-app-config"]["AAI_DMAPP_WORKLOAD_ENABLE_EVENT_PROCESSING"]
-      )
-  end
-end
-
-#remote_directory "/opt/mso/etc/ecomp/mso/config/" do
-#  source "mso-asdc-controller-config"
-#  #cookbook "default is current"
-#  files_mode "0700"
-#  files_owner "jboss"
-#  files_group "jboss"
-#  mode "0755"
-#  owner "jboss"
-#  group "jboss"
-#  overwrite true
-#  recursive true
-#  action :create
-#end
-
-
-################
-# Alternative example1
-# This updates all the timestamps
-# Seting preserve never changes the timestamp when the file is changed
-######
-# ruby_block "copy_recurse" do
-#   block do
-#     FileUtils.cp_r("#{Chef::Config[:file_cache_path]}/cookbooks/mso-config/files/default/mso-api-handler-config/.",\
-#       "/opt/mso/etc/ecomp/mso/config/", :preserve => true)  
-#   end
-#   action :run
-# end
-
-################
-# Alternative example2
-######
-# Dir.glob("#{Chef::Config[:file_cache_path]}/cookbooks/mso-config/files/default/mso-api-handler-config/*").sort.each do |entry|
-#   cookbook_file "/opt/mso/etc/ecomp/mso/config/#{entry}" do
-#     source entry
-#     owner "root"
-#     group "root"
-#     mode 0755
-#   end
-# end 
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/recipes/aai-logback.rb b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/recipes/aai-logback.rb
deleted file mode 100755 (executable)
index 505c44a..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-################
-# Update logback.xml
-######
-  
-['logback.xml'].each do |file|
-  template "#{node['aai-app-config']['PROJECT_HOME']}/bundleconfig/etc/#{file}" do
-    source "aai-app-config/logback.erb"
-    owner "aaiadmin"
-    group "aaiadmin"
-    mode "0777"
-    variables(
-:ORG_OPENECOMP_AAI_LEVEL => node["aai-app-config"]["ORG_OPENECOMP_AAI_LEVEL"]
-      )
-  end
-end
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/recipes/aai-preferredRoute.rb b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/recipes/aai-preferredRoute.rb
deleted file mode 100755 (executable)
index c9f4887..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-['preferredRoute.txt'].each do |file|
-  template "#{node['aai-app-config']['PROJECT_HOME']}/bundleconfig/etc/appprops/#{file}" do
-    source "aai-app-config/preferredRoute.txt"
-    owner "aaiadmin"
-    group "aaiadmin"
-    mode "0644"
-    variables(
-:AAI_WORKLOAD_PREFERRED_ROUTE_KEY => node["aai-app-config"]["AAI_WORKLOAD_PREFERRED_ROUTE_KEY"]
-      )
-  end
-end
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/recipes/aaiWorkloadConsumer.rb b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/recipes/aaiWorkloadConsumer.rb
deleted file mode 100755 (executable)
index 676e5ce..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-['aaiWorkloadConsumer.properties'].each do |file|
-  template "#{node['aai-app-config']['PROJECT_HOME']}/bundleconfig/etc/appprops/#{file}" do
-    source "aai-app-config/aaiWorkloadConsumer.properties"
-    owner "aaiadmin"
-    group "aaiadmin"
-    mode "0644"
-    variables(
-:AAI_WORKLOAD_SERVICE_NAME => node["aai-app-config"]["AAI_WORKLOAD_SERVICE_NAME"],
-:AAI_WORKLOAD_ENVIRONMENT => node["aai-app-config"]["AAI_WORKLOAD_ENVIRONMENT"],
-:AAI_WORKLOAD_USERNAME => node["aai-app-config"]["AAI_WORKLOAD_USERNAME"],
-:AAI_WORKLOAD_PASSWORD => node["aai-app-config"]["AAI_WORKLOAD_PASSWORD"],
-:AAI_WORKLOAD_HOST => node["aai-app-config"]["AAI_WORKLOAD_HOST"],
-:AAI_WORKLOAD_AFT_DME2_EXCHANGE_REQUEST_HANDLERS => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EXCHANGE_REQUEST_HANDLERS"],
-:AAI_WORKLOAD_AFT_DME2_EXCHANGE_REPLY_HANDLERS => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EXCHANGE_REPLY_HANDLERS"],
-:AAI_WORKLOAD_AFT_DME2_REQ_TRACE_ON => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_REQ_TRACE_ON"],
-:AAI_WORKLOAD_AFT_ENVIRONMENT => node["aai-app-config"]["AAI_WORKLOAD_AFT_ENVIRONMENT"],
-:AAI_WORKLOAD_AFT_DME2_EP_CONN_TIMEOUT => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EP_CONN_TIMEOUT"],
-:AAI_WORKLOAD_AFT_DME2_ROUNDTRIP_TIMEOUT_MS => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_ROUNDTRIP_TIMEOUT_MS"],
-:AAI_WORKLOAD_AFT_DME2_EP_READ_TIMEOUT_MS => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EP_READ_TIMEOUT_MS"],
-:AAI_WORKLOAD_SESSION_STICKINESS_REQUIRED => node["aai-app-config"]["AAI_WORKLOAD_SESSION_STICKINESS_REQUIRED"],
-:AAI_WORKLOAD_DME2_PREFERRED_ROUTER_FILE_PATH => node["aai-app-config"]["AAI_WORKLOAD_DME2_PREFERRED_ROUTER_FILE_PATH"],
-:AAI_WORKLOAD_PARTNER => node["aai-app-config"]["AAI_WORKLOAD_PARTNER"], 
-:AAI_WORKLOAD_ROUTE_OFFER => node["aai-app-config"]["AAI_WORKLOAD_ROUTE_OFFER"], 
-:AAI_WORKLOAD_PROTOCOL => node["aai-app-config"]["AAI_WORKLOAD_PROTOCOL"],
-:AAI_WORKLOAD_FILTER => node["aai-app-config"]["AAI_WORKLOAD_FILTER"],
-:AAI_WORKLOAD_TOPIC => node["aai-app-config"]["AAI_WORKLOAD_TOPIC"],
-:AAI_WORKLOAD_ID => node["aai-app-config"]["AAI_WORKLOAD_ID"],
-:AAI_WORKLOAD_TIMEOUT => node["aai-app-config"]["AAI_WORKLOAD_TIMEOUT"],
-:AAI_WORKLOAD_LIMIT => node["aai-app-config"]["AAI_WORKLOAD_LIMIT"]
-      )
-  end
-end
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/recipes/aaiWorkloadPublisher.rb b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/recipes/aaiWorkloadPublisher.rb
deleted file mode 100755 (executable)
index 815f29c..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-['aaiWorkloadPublisher.properties'].each do |file|
-  template "#{node['aai-app-config']['PROJECT_HOME']}/bundleconfig/etc/appprops/#{file}" do
-    source "aai-app-config/aaiWorkloadPublisher.properties"
-    owner "aaiadmin"
-    group "aaiadmin"
-    mode "0644"
-    variables(
-:AAI_WORKLOAD_SERVICE_NAME => node["aai-app-config"]["AAI_WORKLOAD_SERVICE_NAME"],
-:AAI_WORKLOAD_ENVIRONMENT => node["aai-app-config"]["AAI_WORKLOAD_ENVIRONMENT"],
-:AAI_WORKLOAD_USERNAME => node["aai-app-config"]["AAI_WORKLOAD_USERNAME"],
-:AAI_WORKLOAD_PASSWORD => node["aai-app-config"]["AAI_WORKLOAD_PASSWORD"],
-:AAI_WORKLOAD_HOST => node["aai-app-config"]["AAI_WORKLOAD_HOST"],
-:AAI_WORKLOAD_AFT_DME2_EXCHANGE_REQUEST_HANDLERS => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EXCHANGE_REQUEST_HANDLERS"],
-:AAI_WORKLOAD_AFT_DME2_EXCHANGE_REPLY_HANDLERS => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EXCHANGE_REPLY_HANDLERS"],
-:AAI_WORKLOAD_AFT_DME2_REQ_TRACE_ON => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_REQ_TRACE_ON"],
-:AAI_WORKLOAD_AFT_ENVIRONMENT => node["aai-app-config"]["AAI_WORKLOAD_AFT_ENVIRONMENT"],
-:AAI_WORKLOAD_AFT_DME2_EP_CONN_TIMEOUT => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EP_CONN_TIMEOUT"],
-:AAI_WORKLOAD_AFT_DME2_ROUNDTRIP_TIMEOUT_MS => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_ROUNDTRIP_TIMEOUT_MS"],
-:AAI_WORKLOAD_AFT_DME2_EP_READ_TIMEOUT_MS => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EP_READ_TIMEOUT_MS"],
-:AAI_WORKLOAD_SESSION_STICKINESS_REQUIRED => node["aai-app-config"]["AAI_WORKLOAD_SESSION_STICKINESS_REQUIRED"],
-:AAI_WORKLOAD_DME2_PREFERRED_ROUTER_FILE_PATH => node["aai-app-config"]["AAI_WORKLOAD_DME2_PREFERRED_ROUTER_FILE_PATH"],
-:AAI_WORKLOAD_PARTNER => node["aai-app-config"]["AAI_WORKLOAD_PARTNER"], 
-:AAI_WORKLOAD_ROUTE_OFFER => node["aai-app-config"]["AAI_WORKLOAD_ROUTE_OFFER"], 
-:AAI_WORKLOAD_PROTOCOL => node["aai-app-config"]["AAI_WORKLOAD_PROTOCOL"],
-:AAI_WORKLOAD_TOPIC => node["aai-app-config"]["AAI_WORKLOAD_TOPIC"],
-:AAI_WORKLOAD_MAX_BATCH_SIZE => node["aai-app-config"]["AAI_WORKLOAD_MAX_BATCH_SIZE"],
-:AAI_WORKLOAD_MAX_AGE_MS => node["aai-app-config"]["AAI_WORKLOAD_MAX_AGE_MS"],
-:AAI_WORKLOAD_MESSAGE_SENT_THREAD_OCCURANCE => node["aai-app-config"]["AAI_WORKLOAD_MESSAGE_SENT_THREAD_OCCURANCE"]
-      )
-  end
-end
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/recipes/aaiWorkloadStatusPublisher.rb b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/recipes/aaiWorkloadStatusPublisher.rb
deleted file mode 100755 (executable)
index 032737e..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-['aaiWorkloadStatusPublisher.properties'].each do |file|
-  template "#{node['aai-app-config']['PROJECT_HOME']}/bundleconfig/etc/appprops/#{file}" do
-    source "aai-app-config/aaiWorkloadStatusPublisher.properties"
-    owner "aaiadmin"
-    group "aaiadmin"
-    mode "0644"
-    variables(
-:AAI_WORKLOAD_SERVICE_NAME => node["aai-app-config"]["AAI_WORKLOAD_SERVICE_NAME"],
-:AAI_WORKLOAD_ENVIRONMENT => node["aai-app-config"]["AAI_WORKLOAD_ENVIRONMENT"],
-:AAI_WORKLOAD_USERNAME => node["aai-app-config"]["AAI_WORKLOAD_USERNAME"],
-:AAI_WORKLOAD_PASSWORD => node["aai-app-config"]["AAI_WORKLOAD_PASSWORD"],
-:AAI_WORKLOAD_HOST => node["aai-app-config"]["AAI_WORKLOAD_HOST"],
-:AAI_WORKLOAD_AFT_DME2_EXCHANGE_REQUEST_HANDLERS => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EXCHANGE_REQUEST_HANDLERS"],
-:AAI_WORKLOAD_AFT_DME2_EXCHANGE_REPLY_HANDLERS => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EXCHANGE_REPLY_HANDLERS"],
-:AAI_WORKLOAD_AFT_DME2_REQ_TRACE_ON => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_REQ_TRACE_ON"],
-:AAI_WORKLOAD_AFT_ENVIRONMENT => node["aai-app-config"]["AAI_WORKLOAD_AFT_ENVIRONMENT"],
-:AAI_WORKLOAD_AFT_DME2_EP_CONN_TIMEOUT => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EP_CONN_TIMEOUT"],
-:AAI_WORKLOAD_AFT_DME2_ROUNDTRIP_TIMEOUT_MS => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_ROUNDTRIP_TIMEOUT_MS"],
-:AAI_WORKLOAD_AFT_DME2_EP_READ_TIMEOUT_MS => node["aai-app-config"]["AAI_WORKLOAD_AFT_DME2_EP_READ_TIMEOUT_MS"],
-:AAI_WORKLOAD_SESSION_STICKINESS_REQUIRED => node["aai-app-config"]["AAI_WORKLOAD_SESSION_STICKINESS_REQUIRED"],
-:AAI_WORKLOAD_DME2_PREFERRED_ROUTER_FILE_PATH => node["aai-app-config"]["AAI_WORKLOAD_DME2_PREFERRED_ROUTER_FILE_PATH"],
-:AAI_WORKLOAD_PARTNER => node["aai-app-config"]["AAI_WORKLOAD_PARTNER"], 
-:AAI_WORKLOAD_ROUTE_OFFER => node["aai-app-config"]["AAI_WORKLOAD_ROUTE_OFFER"], 
-:AAI_WORKLOAD_PROTOCOL => node["aai-app-config"]["AAI_WORKLOAD_PROTOCOL"],
-:AAI_WORKLOAD_MAX_BATCH_SIZE => node["aai-app-config"]["AAI_WORKLOAD_MAX_BATCH_SIZE"],
-:AAI_WORKLOAD_MAX_AGE_MS => node["aai-app-config"]["AAI_WORKLOAD_MAX_AGE_MS"],
-:AAI_WORKLOAD_MESSAGE_SENT_THREAD_OCCURANCE => node["aai-app-config"]["AAI_WORKLOAD_MESSAGE_SENT_THREAD_OCCURANCE"],
-:AAI_WORKLOAD_STATUS_PUBLISHER_TOPIC => node["aai-app-config"]["AAI_WORKLOAD_STATUS_PUBLISHER_TOPIC"]
-      )
-  end
-end
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/recipes/createConfigDirectories.rb b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/recipes/createConfigDirectories.rb
deleted file mode 100755 (executable)
index eac5cd1..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# Create or update the needed directories/links.
-# If the directory already exists, it is updated to match
-# 
-# LOGROOT should already be created by the SWM installation script
-# It needs to run as root 
-
-execute "mv logs logs.bak" do
-    only_if { ::File.directory?("#{node['aai-app-config']['PROJECT_HOME']}/logs") }
-    user 'aaiadmin'
-    group 'aaiadmin'
-    cwd "#{node['aai-app-config']['PROJECT_HOME']}"
-end
-
-[ 
-       "#{node['aai-app-config']['LOGROOT']}/AAI",
-  "#{node['aai-app-config']['LOGROOT']}/AAI/data",
-       "#{node['aai-app-config']['LOGROOT']}/AAI/misc",
-  "#{node['aai-app-config']['LOGROOT']}/AAI/ajsc-jetty" ].each do |path|
-  directory path do
-    owner 'aaiadmin'
-    group 'aaiadmin'
-    mode '0755'
-    recursive=true
-    action :create
-  end
-end
-
-[ "#{node['aai-app-config']['PROJECT_HOME']}/bundleconfig/etc/auth" ].each do |path|
-  directory path do
-    owner 'aaiadmin'
-    group 'aaiadmin'
-    mode '0777'
-    recursive=true
-    action :create
-  end
-end
-#Application logs
-link "#{node['aai-app-config']['PROJECT_HOME']}/logs" do
-  to "#{node['aai-app-config']['LOGROOT']}/AAI"
-  owner 'aaiadmin'
-  group 'aaiadmin'
-  mode '0755'
-end
-
-#Make a link from /opt/app/aai/scripts to /opt/app/aai/bin
-link "#{node['aai-app-config']['PROJECT_HOME']}/scripts" do
-  to "#{node['aai-app-config']['PROJECT_HOME']}/bin"
-  owner 'aaiadmin'
-  group 'aaiadmin'
-  mode '0755'
-end
-
-#Process logs??
-#ln -s ${LOGROOT}/aai/servers/${server}/logs ${TRUE_PROJECT_HOME}/servers/${server}/logs
-#link "#{node['aai-app-config']['PROJECT_HOME']}/servers/aai/logs" do
-# to "#{node['aai-app-config']['LOGROOT']}/aai/servers/aai/logs"
-#  owner 'aaiadmin'
-# group 'aaiadmin'
-#  mode '0755'
-#end
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/templates/default/aai-app-config/aaiWorkloadConsumer.properties b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/templates/default/aai-app-config/aaiWorkloadConsumer.properties
deleted file mode 100755 (executable)
index 81b0e30..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-TransportType=DME2
-Latitude=47.778998
-Longitude=-122.182883
-Version=1.0
-ServiceName=<%= @AAI_WORKLOAD_SERVICE_NAME %>
-Environment=<%= @AAI_WORKLOAD_ENVIRONMENT %>
-Partner=<%= @AAI_WORKLOAD_PARTNER %>
-routeOffer=<%= @AAI_WORKLOAD_ROUTE_OFFER %>
-SubContextPath=/
-Protocol=<%= @AAI_WORKLOAD_PROTOCOL %>
-MethodType=GET
-username=<%= @AAI_WORKLOAD_USERNAME %>
-password=<%= @AAI_WORKLOAD_PASSWORD %>
-contenttype=application/json
-host=<%= @AAI_WORKLOAD_HOST %>
-topic=<%= @AAI_WORKLOAD_TOPIC %>
-group=aaiWorkloadConsumer
-id=<%= @AAI_WORKLOAD_ID %>
-timeout=<%= @AAI_WORKLOAD_TIMEOUT %>
-limit=<%= @AAI_WORKLOAD_LIMIT %>
-filter=<%= @AAI_WORKLOAD_FILTER %>
-AFT_DME2_EXCHANGE_REQUEST_HANDLERS=<%= @AAI_WORKLOAD_AFT_DME2_EXCHANGE_REQUEST_HANDLERS %>
-AFT_DME2_EXCHANGE_REPLY_HANDLERS=<%= @AAI_WORKLOAD_AFT_DME2_EXCHANGE_REPLY_HANDLERS %>
-AFT_DME2_REQ_TRACE_ON=<%= @AAI_WORKLOAD_AFT_DME2_REQ_TRACE_ON %>
-AFT_ENVIRONMENT=<%= @AAI_WORKLOAD_AFT_ENVIRONMENT %>
-AFT_DME2_EP_CONN_TIMEOUT=<%= @AAI_WORKLOAD_AFT_DME2_EP_CONN_TIMEOUT %>
-AFT_DME2_ROUNDTRIP_TIMEOUT_MS=<%= @AAI_WORKLOAD_AFT_DME2_ROUNDTRIP_TIMEOUT_MS %>
-AFT_DME2_EP_READ_TIMEOUT_MS=<%= @AAI_WORKLOAD_AFT_DME2_EP_READ_TIMEOUT_MS %>
-sessionstickinessrequired=<%= @AAI_WORKLOAD_SESSION_STICKINESS_REQUIRED %>
-DME2preferredRouterFilePath=<%= @AAI_WORKLOAD_DME2_PREFERRED_ROUTER_FILE_PATH %>
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/templates/default/aai-app-config/aaiWorkloadPublisher.properties b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/templates/default/aai-app-config/aaiWorkloadPublisher.properties
deleted file mode 100755 (executable)
index 87a47bc..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-TransportType=DME2
-Latitude=47.778998
-Longitude=-122.182883
-Version=1.0
-ServiceName=<%= @AAI_WORKLOAD_SERVICE_NAME %>
-Environment=<%= @AAI_WORKLOAD_ENVIRONMENT %>
-Partner=<%= @AAI_WORKLOAD_PARTNER %>
-routeOffer=<%= @AAI_WORKLOAD_ROUTE_OFFER %>
-SubContextPath=/
-Protocol=<%= @AAI_WORKLOAD_PROTOCOL %>
-MethodType=POST
-username=<%= @AAI_WORKLOAD_USERNAME %>
-password=<%= @AAI_WORKLOAD_PASSWORD %>
-contenttype=application/json
-host=<%= @AAI_WORKLOAD_HOST %>
-topic=<%= @AAI_WORKLOAD_TOPIC %>
-partition=AAI_WORKLOAD
-maxBatchSize=<%= @AAI_WORKLOAD_MAX_BATCH_SIZE %>
-maxAgeMs=<%= @AAI_WORKLOAD_MAX_AGE_MS %>
-AFT_DME2_EXCHANGE_REQUEST_HANDLERS=<%= @AAI_WORKLOAD_AFT_DME2_EXCHANGE_REQUEST_HANDLERS %>
-AFT_DME2_EXCHANGE_REPLY_HANDLERS=<%= @AAI_WORKLOAD_AFT_DME2_EXCHANGE_REPLY_HANDLERS %>
-AFT_DME2_REQ_TRACE_ON=<%= @AAI_WORKLOAD_AFT_DME2_REQ_TRACE_ON %>
-AFT_ENVIRONMENT=<%= @AAI_WORKLOAD_AFT_ENVIRONMENT %>
-AFT_DME2_EP_CONN_TIMEOUT=<%= @AAI_WORKLOAD_AFT_DME2_EP_CONN_TIMEOUT %>
-AFT_DME2_ROUNDTRIP_TIMEOUT_MS=<%= @AAI_WORKLOAD_AFT_DME2_ROUNDTRIP_TIMEOUT_MS %>
-AFT_DME2_EP_READ_TIMEOUT_MS=<%= @AAI_WORKLOAD_AFT_DME2_EP_READ_TIMEOUT_MS %>
-sessionstickinessrequired=<%= @AAI_WORKLOAD_SESSION_STICKINESS_REQUIRED %>
-DME2preferredRouterFilePath=<%= @AAI_WORKLOAD_DME2_PREFERRED_ROUTER_FILE_PATH %>
-MessageSentThreadOccurance=<%= @AAI_WORKLOAD_MESSAGE_SENT_THREAD_OCCURANCE %>
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/templates/default/aai-app-config/aaiWorkloadStatusPublisher.properties b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/templates/default/aai-app-config/aaiWorkloadStatusPublisher.properties
deleted file mode 100755 (executable)
index 73cc1c9..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-TransportType=DME2
-Latitude=47.778998
-Longitude=-122.182883
-Version=1.0
-ServiceName=<%= @AAI_WORKLOAD_SERVICE_NAME %>
-Environment=<%= @AAI_WORKLOAD_ENVIRONMENT %>
-Partner=<%= @AAI_WORKLOAD_PARTNER %>
-routeOffer=<%= @AAI_WORKLOAD_ROUTE_OFFER %>
-SubContextPath=/
-Protocol=<%= @AAI_WORKLOAD_PROTOCOL %>
-MethodType=POST
-username=<%= @AAI_WORKLOAD_USERNAME %>
-password=<%= @AAI_WORKLOAD_PASSWORD %>
-contenttype=application/json
-host=<%= @AAI_WORKLOAD_HOST %>
-topic=<%= @AAI_WORKLOAD_STATUS_PUBLISHER_TOPIC %>
-partition=AAI_WORKLOAD
-maxBatchSize=<%= @AAI_WORKLOAD_MAX_BATCH_SIZE %>
-maxAgeMs=<%= @AAI_WORKLOAD_MAX_AGE_MS %>
-AFT_DME2_EXCHANGE_REQUEST_HANDLERS=<%= @AAI_WORKLOAD_AFT_DME2_EXCHANGE_REQUEST_HANDLERS %>
-AFT_DME2_EXCHANGE_REPLY_HANDLERS=<%= @AAI_WORKLOAD_AFT_DME2_EXCHANGE_REPLY_HANDLERS %>
-AFT_DME2_REQ_TRACE_ON=<%= @AAI_WORKLOAD_AFT_DME2_REQ_TRACE_ON %>
-AFT_ENVIRONMENT=<%= @AAI_WORKLOAD_AFT_ENVIRONMENT %>
-AFT_DME2_EP_CONN_TIMEOUT=<%= @AAI_WORKLOAD_AFT_DME2_EP_CONN_TIMEOUT %>
-AFT_DME2_ROUNDTRIP_TIMEOUT_MS=<%= @AAI_WORKLOAD_AFT_DME2_ROUNDTRIP_TIMEOUT_MS %>
-AFT_DME2_EP_READ_TIMEOUT_MS=<%= @AAI_WORKLOAD_AFT_DME2_EP_READ_TIMEOUT_MS %>
-sessionstickinessrequired=<%= @AAI_WORKLOAD_SESSION_STICKINESS_REQUIRED %>
-DME2preferredRouterFilePath=<%= @AAI_WORKLOAD_DME2_PREFERRED_ROUTER_FILE_PATH %>
-MessageSentThreadOccurance=<%= @AAI_WORKLOAD_MESSAGE_SENT_THREAD_OCCURANCE %>
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/templates/default/aai-app-config/aft.properties b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/templates/default/aai-app-config/aft.properties
deleted file mode 100755 (executable)
index d3165d2..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-com.att.aft.discovery.client.environment=<%= @COM_ATT_AFT_DISCOVERY_CLIENT_ENVIRONMENT %>
-com.att.aft.discovery.client.latitude=<%= @COM_ATT_AFT_DISCOVERY_CLIENT_LATITUDE %>
-com.att.aft.discovery.client.longitude=<%= @COM_ATT_AFT_DISCOVERY_CLIENT_LONGITUDE %>
-com.att.aft.alias=ecomp-aai
-com.att.aft.keyStore=/opt/app/aai/bundleconfig/etc/m04353t.jks
-com.att.aft.keyStorePassword=<%= @COM_ATT_AFT_KEY_STORE_PASSWORD %>
-com.att.aft.trustStore=/opt/app/aai/bundleconfig/etc/m04353t.jks
-com.att.aft.trustStorePassword=<%= @COM_ATT_AFT_TRUST_STORE_PASSWORD %>
diff --git a/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/templates/default/aai-app-config/logback.erb b/kubernetes/config/docker/init/src/config/aai/aai-data/chef-config/dev/.knife/local-mode-cache/cache/cookbooks/ajsc-aai-config/templates/default/aai-app-config/logback.erb
deleted file mode 100755 (executable)
index e438b89..0000000
+++ /dev/null
@@ -1,298 +0,0 @@
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-       <contextName>${module.ajsc.namespace.name}</contextName>
-       <jmxConfigurator />
-       <property name="logDirectory" value="${AJSC_HOME}/logs" />
-       
-       <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-               <filter class="ch.qos.logback.classic.filter.LevelFilter">
-                       <level>ERROR</level>
-                       <onMatch>ACCEPT</onMatch>
-                       <onMismatch>DENY</onMismatch>
-               </filter>
-               <encoder>
-                       <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n</pattern>
-               </encoder>
-       </appender>
-       
-       <appender name="METRIC" class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.LevelFilter">
-                       <level>INFO</level>
-                       <onMatch>ACCEPT</onMatch>
-                       <onMismatch>DENY</onMismatch>
-               </filter>
-               <file>${logDirectory}/rest/metrics.log</file>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/rest/metrics.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       <appender name="asyncMETRIC" class="ch.qos.logback.classic.AsyncAppender">
-               <queueSize>1000</queueSize>
-               <appender-ref ref="METRIC" />
-       </appender>
-       
-       <appender name="DEBUG"  class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.LevelFilter">
-                       <level>DEBUG</level>
-                       <onMatch>ACCEPT</onMatch>
-                       <onMismatch>DENY</onMismatch>
-               </filter>
-               <file>${logDirectory}/rest/debug.log</file>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/rest/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       <appender name="asyncDEBUG" class="ch.qos.logback.classic.AsyncAppender">
-               <queueSize>1000</queueSize>
-               <appender-ref ref="DEBUG" />
-       </appender>
-       
-       <appender name="ERROR"  class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-                       <level>WARN</level>
-               </filter>
-               <file>${logDirectory}/rest/error.log</file>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/rest/error.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       <appender name="asyncERROR" class="ch.qos.logback.classic.AsyncAppender">
-               <queueSize>1000</queueSize>
-               <appender-ref ref="ERROR" />
-       </appender>
-       
-       <appender name="AUDIT"  class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <file>${logDirectory}/rest/audit.log</file>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/rest/audit.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       <appender name="asyncAUDIT" class="ch.qos.logback.classic.AsyncAppender">
-               <queueSize>1000</queueSize>
-               <appender-ref ref="AUDIT" />
-       </appender>
-       
-       <appender name="dmaapAAIWorkloadConsumer"       class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-                       <level>WARN</level>
-               </filter>
-               <File>${logDirectory}/dmaapAAIWorkloadConsumer/error.log</File>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/dmaapAAIWorkloadConsumer/error.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       
-       <appender name="dmaapAAIWorkloadConsumerdebug"  class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.LevelFilter">
-                       <level>DEBUG</level>
-                       <onMatch>ACCEPT</onMatch>
-                       <onMismatch>DENY</onMismatch>
-               </filter>
-               <File>${logDirectory}/dmaapAAIWorkloadConsumer/debug.log</File>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/dmaapAAIWorkloadConsumer/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       <appender name="dmaapAAIWorkloadConsumermetric" class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.LevelFilter">
-                       <level>INFO</level>
-                       <onMatch>ACCEPT</onMatch>
-                       <onMismatch>DENY</onMismatch>
-               </filter>
-               <File>${logDirectory}/dmaapAAIWorkloadConsumer/metrics.log</File>
-               <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                       <fileNamePattern>${logDirectory}/dmaapAAIWorkloadConsumer/metrics.log.%d{yyyy-MM-dd}</fileNamePattern>
-               </rollingPolicy>
-               <encoder>
-                       <pattern>%m%n</pattern>
-               </encoder>
-       </appender>
-       
-       <!-- Spring related loggers -->
-       <logger name="org.springframework" level="WARN" />
-       <logger name="org.springframework.beans" level="WARN" />
-       <logger name="org.springframework.web" level="WARN" />
-       <logger name="com.blog.spring.jms" level="WARN" />
-       
-       <!-- AJSC Services (bootstrap services) -->
-       <logger name="ajsc" level="WARN" />
-       <logger name="ajsc.RouteMgmtService" level="WARN" />
-       <logger name="ajsc.ComputeService" level="WARN" />
-       <logger name="ajsc.VandelayService" level="WARN" />
-       <logger name="ajsc.FilePersistenceService" level="WARN" />
-       <logger name="ajsc.UserDefinedJarService" level="WARN" />
-       <logger name="ajsc.UserDefinedBeansDefService" level="WARN" />
-       <logger name="ajsc.LoggingConfigurationService" level="WARN" />
-       
-       <!-- AJSC related loggers (DME2 Registration, csi logging, restlet, servlet     logging) -->
-       <logger name="ajsc.utils" level="WARN" />
-       <logger name="ajsc.utils.DME2Helper" level="WARN" />
-       <logger name="ajsc.filters" level="WARN" />
-       <logger name="ajsc.beans.interceptors" level="WARN" />
-       <logger name="ajsc.restlet" level="WARN" />
-       <logger name="ajsc.servlet" level="WARN" />
-       <logger name="com.att.ajsc" level="WARN" />
-       <logger name="com.att.ajsc.csi.logging" level="WARN" />
-       <logger name="com.att.ajsc.filemonitor" level="WARN" />
-       
-       <!-- Other Loggers that may help troubleshoot -->
-       <logger name="net.sf" level="WARN" />
-       <logger name="org.apache.commons.httpclient" level="WARN" />
-       <logger name="org.apache.commons" level="WARN" />
-       <logger name="org.apache.coyote" level="WARN" />
-       <logger name="org.apache.jasper" level="WARN" />
-       
-       <!-- Camel Related Loggers (including restlet/servlet/jaxrs/cxf logging.        May aid in troubleshooting) -->
-       <logger name="org.apache.camel" level="WARN" />
-       <logger name="org.apache.cxf" level="WARN" />
-       <logger name="org.apache.camel.processor.interceptor" level="WARN" />
-       <logger name="org.apache.cxf.jaxrs.interceptor" level="WARN" />
-       <logger name="org.apache.cxf.service" level="WARN" />
-       <logger name="org.restlet" level="WARN" />
-       <logger name="org.apache.camel.component.restlet" level="WARN" />
-       
-       <!-- logback internals logging -->
-       <logger name="ch.qos.logback.classic" level="WARN" />
-       <logger name="ch.qos.logback.core" level="WARN" />
-       
-       <!-- logback jms appenders & loggers definition starts here -->
-       <appender name="auditLogs"      class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.ThresholdFilter"/>
-               <file>${logDirectory}/perf-audit/Audit-${lrmRVer}-${lrmRO}-${Pid}.log</file>
-               <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-                       <fileNamePattern>${logDirectory}/perf-audit/Audit-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip</fileNamePattern>
-                       <minIndex>1</minIndex>
-                       <maxIndex>9</maxIndex>
-               </rollingPolicy>
-               <triggeringPolicy       class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-                       <maxFileSize>5MB</maxFileSize>
-               </triggeringPolicy>
-               <encoder>
-                       <pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern>
-               </encoder>
-       </appender>
-       <appender name="perfLogs"       class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <filter class="ch.qos.logback.classic.filter.ThresholdFilter"/>
-               <file>${logDirectory}/perf-audit/Perform-${lrmRVer}-${lrmRO}-${Pid}.log</file>
-               <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-                       <fileNamePattern>${logDirectory}/perf-audit/Perform-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip</fileNamePattern>
-                       <minIndex>1</minIndex>
-                       <maxIndex>9</maxIndex>
-               </rollingPolicy>
-               <triggeringPolicy       class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-                       <maxFileSize>5MB</maxFileSize>
-               </triggeringPolicy>
-               <encoder>
-                       <pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern>
-               </encoder>
-       </appender>
-<!--   <if condition='property("JMS_BROKER").contains("WMQ")'>
-               <then>
-                       <appender name="Audit-Record-Queue" class="ajsc.JMSQueueAppender">
-                               <param name="InitialContextFactoryName" value="${JMS_WMQ_INITIAL_CONNECTION_FACTORY_NAME}" />
-                               <param name="ProviderURL" value="${JMS_WMQ_PROVIDER_URL}" />
-                               <param name="DestinationName" value="${JMS_WMQ_AUDIT_DESTINATION_NAME}" />
-                               <param name="ConnectionFactoryName" value="${JMS_WMQ_CONNECTION_FACTORY_NAME}" />
-                       </appender>
-                       <appender name="Performance-Tracker-Queue" class="ajsc.JMSQueueAppender">
-                               <param name="InitialContextFactoryName" value="${JMS_WMQ_INITIAL_CONNECTION_FACTORY_NAME}" />
-                               <param name="ProviderURL" value="${JMS_WMQ_PROVIDER_URL}" />
-                               <param name="DestinationName" value="${JMS_WMQ_PERF_DESTINATION_NAME}" />
-                               <param name="ConnectionFactoryName" value="${JMS_WMQ_CONNECTION_FACTORY_NAME}" />
-                       </appender>
-               </then>
-               <else>-->
-                       <!-- logback jms appenders definition starts here -->
-<!--                   <appender name="Audit-Record-Queue" class="ajsc.JMSQueueAppender">
-                               <param name="InitialContextFactoryName" value="com.tibco.tibjms.naming.TibjmsInitialContextFactory" />
-                               <param name="ProviderURL" value="${JMS_TIBCO_PROVIDER_URL}" />
-                               <param name="userName" value="${JMS_LOGGER_USER_NAME}" />
-                               <param name="password" value="${JMS_LOGGER_PASSWORD}" />
-                               <QueueBindingName>${JMS_LOGGER_AUDIT_QUEUE_BINDING}</QueueBindingName>
-                       </appender>
-                       <appender name="Performance-Tracker-Queue" class="ajsc.JMSQueueAppender">
-                               <param name="InitialContextFactoryName" value="com.tibco.tibjms.naming.TibjmsInitialContextFactory" />
-                               <param name="ProviderURL" value="${JMS_TIBCO_PROVIDER_URL}" />
-                               <param name="userName" value="${JMS_LOGGER_USER_NAME}" />
-                               <param name="password" value="${JMS_LOGGER_PASSWORD}" />
-                               <QueueBindingName>${JMS_LOGGER_PERF_QUEUE_BINDING}</QueueBindingName>
-                       </appender>
-               </else>
-       </if> -->
-       <appender name="ASYNC-audit" class="ch.qos.logback.classic.AsyncAppender">
-               <queueSize>1000</queueSize>
-               <discardingThreshold>0</discardingThreshold>
-               <appender-ref ref="Audit-Record-Queue" />
-       </appender>
-       <logger name="AuditRecord" level="INFO" additivity="false">
-               <appender-ref ref="ASYNC-audit" />
-               <appender-ref ref="auditLogs" />
-       </logger>
-       <logger name="AuditRecord_DirectCall" level="INFO" additivity="false">
-               <appender-ref ref="ASYNC-audit" />
-               <appender-ref ref="auditLogs" />
-       </logger>
-       <appender name="ASYNC-perf" class="ch.qos.logback.classic.AsyncAppender">
-               <queueSize>1000</queueSize>
-               <discardingThreshold>0</discardingThreshold>
-               <appender-ref ref="Performance-Tracker-Queue" />
-       </appender>
-       <logger name="PerfTrackerRecord" level="INFO" additivity="false">
-               <appender-ref ref="ASYNC-perf" />
-               <appender-ref ref="perfLogs" />
-       </logger>
-       <!-- logback jms appenders & loggers definition ends here -->
-       
-       <logger name="org.openecomp.aai.dmaap" level="DEBUG" additivity="false">
-               <appender-ref ref="dmaapAAIWorkloadConsumer" />
-               <appender-ref ref="dmaapAAIWorkloadConsumerdebug" />
-               <appender-ref ref="dmaapAAIWorkloadConsumermetric" />
-       </logger>
-       
-       <logger name="org.openecomp.aai" level="<%= @ORG_OPENECOMP_AAI_LEVEL %>" additivity="false">
-               <appender-ref ref="asyncDEBUG" />
-               <appender-ref ref="asyncERROR" />
-               <appender-ref ref="asyncMETRIC" />
-       </logger>
-       <logger name="org.openecomp.aai.AUDITLOGGER" level="INFO" additivity="false">
-                       <appender-ref ref="asyncAUDIT" /> 
-    </logger>
-    
-       <logger name="org.apache" level="WARN" />
-       <logger name="org.zookeeper" level="WARN" />
-       <logger name="com.thinkaurelius" level="WARN" />
-       
-       <!-- ============================================================================ -->
-       <!-- General EELF logger -->
-       <!-- ============================================================================ -->
-       <logger name="com.att.eelf" level="WARN" additivity="false">
-               <appender-ref ref="asyncDEBUG" />
-               <appender-ref ref="asyncERROR" />
-               <appender-ref ref="asyncMETRIC" />
-               <appender-ref ref="asyncAUDIT" />
-       </logger>
-       
-       <root level="WARN">
-               <appender-ref ref="asyncDEBUG" />
-               <appender-ref ref="asyncERROR" />
-               <appender-ref ref="asyncMETRIC" />
-               <appender-ref ref="asyncAUDIT" />
-       </root>
-</configuration>
\ No newline at end of file
old mode 100755 (executable)
new mode 100644 (file)
index 5985963..3d903ad
@@ -6,4 +6,4 @@ node_name                "chef-node"
 cookbook_path [ "/var/chef/aai-config/cookbooks" ]
 environment_path "#{env_path}"
 log_level :info
-log_location STDOUT
+log_location STDOUT
\ No newline at end of file
old mode 100755 (executable)
new mode 100644 (file)
index c30c2a5..5c64d25
   "name": "simpledemo",
   "description": "Development Environment",
   "cookbook_versions": {
-    "ajsc-aai-config":  "= 0.2.2",
-    "ajsc-aai-auth":    "= 0.2.0",
-    "user":             "= 0.1.9"
+               "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"
   },
   "json_class": "Chef::Environment",
   "chef_type": "environment",
   "default_attributes": {
-       "aai-app-config": {
-"SERVICE_API_VERSION": "1.0.1",
-"SOA_CLOUD_NAMESPACE": "org.openecomp.aai",
-"AJSC_SERVICE_NAMESPACE": "ActiveAndAvailableInventory-CloudNetwork",
-"AFTSWM_ACTION_ARTIFACT_NAME": "ajsc-aai",
-"AJSC_JETTY_ThreadCount_MAX": "500",
-"AJSC_JETTY_ThreadCount_MIN": "10",
-"AJSC_SSL_PORT": "8443",
-"AJSC_SVC_PORT": "8080",
-"KEY_MANAGER_PASSWORD": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
-"KEY_STORE_PASSWORD": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
-"MAX_HEAP_SIZE": "2056m",
-"MAX_PERM_SIZE": "512M",
-"MIN_HEAP_SIZE": "2056m",
-"PERM_SIZE": "512M",
-"PRE_JVM_ARGS": "-XX:+UnlockDiagnosticVMOptions -XX:+UnsyncloadClass -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=70 -XX:+ScavengeBeforeFullGC -XX:+CMSScavengeBeforeRemark -XX:-HeapDumpOnOutOfMemoryError -XX:+UseParNewGC -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps",
-"AAIENV": "simpledemo",
-"PROJECT_HOME": "/opt/app/aai",
-"LOGROOT": "/opt/aai/logroot",
-"JAVA_HOME": "/usr/lib/jvm/java-8-openjdk-amd64",
-"AAI_SERVER_URL_BASE": "https://aai-service.onap-aai:8443/aai/",
-"AAI_SERVER_URL": "https://aai-service.onap-aai:8443/aai/v8/",
-"AAI_GLOBAL_CALLBACK_URL": "https://aai-service.onap-aai:8443/aai/",
-"AAI_TRUSTSTORE_FILENAME": "aai_keystore",
-"AAI_TRUSTSTORE_PASSWD_X": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
-"AAI_KEYSTORE_FILENAME": "aai_keystore",
-"AAI_KEYSTORE_PASSWD_X": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
-"STORAGE_HOSTNAME": "hbase",
-"STORAGE_BACKEND": "hbase",
-"STORAGE_HBASE_TABLE": "aaigraph.dev",
-"STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT": "/hbase",
-"TXN_HBASE_TABLE_NAME": "aailogging.dev",
-"HBASE_COLUMN_TTL_DAYS": "15",
-"TXN_ZOOKEEPER_QUORUM": "hbase",
-"TXN_ZOOKEEPER_PROPERTY_CLIENTPORT": "2181",
-"TXN_HBASE_ZOOKEEPER_ZNODE_PARENT": "/hbase",
-"APPLICATION_SERVERS": "aai-service.onap-aai",
-"AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS": "UNPROCESSED",
-"AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_TYPE": "AAI-EVENT",
-"AAI_NOTIFICATION_EVENT_DEFAULT_DOMAIN": "dev",
-"AAI_NOTIFICATION_EVENT_DEFAULT_SOURCE_NAME": "aai",
-"AAI_NOTIFICATION_EVENT_DEFAULT_SEQUENCE_NUMBER": "0",
-"AAI_NOTIFICATION_EVENT_DEFAULT_SEVERITY": "NORMAL",
-"AAI_NOTIFICATION_EVENT_DEFAULT_VERSION": "v8",
-"AAI_NOTIFICATION_CURRENT_VERSION": "v8",
-"RESOURCE_VERSION_ENABLE_FLAG": "true",
-"AAI_DEFAULT_API_VERSION": "v8",
-"AAI_DMAPP_WORKLOAD_ENABLE_EVENT_PROCESSING": "false",
-"AAI_WORKLOAD_SERVICE_NAME": "",
-"AAI_WORKLOAD_ENVIRONMENT": "TEST",
-"AAI_WORKLOAD_USERNAME": "",
-"AAI_WORKLOAD_PASSWORD": "",
-"AAI_WORKLOAD_HOST": "",
-"AAI_WORKLOAD_AFT_DME2_EXCHANGE_REQUEST_HANDLERS": "",
-"AAI_WORKLOAD_AFT_DME2_EXCHANGE_REPLY_HANDLERS": "",
-"AAI_WORKLOAD_AFT_DME2_REQ_TRACE_ON": "true",
-"AAI_WORKLOAD_AFT_ENVIRONMENT": "AFTUAT",
-"AAI_WORKLOAD_AFT_DME2_EP_CONN_TIMEOUT": "15000",
-"AAI_WORKLOAD_AFT_DME2_ROUNDTRIP_TIMEOUT_MS": "240000",
-"AAI_WORKLOAD_AFT_DME2_EP_READ_TIMEOUT_MS": "50000",
-"AAI_WORKLOAD_SESSION_STICKINESS_REQUIRED": "no",
-"AAI_WORKLOAD_DME2_PREFERRED_ROUTER_FILE_PATH": "/opt/app/aai/bundleconfig/etc/appprops/preferredRoute.txt",
-"AAI_WORKLOAD_PARTNER": "BOT_R",
-"AAI_WORKLOAD_ROUTE_OFFER": "MR1",
-"AAI_WORKLOAD_PROTOCOL": "http",
-"AAI_WORKLOAD_TOPIC": "",
-"AAI_WORKLOAD_ID": "aaiConsumerId",
-"AAI_WORKLOAD_TIMEOUT": "15000",
-"AAI_WORKLOAD_LIMIT": "1000",
-"AAI_WORKLOAD_STATUS_PUBLISHER_TOPIC": "",
-"AAI_WORKLOAD_MAX_BATCH_SIZE": "100",
-"AAI_WORKLOAD_MAX_AGE_MS": "250",
-"AAI_WORKLOAD_MESSAGE_SENT_THREAD_OCCURANCE": "50",
-"AAI_WORKLOAD_PREFERRED_ROUTE_KEY": "MR1"
+    "aai-traversal-config": {
+               "SERVICE_API_VERSION": "1.0.1",
+               "SOA_CLOUD_NAMESPACE": "org.openecomp.aai",
+               "AJSC_SERVICE_NAMESPACE": "traversal",
+               "AFTSWM_ACTION_ARTIFACT_NAME": "traversal",
+               "AJSC_JETTY_ThreadCount_MAX": "500",
+               "AJSC_JETTY_ThreadCount_MIN": "10",
+               "AJSC_SSL_PORT": "8446",
+               "AJSC_SVC_PORT": "8083",
+               "KEY_MANAGER_PASSWORD": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
+               "KEY_STORE_PASSWORD": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
+               "MAX_HEAP_SIZE": "2056m",
+               "MAX_PERM_SIZE": "512M",
+               "MIN_HEAP_SIZE": "2056m",
+               "PERM_SIZE": "512M",
+               "PRE_JVM_ARGS": "-XX:+UnlockDiagnosticVMOptions -XX:+UnsyncloadClass -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=70 -XX:+ScavengeBeforeFullGC -XX:+CMSScavengeBeforeRemark -XX:-HeapDumpOnOutOfMemoryError -XX:+UseParNewGC -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps",
+               "AAIENV": "dev",
+               "PROJECT_HOME": "/opt/app/aai-traversal",
+               "LOGROOT": "/opt/aai/logroot",
+               "JAVA_HOME": "/usr/lib/jvm/java-8-openjdk-amd64",
+               "AAI_SERVER_URL_BASE": "https://aai-service.onap-aai:8443/aai/",
+               "AAI_SERVER_URL": "https://aai-service.onap-aai:8443/aai/v11/",
+               "AAI_GLOBAL_CALLBACK_URL": "https://aai-service.onap-aai:8443/aai/",
+               "AAI_TRUSTSTORE_FILENAME": "aai_keystore",
+               "AAI_TRUSTSTORE_PASSWD_X": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
+               "AAI_KEYSTORE_FILENAME": "aai_keystore",
+               "AAI_KEYSTORE_PASSWD_X": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
+               "APPLICATION_SERVERS": "aai-service.onap-aai",
+               "AAI_DMAAP_PROTOCOL": "http",
+               "AAI_DMAAP_HOST_PORT": "dmaap.onap-message-router:3904",
+               "AAI_DMAAP_TOPIC_NAME": "AAI-EVENT",
+               "AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS": "UNPROCESSED",
+               "AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_TYPE": "AAI-EVENT",
+               "AAI_NOTIFICATION_EVENT_DEFAULT_DOMAIN": "dev",
+               "AAI_NOTIFICATION_EVENT_DEFAULT_SOURCE_NAME": "aai",
+               "AAI_NOTIFICATION_EVENT_DEFAULT_SEQUENCE_NUMBER": "0",
+               "AAI_NOTIFICATION_EVENT_DEFAULT_SEVERITY": "NORMAL",
+               "AAI_NOTIFICATION_EVENT_DEFAULT_VERSION": "v11",
+               "AAI_NOTIFICATION_CURRENT_VERSION": "v11",
+               "RESOURCE_VERSION_ENABLE_FLAG": "true",
+               "TXN_HBASE_TABLE_NAME": "aailogging.dev",
+               "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",
+               "STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT": "/hbase",
+               "DB_CACHE_CLEAN_WAIT": "20",
+               "DB_CACHE_TIME": "180000",
+               "DB_CACHE_SIZE": "0.3",
+               "AAI_DEFAULT_API_VERSION": "v11"
+    },
+        "aai-resources-config": {
+               "SERVICE_API_VERSION": "1.0.1",
+               "AJSC_SERVICE_NAMESPACE": "aai-resources",
+               "AFTSWM_ACTION_ARTIFACT_NAME": "aai-resources",
+               "AJSC_JETTY_ThreadCount_MAX": "500",
+               "AJSC_JETTY_ThreadCount_MIN": "10",
+               "AJSC_SSL_PORT": "8447",
+               "AJSC_SVC_PORT": "8087",
+               "KEY_MANAGER_PASSWORD": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
+               "KEY_STORE_PASSWORD": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
+               "MAX_HEAP_SIZE": "2056m",
+               "MAX_PERM_SIZE": "512M",
+               "MIN_HEAP_SIZE": "2056m",
+               "PERM_SIZE": "512M",
+               "PRE_JVM_ARGS": "-XX:+UnlockDiagnosticVMOptions -XX:+UnsyncloadClass -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=70 -XX:+ScavengeBeforeFullGC -XX:+CMSScavengeBeforeRemark -XX:-HeapDumpOnOutOfMemoryError -XX:+UseParNewGC -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps",
+               "AAIENV": "dev",
+               "PROJECT_HOME": "/opt/app/aai-resources",
+               "LOGROOT": "/opt/aai/logroot",
+               "JAVA_HOME": "/usr/lib/jvm/java-8-openjdk-amd64",
+               "AAI_SERVER_URL_BASE": "https://aai-service.onap-aai:8443/aai/",
+               "AAI_SERVER_URL": "https://aai-service.onap-aai:8443/aai/v11/",
+               "AAI_GLOBAL_CALLBACK_URL": "https://aai-service.onap-aai:8443/aai/",
+               "AAI_TRUSTSTORE_FILENAME": "aai_keystore",
+               "AAI_TRUSTSTORE_PASSWD_X": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
+               "AAI_KEYSTORE_FILENAME": "aai_keystore",
+               "AAI_KEYSTORE_PASSWD_X": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
+               "APPLICATION_SERVERS": "aai-service.onap-aai",
+               "AAI_DMAAP_PROTOCOL": "http",
+               "AAI_DMAAP_HOST_PORT": "dmaap.onap-message-router:3904",
+               "AAI_DMAAP_TOPIC_NAME": "AAI-EVENT",
+               "AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS": "UNPROCESSED",
+               "AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_TYPE": "AAI-EVENT",
+               "AAI_NOTIFICATION_EVENT_DEFAULT_DOMAIN": "dev",
+               "AAI_NOTIFICATION_EVENT_DEFAULT_SOURCE_NAME": "aai",
+               "AAI_NOTIFICATION_EVENT_DEFAULT_SEQUENCE_NUMBER": "0",
+               "AAI_NOTIFICATION_EVENT_DEFAULT_SEVERITY": "NORMAL",
+               "AAI_NOTIFICATION_EVENT_DEFAULT_VERSION": "v11",
+               "AAI_NOTIFICATION_CURRENT_VERSION": "v11",              
+               "RESOURCE_VERSION_ENABLE_FLAG": "true",
+               "TXN_HBASE_TABLE_NAME": "aailogging.dev",
+               "TXN_ZOOKEEPER_QUORUM": "hbase.onap-aai",
+               "TXN_ZOOKEEPER_PROPERTY_CLIENTPORT": "2181",
+               "TXN_HBASE_ZOOKEEPER_ZNODE_PARENT": "/hbase",
+               "AAI_WORKLOAD_PREFERRED_ROUTE_KEY": "MR1",
+               "STORAGE_HOSTNAME": "hbase.onap-aai",
+               "STORAGE_HBASE_TABLE": "aaigraph.dev",
+               "STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT": "/hbase",
+               "DB_CACHE_CLEAN_WAIT": "20",
+               "DB_CACHE_TIME": "180000",
+               "DB_CACHE_SIZE": "0.3",
+               "AAI_DEFAULT_API_VERSION": "v11"
     }
   },
   "override_attributes": {
old mode 100755 (executable)
new mode 100644 (file)
index eb8859d..fb8e91b
   "name": "local",
   "description": "Development Environment",
   "cookbook_versions": {
-    "ajsc-aai-config":  "= 0.2.2",
-    "ajsc-aai-auth":    "= 0.2.0",
-    "user":             "= 0.1.9"
+               "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"
   },
   "json_class": "Chef::Environment",
   "chef_type": "environment",
   "default_attributes": {
-       "aai-app-config": {
-"SERVICE_API_VERSION": "1.0.1",
-"SOA_CLOUD_NAMESPACE": "org.openecomp.aai",
-"AJSC_SERVICE_NAMESPACE": "ActiveAndAvailableInventory-CloudNetwork",
-"AFTSWM_ACTION_ARTIFACT_NAME": "ajsc-aai",
-"AJSC_JETTY_ThreadCount_MAX": "500",
-"AJSC_JETTY_ThreadCount_MIN": "10",
-"AJSC_SSL_PORT": "8443",
-"AJSC_SVC_PORT": "8080",
-"KEY_MANAGER_PASSWORD": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
-"KEY_STORE_PASSWORD": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
-"MAX_HEAP_SIZE": "2056m",
-"MAX_PERM_SIZE": "512M",
-"MIN_HEAP_SIZE": "2056m",
-"PERM_SIZE": "512M",
-"PRE_JVM_ARGS": "-XX:+UnlockDiagnosticVMOptions -XX:+UnsyncloadClass -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=70 -XX:+ScavengeBeforeFullGC -XX:+CMSScavengeBeforeRemark -XX:-HeapDumpOnOutOfMemoryError -XX:+UseParNewGC -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps",
-"AAIENV": "dev",
-"PROJECT_HOME": "/opt/app/aai",
-"LOGROOT": "/opt/aai/logroot",
-"JAVA_HOME": "/usr/lib/jvm/java-8-openjdk-amd64",
-"AAI_SERVER_URL_BASE": "https://localhost:8443/aai/",
-"AAI_SERVER_URL": "https://localhost:8443/aai/v8/",
-"AAI_GLOBAL_CALLBACK_URL": "https://localhost:8443/aai/",
-"AAI_TRUSTSTORE_FILENAME": "aai_keystore",
-"AAI_TRUSTSTORE_PASSWD_X": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
-"AAI_KEYSTORE_FILENAME": "aai_keystore",
-"AAI_KEYSTORE_PASSWD_X": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
-"STORAGE_HOSTNAME": "localhost",
-"STORAGE_BACKEND": "hbase",
-"STORAGE_HBASE_TABLE": "aaigraph.dev",
-"STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT": "/hbase",
-"TXN_HBASE_TABLE_NAME": "aailogging.dev",
-"HBASE_COLUMN_TTL_DAYS": "15",
-"TXN_ZOOKEEPER_QUORUM": "localhost",
-"TXN_ZOOKEEPER_PROPERTY_CLIENTPORT": "2181",
-"TXN_HBASE_ZOOKEEPER_ZNODE_PARENT": "/hbase",
-"APPLICATION_SERVERS": "localhost",
-"AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS": "UNPROCESSED",
-"AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_TYPE": "AAI-EVENT",
-"AAI_NOTIFICATION_EVENT_DEFAULT_DOMAIN": "dev",
-"AAI_NOTIFICATION_EVENT_DEFAULT_SOURCE_NAME": "aai",
-"AAI_NOTIFICATION_EVENT_DEFAULT_SEQUENCE_NUMBER": "0",
-"AAI_NOTIFICATION_EVENT_DEFAULT_SEVERITY": "NORMAL",
-"AAI_NOTIFICATION_EVENT_DEFAULT_VERSION": "v8",
-"AAI_NOTIFICATION_CURRENT_VERSION": "v8",
-"RESOURCE_VERSION_ENABLE_FLAG": "true",
-"AAI_DEFAULT_API_VERSION": "v8",
-"AAI_DMAPP_WORKLOAD_ENABLE_EVENT_PROCESSING": "false",
-"AAI_WORKLOAD_SERVICE_NAME": "",
-"AAI_WORKLOAD_ENVIRONMENT": "TEST",
-"AAI_WORKLOAD_USERNAME": "",
-"AAI_WORKLOAD_PASSWORD": "",
-"AAI_WORKLOAD_HOST": "",
-"AAI_WORKLOAD_AFT_DME2_EXCHANGE_REQUEST_HANDLERS": "",
-"AAI_WORKLOAD_AFT_DME2_EXCHANGE_REPLY_HANDLERS": "",
-"AAI_WORKLOAD_AFT_DME2_REQ_TRACE_ON": "true",
-"AAI_WORKLOAD_AFT_ENVIRONMENT": "AFTUAT",
-"AAI_WORKLOAD_AFT_DME2_EP_CONN_TIMEOUT": "15000",
-"AAI_WORKLOAD_AFT_DME2_ROUNDTRIP_TIMEOUT_MS": "240000",
-"AAI_WORKLOAD_AFT_DME2_EP_READ_TIMEOUT_MS": "50000",
-"AAI_WORKLOAD_SESSION_STICKINESS_REQUIRED": "no",
-"AAI_WORKLOAD_DME2_PREFERRED_ROUTER_FILE_PATH": "/opt/app/aai/bundleconfig/etc/appprops/preferredRoute.txt",
-"AAI_WORKLOAD_PARTNER": "BOT_R",
-"AAI_WORKLOAD_ROUTE_OFFER": "MR1",
-"AAI_WORKLOAD_PROTOCOL": "http",
-"AAI_WORKLOAD_TOPIC": "",
-"AAI_WORKLOAD_ID": "aaiConsumerId",
-"AAI_WORKLOAD_TIMEOUT": "15000",
-"AAI_WORKLOAD_LIMIT": "1000",
-"AAI_WORKLOAD_STATUS_PUBLISHER_TOPIC": "",
-"AAI_WORKLOAD_MAX_BATCH_SIZE": "100",
-"AAI_WORKLOAD_MAX_AGE_MS": "250",
-"AAI_WORKLOAD_MESSAGE_SENT_THREAD_OCCURANCE": "50",
-"AAI_WORKLOAD_PREFERRED_ROUTE_KEY": "MR1"
+    "aai-traversal-config": {
+               "SERVICE_API_VERSION": "1.0.1",
+               "AJSC_SERVICE_NAMESPACE": "traversal",
+               "AFTSWM_ACTION_ARTIFACT_NAME": "traversal",
+               "AJSC_JETTY_ThreadCount_MAX": "500",
+               "AJSC_JETTY_ThreadCount_MIN": "10",
+               "AJSC_SSL_PORT": "8446",
+               "AJSC_SVC_PORT": "8083",
+               "KEY_MANAGER_PASSWORD": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
+               "KEY_STORE_PASSWORD": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
+               "MAX_HEAP_SIZE": "2056m",
+               "MAX_PERM_SIZE": "512M",
+               "MIN_HEAP_SIZE": "2056m",
+               "PERM_SIZE": "512M",
+               "PRE_JVM_ARGS": "-XX:+UnlockDiagnosticVMOptions -XX:+UnsyncloadClass -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=70 -XX:+ScavengeBeforeFullGC -XX:+CMSScavengeBeforeRemark -XX:-HeapDumpOnOutOfMemoryError -XX:+UseParNewGC -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps",
+               "AAIENV": "dev",
+               "PROJECT_HOME": "/opt/app/aai-traversal",
+               "LOGROOT": "/opt/aai/logroot",
+               "JAVA_HOME": "/usr/lib/jvm/java-8-openjdk-amd64",
+               "AAI_SERVER_URL_BASE": "https://localhost:8443/aai/",
+               "AAI_SERVER_URL": "https://localhost:8443/aai/v11/",
+               "AAI_GLOBAL_CALLBACK_URL": "https://localhost:8443/aai/",
+               "AAI_TRUSTSTORE_FILENAME": "aai_keystore",
+               "AAI_TRUSTSTORE_PASSWD_X": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
+               "AAI_KEYSTORE_FILENAME": "aai_keystore",
+               "AAI_KEYSTORE_PASSWD_X": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
+               "APPLICATION_SERVERS": "localhost",
+               "AAI_DMAAP_PROTOCOL": "http",
+               "AAI_DMAAP_HOST_PORT": "localhost:3904",
+               "AAI_DMAAP_TOPIC_NAME": "AAI-EVENT",
+               "AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS": "UNPROCESSED",
+               "AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_TYPE": "AAI-EVENT",
+               "AAI_NOTIFICATION_EVENT_DEFAULT_DOMAIN": "dev",
+               "AAI_NOTIFICATION_EVENT_DEFAULT_SOURCE_NAME": "aai",
+               "AAI_NOTIFICATION_EVENT_DEFAULT_SEQUENCE_NUMBER": "0",
+               "AAI_NOTIFICATION_EVENT_DEFAULT_SEVERITY": "NORMAL",
+               "AAI_NOTIFICATION_EVENT_DEFAULT_VERSION": "v11",
+               "AAI_NOTIFICATION_CURRENT_VERSION": "v11",
+               "RESOURCE_VERSION_ENABLE_FLAG": "true",
+               "TXN_HBASE_TABLE_NAME": "aailogging.dev",
+               "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",
+               "STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT": "/hbase",
+               "DB_CACHE_CLEAN_WAIT": "20",
+               "DB_CACHE_TIME": "180000",
+               "DB_CACHE_SIZE": "0.3",
+               "AAI_DEFAULT_API_VERSION": "v11"
+    },
+        "aai-resources-config": {
+               "SERVICE_API_VERSION": "1.0.1",
+               "AJSC_SERVICE_NAMESPACE": "aai-resources",
+               "AFTSWM_ACTION_ARTIFACT_NAME": "aai-resources",
+               "AJSC_JETTY_ThreadCount_MAX": "500",
+               "AJSC_JETTY_ThreadCount_MIN": "10",
+               "AJSC_SSL_PORT": "8447",
+               "AJSC_SVC_PORT": "8087",
+               "KEY_MANAGER_PASSWORD": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
+               "KEY_STORE_PASSWORD": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
+               "MAX_HEAP_SIZE": "2056m",
+               "MAX_PERM_SIZE": "512M",
+               "MIN_HEAP_SIZE": "2056m",
+               "PERM_SIZE": "512M",
+               "PRE_JVM_ARGS": "-XX:+UnlockDiagnosticVMOptions -XX:+UnsyncloadClass -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=70 -XX:+ScavengeBeforeFullGC -XX:+CMSScavengeBeforeRemark -XX:-HeapDumpOnOutOfMemoryError -XX:+UseParNewGC -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps",
+               "AAIENV": "dev",
+               "PROJECT_HOME": "/opt/app/aai-resources",
+               "LOGROOT": "/opt/aai/logroot",
+               "JAVA_HOME": "/usr/lib/jvm/java-8-openjdk-amd64",
+               "AAI_SERVER_URL_BASE": "https://localhost:8443/aai/",
+               "AAI_SERVER_URL": "https://localhost:8443/aai/v11/",
+               "AAI_GLOBAL_CALLBACK_URL": "https://localhost:8443/aai/",
+               "AAI_TRUSTSTORE_FILENAME": "aai_keystore",
+               "AAI_TRUSTSTORE_PASSWD_X": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
+               "AAI_KEYSTORE_FILENAME": "aai_keystore",
+               "AAI_KEYSTORE_PASSWD_X": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
+               "APPLICATION_SERVERS": "localhost",
+               "AAI_DMAAP_PROTOCOL": "http",
+               "AAI_DMAAP_HOST_PORT": "localhost:3904",
+               "AAI_DMAAP_TOPIC_NAME": "AAI-EVENT",
+               "AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS": "UNPROCESSED",
+               "AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_TYPE": "AAI-EVENT",
+               "AAI_NOTIFICATION_EVENT_DEFAULT_DOMAIN": "dev",
+               "AAI_NOTIFICATION_EVENT_DEFAULT_SOURCE_NAME": "aai",
+               "AAI_NOTIFICATION_EVENT_DEFAULT_SEQUENCE_NUMBER": "0",
+               "AAI_NOTIFICATION_EVENT_DEFAULT_SEVERITY": "NORMAL",
+               "AAI_NOTIFICATION_EVENT_DEFAULT_VERSION": "v11",
+               "AAI_NOTIFICATION_CURRENT_VERSION": "v11",
+               "RESOURCE_VERSION_ENABLE_FLAG": "true",
+               "TXN_HBASE_TABLE_NAME": "aailogging.dev",
+               "TXN_ZOOKEEPER_QUORUM": "localhost",
+               "TXN_ZOOKEEPER_PROPERTY_CLIENTPORT": "2181",
+               "TXN_HBASE_ZOOKEEPER_ZNODE_PARENT": "/hbase",
+               "AAI_WORKLOAD_PREFERRED_ROUTE_KEY": "MR1",
+               "STORAGE_HOSTNAME": "localhost",
+               "STORAGE_HBASE_TABLE": "aaigraph.dev",
+               "STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT": "/hbase",
+               "DB_CACHE_CLEAN_WAIT": "20",
+               "DB_CACHE_TIME": "180000",
+               "DB_CACHE_SIZE": "0.3",
+               "AAI_DEFAULT_API_VERSION": "v11"
     }
   },
   "override_attributes": {
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
new file mode 100755 (executable)
index 0000000..059ef45
--- /dev/null
@@ -0,0 +1,56 @@
+###
+# ============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
new file mode 100755 (executable)
index 0000000..60268f6
--- /dev/null
@@ -0,0 +1,47 @@
+###
+# ============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/auth/client-cert-onap.p12 b/kubernetes/config/docker/init/src/config/aai/data-router/appconfig/auth/client-cert-onap.p12
new file mode 100644 (file)
index 0000000..dbf4fca
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/aai/data-router/appconfig/auth/client-cert-onap.p12 differ
diff --git a/kubernetes/config/docker/init/src/config/aai/data-router/appconfig/auth/data-router_policy.json b/kubernetes/config/docker/init/src/config/aai/data-router/appconfig/auth/data-router_policy.json
new file mode 100644 (file)
index 0000000..1b4a6b0
--- /dev/null
@@ -0,0 +1,18 @@
+{
+       "roles": [
+               {
+                       "name": "admin",
+                       "functions": [
+                               {
+                                       "name": "search", "methods": [ { "name": "GET" },{ "name": "DELETE" }, { "name": "PUT" }, { "name": "POST" } ]
+                               }
+                       ],
+
+                       "users": [
+                               {
+                                       "username": "CN=ONAP, OU=ONAP, O=ONAP, L=Ottawa, ST=Ontario, C=CA"
+                               }
+                       ]
+               }
+       ]
+}
diff --git a/kubernetes/config/docker/init/src/config/aai/data-router/appconfig/auth/tomcat_keystore b/kubernetes/config/docker/init/src/config/aai/data-router/appconfig/auth/tomcat_keystore
new file mode 100644 (file)
index 0000000..9eec841
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/aai/data-router/appconfig/auth/tomcat_keystore differ
diff --git a/kubernetes/config/docker/init/src/config/aai/data-router/appconfig/data-router.properties b/kubernetes/config/docker/init/src/config/aai/data-router/appconfig/data-router.properties
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/aai/data-router/appconfig/model/aai_oxm_v10.xml b/kubernetes/config/docker/init/src/config/aai/data-router/appconfig/model/aai_oxm_v10.xml
new file mode 100644 (file)
index 0000000..7eddd10
--- /dev/null
@@ -0,0 +1,5558 @@
+<?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.openecomp.org.v10" xml-mapping-metadata-complete="true">
+       <xml-schema element-form-default="QUALIFIED">
+               <xml-ns namespace-uri="http://org.openecomp.aai.inventory/v10" />
+       </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.openecomp.org.v10.Search" />
+                               <xml-element java-attribute="actions" name="actions" type="inventory.aai.openecomp.org.v10.Actions" />
+                               <xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.openecomp.org.v10.CloudInfrastructure" />
+                               <xml-element java-attribute="business" name="business" type="inventory.aai.openecomp.org.v10.Business" />
+                               <xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.openecomp.org.v10.ServiceDesignAndCreation" />
+                               <xml-element java-attribute="network" name="network" type="inventory.aai.openecomp.org.v10.Network" />
+                               <xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.openecomp.org.v10.AaiInternal" />
+                               <xml-element java-attribute="nodes" name="nodes" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.EdgeTagQueryResult" />
+                               <xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.openecomp.org.v10.EdgeTagQueryRequest" />
+                               <xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.openecomp.org.v10.SearchResults" />
+                               <xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.InventoryItemData" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.StartNodeFilter" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.openecomp.org.v10.IncludeNodeFilter" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.OamNetworks" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.DvsSwitches" />
+                               <xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.Update" />
+                               <xml-element java-attribute="notify" name="notify" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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="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.openecomp.org.v10.Complexes" />
+                               <xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.openecomp.org.v10.CloudRegions" />
+                               <xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.openecomp.org.v10.NetworkProfiles" />
+                               <xml-element java-attribute="pservers" name="pservers" type="inventory.aai.openecomp.org.v10.Pservers" />
+                               <xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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 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.openecomp.org.v10.VolumeGroups" />
+                               <xml-element java-attribute="tenants" name="tenants" type="inventory.aai.openecomp.org.v10.Tenants" />
+                               <xml-element java-attribute="flavors" name="flavors" type="inventory.aai.openecomp.org.v10.Flavors" />
+                               <xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.openecomp.org.v10.GroupAssignments" />
+                               <xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.openecomp.org.v10.Snapshots" />
+                               <xml-element java-attribute="images" name="images" type="inventory.aai.openecomp.org.v10.Images" />
+                               <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.openecomp.org.v10.DvsSwitches" />
+                               <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.openecomp.org.v10.OamNetworks" />
+                               <xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.openecomp.org.v10.AvailabilityZones" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation. In AT&amp;Ts AIC cloud, this could be an LCP or DCP. Cloud regions are uniquely identified by a composite key, cloud-owner + cloud-region-id. The format of the cloud-owner is vendor-cloudname and we will use att-aic for AT&amp;T's AIC." />
+                               <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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.RelationshipData" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.CtagPools" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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="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.openecomp.org.v10.Vservers" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.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" />
+                               <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.openecomp.org.v10.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.openecomp.org.v10.Volumes" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                               <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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="vlans" name="vlans" type="inventory.aai.openecomp.org.v10.Vlans" />
+                               <xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.openecomp.org.v10.SriovVfs" />
+                               <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v10.LInterfaces" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.openecomp.org.v10.L3InterfaceIpv4AddressList" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.openecomp.org.v10.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,vpe,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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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" />
+                       </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.openecomp.org.v10.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="vpnId" name="vpn-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="This indicates the customers VPN ID associated with this vlan" />
+                                               <xml-property name="dbAlias" value="vpn-id-local" />
+                                       </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="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.openecomp.org.v10.L3InterfaceIpv4AddressList" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.openecomp.org.v10.L3InterfaceIpv6AddressList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Definition of vlan" />
+                               <xml-property name="indexedProps" value="vlan-interface,vlan-id-inner,vpn-id" />
+                               <xml-property name="uniqueProps" value="vpn-id" />
+                               <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.openecomp.org.v10.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" />
+                       </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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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="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.openecomp.org.v10.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.openecomp.org.v10.RelationshipList" />
+                               <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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 VPEs." />
+                       </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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                               <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.openecomp.org.v10.PInterfaces" />
+                               <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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="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="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                               <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.RelationshipList" />
+                               <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v10.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,vpe,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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.Connectors" />
+                               <xml-element java-attribute="customers" name="customers" type="inventory.aai.openecomp.org.v10.Customers" />
+                       </java-attributes>
+               </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.openecomp.org.v10.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="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="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.openecomp.org.v10.RelationshipList" />
+                               <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.ServiceSubscriptions" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.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="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.openecomp.org.v10.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.openecomp.org.v10.ServiceInstances">
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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="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="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="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.openecomp.org.v10.RelationshipList" />
+                               <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v10.Metadata" />
+                               <xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.openecomp.org.v10.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" />
+                               <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.openecomp.org.v10.VnfImages" />
+                               <xml-element java-attribute="services" name="services" type="inventory.aai.openecomp.org.v10.Services" />
+                               <xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.openecomp.org.v10.ServiceCapabilities" />
+                               <xml-element java-attribute="models" name="models" type="inventory.aai.openecomp.org.v10.Models" />
+                               <xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.LogicalLinks" />
+                               <xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.openecomp.org.v10.SitePairSets" />
+                               <xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.openecomp.org.v10.VpnBindings" />
+                               <xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.openecomp.org.v10.VplsPes" />
+                               <xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.openecomp.org.v10.MulticastConfigurations" />
+                               <xml-element java-attribute="vces" name="vces" type="inventory.aai.openecomp.org.v10.Vces" />
+                               <xml-element java-attribute="vpes" name="vpes" type="inventory.aai.openecomp.org.v10.Vpes" />
+                               <xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.openecomp.org.v10.Vnfcs" />
+                               <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.openecomp.org.v10.L3Networks" />
+                               <xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.openecomp.org.v10.NetworkPolicies" />
+                               <xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.openecomp.org.v10.GenericVnfs" />
+                               <xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.openecomp.org.v10.LagLinks" />
+                               <xml-element java-attribute="newvces" name="newvces" type="inventory.aai.openecomp.org.v10.Newvces" />
+                               <xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.openecomp.org.v10.Pnfs" />
+                               <xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.openecomp.org.v10.PhysicalLinks" />
+                               <xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.openecomp.org.v10.IpsecConfigurations" />
+                               <xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.openecomp.org.v10.RouteTableReferences" />
+                               <xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.openecomp.org.v10.InstanceGroups" />
+                               <xml-element java-attribute="zones" name="zones" type="inventory.aai.openecomp.org.v10.Zones" />
+                       </java-attributes>
+               </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.openecomp.org.v10.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 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="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="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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.RoutingInstances" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.SitePairs" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="indexedProps" value="routing-instance-id" />
+                               <xml-property name="uniqueProps" 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.openecomp.org.v10.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, 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.openecomp.org.v10.ClassesOfService" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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="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.openecomp.org.v10.RouteTargets" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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 vpe, also used for troubleshooting and is IP used for traps generated by VPE (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.openecomp.org.v10.RelationshipList" />
+                               <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.openecomp.org.v10.PInterfaces" />
+                               <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.PortGroups" />
+                               <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.openecomp.org.v10.Licenses" />
+                               <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.openecomp.org.v10.Entitlements" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.CvlanTags" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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="Vpes">
+                       <xml-properties>
+                               <xml-property name="description" value="Virtual provider edge router. In 1504, A&amp;AI will populate this object through an M&amp;P and tool provided to operations." />
+                       </xml-properties>
+                       <xml-root-element name="vpes" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="vpe" name="vpe" type="inventory.aai.openecomp.org.v10.Vpe" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="Vpe">
+                       <xml-root-element name="vpe" />
+                       <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 map strictly 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.  See child relationships." />
+                                       </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, 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="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-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="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="v4Loopback0IpAddress" name="v4-loopback0-ip-address" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Loopback0 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 stag to get to VCE" />
+                                       </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 VPE" />
+                                       </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 vpe 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 vpe access uses SSH" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                               <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v10.LInterfaces" />
+                               <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v10.LagInterfaces" />
+                               <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.openecomp.org.v10.Licenses" />
+                               <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.openecomp.org.v10.Entitlements" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Relationship-list must include related to info for complex." />
+                               <xml-property name="nameProps" value="vnf-name" />
+                               <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,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="vpes" />
+                               <xml-property name="namespace" value="network" />
+                               <xml-property name="extends" value="vnf" />
+                       </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.openecomp.org.v10.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="vnfcFunctionCode" name="vnfc-function-code" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="function code" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vnfcType" name="vnfc-type" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="type" />
+                                       </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="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.openecomp.org.v10.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="indexedProps" value="vnfc-name,prov-status,vnfc-type,vnfc-function-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation" />
+                               <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.openecomp.org.v10.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="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="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.openecomp.org.v10.Subnets" />
+                               <xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.openecomp.org.v10.CtagAssignments" />
+                               <xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.openecomp.org.v10.SegmentationAssignments" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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="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.openecomp.org.v10.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.openecomp.org.v10.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 company 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 in some usecases" />
+                                       </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 in some usecases" />
+                                       </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 in some usecases" />
+                                       </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 in some usecases" />
+                                       </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 in some usecases" />
+                                       </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 in some usecases" />
+                                       </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="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="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-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-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="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+                               <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v10.LInterfaces" />
+                               <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v10.LagInterfaces" />
+                               <xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.openecomp.org.v10.VfModules" />
+                               <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.openecomp.org.v10.Licenses" />
+                               <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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="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="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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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 vpe, also used for troubleshooting and is IP used for traps generated by VPE (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., VPE." />
+                                       </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.openecomp.org.v10.RelationshipList" />
+                               <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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 company 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.openecomp.org.v10.RelationshipList" />
+                               <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.openecomp.org.v10.PInterfaces" />
+                               <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v10.LagInterfaces" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world." />
+                               <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.openecomp.org.v10.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="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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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="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,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.openecomp.org.v10.RelationshipList" />
+                               <xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.ReservedPropNames" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.openecomp.org.v10.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="isParent" name="isParent" type="java.lang.Boolean" />
+                               <xml-element java-attribute="usesResource" name="usesResource" type="java.lang.Boolean" />
+                               <xml-element java-attribute="hasDelTarget" name="hasDelTarget" type="java.lang.Boolean" />
+                               <xml-element java-attribute="SVC-INFRA" name="SVC-INFRA" type="java.lang.Boolean" />
+                               <xml-element java-attribute="SVC-INFRA-REV" name="SVC-INFRA-REV" type="java.lang.Boolean" />
+                       </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.openecomp.org.v10.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.openecomp.org.v10.ModelVers" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.ModelElements" />
+                               <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v10.Metadata" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.ElementChoiceSets" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.ModelElements" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.NamedQueryElements" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.NamedQueryElements" />
+                               <xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.openecomp.org.v10.RelatedLookups" />
+                               <xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.openecomp.org.v10.PropertyConstraints" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.QueryParameters" />
+                               <xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.openecomp.org.v10.InstanceFilters" />
+                               <xml-element java-attribute="secondaryFilts" name="secondary-filts" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.NamedQuery" />
+                               <xml-element java-attribute="model" name="model" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.ModelVers" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.ExtraProperties" />
+                               <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.openecomp.org.v10.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-any-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.openecomp.org.v10.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-any-element java-attribute="propertyValue" lax="true" name="property-value" />
+                       </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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.InstanceGroup" />
+                       </java-attributes>
+               </java-type>
+               
+               <java-type name="InstanceGroup">
+                       <xml-root-element name="instance-group" />
+                       <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="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.openecomp.org.v10.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="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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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="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="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.openecomp.org.v10.TunnelXconnects" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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,vpe" />
+                               <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.openecomp.org.v10.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.openecomp.org.v10.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,vpe" />
+                               <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,vpe,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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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-types>
+</xml-bindings>
diff --git a/kubernetes/config/docker/init/src/config/aai/data-router/appconfig/model/aai_oxm_v8.xml b/kubernetes/config/docker/init/src/config/aai/data-router/appconfig/model/aai_oxm_v8.xml
new file mode 100644 (file)
index 0000000..3ed2ea5
--- /dev/null
@@ -0,0 +1,3076 @@
+<?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.openecomp.org.v8" xml-mapping-metadata-complete="true">
+       <xml-schema element-form-default="QUALIFIED">
+               <xml-ns namespace-uri="http://org.openecomp.aai.inventory/v8" />
+       </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.openecomp.org.v8.Search" />
+                               <xml-element java-attribute="actions" name="actions" type="inventory.aai.openecomp.org.v8.Actions" />
+                               <xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.openecomp.org.v8.CloudInfrastructure" />
+                               <xml-element java-attribute="business" name="business" type="inventory.aai.openecomp.org.v8.Business" />
+                               <xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.openecomp.org.v8.ServiceDesignAndCreation" />
+                               <xml-element java-attribute="network" name="network" type="inventory.aai.openecomp.org.v8.Network" />
+                               <xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.openecomp.org.v8.AaiInternal" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="Search">
+                       <xml-root-element name="search" />
+                       <java-attributes>
+                               <xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.openecomp.org.v8.SearchResults" />
+                       </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.openecomp.org.v8.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.openecomp.org.v8.InventoryItemData" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.openecomp.org.v8.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="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.openecomp.org.v8.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 AAI 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="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.openecomp.org.v8.Update" />
+                               <xml-element java-attribute="notify" name="notify" type="inventory.aai.openecomp.org.v8.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." />
+                       </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.openecomp.org.v8.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.openecomp.org.v8.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.openecomp.org.v8.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.openecomp.org.v8.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="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="cloudRegions" name="cloud-regions" type="inventory.aai.openecomp.org.v8.CloudRegions" />
+                               <xml-element java-attribute="pservers" name="pservers" type="inventory.aai.openecomp.org.v8.Pservers" />
+                       </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.openecomp.org.v8.CloudRegion" />
+                       </java-attributes>
+               </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" />
+                                       </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" />
+                                       </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" />
+                                       </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" />
+                                       </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.openecomp.org.v8.VolumeGroups" />
+                               <xml-element java-attribute="tenants" name="tenants" type="inventory.aai.openecomp.org.v8.Tenants" />
+                               <xml-element java-attribute="flavors" name="flavors" type="inventory.aai.openecomp.org.v8.Flavors" />
+                               <xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.openecomp.org.v8.GroupAssignments" />
+                               <xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.openecomp.org.v8.Snapshots" />
+                               <xml-element java-attribute="images" name="images" type="inventory.aai.openecomp.org.v8.Images" />
+                               <xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.openecomp.org.v8.AvailabilityZones" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation. Cloud regions are uniquely identified by a composite key, cloud-owner + cloud-region-id. The format of the cloud-owner is vendor-cloudname." />
+                               <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.openecomp.org.v8.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 SDC resource.  This field has been overloaded and clients should expect changes                  to occur in the future to this field as SDC 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="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.openecomp.org.v8.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="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.openecomp.org.v8.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 AAI 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 AAI." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="relationshipData" name="relationship-data" type="inventory.aai.openecomp.org.v8.RelationshipData" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.openecomp.org.v8.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 AAI 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="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.openecomp.org.v8.Tenant" />
+                       </java-attributes>
+               </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="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.openecomp.org.v8.Vservers" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.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" />
+                               <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.openecomp.org.v8.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.openecomp.org.v8.Volumes" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+                               <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v8.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-name,vserver-id,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.openecomp.org.v8.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 AAI should be managing this interface of not. Could have value like CUSTOMER" />
+                                       </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="vlans" name="vlans" type="inventory.aai.openecomp.org.v8.Vlans" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.openecomp.org.v8.L3InterfaceIpv4AddressList" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.openecomp.org.v8.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,p-interface,vserver,lag-interface" />
+                               <xml-property name="container" value="l-interfaces" />
+                       </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.openecomp.org.v8.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" />
+                       </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.openecomp.org.v8.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="vpnId" name="vpn-id" 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="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.openecomp.org.v8.L3InterfaceIpv4AddressList" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.openecomp.org.v8.L3InterfaceIpv6AddressList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Definition of vlan" />
+                               <xml-property name="indexedProps" value="vlan-interface,vlan-id-inner,vpn-id" />
+                               <xml-property name="uniqueProps" value="vpn-id" />
+                               <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.openecomp.org.v8.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" />
+                       </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.openecomp.org.v8.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.openecomp.org.v8.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.openecomp.org.v8.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.openecomp.org.v8.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.openecomp.org.v8.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.openecomp.org.v8.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.openecomp.org.v8.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.openecomp.org.v8.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="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.openecomp.org.v8.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.openecomp.org.v8.RelationshipList" />
+                               <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v8.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.openecomp.org.v8.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,model" />
+                               <xml-property name="container" value="metadata" />
+                       </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.openecomp.org.v8.Pserver" />
+                       </java-attributes>
+               </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="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="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+                               <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.openecomp.org.v8.PInterfaces" />
+                               <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v8.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" />
+                               <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.openecomp.org.v8.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="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.openecomp.org.v8.RelationshipList" />
+                               <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v8.LInterfaces" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Physical interface (e.g., nic)" />
+                               <xml-property name="indexedProps" value="interface-name" />
+                               <xml-property name="dependentOn" value="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.openecomp.org.v8.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="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="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+                               <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v8.LInterfaces" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Link aggregate interface" />
+                               <xml-property name="indexedProps" value="interface-name" />
+                               <xml-property name="dependentOn" value="generic-vnf,pserver,pnf" />
+                               <xml-property name="container" value="lag-interfaces" />
+                       </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.openecomp.org.v8.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="operationalState" name="operational-state" 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.openecomp.org.v8.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="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="customers" name="customers" type="inventory.aai.openecomp.org.v8.Customers" />
+                       </java-attributes>
+               </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.openecomp.org.v8.Customer" />
+                       </java-attributes>
+               </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 OpenECOMP 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.openecomp.org.v8.ServiceSubscriptions" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.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="subscriber-name,global-customer-id" />
+                               <xml-property name="uniqueProps" value="global-customer-id,subscriber-name" />
+                               <xml-property name="alternateKeys1" value="subscriber-name" />
+                               <xml-property name="container" value="customers" />
+                               <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.openecomp.org.v8.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 OpenECOMP." />
+                                       </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 AAI 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.openecomp.org.v8.ServiceInstances">
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.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-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.openecomp.org.v8.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="personaModelId" name="persona-model-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the SDC model id for this resource or service model." />
+                                       </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 SDC model version for this resource or service model." />
+                                       </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 SDC data dictionary widget model. This maps directly to the AAI 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 SDC data dictionary version of the widget model.This maps directly to the AAI 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="operationalStatus" name="operational-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Operational status of the service-instance." />
+                                       </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="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+                               <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v8.Metadata" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Instance of a service" />
+                               <xml-property name="indexedProps" value="service-instance-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id" />
+                               <xml-property name="nameProps" value="service-instance-name" />
+                               <xml-property name="searchable" value="service-instance-id" />
+                               <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 SDC" />
+                       </xml-properties>
+                       <xml-root-element name="service-design-and-creation" />
+                       <java-attributes>
+                               <xml-element java-attribute="services" name="services" type="inventory.aai.openecomp.org.v8.Services" />
+                               <xml-element java-attribute="models" name="models" type="inventory.aai.openecomp.org.v8.Models" />
+                               <xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.openecomp.org.v8.NamedQueries" />
+                       </java-attributes>
+               </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.openecomp.org.v8.LogicalLinks" />
+                               <xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.openecomp.org.v8.Vnfcs" />
+                               <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.openecomp.org.v8.L3Networks" />
+                               <xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.openecomp.org.v8.GenericVnfs" />
+                               <xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.openecomp.org.v8.Pnfs" />
+                               <xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.openecomp.org.v8.PhysicalLinks" />
+                       </java-attributes>
+               </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.openecomp.org.v8.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 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 (should be ip-version)" />
+                                       </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="personaModelId" name="persona-model-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the SDC model id for this resource or service model." />
+                                       </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 SDC model version for this resource or service model." />
+                                       </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 SDC data dictionary widget model. This maps directly to the AAI 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 SDC data dictionary version of the widget model.This maps directly to the AAI 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="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="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.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,persona-model-id,persona-model-version,widget-model-id,widget-model-version,link-id" />
+                               <xml-property name="uniqueProps" value="link-id" />
+                               <xml-property name="container" value="logical-links" />
+                               <xml-property name="namespace" value="network" />
+                       </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.openecomp.org.v8.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="vnfcFunctionCode" name="vnfc-function-code" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="function code" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vnfcType" name="vnfc-type" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="type" />
+                                       </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="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.openecomp.org.v8.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="indexedProps" value="vnfc-name,prov-status,vnfc-type,vnfc-function-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation" />
+                               <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.openecomp.org.v8.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 AAI." />
+                                       </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 SDC" />
+                                       </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="personaModelId" name="persona-model-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the SDC model id for this resource or service model." />
+                                       </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 SDC model version for this resource or service model." />
+                                       </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 SDC data dictionary widget model. This maps directly to the AAI 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 SDC data dictionary version of the widget model.This maps directly to the AAI 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="subnets" name="subnets" type="inventory.aai.openecomp.org.v8.Subnets" />
+                               <xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.openecomp.org.v8.CtagAssignments" />
+                               <xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.openecomp.org.v8.SegmentationAssignments" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" >
+                                       <xml-properties>
+                                               <xml-property name="description" value="Relates to tenant (or is it a child of tenant)" />
+                                       </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,persona-model-id,persona-model-version,widget-model-id,widget-model-version,contrail-network-fqdn" />
+                               <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="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.openecomp.org.v8.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.openecomp.org.v8.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.openecomp.org.v8.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="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.openecomp.org.v8.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.openecomp.org.v8.GenericVnf" />
+                       </java-attributes>
+               </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 SDC resource.  This field has been overloaded and clients should expect changes                  to occur in the future to this field as SDC 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 from SDC" />
+                                       </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="operationalState" name="operational-state" 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="License key" />
+                                       </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-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 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" />
+                                       </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" />
+                                       </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" />
+                                       </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" />
+                                       </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" />
+                                       </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" />
+                                       </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" />
+                                       </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" />
+                                       </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" />
+                                       </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" />
+                                       </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" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="personaModelId" name="persona-model-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the SDC model id for this resource or service model." />
+                                       </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 SDC model version for this resource or service model." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="personaModelCustomizationId" name="persona-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 SDC data dictionary widget model. This maps directly to the AAI 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 SDC data dictionary version of the widget model.This maps directly to the AAI 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="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+                               <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v8.LInterfaces" />
+                               <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v8.LagInterfaces" />
+                               <xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.openecomp.org.v8.VfModules" />
+                       </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,persona-model-id,persona-model-version,widget-model-id,widget-model-version" />
+                               <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-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.openecomp.org.v8.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="personaModelId" name="persona-model-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the SDC model id for this resource or service model." />
+                                       </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 SDC model version for this resource or service model." />
+                                       </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 SDC data dictionary widget model. This maps directly to the AAI 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 SDC data dictionary version of the widget model.This maps directly to the AAI 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="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.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,persona-model-id,persona-model-version,widget-model-id,widget-model-version,contrail-service-instance-fqdn" />
+                               <xml-property name="dependentOn" value="generic-vnf" />
+                               <xml-property name="container" value="vf-modules" />
+                       </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.openecomp.org.v8.Pnf" />
+                       </java-attributes>
+               </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 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 java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="orchestration-status is the status of orchestration 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="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.openecomp.org.v8.RelationshipList" />
+                               <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.openecomp.org.v8.PInterfaces" />
+                               <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v8.LagInterfaces" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="PNF represents a physical network function." />
+                               <xml-property name="indexedProps" value="pnf-name,orchestration-status" />
+                               <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.openecomp.org.v8.PhysicalLink" />
+                       </java-attributes>
+               </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. AAI 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="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.openecomp.org.v8.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-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.openecomp.org.v8.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.openecomp.org.v8.ReservedPropNames" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.openecomp.org.v8.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" />
+                       </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" />
+                       </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="isParent" name="isParent" type="java.lang.Boolean" />
+                               <xml-element java-attribute="usesResource" name="usesResource" type="java.lang.Boolean" />
+                               <xml-element java-attribute="hasDelTarget" name="hasDelTarget" type="java.lang.Boolean" />
+                               <xml-element java-attribute="SVC-INFRA" name="SVC-INFRA" type="java.lang.String" />
+                               <xml-element java-attribute="SVC-INFRA-REV" name="SVC-INFRA-REV" type="java.lang.String" />
+                       </java-attributes>
+               </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 SDC."/>
+               </xml-properties>
+               <xml-root-element name="services" />
+               <java-attributes>
+                       <xml-element container-type="java.util.ArrayList" java-attribute="service" name="service" type="inventory.aai.openecomp.org.v8.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.openecomp.org.v8.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 SDC." />
+                               <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="Models">
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of subgraph definitions provided by SDC to describe the inventory assets and their connections related to SDC 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.openecomp.org.v8.Model" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="Model">
+                       <xml-properties>
+                               <xml-property name="description" value="Subgraph definition provided by SDC to describe an inventory asset and its connections related to SDC models" />
+                               <xml-property name="nameProps" value="model-name,model-type" />
+                               <xml-property name="indexedProps" value="model-name-version-id,model-type,model-name,model-id,model-version" />
+                               <xml-property name="alternateKeys1" value="model-id,model-version" />
+                               <xml-property name="uniqueProps" value="model-name-version-id" />
+                               <xml-property name="container" value="models" />
+                               <xml-property name="namespace" value="service-design-and-creation" />
+                       </xml-properties>
+                       <xml-root-element name="model" />
+                       <java-attributes>
+                               <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 SDC" />
+                                       </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="modelElements" name="model-elements" type="inventory.aai.openecomp.org.v8.ModelElements" />
+                               <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v8.Metadata" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.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.openecomp.org.v8.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-point" type="java.lang.String">
+                                       <xml-element-wrapper name="linkage-points" />
+                               </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.openecomp.org.v8.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.openecomp.org.v8.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.openecomp.org.v8.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.openecomp.org.v8.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.openecomp.org.v8.ConstrainedElementSets" />
+                       </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.openecomp.org.v8.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.openecomp.org.v8.ElementChoiceSets" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.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.openecomp.org.v8.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.openecomp.org.v8.ModelElements" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.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.openecomp.org.v8.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.openecomp.org.v8.NamedQueryElements" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.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.openecomp.org.v8.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.openecomp.org.v8.NamedQueryElements" />
+                               <xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.openecomp.org.v8.RelatedLookups" />
+                               <xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.openecomp.org.v8.PropertyConstraints" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.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.openecomp.org.v8.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.openecomp.org.v8.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.openecomp.org.v8.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="property-name" name="property-name" required="true" type="java.lang.String" />
+                               <xml-element java-attribute="property-value" 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.openecomp.org.v8.QueryParameters" />
+                               <xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.openecomp.org.v8.InstanceFilters" />
+                               <xml-element java-attribute="topNodeType"     name="top-node-type"    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.openecomp.org.v8.NamedQuery" />
+                               <xml-element java-attribute="model" name="model" type="inventory.aai.openecomp.org.v8.Model" />
+                       </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.openecomp.org.v8.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="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.openecomp.org.v8.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.openecomp.org.v8.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.openecomp.org.v8.ExtraProperties" />
+                               <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.openecomp.org.v8.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-any-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.openecomp.org.v8.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-any-element java-attribute="propertyValue" lax="true" name="property-value" />
+                       </java-attributes>
+               </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.openecomp.org.v8.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.openecomp.org.v8.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-types>
+</xml-bindings>
diff --git a/kubernetes/config/docker/init/src/config/aai/data-router/appconfig/model/aai_oxm_v9.xml b/kubernetes/config/docker/init/src/config/aai/data-router/appconfig/model/aai_oxm_v9.xml
new file mode 100644 (file)
index 0000000..87a3d65
--- /dev/null
@@ -0,0 +1,5451 @@
+<?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.openecomp.org.v9" xml-mapping-metadata-complete="true">
+       <xml-schema element-form-default="QUALIFIED">
+               <xml-ns namespace-uri="http://org.openecomp.aai.inventory/v9" />
+       </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.openecomp.org.v9.Search" />
+                               <xml-element java-attribute="actions" name="actions" type="inventory.aai.openecomp.org.v9.Actions" />
+                               <xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.openecomp.org.v9.CloudInfrastructure" />
+                               <xml-element java-attribute="business" name="business" type="inventory.aai.openecomp.org.v9.Business" />
+                               <xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.openecomp.org.v9.ServiceDesignAndCreation" />
+                               <xml-element java-attribute="network" name="network" type="inventory.aai.openecomp.org.v9.Network" />
+                               <xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.openecomp.org.v9.AaiInternal" />
+                               <xml-element java-attribute="nodes" name="nodes" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.EdgeTagQueryResult" />
+                               <xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.openecomp.org.v9.EdgeTagQueryRequest" />
+                               <xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.openecomp.org.v9.SearchResults" />
+                               <xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.InventoryItemData" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.StartNodeFilter" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.openecomp.org.v9.IncludeNodeFilter" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.OamNetworks" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.DvsSwitches" />
+                               <xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.Update" />
+                               <xml-element java-attribute="notify" name="notify" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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="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.openecomp.org.v9.Complexes" />
+                               <xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.openecomp.org.v9.CloudRegions" />
+                               <xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.openecomp.org.v9.NetworkProfiles" />
+                               <xml-element java-attribute="pservers" name="pservers" type="inventory.aai.openecomp.org.v9.Pservers" />
+                               <xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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 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.openecomp.org.v9.VolumeGroups" />
+                               <xml-element java-attribute="tenants" name="tenants" type="inventory.aai.openecomp.org.v9.Tenants" />
+                               <xml-element java-attribute="flavors" name="flavors" type="inventory.aai.openecomp.org.v9.Flavors" />
+                               <xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.openecomp.org.v9.GroupAssignments" />
+                               <xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.openecomp.org.v9.Snapshots" />
+                               <xml-element java-attribute="images" name="images" type="inventory.aai.openecomp.org.v9.Images" />
+                               <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.openecomp.org.v9.DvsSwitches" />
+                               <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.openecomp.org.v9.OamNetworks" />
+                               <xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.openecomp.org.v9.AvailabilityZones" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation. In AT&amp;Ts AIC cloud, this could be an LCP or DCP. Cloud regions are uniquely identified by a composite key, cloud-owner + cloud-region-id. The format of the cloud-owner is vendor-cloudname and we will use att-aic for AT&amp;T's AIC." />
+                               <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.openecomp.org.v9.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="personaModelCustomizationId" name="persona-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-property name="dbAlias" value="model-customization-id" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vfModulePersonaModelCustomizationId" name="vf-module-persona-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-property name="dbAlias" value="vf-module-model-customization-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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.RelationshipData" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.CtagPools" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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="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.openecomp.org.v9.Vservers" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.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" />
+                               <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.openecomp.org.v9.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.openecomp.org.v9.Volumes" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                               <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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="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="vlans" name="vlans" type="inventory.aai.openecomp.org.v9.Vlans" />
+                               <xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.openecomp.org.v9.SriovVfs" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.openecomp.org.v9.L3InterfaceIpv4AddressList" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.openecomp.org.v9.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,vpe,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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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" />
+                       </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.openecomp.org.v9.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="vpnId" name="vpn-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="This indicates the customers VPN ID associated with this vlan" />
+                                               <xml-property name="dbAlias" value="vpn-id-local" />
+                                       </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 java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.openecomp.org.v9.L3InterfaceIpv4AddressList" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.openecomp.org.v9.L3InterfaceIpv6AddressList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Definition of vlan" />
+                               <xml-property name="indexedProps" value="vlan-interface,vlan-id-inner,vpn-id" />
+                               <xml-property name="uniqueProps" value="vpn-id" />
+                               <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.openecomp.org.v9.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" />
+                       </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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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="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.openecomp.org.v9.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.openecomp.org.v9.RelationshipList" />
+                               <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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 VPEs." />
+                       </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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                               <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.openecomp.org.v9.PInterfaces" />
+                               <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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="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.openecomp.org.v9.RelationshipList" />
+                               <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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 java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                               <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v9.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,vpe,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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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="operationalState" name="operational-state" 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-property name="dbAlias" value="operational-status" />
+                                       </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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.Connectors" />
+                               <xml-element java-attribute="customers" name="customers" type="inventory.aai.openecomp.org.v9.Customers" />
+                       </java-attributes>
+               </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.openecomp.org.v9.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="personaModelId" name="persona-model-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="dbAlias" value="model-invariant-id-local" />
+                                               <xml-property name="visibility" value="deployment" />
+                                       </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="deployment" />
+                                       </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="internal" />
+                                               <xml-property name="dbAlias" value="model-version-id-local" />
+                                               <xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
+                                       </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.openecomp.org.v9.RelationshipList" />
+                               <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v9.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,persona-model-id,persona-model-version,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.openecomp.org.v9.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.openecomp.org.v9.ServiceSubscriptions" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.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="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.openecomp.org.v9.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.openecomp.org.v9.ServiceInstances">
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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="personaModelId" name="persona-model-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="dbAlias" value="model-invariant-id-local" />
+                                               <xml-property name="visibility" value="deployment" />
+                                       </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="deployment" />
+                                       </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="internal" />
+                                               <xml-property name="dbAlias" value="model-version-id-local" />
+                                               <xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
+                                       </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.openecomp.org.v9.RelationshipList" />
+                               <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v9.Metadata" />
+                               <xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.openecomp.org.v9.AllottedResources" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Instance of a service" />
+                               <xml-property name="indexedProps" value="service-instance-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status" />
+                               <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.openecomp.org.v9.VnfImages" />
+                               <xml-element java-attribute="services" name="services" type="inventory.aai.openecomp.org.v9.Services" />
+                               <xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.openecomp.org.v9.ServiceCapabilities" />
+                               <xml-element java-attribute="models" name="models" type="inventory.aai.openecomp.org.v9.Models" />
+                               <xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.LogicalLinks" />
+                               <xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.openecomp.org.v9.SitePairSets" />
+                               <xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.openecomp.org.v9.VpnBindings" />
+                               <xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.openecomp.org.v9.VplsPes" />
+                               <xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.openecomp.org.v9.MulticastConfigurations" />
+                               <xml-element java-attribute="vces" name="vces" type="inventory.aai.openecomp.org.v9.Vces" />
+                               <xml-element java-attribute="vpes" name="vpes" type="inventory.aai.openecomp.org.v9.Vpes" />
+                               <xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.openecomp.org.v9.Vnfcs" />
+                               <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.openecomp.org.v9.L3Networks" />
+                               <xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.openecomp.org.v9.NetworkPolicies" />
+                               <xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.openecomp.org.v9.GenericVnfs" />
+                               <xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.openecomp.org.v9.LagLinks" />
+                               <xml-element java-attribute="newvces" name="newvces" type="inventory.aai.openecomp.org.v9.Newvces" />
+                               <xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.openecomp.org.v9.Pnfs" />
+                               <xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.openecomp.org.v9.PhysicalLinks" />
+                               <xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.openecomp.org.v9.IpsecConfigurations" />
+                               <xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.openecomp.org.v9.RouteTableReferences" />
+                               <xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.openecomp.org.v9.InstanceGroups" />
+                               <xml-element java-attribute="zones" name="zones" type="inventory.aai.openecomp.org.v9.Zones" />
+                       </java-attributes>
+               </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.openecomp.org.v9.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 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="personaModelId" name="persona-model-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="dbAlias" value="model-invariant-id-local" />
+                                               <xml-property name="visibility" value="deployment" />
+                                       </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="deployment" />
+                                       </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="internal" />
+                                               <xml-property name="dbAlias" value="model-version-id-local" />
+                                               <xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
+                                       </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.openecomp.org.v9.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,persona-model-id,persona-model-version,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.openecomp.org.v9.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.openecomp.org.v9.RoutingInstances" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.SitePairs" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="indexedProps" value="routing-instance-id" />
+                               <xml-property name="uniqueProps" 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.openecomp.org.v9.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, 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.openecomp.org.v9.ClassesOfService" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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="globalRouteTarget" name="global-route-target" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Number used to identify a VPN, globally unique in the network" />
+                                               <xml-property name="dataLink" value="./route-targets/route-target/{global-route-target}/{route-target-role}" />
+                                       </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="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="routeTargetRole" name="route-target-role" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Role assigned to this route target" />
+                                               <xml-property name="dataLink" value="./route-targets/route-target/{global-route-target}/{route-target-role}" />
+                                               <xml-property name="defaultValue" value="BOTH" />
+                                       </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.openecomp.org.v9.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,global-route-target,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.openecomp.org.v9.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 vpe, also used for troubleshooting and is IP used for traps generated by VPE (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.openecomp.org.v9.RelationshipList" />
+                               <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.openecomp.org.v9.PInterfaces" />
+                               <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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="operationalState" name="operational-state" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Indicator for whether the resource is considered operational" />
+                                               <xml-property name="dbAlias" value="operational-status" />
+                                       </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.openecomp.org.v9.PortGroups" />
+                               <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.openecomp.org.v9.Licenses" />
+                               <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.openecomp.org.v9.Entitlements" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.CvlanTags" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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="Vpes">
+                       <xml-properties>
+                               <xml-property name="description" value="Virtual provider edge router. In 1504, A&amp;AI will populate this object through an M&amp;P and tool provided to operations." />
+                       </xml-properties>
+                       <xml-root-element name="vpes" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="vpe" name="vpe" type="inventory.aai.openecomp.org.v9.Vpe" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="Vpe">
+                       <xml-root-element name="vpe" />
+                       <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 map strictly 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="operationalState" name="operational-state" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Indicator for whether the resource is considered operational" />
+                                               <xml-property name="dbAlias" value="operational-status" />
+                                       </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.  See child relationships." />
+                                       </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, 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="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-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="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="v4Loopback0IpAddress" name="v4-loopback0-ip-address" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Loopback0 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 stag to get to VCE" />
+                                       </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 VPE" />
+                                       </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 vpe 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 vpe access uses SSH" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+                               <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v9.LInterfaces" />
+                               <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v9.LagInterfaces" />
+                               <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.openecomp.org.v9.Licenses" />
+                               <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.openecomp.org.v9.Entitlements" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Relationship-list must include related to info for complex." />
+                               <xml-property name="nameProps" value="vnf-name" />
+                               <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,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="vpes" />
+                               <xml-property name="namespace" value="network" />
+                               <xml-property name="extends" value="vnf" />
+                       </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.openecomp.org.v9.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="vnfcFunctionCode" name="vnfc-function-code" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="function code" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vnfcType" name="vnfc-type" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="type" />
+                                       </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="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.openecomp.org.v9.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="indexedProps" value="vnfc-name,prov-status,vnfc-type,vnfc-function-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation" />
+                               <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.openecomp.org.v9.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="personaModelId" name="persona-model-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="dbAlias" value="model-invariant-id-local" />
+                                               <xml-property name="visibility" value="deployment" />
+                                       </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="deployment" />
+                                       </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="internal" />
+                                               <xml-property name="dbAlias" value="model-version-id-local" />
+                                               <xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="personaModelCustomizationId" name="persona-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-property name="dbAlias" value="model-customization-id" />
+                                       </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="subnets" name="subnets" type="inventory.aai.openecomp.org.v9.Subnets" />
+                               <xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.openecomp.org.v9.CtagAssignments" />
+                               <xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.openecomp.org.v9.SegmentationAssignments" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.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,persona-model-id,persona-model-version,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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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="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.openecomp.org.v9.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.openecomp.org.v9.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-properties>
+                               </xml-element>
+                               <xml-element java-attribute="operationalState" name="operational-state" 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-property name="dbAlias" value="operational-status" />
+                                       </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-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 company 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 in some usecases" />
+                                       </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 in some usecases" />
+                                       </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 in some usecases" />
+                                       </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 in some usecases" />
+                                       </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 in some usecases" />
+                                       </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 in some usecases" />
+                                       </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="personaModelId" name="persona-model-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="dbAlias" value="model-invariant-id-local" />
+                                               <xml-property name="visibility" value="deployment" />
+                                       </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="deployment" />
+                                       </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="internal" />
+                                               <xml-property name="dbAlias" value="model-version-id-local" />
+                                               <xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="personaModelCustomizationId" name="persona-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-property name="dbAlias" value="model-customization-id" />
+                                       </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="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.openecomp.org.v9.RelationshipList" />
+                               <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v9.LInterfaces" />
+                               <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v9.LagInterfaces" />
+                               <xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.openecomp.org.v9.VfModules" />
+                               <xml-element java-attribute="licenses" name="licenses" type="inventory.aai.openecomp.org.v9.Licenses" />
+                               <xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.openecomp.org.v9.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,persona-model-id,persona-model-version,widget-model-id,widget-model-version" />
+                               <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-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.openecomp.org.v9.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="personaModelId" name="persona-model-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="dbAlias" value="model-invariant-id-local" />
+                                               <xml-property name="visibility" value="deployment" />
+                                       </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="deployment" />
+                                       </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="internal" />
+                                               <xml-property name="dbAlias" value="model-version-id-local" />
+                                               <xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="personaModelCustomizationId" name="persona-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-property name="dbAlias" value="model-customization-id" />
+                                       </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.openecomp.org.v9.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,persona-model-id,persona-model-version,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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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="operationalState" name="operational-state" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Indicator for whether the resource is considered operational" />
+                                               <xml-property name="dbAlias" value="operational-status" />
+                                       </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 vpe, also used for troubleshooting and is IP used for traps generated by VPE (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., VPE." />
+                                       </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.openecomp.org.v9.RelationshipList" />
+                               <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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 company 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.openecomp.org.v9.RelationshipList" />
+                               <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.openecomp.org.v9.PInterfaces" />
+                               <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v9.LagInterfaces" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world." />
+                               <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.openecomp.org.v9.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="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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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="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, 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.openecomp.org.v9.RelationshipList" />
+                               <xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.ReservedPropNames" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.openecomp.org.v9.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="isParent" name="isParent" type="java.lang.Boolean" />
+                               <xml-element java-attribute="usesResource" name="usesResource" type="java.lang.Boolean" />
+                               <xml-element java-attribute="hasDelTarget" name="hasDelTarget" type="java.lang.Boolean" />
+                               <xml-element java-attribute="SVC-INFRA" name="SVC-INFRA" type="java.lang.Boolean" />
+                               <xml-element java-attribute="SVC-INFRA-REV" name="SVC-INFRA-REV" type="java.lang.Boolean" />
+                       </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.openecomp.org.v9.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.openecomp.org.v9.ModelVers" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.ModelElements" />
+                               <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v9.Metadata" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.ElementChoiceSets" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.ModelElements" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.NamedQueryElements" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.NamedQueryElements" />
+                               <xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.openecomp.org.v9.RelatedLookups" />
+                               <xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.openecomp.org.v9.PropertyConstraints" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.QueryParameters" />
+                               <xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.openecomp.org.v9.InstanceFilters" />
+                               <xml-element java-attribute="secondaryFilts" name="secondary-filts" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.NamedQuery" />
+                               <xml-element java-attribute="model" name="model" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.ModelVers" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.ExtraProperties" />
+                               <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.openecomp.org.v9.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-any-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.openecomp.org.v9.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-any-element java-attribute="propertyValue" lax="true" name="property-value" />
+                       </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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.InstanceGroup" />
+                       </java-attributes>
+               </java-type>
+               
+               <java-type name="InstanceGroup">
+                       <xml-root-element name="instance-group" />
+                       <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="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.openecomp.org.v9.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="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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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="personaModelId" name="persona-model-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="dbAlias" value="model-invariant-id-local" />
+                                               <xml-property name="visibility" value="deployment" />
+                                       </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="deployment" />
+                                       </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="internal" />
+                                               <xml-property name="dbAlias" value="model-version-id-local" />
+                                               <xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="personaModelCustomizationId" name="persona-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-property name="dbAlias" value="model-customization-id" />
+                                       </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="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.openecomp.org.v9.TunnelXconnects" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.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,persona-model-id,persona-model-version" />
+                               <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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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,vpe" />
+                               <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.openecomp.org.v9.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.openecomp.org.v9.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,vpe" />
+                               <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,vpe,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.openecomp.org.v9.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.openecomp.org.v9.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-types>
+</xml-bindings>
diff --git a/kubernetes/config/docker/init/src/config/aai/data-router/dynamic/conf/entity-event-policy.xml b/kubernetes/config/docker/init/src/config/aai/data-router/dynamic/conf/entity-event-policy.xml
new file mode 100644 (file)
index 0000000..e0dd8cb
--- /dev/null
@@ -0,0 +1,24 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="
+              http://www.springframework.org/schema/beans
+              http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+  <bean id="eepConfig" class="org.openecomp.datarouter.policy.EntityEventPolicyConfig" >
+    <property name="sourceDomain" value="default" />
+    <property name="searchBaseUrl" value="https://search-data-service:9509" />
+    <property name="searchEndpoint" value="services/search-data-service/v1/search/indexes/" />
+    <property name="searchEndpointDocuments" value = "documents" />
+    <property name="searchEntitySearchIndex" value="entity-search-index" />
+    <property name="searchTopographySearchIndex" value="topography-search-index" />
+    <property name="searchEntityAutoSuggestIndex" value="entity-autosuggest-index" />
+    <property name="searchAggregationVnfIndex" value="aggregate-vnf-index" />
+    <property name="searchCertName" value="client-cert-onap.p12" />
+    <property name="searchKeystorePwd" value="OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10" />
+    <property name="searchKeystore" value="tomcat_keystore" />
+  </bean>
+
+  <bean id="entityEventPolicy" class="org.openecomp.datarouter.policy.EntityEventPolicy" init-method="startup" >
+    <constructor-arg ref="eepConfig"/>
+  </bean>
+</beans>
diff --git a/kubernetes/config/docker/init/src/config/aai/data-router/dynamic/routes/entity-event.route b/kubernetes/config/docker/init/src/config/aai/data-router/dynamic/routes/entity-event.route
new file mode 100644 (file)
index 0000000..46c3890
--- /dev/null
@@ -0,0 +1,4 @@
+<route xmlns="http://camel.apache.org/schema/spring" trace="true">
+  <from uri="event-bus:mybus/?eventTopic=AAI-EVENT&amp;groupName=datarouter&amp;groupId=datarouter&amp;url="http://dmaap.onap-message-router:3904"/>
+  <to uri="bean:entityEventPolicy?method=process"/>
+</route>
diff --git a/kubernetes/config/docker/init/src/config/aai/elasticsearch/config/elasticsearch.yml b/kubernetes/config/docker/init/src/config/aai/elasticsearch/config/elasticsearch.yml
new file mode 100644 (file)
index 0000000..21e29df
--- /dev/null
@@ -0,0 +1,400 @@
+##################### Elasticsearch Configuration Example #####################
+
+# This file contains an overview of various configuration settings,
+# targeted at operations staff. Application developers should
+# consult the guide at <http://elasticsearch.org/guide>.
+#
+# The installation procedure is covered at
+# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/setup.html>.
+#
+# Elasticsearch comes with reasonable defaults for most settings,
+# so you can try it out without bothering with configuration.
+#
+# Most of the time, these defaults are just fine for running a production
+# cluster. If you're fine-tuning your cluster, or wondering about the
+# effect of certain configuration option, please _do ask_ on the
+# mailing list or IRC channel [http://elasticsearch.org/community].
+
+# Any element in the configuration can be replaced with environment variables
+# by placing them in ${...} notation. For example:
+#
+# node.rack: ${RACK_ENV_VAR}
+
+# For information on supported formats and syntax for the config file, see
+# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/setup-configuration.html>
+################################### Cluster ###################################
+
+# Cluster name identifies your cluster for auto-discovery. If you're running
+# multiple clusters on the same network, make sure you're using unique names.
+#
+# cluster.name: elasticsearch
+
+cluster.name: ES_AAI
+
+#################################### Node #####################################
+
+node.name: ES_ONAP
+node.master: true
+node.data: true
+
+
+# Use the Cluster Health API [http://localhost:9200/_cluster/health], the
+# Node Info API [http://localhost:9200/_nodes] or GUI tools
+# such as <http://www.elasticsearch.org/overview/marvel/>,
+# <http://github.com/karmi/elasticsearch-paramedic>,
+# <http://github.com/lukas-vlcek/bigdesk> and
+# <http://mobz.github.com/elasticsearch-head> to inspect the cluster state.
+
+# By default, multiple nodes are allowed to start from the same installation location
+# to disable it, set the following:
+
+node.max_local_storage_nodes: 1
+
+
+#################################### Index ####################################
+# You can set a number of options (such as shard/replica options, mapping
+# or analyzer definitions, translog settings, ...) for indices globally,
+# in this file.
+#
+# Note, that it makes more sense to configure index settings specifically for
+# a certain index, either when creating it or by using the index templates API.
+#
+# See <http://elasticsearch.org/guide/en/elasticsearch/reference/current/index-modules.html> and
+# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/indices-create-index.html>
+# for more information.
+
+# Set the number of shards (splits) of an index (5 by default):
+
+index.number_of_shards: 5
+
+# Set the number of replicas (additional copies) of an index (1 by default):
+
+index.number_of_replicas: 1
+
+# These settings directly affect the performance of index and search operations
+# in your cluster. Assuming you have enough machines to hold shards and
+# replicas, the rule of thumb is:
+#
+# 1. Having more *shards* enhances the _indexing_ performance and allows to
+#    _distribute_ a big index across machines.
+# 2. Having more *replicas* enhances the _search_ performance and improves the
+#    cluster _availability_.
+#
+# The "number_of_shards" is a one-time setting for an index.
+#
+# The "number_of_replicas" can be increased or decreased anytime,
+# by using the Index Update Settings API.
+#
+# Elasticsearch takes care about load balancing, relocating, gathering the
+# results from nodes, etc. Experiment with different settings to fine-tune
+# your setup.
+
+# Use the Index Status API (<http://localhost:9200/A/_status>) to inspect
+# the index status.
+
+
+#################################### Paths ####################################
+
+# Path to directory containing configuration (this file and logging.yml):
+#path.conf: /opt/app/elasticsearch/config
+
+# Path to directory where to store index data allocated for this node.
+# Use swm auto link to redirect the data directory if necessary.
+
+#path.data: /opt/app/elasticsearch/data
+
+# path.data: /path/to/data1,/path/to/data2
+
+# path.work: /path/to/work
+
+#path.logs: /opt/app/elasticsearch/logs
+
+#path.plugins: /opt/app/elasticsearch/plugins
+
+
+#################################### Plugin ###################################
+
+# If a plugin listed here is not installed for current node, the node will not start.
+#
+# plugin.mandatory: mapper-attachments,lang-groovy
+
+
+################################### Memory ####################################
+
+# Elasticsearch performs poorly when JVM starts swapping: you should ensure that
+# it _never_ swaps.
+#
+# Set this property to true to lock the memory: default is true
+
+bootstrap.mlockall: true
+
+# Make sure that the ES_MIN_MEM and ES_MAX_MEM environment variables are set
+# to the same value, and that the machine has enough memory to allocate
+# for Elasticsearch, leaving enough memory for the operating system itself.
+#
+# You should also make sure that the Elasticsearch process is allowed to lock
+# the memory, eg. by using `ulimit -l unlimited`.
+
+
+############################## Network And HTTP ###############################
+# Elasticsearch, by default, binds itself to the 0.0.0.0 address, and listens
+# on port [9200-9300] for HTTP traffic and on port [9300-9400] for node-to-node
+# communication. (the range means that if the port is busy, it will automatically
+# try the next port).
+
+# Set the bind address specifically (IPv4 or IPv6):
+network.bind_host: 0.0.0.0
+
+# Set the address other nodes will use to communicate with this node. If not
+# set, it is automatically derived. It must point to an actual IP address.
+
+# network.publish_host: 0.0.0.0
+
+# Set both 'bind_host' and 'publish_host':
+# network.host: 192.168.0.1
+
+
+# Set a custom port for the node to node communication (9300 by default):
+transport.tcp.port: 8443
+
+# Enable compression for all communication between nodes (disabled by default):
+transport.tcp.compress: false
+
+# Set a custom port to listen for HTTP traffic:
+# http.port: 9200
+http.port: 9200
+
+# Set a custom allowed content length:
+# http.max_content_length: 100mb
+http.max_content_length: 100mb
+
+# Disable HTTP completely:
+# http.enabled: false
+http.enabled: true
+
+# This is specifically useful for permitting which front end Kibana Url's are permitted to access elastic search.
+http.cors.enabled: false
+http.cors.allow-origin: "/.*/"
+http.cors.allow-headers: X-Requested-With, Content-Type, Content-Length
+http.cors.allow-credentials: false
+################################### Gateway ###################################
+
+# The gateway allows for persisting the cluster state between full cluster
+# restarts. Every change to the state (such as adding an index) will be stored
+# in the gateway, and when the cluster starts up for the first time,
+# it will read its state from the gateway.
+# There are several types of gateway implementations. For more information, see
+# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/modules-gateway.html>.
+
+# The default gateway type is the "local" gateway (recommended):
+#
+#gateway.type: local
+#gateway.type: local
+
+# Settings below control how and when to start the initial recovery process on
+# a full cluster restart (to reuse as much local data as possible when using shared
+# gateway).
+
+# Allow recovery process after N nodes in a cluster are up:
+#
+# gateway.recover_after_nodes: 1
+gateway.recover_after_nodes: 1
+
+# Set the timeout to initiate the recovery process, once the N nodes
+# from previous setting are up (accepts time value):
+#
+#gateway.recover_after_time: 5m
+gateway.recover_after_time: 5m
+
+# Set how many nodes are expected in this cluster. Once these N nodes
+# are up (and recover_after_nodes is met), begin recovery process immediately
+# (without waiting for recover_after_time to expire):
+#
+# gateway.expected_nodes: 2
+gateway.expected_nodes: 2
+
+############################# Recovery Throttling #############################
+
+# These settings allow to control the process of shards allocation between
+# nodes during initial recovery, replica allocation, rebalancing,
+# or when adding and removing nodes.
+
+# Set the number of concurrent recoveries happening on a node:
+#
+# 1. During the initial recovery
+#
+# cluster.routing.allocation.node_initial_primaries_recoveries: 4
+#
+# 2. During adding/removing nodes, rebalancing, etc
+#
+# cluster.routing.allocation.node_concurrent_recoveries: 2
+
+# Set to throttle throughput when recovering (eg. 100mb, by default 20mb):
+# indices.recovery.max_bytes_per_sec: 20mb
+indices.recovery.max_bytes_per_sec: 20mb
+
+# Set to limit the number of open concurrent streams when
+# recovering a shard from a peer:
+#
+# indices.recovery.concurrent_streams: 5
+indices.recovery.concurrent_streams: 5
+
+################################## Discovery ##################################
+
+# Discovery infrastructure ensures nodes can be found within a cluster
+# and master node is elected. Multicast discovery is the default.
+
+# Set to ensure a node sees N other master eligible nodes to be considered
+# operational within the cluster. Its recommended to set it to a higher value
+# than 1 when running more than 2 nodes in the cluster.
+#
+discovery.zen.minimum_master_nodes: 1
+
+# Set the time to wait for ping responses from other nodes when discovering.
+# Set this option to a higher value on a slow or congested network
+# to minimize discovery failures:
+#
+# discovery.zen.ping.timeout: 3s
+discovery.zen.ping.timeout:
+
+# For more information, see
+# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/modules-discovery-zen.html>
+
+# Unicast discovery allows to explicitly control which nodes will be used
+# to discover the cluster. It can be used when multicast is not present,
+# or to restrict the cluster communication-wise.
+#
+# 1. Disable multicast discovery (enabled by default):
+# discovery.zen.ping.multicast.enabled: false
+discovery.zen.ping.multicast.enabled: false
+
+
+# 2. Configure an initial list of master nodes in the cluster
+#    to perform discovery when new nodes (master or data) are started:
+#
+# discovery.zen.ping.unicast.hosts: ["host1", "host2:port"]
+discovery.zen.ping.unicast.hosts: ["0.0.0.0"]
+
+# EC2 discovery allows to use AWS EC2 API in order to perform discovery.
+#
+# You have to install the cloud-aws plugin for enabling the EC2 discovery.
+#
+# For more information, see
+# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/modules-discovery-ec2.html>
+#
+#
+# See <http://elasticsearch.org/tutorials/elasticsearch-on-ec2/>
+# for a step-by-step tutorial.
+
+# GCE discovery allows to use Google Compute Engine API in order to perform discovery.
+#
+# You have to install the cloud-gce plugin for enabling the GCE discovery.
+#
+# For more information, see <https://github.com/elasticsearch/elasticsearch-cloud-gce>.
+
+# Azure discovery allows to use Azure API in order to perform discovery.
+#
+# You have to install the cloud-azure plugin for enabling the Azure discovery.
+#
+# For more information, see <https://github.com/elasticsearch/elasticsearch-cloud-azure>.
+
+################################## Slow Log ##################################
+
+# Shard level query and fetch threshold logging.
+
+#index.search.slowlog.threshold.query.warn: 10s
+#index.search.slowlog.threshold.query.info: 5s
+#index.search.slowlog.threshold.query.debug: 2s
+#index.search.slowlog.threshold.query.trace: 500ms
+
+#index.search.slowlog.threshold.fetch.warn: 1s
+#index.search.slowlog.threshold.fetch.info: 800ms
+#index.search.slowlog.threshold.fetch.debug: 500ms
+#index.search.slowlog.threshold.fetch.trace: 200ms
+
+#index.indexing.slowlog.threshold.index.warn: 10s
+#index.indexing.slowlog.threshold.index.info: 5s
+#index.indexing.slowlog.threshold.index.debug: 2s
+#index.indexing.slowlog.threshold.index.trace: 500ms
+
+################################## GC Logging ################################
+
+#monitor.jvm.gc.young.warn: 1000ms
+#monitor.jvm.gc.young.info: 700ms
+#monitor.jvm.gc.young.debug: 400ms
+
+#monitor.jvm.gc.old.warn: 10s
+#monitor.jvm.gc.old.info: 5s
+#monitor.jvm.gc.old.debug: 2s
+
+#############################################################################################
+###                                     SEARCH GUARD SSL                                      #
+###                                       Configuration                                       #
+###############################################################################################
+##  Uncomment all lines below prefixed with #X#  (globally remove #X#) for searchguard
+##
+###############################################################################################
+### Transport layer SSL                                                                       #
+###                                                                                           #
+###############################################################################################
+### Enable or disable node-to-node ssl encryption (default: true)
+#X#searchguard.ssl.transport.enable_openssl_if_available: true
+#X#searchguard.ssl.transport.enabled: true
+### JKS or PKCS12 (default: JKS)
+#X#searchguard.ssl.transport.keystore_type: JKS
+### Relative path to the keystore file (mandatory, this stores the server certificates), must be placed under the config/ dir
+#X#searchguard.ssl.transport.keystore_filepath: /some/path 
+### Alias name (default: first alias which could be found)
+###searchguard.ssl.transport.keystore_alias: localhost
+### Keystore password (default: changeit)
+#X#searchguard.ssl.transport.keystore_password: changeit
+##
+### JKS or PKCS12 (default: JKS)
+#X#searchguard.ssl.transport.truststore_type: JKS
+### Relative path to the truststore file (mandatory, this stores the client/root certificates), must be placed under the config/ dir
+#X#searchguard.ssl.transport.truststore_filepath: truststore.jks
+### Alias name (default: first alias which could be found)
+###searchguard.ssl.transport.truststore_alias: my_alias
+### Truststore password (default: changeit)
+#X#searchguard.ssl.transport.truststore_password: changeit
+### Enforce hostname verification (default: true)
+###searchguard.ssl.transport.enforce_hostname_verification: true
+### If hostname verification specify if hostname should be resolved (default: true)
+###searchguard.ssl.transport.resolve_hostname: true
+### Use native Open SSL instead of JDK SSL if available (default: true)
+###searchguard.ssl.transport.enable_openssl_if_available: false
+##
+###############################################################################################
+### HTTP/REST layer SSL                                                                       #
+###                                                                                           #
+###############################################################################################
+### Enable or disable rest layer security - https, (default: false)
+#X#searchguard.ssl.http.enable_openssl_if_available: true
+#X#searchguard.ssl.http.enabled: true
+### JKS or PKCS12 (default: JKS)
+#X#searchguard.ssl.http.keystore_type: JKS
+### Relative path to the keystore file (this stores the server certificates), must be placed under the config/ dir
+#X#searchguard.ssl.http.keystore_filepath: /keystore/path
+### Alias name (default: first alias which could be found)
+###searchguard.ssl.http.keystore_alias: my_alias
+### Keystore password (default: changeit)
+#X#searchguard.ssl.http.keystore_password: changeit
+### Do the clients (typically the browser or the proxy) have to authenticate themself to the http server, default is OPTIONAL
+### To enforce authentication use REQUIRE, to completely disable client certificates use NONE
+###searchguard.ssl.http.clientauth_mode: REQUIRE
+### JKS or PKCS12 (default: JKS)
+#X#searchguard.ssl.http.truststore_type: JKS
+### Relative path to the truststore file (this stores the client certificates), must be placed under the config/ dir
+#X#searchguard.ssl.http.truststore_filepath: truststore.jks
+### Alias name (default: first alias which could be found)
+###searchguard.ssl.http.truststore_alias: my_alias
+### Truststore password (default: changeit)
+#X#searchguard.ssl.http.truststore_password: changeit
+### Use native Open SSL instead of JDK SSL if available (default: true)
+###searchguard.ssl.http.enable_openssl_if_available: false
+
+#####################################################
+##### Security manager - Searchguard Configuration
+#####################################################
+#X#security.manager.enabled: false
+#X#searchguard.authcz.admin_dn:
diff --git a/kubernetes/config/docker/init/src/config/aai/haproxy/haproxy.cfg b/kubernetes/config/docker/init/src/config/aai/haproxy/haproxy.cfg
new file mode 100644 (file)
index 0000000..d777327
--- /dev/null
@@ -0,0 +1,121 @@
+global
+        log /dev/log    local0
+        stats socket /usr/local/etc/haproxy/haproxy.socket mode 660 level admin
+        stats timeout 30s
+        user root
+        group root
+        daemon
+        #################################
+        # Default SSL material locations#
+        #################################
+        ca-base /etc/ssl/certs
+        crt-base /etc/ssl/private
+
+        # Default ciphers to use on SSL-enabled listening sockets.
+        # For more information, see ciphers(1SSL). This list is from:
+        # https://hynek.me/articles/hardening-your-web-servers-ssl-ciphers/
+        # An alternative list with additional directives can be obtained from
+        # https://mozilla.github.io/server-side-tls/ssl-config-generator/?server=haproxy
+        tune.ssl.default-dh-param 2048
+
+defaults
+        log     global
+        mode    http
+        option  httplog
+#       option  dontlognull
+#       errorfile 400 /etc/haproxy/errors/400.http
+#       errorfile 403 /etc/haproxy/errors/403.http
+#       errorfile 408 /etc/haproxy/errors/408.http
+#       errorfile 500 /etc/haproxy/errors/500.http
+#       errorfile 502 /etc/haproxy/errors/502.http
+#       errorfile 503 /etc/haproxy/errors/503.http
+#       errorfile 504 /etc/haproxy/errors/504.http
+
+        option  http-server-close
+        option forwardfor except 127.0.0.1
+        retries 6
+        option redispatch
+        maxconn 50000
+        timeout connect 50000
+        timeout client  480000
+        timeout server  480000
+        timeout http-keep-alive 30000
+
+
+frontend IST_8443
+        mode http
+        bind 0.0.0.0:8443 name https ssl crt /etc/ssl/private/aai.pem
+#       log-format %ci:%cp\ [%t]\ %ft\ %b/%s\ %Tq/%Tw/%Tc/%Tr/%Tt\ %ST\ %B\ %CC\ %CS\ %tsc\ %ac/%fc/%bc/%sc/%rc\ %sq/%bq\ %hr\ %hs\ {%[ssl_c_verify],%{+Q}[ssl_c_s_dn],%{+Q}[ssl_c_i_dn]}\ %{+Q}r
+        log-format "%ci:%cp [%tr] %ft %b/%s %TR/%Tw/%Tc/%Tr/%Ta %ST %B %CC \ %CS %tsc %ac/%fc/%bc/%sc/%rc %sq/%bq %hr %hs %{+Q}r"
+        option httplog
+        log global
+        option logasap
+        option forwardfor
+        capture request header  Host len 100
+        capture response header Host len 100
+        option log-separate-errors
+        option forwardfor
+        http-request set-header X-Forwarded-Proto https if { ssl_fc }
+        http-request set-header X-AAI-Client-SSL TRUE if { ssl_c_used }
+        http-request set-header X-AAI-SSL                       %[ssl_fc]
+        http-request set-header X-AAI-SSL-Client-Verify         %[ssl_c_verify]
+        http-request set-header X-AAI-SSL-Client-DN             %{+Q}[ssl_c_s_dn]
+        http-request set-header X-AAI-SSL-Client-CN             %{+Q}[ssl_c_s_dn(cn)]
+        http-request set-header X-AAI-SSL-Issuer                %{+Q}[ssl_c_i_dn]
+        http-request set-header X-AAI-SSL-Client-NotBefore      %{+Q}[ssl_c_notbefore]
+        http-request set-header X-AAI-SSL-Client-NotAfter       %{+Q}[ssl_c_notafter]
+        http-request set-header X-AAI-SSL-ClientCert-Base64   %{+Q}[ssl_c_der,base64]
+        http-request set-header X-AAI-SSL-Client-OU             %{+Q}[ssl_c_s_dn(OU)]
+        http-request set-header X-AAI-SSL-Client-L              %{+Q}[ssl_c_s_dn(L)]
+        http-request set-header X-AAI-SSL-Client-ST             %{+Q}[ssl_c_s_dn(ST)]
+        http-request set-header X-AAI-SSL-Client-C              %{+Q}[ssl_c_s_dn(C)]
+        http-request set-header X-AAI-SSL-Client-O              %{+Q}[ssl_c_s_dn(O)]
+        reqadd X-Forwarded-Proto:\ https
+        reqadd X-Forwarded-Port:\ 8443
+
+#######################
+#ACLS FOR PORT 8446####
+#######################
+
+        acl is_Port_8446_generic path_reg -i ^/aai/v[0-9]+/search/generic-query$
+        acl is_Port_8446_nodes path_reg -i ^/aai/v[0-9]+/search/nodes-query$
+        acl is_Port_8446_version path_reg -i ^/aai/v[0-9]+/query$
+        acl is_named-query path_beg -i /aai/search/named-query
+        acl is_search-model path_beg -i /aai/search/model
+        use_backend IST_AAI_8446 if is_Port_8446_generic or is_Port_8446_nodes or is_Port_8446_version or is_named-query or is_search-model
+
+        default_backend IST_Default_8447
+
+
+#######################
+#DEFAULT BACKEND 847###
+#######################
+
+backend IST_Default_8447
+        balance roundrobin
+        http-request set-header X-Forwarded-Port %[src_port]
+        http-response set-header Strict-Transport-Security max-age=16000000;\ includeSubDomains;\ preload;
+        server aai-resources.onap-aai  aai-resources.onap-aai:8447  port 8447 ssl verify none
+
+#######################
+# BACKEND 8446#########
+#######################
+
+backend IST_AAI_8446
+        balance roundrobin
+        http-request set-header X-Forwarded-Port %[src_port]
+        http-response set-header Strict-Transport-Security max-age=16000000;\ includeSubDomains;\ preload;
+        server aai-traversal.onap-aai aai-traversal.onap-aai:8446  port 8446 ssl verify none
+
+listen IST_AAI_STATS
+        mode http
+        bind *:8080
+        stats uri /stats
+        stats enable
+        stats refresh 30s
+        stats hide-version
+        stats auth admin:admin
+        stats show-legends
+        stats show-desc IST AAI APPLICATION NODES
+        stats admin if TRUE
+
diff --git a/kubernetes/config/docker/init/src/config/aai/model-loader/appconfig/auth/aai-os-cert.p12 b/kubernetes/config/docker/init/src/config/aai/model-loader/appconfig/auth/aai-os-cert.p12
new file mode 100644 (file)
index 0000000..ee57120
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/aai/model-loader/appconfig/auth/aai-os-cert.p12 differ
diff --git a/kubernetes/config/docker/init/src/config/aai/model-loader/appconfig/model-loader.properties b/kubernetes/config/docker/init/src/config/aai/model-loader/appconfig/model-loader.properties
new file mode 100644 (file)
index 0000000..58b80d8
--- /dev/null
@@ -0,0 +1,23 @@
+# Model Loader Distribution Client Configuration
+ml.distribution.ACTIVE_SERVER_TLS_AUTH=false
+ml.distribution.ASDC_ADDRESS=sdc-be.onap-sdc:8443
+ml.distribution.CONSUMER_GROUP=aai-ml-group
+ml.distribution.CONSUMER_ID=aai-ml
+ml.distribution.ENVIRONMENT_NAME=AUTO
+ml.distribution.KEYSTORE_PASSWORD=
+ml.distribution.KEYSTORE_FILE=asdc-client.jks
+ml.distribution.PASSWORD=OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go21hnj1y0k1mli1sop1k8o1j651vu91mxw1vun1mze1vv11j8x1k5i1sp11mjc1y161hlr1gm41m111nkj1z781pw31kku1r4p1e391r571pbm1o741l4x1ksp
+ml.distribution.POLLING_INTERVAL=30
+ml.distribution.POLLING_TIMEOUT=20
+ml.distribution.USER=aai
+ml.distribution.ARTIFACT_TYPES=MODEL_INVENTORY_PROFILE,MODEL_QUERY_SPEC,VNF_CATALOG
+
+# Model Loader AAI REST Client Configuration
+ml.aai.BASE_URL=https://aai-service.onap-aai:8443
+ml.aai.MODEL_URL=/aai/v10/service-design-and-creation/models/model/
+ml.aai.NAMED_QUERY_URL=/aai/v10/service-design-and-creation/named-queries/named-query/
+ml.aai.VNF_IMAGE_URL=/aai/v8/service-design-and-creation/vnf-images
+ml.aai.KEYSTORE_FILE=aai-os-cert.p12
+ml.aai.KEYSTORE_PASSWORD=OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o
+ml.aai.AUTH_USER=ModelLoader
+ml.aai.AUTH_PASSWORD=OBF:1qvu1v2h1sov1sar1wfw1j7j1wg21saj1sov1v1x1qxw
diff --git a/kubernetes/config/docker/init/src/config/aai/search-data-service/appconfig/analysis-config.json b/kubernetes/config/docker/init/src/config/aai/search-data-service/appconfig/analysis-config.json
new file mode 100644 (file)
index 0000000..f98ea37
--- /dev/null
@@ -0,0 +1,32 @@
+[
+       {
+               "name": "whitespace_analyzer", 
+               "description": "A standard whitespace analyzer.",
+               "behaviours": [
+                       "Tokenize the text using white space characters as delimeters.",
+                       "Convert all characters to lower case.",
+                       "Convert all alphanumeric and symbolic Unicode characters above the first 127 ASCII characters into their ASCII equivalents."
+               ],
+               "tokenizer": "whitespace",
+               "filters": [
+                       "lowercase",
+                       "asciifolding"
+               ]
+       },
+       {
+               "name": "ngram_analyzer", 
+               "description": "An analyzer which performs ngram filtering on the data stream.",
+               "behaviours": [
+                       "Tokenize the text using white space characters as delimeters.",
+                       "Convert all characters to lower case.",
+                       "Convert all alphanumeric and symbolic Unicode characters above the first 127 ASCII characters into their ASCII equivalents.",
+                       "Apply ngram filtering using the following values for minimum and maximum size in codepoints of a single n-gram: minimum = 1, maximum = 2."
+               ],
+               "tokenizer": "whitespace",
+               "filters": [
+                       "lowercase",
+                       "asciifolding",
+                       "ngram_filter"
+               ]
+       }
+]
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/search-data-service/appconfig/auth/search_policy.json b/kubernetes/config/docker/init/src/config/aai/search-data-service/appconfig/auth/search_policy.json
new file mode 100644 (file)
index 0000000..72d8902
--- /dev/null
@@ -0,0 +1,18 @@
+{
+       "roles": [
+               {
+                       "name": "admin",
+                       "functions": [
+                               {
+                                       "name": "search", "methods": [ { "name": "GET" },{ "name": "DELETE" }, { "name": "PUT" }, { "name": "POST" } ]
+                               }
+                       ],
+
+                       "users": [
+                               {
+                                       "username": "CN=ONAP, OU=ONAP, O=ONAP, L=Ottawa, ST=Ontario, C=CA"
+                               }
+                       ]
+               }               
+       ]
+}
diff --git a/kubernetes/config/docker/init/src/config/aai/search-data-service/appconfig/auth/tomcat_keystore b/kubernetes/config/docker/init/src/config/aai/search-data-service/appconfig/auth/tomcat_keystore
new file mode 100644 (file)
index 0000000..9eec841
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/aai/search-data-service/appconfig/auth/tomcat_keystore differ
diff --git a/kubernetes/config/docker/init/src/config/aai/search-data-service/appconfig/elastic-search.properties b/kubernetes/config/docker/init/src/config/aai/search-data-service/appconfig/elastic-search.properties
new file mode 100644 (file)
index 0000000..006fc6e
--- /dev/null
@@ -0,0 +1,5 @@
+# ElasticSearch Configuration
+
+es.cluster-name=ES_AAI
+es.ip-address=elasticsearch.onap-aai
+es.http-port=9200
diff --git a/kubernetes/config/docker/init/src/config/aai/search-data-service/appconfig/filter-config.json b/kubernetes/config/docker/init/src/config/aai/search-data-service/appconfig/filter-config.json
new file mode 100644 (file)
index 0000000..e2d5285
--- /dev/null
@@ -0,0 +1,7 @@
+[
+       {
+               "name": "ngram_filter",
+               "description": "Custom NGram Filter.",
+               "configuration": " \"type\": \"nGram\", \"min_gram\": 1, \"max_gram\": 50, \"token_chars\": [ \"letter\", \"digit\", \"punctuation\", \"symbol\" ]"
+       }
+]
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/aai.properties b/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/aai.properties
new file mode 100644 (file)
index 0000000..3b45428
--- /dev/null
@@ -0,0 +1,87 @@
+################################################################################################################
+############################## ActiveInventoryDataCollector TLS/SSL configuration ##############################
+################################################################################################################
+
+############################## Networking ##############################
+#
+# The ip address/hostname and port to the desired AAI instance
+#
+aai.rest.host=aai-service.onap-aai
+aai.rest.port=8443
+
+############################## REST ##############################
+# OXM version
+aai.rest.resourceBasePath=/aai/v9
+aai.rest.connectTimeoutInMs=30000
+aai.rest.readTimeoutInMs=60000
+aai.rest.numRequestRetries=5
+# HTTP_NOAUTH - straight HTTP no user/pass
+# SSL_BASIC   - HTTP/S with user/pass
+# SSL_CERT    - HTTP/S with client cert
+aai.rest.authenticationMode=SSL_BASIC
+
+############################## Cache ##############################
+# Experimental caching feature that is NOT production ready.
+# Enable at your own risk... it might not work.
+aai.rest.cache.enabled=false
+aai.rest.cache.numWorkers=10
+aai.rest.cache.cacheFailures=false
+aai.rest.cache.useCacheOnly=false
+aai.rest.cache.storageFolderOverride=
+aai.rest.cache.maxTimeToLiveInMs=-1
+
+# The shallowEntity filter will display the entity in a visualization
+# but will not collect it's relationships or complex attributes.
+aai.rest.shallowEntities=cloud-region,complex,vnf-image,att-aic,image
+
+############################## Certs, Auth, and SSL Settings ##############################
+aai.ssl.keystore.filename=aai-os-cert.p12
+aai.ssl.keystore.pass=OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o
+aai.ssl.keystore.type=pkcs12
+# Enable debug on the SSL connections
+aai.ssl.enableDebug=false
+# Degree of strictness to SSL connection standards
+aai.ssl.validateServerHostName=false;
+aai.ssl.validateServerCertificateChain=false;
+# If basic auth is implemented, username and password as required
+aai.ssl.basicAuth.username=AaiUI
+aai.ssl.basicAuth.password=OBF:1gfr1p571unz1p4j1gg7
+
+############################## Statistics Report Formatting ##############################
+#
+# During synchronization, a formatted statisitics log is generated
+#
+# Response size in bytes histogram
+aai.taskProcessor.bytesHistogramLabel="[Response Size In Bytes]"
+aai.taskProcessor.bytesHistogramMaxYAxis=1000000
+aai.taskProcessor.bytesHistogramNumBins=20
+aai.taskProcessor.bytesHistogramNumDecimalPoints=2
+# "Work on Hand" statisitcs for external resource requests
+aai.taskProcessor.queueLengthHistogramLabel="[Queue Item Length]"
+aai.taskProcessor.queueLengthHistogramMaxYAxis=20000
+aai.taskProcessor.queueLengthHistogramNumBins=20
+aai.taskProcessor.queueLengthHistogramNumDecimalPoints=2
+# Time on queue (how long does a task stay on the work queue)
+aai.taskProcessor.taskAgeHistogramLabel="[Task Age In Ms]"
+aai.taskProcessor.taskAgeHistogramMaxYAxis=600000
+aai.taskProcessor.taskAgeHistogramNumBins=20
+aai.taskProcessor.taskAgeHistogramNumDecimalPoints=2
+# Per transaction response time for external resource requests
+aai.taskProcessor.responseTimeHistogramLabel="[Response Time In Ms]"
+aai.taskProcessor.responseTimeHistogramMaxYAxis=10000
+aai.taskProcessor.responseTimeHistogramNumBins=20
+aai.taskProcessor.responseTimeHistogramNumDecimalPoints=2
+# Transaction throughput velocity
+aai.taskProcessor.tpsHistogramLabel="[Transactions Per Second]"
+aai.taskProcessor.tpsHistogramMaxYAxis=100
+aai.taskProcessor.tpsHistogramNumBins=20
+aai.taskProcessor.tpsHistogramNumDecimalPoints=2
+
+############################## Deprecated, to be removed or updated ##############################
+aai.rest.numResolverWorkers=15
+aai.ssl.truststore.filename=asdc-client.jks
+aai.ssl.truststore.type=jks
+aai.taskProcessor.maxConcurrentWorkers=5
+aai.taskProcessor.transactionRateControllerEnabled=false
+aai.taskProcessor.numSamplesPerThreadForRunningAverage=100
+aai.taskProcessor.targetTPS=100
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/auth/aai-os-cert.p12 b/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/auth/aai-os-cert.p12
new file mode 100644 (file)
index 0000000..ee57120
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/auth/aai-os-cert.p12 differ
diff --git a/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/auth/client-cert-onap.p12 b/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/auth/client-cert-onap.p12
new file mode 100644 (file)
index 0000000..dbf4fca
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/auth/client-cert-onap.p12 differ
diff --git a/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/auth/inventory-ui-keystore b/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/auth/inventory-ui-keystore
new file mode 100644 (file)
index 0000000..efa01f8
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/auth/inventory-ui-keystore differ
diff --git a/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/elasticsearch.properties b/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/elasticsearch.properties
new file mode 100644 (file)
index 0000000..82b5af3
--- /dev/null
@@ -0,0 +1,72 @@
+#######################################################################################
+############################## ElasticSearch Config ###################################
+#######################################################################################
+
+############################## Networking ##############################
+#
+# The ip address/hostname and port to the desired AAI instance
+# For development it's recommended to use a local instance of ES
+#
+elasticsearch.ipAddress=elasticsearch.onap-aai
+elasticsearch.httpPort=9200
+elasticsearch.javaApiPort=8443
+
+############################## Indexes ##############################
+#
+# Index names for various searches.
+#
+elasticsearch.indexName=entitysearchindex
+elasticsearch.topographicalIndexName=topographicalsearchindex
+elasticsearch.entityCountHistoryIndexName=entitycounthistoryindex
+elasticsearch.autosuggestIndexname=entityautosuggestindex
+
+# Default document type
+elasticsearch.type=default
+
+############################## Index Mappings and Settings ##############################
+#
+# JSON files for sparky elasticsearch indexes.
+#
+elasticsearch.mappingsFileName=/etc/es_mappings.json
+elasticsearch.settingsFileName=/etc/es_settings.json
+elasticsearch.autosuggestSettingsFileName=/etc/autoSuggestSettings.json
+elasticsearch.autosuggestMappingsFileName=/etc/autoSuggestMappings.json
+elasticsearch.dynamicMappingsFileName=/etc/dynamicMappings.json
+elasticsearch.entityCountHistoryMappingsFileName=/etc/entityCountHistoryMappings.json
+
+############################## Statistics Report Formatting ##############################
+#
+# During synchronization, a formatted statisitics log is generated.
+#
+# Response size in bytes histogram
+elasticsearch.taskProcessor.bytesHistogramLabel="[Response Size In Bytes]"
+elasticsearch.taskProcessor.bytesHistogramMaxYAxis=1000000
+elasticsearch.taskProcessor.bytesHistogramNumBins=20
+elasticsearch.taskProcessor.bytesHistogramNumDecimalPoints=2
+# "Work on Hand" statisitcs for external resource requests
+elasticsearch.taskProcessor.queueLengthHistogramLabel="[Queue Item Length]"
+elasticsearch.taskProcessor.queueLengthHistogramMaxYAxis=20000
+elasticsearch.taskProcessor.queueLengthHistogramNumBins=20
+elasticsearch.taskProcessor.queueLengthHistogramNumDecimalPoints=2
+# Time on queue (how long does a task stay on the work queue)
+elasticsearch.taskProcessor.taskAgeHistogramLabel="[Task Age In Ms]"
+elasticsearch.taskProcessor.taskAgeHistogramMaxYAxis=600000
+elasticsearch.taskProcessor.taskAgeHistogramNumBins=20
+elasticsearch.taskProcessor.taskAgeHistogramNumDecimalPoints=2
+# Per transaction response time for external resource requests
+elasticsearch.taskProcessor.responseTimeHistogramLabel="[Response Time In Ms]"
+elasticsearch.taskProcessor.responseTimeHistogramMaxYAxis=1000
+elasticsearch.taskProcessor.responseTimeHistogramNumBins=20
+elasticsearch.taskProcessor.responseTimeHistogramNumDecimalPoints=2
+# Transaction throughput velocity
+elasticsearch.taskProcessor.tpsHistogramLabel="[Transactions Per Second]"
+elasticsearch.taskProcessor.tpsHistogramMaxYAxis=100
+elasticsearch.taskProcessor.tpsHistogramNumBins=20
+elasticsearch.taskProcessor.tpsHistogramNumDecimalPoints=2
+
+############################## Deprecated, to be removed or updated ##############################
+elasticsearch.taskProcessor.maxConcurrentWorkers=5
+elasticsearch.taskProcessor.transactionRateControllerEnabled=false
+elasticsearch.taskProcessor.numSamplesPerThreadForRunningAverage=100
+elasticsearch.taskProcessor.targetTPS=100
+elasticsearch.clusterName=ES_AAI_LOCALHOST
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/model/aai_oxm_v9.xml b/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/model/aai_oxm_v9.xml
new file mode 100644 (file)
index 0000000..6337c32
--- /dev/null
@@ -0,0 +1,4775 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.att.com.v9" xml-mapping-metadata-complete="true">
+       <xml-schema element-form-default="QUALIFIED">
+               <xml-ns namespace-uri="http://com.att.aai.inventory/v9" />
+       </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.att.com.v9.Search" />
+                               <xml-element java-attribute="actions" name="actions" type="inventory.aai.att.com.v9.Actions" />
+                               <xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.att.com.v9.CloudInfrastructure" />
+                               <xml-element java-attribute="licenseManagement" name="license-management" type="inventory.aai.att.com.v9.LicenseManagement" />
+                               <xml-element java-attribute="business" name="business" type="inventory.aai.att.com.v9.Business" />
+                               <xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.att.com.v9.ServiceDesignAndCreation" />
+                               <xml-element java-attribute="network" name="network" type="inventory.aai.att.com.v9.Network" />
+                               <xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.att.com.v9.AaiInternal" />
+                       </java-attributes>
+               </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.att.com.v9.EdgeTagQueryResult" />
+                               <xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.att.com.v9.EdgeTagQueryRequest" />
+                               <xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.att.com.v9.SearchResults" />
+                               <xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.att.com.v9.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.att.com.v9.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.att.com.v9.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.att.com.v9.InventoryItemData" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.att.com.v9.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.att.com.v9.StartNodeFilter" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.att.com.v9.IncludeNodeFilter" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.att.com.v9.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.att.com.v9.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.att.com.v9.OamNetworks" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.att.com.v9.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.att.com.v9.DvsSwitches" />
+                               <xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.att.com.v9.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.att.com.v9.Update" />
+                               <xml-element java-attribute="notify" name="notify" type="inventory.aai.att.com.v9.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.att.com.v9.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.att.com.v9.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.att.com.v9.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.att.com.v9.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="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.att.com.v9.Complexes" />
+                               <xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.att.com.v9.CloudRegions" />
+                               <xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.att.com.v9.NetworkProfiles" />
+                               <xml-element java-attribute="pservers" name="pservers" type="inventory.aai.att.com.v9.Pservers" />
+                               <xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.att.com.v9.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.att.com.v9.CloudRegion" />
+                       </java-attributes>
+               </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, e.g., att-aic. 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" />
+                                       </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" />
+                                       </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" />
+                                       </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.att.com.v9.VolumeGroups" />
+                               <xml-element java-attribute="tenants" name="tenants" type="inventory.aai.att.com.v9.Tenants" />
+                               <xml-element java-attribute="flavors" name="flavors" type="inventory.aai.att.com.v9.Flavors" />
+                               <xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.att.com.v9.GroupAssignments" />
+                               <xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.att.com.v9.Snapshots" />
+                               <xml-element java-attribute="images" name="images" type="inventory.aai.att.com.v9.Images" />
+                               <xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.att.com.v9.DvsSwitches" />
+                               <xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.att.com.v9.OamNetworks" />
+                               <xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.att.com.v9.AvailabilityZones" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v9.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation. In AT&amp;Ts AIC cloud, this could be an LCP or DCP. Cloud regions are uniquely identified by a composite key, cloud-owner + cloud-region-id. The format of the cloud-owner is vendor-cloudname and we will use att-aic for AT&amp;T's AIC." />
+                               <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.att.com.v9.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 and clients should expect changes                  to occur in the future to this field as ASDC 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="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.att.com.v9.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.att.com.v9.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.att.com.v9.RelationshipData" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.att.com.v9.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.att.com.v9.Complex" />
+                       </java-attributes>
+               </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.att.com.v9.CtagPools" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v9.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-property name="geoProps" value="latitude,longitude" />
+                               <xml-property name="geoLat" value="latitude" />
+                               <xml-property name="geoLong" value="longitude" />
+                       </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.att.com.v9.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.att.com.v9.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.att.com.v9.Tenant" />
+                       </java-attributes>
+               </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="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.att.com.v9.Vservers" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v9.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" />
+                               <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.att.com.v9.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.att.com.v9.Volumes" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v9.RelationshipList" />
+                               <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.att.com.v9.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.att.com.v9.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="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="vlans" name="vlans" type="inventory.aai.att.com.v9.Vlans" />
+                               <xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.att.com.v9.SriovVfs" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v9.RelationshipList" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.att.com.v9.L3InterfaceIpv4AddressList" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.att.com.v9.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,vpe,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.att.com.v9.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.att.com.v9.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.att.com.v9.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" />
+                       </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.att.com.v9.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="vpnId" name="vpn-id" 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="relationshipList" name="relationship-list" type="inventory.aai.att.com.v9.RelationshipList" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.att.com.v9.L3InterfaceIpv4AddressList" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.att.com.v9.L3InterfaceIpv6AddressList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Definition of vlan" />
+                               <xml-property name="indexedProps" value="vlan-interface,vlan-id-inner,vpn-id" />
+                               <xml-property name="uniqueProps" value="vpn-id" />
+                               <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.att.com.v9.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" />
+                       </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.att.com.v9.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.att.com.v9.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.att.com.v9.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.att.com.v9.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.att.com.v9.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.att.com.v9.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.att.com.v9.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.att.com.v9.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="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.att.com.v9.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.att.com.v9.RelationshipList" />
+                               <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.att.com.v9.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.att.com.v9.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 VPEs." />
+                       </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.att.com.v9.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.att.com.v9.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.att.com.v9.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.att.com.v9.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.att.com.v9.Pserver" />
+                       </java-attributes>
+               </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="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="relationshipList" name="relationship-list" type="inventory.aai.att.com.v9.RelationshipList" />
+                               <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.att.com.v9.PInterfaces" />
+                               <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.att.com.v9.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" />
+                               <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.att.com.v9.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="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.att.com.v9.RelationshipList" />
+                               <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.att.com.v9.LInterfaces" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Physical interface (e.g., nic)" />
+                               <xml-property name="indexedProps" value="interface-name" />
+                               <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.att.com.v9.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="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="relationshipList" name="relationship-list" type="inventory.aai.att.com.v9.RelationshipList" />
+                               <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.att.com.v9.LInterfaces" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Link aggregate interface" />
+                               <xml-property name="indexedProps" value="interface-name" />
+                               <xml-property name="dependentOn" value="generic-vnf,pserver,vpe,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.att.com.v9.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.att.com.v9.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.att.com.v9.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="operationalState" name="operational-state" 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.att.com.v9.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.att.com.v9.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.att.com.v9.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="LicenseManagement">
+                       <xml-root-element name="license-management" />
+                       <java-attributes>
+                               <xml-element java-attribute="licenseKeyResources" name="license-key-resources" type="inventory.aai.att.com.v9.LicenseKeyResources" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="LicenseKeyResources">
+                       <xml-root-element name="license-key-resources" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="licenseKeyResource" name="license-key-resource" type="inventory.aai.att.com.v9.LicenseKeyResource" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="LicenseKeyResource">
+                       <xml-root-element name="license-key-resource" />
+                       <java-attributes>
+                               <xml-element java-attribute="attUuid" name="att-uuid" required="true" type="java.lang.String" xml-key="true" />
+                               <xml-element java-attribute="assignmentType" name="assignment-type" type="java.lang.String" />
+                               <xml-element java-attribute="assignmentStatus" name="assignment-status" type="java.lang.String" />
+                               <xml-element java-attribute="assignmentGroupUuid" name="assignment-group-uuid" required="true" type="java.lang.String" />
+                               <xml-element java-attribute="assignmentDate" name="assignment-date" type="java.lang.String" />
+                               <xml-element java-attribute="name" name="name" type="java.lang.String" />
+                               <xml-element java-attribute="modelUuid" name="model-uuid" type="java.lang.String" />
+                               <xml-element java-attribute="modelVersion" name="model-version" type="java.lang.String" />
+                               <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String" />
+                               <xml-element java-attribute="licenseKeyFileUrl" name="license-key-file-url" type="java.lang.String" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="supplierReleaseList" name="supplier-release-list" 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>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v9.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="nameProps" value="name" />
+                               <xml-property name="indexedProps" value="assignment-group-uuid,att-uuid,name" />
+                               <xml-property name="uniqueProps" value="att-uuid" />
+                               <xml-property name="container" value="license-key-resources" />
+                               <xml-property name="namespace" value="license-management" />
+                       </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.att.com.v9.Connectors" />
+                               <xml-element java-attribute="customers" name="customers" type="inventory.aai.att.com.v9.Customers" />
+                       </java-attributes>
+               </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.att.com.v9.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="personaModelId" name="persona-model-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC model id for this resource or service model." />
+                                       </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-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.att.com.v9.RelationshipList" />
+                               <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.att.com.v9.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,persona-model-id,persona-model-version,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.att.com.v9.Customer" />
+                       </java-attributes>
+               </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.att.com.v9.ServiceSubscriptions" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v9.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,subscriber-name" />
+                               <xml-property name="alternateKeys1" value="subscriber-name" />
+                               <xml-property name="container" value="customers" />
+                               <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.att.com.v9.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.att.com.v9.ServiceInstances">
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v9.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.att.com.v9.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="personaModelId" name="persona-model-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC model id for this resource or service model." />
+                                       </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-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="operationalStatus" name="operational-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Operational status of the service-instance." />
+                                       </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="relationshipList" name="relationship-list" type="inventory.aai.att.com.v9.RelationshipList" />
+                               <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.att.com.v9.Metadata" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Instance of a service" />
+                               <xml-property name="indexedProps" value="service-instance-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id" />
+                               <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.att.com.v9.VnfImages" />
+                               <xml-element java-attribute="services" name="services" type="inventory.aai.att.com.v9.Services" />
+                               <xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.att.com.v9.ServiceCapabilities" />
+                               <xml-element java-attribute="models" name="models" type="inventory.aai.att.com.v9.Models" />
+                               <xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.att.com.v9.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.att.com.v9.VnfImage" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="VnfImage">
+                       <xml-root-element name="vnf-image" />
+                       <java-attributes>
+                               <xml-element java-attribute="attUuid" name="att-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.att.com.v9.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,att-uuid,application-vendor,application-version" />
+                               <xml-property name="uniqueProps" value="att-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.att.com.v9.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.att.com.v9.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." />
+                               <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.att.com.v9.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 and clients should expect changes                  to occur in the future to this field as ASDC 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.att.com.v9.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.att.com.v9.LogicalLinks" />
+                               <xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.att.com.v9.SitePairSets" />
+                               <xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.att.com.v9.VpnBindings" />
+                               <xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.att.com.v9.VplsPes" />
+                               <xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.att.com.v9.MulticastConfigurations" />
+                               <xml-element java-attribute="vces" name="vces" type="inventory.aai.att.com.v9.Vces" />
+                               <xml-element java-attribute="vpes" name="vpes" type="inventory.aai.att.com.v9.Vpes" />
+                               <xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.att.com.v9.Vnfcs" />
+                               <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.att.com.v9.L3Networks" />
+                               <xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.att.com.v9.NetworkPolicies" />
+                               <xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.att.com.v9.GenericVnfs" />
+                               <xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.att.com.v9.LagLinks" />
+                               <xml-element java-attribute="newvces" name="newvces" type="inventory.aai.att.com.v9.Newvces" />
+                               <xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.att.com.v9.Pnfs" />
+                               <xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.att.com.v9.PhysicalLinks" />
+                               <xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.att.com.v9.IpsecConfigurations" />
+                               <xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.att.com.v9.RouteTableReferences" />
+                       </java-attributes>
+               </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.att.com.v9.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 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 (should be att-ip-version)" />
+                                       </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="personaModelId" name="persona-model-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC model id for this resource or service model." />
+                                       </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-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="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="relationshipList" name="relationship-list" type="inventory.aai.att.com.v9.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,persona-model-id,persona-model-version,widget-model-id,widget-model-version,link-id" />
+                               <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.att.com.v9.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.att.com.v9.RoutingInstances" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v9.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.att.com.v9.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.att.com.v9.SitePairs" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v9.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="indexedProps" value="routing-instance-id" />
+                               <xml-property name="uniqueProps" 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.att.com.v9.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.att.com.v9.ClassesOfService" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v9.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.att.com.v9.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.att.com.v9.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.att.com.v9.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="globalRouteTarget" name="global-route-target" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Number used to identify a VPN, globally unique in the network" />
+                                       </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="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.att.com.v9.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" />
+                               <xml-property name="indexedProps" value="vpn-name,vpn-id,global-route-target" />
+                               <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.att.com.v9.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 vpe, also used for troubleshooting and is IP used for traps generated by VPE (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.att.com.v9.RelationshipList" />
+                               <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.att.com.v9.PInterfaces" />
+                               <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.att.com.v9.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.att.com.v9.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.att.com.v9.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.att.com.v9.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 and clients should expect changes                  to occur in the future to this field as ASDC 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 from ASDC.  Expect this to change as ASDC matures." />
+                                       </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="operationalState" name="operational-state" 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="License key" />
+                                       </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="Entitlement resource uuid" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.att.com.v9.PortGroups" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v9.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="vpe-id,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.att.com.v9.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.att.com.v9.CvlanTags" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v9.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.att.com.v9.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.att.com.v9.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="Vpes">
+                       <xml-properties>
+                               <xml-property name="description" value="Virtual provider edge router. In 1504, A&amp;AI will populate this object through an M&amp;P and tool provided to operations." />
+                       </xml-properties>
+                       <xml-root-element name="vpes" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="vpe" name="vpe" type="inventory.aai.att.com.v9.Vpe" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="Vpe">
+                       <xml-root-element name="vpe" />
+                       <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 and clients should expect changes                  to occur in the future to this field as ASDC 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 from ASDC" />
+                                       </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="operationalState" name="operational-state" 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="License key" />
+                                       </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, 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="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-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="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="v4Loopback0IpAddress" name="v4-loopback0-ip-address" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Loopback0 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 stag to get to VCE" />
+                                       </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 VPE" />
+                                       </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 vpe operation" />
+                                       </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 vpe access uses SSH" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v9.RelationshipList" />
+                               <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.att.com.v9.LInterfaces" />
+                               <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.att.com.v9.LagInterfaces" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Relationship-list must include related to info for complex." />
+                               <xml-property name="nameProps" value="vnf-name" />
+                               <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,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="vpes" />
+                               <xml-property name="namespace" value="network" />
+                               <xml-property name="extends" value="vnf" />
+                       </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.att.com.v9.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="vnfcFunctionCode" name="vnfc-function-code" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="function code" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vnfcType" name="vnfc-type" required="true" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="type" />
+                                       </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="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.att.com.v9.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="indexedProps" value="vnfc-name,prov-status,vnfc-type,vnfc-function-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation" />
+                               <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.att.com.v9.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" />
+                                       </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="personaModelId" name="persona-model-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC model id for this resource or service model." />
+                                       </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-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="subnets" name="subnets" type="inventory.aai.att.com.v9.Subnets" />
+                               <xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.att.com.v9.CtagAssignments" />
+                               <xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.att.com.v9.SegmentationAssignments" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v9.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,persona-model-id,persona-model-version,widget-model-id,widget-model-version,contrail-network-fqdn" />
+                               <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.att.com.v9.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.att.com.v9.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.att.com.v9.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.att.com.v9.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.att.com.v9.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="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.att.com.v9.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.att.com.v9.GenericVnf" />
+                       </java-attributes>
+               </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 and clients should expect changes                  to occur in the future to this field as ASDC 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 from ASDC" />
+                                       </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-property name="suggestionVerbs" value="is,in,at,with,on,off,changed,changing"/>
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="operationalState" name="operational-state" 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="License key" />
+                                       </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-property name="suggestionVerbs" value="is,in,at,with,on,off,changed,changing"/>
+                                       </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" />
+                                       </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" />
+                                       </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" />
+                                       </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" />
+                                       </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" />
+                                       </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" />
+                                       </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" />
+                                       </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" />
+                                       </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" />
+                                       </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" />
+                                       </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" />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="personaModelId" name="persona-model-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC model id for this resource or service model." />
+                                       </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-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="relationshipList" name="relationship-list" type="inventory.aai.att.com.v9.RelationshipList" />
+                               <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.att.com.v9.LInterfaces" />
+                               <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.att.com.v9.LagInterfaces" />
+                               <xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.att.com.v9.VfModules" />
+                       </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,persona-model-id,persona-model-version,widget-model-id,widget-model-version" />
+                               <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.att.com.v9.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="personaModelId" name="persona-model-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the ASDC model id for this resource or service model." />
+                                       </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-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="relationshipList" name="relationship-list" type="inventory.aai.att.com.v9.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,persona-model-id,persona-model-version,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.att.com.v9.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.att.com.v9.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.att.com.v9.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 and clients should expect changes                  to occur in the future to this field as ASDC 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="operationalState" name="operational-state" 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="License key" />
+                                       </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 vpe, also used for troubleshooting and is IP used for traps generated by VPE (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., VPE." />
+                                       </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.att.com.v9.RelationshipList" />
+                               <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.att.com.v9.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.att.com.v9.Pnf" />
+                       </java-attributes>
+               </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 java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="orchestration-status is the status of orchestration 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="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.att.com.v9.RelationshipList" />
+                               <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.att.com.v9.PInterfaces" />
+                               <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.att.com.v9.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" />
+                               <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.att.com.v9.PhysicalLink" />
+                       </java-attributes>
+               </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="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.att.com.v9.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.att.com.v9.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.att.com.v9.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.att.com.v9.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.att.com.v9.RelationshipList" />
+                               <xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.att.com.v9.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.att.com.v9.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.att.com.v9.ReservedPropNames" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.att.com.v9.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" />
+                       </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" />
+                       </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="isParent" name="isParent" type="java.lang.Boolean" />
+                               <xml-element java-attribute="usesResource" name="usesResource" type="java.lang.Boolean" />
+                               <xml-element java-attribute="hasDelTarget" name="hasDelTarget" type="java.lang.Boolean" />
+                               <xml-element java-attribute="SVC-INFRA" name="SVC-INFRA" type="java.lang.String" />
+                               <xml-element java-attribute="SVC-INFRA-REV" name="SVC-INFRA-REV" 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.att.com.v9.Model" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type 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" />
+                               <xml-property name="nameProps" value="model-name,model-type" />
+                               <xml-property name="indexedProps" value="model-name-version-id,model-type,model-name,model-id,model-version" />
+                               <xml-property name="alternateKeys1" value="model-id,model-version" />
+                               <xml-property name="uniqueProps" value="model-name-version-id" />
+                               <xml-property name="container" value="models" />
+                               <xml-property name="namespace" value="service-design-and-creation" />
+                       </xml-properties>
+                       <xml-root-element name="model" />
+                       <java-attributes>
+                               <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="modelElements" name="model-elements" type="inventory.aai.att.com.v9.ModelElements" />
+                               <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.att.com.v9.Metadata" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v9.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.att.com.v9.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-point" type="java.lang.String">
+                                       <xml-element-wrapper name="linkage-points" />
+                               </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.att.com.v9.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.att.com.v9.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.att.com.v9.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.att.com.v9.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.att.com.v9.ConstrainedElementSets" />
+                       </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.att.com.v9.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.att.com.v9.ElementChoiceSets" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v9.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.att.com.v9.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.att.com.v9.ModelElements" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v9.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.att.com.v9.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.att.com.v9.NamedQueryElements" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v9.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.att.com.v9.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.att.com.v9.NamedQueryElements" />
+                               <xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.att.com.v9.RelatedLookups" />
+                               <xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.att.com.v9.PropertyConstraints" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.att.com.v9.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.att.com.v9.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.att.com.v9.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.att.com.v9.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="property-name" name="property-name" required="true" type="java.lang.String" />
+                               <xml-element java-attribute="property-value" 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.att.com.v9.QueryParameters" />
+                               <xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.att.com.v9.InstanceFilters" />
+                               <xml-element java-attribute="topNodeType"     name="top-node-type"    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.att.com.v9.NamedQuery" />
+                               <xml-element java-attribute="model" name="model" type="inventory.aai.att.com.v9.Model" />
+                       </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.att.com.v9.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="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.att.com.v9.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.att.com.v9.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.att.com.v9.ExtraProperties" />
+                               <xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.att.com.v9.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-any-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.att.com.v9.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-any-element java-attribute="propertyValue" lax="true" name="property-value" />
+                       </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.att.com.v9.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.att.com.v9.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="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.att.com.v9.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.att.com.v9.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="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,vpe,generic-vnf" />
+                               <xml-property name="abstract" value="true" />
+                       </xml-properties>
+               </java-type>
+       </java-types>
+</xml-bindings>
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/portal/portal-authentication.properties b/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/portal/portal-authentication.properties
new file mode 100644 (file)
index 0000000..0873fc1
--- /dev/null
@@ -0,0 +1,14 @@
+##########################################################################################
+############################## eCOMP Portal Auth Properties ##############################
+##########################################################################################
+
+############################## Auth ##############################
+username=aaiui
+password=1t2v1vfv1unz1vgz1t3b
+
+##############################  ##############################
+#
+# ONAP Cookie Processing - During initial development, this flag, if true, will
+# prevent the portal interface's login processing from searching for a user
+# specific cookie, and will instead allow passage if a valid session cookie is discovered.
+onap_enabled=true
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/portal/portal.properties b/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/portal/portal.properties
new file mode 100644 (file)
index 0000000..cf99f5d
--- /dev/null
@@ -0,0 +1,23 @@
+######################################################################################
+############################## eCOMP Portal properties ###############################
+######################################################################################
+
+# Java class that implements the ECOMP role and user mgt API
+portal.api.impl.class = org.openecomp.sparky.security.portal.PortalRestAPIServiceImpl
+
+# Instance of ECOMP Portal where the app has been on-boarded
+# use insecure http for dev purposes to avoid self-signed certificate
+ecomp_rest_url = http://portalapps.onap-portal:8989/ECOMPPORTAL/auxapi
+
+# Standard global logon page
+ecomp_redirect_url = http://portalapps.onap-portal:8989/ECOMPPORTAL/login.htm
+
+# Name of cookie to extract on login request
+csp_cookie_name = EPService
+# Alternate values: DEVL, V_DEVL, V_PROD
+csp_gate_keeper_prod_key = PROD
+
+# Toggles use of UEB
+ueb_listeners_enable = false
+# IDs application withing UEB flow
+ueb_app_key = qFKles9N8gDTV0Zc 
diff --git a/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/roles.config b/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/roles.config
new file mode 100644 (file)
index 0000000..b8313bd
--- /dev/null
@@ -0,0 +1,6 @@
+[
+  {
+    "id":1,
+    "name":"View"
+  }
+]
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/search-service.properties b/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/search-service.properties
new file mode 100644 (file)
index 0000000..5f4985a
--- /dev/null
@@ -0,0 +1,32 @@
+########################################################################################
+############################## Search Data Service Config ##############################
+########################################################################################
+
+############################## Networking ##############################
+#
+# The ip address/hostname and port to the desired Search Data Service instance
+#
+search-service.ipAddress=search-data-service.onap-aai
+search-service.httpPort=9509
+
+############################## Indexes ##############################
+#
+# Index values that will be associated with searches
+#
+# Searchable entities
+search-service.indexName=entitysearchindex
+# Inventory searches
+search-service.topographicalIndexName=topographicalsearchindex
+search-service.entityCountHistoryIndexName=entitycounthistoryindex
+
+############################## Version ##############################
+#
+# Search Data Service version and type (see Search Data Service for more details)
+#
+search-service.version=v1
+search-service.type=default
+
+############################## Certs ##############################
+search-service.ssl.cert-name=client-cert-onap.p12
+search-service.ssl.keystore-password=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
+search-service.ssl.keystore=tomcat_keystore
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/suggestive-search.properties b/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/suggestive-search.properties
new file mode 100644 (file)
index 0000000..b82baff
--- /dev/null
@@ -0,0 +1,27 @@
+######################################################################################
+############################## Suggestive Search Config ##############################
+######################################################################################
+
+# Indexes to be taken into account when generating suggestion entries
+suggestion.indexes=elasticsearch.autosuggestIndexname,elasticsearch.indexName
+# List of stop words to be used during suggestive search
+suggestion.stopwords=a,an,and,are,as,at,be,but,by,called,for,if,in,into,is,it,no,not,of,on,or,such,that,the,their,then,there,these,they,this,to,was,will,with
+# Assigns which class, within sparky, will process the searches related to an assosiated index
+suggestion.routing=elasticsearch.autosuggestIndexname:SearchServiceWrapper,elasticsearch.indexName:VnfSearchService
+
+############################## Pairings ##############################
+#
+# "called" pairings, keys reference types within the OXM, and the value
+# is the suggestion term used for matches with any of the "called" keys.
+# e.g. "x called vserver-id" (but actual value of vserver-id)
+suggestion.pairing.called.key=volume-group-id,volume-group-name,physical-location-id,data-center-code,complex-name,tenant-id,tenant-name,vserver-id,vserver-name,vserver-name2,hostname,pserver-name2,pserver-id,global-customer-id,subscriber-name,service-instance-id,service-instance-name,link-name,vpn-id,vpn-name,vpe-id,vnf-id,vnf-name,vnf-name2,vnfc-name,network-id,network-name,network-policy-id,vf-module-id,vf-module-name,vnf-id2,pnf-name,circuit-id
+suggestion.pairing.called.value=called
+#
+# Exact same explanation as the "called" pairings above.
+# e.g. "x at ipv4-oam-address"
+suggestion.pairing.at.key=street1,street2,postal-code,ipv4-oam-address,network-policy-fqdn
+suggestion.pairing.at.value=at
+#
+# Default pairing values for any OXM types that aren't part of the the other
+# pairing lists.
+suggestion.pairing.default.value=with
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/synchronizer.properties b/kubernetes/config/docker/init/src/config/aai/sparky-be/appconfig/synchronizer.properties
new file mode 100644 (file)
index 0000000..0b84f06
--- /dev/null
@@ -0,0 +1,33 @@
+##############################################################################################
+############################## ElasticSearchSynchronizer Config ##############################
+##############################################################################################
+
+# Initial delay on startup before starting synchronization tasks
+synchronizer.syncTask.initialDelayInMs=60000
+# The frequency at which the synchronizationtask will be run
+synchronizer.syncTask.taskFrequencyInDay=2
+
+# Time at which to run synchronization. Format = hh:mm:ss UTC(-/+)hh:mm
+synchronizer.syncTask.startTimestamp=05:00:00 UTC+00:00
+
+# Generates a count in elasticsearch related to inventory
+synchronizer.historicalEntitySummarizerEnabled=true
+# Toggles the suggestion synchronizer
+synchronizer.autosuggestSynchronizationEnabled=true
+# Frequency at which above count is generated
+synchronizer.historicalEntitySummarizedFrequencyInMinutes=60
+
+# Elasticsearch scroll api context keep alive value
+synchronizer.scrollContextTimeToLiveInMinutes=5
+# Elasticsearch scroll api context max items per batch request
+synchronizer.numScrollContextItemsToRetrievePerRequest=5000
+
+
+############################## Deprecated, to be removed or updated ##############################
+synchronizer.resolver.progressLogFrequencyInMs=60000
+synchronizer.resolver.queueMonitorFrequencyInMs=1000
+synchronizer.resolver.displayVerboseQueueManagerStats=false
+synchronizer.indexIntegrityValidator.enabled=false
+synchronizer.indexIntegrityValidatorFrequencyInMs=3600000
+synchronizer.suppressResourceNotFoundErrors=true
+synchronizer.applyNodesOnlyModifier=false
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/APPC-CL-0/00000000000000000000.index b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/APPC-CL-0/00000000000000000000.index
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/APPC-CL-0/00000000000000000000.log b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/APPC-CL-0/00000000000000000000.log
new file mode 100644 (file)
index 0000000..85ee8bf
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/APPC-CL-0/00000000000000000000.log differ
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/APPC-CL-1/00000000000000000000.index b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/APPC-CL-1/00000000000000000000.index
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/APPC-CL-1/00000000000000000000.log b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/APPC-CL-1/00000000000000000000.log
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/APPC-TEST1-0/00000000000000000000.index b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/APPC-TEST1-0/00000000000000000000.index
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/APPC-TEST1-0/00000000000000000000.log b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/APPC-TEST1-0/00000000000000000000.log
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/APPC-TEST2-0/00000000000000000000.index b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/APPC-TEST2-0/00000000000000000000.index
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/APPC-TEST2-0/00000000000000000000.log b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/APPC-TEST2-0/00000000000000000000.log
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/APPC-TEST2-1/00000000000000000000.index b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/APPC-TEST2-1/00000000000000000000.index
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/APPC-TEST2-1/00000000000000000000.log b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/APPC-TEST2-1/00000000000000000000.log
new file mode 100644 (file)
index 0000000..66dcea9
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/APPC-TEST2-1/00000000000000000000.log differ
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/DCAE-CL-EVENT-0/00000000000000000000.index b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/DCAE-CL-EVENT-0/00000000000000000000.index
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/DCAE-CL-EVENT-0/00000000000000000000.log b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/DCAE-CL-EVENT-0/00000000000000000000.log
new file mode 100644 (file)
index 0000000..bb73f23
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/DCAE-CL-EVENT-0/00000000000000000000.log differ
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/DCAE-CL-EVENT-1/00000000000000000000.index b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/DCAE-CL-EVENT-1/00000000000000000000.index
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/DCAE-CL-EVENT-1/00000000000000000000.log b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/DCAE-CL-EVENT-1/00000000000000000000.log
new file mode 100644 (file)
index 0000000..53364c5
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/DCAE-CL-EVENT-1/00000000000000000000.log differ
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-INBOX-0/00000000000000000000.index b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-INBOX-0/00000000000000000000.index
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-INBOX-0/00000000000000000000.log b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-INBOX-0/00000000000000000000.log
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-APP1-0/00000000000000000000.index b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-APP1-0/00000000000000000000.index
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-APP1-0/00000000000000000000.log b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-APP1-0/00000000000000000000.log
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-DBC1-0/00000000000000000000.index b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-DBC1-0/00000000000000000000.index
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-DBC1-0/00000000000000000000.log b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-DBC1-0/00000000000000000000.log
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-POL1-0/00000000000000000000.index b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-POL1-0/00000000000000000000.index
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-POL1-0/00000000000000000000.log b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-POL1-0/00000000000000000000.log
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-SDC1-0/00000000000000000000.index b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-SDC1-0/00000000000000000000.index
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-SDC1-0/00000000000000000000.log b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-SDC1-0/00000000000000000000.log
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-VID1-0/00000000000000000000.index b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-VID1-0/00000000000000000000.index
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-VID1-0/00000000000000000000.log b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/ECOMP-PORTAL-OUTBOX-VID1-0/00000000000000000000.log
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/PDPD-CONFIGURATION-0/00000000000000000000.index b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/PDPD-CONFIGURATION-0/00000000000000000000.index
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/PDPD-CONFIGURATION-0/00000000000000000000.log b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/PDPD-CONFIGURATION-0/00000000000000000000.log
new file mode 100644 (file)
index 0000000..b466eda
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/PDPD-CONFIGURATION-0/00000000000000000000.log differ
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/PDPD-CONFIGURATION-1/00000000000000000000.index b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/PDPD-CONFIGURATION-1/00000000000000000000.index
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/PDPD-CONFIGURATION-1/00000000000000000000.log b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/PDPD-CONFIGURATION-1/00000000000000000000.log
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/POLICY-CL-MGT-0/00000000000000000000.index b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/POLICY-CL-MGT-0/00000000000000000000.index
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/POLICY-CL-MGT-0/00000000000000000000.log b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/POLICY-CL-MGT-0/00000000000000000000.log
new file mode 100644 (file)
index 0000000..bc5db56
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/POLICY-CL-MGT-0/00000000000000000000.log differ
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/POLICY-CL-MGT-1/00000000000000000000.index b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/POLICY-CL-MGT-1/00000000000000000000.index
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/POLICY-CL-MGT-1/00000000000000000000.log b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/POLICY-CL-MGT-1/00000000000000000000.log
new file mode 100644 (file)
index 0000000..978eeb6
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/POLICY-CL-MGT-1/00000000000000000000.log differ
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/SDC-DISTR-NOTIF-TOPIC-SDC-OPENSOURCE-ENV1-0/00000000000000000000.index b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/SDC-DISTR-NOTIF-TOPIC-SDC-OPENSOURCE-ENV1-0/00000000000000000000.index
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/SDC-DISTR-NOTIF-TOPIC-SDC-OPENSOURCE-ENV1-0/00000000000000000000.log b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/SDC-DISTR-NOTIF-TOPIC-SDC-OPENSOURCE-ENV1-0/00000000000000000000.log
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/SDC-DISTR-STATUS-TOPIC-SDC-OPENSOURCE-ENV1-0/00000000000000000000.index b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/SDC-DISTR-STATUS-TOPIC-SDC-OPENSOURCE-ENV1-0/00000000000000000000.index
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/SDC-DISTR-STATUS-TOPIC-SDC-OPENSOURCE-ENV1-0/00000000000000000000.log b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/SDC-DISTR-STATUS-TOPIC-SDC-OPENSOURCE-ENV1-0/00000000000000000000.log
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/msgrtr.apinode.metrics.dmaap-0/00000000000000000000.index b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/msgrtr.apinode.metrics.dmaap-0/00000000000000000000.index
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/msgrtr.apinode.metrics.dmaap-0/00000000000000000000.log b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/msgrtr.apinode.metrics.dmaap-0/00000000000000000000.log
new file mode 100644 (file)
index 0000000..7c1c0f6
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/msgrtr.apinode.metrics.dmaap-0/00000000000000000000.log differ
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/msgrtr.apinode.metrics.dmaap-1/00000000000000000000.index b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/msgrtr.apinode.metrics.dmaap-1/00000000000000000000.index
new file mode 100644 (file)
index 0000000..a0afe1d
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/msgrtr.apinode.metrics.dmaap-1/00000000000000000000.index differ
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/msgrtr.apinode.metrics.dmaap-1/00000000000000000000.log b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/msgrtr.apinode.metrics.dmaap-1/00000000000000000000.log
new file mode 100644 (file)
index 0000000..e3e471a
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/msgrtr.apinode.metrics.dmaap-1/00000000000000000000.log differ
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/recovery-point-offset-checkpoint b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/recovery-point-offset-checkpoint
new file mode 100644 (file)
index 0000000..a003b5d
--- /dev/null
@@ -0,0 +1,27 @@
+0
+25
+ECOMP-PORTAL-OUTBOX-VID1 0 0
+PDPD-CONFIGURATION 0 2
+msgrtr.apinode.metrics.dmaap 1 26
+unauthenticated.SEC_MEASUREMENT_OUTPUT 1 1
+APPC-TEST2 0 0
+unauthenticated.TCA_EVENT_OUTPUT 1 1
+APPC-TEST1 0 0
+APPC-CL 0 2
+ECOMP-PORTAL-INBOX 0 0
+APPC-CL 1 0
+APPC-TEST2 1 1
+unauthenticated.TCA_EVENT_OUTPUT 0 1
+unauthenticated.SEC_MEASUREMENT_OUTPUT 0 1
+SDC-DISTR-NOTIF-TOPIC-SDC-OPENSOURCE-ENV1 0 0
+POLICY-CL-MGT 1 1
+PDPD-CONFIGURATION 1 0
+DCAE-CL-EVENT 1 1
+msgrtr.apinode.metrics.dmaap 0 4
+ECOMP-PORTAL-OUTBOX-APP1 0 0
+ECOMP-PORTAL-OUTBOX-SDC1 0 0
+POLICY-CL-MGT 0 1
+SDC-DISTR-STATUS-TOPIC-SDC-OPENSOURCE-ENV1 0 0
+DCAE-CL-EVENT 0 1
+ECOMP-PORTAL-OUTBOX-DBC1 0 0
+ECOMP-PORTAL-OUTBOX-POL1 0 0
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/replication-offset-checkpoint b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/replication-offset-checkpoint
new file mode 100644 (file)
index 0000000..a003b5d
--- /dev/null
@@ -0,0 +1,27 @@
+0
+25
+ECOMP-PORTAL-OUTBOX-VID1 0 0
+PDPD-CONFIGURATION 0 2
+msgrtr.apinode.metrics.dmaap 1 26
+unauthenticated.SEC_MEASUREMENT_OUTPUT 1 1
+APPC-TEST2 0 0
+unauthenticated.TCA_EVENT_OUTPUT 1 1
+APPC-TEST1 0 0
+APPC-CL 0 2
+ECOMP-PORTAL-INBOX 0 0
+APPC-CL 1 0
+APPC-TEST2 1 1
+unauthenticated.TCA_EVENT_OUTPUT 0 1
+unauthenticated.SEC_MEASUREMENT_OUTPUT 0 1
+SDC-DISTR-NOTIF-TOPIC-SDC-OPENSOURCE-ENV1 0 0
+POLICY-CL-MGT 1 1
+PDPD-CONFIGURATION 1 0
+DCAE-CL-EVENT 1 1
+msgrtr.apinode.metrics.dmaap 0 4
+ECOMP-PORTAL-OUTBOX-APP1 0 0
+ECOMP-PORTAL-OUTBOX-SDC1 0 0
+POLICY-CL-MGT 0 1
+SDC-DISTR-STATUS-TOPIC-SDC-OPENSOURCE-ENV1 0 0
+DCAE-CL-EVENT 0 1
+ECOMP-PORTAL-OUTBOX-DBC1 0 0
+ECOMP-PORTAL-OUTBOX-POL1 0 0
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/unauthenticated.SEC_MEASUREMENT_OUTPUT-0/00000000000000000000.index b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/unauthenticated.SEC_MEASUREMENT_OUTPUT-0/00000000000000000000.index
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/unauthenticated.SEC_MEASUREMENT_OUTPUT-0/00000000000000000000.log b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/unauthenticated.SEC_MEASUREMENT_OUTPUT-0/00000000000000000000.log
new file mode 100644 (file)
index 0000000..33bee2d
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/unauthenticated.SEC_MEASUREMENT_OUTPUT-0/00000000000000000000.log differ
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/unauthenticated.SEC_MEASUREMENT_OUTPUT-1/00000000000000000000.index b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/unauthenticated.SEC_MEASUREMENT_OUTPUT-1/00000000000000000000.index
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/unauthenticated.SEC_MEASUREMENT_OUTPUT-1/00000000000000000000.log b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/unauthenticated.SEC_MEASUREMENT_OUTPUT-1/00000000000000000000.log
new file mode 100644 (file)
index 0000000..69b1e68
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/unauthenticated.SEC_MEASUREMENT_OUTPUT-1/00000000000000000000.log differ
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/unauthenticated.TCA_EVENT_OUTPUT-0/00000000000000000000.index b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/unauthenticated.TCA_EVENT_OUTPUT-0/00000000000000000000.index
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/unauthenticated.TCA_EVENT_OUTPUT-0/00000000000000000000.log b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/unauthenticated.TCA_EVENT_OUTPUT-0/00000000000000000000.log
new file mode 100644 (file)
index 0000000..68a76bc
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/unauthenticated.TCA_EVENT_OUTPUT-0/00000000000000000000.log differ
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/unauthenticated.TCA_EVENT_OUTPUT-1/00000000000000000000.index b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/unauthenticated.TCA_EVENT_OUTPUT-1/00000000000000000000.index
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/unauthenticated.TCA_EVENT_OUTPUT-1/00000000000000000000.log b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/unauthenticated.TCA_EVENT_OUTPUT-1/00000000000000000000.log
new file mode 100644 (file)
index 0000000..89ec482
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/kafka-logs/unauthenticated.TCA_EVENT_OUTPUT-1/00000000000000000000.log differ
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-zookeeper/version-2/log.1 b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-zookeeper/version-2/log.1
new file mode 100644 (file)
index 0000000..f3cb136
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-zookeeper/version-2/log.1 differ
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-zookeeper/version-2/log.103 b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-zookeeper/version-2/log.103
new file mode 100644 (file)
index 0000000..9b648e2
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-zookeeper/version-2/log.103 differ
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-zookeeper/version-2/log.125 b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-zookeeper/version-2/log.125
new file mode 100644 (file)
index 0000000..0613642
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-zookeeper/version-2/log.125 differ
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/start-kafka.sh b/kubernetes/config/docker/init/src/config/dcae/message-router/dcae-startup-vm-message-router/docker_files/start-kafka.sh
new file mode 100644 (file)
index 0000000..4d955da
--- /dev/null
@@ -0,0 +1,69 @@
+#!/bin/bash
+
+if [[ -z "$KAFKA_PORT" ]]; then
+    export KAFKA_PORT=9092
+fi
+if [[ -z "$KAFKA_ADVERTISED_PORT" ]]; then
+    export KAFKA_ADVERTISED_PORT=$(docker port `hostname` $KAFKA_PORT | sed -r "s/.*:(.*)/\1/g")
+fi
+if [[ -z "$KAFKA_BROKER_ID" ]]; then
+    # By default auto allocate broker ID
+    #export KAFKA_BROKER_ID=-1
+    export KAFKA_BROKER_ID=1
+fi
+#if [[ -z "$KAFKA_LOG_DIRS" ]]; then
+    #export KAFKA_LOG_DIRS="/kafka/kafka-logs-$HOSTNAME"
+    export KAFKA_LOG_DIRS="/kafka/kafka-logs"
+#fi
+if [[ -z "$KAFKA_ZOOKEEPER_CONNECT" ]]; then
+    export KAFKA_ZOOKEEPER_CONNECT=$(env | grep ZK.*PORT_2181_TCP= | sed -e 's|.*tcp://||' | paste -sd ,)
+fi
+
+if [[ -n "$KAFKA_HEAP_OPTS" ]]; then
+    sed -r -i "s/(export KAFKA_HEAP_OPTS)=\"(.*)\"/\1=\"$KAFKA_HEAP_OPTS\"/g" $KAFKA_HOME/bin/kafka-server-start.sh
+    unset KAFKA_HEAP_OPTS
+fi
+
+if [[ -z "$KAFKA_ADVERTISED_HOST_NAME" && -n "$HOSTNAME_COMMAND" ]]; then
+    export KAFKA_ADVERTISED_HOST_NAME=$(eval $HOSTNAME_COMMAND)
+fi
+
+for VAR in `env`
+do
+  if [[ $VAR =~ ^KAFKA_ && ! $VAR =~ ^KAFKA_HOME ]]; then
+    kafka_name=`echo "$VAR" | sed -r "s/KAFKA_(.*)=.*/\1/g" | tr '[:upper:]' '[:lower:]' | tr _ .`
+    env_var=`echo "$VAR" | sed -r "s/(.*)=.*/\1/g"`
+    if egrep -q "(^|^#)$kafka_name=" $KAFKA_HOME/config/server.properties; then
+        sed -r -i "s@(^|^#)($kafka_name)=(.*)@\2=${!env_var}@g" $KAFKA_HOME/config/server.properties #note that no config values may contain an '@' char
+    else
+        echo "$kafka_name=${!env_var}" >> $KAFKA_HOME/config/server.properties
+    fi
+  fi
+done
+
+if [[ -n "$CUSTOM_INIT_SCRIPT" ]] ; then
+  eval $CUSTOM_INIT_SCRIPT
+fi
+
+
+KAFKA_PID=0
+
+# see https://medium.com/@gchudnov/trapping-signals-in-docker-containers-7a57fdda7d86#.bh35ir4u5
+term_handler() {
+  echo 'Stopping Kafka....'
+  if [ $KAFKA_PID -ne 0 ]; then
+    kill -s TERM "$KAFKA_PID"
+    wait "$KAFKA_PID"
+  fi
+  echo 'Kafka stopped.'
+  exit
+}
+
+
+# Capture kill requests to stop properly
+trap "term_handler" SIGHUP SIGINT SIGTERM
+create-topics.sh &
+$KAFKA_HOME/bin/kafka-server-start.sh $KAFKA_HOME/config/server.properties &
+KAFKA_PID=$!
+
+wait "$KAFKA_PID"
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dmaap/MsgRtrApi.properties b/kubernetes/config/docker/init/src/config/dcae/message-router/dmaap/MsgRtrApi.properties
new file mode 100644 (file)
index 0000000..8c6f50d
--- /dev/null
@@ -0,0 +1,140 @@
+###############################################################################
+##
+## Cambria API Server config
+##
+##     - Default values are shown as commented settings.
+##
+
+###############################################################################
+##
+## HTTP service
+##
+##             - 3904 is standard as of 7/29/14.
+#
+## Zookeeper Connection
+##
+##     Both Cambria and Kafka make use of Zookeeper.
+##
+config.zk.servers=zookeeper.onap-dcae:2181
+#config.zk.servers=172.17.0.1:2181
+#dmaap.onap-dcae:2181
+#10.208.128.229:2181
+#config.zk.root=/fe3c/cambria/config
+
+
+###############################################################################
+##
+## Kafka Connection
+##
+##     Items below are passed through to Kafka's producer and consumer
+##     configurations (after removing "kafka.")
+##     if you want to change request.required.acks it can take this one value
+#kafka.metadata.broker.list=localhost:9092,localhost:9093
+kafka.metadata.broker.list=kafka.onap-dcae:9092
+#kafka.metadata.broker.list=172.17.0.1:9092
+#dmaap.onap-dcae:9092
+#10.208.128.229:9092
+##kafka.request.required.acks=-1
+#kafka.client.zookeeper=${config.zk.servers}
+consumer.timeout.ms=100
+zookeeper.connection.timeout.ms=6000
+zookeeper.session.timeout.ms=6000
+zookeeper.sync.time.ms=2000
+auto.commit.interval.ms=1000
+fetch.message.max.bytes =1000000
+auto.commit.enable=false
+
+
+###############################################################################
+##
+##     Secured Config
+##
+##     Some data stored in the config system is sensitive -- API keys and secrets,
+##     for example. to protect it, we use an encryption layer for this section
+##     of the config.
+##
+## The key is a base64 encode AES key. This must be created/configured for
+## each installation.
+#cambria.secureConfig.key=
+##
+## The initialization vector is a 16 byte value specific to the secured store.
+## This must be created/configured for each installation.
+#cambria.secureConfig.iv=
+
+## Southfield Sandbox
+cambria.secureConfig.key=b/7ouTn9FfEw2PQwL0ov/Q==
+cambria.secureConfig.iv=wR9xP5k5vbz/xD0LmtqQLw==
+authentication.adminSecret=fe3cCompound
+#cambria.secureConfig.key[pc569h]=YT3XPyxEmKCTLI2NK+Sjbw==
+#cambria.secureConfig.iv[pc569h]=rMm2jhR3yVnU+u2V9Ugu3Q==
+
+
+###############################################################################
+##
+## Consumer Caching
+##
+##     Kafka expects live connections from the consumer to the broker, which
+##     obviously doesn't work over connectionless HTTP requests. The Cambria
+##     server proxies HTTP requests into Kafka consumer sessions that are kept
+##     around for later re-use. Not doing so is costly for setup per request,
+##     which would substantially impact a high volume consumer's performance.
+##
+##     This complicates Cambria server failover, because we often need server
+##     A to close its connection before server B brings up the replacement.
+##
+
+## The consumer cache is normally enabled.
+#cambria.consumer.cache.enabled=true
+
+## Cached consumers are cleaned up after a period of disuse. The server inspects
+## consumers every sweepFreqSeconds and will clean up any connections that are
+## dormant for touchFreqMs.
+#cambria.consumer.cache.sweepFreqSeconds=15
+#cambria.consumer.cache.touchFreqMs=120000
+
+## The cache is managed through ZK. The default value for the ZK connection
+## string is the same as config.zk.servers.
+#cambria.consumer.cache.zkConnect=${config.zk.servers}
+
+##
+## Shared cache information is associated with this node's name. The default
+## name is the hostname plus the HTTP service port this host runs on. (The
+## hostname is determined via InetAddress.getLocalHost ().getCanonicalHostName(),
+## which is not always adequate.) You can set this value explicitly here.
+##
+#cambria.api.node.identifier=<use-something-unique-to-this-instance>
+
+###############################################################################
+##
+## Metrics Reporting
+##
+##     This server can report its metrics periodically on a topic.
+##
+#metrics.send.cambria.enabled=true
+#metrics.send.cambria.topic=cambria.apinode.metrics                                  #msgrtr.apinode.metrics.dmaap
+#metrics.send.cambria.sendEverySeconds=60
+
+cambria.consumer.cache.zkBasePath=/fe3c/cambria/consumerCache
+
+##############################################################################
+#100mb
+maxcontentlength=10000
+
+
+##############################################################################
+#AAF Properties
+msgRtr.namespace.aaf=org.openecomp.dcae.dmaap.mtnje2.mr.topic
+msgRtr.topicfactory.aaf=org.openecomp.dcae.dmaap.topicFactory|:org.openecomp.dcae.dmaap.mtnje2.mr.topic:
+enforced.topic.name.AAF=org.openecomp
+forceAAF=false
+transidUEBtopicreqd=false
+defaultNSforUEB=org.openecomp.dmaap.mr.ueb
+##############################################################################
+#Mirror Maker Agent
+msgRtr.mirrormakeradmin.aaf=org.openecomp.dmaap.mr.dev.mirrormaker|*|admin
+msgRtr.mirrormakeruser.aaf=org.openecomp.dmaap.mr.dev.mirrormaker|*|user
+msgRtr.mirrormakeruser.aaf.create=org.openecomp.dmaap.mr.dev.topicFactory|:org.openecomp.dmaap.mr.dev.topic:
+msgRtr.mirrormaker.timeout=15000
+msgRtr.mirrormaker.topic=org.openecomp.dmaap.mr.prod.mm.agent
+msgRtr.mirrormaker.consumergroup=mmagentserver
+msgRtr.mirrormaker.consumerid=1
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dmaap/cadi.properties b/kubernetes/config/docker/init/src/config/dcae/message-router/dmaap/cadi.properties
new file mode 100644 (file)
index 0000000..1cb00a5
--- /dev/null
@@ -0,0 +1,21 @@
+basic_realm=openecomp.org
+basic_warn=TRUE
+
+cadi_loglevel=DEBUG
+#cadi_keyfile=target/swm/package/nix/dist_files/appl/${artifactId}/etc/keyfile2
+cadi_keyfile=/appl/dmaapMR1/etc/keyfile
+# Configure AAF
+aaf_url=https://DME2RESOLVE/service=org.openecomp.authz.AuthorizationService/version=2.0/envContext=DEV/routeOffer=BAU_SE
+
+aaf_id=dgl@openecomp.org
+aaf_password=enc:f2u5br1mh29M02-
+aaf_timeout=5000
+aaf_clean_interval=1200000
+aaf_user_expires=60000
+aaf_high_count=1000000
+
+
+# The following properties are being set by the AJSC Container and should NOT need to be set here.
+AFT_LATITUDE=33.823589
+AFT_LONGITUDE=-84.366982
+AFT_ENVIRONMENT=AFTUAT
diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dmaap/mykey b/kubernetes/config/docker/init/src/config/dcae/message-router/dmaap/mykey
new file mode 100644 (file)
index 0000000..c2b8b87
--- /dev/null
@@ -0,0 +1,27 @@
+_sNOLphPzrU7L0L3oWv0pYwgV_ddGF1XoBsQEIAp34jfP-fGJFPfFYaMpDEZ3gwH59rNw6qyMZHk
+k-4irklvVcWk36lC3twNvc0DueRCVrws1bkuhOLCXdxHJx-YG-1xM8EJfRmzh79WPlPkbAdyPmFF
+Ah44V0GjAnInPOFZA6MHP9rNx9B9qECHRfmvzU13vJCcgTsrmOr-CEiWfRsnzPjsICxpq9OaVT_D
+zn6rNaroGm1OiZNCrCgvRkCUHPOOCw3j9G1GeaImoZNYtozbz9u4sj13PU-MxIIAa64b1bMMMjpz
+Upc8lVPI4FnJKg6axMmEGn5zJ6JUq9mtOVyPj__2GEuDgpx5H4AwodXXVjFsVgR8UJwI_BvS2JVp
+JoQk0J1RqXmAXVamlsMAfzmmbARXgmrBfnuhveZnh9ymFVU-YZeujdANniXAwBGI7c6hG_BXkH7i
+Eyf4Fn41_SV78PskP6qgqJahr9r3bqdjNbKBztIKCOEVrE_w3IM5r02l-iStk_NBRkj6cq_7VCpG
+afxZ2CtZMwuZMiypO_wOgbdpCSKNzsL-NH2b4b08OlKiWb263gz634KJmV5WEfCl-6eH-JUFbWOS
+JwQfActLNT2ZQPl2MyZQNBzJEWoJRgS6k7tPRO-zqeUtYYHGHVMCxMuMHGQcoilNNHEFeBCG_fBh
+yAKb9g9F86Cbx9voMLiyTX2T3rwVHiSJFOzfNxGmfN5JWOthIun_c5hEY1tLQ15BomzkDwk7BAj7
+VbRCrVD45B6xrmSTMBSWYmLyr6mnQxQqeh9cMbD-0ZAncE3roxRnRvPKjFFa208ykYUp2V83r_PJ
+fV5I9ZPKSjk9DwFyrjkcQQEYDhdK6IFqcd6nEthjYVkmunu2fsX0bIOm9GGdIbKGqBnpdgBO5hyT
+rBr9HSlZrHcGdti1R823ckDF0Ekcl6kioDr5NLIpLtg9zUEDRm3QrbX2mv5Zs8W0pYnOqglxy3lz
+bJZTN7oR7VasHUtjmp0RT9nLZkUs5TZ6MHhlIq3ZsQ6w_Q9Rv1-ofxfwfCC4EBrWKbWAGCf6By4K
+Ew8321-2YnodhmsK5BrT4zQ1DZlmUvK8BmYjZe7wTljKjgYcsLTBfX4eMhJ7MIW1kpnl8AbiBfXh
+QzN56Mki51Q8PSQWHm0W9tnQ0z6wKdck6zBJ8JyNzewZahFKueDTn-9DOqIDfr3YHvQLLzeXyJ8e
+h4AgjW-hvlLzRGtkCknjLIgXVa3rMTycseAwbW-mgdCqqkw3SdEG8feAcyntmvE8j2jbtSDStQMB
+9JdvyNLuQdNG4pxpusgvVso0-8NQF0YVa9VFwg9U6IPSx5p8FcW68OAHt_fEgT4ZtiH7o9aur4o9
+oYqUh2lALCY-__9QLq1KkNjMKs33Jz9E8LbRerG9PLclkTrxCjYAeUWBjCwSI7OB7xkuaYDSjkjj
+a46NLpdBN1GNcsFFcZ79GFAK0_DsyxGLX8Tq6q0Bvhs8whD8wlSxpTGxYkyqNX-vcb7SDN_0WkCE
+XSdZWkqTHXcYbOvoCOb_e6SFAztuMenuHWY0utX0gBfx_X5lPDFyoYXErxFQHiA7t27keshXNa6R
+ukQRRS8kMjre1U74sc-fRNXkXpl57rG4rgxaEX0eBeowa53KAsVvUAoSac2aC_nfzXrDvoyf9Xi3
+JpEZNhUDLpFCEycV4I7jGQ9wo9qNaosvlsr6kbLDNdb_1xrGVgjT3xEvRNJNPqslSAu-yD-UFhC3
+AmCdYUnugw_eEFqXCHTARcRkdPPvl2XsmEKY2IqEeO5tz4DyXQFaL-5hEVh6lYEU1EOWHk3UGIXe
+Vc5_Ttp82qNLmlJPbZvgmNTJzYTHDQ_27KBcp7IVVZgPDjVKdWqQvZ18KhxvfF3Idgy82LBZniFV
+IbtxllXiPRxoPQriSXMnXjh3XkvSDI2pFxXfEvLRn1tvcFOwPNCz3QfPIzYg8uYXN5bRt3ZOrR_g
+ZhIlrc7HO0VbNbeqEVPKMZ-cjkqGj4VAuDKoQc0eQ6X_wCoAGO78nPpLeIvZPx1X3z5YoqNA
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/aria_log.00000001 b/kubernetes/config/docker/init/src/config/policy/mariadb/data/aria_log.00000001
new file mode 100644 (file)
index 0000000..8608ff7
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/aria_log.00000001 differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/aria_log_control b/kubernetes/config/docker/init/src/config/policy/mariadb/data/aria_log_control
new file mode 100644 (file)
index 0000000..9ae850a
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/aria_log_control differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/debian-10.0.flag b/kubernetes/config/docker/init/src/config/policy/mariadb/data/debian-10.0.flag
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/firstrun b/kubernetes/config/docker/init/src/config/policy/mariadb/data/firstrun
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/ib_logfile0 b/kubernetes/config/docker/init/src/config/policy/mariadb/data/ib_logfile0
new file mode 100644 (file)
index 0000000..cc8b741
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/ib_logfile0 differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/ib_logfile1 b/kubernetes/config/docker/init/src/config/policy/mariadb/data/ib_logfile1
new file mode 100644 (file)
index 0000000..274bba0
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/ib_logfile1 differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/ibdata1 b/kubernetes/config/docker/init/src/config/policy/mariadb/data/ibdata1
new file mode 100644 (file)
index 0000000..3920f04
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/ibdata1 differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/log/db.opt b/kubernetes/config/docker/init/src/config/policy/mariadb/data/log/db.opt
new file mode 100644 (file)
index 0000000..d8429c4
--- /dev/null
@@ -0,0 +1,2 @@
+default-character-set=latin1
+default-collation=latin1_swedish_ci
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/multi-master.info b/kubernetes/config/docker/init/src/config/policy/mariadb/data/multi-master.info
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/column_stats.MYD b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/column_stats.MYD
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/column_stats.MYI b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/column_stats.MYI
new file mode 100644 (file)
index 0000000..9ff5ed6
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/column_stats.MYI differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/column_stats.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/column_stats.frm
new file mode 100644 (file)
index 0000000..fefc7eb
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/column_stats.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/columns_priv.MYD b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/columns_priv.MYD
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/columns_priv.MYI b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/columns_priv.MYI
new file mode 100644 (file)
index 0000000..f261e28
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/columns_priv.MYI differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/columns_priv.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/columns_priv.frm
new file mode 100644 (file)
index 0000000..faa4a8a
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/columns_priv.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/db.MYD b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/db.MYD
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/db.MYI b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/db.MYI
new file mode 100644 (file)
index 0000000..628c578
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/db.MYI differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/db.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/db.frm
new file mode 100644 (file)
index 0000000..1ab1f59
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/db.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/event.MYD b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/event.MYD
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/event.MYI b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/event.MYI
new file mode 100644 (file)
index 0000000..fc4d47f
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/event.MYI differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/event.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/event.frm
new file mode 100644 (file)
index 0000000..9089087
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/event.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/func.MYD b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/func.MYD
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/func.MYI b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/func.MYI
new file mode 100644 (file)
index 0000000..b0ddde1
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/func.MYI differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/func.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/func.frm
new file mode 100644 (file)
index 0000000..42aca49
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/func.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/general_log.CSM b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/general_log.CSM
new file mode 100644 (file)
index 0000000..8d08b8d
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/general_log.CSM differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/general_log.CSV b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/general_log.CSV
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/general_log.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/general_log.frm
new file mode 100644 (file)
index 0000000..919bb7f
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/general_log.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/gtid_slave_pos.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/gtid_slave_pos.frm
new file mode 100644 (file)
index 0000000..d09f1d4
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/gtid_slave_pos.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/gtid_slave_pos.ibd b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/gtid_slave_pos.ibd
new file mode 100644 (file)
index 0000000..b74a0af
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/gtid_slave_pos.ibd differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_category.MYD b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_category.MYD
new file mode 100644 (file)
index 0000000..360a41a
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_category.MYD differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_category.MYI b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_category.MYI
new file mode 100644 (file)
index 0000000..c381776
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_category.MYI differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_category.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_category.frm
new file mode 100644 (file)
index 0000000..e9dc205
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_category.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_keyword.MYD b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_keyword.MYD
new file mode 100644 (file)
index 0000000..570509b
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_keyword.MYD differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_keyword.MYI b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_keyword.MYI
new file mode 100644 (file)
index 0000000..36715cf
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_keyword.MYI differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_keyword.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_keyword.frm
new file mode 100644 (file)
index 0000000..999eec1
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_keyword.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_relation.MYD b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_relation.MYD
new file mode 100644 (file)
index 0000000..f963ea5
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_relation.MYD differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_relation.MYI b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_relation.MYI
new file mode 100644 (file)
index 0000000..53190af
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_relation.MYI differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_relation.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_relation.frm
new file mode 100644 (file)
index 0000000..6eef95a
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_relation.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_topic.MYD b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_topic.MYD
new file mode 100644 (file)
index 0000000..ad4c19e
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_topic.MYD differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_topic.MYI b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_topic.MYI
new file mode 100644 (file)
index 0000000..d8ef966
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_topic.MYI differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_topic.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_topic.frm
new file mode 100644 (file)
index 0000000..3b59b25
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/help_topic.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/host.MYD b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/host.MYD
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/host.MYI b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/host.MYI
new file mode 100644 (file)
index 0000000..2a1cfcb
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/host.MYI differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/host.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/host.frm
new file mode 100644 (file)
index 0000000..62ae8cd
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/host.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/index_stats.MYD b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/index_stats.MYD
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/index_stats.MYI b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/index_stats.MYI
new file mode 100644 (file)
index 0000000..05be1c8
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/index_stats.MYI differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/index_stats.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/index_stats.frm
new file mode 100644 (file)
index 0000000..e4cf7e0
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/index_stats.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/innodb_index_stats.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/innodb_index_stats.frm
new file mode 100644 (file)
index 0000000..ed0f019
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/innodb_index_stats.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/innodb_index_stats.ibd b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/innodb_index_stats.ibd
new file mode 100644 (file)
index 0000000..daac102
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/innodb_index_stats.ibd differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/innodb_table_stats.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/innodb_table_stats.frm
new file mode 100644 (file)
index 0000000..64e3af3
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/innodb_table_stats.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/innodb_table_stats.ibd b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/innodb_table_stats.ibd
new file mode 100644 (file)
index 0000000..7716fcc
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/innodb_table_stats.ibd differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/plugin.MYD b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/plugin.MYD
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/plugin.MYI b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/plugin.MYI
new file mode 100644 (file)
index 0000000..5e741be
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/plugin.MYI differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/plugin.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/plugin.frm
new file mode 100644 (file)
index 0000000..7f57bf2
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/plugin.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/proc.MYD b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/proc.MYD
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/proc.MYI b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/proc.MYI
new file mode 100644 (file)
index 0000000..253b7c7
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/proc.MYI differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/proc.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/proc.frm
new file mode 100644 (file)
index 0000000..a7c27b0
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/proc.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/procs_priv.MYD b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/procs_priv.MYD
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/procs_priv.MYI b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/procs_priv.MYI
new file mode 100644 (file)
index 0000000..62aca26
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/procs_priv.MYI differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/procs_priv.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/procs_priv.frm
new file mode 100644 (file)
index 0000000..03a6ce6
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/procs_priv.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/proxies_priv.MYD b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/proxies_priv.MYD
new file mode 100644 (file)
index 0000000..5d8c536
--- /dev/null
@@ -0,0 +1 @@
+ÿlocalhost                                                                                                                                                                           root                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                \ 1                                                                                                                                                                                                                                                                                                                                                                                                                                       VUÚXÿae9df72d0f92                                                                                                                                                                        root                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                \ 1                                                                                                                                                                                                                                                                                                                                                                                                                                       VUÚX
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/proxies_priv.MYI b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/proxies_priv.MYI
new file mode 100644 (file)
index 0000000..8ad2f00
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/proxies_priv.MYI differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/proxies_priv.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/proxies_priv.frm
new file mode 100644 (file)
index 0000000..194540f
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/proxies_priv.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/roles_mapping.MYD b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/roles_mapping.MYD
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/roles_mapping.MYI b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/roles_mapping.MYI
new file mode 100644 (file)
index 0000000..adcba59
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/roles_mapping.MYI differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/roles_mapping.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/roles_mapping.frm
new file mode 100644 (file)
index 0000000..c3d60e7
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/roles_mapping.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/servers.MYD b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/servers.MYD
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/servers.MYI b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/servers.MYI
new file mode 100644 (file)
index 0000000..c44463f
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/servers.MYI differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/servers.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/servers.frm
new file mode 100644 (file)
index 0000000..8892243
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/servers.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/slow_log.CSM b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/slow_log.CSM
new file mode 100644 (file)
index 0000000..8d08b8d
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/slow_log.CSM differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/slow_log.CSV b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/slow_log.CSV
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/slow_log.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/slow_log.frm
new file mode 100644 (file)
index 0000000..3509539
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/slow_log.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/table_stats.MYD b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/table_stats.MYD
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/table_stats.MYI b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/table_stats.MYI
new file mode 100644 (file)
index 0000000..0d26cd3
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/table_stats.MYI differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/table_stats.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/table_stats.frm
new file mode 100644 (file)
index 0000000..6bac5bd
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/table_stats.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/tables_priv.MYD b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/tables_priv.MYD
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/tables_priv.MYI b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/tables_priv.MYI
new file mode 100644 (file)
index 0000000..610ffef
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/tables_priv.MYI differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/tables_priv.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/tables_priv.frm
new file mode 100644 (file)
index 0000000..008358b
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/tables_priv.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone.MYD b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone.MYD
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone.MYI b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone.MYI
new file mode 100644 (file)
index 0000000..99242f2
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone.MYI differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone.frm
new file mode 100644 (file)
index 0000000..5e091a2
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone_leap_second.MYD b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone_leap_second.MYD
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone_leap_second.MYI b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone_leap_second.MYI
new file mode 100644 (file)
index 0000000..8063843
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone_leap_second.MYI differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone_leap_second.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone_leap_second.frm
new file mode 100644 (file)
index 0000000..ae89ff5
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone_leap_second.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone_name.MYD b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone_name.MYD
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone_name.MYI b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone_name.MYI
new file mode 100644 (file)
index 0000000..46e949c
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone_name.MYI differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone_name.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone_name.frm
new file mode 100644 (file)
index 0000000..a9e7942
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone_name.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone_transition.MYD b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone_transition.MYD
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone_transition.MYI b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone_transition.MYI
new file mode 100644 (file)
index 0000000..a98b680
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone_transition.MYI differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone_transition.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone_transition.frm
new file mode 100644 (file)
index 0000000..58743dc
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone_transition.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone_transition_type.MYD b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone_transition_type.MYD
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone_transition_type.MYI b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone_transition_type.MYI
new file mode 100644 (file)
index 0000000..d4f0bc1
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone_transition_type.MYI differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone_transition_type.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone_transition_type.frm
new file mode 100644 (file)
index 0000000..7d0229c
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/time_zone_transition_type.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/user.MYD b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/user.MYD
new file mode 100644 (file)
index 0000000..107af55
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/user.MYD differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/user.MYI b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/user.MYI
new file mode 100644 (file)
index 0000000..c6eb47d
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/user.MYI differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/user.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/user.frm
new file mode 100644 (file)
index 0000000..9e5f937
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/mysql/user.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/accounts.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/accounts.frm
new file mode 100644 (file)
index 0000000..76257e5
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/accounts.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/cond_instances.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/cond_instances.frm
new file mode 100644 (file)
index 0000000..746f90d
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/cond_instances.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/db.opt b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/db.opt
new file mode 100644 (file)
index 0000000..4ed6015
--- /dev/null
@@ -0,0 +1,2 @@
+default-character-set=utf8
+default-collation=utf8_general_ci
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_stages_current.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_stages_current.frm
new file mode 100644 (file)
index 0000000..5520614
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_stages_current.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_stages_history.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_stages_history.frm
new file mode 100644 (file)
index 0000000..ff098a6
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_stages_history.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_stages_history_long.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_stages_history_long.frm
new file mode 100644 (file)
index 0000000..7c80576
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_stages_history_long.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_stages_summary_by_account_by_event_name.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_stages_summary_by_account_by_event_name.frm
new file mode 100644 (file)
index 0000000..e550bc8
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_stages_summary_by_account_by_event_name.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_stages_summary_by_host_by_event_name.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_stages_summary_by_host_by_event_name.frm
new file mode 100644 (file)
index 0000000..07b0159
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_stages_summary_by_host_by_event_name.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_stages_summary_by_thread_by_event_name.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_stages_summary_by_thread_by_event_name.frm
new file mode 100644 (file)
index 0000000..953423d
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_stages_summary_by_thread_by_event_name.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_stages_summary_by_user_by_event_name.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_stages_summary_by_user_by_event_name.frm
new file mode 100644 (file)
index 0000000..ee203b4
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_stages_summary_by_user_by_event_name.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_stages_summary_global_by_event_name.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_stages_summary_global_by_event_name.frm
new file mode 100644 (file)
index 0000000..17695df
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_stages_summary_global_by_event_name.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_statements_current.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_statements_current.frm
new file mode 100644 (file)
index 0000000..f1c697d
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_statements_current.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_statements_history.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_statements_history.frm
new file mode 100644 (file)
index 0000000..a22f245
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_statements_history.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_statements_history_long.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_statements_history_long.frm
new file mode 100644 (file)
index 0000000..90184ae
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_statements_history_long.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_statements_summary_by_account_by_event_name.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_statements_summary_by_account_by_event_name.frm
new file mode 100644 (file)
index 0000000..6d96ec6
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_statements_summary_by_account_by_event_name.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_statements_summary_by_digest.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_statements_summary_by_digest.frm
new file mode 100644 (file)
index 0000000..bd5d1be
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_statements_summary_by_digest.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_statements_summary_by_host_by_event_name.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_statements_summary_by_host_by_event_name.frm
new file mode 100644 (file)
index 0000000..a4cbc46
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_statements_summary_by_host_by_event_name.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_statements_summary_by_thread_by_event_name.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_statements_summary_by_thread_by_event_name.frm
new file mode 100644 (file)
index 0000000..2463e3f
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_statements_summary_by_thread_by_event_name.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_statements_summary_by_user_by_event_name.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_statements_summary_by_user_by_event_name.frm
new file mode 100644 (file)
index 0000000..8e1e1b4
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_statements_summary_by_user_by_event_name.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_statements_summary_global_by_event_name.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_statements_summary_global_by_event_name.frm
new file mode 100644 (file)
index 0000000..0866d50
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_statements_summary_global_by_event_name.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_waits_current.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_waits_current.frm
new file mode 100644 (file)
index 0000000..e511ca1
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_waits_current.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_waits_history.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_waits_history.frm
new file mode 100644 (file)
index 0000000..0ccd30e
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_waits_history.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_waits_history_long.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_waits_history_long.frm
new file mode 100644 (file)
index 0000000..6d80113
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_waits_history_long.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_waits_summary_by_account_by_event_name.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_waits_summary_by_account_by_event_name.frm
new file mode 100644 (file)
index 0000000..1e866b6
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_waits_summary_by_account_by_event_name.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_waits_summary_by_host_by_event_name.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_waits_summary_by_host_by_event_name.frm
new file mode 100644 (file)
index 0000000..2da5615
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_waits_summary_by_host_by_event_name.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_waits_summary_by_instance.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_waits_summary_by_instance.frm
new file mode 100644 (file)
index 0000000..8830264
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_waits_summary_by_instance.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_waits_summary_by_thread_by_event_name.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_waits_summary_by_thread_by_event_name.frm
new file mode 100644 (file)
index 0000000..d72308c
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_waits_summary_by_thread_by_event_name.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_waits_summary_by_user_by_event_name.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_waits_summary_by_user_by_event_name.frm
new file mode 100644 (file)
index 0000000..787a3a5
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_waits_summary_by_user_by_event_name.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_waits_summary_global_by_event_name.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_waits_summary_global_by_event_name.frm
new file mode 100644 (file)
index 0000000..f690713
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/events_waits_summary_global_by_event_name.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/file_instances.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/file_instances.frm
new file mode 100644 (file)
index 0000000..8583666
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/file_instances.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/file_summary_by_event_name.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/file_summary_by_event_name.frm
new file mode 100644 (file)
index 0000000..591f0e9
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/file_summary_by_event_name.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/file_summary_by_instance.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/file_summary_by_instance.frm
new file mode 100644 (file)
index 0000000..9f5807e
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/file_summary_by_instance.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/host_cache.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/host_cache.frm
new file mode 100644 (file)
index 0000000..be7423d
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/host_cache.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/hosts.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/hosts.frm
new file mode 100644 (file)
index 0000000..c6aa503
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/hosts.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/mutex_instances.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/mutex_instances.frm
new file mode 100644 (file)
index 0000000..cca0452
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/mutex_instances.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/objects_summary_global_by_type.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/objects_summary_global_by_type.frm
new file mode 100644 (file)
index 0000000..2fa0064
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/objects_summary_global_by_type.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/performance_timers.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/performance_timers.frm
new file mode 100644 (file)
index 0000000..f7e1660
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/performance_timers.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/rwlock_instances.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/rwlock_instances.frm
new file mode 100644 (file)
index 0000000..135277b
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/rwlock_instances.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/session_account_connect_attrs.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/session_account_connect_attrs.frm
new file mode 100644 (file)
index 0000000..d73a80e
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/session_account_connect_attrs.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/session_connect_attrs.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/session_connect_attrs.frm
new file mode 100644 (file)
index 0000000..31c7475
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/session_connect_attrs.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/setup_actors.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/setup_actors.frm
new file mode 100644 (file)
index 0000000..276443f
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/setup_actors.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/setup_consumers.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/setup_consumers.frm
new file mode 100644 (file)
index 0000000..80f6dd0
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/setup_consumers.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/setup_instruments.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/setup_instruments.frm
new file mode 100644 (file)
index 0000000..fd83053
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/setup_instruments.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/setup_objects.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/setup_objects.frm
new file mode 100644 (file)
index 0000000..89ae59b
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/setup_objects.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/setup_timers.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/setup_timers.frm
new file mode 100644 (file)
index 0000000..7058356
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/setup_timers.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/socket_instances.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/socket_instances.frm
new file mode 100644 (file)
index 0000000..20963dc
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/socket_instances.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/socket_summary_by_event_name.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/socket_summary_by_event_name.frm
new file mode 100644 (file)
index 0000000..739b5d5
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/socket_summary_by_event_name.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/socket_summary_by_instance.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/socket_summary_by_instance.frm
new file mode 100644 (file)
index 0000000..649c26f
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/socket_summary_by_instance.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/table_io_waits_summary_by_index_usage.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/table_io_waits_summary_by_index_usage.frm
new file mode 100644 (file)
index 0000000..0fb793b
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/table_io_waits_summary_by_index_usage.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/table_io_waits_summary_by_table.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/table_io_waits_summary_by_table.frm
new file mode 100644 (file)
index 0000000..ffe51b3
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/table_io_waits_summary_by_table.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/table_lock_waits_summary_by_table.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/table_lock_waits_summary_by_table.frm
new file mode 100644 (file)
index 0000000..e771595
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/table_lock_waits_summary_by_table.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/threads.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/threads.frm
new file mode 100644 (file)
index 0000000..121dfd3
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/threads.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/users.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/users.frm
new file mode 100644 (file)
index 0000000..6bb88f3
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/performance_schema/users.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/support/db.opt b/kubernetes/config/docker/init/src/config/policy/mariadb/data/support/db.opt
new file mode 100644 (file)
index 0000000..d8429c4
--- /dev/null
@@ -0,0 +1,2 @@
+default-character-set=latin1
+default-collation=latin1_swedish_ci
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/support/db_version.frm b/kubernetes/config/docker/init/src/config/policy/mariadb/data/support/db_version.frm
new file mode 100644 (file)
index 0000000..29d4a20
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/support/db_version.frm differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/support/db_version.ibd b/kubernetes/config/docker/init/src/config/policy/mariadb/data/support/db_version.ibd
new file mode 100644 (file)
index 0000000..c331218
Binary files /dev/null and b/kubernetes/config/docker/init/src/config/policy/mariadb/data/support/db_version.ibd differ
diff --git a/kubernetes/config/docker/init/src/config/policy/mariadb/data/xacml/db.opt b/kubernetes/config/docker/init/src/config/policy/mariadb/data/xacml/db.opt
new file mode 100644 (file)
index 0000000..d8429c4
--- /dev/null
@@ -0,0 +1,2 @@
+default-character-set=latin1
+default-collation=latin1_swedish_ci
diff --git a/kubernetes/config/docker/init/src/config/sdc/jetty/keystore b/kubernetes/config/docker/init/src/config/sdc/jetty/keystore
deleted file mode 100755 (executable)
index 08f6cda..0000000
Binary files a/kubernetes/config/docker/init/src/config/sdc/jetty/keystore and /dev/null differ
index f190b86..85c4f01 100644 (file)
@@ -40,10 +40,10 @@ spec:
   ports:
   - name: mr1
     port: 3904
-    nodePort: 30227
+    nodePort: {{ .Values.nodePortPrefix }}27
   - name: mr2
     port: 3905
-    nodePort: 30226
+    nodePort: {{ .Values.nodePortPrefix }}26
   selector:
     app: dmaap
   type: NodePort
index 19583bf..ab5c3d4 100644 (file)
@@ -74,8 +74,8 @@ spec:
         hostPath:
           path: /var/run/docker.sock
       - name: kafka-data
-        hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/
+        persistentVolumeClaim:
+          claimName: message-router-kafka
       - name: start-kafka
         hostPath:
           path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dcae-startup-vm-message-router/docker_files/start-kafka.sh
diff --git a/kubernetes/message-router/templates/message-router-pv-pvc.yaml b/kubernetes/message-router/templates/message-router-pv-pvc.yaml
new file mode 100644 (file)
index 0000000..16d6fcd
--- /dev/null
@@ -0,0 +1,61 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: message-router-kafka
+  namespace: "{{ .Values.nsPrefix }}-message-router"
+  labels:
+    name: message-router-kafka
+spec:
+  capacity:
+    storage: 2Gi
+  accessModes:
+    - ReadWriteMany
+  persistentVolumeReclaimPolicy: Retain
+  hostPath:
+    path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/
+---
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: message-router-kafka
+  namespace: "{{ .Values.nsPrefix }}-message-router"
+spec:
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: 2Gi
+  selector:
+    matchLabels:
+      name: message-router-kafka
+---
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: message-router-zookeeper
+  namespace: "{{ .Values.nsPrefix }}-message-router"
+  labels:
+    name: message-router-zookeeper
+spec:
+  capacity:
+    storage: 2Gi
+  accessModes:
+    - ReadWriteMany
+  persistentVolumeReclaimPolicy: Retain
+  hostPath:
+    path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dcae-startup-vm-message-router/docker_files/data-zookeeper
+---
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: message-router-zookeeper
+  namespace: "{{ .Values.nsPrefix }}-message-router"
+spec:
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: 2Gi
+  selector:
+    matchLabels:
+      name: message-router-zookeeper
index 5b46dc0..c07ef3a 100644 (file)
@@ -30,7 +30,7 @@ spec:
       restartPolicy: Always
       volumes:
       - name: zookeeper-data
-        hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dcae-startup-vm-message-router/docker_files/data-zookeeper
+        persistentVolumeClaim:
+          claimName: message-router-zookeeper
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
index a3210c2..9206729 100644 (file)
@@ -1,5 +1,6 @@
 nsPrefix: onap
 pullPolicy: Always
+nodePortPrefix: 302
 image:
   readiness: oomk8s/readiness-check:1.0.0
   dmaap: attos/dmaap:latest
index b67808d..4ec4656 100644 (file)
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: msb-consul
+  namespace: "{{ .Values.nsPrefix }}-msb"
   labels:
     app: msb-consul
 spec:
@@ -17,6 +18,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: msb-discovery
+  namespace: "{{ .Values.nsPrefix }}-msb"
   labels:
     app: msb-discovery
 spec:
@@ -32,6 +34,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: msb-iag
+  namespace: "{{ .Values.nsPrefix }}-msb"
   labels:
     app: msb-iag
 spec:
@@ -47,6 +50,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: msb-eag
+  namespace: "{{ .Values.nsPrefix }}-msb"
   labels:
     app: msb-eag
 spec:
index 1dbbe8f..fc8a95a 100644 (file)
@@ -2,6 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: msb-consul
+  namespace: "{{ .Values.nsPrefix }}-msb"
 spec:
   replicas: 1
   selector:
@@ -16,8 +17,8 @@ spec:
       hostname: msb-consul
       containers:
       - args:
-        image: consul
-        name: "msb-consul"
+        image: {{ .Values.image.consul }}
+        name: msb-consul
         ports:
         - containerPort: {{ .Values.consulPort }}
           name: msb-consul
@@ -26,4 +27,4 @@ spec:
             port: {{ .Values.consulPort }}
           initialDelaySeconds: 5
           periodSeconds: 10
-        imagePullPolicy: "{{ .Values.pullPolicy }}"
\ No newline at end of file
+        imagePullPolicy: {{ .Values.pullPolicy }}
\ No newline at end of file
index 0fcd2f9..535eab9 100644 (file)
@@ -2,6 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: msb-discovery
+  namespace: "{{ .Values.nsPrefix }}-msb"
 spec:
   replicas: {{ .Values.discoveryReplicas }}
   selector:
@@ -16,7 +17,7 @@ spec:
       hostname: msb-discovery
       containers:
       - args:
-        image:  nexus3.onap.org:10001/onap/msb/msb_discovery
+        image:  {{ .Values.image.discovery }}
         name: "msb-discovery"
         env:
         - name: CONSUL_IP
@@ -29,6 +30,6 @@ spec:
             port: {{ .Values.discoveryPort }}
           initialDelaySeconds: 5
           periodSeconds: 10
-        imagePullPolicy: "{{ .Values.pullPolicy }}"
+        imagePullPolicy: {{ .Values.pullPolicy }}
 
 
index eb75cd9..eb60fe2 100644 (file)
@@ -2,6 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: msb-eag
+  namespace: "{{ .Values.nsPrefix }}-msb"
 spec:
   replicas: {{ .Values.eagReplicas }}
   selector:
@@ -16,7 +17,7 @@ spec:
       hostname: msb-eag
       containers:
       - args:
-        image:  nexus3.onap.org:10001/onap/msb/msb_apigateway
+        image:  {{ .Values.image.apigateway }}
         name: "msb-eag"
         env:
         - name: CONSUL_IP
@@ -33,6 +34,6 @@ spec:
             port: {{ .Values.eagPort }}
           initialDelaySeconds: 5
           periodSeconds: 10
-        imagePullPolicy: "{{ .Values.pullPolicy}}"
+        imagePullPolicy: {{ .Values.pullPolicy}}
 
 
index d83951a..180c315 100644 (file)
@@ -2,6 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: msb-iag
+  namespace: "{{ .Values.nsPrefix }}-msb"
 spec:
   replicas: {{ .Values.iagReplicas }}
   selector:
index 38059e1..6927f1d 100644 (file)
@@ -1,3 +1,10 @@
+nsPrefix: onap
+pullPolicy: IfNotPresent
+image:
+  consul: consul:latest
+  discovery: nexus3.onap.org:10001/onap/msb/msb_discovery:latest
+  apigateway: nexus3.onap.org:10001/onap/msb/msb_discovery:latest
+
 consulClusterIP: 10.43.6.204
 consulPort: 8500
 consulNodePort: 30500
@@ -15,6 +22,4 @@ iagReplicas: 1
 eagClusterIP: 10.43.6.207
 eagPort: 80
 eagNodePort: 30082
-eagReplicas: 1
-
-pullPolicy: IfNotPresent
\ No newline at end of file
+eagReplicas: 1
\ No newline at end of file
index a0807d7..96c7fd7 100644 (file)
@@ -8,7 +8,7 @@ metadata:
 spec:
   ports:
     - port: 3306
-      nodePort: 30252
+      nodePort: {{ .Values.nodePortPrefix }}52
   selector:
     app: mariadb
   type: NodePort
@@ -20,23 +20,43 @@ metadata:
   namespace: "{{ .Values.nsPrefix }}-mso"
   labels:
     app: mso
+  annotations:
+    msb.onap.org/service-info: '[
+      {
+          "serviceName": "so",
+          "version": "v1",
+          "url": "/ecomp/mso/infra",
+          "protocol": "REST"
+          "port": "8080",
+          "visualRange":"1"
+      },
+      {
+          "serviceName": "so-deprecated",
+          "version": "v1",
+          "url": "/ecomp/mso/infra",
+          "protocol": "REST"
+          "port": "8080",
+          "visualRange":"1",
+          "path":"/ecomp/mso/infra"
+      }
+      ]'
 spec:
   selector:
     app: mso
   ports:
     - name: mso1
       port: 8080
-      nodePort: 30223
+      nodePort: {{ .Values.nodePortPrefix }}23
     - name: mso2
       port: 3904
-      nodePort: 30225
+      nodePort: {{ .Values.nodePortPrefix }}25
     - name: mso3
       port: 3905
-      nodePort: 30224
+      nodePort: {{ .Values.nodePortPrefix }}24
     - name: mso4
       port: 9990
-      nodePort: 30222
+      nodePort: {{ .Values.nodePortPrefix }}22
     - name: mso5
       port: 8787
-      nodePort: 30250
+      nodePort: {{ .Values.nodePortPrefix }}50
   type: NodePort
index 76cf2ec..389fb5a 100644 (file)
@@ -32,6 +32,8 @@ spec:
           name: mso-mariadb-conf
         - mountPath: /docker-entrypoint-initdb.d
           name: mso-mariadb-docker-entrypoint-initdb
+        - mountPath: /var/lib/mysql
+          name: mso-mariadb-data
         ports:
         - containerPort: 3306
           name: mariadb
@@ -47,5 +49,8 @@ spec:
         - name: mso-mariadb-docker-entrypoint-initdb
           hostPath:
             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/mso/mariadb/docker-entrypoint-initdb.d
+        - name: mso-mariadb-data
+          persistentVolumeClaim:
+            claimName: mso-db
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/mso/templates/mso-pv-pvc.yaml b/kubernetes/mso/templates/mso-pv-pvc.yaml
new file mode 100644 (file)
index 0000000..c195980
--- /dev/null
@@ -0,0 +1,30 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: mso-db
+  namespace: "{{ .Values.nsPrefix }}-mso"
+  labels:
+    name: mso-db
+spec:
+  capacity:
+    storage: 2Gi
+  accessModes:
+    - ReadWriteMany
+  persistentVolumeReclaimPolicy: Retain
+  hostPath:
+    path: /dockerdata-nfs/{{ .Values.nsPrefix }}/mso/mariadb/data
+---
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: mso-db
+  namespace: "{{ .Values.nsPrefix }}-mso"
+spec:
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: 2Gi
+  selector:
+    matchLabels:
+      name: mso-db
index a7eed47..883db87 100644 (file)
@@ -1,5 +1,6 @@
 nsPrefix: onap
 pullPolicy: Always 
+nodePortPrefix: 302
 image:
   readiness: oomk8s/readiness-check:1.0.0
   mso: nexus3.onap.org:10001/openecomp/mso:1.1-STAGING-latest
index 829f27a..636d86f 100755 (executable)
@@ -25,21 +25,7 @@ create_registry_key() {
 }
 
 create_onap_helm() {
-  helm install ../$2/ --name $2 --namespace $1 --set nsPrefix=$1
-}
-
-configure_app() {
-  # if previous configuration exists put back original template file
-  for file in $3/*.yaml; do
-    if [ -e "$file-template" ]; then
-      mv "$file-template" "${file%}"
-    fi
-  done
-  
-  if [ -e "$2/Chart.yaml" ]; then
-    sed -i-- 's/nodePort: [0-9]\{2\}[02468]\{1\}/nodePort: '"$4"'/g' $3/all-services.yaml
-    sed -i-- 's/nodePort: [0-9]\{2\}[13579]\{1\}/nodePort: '"$5"'/g' $3/all-services.yaml
-  fi
+  helm install ../$2/ --name $1-$2 --namespace $1 --set nsPrefix=$1,nodePortPrefix=$3
 }
 
 
@@ -51,6 +37,7 @@ INSTANCE=1
 MAX_INSTANCE=5
 DU=$ONAP_DOCKER_USER
 DP=$ONAP_DOCKER_PASS
+_FILES_PATH=$(echo ../$i/templates)
 
 while getopts ":n:u:s:i:a:du:dp:" PARAM; do
   case $PARAM in
@@ -119,9 +106,7 @@ for i in ${HELM_APPS[@]}; do
   create_registry_key $NS $i ${NS}-docker-registry-key $ONAP_DOCKER_REGISTRY $DU $DP $ONAP_DOCKER_MAIL
 
   printf "\nCreating deployments and services **********\n"
-  _FILES_PATH=$(echo ../$i/templates)
-  configure_app $NS $i $_FILES_PATH $start $end
-  create_onap_helm $NS $i
+  create_onap_helm $NS $i $start
 
   printf "\n"
 done
index 33ecb32..40d0701 100755 (executable)
@@ -17,7 +17,7 @@ delete_registry_key() {
 }
 
 delete_app_helm() {
-  helm delete $1 --purge
+  helm delete $1-$2 --purge
 }
 
 usage() {
@@ -74,7 +74,7 @@ printf "\n********** Cleaning up ONAP: ${ONAP_APPS[*]}\n"
 
 for i in ${HELM_APPS[@]}; do
 
-  delete_app_helm $i
+  delete_app_helm $NS $i
   delete_namespace $NS $i
 
 done
diff --git a/kubernetes/oom/Chart.yaml b/kubernetes/oom/Chart.yaml
new file mode 100644 (file)
index 0000000..0c62d86
--- /dev/null
@@ -0,0 +1,4 @@
+apiVersion: v1
+description: A Helm chart for Kubernetes
+name: oom-registrator
+version: 0.1.0
diff --git a/kubernetes/oom/templates/oom-registrator-deployment.yaml b/kubernetes/oom/templates/oom-registrator-deployment.yaml
new file mode 100644 (file)
index 0000000..77f71f4
--- /dev/null
@@ -0,0 +1,27 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: oom-registrator
+  namespace: "{{ .Values.nsPrefix }}-oom"
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: oom-registrator
+  template:
+    metadata:
+      labels:
+        app: oom-registrator
+      name: oom-registrator
+    spec:
+      hostname: oom-registrator
+      containers:
+      - args:
+        image: {{ .Values.image.kube2msb }}
+        name: oom-registrator
+        env:
+        - name: KUBE_MASTER_URL
+          value: {{ .Values.kubeMasterUrl }}
+        - name: MSB_URL
+          value: {{ .Values.discoveryUrl }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
diff --git a/kubernetes/oom/values.yaml b/kubernetes/oom/values.yaml
new file mode 100644 (file)
index 0000000..aa8d771
--- /dev/null
@@ -0,0 +1,8 @@
+nsPrefix: onap
+pullPolicy: IfNotPresent
+image:
+  #need help from LF to build and push image to nexus3.onap.org
+  #kube2msb: nexus3.onap.org:10001/onap/msb/kube2msb
+  kube2msb: zhaohuabing/kube2msb:latest
+kubeMasterUrl: http://10.96.33.43:8080/r/projects/1a7/kubernetes:6443
+discoveryUrl: http://10.43.6.205:10081
\ No newline at end of file
index 0dc1785..cd01b54 100644 (file)
@@ -39,7 +39,7 @@ spec:
   ports:
   - name: "drools-port"
     port: 6969
-    nodePort: 30217
+    nodePort: {{ .Values.nodePortPrefix }}17
   selector:
     app: drools
   type: NodePort
@@ -55,10 +55,10 @@ spec:
   ports:
   - name: 8443-port
     port: 8443
-    nodePort: 30219
+    nodePort: {{ .Values.nodePortPrefix }}19
   - name: 9091-port
     port: 9091
-    nodePort: 30218
+    nodePort: {{ .Values.nodePortPrefix }}18
   selector:
     app: pap
   type: NodePort
@@ -77,6 +77,7 @@ metadata:
           "version": "v1",
           "url": "/pdp",
           "protocol": "REST"
+          "port": "8081",
           "visualRange":"1"
       },
       {
@@ -84,6 +85,7 @@ metadata:
           "version": "v1",
           "url": "/pdp",
           "protocol": "REST"
+          "port": "8081",
           "visualRange":"1",
           "path":"/pdp"
       }
@@ -92,7 +94,7 @@ spec:
   ports:
   - name: 8081-port
     port: 8081
-    nodePort: 30220
+    nodePort: {{ .Values.nodePortPrefix }}20
   selector:
     app: pdp
   type: NodePort
@@ -108,7 +110,7 @@ spec:
   ports:
   - name: tcp-31032-8480-bm91k
     port: 8480
-    nodePort: 30221
+    nodePort: {{ .Values.nodePortPrefix }}21
   selector:
     app: pypdp
   type: NodePort
@@ -124,7 +126,7 @@ spec:
   ports:
   - name: 9989-port
     port: 9989
-    nodePort: 30216
+    nodePort: {{ .Values.nodePortPrefix }}16
   selector:
     app: brmsgw
   type: NodePort
index 511405b..30d0db3 100644 (file)
@@ -24,10 +24,17 @@ spec:
         name: mariadb
         ports:
         - containerPort: 3306
+        volumeMounts:
+        - mountPath: /var/lib/mysql
+          name: policy-mariadb-data
         readinessProbe:
           tcpSocket:
             port: 3306
           initialDelaySeconds: 5
           periodSeconds: 10
+      volumes:
+      - name: policy-mariadb-data
+        persistentVolumeClaim:
+          claimName: policy-db
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/policy/templates/policy-pv-pvc.yaml b/kubernetes/policy/templates/policy-pv-pvc.yaml
new file mode 100644 (file)
index 0000000..dda9820
--- /dev/null
@@ -0,0 +1,30 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: policy-db
+  namespace: "{{ .Values.nsPrefix }}-policy"
+  labels:
+    name: policy-db
+spec:
+  capacity:
+    storage: 2Gi
+  accessModes:
+    - ReadWriteMany
+  persistentVolumeReclaimPolicy: Retain
+  hostPath:
+    path: /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/mariadb/data/
+---
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: policy-db
+  namespace: "{{ .Values.nsPrefix }}-policy"
+spec:
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: 2Gi
+  selector:
+    matchLabels:
+      name: policy-db
index e11ad74..1b2ed0f 100644 (file)
@@ -1,5 +1,6 @@
 nsPrefix: onap
 pullPolicy: Always
+nodePortPrefix: 302
 image:
   readiness: oomk8s/readiness-check
   readinessVersion: 1.0.0
index 2107e2a..b3fabb2 100644 (file)
@@ -23,15 +23,15 @@ metadata:
 spec:
   ports:
   - name: portal-1
-    nodePort: 30213
+    nodePort: {{ .Values.nodePortPrefix }}13
     port: 8006
     targetPort: 8005
   - name: portal-2
-    nodePort: 30214
+    nodePort: {{ .Values.nodePortPrefix }}14
     port: 8010
     targetPort: 8009
   - name: portal-3
-    nodePort: 30215
+    nodePort: {{ .Values.nodePortPrefix }}15
     port: 8989
     targetPort: 8080
   selector:
@@ -50,11 +50,11 @@ spec:
   - name: tcp-1
     port: 6080
     targetPort: 80
-    nodePort: 30211
+    nodePort: {{ .Values.nodePortPrefix }}11
   - name: tcp-2
     port: 5900
     targetPort: 5900
-    nodePort: 30212
+    nodePort: {{ .Values.nodePortPrefix }}12
   selector:
     app: vnc-portal
   type: NodePort
index a31c6a2..16c0d7e 100755 (executable)
@@ -35,7 +35,7 @@ spec:
           periodSeconds: 10
       volumes:
       - name: portal-mariadb-data
-        hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/mariadb/data
+        persistentVolumeClaim:
+          claimName: portal-db
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/portal/templates/portal-pv-pvc.yaml b/kubernetes/portal/templates/portal-pv-pvc.yaml
new file mode 100644 (file)
index 0000000..5d41e4f
--- /dev/null
@@ -0,0 +1,30 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: portal-db
+  namespace: "{{ .Values.nsPrefix }}-portal"
+  labels:
+    name: portal-db
+spec:
+  capacity:
+    storage: 2Gi
+  accessModes:
+    - ReadWriteMany
+  persistentVolumeReclaimPolicy: Retain
+  hostPath:
+    path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/mariadb/data
+---
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: portal-db
+  namespace: "{{ .Values.nsPrefix }}-portal"
+spec:
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: 2Gi
+  selector:
+    matchLabels:
+      name: portal-db
index fb7bd93..6c90bbf 100644 (file)
@@ -95,7 +95,7 @@ spec:
           },
           {
               "command": ["/bin/sh","-c"],
-              "args": ["echo `host sdc-be.{{ .Values.nsPrefix }}-sdc | awk ''{print$4}''` sdc.api.be.simpledemo.openecomp.org  >> /ubuntu-init/hosts; echo `host portalapps.{{ .Values.nsPrefix }}-portal | awk ''{print$4}''` portal.api.simpledemo.openecomp.org  >> /ubuntu-init/hosts; echo `host pap.{{ .Values.nsPrefix }}-policy | awk ''{print$4}''` policy.api.simpledemo.openecomp.org  >> /ubuntu-init/hosts; echo `host sdc-fe.{{ .Values.nsPrefix }}-sdc | awk ''{print$4}''` sdc.ui.simpledemo.openecomp.org  >> /ubuntu-init/hosts; echo `host vid-server.{{ .Values.nsPrefix }}-vid | awk ''{print$4}''` vid.api.simpledemo.openecomp.org >> /ubuntu-init/hosts; echo `host sparky-fe.{{ .Values.nsPrefix }}-aai | awk ''{print$4}''` aai.api.simpledemo.openecomp.org  >> /ubuntu-init/hosts"],
+              "args": ["echo `host sdc-be.{{ .Values.nsPrefix }}-sdc | awk ''{print$4}''` sdc.api.be.simpledemo.openecomp.org  >> /ubuntu-init/hosts; echo `host portalapps.{{ .Values.nsPrefix }}-portal | awk ''{print$4}''` portal.api.simpledemo.openecomp.org  >> /ubuntu-init/hosts; echo `host pap.{{ .Values.nsPrefix }}-policy | awk ''{print$4}''` policy.api.simpledemo.openecomp.org  >> /ubuntu-init/hosts; echo `host sdc-fe.{{ .Values.nsPrefix }}-sdc | awk ''{print$4}''` sdc.api.simpledemo.openecomp.org  >> /ubuntu-init/hosts; echo `host vid-server.{{ .Values.nsPrefix }}-vid | awk ''{print$4}''` vid.api.simpledemo.openecomp.org >> /ubuntu-init/hosts; echo `host sparky-be.{{ .Values.nsPrefix }}-aai | awk ''{print$4}''` aai.api.simpledemo.openecomp.org  >> /ubuntu-init/hosts"],
               "image": "{{ .Values.image.ubuntuInit }}",
               "imagePullPolicy": "{{ .Values.pullPolicy }}",
               "name": "vnc-init-hosts",
index ae9479e..f4d1919 100644 (file)
@@ -1,5 +1,6 @@
 nsPrefix: onap
 pullPolicy: Always
+nodePortPrefix: 302
 image:
   readiness: oomk8s/readiness-check:1.0.0
   portalapps: nexus3.onap.org:10001/openecomp/portalapps:1.1-STAGING-latest
index b152454..1fbabe2 100644 (file)
@@ -7,7 +7,7 @@ metadata:
 spec:
   ports:
   - port: 88
-    nodePort: 30209
+    nodePort: {{ .Values.nodePortPrefix }}09
   selector:
     app: robot
   type: NodePort
index a14dae7..f126bc9 100644 (file)
@@ -8,7 +8,7 @@ metadata:
 spec:
   ports:
   - port: 88
-    nodePort: 30209
+    nodePort: {{ .Values.nodePortPrefix }}09
   selector:
     app: robot
   type: NodePort
index 90566c4..221b572 100644 (file)
@@ -1,5 +1,6 @@
 nsPrefix: onap
 pullPolicy: Always
+nodePortPrefix: 302
 image:
   testsuite: nexus3.onap.org:10001/openecomp/testsuite:1.1-STAGING-latest
 
index 93febcc..88cbe8e 100644 (file)
@@ -57,10 +57,10 @@ metadata:
 spec:
   ports:
   - name: sdc-be-port-8443
-    nodePort: 30204
+    nodePort: {{ .Values.nodePortPrefix }}04
     port: 8443
   - name: sdc-be-port-8080
-    nodePort: 30205
+    nodePort: {{ .Values.nodePortPrefix }}05
     port: 8080
   selector:
     app: sdc-be
@@ -76,10 +76,10 @@ metadata:
 spec:
   ports:
   - name: sdc-fe-port-9443
-    nodePort: 30207
+    nodePort: {{ .Values.nodePortPrefix }}07
     port: 9443
   - name: sdc-fe-port-8181
-    nodePort: 30206
+    nodePort: {{ .Values.nodePortPrefix }}06
     port: 8181
   selector:
     app: sdc-fe
index 38a239e..d853f18 100644 (file)
@@ -79,8 +79,6 @@ spec:
           name: sdc-sdc-es-es
         - mountPath: /root/chef-solo/environments/
           name: sdc-environments
-        - mountPath: /var/lib/jetty/etc/keystore
-          name: sdc-jetty-keystore
         - mountPath: /etc/localtime
           name: sdc-localtime
         - mountPath: /var/lib/jetty/logs
@@ -100,9 +98,6 @@ spec:
         - name: sdc-environments
           hostPath:
             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/environments
-        - name: sdc-jetty-keystore
-          hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/jetty/keystore
         - name: sdc-localtime
           hostPath:
             path:  /etc/localtime
index b660c90..9021194 100644 (file)
@@ -73,8 +73,8 @@ spec:
           periodSeconds: 10
       volumes:
         - name: sdc-sdc-cs-cs
-          hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/sdc-cs/CS
+          persistentVolumeClaim:
+            claimName: sdc-cs-db
         - name: sdc-environments
           hostPath:
             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/environments
index 53759dc..915d18b 100644 (file)
@@ -63,8 +63,6 @@ spec:
           name: sdc-sdc-es-es
         - mountPath: /root/chef-solo/environments/
           name: sdc-environments
-        - mountPath: /var/lib/jetty/etc/keystore
-          name: sdc-jetty-keystore
         - mountPath: /etc/localtime
           name: sdc-localtime
         - mountPath: /var/lib/jetty/logs
@@ -86,9 +84,6 @@ spec:
         - name: sdc-environments
           hostPath:
             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/environments
-        - name: sdc-jetty-keystore
-          hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/jetty/keystore
         - name: sdc-localtime
           hostPath:
             path:  /etc/localtime
diff --git a/kubernetes/sdc/templates/sdc-pv-pvc.yaml b/kubernetes/sdc/templates/sdc-pv-pvc.yaml
new file mode 100644 (file)
index 0000000..41f85e9
--- /dev/null
@@ -0,0 +1,30 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: sdc-cs-db
+  namespace: "{{ .Values.nsPrefix }}-sdc"
+  labels:
+    name: sdc-cs-db
+spec:
+  capacity:
+    storage: 2Gi
+  accessModes:
+    - ReadWriteMany
+  persistentVolumeReclaimPolicy: Retain
+  hostPath:
+    path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/sdc-cs/CS
+---
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: sdc-cs-db
+  namespace: "{{ .Values.nsPrefix }}-sdc"
+spec:
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: 2Gi
+  selector:
+    matchLabels:
+      name: sdc-cs-db
index 139f08c..58bcf1c 100644 (file)
@@ -1,5 +1,6 @@
 nsPrefix: onap
 pullPolicy: Always
+nodePortPrefix: 302
 image:
   readiness: oomk8s/readiness-check:1.0.0
   sdcKibana: nexus3.onap.org:10001/openecomp/sdc-kibana:1.1-STAGING-latest
index 311bd7b..4a24947 100644 (file)
@@ -52,7 +52,7 @@ spec:
   - name: "sdnc-dgbuilder-port"
     port: 3000
     targetPort: 3100
-    nodePort: 30203
+    nodePort: {{ .Values.nodePortPrefix }}03
   type: NodePort
   selector:
     app: sdnc-dgbuilder
@@ -69,7 +69,7 @@ spec:
   - name: "sdnc-port"
     port: 8282
     targetPort: 8181
-    nodePort: 30202
+    nodePort: {{ .Values.nodePortPrefix }}02
   type: NodePort
   selector:
     app: sdnc
@@ -85,7 +85,7 @@ spec:
   ports:
   - name: "sdnc-portal-port"
     port: 8843
-    nodePort: 30201
+    nodePort: {{ .Values.nodePortPrefix }}01
   type: NodePort
   selector:
     app: sdnc-portal
index fc692ba..8370798 100644 (file)
@@ -34,7 +34,7 @@ spec:
           periodSeconds: 10
       volumes:
       - name: sdnc-data
-        hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdnc/data
+        persistentVolumeClaim:
+          claimName: sdnc-db
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/sdnc/templates/sdnc-pv-pvc.yaml b/kubernetes/sdnc/templates/sdnc-pv-pvc.yaml
new file mode 100644 (file)
index 0000000..ac890c6
--- /dev/null
@@ -0,0 +1,30 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: sdnc-db
+  namespace: "{{ .Values.nsPrefix }}-sdnc"
+  labels:
+    name: sdnc-db
+spec:
+  capacity:
+    storage: 2Gi
+  accessModes:
+    - ReadWriteMany
+  persistentVolumeReclaimPolicy: Retain
+  hostPath:
+    path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdnc/data
+---
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: sdnc-db
+  namespace: "{{ .Values.nsPrefix }}-sdnc"
+spec:
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: 2Gi
+  selector:
+    matchLabels:
+      name: sdnc-db
index 5e17a96..0ccc357 100644 (file)
@@ -1,5 +1,6 @@
 nsPrefix: onap
 pullPolicy: Always
+nodePortPrefix: 302
 image:
   readiness: oomk8s/readiness-check:1.0.0
   mysqlServer: mysql/mysql-server:5.6
index c085671..270aab9 100644 (file)
@@ -21,7 +21,7 @@ metadata:
 spec:
   ports:
   - name: vid-server
-    nodePort: 30200
+    nodePort: {{ .Values.nodePortPrefix }}00
     port: 8080
   selector:
     app: vid-server
index 7623674..e5032f3 100644 (file)
@@ -44,8 +44,8 @@ spec:
           periodSeconds: 10
       volumes:
         - name: vid-mariadb-data
-          hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/vid/mariadb/data
+          persistentVolumeClaim:
+            claimName: vid-db
         - name: vid-pre-init
           hostPath:
             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/vid/vid/lf_config/vid-pre-init.sql
diff --git a/kubernetes/vid/templates/vid-pv-pvc.yaml b/kubernetes/vid/templates/vid-pv-pvc.yaml
new file mode 100644 (file)
index 0000000..71c5d73
--- /dev/null
@@ -0,0 +1,30 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: vid-db
+  namespace: "{{ .Values.nsPrefix }}-vid"
+  labels:
+    name: vid-db
+spec:
+  capacity:
+    storage: 2Gi
+  accessModes:
+    - ReadWriteMany
+  persistentVolumeReclaimPolicy: Retain
+  hostPath:
+    path: /dockerdata-nfs/{{ .Values.nsPrefix }}/vid/mariadb/data
+---
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: vid-db
+  namespace: "{{ .Values.nsPrefix }}-vid"
+spec:
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: 2Gi
+  selector:
+    matchLabels:
+      name: vid-db
index ed9e12d..a7d494c 100644 (file)
@@ -1,5 +1,6 @@
 nsPrefix: onap
 pullPolicy: IfNotPresent
+nodePortPrefix: 302
 image:
   readiness: oomk8s/readiness-check:1.0.0
   mariadb: nexus3.onap.org:10001/library/mariadb:10
index 50ac29b..699312b 100644 (file)
@@ -8,8 +8,10 @@ description: >
 
 imports:
   - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-manager/4.1/resources/rest-service/cloudify/types/types.yaml
-  # Plugin required: https://github.com/cloudify-incubator/cloudify-kubernetes-plugin/releases/download/1.2.0/cloudify_kubernetes_plugin-1.2.0-py27-none-linux_x86_64-centos-Core.wgn
-  - https://raw.githubusercontent.com/cloudify-incubator/cloudify-kubernetes-plugin/1.2.0/plugin.yaml
+  # Plugin required: https://github.com/cloudify-incubator/cloudify-kubernetes-plugin/releases/download/1.2.1rc1/cloudify_kubernetes_plugin-1.2.1rc1-py27-none-linux_x86_64-centos-Core.wgn
+  - https://raw.githubusercontent.com/cloudify-incubator/cloudify-kubernetes-plugin/1.2.1rc1/plugin.yaml
+  # Plugin required: http://repository.cloudifysource.org/cloudify/wagons/cloudify-fabric-plugin/1.4.2/cloudify_fabric_plugin-1.4.2-py27-none-linux_x86_64-centos-Core.wgn
+  - http://www.getcloudify.org/spec/fabric-plugin/1.4.2/plugin.yaml
   - cloudify/types/onap.yaml
 
 inputs:
@@ -17,46 +19,16 @@ inputs:
     description: >
       File content of kubernetes master YAML configuration
 
-  apps:
-    description: >
-      List of ONAP apps names to be deployed.
-      Default empty array (deploy all available apps).
-    default: []
-
   namespace_prefix:
     type: string
     description: >
       Kubernetes namespace name prefix which will be uese for all ONAP apps
     default: onap
 
-  docker_registry:
-    type: string
-    default: regsecret
-
-  docker_server:
-    type: string
-    default: nexus3.onap.org:10001
-
-  docker_username:
-    type: string
-    default: docker
-
-  docker_password:
-    type: string
-    default: docker
-
-  docker_email:
-    type: string
-    default: email@email.com
-
 dsl_definitions:
-  inputs: &app_inputs
-    namespace_prefix: { get_input: namespace_prefix }
-    docker_registry: { get_input: docker_registry }
-    docker_server: { get_input: docker_server }
-    docker_username: { get_input: docker_username }
-    docker_password: { get_input: docker_password }
-    docker_email: { get_input: docker_email }
+  options: &app_options
+    namespace:
+      concat: [{ get_input: namespace_prefix }, '-', { get_property: [SELF, name] }]
 
 node_templates:
   kubernetes_master:
@@ -65,12 +37,13 @@ node_templates:
       configuration:
         file_content: { get_input: kubernetes_configuration_file_content }
 
-  init_pod:
-    type: cloudify.kubernetes.resources.Pod
+  onap_environment:
+    type: cloudify.onap.kubernetes.Environment
     properties:
-      definition:
-        file:
-          resource_path: kubernetes/config/pod-config-init.yaml
+      namespace: { get_input: namespace_prefix }
+      init_pod: kubernetes/config/pod-config-init.yaml
+      options:
+        namespace: { get_input: namespace_prefix }
     relationships:
       - type: cloudify.kubernetes.relationships.managed_by_master
         target: kubernetes_master
@@ -79,162 +52,172 @@ node_templates:
     type: cloudify.onap.kubernetes.App
     properties:
       name: mso
+      values: kubernetes/mso/values.yaml
       resources:
-          - kubernetes/mso/templates/mso-deployment.yaml
-          - kubernetes/mso/templates/db-deployment.yaml
+        - kubernetes/mso/templates/mso-deployment.yaml
+        - kubernetes/mso/templates/db-deployment.yaml
       services: kubernetes/mso/templates/all-services.yaml
-      inputs: *app_inputs
+      options: *app_options
     relationships:
       - type: cloudify.kubernetes.relationships.managed_by_master
         target: kubernetes_master
       - type: cloudify.relationships.depends_on
-        target: init_pod
+        target: onap_environment
 
   message_router_app:
     type: cloudify.onap.kubernetes.App
     properties:
       name: message-router
+      values: kubernetes/message-router/values.yaml
       resources:
           - kubernetes/message-router/templates/message-router-zookeeper.yaml
           - kubernetes/message-router/templates/message-router-dmaap.yaml
           - kubernetes/message-router/templates/message-router-kafka.yaml
       services: kubernetes/message-router/templates/all-services.yaml
-      inputs: *app_inputs
+      options: *app_options
     relationships:
       - type: cloudify.kubernetes.relationships.managed_by_master
         target: kubernetes_master
       - type: cloudify.relationships.depends_on
-        target: init_pod
+        target: onap_environment
 
   sdc_app:
     type: cloudify.onap.kubernetes.App
     properties:
       name: sdc
+      values: kubernetes/sdc/values.yaml
       resources:
-        - kubernetes/sdc/sdc-es.yaml
-        - kubernetes/sdc/sdc-fe.yaml
-        - kubernetes/sdc/sdc-kb.yaml
-        - kubernetes/sdc/sdc-cs.yaml
-        - kubernetes/sdc/sdc-be.yaml
-      services: kubernetes/sdc/all-services.yaml
-      inputs: *app_inputs
+        - kubernetes/sdc/templates/sdc-es.yaml
+        - kubernetes/sdc/templates/sdc-fe.yaml
+        - kubernetes/sdc/templates/sdc-kb.yaml
+        - kubernetes/sdc/templates/sdc-cs.yaml
+        - kubernetes/sdc/templates/sdc-be.yaml
+      services: kubernetes/sdc/templates/all-services.yaml
+      options: *app_options
     relationships:
       - type: cloudify.kubernetes.relationships.managed_by_master
         target: kubernetes_master
       - type: cloudify.relationships.depends_on
-        target: init_pod
+        target: onap_environment
 
   aai_app:
     type: cloudify.onap.kubernetes.App
     properties:
       name: aai
+      values: kubernetes/aai/values.yaml
       resources:
-        - kubernetes/aai/aai-deployment.yaml
-        - kubernetes/aai/modelloader-deployment.yaml
-        - kubernetes/aai/hbase-deployment.yaml
-      services: kubernetes/aai/all-services.yaml
-      inputs: *app_inputs
+        - kubernetes/aai/templates/aai-deployment.yaml
+        - kubernetes/aai/templates/modelloader-deployment.yaml
+        - kubernetes/aai/templates/hbase-deployment.yaml
+      services: kubernetes/aai/templates/all-services.yaml
+      options: *app_options
     relationships:
       - type: cloudify.kubernetes.relationships.managed_by_master
         target: kubernetes_master
       - type: cloudify.relationships.depends_on
-        target: init_pod
+        target: onap_environment
 
   robot_app:
     type: cloudify.onap.kubernetes.App
     properties:
       name: robot
+      values: kubernetes/robot/values.yaml
       resources:
-        - kubernetes/robot/robot-deployment.yaml
-      services: kubernetes/robot/all-services.yaml
-      inputs: *app_inputs
+        - kubernetes/robot/templates/robot-deployment.yaml
+      services: kubernetes/robot/templates/all-services.yaml
+      options: *app_options
     relationships:
       - type: cloudify.kubernetes.relationships.managed_by_master
         target: kubernetes_master
       - type: cloudify.relationships.depends_on
-        target: init_pod
+        target: onap_environment
 
   vid_app:
     type: cloudify.onap.kubernetes.App
     properties:
       name: vid
+      values: kubernetes/vid/values.yaml
       resources:
-        - kubernetes/vid/vid-mariadb-deployment.yaml
-        - kubernetes/vid/vid-server-deployment.yaml
-      services: kubernetes/vid/all-services.yaml
-      inputs: *app_inputs
+        - kubernetes/templates/vid-mariadb-deployment.yaml
+        - kubernetes/templates/vid-server-deployment.yaml
+      services: kubernetes/vid/templates/all-services.yaml
+      options: *app_options
     relationships:
       - type: cloudify.kubernetes.relationships.managed_by_master
         target: kubernetes_master
       - type: cloudify.relationships.depends_on
-        target: init_pod
+        target: onap_environment
 
   sdnc_app:
     type: cloudify.onap.kubernetes.App
     properties:
       name: sdnc
+      values: kubernetes/sdnc/values.yaml
       resources:
-        - kubernetes/sdnc/web-deployment.yaml
-        - kubernetes/sdnc/sdnc-deployment.yaml
-        - kubernetes/sdnc/dgbuilder-deployment.yaml
-        - kubernetes/sdnc/db-deployment.yaml
-      services: kubernetes/sdnc/all-services.yaml
-      inputs: *app_inputs
+        - kubernetes/sdnc/templates/web-deployment.yaml
+        - kubernetes/sdnc/templates/sdnc-deployment.yaml
+        - kubernetes/sdnc/templates/dgbuilder-deployment.yaml
+        - kubernetes/sdnc/templates/db-deployment.yaml
+      services: kubernetes/sdnc/templates/all-services.yaml
+      options: *app_options
     relationships:
       - type: cloudify.kubernetes.relationships.managed_by_master
         target: kubernetes_master
       - type: cloudify.relationships.depends_on
-        target: init_pod
+        target: onap_environment
 
   portal_app:
     type: cloudify.onap.kubernetes.App
     properties:
       name: portal
+      values: kubernetes/portal/values.yaml
       resources:
-        - kubernetes/portal/portal-widgets-deployment.yaml
-        - kubernetes/portal/portal-apps-deployment.yaml
-        - kubernetes/portal/portal-mariadb-deployment.yaml
-        - kubernetes/portal/portal-vnc-dep.yaml
-      services: kubernetes/portal/all-services.yaml
-      inputs: *app_inputs
+        - kubernetes/portal/templates/portal-widgets-deployment.yaml
+        - kubernetes/portal/templates/portal-apps-deployment.yaml
+        - kubernetes/portal/templates/portal-mariadb-deployment.yaml
+        - kubernetes/portal/templates/portal-vnc-dep.yaml
+      services: kubernetes/portal/templates/all-services.yaml
+      options: *app_options
     relationships:
       - type: cloudify.kubernetes.relationships.managed_by_master
         target: kubernetes_master
       - type: cloudify.relationships.depends_on
-        target: init_pod
+        target: onap_environment
 
   policy_app:
     type: cloudify.onap.kubernetes.App
     properties:
       name: policy
+      values: kubernetes/policy/values.yaml
       resources:
-        - kubernetes/policy/dep-drools.yaml
-        - kubernetes/policy/dep-nexus.yaml
-        - kubernetes/policy/dep-brmsgw.yaml
-        - kubernetes/policy/dep-pdp.yaml
-        - kubernetes/policy/dep-pap.yaml
-        - kubernetes/policy/dep-maria.yaml
-        - kubernetes/policy/dep-pypdp.yaml
-      services: kubernetes/policy/all-services.yaml
-      inputs: *app_inputs
+        - kubernetes/policy/templates/dep-drools.yaml
+        - kubernetes/policy/templates/dep-nexus.yaml
+        - kubernetes/policy/templates/dep-brmsgw.yaml
+        - kubernetes/policy/templates/dep-pdp.yaml
+        - kubernetes/policy/templates/dep-pap.yaml
+        - kubernetes/policy/templates/dep-maria.yaml
+        - kubernetes/policy/templates/dep-pypdp.yaml
+      services: kubernetes/policy/templates/all-services.yaml
+      options: *app_options
     relationships:
       - type: cloudify.kubernetes.relationships.managed_by_master
         target: kubernetes_master
       - type: cloudify.relationships.depends_on
-        target: init_pod
+        target: onap_environment
 
   appc_app:
     type: cloudify.onap.kubernetes.App
     properties:
       name: appc
+      values: kubernetes/appc/values.yaml
       resources:
-        - kubernetes/appc/appc-deployment.yaml
-        - kubernetes/appc/dgbuilder-deployment.yaml
-        - kubernetes/appc/db-deployment.yaml
-      services: kubernetes/appc/all-services.yaml
-      inputs: *app_inputs
+        - kubernetes/appc/templates/appc-deployment.yaml
+        - kubernetes/appc/templates/dgbuilder-deployment.yaml
+        - kubernetes/appc/templates/db-deployment.yaml
+      services: kubernetes/appc/templates/all-services.yaml
+      options: *app_options
     relationships:
       - type: cloudify.kubernetes.relationships.managed_by_master
         target: kubernetes_master
       - type: cloudify.relationships.depends_on
-        target: init_pod
+        target: onap_environment