Init dcae.demo

Change-Id: Ifc50405276e40c6458d236cd218764573551a7aa Signed-off-by: lj1412 <lji@research.att.com>
author: lj1412 <lji@research.att.com> 2017-02-14 15:12:15 +0000
committer: lj1412 <lji@research.att.com> 2017-02-14 15:12:17 +0000
commit: f80e6a127d51d68ff6c77196767ea8ea10e73243 (patch)
tree: 4d0cf0ec81578cedcf196940730685f2bbf28870
parent: 055adf10fbc9893772f4d799c5af053fe098e144 (diff)
135 files changed, 3439 insertions, 0 deletions
diff --git a/.gitreview b/.gitreview
new file mode 100644
index 0000000..5c146fc
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,4 @@
+[gerrit]
+host=gerrit.openecomp.org
+port=29418
+project=dcae/demo.git
diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 0000000..30471b5
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,22 @@
+
+/*-
+ * ============LICENSE_START==========================================
+ * OPENECOMP - DCAE
+ * ===================================================================
+ * 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============================================
+ */
+	
+ECOMP and OpenECOMP are trademarks and service marks of AT&T Intellectual Property.
diff --git a/OPENECOMP-DEMO-RACKSPACE/.project b/OPENECOMP-DEMO-RACKSPACE/.project
new file mode 100644
index 0000000..26d9e0b
--- /dev/null
+++ b/OPENECOMP-DEMO-RACKSPACE/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>OPENECOMP-DEMO-RACKSPACE</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/OPENECOMP-DEMO-RACKSPACE/LICENSE.txt b/OPENECOMP-DEMO-RACKSPACE/LICENSE.txt
new file mode 100644
index 0000000..30471b5
--- /dev/null
+++ b/OPENECOMP-DEMO-RACKSPACE/LICENSE.txt
@@ -0,0 +1,22 @@
+
+/*-
+ * ============LICENSE_START==========================================
+ * OPENECOMP - DCAE
+ * ===================================================================
+ * 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============================================
+ */
+	
+ECOMP and OpenECOMP are trademarks and service marks of AT&T Intellectual Property.
diff --git a/OPENECOMP-DEMO-RACKSPACE/certificates/passwords.yaml b/OPENECOMP-DEMO-RACKSPACE/certificates/passwords.yaml
new file mode 100644
index 0000000..139597f
--- /dev/null
+++ b/OPENECOMP-DEMO-RACKSPACE/certificates/passwords.yaml
@@ -0,0 +1,2 @@
+
+
diff --git a/OPENECOMP-DEMO-RACKSPACE/config/openstack.properties b/OPENECOMP-DEMO-RACKSPACE/config/openstack.properties
new file mode 100644
index 0000000..6a9eae2
--- /dev/null
+++ b/OPENECOMP-DEMO-RACKSPACE/config/openstack.properties
@@ -0,0 +1,4 @@
+@{ZONE}.password.@{OPENSTACK-USER} = @{OPENSTACK-PASSWORD}
+serverCreationTimeout = 1800
+server.debug = true
+pollingFrequency = 300000
diff --git a/OPENECOMP-DEMO-RACKSPACE/env.yaml b/OPENECOMP-DEMO-RACKSPACE/env.yaml
new file mode 100644
index 0000000..20a5b75
--- /dev/null
+++ b/OPENECOMP-DEMO-RACKSPACE/env.yaml
@@ -0,0 +1,50 @@
+
+dns:
+  service-suffix: dcae.simpledemo.openecomp.org
+
+passwords:
+  postgres: 
+    dmaap: 
+      admin: test234-ftl
+      user: test234-ftlu
+      viewer: test234-ftlv
+    
+streams:
+  cdap-tca-hi-lo:
+    event-input:
+      hostname: xxxx.openecomp.org
+      username: m00001@dcae.openecomp.org
+      userpassword: foobar
+
+vm-templates:
+  default: 
+    admin-users: [ "@{OPENSTACK-KEYNAME}" ]
+    users: [ "@{OPENSTACK-KEYNAME}"]
+  vm-postgresql:
+    admin-users: [ "@{OPENSTACK-KEYNAME}" ]
+    users: [ "@{OPENSTACK-KEYNAME}" ]
+    PGAASMASTER: zldc@{ZONE}@{STATE}pstg00
+    PGAASMASTER2: notused
+
+open-ecomp-demo:    
+  zone: "@{ZONE}"
+  git:
+    mr-repo: "@{GIT-MR-REPO}"
+  maven:
+    user: "@{NEXUS-USER}"
+    password: "@{NEXUS-PASSWORD}"  
+    rawurl: "@{NEXUS-RAWURL}"
+  docker:
+    registry: "@{DOCKER-REGISTRY}"
+    user: "@{NEXUS-USER}"
+    password: "@{NEXUS-PASSWORD}"  
+  versions:
+    controller: "@{DCAE-VERSION}"
+    apod: 1.0.0
+    postgres: 1.0.0-LATEST
+    databus-controller: 1.0.0
+    collector: 1.0.0
+    
+users:
+  "@{OPENSTACK-KEYNAME}":
+     publicKey: "@{OPENSTACK-PUBKEY}"
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO-RACKSPACE/hosts b/OPENECOMP-DEMO-RACKSPACE/hosts
new file mode 100644
index 0000000..6d31447
--- /dev/null
+++ b/OPENECOMP-DEMO-RACKSPACE/hosts
@@ -0,0 +1,7 @@
+10.0.4.1   zldc@{ZONE}@{STATE}cont00.dcae.simpledemo.openecomp.org cont00 zldc@{ZONE}@{STATE}cont00 
+10.0.4.101 zldc@{ZONE}@{STATE}pstg00.dcae.simpledemo.openecomp.org pstg00 zldc@{ZONE}@{STATE}pstg00
+10.0.4.102 zldc@{ZONE}@{STATE}coll00.dcae.simpledemo.openecomp.org coll00 zldc@{ZONE}@{STATE}coll00 dcae-coll-@{ZONE}.dcae.simpledemo.openecomp.org
+10.0.4.103 zldc@{ZONE}@{STATE}cdap00.dcae.simpledemo.openecomp.org cdap00 zldc@{ZONE}@{STATE}cdap00 
+10.0.4.104 zldc@{ZONE}@{STATE}cdap01.dcae.simpledemo.openecomp.org cdap01 zldc@{ZONE}@{STATE}cdap01
+10.0.4.105 zldc@{ZONE}@{STATE}cdap02.dcae.simpledemo.openecomp.org cdap02 zldc@{ZONE}@{STATE}cdap02
+@{POLICY-IP}   policy.api.simpledemo.openecomp.org
diff --git a/OPENECOMP-DEMO-RACKSPACE/ip-assignment.yaml b/OPENECOMP-DEMO-RACKSPACE/ip-assignment.yaml
new file mode 100644
index 0000000..6322099
--- /dev/null
+++ b/OPENECOMP-DEMO-RACKSPACE/ip-assignment.yaml
@@ -0,0 +1,13 @@
+
+### contains IP assignments VMs to floating ips
+
+
+zldc@{ZONE}@{STATE}cont00: 10.0.4.1
+zldc@{ZONE}@{STATE}pstg00: 10.0.4.101
+zldc@{ZONE}@{STATE}coll00: 10.0.4.102
+zldc@{ZONE}@{STATE}cdap00: 10.0.4.103
+zldc@{ZONE}@{STATE}cdap01: 10.0.4.104
+zldc@{ZONE}@{STATE}cdap02: 10.0.4.105
+zldc@{ZONE}@{STATE}dmpb00: 10.0.4.106
+zldc@{ZONE}@{STATE}dbcl00: 10.0.4.107
+zldc@{ZONE}@{STATE}drps00: 10.0.4.108
diff --git a/OPENECOMP-DEMO-RACKSPACE/maven.yaml b/OPENECOMP-DEMO-RACKSPACE/maven.yaml
new file mode 100644
index 0000000..692ac1d
--- /dev/null
+++ b/OPENECOMP-DEMO-RACKSPACE/maven.yaml
@@ -0,0 +1,60 @@
+
+
+settings:
+  destination: /tmp/settings.xml
+  content: '
+    <?xml version="1.0" encoding="UTF-8"?>
+    <settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+    	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    	xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+    	<profiles>
+    		<profile>
+    			<id>open-ecomp</id>
+    			<activation>
+    				<activeByDefault>true</activeByDefault>
+    			</activation>
+    			<repositories>
+    				<repository>
+    					<id>osecomp-nexus-snapshots</id>
+    					<name>OSECOMP Snapshot Repository</name>
+    					<url>@{NEXUS-URL-SNAPSHOTS}</url>
+    				</repository>
+    				<repository>
+    					<id>eclipse</id>
+    					<url>https://repo.eclipse.org/content/repositories/releases</url>
+    					<releases>
+    						<enabled>true</enabled>
+    						<updatePolicy>daily</updatePolicy>
+    					</releases>
+    					<snapshots>
+    						<enabled>false</enabled>
+    					</snapshots>
+    				</repository>
+    			</repositories>
+    		</profile>
+    
+    	</profiles>
+    
+    	<activeProfiles>
+    	
+    		<activeProfile>open-ecomp</activeProfile>
+    		
+    	</activeProfiles>
+    
+    	<servers>
+    	
+    		<server>
+    			<id>osecomp-nexus</id>
+    			<username>@{NEXUS-USER}</username>
+    			<password>@{NEXUS-PASSWORD}</password>
+    		</server>
+    		
+    		<server>
+    			<id>osecomp-nexus-snapshots</id>
+    			<username>@{NEXUS-USER}</username>
+    			<password>@{NEXUS-PASSWORD}</password>
+    		</server>
+    		
+    	</servers>
+    </settings>'
+  
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO-RACKSPACE/ssl.yaml b/OPENECOMP-DEMO-RACKSPACE/ssl.yaml
new file mode 100644
index 0000000..82a7e65
--- /dev/null
+++ b/OPENECOMP-DEMO-RACKSPACE/ssl.yaml
@@ -0,0 +1,42 @@
+
+certificates:
+  ecomp-nexus:
+    destination: /tmp/ecomp-nexus.crt
+    content: >
+      -----BEGIN CERTIFICATE-----
+      
+      MIIDtzCCAp+gAwIBAgIEet16RjANBgkqhkiG9w0BAQsFADB2MQswCQYDVQQGEwJVUzEUMBIGA1UE
+      
+      CBMLVW5zcGVjaWZpZWQxFDASBgNVBAcTC1Vuc3BlY2lmaWVkMREwDwYDVQQKEwhTb25hdHlwZTEQ
+      
+      MA4GA1UECxMHRXhhbXBsZTEWMBQGA1UEAwwNKi5lY29tcC1uZXh1czAeFw0xNjExMTQxMDE5NDJa
+      
+      Fw0zMDA3MjQxMDE5NDJaMHYxCzAJBgNVBAYTAlVTMRQwEgYDVQQIEwtVbnNwZWNpZmllZDEUMBIG
+      
+      A1UEBxMLVW5zcGVjaWZpZWQxETAPBgNVBAoTCFNvbmF0eXBlMRAwDgYDVQQLEwdFeGFtcGxlMRYw
+      
+      FAYDVQQDDA0qLmVjb21wLW5leHVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqkDu
+      
+      vC91cZxOaRMYGHSyDeuw4hyXjqyD5Etl5L5TNN7+uFKEtvXsRYOxtD62TqWHKozffLE5o6zoRZL4
+      
+      8qNTQyAx0LaEfWfR2w0jat+UqtqEtW0xpOD0/O0qRq5Y/XG3Yr8SQ/y84Pr1FIflM7pM4PZTt3kc
+      
+      UfqzbaONW5K8t+UG+5jgNXdRk3hln8WMunVZeci0J6TV+tWs9tOeAKBdpI7K7LV+FJBaF8vBAw2x
+      
+      8AhlNPXKQUhK+M3DD73c1aLWrZ3mIwJXt2oQUDwgtXGCPR1/Z9f2tTAoDxpzvkwtP/BtH3qvgtpY
+      
+      QfDNmWbJVHh6ll39Hapt7V0v4aCRSN21ZQIDAQABo00wSzAMBgNVHRMEBTADAQH/MBwGA1UdEQQV
+      
+      MBOCC2Vjb21wLW5leHVzhwQK0MVLMB0GA1UdDgQWBBQxcUlk/lkKkwSz0GuewbXptJxl+zANBgkq
+      
+      hkiG9w0BAQsFAAOCAQEAPnNbtdreMZaUSjv+1eqpriLKquwnZhnwWENn1u3sw4hTAWQc+ehhogGg
+      
+      eIqPN81Dt3jhr0bYZW+r3gGq7tgrLxdSXso8bTtqHsFLszirgWcQXDlBQGnw9wqp/KBzeDJInJep
+      
+      d6aGu3yBXV6459S/mClxZTSvsR+Vz3rRWxx01R3/ft5/myqrRMDnEncqPopTbEamBuUJL3eJDpFO
+      
+      xlVqYR3y6AXwwguMaTiHMfFBmDOVaz4K8Qy6AaHH9eoch9fxOJ/7ASvqSwkC9GYTJSnF2vE37rmH
+      
+      kPp//Vm4WSnQ2NrBGkH9rUUdYdDdgWJYnTeZ+YFd8J6z9xNiEn9QKQNNcA==
+      
+      -----END CERTIFICATE-----
diff --git a/OPENECOMP-DEMO-RACKSPACE/tenants.yaml b/OPENECOMP-DEMO-RACKSPACE/tenants.yaml
new file mode 100644
index 0000000..d2f3583
--- /dev/null
+++ b/OPENECOMP-DEMO-RACKSPACE/tenants.yaml
@@ -0,0 +1,22 @@
+
+
+
+"@{ZONE}":
+  description: Rackspace Opensource Demo Tenant
+  type: demo
+  name-short: "@{ZONE}@{STATE}"
+  dns-surfix: dcae.simpledemo.openecomp.org
+  openstack:
+    horizon-url: "@{HORIZON-URL}"
+    keystone-url: "@{KEYSTONE-URL}"
+    version: Juno
+    supports-security-groups: false
+    supports-floating-ips: false
+    tenant:
+      name: "@{OPENSTACK-TENANT-NAME}"
+      tenant-id: "@{OPENSTACK-TENANT-ID}"
+      region: "@{OPENSTACK-REGION}"
+      public-network: 00000000-0000-0000-0000-000000000000
+      private-network: "@{OPENSTACK-PRIVATE-NETWORK}"
+      admin-user: "@{OPENSTACK-USER}"
+      api-key: "@{OPENSTACK-PASSWORD}"
diff --git a/OPENECOMP-DEMO-RACKSPACE/vm-config/vm-cdap-cluster/hosts b/OPENECOMP-DEMO-RACKSPACE/vm-config/vm-cdap-cluster/hosts
new file mode 100644
index 0000000..8352252
--- /dev/null
+++ b/OPENECOMP-DEMO-RACKSPACE/vm-config/vm-cdap-cluster/hosts
@@ -0,0 +1,11 @@
+10.0.4.1   zldc@{ZONE}@{STATE}cont00.dcae.simpledemo.openecomp.org cont00 zldc@{ZONE}@{STATE}cont00 
+
+10.0.4.101 zldc@{ZONE}@{STATE}pstg00.dcae.simpledemo.openecomp.org pstg00 zldc@{ZONE}@{STATE}pstg00
+
+10.0.4.102 zldc@{ZONE}@{STATE}coll00.dcae.simpledemo.openecomp.org coll00 zldc@{ZONE}@{STATE}coll00 dcae-coll-@{ZONE}.dcae.simpledemo.openecomp.org
+
+10.0.4.103 zldc@{ZONE}@{STATE}cdap00.dcae.simpledemo.openecomp.org cdap00 zldc@{ZONE}@{STATE}cdap00 
+
+10.0.4.104 zldc@{ZONE}@{STATE}cdap01.dcae.simpledemo.openecomp.org cdap01 zldc@{ZONE}@{STATE}cdap01
+
+10.0.4.105 zldc@{ZONE}@{STATE}cdap02.dcae.simpledemo.openecomp.org cdap02 zldc@{ZONE}@{STATE}cdap02
diff --git a/OPENECOMP-DEMO-RACKSPACE/vm-config/vm-docker-host/hosts b/OPENECOMP-DEMO-RACKSPACE/vm-config/vm-docker-host/hosts
new file mode 100644
index 0000000..8352252
--- /dev/null
+++ b/OPENECOMP-DEMO-RACKSPACE/vm-config/vm-docker-host/hosts
@@ -0,0 +1,11 @@
+10.0.4.1   zldc@{ZONE}@{STATE}cont00.dcae.simpledemo.openecomp.org cont00 zldc@{ZONE}@{STATE}cont00 
+
+10.0.4.101 zldc@{ZONE}@{STATE}pstg00.dcae.simpledemo.openecomp.org pstg00 zldc@{ZONE}@{STATE}pstg00
+
+10.0.4.102 zldc@{ZONE}@{STATE}coll00.dcae.simpledemo.openecomp.org coll00 zldc@{ZONE}@{STATE}coll00 dcae-coll-@{ZONE}.dcae.simpledemo.openecomp.org
+
+10.0.4.103 zldc@{ZONE}@{STATE}cdap00.dcae.simpledemo.openecomp.org cdap00 zldc@{ZONE}@{STATE}cdap00 
+
+10.0.4.104 zldc@{ZONE}@{STATE}cdap01.dcae.simpledemo.openecomp.org cdap01 zldc@{ZONE}@{STATE}cdap01
+
+10.0.4.105 zldc@{ZONE}@{STATE}cdap02.dcae.simpledemo.openecomp.org cdap02 zldc@{ZONE}@{STATE}cdap02
diff --git a/OPENECOMP-DEMO-RACKSPACE/vm-config/vm-postgresql/hosts b/OPENECOMP-DEMO-RACKSPACE/vm-config/vm-postgresql/hosts
new file mode 100644
index 0000000..8352252
--- /dev/null
+++ b/OPENECOMP-DEMO-RACKSPACE/vm-config/vm-postgresql/hosts
@@ -0,0 +1,11 @@
+10.0.4.1   zldc@{ZONE}@{STATE}cont00.dcae.simpledemo.openecomp.org cont00 zldc@{ZONE}@{STATE}cont00 
+
+10.0.4.101 zldc@{ZONE}@{STATE}pstg00.dcae.simpledemo.openecomp.org pstg00 zldc@{ZONE}@{STATE}pstg00
+
+10.0.4.102 zldc@{ZONE}@{STATE}coll00.dcae.simpledemo.openecomp.org coll00 zldc@{ZONE}@{STATE}coll00 dcae-coll-@{ZONE}.dcae.simpledemo.openecomp.org
+
+10.0.4.103 zldc@{ZONE}@{STATE}cdap00.dcae.simpledemo.openecomp.org cdap00 zldc@{ZONE}@{STATE}cdap00 
+
+10.0.4.104 zldc@{ZONE}@{STATE}cdap01.dcae.simpledemo.openecomp.org cdap01 zldc@{ZONE}@{STATE}cdap01
+
+10.0.4.105 zldc@{ZONE}@{STATE}cdap02.dcae.simpledemo.openecomp.org cdap02 zldc@{ZONE}@{STATE}cdap02
diff --git a/OPENECOMP-DEMO/.project b/OPENECOMP-DEMO/.project
new file mode 100644
index 0000000..fbaa594
--- /dev/null
+++ b/OPENECOMP-DEMO/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>OPENECOMP-DEMO</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/OPENECOMP-DEMO/LICENSE.txt b/OPENECOMP-DEMO/LICENSE.txt
new file mode 100644
index 0000000..30471b5
--- /dev/null
+++ b/OPENECOMP-DEMO/LICENSE.txt
@@ -0,0 +1,22 @@
+
+/*-
+ * ============LICENSE_START==========================================
+ * OPENECOMP - DCAE
+ * ===================================================================
+ * 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============================================
+ */
+	
+ECOMP and OpenECOMP are trademarks and service marks of AT&T Intellectual Property.
diff --git a/OPENECOMP-DEMO/cdap-descriptors/cdap-helloworld.json b/OPENECOMP-DEMO/cdap-descriptors/cdap-helloworld.json
new file mode 100644
index 0000000..c5b5e7d
--- /dev/null
+++ b/OPENECOMP-DEMO/cdap-descriptors/cdap-helloworld.json
@@ -0,0 +1,7 @@
+{
+  $class : "org.openecomp.dcae.controller.service.cdap.CdapServiceDescriptor",
+  groupId : "org.openecomp.dcae.controller",
+  servicePackage : "org.openecomp.dcae.controller.service.cdap",
+  serviceClass : "CdapService",
+  serviceInstanceClass : "CdapServiceInstance",
+}
diff --git a/OPENECOMP-DEMO/cdap-descriptors/cdap-tca-hi-lo.json b/OPENECOMP-DEMO/cdap-descriptors/cdap-tca-hi-lo.json
new file mode 100644
index 0000000..c5b5e7d
--- /dev/null
+++ b/OPENECOMP-DEMO/cdap-descriptors/cdap-tca-hi-lo.json
@@ -0,0 +1,7 @@
+{
+  $class : "org.openecomp.dcae.controller.service.cdap.CdapServiceDescriptor",
+  groupId : "org.openecomp.dcae.controller",
+  servicePackage : "org.openecomp.dcae.controller.service.cdap",
+  serviceClass : "CdapService",
+  serviceInstanceClass : "CdapServiceInstance",
+}
diff --git a/OPENECOMP-DEMO/cdap-templates/cdap-helloworld.yaml b/OPENECOMP-DEMO/cdap-templates/cdap-helloworld.yaml
new file mode 100644
index 0000000..f1c02b9
--- /dev/null
+++ b/OPENECOMP-DEMO/cdap-templates/cdap-helloworld.yaml
@@ -0,0 +1,15 @@
+controller-instance-configuration:
+  $class: org.openecomp.dcae.controller.service.cdap.CdapServiceInstance
+  namespace: HelloWorld
+  appNames:
+  - HelloWorld
+  flowNames:
+  - HelloWorld.WhoFlow
+  serviceNames:
+  - HelloWorld.Greeting
+  version: '3.5.1'
+  apps:
+    HelloWorld:
+      jarFile: /opt/app/cask-hello-world/lib/HelloWorld-3.5.1.jar
+      artifactName: HelloWorld
+      version: 3.5.1
diff --git a/OPENECOMP-DEMO/cdap-templates/cdap-tca-hi-lo.yaml b/OPENECOMP-DEMO/cdap-templates/cdap-tca-hi-lo.yaml
new file mode 100644
index 0000000..5642842
--- /dev/null
+++ b/OPENECOMP-DEMO/cdap-templates/cdap-tca-hi-lo.yaml
@@ -0,0 +1,82 @@
+controller-instance-configuration:
+  $class: org.openecomp.dcae.controller.service.cdap.CdapServiceInstance
+  namespace: TCA
+  appNames:
+  - dcae-tca
+  flowNames:
+  - dcae-tca.TCAVESCollectorFlow
+  workerNames:
+  - dcae-tca.TCADMaaPMRSubscriberWorker
+  - dcae-tca.TCADMaaPMRPublisherWorker
+  serviceNames: []
+  artifacts: {
+    }
+  apps: 
+    dcae-tca:
+        jarFile: /opt/app/cdap-apps/dcae-analytics-tca-1.0.0.jar
+        artifactName: dcae-analytics-tca
+        version: 1.0.0
+        appConfigFileContent: '{config:{
+          "appName":"dcae-tca",
+          "appDescription":"DCAE Analytics Threshold Crossing Alert Application",
+          "tcaSubscriberOutputStreamName":"TCASubscriberOutputStream",
+          "thresholdCalculatorFlowletInstances":2,
+          "tcaVESMessageStatusTableName":"TCAVESMessageStatusTable",
+          "tcaVESMessageStatusTableTTLSeconds":864000,
+          "tcaVESAlertsTableName":"TCAVESAlertsTable",
+          "tcaVESAlertsTableTTLSeconds":1728000
+    }}'
+  configuration:
+    $class: org.openecomp.dcae.analytics.cdap.common.TcaConfiguration
+    subscriberContentType: 'application/json'
+    subscriberConsumerId: 'c12'
+    subscriberConsumerGroup: 'OpenDCAE-c12'
+    subscriberTimeoutMS: -1
+    subscriberMessageLimit: -1
+    subscriberPollingInterval: 20000
+    publisherContentType: 'application/json'
+    publisherMaxBatchSize: 10
+    publisherMaxRecoveryQueueSize: 100000
+    publisherPollingInterval: 20000
+    domain: measurementsForVfScaling
+    metricsPerFunctionalRole:
+      vFirewall:
+        "functionalRole": "vFirewall"
+        "policyScope": "resource=vFirewall;type=configuration"
+        "policyName": "configuration.dcae.microservice.tca.xml"
+        "policyVersion": "v0.0.1"
+        thresholds:
+          '0' :
+            "closedLoopControlName": "CL-FRWL-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8"
+            "version": "1.0.2"
+            "fieldPath": "\\$.event.measurementsForVfScalingFields.vNicUsageArray[*].bytesIn"
+            "thresholdValue": 4000
+            "direction": "LESS_OR_EQUAL"
+            "severity": "MAJOR"
+          '1' :
+            "closedLoopControlName": "CL-FRWL-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8"
+            "version": "1.0.2"
+            "fieldPath": "\\$.event.measurementsForVfScalingFields.vNicUsageArray[*].bytesIn"
+            "thresholdValue": 4000
+            "direction": "LESS_OR_EQUAL"
+            "severity": "MAJOR"
+      vLoadBalancer:
+        "functionalRole": "vLoadBalancer"
+        "policyScope": "resource=vLoadBalancer;type=configuration"
+        "policyName": "configuration.dcae.microservice.tca.xml"
+        "policyVersion": "v0.0.1"              
+        thresholds:
+          '0' :
+            "closedLoopControlName": "CL-LBAL-LOW-TRAFFIC-SIG-FB480F95-A453-6F24-B767-FD703241AB1A"
+            "version": "1.0.2"
+            "fieldPath": "\\$.event.measurementsForVfScalingFields.vNicUsageArray[*].packetsIn"
+            "thresholdValue": 500
+            "direction": "LESS_OR_EQUAL"
+            "severity": "MAJOR"
+          '1' :
+            "closedLoopControlName": "CL-LBAL-LOW-TRAFFIC-SIG-0C5920A6-B564-8035-C878-0E814352BC2B"
+            "version": "1.0.2"
+            "fieldPath": "\\$.event.measurementsForVfScalingFields.vNicUsageArray[*].packetsIn"
+            "thresholdValue": 5000
+            "direction": "GREATER_OR_EQUAL"
+            "severity": "CRITICAL"
diff --git a/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/DataDepotRealtimeTable1Hour.json b/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/DataDepotRealtimeTable1Hour.json
new file mode 100644
index 0000000..1c29c8e
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/DataDepotRealtimeTable1Hour.json
@@ -0,0 +1,7 @@
+{"alerts": {"1hourDelay": {
+  "$class": "org.openecomp.ncomp.core.alerts.ThresholdAlert",
+  "operationalState": "OPERATIONAL",
+  "severity": "SEV1",
+  "metricName": "timestampOfNewestPartition",
+  "upperBound": "3600000.0"
+}}}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/DataDepotRealtimeTable6Hour.json b/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/DataDepotRealtimeTable6Hour.json
new file mode 100644
index 0000000..b678471
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/DataDepotRealtimeTable6Hour.json
@@ -0,0 +1,7 @@
+{"alerts": {"6hourDelay": {
+  "$class": "org.openecomp.ncomp.core.alerts.ThresholdAlert",
+  "operationalState": "OPERATIONAL",
+  "severity": "SEV2",
+  "metricName": "timestampOfNewestPartition",
+  "upperBound": "2.16E7"
+}}}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/DataDepotTable12Hour.json b/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/DataDepotTable12Hour.json
new file mode 100644
index 0000000..4ad25b6
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/DataDepotTable12Hour.json
@@ -0,0 +1,7 @@
+{"alerts": {"12hourDelay": {
+  "$class": "org.openecomp.ncomp.core.alerts.ThresholdAlert",
+  "operationalState": "OPERATIONAL",
+  "severity": "SEV1",
+  "metricName": "timestampOfNewestPartition",
+  "upperBound": "4.32E7"
+}}}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/DataDepotTable1Day.json b/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/DataDepotTable1Day.json
new file mode 100644
index 0000000..a38eb54
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/DataDepotTable1Day.json
@@ -0,0 +1,7 @@
+{"alerts": {"1DayDelay": {
+  "$class": "org.openecomp.ncomp.core.alerts.ThresholdAlert",
+  "operationalState": "OPERATIONAL",
+  "severity": "SEV1",
+  "metricName": "timestampOfNewestPartition",
+  "upperBound": "8.64E7"
+}}}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/DataDepotTable1Hour.json b/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/DataDepotTable1Hour.json
new file mode 100644
index 0000000..1c29c8e
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/DataDepotTable1Hour.json
@@ -0,0 +1,7 @@
+{"alerts": {"1hourDelay": {
+  "$class": "org.openecomp.ncomp.core.alerts.ThresholdAlert",
+  "operationalState": "OPERATIONAL",
+  "severity": "SEV1",
+  "metricName": "timestampOfNewestPartition",
+  "upperBound": "3600000.0"
+}}}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/DataDepotTable2Day.json b/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/DataDepotTable2Day.json
new file mode 100644
index 0000000..f938582
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/DataDepotTable2Day.json
@@ -0,0 +1,7 @@
+{"alerts": {"2DayDelay": {
+  "$class": "org.openecomp.ncomp.core.alerts.ThresholdAlert",
+  "operationalState": "OPERATIONAL",
+  "severity": "SEV1",
+  "metricName": "timestampOfNewestPartition",
+  "upperBound": "1.728E8"
+}}}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/DataDepotTable2Hour.json b/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/DataDepotTable2Hour.json
new file mode 100644
index 0000000..54d06bb
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/DataDepotTable2Hour.json
@@ -0,0 +1,7 @@
+{"alerts": {"2hourDelay": {
+  "$class": "org.openecomp.ncomp.core.alerts.ThresholdAlert",
+  "operationalState": "OPERATIONAL",
+  "severity": "SEV1",
+  "metricName": "timestampOfNewestPartition",
+  "upperBound": "7200000.0"
+}}}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/DataDepotTable4Day.json b/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/DataDepotTable4Day.json
new file mode 100644
index 0000000..9f03b6b
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/DataDepotTable4Day.json
@@ -0,0 +1,7 @@
+{"alerts": {"4DayDelay": {
+  "$class": "org.openecomp.ncomp.core.alerts.ThresholdAlert",
+  "operationalState": "OPERATIONAL",
+  "severity": "SEV1",
+  "metricName": "timestampOfNewestPartition",
+  "upperBound": "3.456E8"
+}}}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/DataDepotTable4Hour.json b/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/DataDepotTable4Hour.json
new file mode 100644
index 0000000..a2d92fe
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/DataDepotTable4Hour.json
@@ -0,0 +1,7 @@
+{"alerts": {"4hourDelay": {
+  "$class": "org.openecomp.ncomp.core.alerts.ThresholdAlert",
+  "operationalState": "OPERATIONAL",
+  "severity": "SEV1",
+  "metricName": "timestampOfNewestPartition",
+  "upperBound": "1.44E7"
+}}}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/DataDepotTable6Hour.json b/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/DataDepotTable6Hour.json
new file mode 100644
index 0000000..6d20e24
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/DataDepotTable6Hour.json
@@ -0,0 +1,7 @@
+{"alerts": {"6hourDelay": {
+  "$class": "org.openecomp.ncomp.core.alerts.ThresholdAlert",
+  "operationalState": "OPERATIONAL",
+  "severity": "SEV1",
+  "metricName": "timestampOfNewestPartition",
+  "upperBound": "2.16E7"
+}}}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/DataDepotTable7Day.json b/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/DataDepotTable7Day.json
new file mode 100644
index 0000000..69dd966
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/DataDepotTable7Day.json
@@ -0,0 +1,7 @@
+{"alerts": {"7DayDelay": {
+  "$class": "org.openecomp.ncomp.core.alerts.ThresholdAlert",
+  "operationalState": "OPERATIONAL",
+  "severity": "SEV1",
+  "metricName": "timestampOfNewestPartition",
+  "upperBound": "6.048E8"
+}}}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/DataDepotTable8Hour.json b/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/DataDepotTable8Hour.json
new file mode 100644
index 0000000..e09b0f4
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/DataDepotTable8Hour.json
@@ -0,0 +1,7 @@
+{"alerts": {"8hourDelay": {
+  "$class": "org.openecomp.ncomp.core.alerts.ThresholdAlert",
+  "operationalState": "OPERATIONAL",
+  "severity": "SEV1",
+  "metricName": "timestampOfNewestPartition",
+  "upperBound": "2.88E7"
+}}}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/Qfs80Percent.json b/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/Qfs80Percent.json
new file mode 100644
index 0000000..9a1fc9b
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/Qfs80Percent.json
@@ -0,0 +1,16 @@
+{"alerts": {
+  "80PercentUsage": {
+    "$class": "org.openecomp.ncomp.core.alerts.ThresholdAlert",
+    "operationalState": "OPERATIONAL",
+    "severity": "SEV1",
+    "metricName": "ddUsage",
+    "upperBound": "80.0"
+  },
+  "80PercentMetadataUsage": {
+    "$class": "org.openecomp.ncomp.core.alerts.ThresholdAlert",
+    "operationalState": "OPERATIONAL",
+    "severity": "SEV1",
+    "metricName": "mmUsage",
+    "upperBound": "80.0"
+  }
+}}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/QfsQuota95.json b/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/QfsQuota95.json
new file mode 100644
index 0000000..549b1cb
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/QfsQuota95.json
@@ -0,0 +1,16 @@
+{"alerts": {
+  "95PercentUsage": {
+    "$class": "org.openecomp.ncomp.core.alerts.ThresholdAlert",
+    "operationalState": "OPERATIONAL",
+    "severity": "SEV1",
+    "metricName": "dUsage",
+    "upperBound": "95.0"
+  },
+  "95PercentMetadataUsage": {
+    "$class": "org.openecomp.ncomp.core.alerts.ThresholdAlert",
+    "operationalState": "OPERATIONAL",
+    "severity": "SEV1",
+    "metricName": "fUsage",
+    "upperBound": "95.0"
+  }
+}}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/QfsQuotaStandard.json b/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/QfsQuotaStandard.json
new file mode 100644
index 0000000..bacd3cb
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/QfsQuotaStandard.json
@@ -0,0 +1,16 @@
+{"alerts": {
+  "90PercentUsage": {
+    "$class": "org.openecomp.ncomp.core.alerts.ThresholdAlert",
+    "operationalState": "OPERATIONAL",
+    "severity": "SEV1",
+    "metricName": "dUsage",
+    "upperBound": "90.0"
+  },
+  "90PercentMetadataUsage": {
+    "$class": "org.openecomp.ncomp.core.alerts.ThresholdAlert",
+    "operationalState": "OPERATIONAL",
+    "severity": "SEV1",
+    "metricName": "fUsage",
+    "upperBound": "90.0"
+  }
+}}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/QfsStandard.json b/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/QfsStandard.json
new file mode 100644
index 0000000..fb49e14
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/QfsStandard.json
@@ -0,0 +1,16 @@
+{"alerts": {
+  "95PercentUsage": {
+    "$class": "org.openecomp.ncomp.core.alerts.ThresholdAlert",
+    "operationalState": "OPERATIONAL",
+    "severity": "SEV1",
+    "metricName": "ddUsage",
+    "upperBound": "95.0"
+  },
+  "95PercentMetadataUsage": {
+    "$class": "org.openecomp.ncomp.core.alerts.ThresholdAlert",
+    "operationalState": "OPERATIONAL",
+    "severity": "SEV1",
+    "metricName": "mmUsage",
+    "upperBound": "95.0"
+  }
+}}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/ZfsStandard.json b/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/ZfsStandard.json
new file mode 100644
index 0000000..169d73e
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/ZfsStandard.json
@@ -0,0 +1,7 @@
+{"alerts": {"90PercentUsage": {
+  "$class": "org.openecomp.ncomp.core.alerts.ThresholdAlert",
+  "operationalState": "OPERATIONAL",
+  "severity": "SEV1",
+  "metricName": "usage",
+  "upperBound": "90.0"
+}}}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/none.json b/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/none.json
new file mode 100644
index 0000000..3bef753
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/alertTemplates/none.json
@@ -0,0 +1 @@
+{"alerts": {}}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/functions/QfsQuotaFunction.json b/OPENECOMP-DEMO/controller-template/configuration/functions/QfsQuotaFunction.json
new file mode 100644
index 0000000..a414c06
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/functions/QfsQuotaFunction.json
@@ -0,0 +1,71 @@
+{
+  "$class": "org.openecomp.ncomp.core.function.RuleFunction",
+  "rules": [
+    {
+      "matches": [{
+        "$class": "org.openecomp.ncomp.core.function.FunctionMatchAttribute",
+        "path": "/fQuota",
+        "match": "0",
+        "negation": "false"
+      }],
+      "action": {"value": "none"}
+    },
+    {
+      "matches": [{
+        "$class": "org.openecomp.ncomp.core.function.FunctionMatchAttribute",
+        "path": "/fQuota",
+        "match": "-1",
+        "negation": "false"
+      }],
+      "action": {"value": "none"}
+    },
+    {
+      "matches": [{
+        "$class": "org.openecomp.ncomp.core.function.FunctionMatchAttribute",
+        "path": "/fQuota",
+        "match": "2",
+        "negation": "false"
+      }],
+      "action": {"value": "none"}
+    },
+    {
+      "matches": [{
+        "$class": "org.openecomp.ncomp.core.function.FunctionMatchAttribute",
+        "path": "/fQuota",
+        "match": "4",
+        "negation": "false"
+      }],
+      "action": {"value": "none"}
+    },
+    {
+      "matches": [{
+        "$class": "org.openecomp.ncomp.core.function.FunctionMatchAttribute",
+        "path": "/name",
+        "match": "root",
+        "negation": "false"
+      }],
+      "action": {"value": "none"}
+    },
+    {
+      "matches": [
+        {
+          "$class": "org.openecomp.ncomp.core.function.FunctionMatchAttribute",
+          "path": "/name",
+          "match": "mint",
+          "negation": "false"
+        },
+        {
+          "$class": "org.openecomp.ncomp.core.function.FunctionMatchAttribute",
+          "path": "../name",
+          "match": "mobilityhome",
+          "negation": "false"
+        }
+      ],
+      "action": {"value": "QfsQuota95"}
+    },
+    {
+      "matches": [],
+      "action": {"value": "QfsQuotaStandard"}
+    }
+  ]
+}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/metricOptions/dailyAverage.json b/OPENECOMP-DEMO/controller-template/configuration/metricOptions/dailyAverage.json
new file mode 100644
index 0000000..2958993
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/metricOptions/dailyAverage.json
@@ -0,0 +1,11 @@
+{
+  "$class": "org.openecomp.ncomp.core.metrics.SequenceMetricValueOption",
+  "options": {
+    "basic": {"$class": "org.openecomp.ncomp.core.metrics.BasicMetricValueOption"},
+    "aggregation": {
+      "$class": "org.openecomp.ncomp.core.metrics.AggregationMetricValueOption",
+      "duration": "1day",
+      "aggregationType": "AVERAGE"
+    }
+  }
+}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/metricOptions/dailyCount.json b/OPENECOMP-DEMO/controller-template/configuration/metricOptions/dailyCount.json
new file mode 100644
index 0000000..87ac360
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/metricOptions/dailyCount.json
@@ -0,0 +1,11 @@
+{
+  "$class": "org.openecomp.ncomp.core.metrics.SequenceMetricValueOption",
+  "options": {
+    "basic": {"$class": "org.openecomp.ncomp.core.metrics.BasicMetricValueOption"},
+    "aggregation": {
+      "$class": "org.openecomp.ncomp.core.metrics.AggregationMetricValueOption",
+      "duration": "1day",
+      "aggregationType": "COUNT"
+    }
+  }
+}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/metricOptions/dailyMax.json b/OPENECOMP-DEMO/controller-template/configuration/metricOptions/dailyMax.json
new file mode 100644
index 0000000..e84b097
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/metricOptions/dailyMax.json
@@ -0,0 +1,11 @@
+{
+  "$class": "org.openecomp.ncomp.core.metrics.SequenceMetricValueOption",
+  "options": {
+    "basic": {"$class": "org.openecomp.ncomp.core.metrics.BasicMetricValueOption"},
+    "aggregation": {
+      "$class": "org.openecomp.ncomp.core.metrics.AggregationMetricValueOption",
+      "duration": "1day",
+      "aggregationType": "MAX"
+    }
+  }
+}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/metricOptions/dailyMin.json b/OPENECOMP-DEMO/controller-template/configuration/metricOptions/dailyMin.json
new file mode 100644
index 0000000..48977cb
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/metricOptions/dailyMin.json
@@ -0,0 +1,11 @@
+{
+  "$class": "org.openecomp.ncomp.core.metrics.SequenceMetricValueOption",
+  "options": {
+    "basic": {"$class": "org.openecomp.ncomp.core.metrics.BasicMetricValueOption"},
+    "aggregation": {
+      "$class": "org.openecomp.ncomp.core.metrics.AggregationMetricValueOption",
+      "duration": "1day",
+      "aggregationType": "MIN"
+    }
+  }
+}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/metricOptions/dailySum.json b/OPENECOMP-DEMO/controller-template/configuration/metricOptions/dailySum.json
new file mode 100644
index 0000000..5c4c25f
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/metricOptions/dailySum.json
@@ -0,0 +1,11 @@
+{
+  "$class": "org.openecomp.ncomp.core.metrics.SequenceMetricValueOption",
+  "options": {
+    "basic": {"$class": "org.openecomp.ncomp.core.metrics.BasicMetricValueOption"},
+    "aggregation": {
+      "$class": "org.openecomp.ncomp.core.metrics.AggregationMetricValueOption",
+      "duration": "1day",
+      "aggregationType": "SUM"
+    }
+  }
+}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/metricOptions/default.json b/OPENECOMP-DEMO/controller-template/configuration/metricOptions/default.json
new file mode 100644
index 0000000..939d886
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/metricOptions/default.json
@@ -0,0 +1,4 @@
+{
+  "$class": "org.openecomp.ncomp.core.metrics.SequenceMetricValueOption",
+  "options": {"basic": {"$class": "org.openecomp.ncomp.core.metrics.BasicMetricValueOption"}}
+}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/metricOptions/hourlyAverage.json b/OPENECOMP-DEMO/controller-template/configuration/metricOptions/hourlyAverage.json
new file mode 100644
index 0000000..bd97ab0
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/metricOptions/hourlyAverage.json
@@ -0,0 +1,11 @@
+{
+  "$class": "org.openecomp.ncomp.core.metrics.SequenceMetricValueOption",
+  "options": {
+    "basic": {"$class": "org.openecomp.ncomp.core.metrics.BasicMetricValueOption"},
+    "aggregation": {
+      "$class": "org.openecomp.ncomp.core.metrics.AggregationMetricValueOption",
+      "duration": "1hour",
+      "aggregationType": "AVERAGE"
+    }
+  }
+}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/metricOptions/hourlyCount.json b/OPENECOMP-DEMO/controller-template/configuration/metricOptions/hourlyCount.json
new file mode 100644
index 0000000..f947a96
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/metricOptions/hourlyCount.json
@@ -0,0 +1,11 @@
+{
+  "$class": "org.openecomp.ncomp.core.metrics.SequenceMetricValueOption",
+  "options": {
+    "basic": {"$class": "org.openecomp.ncomp.core.metrics.BasicMetricValueOption"},
+    "aggregation": {
+      "$class": "org.openecomp.ncomp.core.metrics.AggregationMetricValueOption",
+      "duration": "1hour",
+      "aggregationType": "COUNT"
+    }
+  }
+}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/metricOptions/hourlyMax.json b/OPENECOMP-DEMO/controller-template/configuration/metricOptions/hourlyMax.json
new file mode 100644
index 0000000..ed72260
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/metricOptions/hourlyMax.json
@@ -0,0 +1,11 @@
+{
+  "$class": "org.openecomp.ncomp.core.metrics.SequenceMetricValueOption",
+  "options": {
+    "basic": {"$class": "org.openecomp.ncomp.core.metrics.BasicMetricValueOption"},
+    "aggregation": {
+      "$class": "org.openecomp.ncomp.core.metrics.AggregationMetricValueOption",
+      "duration": "1hour",
+      "aggregationType": "MAX"
+    }
+  }
+}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/metricOptions/hourlyMin.json b/OPENECOMP-DEMO/controller-template/configuration/metricOptions/hourlyMin.json
new file mode 100644
index 0000000..76ea00a
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/metricOptions/hourlyMin.json
@@ -0,0 +1,11 @@
+{
+  "$class": "org.openecomp.ncomp.core.metrics.SequenceMetricValueOption",
+  "options": {
+    "basic": {"$class": "org.openecomp.ncomp.core.metrics.BasicMetricValueOption"},
+    "aggregation": {
+      "$class": "org.openecomp.ncomp.core.metrics.AggregationMetricValueOption",
+      "duration": "1hour",
+      "aggregationType": "MIN"
+    }
+  }
+}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/metricOptions/hourlySum.json b/OPENECOMP-DEMO/controller-template/configuration/metricOptions/hourlySum.json
new file mode 100644
index 0000000..dcdfed2
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/metricOptions/hourlySum.json
@@ -0,0 +1,11 @@
+{
+  "$class": "org.openecomp.ncomp.core.metrics.SequenceMetricValueOption",
+  "options": {
+    "basic": {"$class": "org.openecomp.ncomp.core.metrics.BasicMetricValueOption"},
+    "aggregation": {
+      "$class": "org.openecomp.ncomp.core.metrics.AggregationMetricValueOption",
+      "duration": "1hour",
+      "aggregationType": "SUM"
+    }
+  }
+}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/rules/Authorization_Error.json b/OPENECOMP-DEMO/controller-template/configuration/rules/Authorization_Error.json
new file mode 100644
index 0000000..7d6eaeb
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/rules/Authorization_Error.json
@@ -0,0 +1,8 @@
+{
+  "messageFilter": ".*Authorization: bad PW.*",
+  "level": "UNKNOWN",
+  "severity": "UNKNOWN",
+  "newLevel": "UNKNOWN",
+  "newSeverity": "SEV1",
+  "disabled": "false"
+}
diff --git a/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/cdap-apps.json b/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/cdap-apps.json
new file mode 100644
index 0000000..40a28b4
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/cdap-apps.json
@@ -0,0 +1,36 @@
+{
+  "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplate",
+  "treePath": "/",
+  "tablePath": "/reports/dcae/cdap-apps",
+  "rowPath": "/services/cdap.*/instances/.*/apps/.*",
+  "columns": {
+    "service": {
+      "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateAttributeColumn",
+      "path": "../../name"
+    },
+    "instance": {
+      "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateAttributeColumn",
+      "path": "../name"
+    },
+    "name": {
+      "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateAttributeColumn",
+      "path": "/name"
+    },
+    "artifactName": {
+      "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateAttributeColumn",
+      "path": "/artifactName"
+    },
+    "version": {
+      "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateAttributeColumn",
+      "path": "/version"
+    },
+    "jarFile": {
+      "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateAttributeColumn",
+      "path": "/jarFile"
+    },
+    "appConfig": {
+      "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateAttributeColumn",
+      "path": "/appConfigFileContent"
+    },  
+  }
+}
diff --git a/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/cdap-artifacts.json b/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/cdap-artifacts.json
new file mode 100644
index 0000000..66c01db
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/cdap-artifacts.json
@@ -0,0 +1,28 @@
+{
+  "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplate",
+  "treePath": "/",
+  "tablePath": "/reports/dcae/cdap-artifacts",
+  "rowPath": "/services/cdap.*/instances/.*/artifacts/.*",
+  "columns": {
+    "service": {
+      "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateAttributeColumn",
+      "path": "../../name"
+    },
+    "instance": {
+      "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateAttributeColumn",
+      "path": "../name"
+    },
+    "name": {
+      "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateAttributeColumn",
+      "path": "/name"
+    },
+    "version": {
+      "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateAttributeColumn",
+      "path": "/version"
+    },
+    "jarFile": {
+      "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateAttributeColumn",
+      "path": "/jarFile"
+    },
+  }
+}
diff --git a/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/dcae-docker.json b/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/dcae-docker.json
new file mode 100644
index 0000000..4b5a04d
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/dcae-docker.json
@@ -0,0 +1,28 @@
+{
+  "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplate",
+  "treePath": "/",
+  "tablePath": "/reports/dcae/docker-containers",
+  "rowPath": "/services/.*/instances/.*/dockerHost/containers/.*",
+  "columns": {
+    "service": {
+      "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateAttributeColumn",
+      "path": "../../../name"
+    },
+    "instance": {
+      "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateAttributeColumn",
+      "path": "../../name"
+    },
+    "name": {
+      "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateAttributeColumn",
+      "path": "/name"
+    },
+    "status": {
+      "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateAttributeColumn",
+      "path": "/status"
+    },
+    "command": {
+      "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateAttributeColumn",
+      "path": "/command"
+    },
+  }
+}
diff --git a/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/dcae-service-instances.json b/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/dcae-service-instances.json
new file mode 100644
index 0000000..a0f3cee
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/dcae-service-instances.json
@@ -0,0 +1,28 @@
+{
+  "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplate",
+  "treePath": "/",
+  "tablePath": "/reports/dcae/service-instances",
+  "rowPath": "/services/.*/instances/.*",
+  "columns": {
+    "service": {
+      "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateAttributeColumn",
+      "path": "../name"
+    },
+    "instance": {
+      "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateAttributeColumn",
+      "path": "/name"
+    },
+    "status": {
+      "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateAttributeColumn",
+      "path": "/status"
+    },
+    "healthTestStatus": {
+      "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateAttributeColumn",
+      "path": "/healthTestStatus"
+    },
+    "healthTestMessageCode": {
+      "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateAttributeColumn",
+      "path": "/healthTestMessageCode"
+    },
+  }
+}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/dcae-vms.json b/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/dcae-vms.json
new file mode 100644
index 0000000..3410572
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/dcae-vms.json
@@ -0,0 +1,40 @@
+{
+  "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplate",
+  "treePath": "/",
+  "tablePath": "/reports/dcae/vms",
+  "rowPath": "/services/.*/instances/.*/servers/.*",
+  "columns": {
+    "service": {
+      "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateAttributeColumn",
+      "path": "../../name"
+    },
+    "instance": {
+      "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateAttributeColumn",
+      "path": "../name"
+    },
+    "name": {
+      "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateAttributeColumn",
+      "path": "/name"
+    },
+    "dns": {
+      "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateAttributeColumn",
+      "path": "/networks/public/dnsName"
+    },
+    "ip-assignment": {
+      "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateAttributeColumn",
+      "path": "/networks/public/ip"
+    },
+    "state": {
+      "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateAttributeColumn",
+      "path": "/operationalState"
+    },
+    "public-ip": {
+      "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateAttributeColumn",
+      "path": "/publicIp"
+    },
+    "private-ip": {
+      "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateAttributeColumn",
+      "path": "/privateIp"
+    },
+  }
+}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/log-ALL-1day.json b/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/log-ALL-1day.json
new file mode 100644
index 0000000..d83caec
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/log-ALL-1day.json
@@ -0,0 +1,10 @@
+{
+  "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.LogTableTemplate",
+  "treePath": "/",
+  "tablePath": "/reports/logging/1day/ALL",
+  "minLevel": "UNKNOWN",
+  "minSeverity": "UNKNOWN",
+  "prefixResourcePath": "",
+  "duration": "-1day",
+  "aggregationDuration": "1hour"
+}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/log-ALL-1week.json b/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/log-ALL-1week.json
new file mode 100644
index 0000000..3c0b3c5
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/log-ALL-1week.json
@@ -0,0 +1,10 @@
+{
+  "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.LogTableTemplate",
+  "treePath": "/",
+  "tablePath": "/reports/logging/1week/ALL",
+  "minLevel": "UNKNOWN",
+  "minSeverity": "UNKNOWN",
+  "prefixResourcePath": "",
+  "duration": "-7day",
+  "aggregationDuration": "1day"
+}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/log-ALL-2hour.json b/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/log-ALL-2hour.json
new file mode 100644
index 0000000..ba19362
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/log-ALL-2hour.json
@@ -0,0 +1,9 @@
+{
+  "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.LogTableTemplate",
+  "treePath": "/",
+  "tablePath": "/reports/logging/2hour/ALL",
+  "minLevel": "UNKNOWN",
+  "minSeverity": "UNKNOWN",
+  "prefixResourcePath": "",
+  "duration": "-2hour"
+}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/log-SEV1-1day.json b/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/log-SEV1-1day.json
new file mode 100644
index 0000000..ffce5ce
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/log-SEV1-1day.json
@@ -0,0 +1,10 @@
+{
+  "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.LogTableTemplate",
+  "treePath": "/",
+  "tablePath": "/reports/logging/1day/SEV1",
+  "minLevel": "UNKNOWN",
+  "minSeverity": "SEV1",
+  "prefixResourcePath": "",
+  "duration": "-1day",
+  "aggregationDuration": "1hour"
+}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/log-SEV1-1week.json b/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/log-SEV1-1week.json
new file mode 100644
index 0000000..be7b501
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/log-SEV1-1week.json
@@ -0,0 +1,10 @@
+{
+  "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.LogTableTemplate",
+  "treePath": "/",
+  "tablePath": "/reports/logging/1week/SEV1",
+  "minLevel": "UNKNOWN",
+  "minSeverity": "SEV1",
+  "prefixResourcePath": "",
+  "duration": "-7day",
+  "aggregationDuration": "1day"
+}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/log-SEV1-2hour.json b/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/log-SEV1-2hour.json
new file mode 100644
index 0000000..ad01a65
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/log-SEV1-2hour.json
@@ -0,0 +1,9 @@
+{
+  "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.LogTableTemplate",
+  "treePath": "/",
+  "tablePath": "/reports/logging/2hour/SEV1",
+  "minLevel": "UNKNOWN",
+  "minSeverity": "SEV1",
+  "prefixResourcePath": "",
+  "duration": "-2hour"
+}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/log-SEV2-1day.json b/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/log-SEV2-1day.json
new file mode 100644
index 0000000..0df8170
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/log-SEV2-1day.json
@@ -0,0 +1,10 @@
+{
+  "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.LogTableTemplate",
+  "treePath": "/",
+  "tablePath": "/reports/logging/1day/SEV2",
+  "minLevel": "UNKNOWN",
+  "minSeverity": "SEV2",
+  "prefixResourcePath": "",
+  "duration": "-1day",
+  "aggregationDuration": "1hour"
+}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/log-SEV2-1week.json b/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/log-SEV2-1week.json
new file mode 100644
index 0000000..c6cdfaf
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/log-SEV2-1week.json
@@ -0,0 +1,10 @@
+{
+  "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.LogTableTemplate",
+  "treePath": "/",
+  "tablePath": "/reports/logging/1week/SEV2",
+  "minLevel": "UNKNOWN",
+  "minSeverity": "SEV2",
+  "prefixResourcePath": "",
+  "duration": "-7day",
+  "aggregationDuration": "1day"
+}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/log-SEV2-2hour.json b/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/log-SEV2-2hour.json
new file mode 100644
index 0000000..d51e4c1
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/log-SEV2-2hour.json
@@ -0,0 +1,9 @@
+{
+  "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.LogTableTemplate",
+  "treePath": "/",
+  "tablePath": "/reports/logging/2hour/SEV2",
+  "minLevel": "UNKNOWN",
+  "minSeverity": "SEV2",
+  "prefixResourcePath": "",
+  "duration": "-2hour"
+}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/log-WARN-1day.json b/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/log-WARN-1day.json
new file mode 100644
index 0000000..b0f9816
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/log-WARN-1day.json
@@ -0,0 +1,10 @@
+{
+  "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.LogTableTemplate",
+  "treePath": "/",
+  "tablePath": "/reports/logging/1day/WARN",
+  "minLevel": "WARN",
+  "minSeverity": "UNKNOWN",
+  "prefixResourcePath": "",
+  "duration": "-1day",
+  "aggregationDuration": "1hour"
+}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/log-WARN-1week.json b/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/log-WARN-1week.json
new file mode 100644
index 0000000..8d1d59d
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/log-WARN-1week.json
@@ -0,0 +1,10 @@
+{
+  "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.LogTableTemplate",
+  "treePath": "/",
+  "tablePath": "/reports/logging/1week/WARN",
+  "minLevel": "WARN",
+  "minSeverity": "UNKNOWN",
+  "prefixResourcePath": "",
+  "duration": "-7day",
+  "aggregationDuration": "1day"
+}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/log-WARN-2hour.json b/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/log-WARN-2hour.json
new file mode 100644
index 0000000..a6a6d8b
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/log-WARN-2hour.json
@@ -0,0 +1,9 @@
+{
+  "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.LogTableTemplate",
+  "treePath": "/",
+  "tablePath": "/reports/logging/2hour/WARN",
+  "minLevel": "WARN",
+  "minSeverity": "UNKNOWN",
+  "prefixResourcePath": "",
+  "duration": "-2hour"
+}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/log-mail.json b/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/log-mail.json
new file mode 100644
index 0000000..8b71fd8
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/log-mail.json
@@ -0,0 +1,10 @@
+{
+  "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.LogTableTemplate",
+  "treePath": "/",
+  "tablePath": "/reports/logging/mail",
+  "minLevel": "UNKNOWN",
+  "minSeverity": "SEV1",
+  "prefixResourcePath": "",
+  "duration": "-1hour",
+  "aggregationDuration": "99999day"
+}
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/logging-count.json b/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/logging-count.json
new file mode 100644
index 0000000..5e5d3e7
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/logging-count.json
@@ -0,0 +1,67 @@
+{
+  "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.IteratorTableTemplate",
+  "treePath": "/",
+  "tablePath": "/reports/logging/count",
+  "columns": {
+    "path": {
+      "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateAttributeColumn",
+      "path": "$path"
+    },
+    "class": {
+      "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateAttributeColumn",
+      "path": "$class"
+    },
+    "Logmessage (last hour)": {
+      "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateMetricColumn",
+      "path": "/logMessageStats/ALL/count",
+      "option": {"$ref": "/configuration/metricOptions/hourlyCount"}
+    },
+    "SEV1 Logmessage (last hour)": {
+      "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateMetricColumn",
+      "path": "/logMessageStats/SEV1/count",
+      "option": {"$ref": "/configuration/metricOptions/hourlyCount"}
+    },
+    "SEV2 Logmessage (last hour)": {
+      "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateMetricColumn",
+      "path": "/logMessageStats/SEV2/count",
+      "option": {"$ref": "/configuration/metricOptions/hourlyCount"}
+    },
+    "Logmessage (last day)": {
+      "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateMetricColumn",
+      "path": "/logMessageStats/ALL/count",
+      "option": {"$ref": "/configuration/metricOptions/dailyCount"}
+    },
+    "SEV1 Logmessage (last day)": {
+      "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateMetricColumn",
+      "path": "/logMessageStats/SEV1/count",
+      "option": {"$ref": "/configuration/metricOptions/dailyCount"}
+    },
+    "SEV2 Logmessage (last day)": {
+      "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateMetricColumn",
+      "path": "/logMessageStats/SEV2/count",
+      "option": {"$ref": "/configuration/metricOptions/dailyCount"}
+    }
+  },
+  "iterator": {
+    "$class": "org.openecomp.ncomp.core.function.IteratorUsingFunction",
+    "paths": ["/"],
+    "recursive": "true",
+    "filter": {
+      "$class": "org.openecomp.ncomp.core.function.RuleFunction",
+      "rules": [
+        {
+          "matches": [{
+            "$class": "org.openecomp.ncomp.core.function.FunctionMatchInstanceOf",
+            "ePackage": "org.openecomp.ncomp.sirius.manager.tableTemplate.ModelPackage",
+            "eName": "LogMessageContainer"
+          }],
+          "action": {"value": "true"}
+        },
+        {
+          "matches": [],
+          "action": {"value": "false"}
+        }
+      ]
+    }
+  }
+}
diff --git a/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/suspended.json b/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/suspended.json
new file mode 100644
index 0000000..f3adcc2
--- /dev/null
+++ b/OPENECOMP-DEMO/controller-template/configuration/tableTemplates/suspended.json
@@ -0,0 +1,42 @@
+{
+  "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.IteratorTableTemplate",
+  "treePath": "/",
+  "tablePath": "/reports/suspended",
+  "columns": {
+    "path": {
+      "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateAttributeColumn",
+      "path": "$path"
+    },
+    "class": {
+      "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateAttributeColumn",
+      "path": "$class"
+    },
+    "Operational State": {
+      "$class": "org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateAttributeColumn",
+      "path": "/operationalState"
+    }
+  },
+  "iterator": {
+    "$class": "org.openecomp.ncomp.core.function.IteratorUsingFunction",
+    "paths": ["/"],
+    "recursive": "true",
+    "filter": {
+      "$class": "org.openecomp.ncomp.core.function.RuleFunction",
+      "rules": [
+        {
+          "matches": [{
+            "$class": "org.openecomp.ncomp.core.function.FunctionMatchAttribute",
+            "path": "/operationalState",
+            "match": "SUSPENDED",
+            "negation": "false"
+          }],
+          "action": {"value": "true"}
+        },
+        {
+          "matches": [],
+          "action": {"value": "false"}
+        }
+      ]
+    }
+  }
+}
diff --git a/OPENECOMP-DEMO/docker-descriptors/docker-common-event.json b/OPENECOMP-DEMO/docker-descriptors/docker-common-event.json
new file mode 100644
index 0000000..8c8dbe4
--- /dev/null
+++ b/OPENECOMP-DEMO/docker-descriptors/docker-common-event.json
@@ -0,0 +1,7 @@
+{
+  $class : "org.openecomp.dcae.controller.service.docker.DockerServiceDescriptor",
+  groupId : "org.openecomp.dcae.controller",
+  servicePackage : "org.openecomp.dcae.controller.service.standardeventcollector.service",
+  serviceClass : "ControllerServiceStandardeventcollectorService",
+  serviceInstanceClass : "ControllerServiceStandardeventcollectorServiceInstance",
+}
diff --git a/OPENECOMP-DEMO/docker-descriptors/docker-databus-controller.json b/OPENECOMP-DEMO/docker-descriptors/docker-databus-controller.json
new file mode 100644
index 0000000..8c8dbe4
--- /dev/null
+++ b/OPENECOMP-DEMO/docker-descriptors/docker-databus-controller.json
@@ -0,0 +1,7 @@
+{
+  $class : "org.openecomp.dcae.controller.service.docker.DockerServiceDescriptor",
+  groupId : "org.openecomp.dcae.controller",
+  servicePackage : "org.openecomp.dcae.controller.service.standardeventcollector.service",
+  serviceClass : "ControllerServiceStandardeventcollectorService",
+  serviceInstanceClass : "ControllerServiceStandardeventcollectorServiceInstance",
+}
diff --git a/OPENECOMP-DEMO/docker-templates/docker-common-event.yaml b/OPENECOMP-DEMO/docker-templates/docker-common-event.yaml
new file mode 100644
index 0000000..4eb51e4
--- /dev/null
+++ b/OPENECOMP-DEMO/docker-templates/docker-common-event.yaml
@@ -0,0 +1,31 @@
+controller-instance-configuration: 
+  "$class": org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceInstance
+  image: "${dcae.env('open-ecomp-demo.docker.registry')}/dcae-controller-common-event:${dcae.env('open-ecomp-demo.versions.collector')}"
+  portBindings:
+    sec-http:
+      containerPort: 8080
+      protocol: tcp
+      vmPort: 8080
+    sec-https:
+      containerPort: 8443
+      protocol: tcp
+      vmPort: 8443
+  volumes: 
+    - "/var/log/DCAE/${dcae.serviceName}/${dcae.instanceName}/app:/opt/app/SEC/logs"
+    - "/var/log/DCAE/${dcae.serviceName}/${dcae.instanceName}/manager:/opt/app/manager/logs"
+    - "/var/config/DCAE/${dcae.serviceName}/${dcae.instanceName}/manager:/opt/app/manager/config"
+    - "/opt/app/dcae-certificate:/opt/app/dcae-certificate"
+    - "/opt/app/groovy:/opt/app/groovy"
+  cport: 8080
+  csecport: 8443
+  keystoreloc: /opt/app/dcae-certificate/keystore.jks
+  keystorepwdloc: /opt/app/dcae-certificate/.password
+  keystorealias: dynamicallyset
+  maxinputqueue: 4096
+  authflag: 0
+  authid: secureid
+  authpwd: "IWRjYWVSb2FkbTEyMyEt"
+  authfile: ../etc/userstore
+  checkschemaflag: 1
+  schemafile: ./etc/CommonEventFormat_Vendors_v25.json
+    
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/docker-templates/docker-databus-controller.yaml b/OPENECOMP-DEMO/docker-templates/docker-databus-controller.yaml
new file mode 100644
index 0000000..356c3c6
--- /dev/null
+++ b/OPENECOMP-DEMO/docker-templates/docker-databus-controller.yaml
@@ -0,0 +1,22 @@
+description: Docker that runs Data Bus Controller
+lifecycle-management:
+  use-dcae-manager: no
+controller-instance-configuration: 
+  "$class": org.openecomp.dcae.controller.service.docker.DockerServiceInstance
+  image: "${dcae.env('open-ecomp-demo.docker.registry')}/dcae_dmaapbc:${dcae.env('open-ecomp-demo.versions.databus-controller')}"
+  portBindings:
+    sec-http:
+      containerPort: 8080
+      protocol: tcp
+      vmPort: 18080
+    sec-https:
+      containerPort: 8443
+      protocol: tcp
+      vmPort: 18443
+  volumes: 
+    - "/var/log/DCAE/${dcae.serviceName}/${dcae.instanceName}/manager:/opt/app/logs"
+    - "/var/config/DCAE/${dcae.serviceName}/${dcae.instanceName}/manager:/opt/app/config"
+    - "/opt/app/dcae-certificate:/opt/app/dcae-certificate"
+    - "/opt/app/groovy:/opt/app/groovy"
+    - "/etc/hosts:/opt/app/etc/hosts"
+    
diff --git a/OPENECOMP-DEMO/location-types.yaml b/OPENECOMP-DEMO/location-types.yaml
new file mode 100644
index 0000000..d3ef91b
--- /dev/null
+++ b/OPENECOMP-DEMO/location-types.yaml
@@ -0,0 +1,28 @@
+
+demo:
+  description: >
+    OpenECOMP Demo Location 
+  vm-deployments: 
+    vm-controller:
+      vm-type: vm-controller
+    vm-postgresql:
+      vm-type: vm-postgresql
+    vm-docker-host-1:
+      vm-type: vm-docker-host
+    vm-cdap-cluster:
+      vm-type: vm-cdap-cluster
+  docker-deployments:
+    docker-common-event:
+      docker-type: docker-common-event
+      container: /services/vm-docker-host-1/instances/${dcae.instanceName}
+    docker-databus-controller:
+      docker-type: docker-databus-controller
+      container: /services/vm-docker-host-1/instances/${dcae.instanceName}
+  cdap-deployments:
+    cdap-tca-hi-lo:
+      cdap-type: cdap-tca-hi-lo
+      container: /services/vm-cdap-cluster/instances/${dcae.instanceName}
+    cdap-helloworld:
+      cdap-type: cdap-helloworld
+      container: /services/vm-cdap-cluster/instances/${dcae.instanceName} 
+       
diff --git a/OPENECOMP-DEMO/monitoring-config/gui.properties b/OPENECOMP-DEMO/monitoring-config/gui.properties
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/OPENECOMP-DEMO/monitoring-config/gui.properties
diff --git a/OPENECOMP-DEMO/networking.yaml b/OPENECOMP-DEMO/networking.yaml
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/OPENECOMP-DEMO/networking.yaml
diff --git a/OPENECOMP-DEMO/streams.yaml b/OPENECOMP-DEMO/streams.yaml
new file mode 100644
index 0000000..5204423
--- /dev/null
+++ b/OPENECOMP-DEMO/streams.yaml
@@ -0,0 +1,23 @@
+## defining feeds
+## works for DataRouter Feeds and DataRouter publishers
+
+streams:
+## Common Event         
+  SEC_MEASUREMENT_OUTPUT:
+    stream-type: message-router
+    databus-type: topic-public
+    description: Common Event Collector output topic
+    publishers:
+      docker-common-event:  
+        local-name: sec_measurement
+    subscribers:
+      cdap-tca-hi-lo:
+        local-name: event-input
+  TCA_EVENT_OUTPUT:
+    stream-type: message-router
+    databus-type: topic-public
+    description: TCA output topic
+    publishers:
+      cdap-tca-hi-lo:
+        local-name: alert-output
+        
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/vm-config/vm-cdap-cluster/cdap.properties b/OPENECOMP-DEMO/vm-config/vm-cdap-cluster/cdap.properties
new file mode 100644
index 0000000..2069baf
--- /dev/null
+++ b/OPENECOMP-DEMO/vm-config/vm-cdap-cluster/cdap.properties
@@ -0,0 +1,4 @@
+cluster.endpoint= foobar
+cluster.user= foobar
+cluster.password= foobar
+
diff --git a/OPENECOMP-DEMO/vm-config/vm-cdap-cluster/console.properties b/OPENECOMP-DEMO/vm-config/vm-cdap-cluster/console.properties
new file mode 100644
index 0000000..4d83a34
--- /dev/null
+++ b/OPENECOMP-DEMO/vm-config/vm-cdap-cluster/console.properties
@@ -0,0 +1,3 @@
+localhost.endpoint=http://localhost:1999
+localhost.user=console
+localhost.password=NTJhYWU1NzAwMzc3OTk1
diff --git a/OPENECOMP-DEMO/vm-config/vm-cdap-cluster/gui.properties b/OPENECOMP-DEMO/vm-config/vm-cdap-cluster/gui.properties
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/OPENECOMP-DEMO/vm-config/vm-cdap-cluster/gui.properties
diff --git a/OPENECOMP-DEMO/vm-config/vm-cdap-cluster/log4j.properties b/OPENECOMP-DEMO/vm-config/vm-cdap-cluster/log4j.properties
new file mode 100644
index 0000000..7ceead4
--- /dev/null
+++ b/OPENECOMP-DEMO/vm-config/vm-cdap-cluster/log4j.properties
@@ -0,0 +1,150 @@
+#log4j.debug=0
+
+log4j.rootLogger=warn, file
+
+log4j.logger.org.openecomp.ncomp=info, file
+
+log4j.additivity.org.openecomp.ncomp=false
+
+
+
+#log4j.logger.org.apache.http.headers=debug, file
+
+#log4j.logger.org.apache.http.wire=debug, file
+
+## uploaded logger
+
+log4j.logger.org.openecomp.ncomp.sirius.manager.uploaded=info, uploaded
+
+log4j.additivity.org.openecomp.ncomp.sirius.manager.uploaded=false
+
+## request logging
+
+log4j.logger.org.openecomp.ncomp.sirius.manager.ManagementServer.requests=info, requests
+
+log4j.additivity.org.openecomp.ncomp.sirius.manager.ManagementServer.requests=false
+
+## openstack polling
+
+log4j.logger.org.openecomp.ncomp.openstack.OpenStackUtil.polling=info, polling
+
+log4j.additivity.org.openecomp.ncomp.openstack.OpenStackUtil.polling=false
+
+log4j.appender.file=org.apache.log4j.RollingFileAppender
+
+log4j.appender.file.File=logs/manager.log
+
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+
+log4j.appender.file.layout.ConversionPattern=%d %5p [%t] %m %C:%L%n
+
+log4j.appender.file.MaxFileSize=50MB
+
+log4j.appender.file.MaxBackupIndex=5 
+
+
+log4j.appender.uploaded=org.apache.log4j.RollingFileAppender
+
+log4j.appender.uploaded.File=logs/manager-uploaded.log
+
+log4j.appender.uploaded.layout=org.apache.log4j.PatternLayout
+
+log4j.appender.uploaded.layout.ConversionPattern=%d %5p [%t] %m %C:%L%n
+
+log4j.appender.uploaded.MaxFileSize=50MB
+
+log4j.appender.uploaded.MaxBackupIndex=5 
+
+
+log4j.appender.requests=org.apache.log4j.RollingFileAppender
+
+log4j.appender.requests.File=logs/manager-requests.log
+
+log4j.appender.requests.layout=org.apache.log4j.PatternLayout
+
+log4j.appender.requests.layout.ConversionPattern=%d %5p [%t] %m %C:%L%n
+
+log4j.appender.requests.MaxFileSize=50MB
+
+log4j.appender.requests.MaxBackupIndex=5 
+
+log4j.appender.polling=org.apache.log4j.RollingFileAppender
+
+log4j.appender.polling.File=logs/manager-polling.log
+
+log4j.appender.polling.layout=org.apache.log4j.PatternLayout
+
+log4j.appender.polling.layout.ConversionPattern=%d %5p [%t] %m %C:%L%n
+
+log4j.appender.polling.MaxFileSize=50MB
+
+log4j.appender.polling.MaxBackupIndex=5
+
+
+### ECOMP Logging
+
+log4j.logger.org.openecomp.audit=info, audit
+
+log4j.additivity.org.openecomp.audit=false
+
+log4j.logger.org.openecomp.metrics=info, metrics
+
+log4j.additivity.org.openecomp.metrics=false
+
+log4j.logger.org.openecomp.error=info, error
+
+log4j.additivity.org.openecomp.error=false
+
+log4j.logger.com.att.eelf.debug=info, debug
+
+log4j.additivity.org.openecomp.debug=false
+
+log4j.appender.audit=org.apache.log4j.RollingFileAppender
+
+log4j.appender.audit.File=logs/audit.log
+
+log4j.appender.audit.layout=org.apache.log4j.PatternLayout
+
+log4j.appender.audit.layout.ConversionPattern=%d{MM/dd-HH:mm:ss.SSS}|%X{RequestId}|%X{ServiceInstanceId}|%t|%X{ServiceName}|%X{InstanceUUID}|%5p|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{Timer}|%m%n
+
+log4j.appender.audit.MaxFileSize=50MB
+
+log4j.appender.audit.MaxBackupIndex=5
+
+log4j.appender.metrics=org.apache.log4j.RollingFileAppender
+
+log4j.appender.metrics.File=logs/metrics.log
+
+log4j.appender.metrics.layout=org.apache.log4j.PatternLayout
+
+log4j.appender.metrics.layout.ConversionPattern=%d{MM/dd-HH:mm:ss.SSS}|%X{RequestId}|%X{ServiceInstanceId}|%t|%X{ServiceName}|%X{InstanceUUID}|%p|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{Timer}|%m%n
+
+log4j.appender.metrics.MaxFileSize=50MB
+
+log4j.appender.metrics.MaxBackupIndex=5
+
+log4j.appender.error=org.apache.log4j.RollingFileAppender
+
+log4j.appender.error.File=logs/error.log
+
+log4j.appender.error.layout=org.apache.log4j.PatternLayout
+
+log4j.appender.error.layout.ConversionPattern=%d{MM/dd-HH:mm:ss.SSS}|%X{RequestId}|%X{ServiceInstanceId}|%t|%X{ServiceName}|%X{InstanceUUID}|%p|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{Timer}|%m%n
+
+log4j.appender.error.MaxFileSize=50MB
+
+log4j.appender.error.MaxBackupIndex=5
+
+log4j.appender.debug=org.apache.log4j.RollingFileAppender
+
+log4j.appender.debug.File=logs/debug.log
+
+log4j.appender.debug.layout=org.apache.log4j.PatternLayout
+
+log4j.appender.debug.layout.ConversionPattern=%d{MM/dd-HH:mm:ss.SSS}|%X{RequestId}|%X{ServiceInstanceId}|%t|%X{ServiceName}|%X{InstanceUUID}|%p|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{Timer}|%m%n
+
+log4j.appender.debug.MaxFileSize=50MB
+
+log4j.appender.debug.MaxBackupIndex=5
+
+
diff --git a/OPENECOMP-DEMO/vm-config/vm-cdap-cluster/manager.properties b/OPENECOMP-DEMO/vm-config/vm-cdap-cluster/manager.properties
new file mode 100644
index 0000000..9c76ae5
--- /dev/null
+++ b/OPENECOMP-DEMO/vm-config/vm-cdap-cluster/manager.properties
@@ -0,0 +1,7 @@
+server.dir = data/resources
+metrics.dir = data/metrics
+properties.dir = data/properties
+server.port = 1999
+server.user.console = NTJhYWU1NzAwMzc3OTk1
+server.user.gui = MDlhZWVjZWEwMmFiOTJi
+server.user.client = YmE2OGE1N2U5NzRmMDg1
diff --git a/OPENECOMP-DEMO/vm-config/vm-cdap-cluster/runtime.properties b/OPENECOMP-DEMO/vm-config/vm-cdap-cluster/runtime.properties
new file mode 100644
index 0000000..dba55a4
--- /dev/null
+++ b/OPENECOMP-DEMO/vm-config/vm-cdap-cluster/runtime.properties
@@ -0,0 +1 @@
+factory.vm=org.openecomp.dcae.controller.service.servers.vm.DcaeVmFactory
diff --git a/OPENECOMP-DEMO/vm-config/vm-controller/console.properties b/OPENECOMP-DEMO/vm-config/vm-controller/console.properties
new file mode 100644
index 0000000..da5f469
--- /dev/null
+++ b/OPENECOMP-DEMO/vm-config/vm-controller/console.properties
@@ -0,0 +1,5 @@
+localhost.endpoint=http://localhost:9998
+localhost.user=console
+localhost.password=ZjJkYjllMjljMTI2M2Iz
+localhost.timeout=3600000
+#localhost.debug=true
diff --git a/OPENECOMP-DEMO/vm-config/vm-controller/controller.properties b/OPENECOMP-DEMO/vm-config/vm-controller/controller.properties
new file mode 100644
index 0000000..03cc7d6
--- /dev/null
+++ b/OPENECOMP-DEMO/vm-config/vm-controller/controller.properties
@@ -0,0 +1,47 @@
+server.dir = data/resources
+metrics.dir = data/metrics
+properties.dir = data/properties
+server.port = 9998
+server.user.console = ZjJkYjllMjljMTI2M2Iz
+server.user.gui = MjViOGNlNmYxYjM0ZGY4
+server.user.client = OTEyMzFlNDViNjM5NTg2
+server.user.jenkins = 7oS6Ew3eLEBDBz
+
+## Add header to response to allow SWAGGER.UI to work from remote server
+server.header.Access-Control-Allow-Methods: POST, GET, OPTIONS, PUT
+server.header.Access-Control-Allow-Origin: *
+server.header.Access-Control-Allow-Headers: Origin, Content-Type, Authorization, X-ECOMP-RequestID, *
+server.header.Access-Control-Request-Headers: Origin, Content-Type, Authorization, X-ECOMP-RequestID, *
+server.header.Access-Control-Allow-Credentials: true
+server.noauth./swagger: server.noauth./swagger
+server.noauth.swagger: server.noauth.swagger
+
+
+
+server.user.monitoring = uedkkdslafdskljf
+
+
+
+##policy.endpoint=http://c4.vm1.policy.simpledemo.openecomp.org:8480
+#policy.endpoint=http://10.0.6.1:8480
+policy.endpoint=http://policy.api.simpledemo.openecomp.org:8480
+policy.user=testrest
+policy.password=3c0mpU#h01@N1c3
+policy.clientAuth=cHl0aG9uOnRlc3Q= 
+policy.pollingFrequency=10000
+policy.debug=true
+#### FOR OpenECOMP demo. 
+policy.substitution.mtd1=demo
+policy.substitution.iad1=demo
+policy.substitution.${dcae.env('open-ecomp-demo.zone')}=demo
+
+databus.endpoint = http://${dcae.allServers('vm-docker-host-1')[0]}.dcae.simpledemo.openecomp.org:18080
+databus.user = m00001@dcae.openecomp.org
+databus.password = foobar
+databus.dmaapName = $dcae.envName
+databus.drProvUrl = https://NO-DR_PROV.dcae.simpledemo.openecomp.org
+databus.debug = true
+databus.mr.service = /services/vm-docker-host-1
+databus.dr.service = /services/vm-docker-host-1
+
+
diff --git a/OPENECOMP-DEMO/vm-config/vm-controller/gui.properties b/OPENECOMP-DEMO/vm-config/vm-controller/gui.properties
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/OPENECOMP-DEMO/vm-config/vm-controller/gui.properties
@@ -0,0 +1 @@
+
diff --git a/OPENECOMP-DEMO/vm-config/vm-controller/log4j.properties b/OPENECOMP-DEMO/vm-config/vm-controller/log4j.properties
new file mode 100644
index 0000000..4534e7f
--- /dev/null
+++ b/OPENECOMP-DEMO/vm-config/vm-controller/log4j.properties
@@ -0,0 +1,86 @@
+#log4j.debug=0
+log4j.rootLogger=warn, file
+log4j.logger.org.openecomp.ncomp=info, file
+log4j.additivity.org.openecomp.ncomp=false
+#log4j.logger.org.apache.http.headers=debug, file
+#log4j.logger.org.apache.http.wire=debug, file
+
+## uploaded logger
+log4j.logger.org.openecomp.ncomp.sirius.manager.uploaded=info, uploaded
+log4j.additivity.org.openecomp.ncomp.sirius.manager.uploaded=false
+## request logging
+log4j.logger.org.openecomp.ncomp.sirius.manager.ManagementServer.requests=info, requests
+log4j.additivity.org.openecomp.ncomp.sirius.manager.ManagementServer.requests=false
+## openstack polling
+log4j.logger.org.openecomp.ncomp.openstack.OpenStackUtil.polling=info, polling
+log4j.additivity.org.openecomp.ncomp.openstack.OpenStackUtil.polling=false
+
+log4j.appender.file=org.apache.log4j.RollingFileAppender
+log4j.appender.file.File=logs/dcae-controller.log
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d %5p [%t] %m %C:%L%n
+log4j.appender.file.MaxFileSize=50MB
+log4j.appender.file.MaxBackupIndex=5 
+
+log4j.appender.uploaded=org.apache.log4j.RollingFileAppender
+log4j.appender.uploaded.File=logs/dcae-controller-uploaded.log
+log4j.appender.uploaded.layout=org.apache.log4j.PatternLayout
+log4j.appender.uploaded.layout.ConversionPattern=%d %5p [%t] %m %C:%L%n
+log4j.appender.uploaded.MaxFileSize=50MB
+log4j.appender.uploaded.MaxBackupIndex=5 
+
+log4j.appender.requests=org.apache.log4j.RollingFileAppender
+log4j.appender.requests.File=logs/dcae-controller-requests.log
+log4j.appender.requests.layout=org.apache.log4j.PatternLayout
+log4j.appender.requests.layout.ConversionPattern=%d %5p [%t] %m %C:%L%n
+log4j.appender.requests.MaxFileSize=50MB
+log4j.appender.requests.MaxBackupIndex=5 
+
+log4j.appender.polling=org.apache.log4j.RollingFileAppender
+log4j.appender.polling.File=logs/dcae-controller-polling.log
+log4j.appender.polling.layout=org.apache.log4j.PatternLayout
+log4j.appender.polling.layout.ConversionPattern=%d %5p [%t] %m %C:%L%n
+log4j.appender.polling.MaxFileSize=50MB
+log4j.appender.polling.MaxBackupIndex=5
+
+
+### ECOMP Logging
+
+log4j.logger.org.openecomp.audit=info, audit
+log4j.additivity.org.openecomp.audit=false
+log4j.logger.org.openecomp.metrics=info, metrics
+log4j.additivity.org.openecomp.metrics=false
+log4j.logger.org.openecomp.error=info, error
+log4j.additivity.org.openecomp.error=false
+log4j.logger.com.att.eelf.debug=info, debug
+log4j.additivity.org.openecomp.debug=false
+
+log4j.appender.audit=org.apache.log4j.RollingFileAppender
+log4j.appender.audit.File=logs/audit.log
+log4j.appender.audit.layout=org.apache.log4j.PatternLayout
+log4j.appender.audit.layout.ConversionPattern=%d{MM/dd-HH:mm:ss.SSS}|%X{RequestId}|%X{ServiceInstanceId}|%t|%X{ServiceName}|%X{InstanceUUID}|%5p|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{Timer}|%m%n
+log4j.appender.audit.MaxFileSize=50MB
+log4j.appender.audit.MaxBackupIndex=5
+
+log4j.appender.metrics=org.apache.log4j.RollingFileAppender
+log4j.appender.metrics.File=logs/metrics.log
+log4j.appender.metrics.layout=org.apache.log4j.PatternLayout
+log4j.appender.metrics.layout.ConversionPattern=%d{MM/dd-HH:mm:ss.SSS}|%X{RequestId}|%X{ServiceInstanceId}|%t|%X{ServiceName}|%X{InstanceUUID}|%p|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{Timer}|%m%n
+log4j.appender.metrics.MaxFileSize=50MB
+log4j.appender.metrics.MaxBackupIndex=5
+
+log4j.appender.error=org.apache.log4j.RollingFileAppender
+log4j.appender.error.File=logs/error.log
+log4j.appender.error.layout=org.apache.log4j.PatternLayout
+log4j.appender.error.layout.ConversionPattern=%d{MM/dd-HH:mm:ss.SSS}|%X{RequestId}|%X{ServiceInstanceId}|%t|%X{ServiceName}|%X{InstanceUUID}|%p|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{Timer}|%m%n
+log4j.appender.error.MaxFileSize=50MB
+log4j.appender.error.MaxBackupIndex=5
+
+log4j.appender.debug=org.apache.log4j.RollingFileAppender
+log4j.appender.debug.File=logs/debug.log
+log4j.appender.debug.layout=org.apache.log4j.PatternLayout
+log4j.appender.debug.layout.ConversionPattern=%d{MM/dd-HH:mm:ss.SSS}|%X{RequestId}|%X{ServiceInstanceId}|%t|%X{ServiceName}|%X{InstanceUUID}|%p|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{Timer}|%m%n
+log4j.appender.debug.MaxFileSize=50MB
+log4j.appender.debug.MaxBackupIndex=5
+
+
diff --git a/OPENECOMP-DEMO/vm-config/vm-controller/managers.properties b/OPENECOMP-DEMO/vm-config/vm-controller/managers.properties
new file mode 100644
index 0000000..6786d1b
--- /dev/null
+++ b/OPENECOMP-DEMO/vm-config/vm-controller/managers.properties
@@ -0,0 +1,24 @@
+
+org.openecomp.dcae.controller.service.docker.DockerServiceInstance.endpoint=http://IP:PORT
+org.openecomp.dcae.controller.service.docker.DockerServiceInstance.user=console
+org.openecomp.dcae.controller.service.docker.DockerServiceInstance.password=TBD
+
+org.openecomp.dcae.controller.service.docker.host.service.DockerHostServiceInstance.endpoint=http://IP:PORT
+org.openecomp.dcae.controller.service.docker.host.service.DockerHostServiceInstance.user=console
+org.openecomp.dcae.controller.service.docker.host.service.DockerHostServiceInstance.password=MDBmMzE0NTgyMDU1NmVj
+
+org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterServiceInstance.endpoint=http://IP:PORT
+org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterServiceInstance.user=console
+org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterServiceInstance.password= NTJhYWU1NzAwMzc3OTk1
+org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterServiceInstance.timeout= 600000
+
+org.openecomp.dcae.controller.service.common.vm.service.CommonVmServiceInstance.endpoint=http://IP:PORT
+org.openecomp.dcae.controller.service.common.vm.service.CommonVmServiceInstance.user=console
+org.openecomp.dcae.controller.service.common.vm.service.CommonVmServiceInstance.password=MDBmMzE0NTgyMDU1NmVj
+
+
+
+
+
+
+
diff --git a/OPENECOMP-DEMO/vm-config/vm-controller/runtime.properties b/OPENECOMP-DEMO/vm-config/vm-controller/runtime.properties
new file mode 100644
index 0000000..29f8585
--- /dev/null
+++ b/OPENECOMP-DEMO/vm-config/vm-controller/runtime.properties
@@ -0,0 +1,24 @@
+factory.vm=org.openecomp.dcae.controller.service.servers.vm.DcaeVmFactory
+factory.docker=org.openecomp.dcae.controller.service.servers.docker.DcaeDockerFactory
+factory.postgres=org.openecomp.dcae.controller.service.storage.postgres.service.impl.ServicePackageImpl
+factory.dcae-controller-service-docker-host-manager.1=org.openecomp.dcae.controller.service.docker.host.servers.manager.DcaeManagerFactory
+factory.dcae-controller-service-docker-host-manager.2=org.openecomp.dcae.controller.service.docker.host.servers.service.DcaeServiceFactory
+factory.ncomp-docker-adaptor.1=org.openecomp.ncomp.servers.docker.DockerDockerFactory
+factory.dcae-controller-service-docker-adaptor.1=org.openecomp.dcae.controller.service.servers.dockermanager.DcaeDockermanagerFactory
+factory.dcae-controller-service-docker-adaptor.2=org.openecomp.dcae.controller.service.servers.docker.DcaeDockerFactory
+factory.cdap=org.openecomp.dcae.controller.service.servers.cdap.DcaeCdapFactory
+factory.cdap-common=org.openecomp.dcae.analytics.cdap.common.impl.CommonPackageImpl
+factory.dcae-controller-service-cdap-adaptor.1=org.openecomp.dcae.controller.service.servers.cdap.DcaeCdapFactory
+factory.dcae-controller-service-cdap-adaptor.2=org.openecomp.dcae.controller.service.servers.cdapmanager.DcaeCdapmanagerFactory
+factory.dcae-controller-service-cdap-cluster-manager.1=org.openecomp.dcae.controller.service.cdap.cluster.servers.manager.DcaeManagerFactory
+factory.dcae-controller-service-cdap-cluster-manager.2=org.openecomp.dcae.controller.service.cdap.cluster.servers.service.DcaeServiceFactory
+factory.dcae-controller-service-common-vm-manager.1=org.openecomp.dcae.controller.service.common.vm.servers.manager.DcaeManagerFactory
+factory.dcae-controller-service-common-vm-manager.2=org.openecomp.dcae.controller.service.common.vm.servers.service.DcaeServiceFactory
+factory.ncomp-cdap-adaptor.1=org.openecomp.ncomp.servers.cdap.CdapCdapFactory
+
+factory.dcae-controller-service-standardeventcollector-manager.1=org.openecomp.dcae.controller.service.standardeventcollector.servers.manager.DcaeManagerFactory
+factory.dcae-controller-service-standardeventcollector-manager.2=org.openecomp.dcae.controller.service.standardeventcollector.servers.service.DcaeServiceFactory
+factory.dcae-controller-service-common-docker-manager.1=org.openecomp.dcae.controller.service.common.docker.servers.manager.DcaeManagerFactory
+factory.dcae-controller-service-common-docker-manager.2=org.openecomp.dcae.controller.service.common.docker.servers.service.DcaeServiceFactory
+factory.dcae-controller-service-drsub-manager.1=org.openecomp.dcae.controller.service.dmaap.drsub.servers.manager.DcaeManagerFactory
+factory.dcae-controller-service-drsub-manager.2=org.openecomp.dcae.controller.service.dmaap.drsub.servers.service.DcaeServiceFactory
diff --git a/OPENECOMP-DEMO/vm-config/vm-controller/simpledemo-root-ca.crt b/OPENECOMP-DEMO/vm-config/vm-controller/simpledemo-root-ca.crt
new file mode 100644
index 0000000..b09e3a0
--- /dev/null
+++ b/OPENECOMP-DEMO/vm-config/vm-controller/simpledemo-root-ca.crt
@@ -0,0 +1,36 @@
+-----BEGIN CERTIFICATE-----
+MIIGQTCCBCmgAwIBAgIJANSi/bsXEOI5MA0GCSqGSIb3DQEBCwUAMIG9MQswCQYD
+VQQGEwJVUzELMAkGA1UECAwCTkoxEzARBgNVBAcMCkJlZG1pbnN0ZXIxEjAQBgNV
+BAoMCU9wZW5FQ09NUDETMBEGA1UECwwKc2ltcGxlZGVtbzE6MDgGA1UEAwwxT3Bl
+bkVDT01QIHNpbXBsZWRlbW8gUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEn
+MCUGCSqGSIb3DQEJARYYc2ltcGxlZGVtb0BvcGVuZWNvbXAub3JnMB4XDTE2MTEy
+ODIxMTQyNVoXDTI2MTEyNjIxMTQyNVowgb0xCzAJBgNVBAYTAlVTMQswCQYDVQQI
+DAJOSjETMBEGA1UEBwwKQmVkbWluc3RlcjESMBAGA1UECgwJT3BlbkVDT01QMRMw
+EQYDVQQLDApzaW1wbGVkZW1vMTowOAYDVQQDDDFPcGVuRUNPTVAgc2ltcGxlZGVt
+byBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MScwJQYJKoZIhvcNAQkBFhhz
+aW1wbGVkZW1vQG9wZW5lY29tcC5vcmcwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
+ggIKAoICAQDLgdDTCZX5xlMFIo+tjj5DItAwbutQE3NMchx/CRIuYwRCBOEO0yOs
+AdnZAuheYrjv/Dw4wKNzcvtIlYbfiPsGWVvx5j6+xoGBLLwIOnDyzD2B62uCvMs9
+47MAuiqpPojPwDDb9fF5EIhlC+cBzSYKm7D5ihYxmUCnh9yHIPEMq0IoVj2illlK
+eCTLW+bZKeaKoWdkFxyyzykOoMFgZTUm01EhDIt1DHTve675Qq80UgzrZdSK6Zjv
+3wLV7tkJSGmCkbUELpxsTLKYuaGUkE0m5n3SMUcvBDa6WNQpWlUbZlTwWotOrxfN
+Gib3nGiqyCmQXrVvuuBDzmZifZaJpBGiiGiOxp0j79E/OZkfk/9V3Hvfy78Ss9H5
+uhf/ACGKsUq9nN25u+Wpz7EzAQm/OBubBrBCMP/8pm+y1jCfQ6Bwd0Nm48KrJkTe
+ySkferISNmpQZ2dyZXQVXMarbRfagQ6XdJw6EVnDwydVzb5LAqam3JUXjsHIj7Gv
+2DmXwJtwV+cnKB/OxRsP/JWwlyC9pFGy17HWc7EwPqXm1UNdDM36UaoBDzsh3DcI
+vg5+BOOtYPmiZ2+CMD2JxAXmtCMAmQA1mSsW7beTuHKy+7EdCAWcregE60PE3w2l
+G8n50YSXb0WZ2IaQUsBhhpZmu6VVTEcoi5eMglI6QyO21y0oKPYWPQIDAQABo0Iw
+QDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUmmQF
+QD3oWZUOVE81Qc9WSfcyqwwwDQYJKoZIhvcNAQELBQADggIBAE1ArwZwMVVJe1Pj
+p1R9+Q766Qhzh4EN9RFCsktCcf4pB23lPtFhMhIZJP5eZKLB4MUIvtmleU+DmOWf
+jcEcgauMrc9Ihacra+IRJsr4JQjQSDHoEgl/yR6VUd9vbGH66ElIg9nP7XWAE6h5
+DTAxA8X1qyUOVGsKAps2uhBwNtl8RdX6GrZahkSOUMOq3H4wyEEPQlpU2AewZqOU
+p0vdbQ/is6cbJh6dgxFrSzBti/MKj/EPM6yJwlO+RfGlJmEI7J7bLEYIeNssLnv6
+FGiOgyWQ+gmwVK827F4Jwoght2BCcNsG/oPkAPbdw4yRIyi92QSWMEBKibECypQE
+a1DYvfHWGQLQifGzFuJTOca9vgu2B/BQ+0Ii4DqMS8hc2rw1CAD5zHAT/BIgAKM6
+ygL5Oyvrj8AQLgOkjhFh0HFKneh4j7wBtibpmDnBoSv227PAtdytCoRgivjhmF5B
+Ryx7BswcTEtZHWHxD/i2wlMEGNqGbcRmCCy9hhCxitAz70aq3Y/pC46n7w5bOmvJ
+Ap9D+WmTJ9PdpDjiwCXCkMD3QaTuUV1W3Zr4mLLj6gRLb6ycgDrsqXnY6/JB/AOd
+gxFK9q1vjhm02FAABIa+kL10CKPuRdlE/GsWl03WKMeT5bY3MTO3odsNXhKWA19h
+wUAp0gnljuFHPX7jWwruZ1eD8mQv
+-----END CERTIFICATE-----
diff --git a/OPENECOMP-DEMO/vm-config/vm-controller/simpledemo-server-ca.crt b/OPENECOMP-DEMO/vm-config/vm-controller/simpledemo-server-ca.crt
new file mode 100644
index 0000000..f71faf6
--- /dev/null
+++ b/OPENECOMP-DEMO/vm-config/vm-controller/simpledemo-server-ca.crt
@@ -0,0 +1,33 @@
+-----BEGIN CERTIFICATE-----
+MIIFpTCCA42gAwIBAgIJAJqx8dKnCZZoMA0GCSqGSIb3DQEBCwUAMIG9MQswCQYD
+VQQGEwJVUzELMAkGA1UECAwCTkoxEzARBgNVBAcMCkJlZG1pbnN0ZXIxEjAQBgNV
+BAoMCU9wZW5FQ09NUDETMBEGA1UECwwKc2ltcGxlZGVtbzE6MDgGA1UEAwwxT3Bl
+bkVDT01QIHNpbXBsZWRlbW8gUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEn
+MCUGCSqGSIb3DQEJARYYc2ltcGxlZGVtb0BvcGVuZWNvbXAub3JnMB4XDTE2MTEy
+ODIxMTQyNloXDTIxMTEyNzIxMTQyNlowga0xCzAJBgNVBAYTAlVTMQswCQYDVQQI
+DAJOSjETMBEGA1UEBwwKQmVkbWluc3RlcjESMBAGA1UECgwJT3BlbkVDT01QMRMw
+EQYDVQQLDApzaW1wbGVkZW1vMSowKAYDVQQDDCFPcGVuRUNPTVAgc2ltcGxlZGVt
+byBTZXJ2ZXIgQ0EgWDExJzAlBgkqhkiG9w0BCQEWGHNpbXBsZWRlbW9Ab3BlbmVj
+b21wLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALr4rivKQuRk
+YNf5Ig40e1nqj6s6LB1vgMOYbKfRziOFpPcUpsHPOhusHowiUsrU1vdFSzPz6Ej7
+PjlmNSg2Qka8YCn9kd6QgM7U0KcPJvIucBp+qjifH3EvP0jgDPhDeVRYxzV454dv
+5kQ9uCpswJP7YAnX51dkWeH8nwPUoagt31bOl9LXENSrgxEThxdLYMJnQJWk2CmV
+otXM4tT1dxyJxFUrZ6uJCEAYw5VtlplqihHf8lHy+sWQavtsLz/4dc+sGeXSTfoI
+voKvoh3uZ5gEhGV8yfJxk1veX5y5/AxP80vQ+smWYjTnQL5QQ57y4bciez4XVBmQ
+SWimWtOi4e8CAwEAAaOBtTCBsjAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE
+AwIBhjAdBgNVHQ4EFgQUTqdsYgGNGubdJHq9tsaJhM9HE5wwcAYDVR0gBGkwZzBl
+BgRVHSAAMF0wWwYIKwYBBQUHAgIwTxpNSWYgeW91IHRydXN0IHRoaXMgY2VydCB0
+aGVuIHdlIGhhdmUgYSBicmlkZ2UgdGhhdCB5b3UgbWlnaHQgYmUgaW50ZXJlc3Rl
+ZCBpbi4wDQYJKoZIhvcNAQELBQADggIBAKNNlRqFuE/JgV1BHyYK0xoSXH4aZP/7
+IoHtDVcSaZAOOuFOUrwVMUbzRBebbb6RpFwt/X+NLFUGysd+XNLF7W7lzxKtmFNX
+n4OpNkBe0y5O7yurus8rERHzu3jiOSgVo+WzDlGpYSRnG3hI2qPWqD+Puzx/WwI8
+XUTuzEQQ3gUSyVFfXHpay3VpYmLZiLJ9WKY5SDw7Ie6Sxrju4Qm1HwnFY8wHZGcs
+2KMQzorJ1ZNQf523yUTghbT0rKaSFaD8zugPtI2ONfFG/QgrkQXo78opzPsHnHwa
+SxGSiAgeLbwAUCvPNl27zr6k6+7TcNjV0VUivAs0OG3VEAdgi7UWYB+30KfWwHwE
+zGmvd4IAGqIqlqLcSVArN5z8JK1B5nfjQn5UrclU1vK+dnuiKE2X4rKuBTRYRFR/
+km+mj4koYFPKFHndmJl1uv2OCJK9l5CSIuKWeI1qv8BASKqgNdoT/SKBXqxgYlCb
+o+j4IDjxrxChRO+e5vl9lA7INfRrbljCkUjfLRa+v2q9tWQ3+EQUwwnSrSfihh2T
+j0Tksr6b8dDsvMlCdOKG1B+JPcEXORSFKNXVTEfjqpJG8s16kFAocWt3S6xO0k1t
+qbQp+3tWQgW2TGnX0rMZzB6NGRNfWhlYmq2zHgXkiCIZ26Ztgt/LNbwEvN3+VlLo
+z/Rd+SKtlrfb
+-----END CERTIFICATE-----
diff --git a/OPENECOMP-DEMO/vm-config/vm-docker-host/console.properties b/OPENECOMP-DEMO/vm-config/vm-docker-host/console.properties
new file mode 100644
index 0000000..ac1ae44
--- /dev/null
+++ b/OPENECOMP-DEMO/vm-config/vm-docker-host/console.properties
@@ -0,0 +1,5 @@
+localhost.endpoint=http://localhost:9999
+localhost.user=console
+localhost.password=MDBmMzE0NTgyMDU1NmVj
+localhost.timeout=3600000
+#localhost.debug=true
diff --git a/OPENECOMP-DEMO/vm-config/vm-docker-host/docker-mra-certs.jks.base64 b/OPENECOMP-DEMO/vm-config/vm-docker-host/docker-mra-certs.jks.base64
new file mode 100644
index 0000000..f1baf94
--- /dev/null
+++ b/OPENECOMP-DEMO/vm-config/vm-docker-host/docker-mra-certs.jks.base64
@@ -0,0 +1,70 @@
+/u3+7QAAAAIAAAACAAAAAQAKY2xpZW50X3AxMgAAAVS+8ArYAAAFAjCCBP4wDgYKKwYBBAEqAhEB
+AQUABIIE6oTtPufmBOp4koaRdeNotNOJLGf5hmfIIP5QwkzDfRBs7kn4QzYK9Qo6rK+Tbvx34Uax
+8rZxS2v3wNiuk2hs3kcsw+/UdPth+kyovoluSDBmKYv72Yhlci/Ys/D3pQKUeggaL3hMk77SMAh4
+RmUZVAqXElkAt1IckEHx2gsB38lAUezAZXWxra3jgO+alCTTQ70KnPkBKDl2fchuyAVx32YDapPx
+jetDBDPNYOGPYO89LSNf9CXgBq6Ns9J2AJfWm4ESl5eol5dqji5baI72u4sLjMGd7U0sK/KDmUGn
+ja2AZ6ZFuLqrWiCSwY5kk/DptwvQsMJL19ypiJnKS+xE6tLHcV43i4XLnsHUf/WD7g0OJO1Br6B6
+aLDkYaZS0qLJLgL3UF5ARaZp/BtTlSbMDWNFcg6gBD2szr4/airWrexxOvP7Z8qYFyRjHeTOILwt
+F2VYT2iwXlqXJviZOWbtQ74X4XdoZ6/FLszPY7zfQBMDkYfoI2MJjAXtHESMl5TEktFjYMcmwcuD
+sWFsJWSaWgEeAyvoOrTaz9F2EdIoPdeVry1/LcNfT8HL6UQ4pAiLOL6iHuZD6wVLgW847vnI0CUn
+0uZayAhV9LE8SNXxgtSKSw9b3dOiM42UdT+WsNNGvQ5DdjG+6G/6A/8x+BALVRCVA1jWWYSMsTRl
+n8FnE9VMKVTgkoSg5gAtOEYtNXsXguibvVgrmdi1HZHPeykDh3TAdanZJXgNFlU/zH6v9d1VN2E7
+fF93a8DKCKXYSsTaXrupUYw67+ZN0k/SPmVB5k1WCAsPPzaXbmsJElwxGV7qkfz5uqnzt/7gPSTU
+pIzs5SXCmyaDi69ECR1SG2AJYL+Lxb+36Ok5SdPJcNhRsxrtSeEwIysqMnv+mZ0Ngwt4jobnjGQQ
+bHpr/S5je4L2NAJ3EbMzBNG5oB3GVi3LEWh2mjBKjMxrAWNfieAOiZ7bcUrRdNIRnkj/yWRT2jZL
+pjKUPEkuFaVYyKmWC24ype+lYfYme95DmDhV9Lr9m3arZkK9g3p0FyNktHCATz5ATRLopPcD1aMS
+Tbiqzv0Wg23+SjNc8/SUZaoIwxloA3J+zrYOcs+SFumB2UsHvlvgwGbFok+1hBkFQaxXiL7R8ehd
+/+NTNEtZtO7bmX7X0T1m1NDB0XgkmdqpsjzmwTwZqaZxdaJFvS/OawR554BT2MEkegaj26yCkABK
+o43fQ4ekpoLju9nNHfY7zGKmQtDhxcg84TwZfBiXaMIJpBzWBklDYbuwS7ypH64zTcizsIH31lh5
+qrKI1Sobef23fDrDMSkHAzburHSQjOe6611ynuiHzi+2aYX3mm/ZrJ83x7BL0FXe70KIEesr7HdN
+uFNVEck/Vk3Yl+EZDTQCrykxL8A6Y2DwWKPG2o6SHNv7l+VoULw26dkbsdO08xf6BciMuoiNhPxF
+AF1lEbfDs52p3BjssDTbQEXqr5+2DFPUlTYG9FYhMuQUT7DJ5BlZu3IS+yzMML+UwQJkNIAD1ZH/
+LK1+qqkRbVDrcYuzWO2f1Ymxjnv5I3hcWn2eWyGkGL3G/1zEHzL60100kxRuGluNpGTRx/Zuu4AG
+NV+mc0Sd12QZJYKNIjlOfkKjMXBWPAxmXs2NuyFOUSu8HmtwOM8o9fl9JivHN4alLPuhdrn9rvCm
+5H/M5xQQXvf5CBgAAAACAAVYLjUwOQAAA0AwggM8MIICJKADAgECAgkAqpdN42sdJHMwDQYJKoZI
+hvcNAQELBQAwPjELMAkGA1UEBhMCVVMxHDAaBgNVBAoME0FUJlQgU2VydmljZXMsIEluYy4xETAP
+BgNVBAMMCERvY2tlckNBMB4XDTE2MDUxNzEzMzczNFoXDTI2MDUxNTEzMzczNFowZDELMAkGA1UE
+BhMCVVMxETAPBgNVBAgMCE1pY2hpZ2FuMRMwEQYDVQQHDApTb3V0aGZpZWxkMRwwGgYDVQQKDBNB
+VCZUIFNlcnZpY2VzLCBJbmMuMQ8wDQYDVQQDDAZDbGllbnQwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDGua+7jt4yJyI40a739UkEiPkWQ0+WvmOC/WTzaV1al13621CAfx7/W3QHGUYQ
+TInuRCGg90fBOh3FEd68enVxNHp7Sfyq1O4PFdZGO1gtRH5uO7liZvqVLfWxz51vA9dPtkx0PHT1
+0sN+0jjgnMaA4lTrsjgZNTZwTWPQTBnMJ7c/GN9DD4uWPNExrGwiqwyai1cGl6gjq0ZC4xW0+JtQ
+eXGNYOBXixZTOYsEs4M7Rp9X0YtXjk41AFkV+mBaDsGSzUN42quXLfh72rTsoHsSLmMJhMQdOS69
+Sp93+jAPqaP3Sei2Pgr+67Qi/Ex+A6UeZZ1A3iXASXgKFMkHc54JAgMBAAGjFzAVMBMGA1UdJQQM
+MAoGCCsGAQUFBwMCMA0GCSqGSIb3DQEBCwUAA4IBAQCpjqtjWhZaDLKBKDxhQO0OJaxdfjaef66B
+OTJ/Wv4+tqe1FuMjttpUkiF0Rf4Gfcd47vd39Ykh+S3aB5Or7h4RKAks9G0sDRRbazfkzOaYRNDq
+iaA8vYYRPCy9r6QY/kE17yWMDiP2Dbm6OlRawAaUXXNKwlBCqAvh3YOB73e3nOgs8g95eUyMQarU
+ZnlJ6PUROpOiUmUlnjjXZ7PFCxUq3/j0BgmVYu3wEYkr6R/k3UBXn8UFH+8KJmQVuyYmspBOQZEh
+DWGUi/VS+DKZZCod8opt3b+/1SSigyDsSsx7pFit2cTR74NyD7tRfg4ajXmsMVFxud5hIbJzi4rm
+hs/MAAVYLjUwOQAAA1MwggNPMIICN6ADAgECAgkAlrtm2gBdRnIwDQYJKoZIhvcNAQELBQAwPjEL
+MAkGA1UEBhMCVVMxHDAaBgNVBAoME0FUJlQgU2VydmljZXMsIEluYy4xETAPBgNVBAMMCERvY2tl
+ckNBMB4XDTE2MDMwMTIxNTI0OFoXDTI2MDIyNzIxNTI0OFowPjELMAkGA1UEBhMCVVMxHDAaBgNV
+BAoME0FUJlQgU2VydmljZXMsIEluYy4xETAPBgNVBAMMCERvY2tlckNBMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA3VJYULv0NlKtpKz+VuxUWnjdJwJSNWZw6Ahb4szqlwSRmEcCs3Sh
+w50u1MQvftmm2Lnb6I8WoLlvAdkBJDEu93TOcFKN8inS3Jl+xv45ZAqQuAScDrlX8X1awPiSQc4I
+Un/w01cHVpjoGg0l3sKdD/h0bKYYXrdyJ1yqa/BlF9Wi85MwbYy6y6KP8F8YFTMi9F4gOYPeZ+eZ
+UXwFyXA6RyqjczFvCamQcxRK0P6kIL/gEFWeOTogaaF5B0JxkL/LCuOZSyjnCWqKhIh0MQEuYLXk
+2Cvi7Tdn/OoQQtbd8o1qNcMAioGNOVTWmWEnlTnxCVzFvG2KIHSUVIeqvbfeKwIDAQABo1AwTjAd
+BgNVHQ4EFgQUytmUKfZnycGMIUkAkmL7t+8L5WMwHwYDVR0jBBgwFoAUytmUKfZnycGMIUkAkmL7
+t+8L5WMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAgQR0flh1aNpq8WwXZqQ2gula
+b4FGRjgLo1qOWogF76ZEwMUyLZIz7B+BSA0YLkal0oeVd1ts1kXR4klR7a+9K6J9Ft8yyK+aLaaG
+s1Ifd3xf/mq1zqKewpCVCrELRgD1MMrV8xYVO51XuJPgGCOwks5UjYRUw/aIZLqAGQXTtaA1TKSL
+8vEVMe492k033KzmXsrHGLZT/LI/bNZDzUcputMqc9GdaY39EcVdXNqWc9/fkFFxpjCKQ+AK8TXd
+7BEPLSfWnwPAHjJA20yquDy7b2lhR3n4dbo4P35NU7GyzpMVwmcO5u0tmoK+TT59a85p3vBbWzRQ
+elofsfJVl6XYjAAAAAIACGRvY2tlcmNhAAABVL7wBzQABVguNTA5AAADUzCCA08wggI3oAMCAQIC
+CQCWu2baAF1GcjANBgkqhkiG9w0BAQsFADA+MQswCQYDVQQGEwJVUzEcMBoGA1UECgwTQVQmVCBT
+ZXJ2aWNlcywgSW5jLjERMA8GA1UEAwwIRG9ja2VyQ0EwHhcNMTYwMzAxMjE1MjQ4WhcNMjYwMjI3
+MjE1MjQ4WjA+MQswCQYDVQQGEwJVUzEcMBoGA1UECgwTQVQmVCBTZXJ2aWNlcywgSW5jLjERMA8G
+A1UEAwwIRG9ja2VyQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDdUlhQu/Q2Uq2k
+rP5W7FRaeN0nAlI1ZnDoCFvizOqXBJGYRwKzdKHDnS7UxC9+2abYudvojxaguW8B2QEkMS73dM5w
+Uo3yKdLcmX7G/jlkCpC4BJwOuVfxfVrA+JJBzghSf/DTVwdWmOgaDSXewp0P+HRsphhet3InXKpr
+8GUX1aLzkzBtjLrLoo/wXxgVMyL0XiA5g95n55lRfAXJcDpHKqNzMW8JqZBzFErQ/qQgv+AQVZ45
+OiBpoXkHQnGQv8sK45lLKOcJaoqEiHQxAS5gteTYK+LtN2f86hBC1t3yjWo1wwCKgY05VNaZYSeV
+OfEJXMW8bYogdJRUh6q9t94rAgMBAAGjUDBOMB0GA1UdDgQWBBTK2ZQp9mfJwYwhSQCSYvu37wvl
+YzAfBgNVHSMEGDAWgBTK2ZQp9mfJwYwhSQCSYvu37wvlYzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3
+DQEBCwUAA4IBAQCBBHR+WHVo2mrxbBdmpDaC6VpvgUZGOAujWo5aiAXvpkTAxTItkjPsH4FIDRgu
+RqXSh5V3W2zWRdHiSVHtr70ron0W3zLIr5otpoazUh93fF/+arXOop7CkJUKsQtGAPUwytXzFhU7
+nVe4k+AYI7CSzlSNhFTD9ohkuoAZBdO1oDVMpIvy8RUx7j3aTTfcrOZeyscYtlP8sj9s1kPNRym6
+0ypz0Z1pjf0RxV1c2pZz39+QUXGmMIpD4ArxNd3sEQ8tJ9afA8AeMkDbTKq4PLtvaWFHefh1ujg/
+fk1TsbLOkxXCZw7m7S2agr5NPn1rzmne8FtbNFB6Wh+x8lWXpdiMB1SwXRn1eihqqwLXRhsTO1MJ
+wZ4=
diff --git a/OPENECOMP-DEMO/vm-config/vm-docker-host/docker.properties b/OPENECOMP-DEMO/vm-config/vm-docker-host/docker.properties
new file mode 100644
index 0000000..f953991
--- /dev/null
+++ b/OPENECOMP-DEMO/vm-config/vm-docker-host/docker.properties
@@ -0,0 +1,3 @@
+dockerHost.endpoint=https://FQDN:4243
+dockerHost.debug=false
+
diff --git a/OPENECOMP-DEMO/vm-config/vm-docker-host/gui.properties b/OPENECOMP-DEMO/vm-config/vm-docker-host/gui.properties
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/OPENECOMP-DEMO/vm-config/vm-docker-host/gui.properties
diff --git a/OPENECOMP-DEMO/vm-config/vm-docker-host/log4j.properties b/OPENECOMP-DEMO/vm-config/vm-docker-host/log4j.properties
new file mode 100644
index 0000000..f648474
--- /dev/null
+++ b/OPENECOMP-DEMO/vm-config/vm-docker-host/log4j.properties
@@ -0,0 +1,108 @@
+#log4j.debug=0
+
+log4j.rootLogger=warn, file
+
+log4j.logger.org.openecomp.ncomp=info, file
+
+log4j.additivity.org.openecomp.ncomp=false
+
+
+
+#log4j.logger.org.apache.http.headers=debug, file
+
+#log4j.logger.org.apache.http.wire=debug, file
+
+
+log4j.appender.file=org.apache.log4j.RollingFileAppender
+
+log4j.appender.file.File=logs/manager.log
+
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+
+log4j.appender.file.layout.ConversionPattern=%d %5p [%t] %m %C:%L%n
+
+log4j.appender.file.MaxFileSize=50MB
+
+log4j.appender.file.MaxBackupIndex=5 
+
+
+log4j.appender.uploaded=org.apache.log4j.RollingFileAppender
+
+log4j.appender.uploaded.File=logs/manager-uploaded.log
+
+log4j.appender.uploaded.layout=org.apache.log4j.PatternLayout
+
+log4j.appender.uploaded.layout.ConversionPattern=%d %5p [%t] %m %C:%L%n
+
+log4j.appender.uploaded.MaxFileSize=50MB
+
+log4j.appender.uploaded.MaxBackupIndex=5 
+
+
+### ECOMP Logging
+
+log4j.logger.org.openecomp.audit=info, audit
+
+log4j.additivity.org.openecomp.audit=false
+
+log4j.logger.org.openecomp.metrics=info, metrics
+
+log4j.additivity.org.openecomp.metrics=false
+
+log4j.logger.org.openecomp.error=info, error
+
+log4j.additivity.org.openecomp.error=false
+
+log4j.logger.com.att.eelf.debug=info, debug
+
+log4j.additivity.org.openecomp.debug=false
+
+log4j.appender.audit=org.apache.log4j.RollingFileAppender
+
+log4j.appender.audit.File=logs/audit.log
+
+log4j.appender.audit.layout=org.apache.log4j.PatternLayout
+
+log4j.appender.audit.layout.ConversionPattern=%d{MM/dd-HH:mm:ss.SSS}|%X{RequestId}|%X{ServiceInstanceId}|%t|%X{ServiceName}|%X{InstanceUUID}|%5p|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{Timer}|%m%n
+
+log4j.appender.audit.MaxFileSize=50MB
+
+log4j.appender.audit.MaxBackupIndex=5
+
+log4j.appender.metrics=org.apache.log4j.RollingFileAppender
+
+log4j.appender.metrics.File=logs/metrics.log
+
+log4j.appender.metrics.layout=org.apache.log4j.PatternLayout
+
+log4j.appender.metrics.layout.ConversionPattern=%d{MM/dd-HH:mm:ss.SSS}|%X{RequestId}|%X{ServiceInstanceId}|%t|%X{ServiceName}|%X{InstanceUUID}|%p|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{Timer}|%m%n
+
+log4j.appender.metrics.MaxFileSize=50MB
+
+log4j.appender.metrics.MaxBackupIndex=5
+
+log4j.appender.error=org.apache.log4j.RollingFileAppender
+
+log4j.appender.error.File=logs/error.log
+
+log4j.appender.error.layout=org.apache.log4j.PatternLayout
+
+log4j.appender.error.layout.ConversionPattern=%d{MM/dd-HH:mm:ss.SSS}|%X{RequestId}|%X{ServiceInstanceId}|%t|%X{ServiceName}|%X{InstanceUUID}|%p|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{Timer}|%m%n
+
+log4j.appender.error.MaxFileSize=50MB
+
+log4j.appender.error.MaxBackupIndex=5
+
+log4j.appender.debug=org.apache.log4j.RollingFileAppender
+
+log4j.appender.debug.File=logs/debug.log
+
+log4j.appender.debug.layout=org.apache.log4j.PatternLayout
+
+log4j.appender.debug.layout.ConversionPattern=%d{MM/dd-HH:mm:ss.SSS}|%X{RequestId}|%X{ServiceInstanceId}|%t|%X{ServiceName}|%X{InstanceUUID}|%p|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{Timer}|%m%n
+
+log4j.appender.debug.MaxFileSize=50MB
+
+log4j.appender.debug.MaxBackupIndex=5
+
+
diff --git a/OPENECOMP-DEMO/vm-config/vm-docker-host/manager.properties b/OPENECOMP-DEMO/vm-config/vm-docker-host/manager.properties
new file mode 100644
index 0000000..98998db
--- /dev/null
+++ b/OPENECOMP-DEMO/vm-config/vm-docker-host/manager.properties
@@ -0,0 +1,8 @@
+JVMARGS=-Djavax.net.ssl.trustStore=config/docker-mra-certs.jks
+server.dir = data/resources
+metrics.dir = data/metrics
+properties.dir = data/properties
+server.port = 9999
+server.user.console = MDBmMzE0NTgyMDU1NmVj
+server.user.gui = ZDAxYzIzMGQ5NWRhZjVi
+server.user.client = OTY4NTk3ODI4ZWI2MjM0
diff --git a/OPENECOMP-DEMO/vm-config/vm-docker-host/runtime.properties b/OPENECOMP-DEMO/vm-config/vm-docker-host/runtime.properties
new file mode 100644
index 0000000..7b7ee54
--- /dev/null
+++ b/OPENECOMP-DEMO/vm-config/vm-docker-host/runtime.properties
@@ -0,0 +1,3 @@
+factory.dcae-controller-service-standardeventcollector-manager.1=org.openecomp.dcae.controller.service.standardeventcollector.servers.manager.DcaeManagerFactory
+
+factory.dcae-controller-service-standardeventcollector-manager.2=org.openecomp.dcae.controller.service.standardeventcollector.servers.service.DcaeServiceFactory
diff --git a/OPENECOMP-DEMO/vm-config/vm-postgresql/console.properties b/OPENECOMP-DEMO/vm-config/vm-postgresql/console.properties
new file mode 100644
index 0000000..75b6a93
--- /dev/null
+++ b/OPENECOMP-DEMO/vm-config/vm-postgresql/console.properties
@@ -0,0 +1,3 @@
+localhost.endpoint=http://localhost:9999
+localhost.user=console
+localhost.password=MDBmMzE0NTgyMDU1NmVj
diff --git a/OPENECOMP-DEMO/vm-config/vm-postgresql/gui.properties b/OPENECOMP-DEMO/vm-config/vm-postgresql/gui.properties
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/OPENECOMP-DEMO/vm-config/vm-postgresql/gui.properties
diff --git a/OPENECOMP-DEMO/vm-config/vm-postgresql/log4j.properties b/OPENECOMP-DEMO/vm-config/vm-postgresql/log4j.properties
new file mode 100644
index 0000000..7ceead4
--- /dev/null
+++ b/OPENECOMP-DEMO/vm-config/vm-postgresql/log4j.properties
@@ -0,0 +1,150 @@
+#log4j.debug=0
+
+log4j.rootLogger=warn, file
+
+log4j.logger.org.openecomp.ncomp=info, file
+
+log4j.additivity.org.openecomp.ncomp=false
+
+
+
+#log4j.logger.org.apache.http.headers=debug, file
+
+#log4j.logger.org.apache.http.wire=debug, file
+
+## uploaded logger
+
+log4j.logger.org.openecomp.ncomp.sirius.manager.uploaded=info, uploaded
+
+log4j.additivity.org.openecomp.ncomp.sirius.manager.uploaded=false
+
+## request logging
+
+log4j.logger.org.openecomp.ncomp.sirius.manager.ManagementServer.requests=info, requests
+
+log4j.additivity.org.openecomp.ncomp.sirius.manager.ManagementServer.requests=false
+
+## openstack polling
+
+log4j.logger.org.openecomp.ncomp.openstack.OpenStackUtil.polling=info, polling
+
+log4j.additivity.org.openecomp.ncomp.openstack.OpenStackUtil.polling=false
+
+log4j.appender.file=org.apache.log4j.RollingFileAppender
+
+log4j.appender.file.File=logs/manager.log
+
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+
+log4j.appender.file.layout.ConversionPattern=%d %5p [%t] %m %C:%L%n
+
+log4j.appender.file.MaxFileSize=50MB
+
+log4j.appender.file.MaxBackupIndex=5 
+
+
+log4j.appender.uploaded=org.apache.log4j.RollingFileAppender
+
+log4j.appender.uploaded.File=logs/manager-uploaded.log
+
+log4j.appender.uploaded.layout=org.apache.log4j.PatternLayout
+
+log4j.appender.uploaded.layout.ConversionPattern=%d %5p [%t] %m %C:%L%n
+
+log4j.appender.uploaded.MaxFileSize=50MB
+
+log4j.appender.uploaded.MaxBackupIndex=5 
+
+
+log4j.appender.requests=org.apache.log4j.RollingFileAppender
+
+log4j.appender.requests.File=logs/manager-requests.log
+
+log4j.appender.requests.layout=org.apache.log4j.PatternLayout
+
+log4j.appender.requests.layout.ConversionPattern=%d %5p [%t] %m %C:%L%n
+
+log4j.appender.requests.MaxFileSize=50MB
+
+log4j.appender.requests.MaxBackupIndex=5 
+
+log4j.appender.polling=org.apache.log4j.RollingFileAppender
+
+log4j.appender.polling.File=logs/manager-polling.log
+
+log4j.appender.polling.layout=org.apache.log4j.PatternLayout
+
+log4j.appender.polling.layout.ConversionPattern=%d %5p [%t] %m %C:%L%n
+
+log4j.appender.polling.MaxFileSize=50MB
+
+log4j.appender.polling.MaxBackupIndex=5
+
+
+### ECOMP Logging
+
+log4j.logger.org.openecomp.audit=info, audit
+
+log4j.additivity.org.openecomp.audit=false
+
+log4j.logger.org.openecomp.metrics=info, metrics
+
+log4j.additivity.org.openecomp.metrics=false
+
+log4j.logger.org.openecomp.error=info, error
+
+log4j.additivity.org.openecomp.error=false
+
+log4j.logger.com.att.eelf.debug=info, debug
+
+log4j.additivity.org.openecomp.debug=false
+
+log4j.appender.audit=org.apache.log4j.RollingFileAppender
+
+log4j.appender.audit.File=logs/audit.log
+
+log4j.appender.audit.layout=org.apache.log4j.PatternLayout
+
+log4j.appender.audit.layout.ConversionPattern=%d{MM/dd-HH:mm:ss.SSS}|%X{RequestId}|%X{ServiceInstanceId}|%t|%X{ServiceName}|%X{InstanceUUID}|%5p|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{Timer}|%m%n
+
+log4j.appender.audit.MaxFileSize=50MB
+
+log4j.appender.audit.MaxBackupIndex=5
+
+log4j.appender.metrics=org.apache.log4j.RollingFileAppender
+
+log4j.appender.metrics.File=logs/metrics.log
+
+log4j.appender.metrics.layout=org.apache.log4j.PatternLayout
+
+log4j.appender.metrics.layout.ConversionPattern=%d{MM/dd-HH:mm:ss.SSS}|%X{RequestId}|%X{ServiceInstanceId}|%t|%X{ServiceName}|%X{InstanceUUID}|%p|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{Timer}|%m%n
+
+log4j.appender.metrics.MaxFileSize=50MB
+
+log4j.appender.metrics.MaxBackupIndex=5
+
+log4j.appender.error=org.apache.log4j.RollingFileAppender
+
+log4j.appender.error.File=logs/error.log
+
+log4j.appender.error.layout=org.apache.log4j.PatternLayout
+
+log4j.appender.error.layout.ConversionPattern=%d{MM/dd-HH:mm:ss.SSS}|%X{RequestId}|%X{ServiceInstanceId}|%t|%X{ServiceName}|%X{InstanceUUID}|%p|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{Timer}|%m%n
+
+log4j.appender.error.MaxFileSize=50MB
+
+log4j.appender.error.MaxBackupIndex=5
+
+log4j.appender.debug=org.apache.log4j.RollingFileAppender
+
+log4j.appender.debug.File=logs/debug.log
+
+log4j.appender.debug.layout=org.apache.log4j.PatternLayout
+
+log4j.appender.debug.layout.ConversionPattern=%d{MM/dd-HH:mm:ss.SSS}|%X{RequestId}|%X{ServiceInstanceId}|%t|%X{ServiceName}|%X{InstanceUUID}|%p|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{Timer}|%m%n
+
+log4j.appender.debug.MaxFileSize=50MB
+
+log4j.appender.debug.MaxBackupIndex=5
+
+
diff --git a/OPENECOMP-DEMO/vm-config/vm-postgresql/manager.properties b/OPENECOMP-DEMO/vm-config/vm-postgresql/manager.properties
new file mode 100644
index 0000000..ae472f9
--- /dev/null
+++ b/OPENECOMP-DEMO/vm-config/vm-postgresql/manager.properties
@@ -0,0 +1,7 @@
+server.dir = data/resources
+metrics.dir = data/metrics
+properties.dir = data/properties
+server.port = 9999
+server.user.console = MDBmMzE0NTgyMDU1NmVj
+server.user.gui = M2NiOTg1YzNiYTI2NTJh
+server.user.client = OTNmMmFkYzkxMzYzNTk0
diff --git a/OPENECOMP-DEMO/vm-config/vm-postgresql/runtime.properties b/OPENECOMP-DEMO/vm-config/vm-postgresql/runtime.properties
new file mode 100644
index 0000000..624b830
--- /dev/null
+++ b/OPENECOMP-DEMO/vm-config/vm-postgresql/runtime.properties
@@ -0,0 +1,2 @@
+factory.vm=org.openecomp.dcae.controller.service.servers.vm.DcaeVmFactory
+factory.postgres=org.openecomp.dcae.controller.service.storage.postgres.service.impl.ServicePackageImpl
diff --git a/OPENECOMP-DEMO/vm-descriptors/vm-cdap-cluster.json b/OPENECOMP-DEMO/vm-descriptors/vm-cdap-cluster.json
new file mode 100644
index 0000000..5537ab5
--- /dev/null
+++ b/OPENECOMP-DEMO/vm-descriptors/vm-cdap-cluster.json
@@ -0,0 +1,9 @@
+{
+  $class : "org.openecomp.dcae.controller.service.vm.VirtualMachineServiceDescriptor",
+  groupId : "org.openecomp.dcae.controller",
+  artifact : "dcae-controller-service-cdap-cluster",
+  version : "0.1.0-SNAPSHOT",
+  servicePackage : "org.openecomp.dcae.controller.service.cdap.cluster.service",
+  serviceClass : "CdapClusterService",
+  serviceInstanceClass : "CdapClusterServiceInstance",
+}
diff --git a/OPENECOMP-DEMO/vm-descriptors/vm-controller.json b/OPENECOMP-DEMO/vm-descriptors/vm-controller.json
new file mode 100644
index 0000000..bb24bc3
--- /dev/null
+++ b/OPENECOMP-DEMO/vm-descriptors/vm-controller.json
@@ -0,0 +1,8 @@
+{
+  $class : "org.openecomp.dcae.controller.service.vm.VirtualMachineServiceDescriptor",
+  groupId : "org.openecomp.dcae.controller",
+  servicePackage : "org.openecomp.dcae.controller.platform.controller",
+  serviceClass : "ControllerVirtualMachineService",
+  serviceInstanceClass : "VirtualMachineServiceInstance",
+  vmType : "dcae-controller",
+}
diff --git a/OPENECOMP-DEMO/vm-descriptors/vm-docker-host-1.json b/OPENECOMP-DEMO/vm-descriptors/vm-docker-host-1.json
new file mode 100644
index 0000000..90d7bba
--- /dev/null
+++ b/OPENECOMP-DEMO/vm-descriptors/vm-docker-host-1.json
@@ -0,0 +1,9 @@
+{
+  $class : "org.openecomp.dcae.controller.service.vm.VirtualMachineServiceDescriptor",
+  groupId : "org.openecomp.dcae.controller",
+  artifact : "dcae-controller-service-docker-host",
+  version : "0.1.0-SNAPSHOT",
+  servicePackage : "org.openecomp.dcae.controller.service.docker.host.service",
+  serviceClass : "DockerHostService",
+  serviceInstanceClass : "DockerHostServiceInstance",
+}
diff --git a/OPENECOMP-DEMO/vm-descriptors/vm-postgresql.json b/OPENECOMP-DEMO/vm-descriptors/vm-postgresql.json
new file mode 100644
index 0000000..45d7623
--- /dev/null
+++ b/OPENECOMP-DEMO/vm-descriptors/vm-postgresql.json
@@ -0,0 +1,9 @@
+{
+  $class : "org.openecomp.dcae.controller.service.vm.VirtualMachineServiceDescriptor",
+  groupId : "org.openecomp.dcae.controller",
+  artifact : "dcae-controller-service-common-vm",
+  version : "0.1.0-SNAPSHOT",
+  servicePackage : "org.openecomp.dcae.controller.service.common.vm.service",
+  serviceClass : "CommonVmService",
+  serviceInstanceClass : "CommonVmServiceInstance",
+}
diff --git a/OPENECOMP-DEMO/vm-templates/vm-cdap-cluster.yaml b/OPENECOMP-DEMO/vm-templates/vm-cdap-cluster.yaml
new file mode 100644
index 0000000..c4530d4
--- /dev/null
+++ b/OPENECOMP-DEMO/vm-templates/vm-cdap-cluster.yaml
@@ -0,0 +1,156 @@
+### Description of VM itself
+description: VMs that runs Hadoop and CDAP 
+short-name: cdap
+number-vms-per-location: 3
+application-ids: [ dcae ]
+dns-service: 
+  drsub: 
+    dns-type : arecords
+    cluster-type : site
+admin-id: ubuntu
+
+installation-steps:
+
+- step: shell
+  command: cp /tmp/ecomp-nexus.crt /usr/local/share/ca-certificates/ ; update-ca-certificates
+  application-id: root
+
+- step: shell
+  command: echo 162.242.254.138 ecomp-nexus >> /etc/hosts
+  application-id: root
+
+- step: shell
+  command: |
+    echo nameserver 10.0.0.1 >>  /etc/resolv.conf
+    echo "prepend domain-name-servers 10.0.0.1;" >> /etc/dhcp/dhclient.conf
+    echo nameserver 10.0.0.1 >> /etc/resolvconf/resolv.conf.d/head
+
+- step: shell
+  command: |
+    apt-get update ; apt-get install -y maven openjdk-7-jdk unzip python-pip
+    pip install pyyaml
+  application-id: root
+  
+- step: shell
+  command: |
+    (cd /opt/app ; curl -Lo apache-groovy-binary-2.4.6.zip https://dl.bintray.com/groovy/maven/apache-groovy-binary-2.4.6.zip )
+    (cd /opt/app ; unzip apache-groovy-binary-2.4.6.zip )
+    mkdir -p /opt/app/java/jdk
+    ln -s /usr /opt/app/java/jdk/jdk170
+    mkdir -p /opt/app/groovy
+    ln -s /opt/app/groovy-2.4.6 /opt/app/groovy/246
+  application-id: root
+
+#- step: maven-artifact
+#  group-id: org.openecomp.dcae.controller
+#  artifact-id: dcae-controller-core-utils
+#  version: ${dcae.env('open-ecomp-demo.versions.controller')}
+#  type: zip
+#  assembly-id: runtime
+#  application-id: dcae
+  
+- step: http
+  url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae/zip-snapshots/dcae-controller-core-utils-${dcae.env('open-ecomp-demo.versions.controller')}-runtime.zip
+  user-name: ${dcae.env('open-ecomp-demo.maven.user')}
+  password: ${dcae.env('open-ecomp-demo.maven.password')}
+  type: zip
+  artifact-id: dcae-controller-core-utils
+  application-id: dcae
+
+- step: shell
+  command: |
+    /opt/app/dcae-controller-core-utils/bin/fs-init.py
+      
+- step: maven-artifact
+  group-id: org.openecomp.dcae.controller
+  artifact-id: dcae-controller-service-cdap-cluster-manager
+  version: ${dcae.env('open-ecomp-demo.versions.controller')}
+  type: zip
+  assembly-id: runtime
+  application-id: dcae
+
+- step: maven-artifact
+  group-id: org.openecomp.dcae.controller
+  artifact-id: dcae-controller-service-dmaap-drsub
+  version: ${dcae.env('open-ecomp-demo.versions.controller')}
+  type: zip
+  assembly-id: runtime
+  application-id: dcae
+
+- step: http
+  url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae/deb-snapshots/org.openecomp.dcae.apod/dcae-cdap-small-hadoop_${dcae.env('open-ecomp-demo.versions.apod')}.deb
+  user-name: ${dcae.env('open-ecomp-demo.maven.user')}
+  password: ${dcae.env('open-ecomp-demo.maven.password')}
+  type: deb
+
+- step: http
+  url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae/deb-snapshots/org.openecomp.dcae.apod/dcae-analytics-tca_${dcae.env('open-ecomp-demo.versions.apod')}.deb
+  user-name: ${dcae.env('open-ecomp-demo.maven.user')}
+  password: ${dcae.env('open-ecomp-demo.maven.password')}
+  type: deb
+
+- step: http
+  url: http://repo1.maven.org/maven2/co/cask/cdap/HelloWorld/3.5.1/HelloWorld-3.5.1.jar
+  artifact-id: cask-hello-world
+  type: jar
+
+- step: shell
+  command: |
+    case \\\\\$(hostname -a) in
+      *openecomp.org*)
+        sed -i /`hostname`/d /etc/hosts
+        cat /tmp/vm-*-hosts >> /etc/hosts
+      ;;
+    esac
+    bash /opt/app/dcae-cdap-small-hadoop/install.sh
+    sudo su dcae -c "/opt/app/dcae-controller-service-cdap-cluster-manager/bin/manager.sh config"
+    sudo su dcae -c "/opt/app/dcae-controller-service-cdap-cluster-manager/bin/manager.sh restart"
+  
+- step: maven-artifact
+  group-id: org.openecomp.dcae.controller
+  artifact-id: dcae-controller-service-dmaap-drsub-manager
+  version: ${dcae.env('open-ecomp-demo.versions.controller')}
+  type: zip
+  assembly-id: runtime
+  application-id: dcae
+
+lifecycle-management:
+  use-dcae-manager: yes
+  manager-port: 1999
+
+openstack-vm-type:  
+  volumeSizeGB: 75
+  memorySizeGB: 8
+  needPublicIp: true
+  numberOfCores: 8
+  rootDiskSizeGB: 40
+  diskSizeGB: 80
+  imageName: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
+  #Flavor details to be confirmed. May need to cretae a new flavor
+  openstack-flavor-name: 8 GB Performance
+  disk-partitions:
+    osType: ubuntu
+    volumes:
+      ephemeral:
+        uuid: ephemeral
+        size: 80
+        filesystems:
+          "/opt/tools" :
+            size: 80
+            type: ext4
+            mount_opts: ""
+      data:
+        uuid: cinder
+        size: 75
+        filesystems:
+          "/opt/data": 
+            size: 75
+            type: ext4
+            mount_opts: ''
+
+
+controller-instance-configuration: 
+  cluster: 
+    baseUrl: "http://localhost:10000/v3"
+    remote: "true"
+    
diff --git a/OPENECOMP-DEMO/vm-templates/vm-controller.yaml b/OPENECOMP-DEMO/vm-templates/vm-controller.yaml
new file mode 100644
index 0000000..fe2bd6a
--- /dev/null
+++ b/OPENECOMP-DEMO/vm-templates/vm-controller.yaml
@@ -0,0 +1,79 @@
+### Description of VM itself
+description: VM that runs the DCAE Controller
+short-name: cont
+number-vms-per-location: 1
+application-ids: [ dcae ]
+admin-id: ubuntu
+dns-gss: [ gss ]
+dns-cnames: [ global ]
+installation-steps:
+
+- step: shell
+  command: cp /tmp/ecomp-nexus.crt /usr/local/share/ca-certificates/ ; update-ca-certificates
+  application-id: root
+
+- step: shell
+  command: echo 162.242.254.138 ecomp-nexus >> /etc/hosts
+  application-id: root
+
+- step: shell
+  command: |
+    apt-get update ; apt-get install -y maven openjdk-7-jdk python-pip
+    pip install pyyaml
+  application-id: root
+  
+- step: shell
+  command: |
+    export SDKMAN_DIR=/opt/app/sdkman
+    curl -s get.sdkman.io | bash 
+    source /opt/app/sdkman/bin/sdkman-init.sh
+    echo Y | sdk install groovy 
+    mkdir -p /opt/app/java/jdk
+    ln -s /usr /opt/app/java/jdk/jdk170
+    mkdir -p /opt/app/groovy
+    ln -s /opt/app/sdkman/candidates/groovy/current /opt/app/groovy/246
+  application-id: root
+
+ 
+- step: maven-artifact
+  group-id: org.openecomp.dcae.controller
+  artifact-id: dcae-controller-platform-server
+  version: ${dcae.env('open-ecomp-demo.versions.controller')}
+  type: zip
+  assembly-id: runtime
+  application-id: dcae
+
+openstack-vm-type:  
+  volumeSizeGB: 1024
+  dev-volumeSizeGB: 100 
+  memorySizeGB: 8
+  dev-memorySizeGB: 8
+  needPublicIp: true
+  numberOfCores: 4
+  dev-numberOfCores: 4
+  rootDiskSizeGB: 80
+  imageName: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
+  openstack-flavor-name: 8 GB Performance
+  disk-partitions:
+    osType: ubuntu
+    volumes:
+      opt:
+        uuid: ephemeral
+        size: 160
+        filesystems:
+          "/opt/tools" :
+            size: 20
+            type: ext4
+            mount_opts: ""
+      dcae-controller-platform-server:
+        uuid: cinder
+        size: 1024
+        filesystems:
+          "/opt/app/dcae-controller-platform-server" :
+            size: 1024
+            type: ext4
+            mount_opts: ""
+
+controller-instance-configuration: 
+  "$class": org.openecomp.dcae.controller.service.vm.VirtualMachineServiceInstance
+
diff --git a/OPENECOMP-DEMO/vm-templates/vm-docker-host.yaml b/OPENECOMP-DEMO/vm-templates/vm-docker-host.yaml
new file mode 100644
index 0000000..6727287
--- /dev/null
+++ b/OPENECOMP-DEMO/vm-templates/vm-docker-host.yaml
@@ -0,0 +1,192 @@
+description: VMs that runs Docker Host for Collectors
+short-name: coll
+number-vms-per-location: 1
+application-ids:
+- dcae
+admin-id: ubuntu
+
+lifecycle-management:
+  use-dcae-manager: yes
+  
+installation-steps:
+
+- step: shell
+  command: cp /tmp/ecomp-nexus.crt /usr/local/share/ca-certificates/ ; update-ca-certificates
+  application-id: root
+
+- step: shell
+  command: echo 162.242.254.138 ecomp-nexus >> /etc/hosts
+  application-id: root
+
+- step: shell
+  command: |
+    case \\\\\$(hostname -a) in
+      *openecomp.org*)
+        sed -i /`hostname`/d /etc/hosts
+        cat /tmp/vm-*-hosts >> /etc/hosts
+      ;;
+    esac
+    apt-get update ; apt-get install -y maven openjdk-7-jdk unzip python-pip
+    pip install libyaml
+  application-id: root
+  
+- step: shell
+  command: |
+    (cd /opt/app ; curl -Lo apache-groovy-binary-2.4.6.zip https://dl.bintray.com/groovy/maven/apache-groovy-binary-2.4.6.zip )
+    (cd /opt/app ; unzip apache-groovy-binary-2.4.6.zip )
+    mkdir -p /opt/app/java/jdk
+    ln -s /usr /opt/app/java/jdk/jdk170
+    mkdir -p /opt/app/groovy
+    ln -s /opt/app/groovy-2.4.6 /opt/app/groovy/246
+  application-id: root
+
+#- step: maven-artifact
+#  group-id: org.openecomp.dcae.controller
+#  artifact-id: dcae-controller-core-utils
+#  version: ${dcae.env('open-ecomp-demo.versions.controller')}
+#  type: zip
+#  assembly-id: runtime
+#  application-id: dcae
+  
+- step: http
+  url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae/zip-snapshots/dcae-controller-core-utils-${dcae.env('open-ecomp-demo.versions.controller')}-runtime.zip
+  user-name: ${dcae.env('open-ecomp-demo.maven.user')}
+  password: ${dcae.env('open-ecomp-demo.maven.password')}
+  type: zip
+  artifact-id: dcae-controller-core-utils
+  application-id: dcae
+
+- step: shell
+  command: |
+    /opt/app/dcae-controller-core-utils/bin/fs-init.py
+      
+- step: maven-artifact
+  group-id: org.openecomp.dcae.controller
+  artifact-id: dcae-controller-service-docker-host-manager
+  version: ${dcae.env('open-ecomp-demo.versions.controller')}
+  type: zip
+  assembly-id: runtime
+  application-id: dcae
+
+- step: maven-artifact
+  group-id: org.openecomp.dcae.controller
+  artifact-id: dcae-controller-service-docker-model
+  version: ${dcae.env('open-ecomp-demo.versions.controller')}
+  type: jar
+  application-id: dcae
+  
+- step: maven-artifact
+  group-id: org.openecomp.dcae.controller
+  artifact-id: dcae-controller-service-docker-adaptor
+  version: ${dcae.env('open-ecomp-demo.versions.controller')}
+  type: jar
+  application-id: dcae
+  
+- step: maven-artifact
+  group-id: org.openecomp.dcae.controller
+  artifact-id: dcae-controller-service-standardeventcollector-model
+  version: ${dcae.env('open-ecomp-demo.versions.controller')}
+  type: jar
+  application-id: dcae
+  
+- step: maven-artifact
+  group-id: org.openecomp.dcae.controller
+  artifact-id: dcae-controller-service-standardeventcollector-manager
+  version: ${dcae.env('open-ecomp-demo.versions.controller')}
+  type: jar
+  application-id: dcae
+
+- step: shell
+  command: |
+    /opt/app/dcae-controller-core-utils/bin/install-docker.sh
+    adduser dcae docker
+    docker login -u ${dcae.env('open-ecomp-demo.maven.user')} -p ${dcae.env('open-ecomp-demo.maven.password')} ${dcae.env('open-ecomp-demo.docker.registry')} 
+    docker pull ${dcae.env('open-ecomp-demo.docker.registry')}/dcae-controller-common-event:${dcae.env('open-ecomp-demo.versions.collector')}
+    docker pull ${dcae.env('open-ecomp-demo.docker.registry')}/dcae_dmaapbc:${dcae.env('open-ecomp-demo.versions.databus-controller')}
+    sudo su dcae -c "/opt/app/dcae-controller-service-docker-host-manager/bin/manager.sh config"
+    sudo su dcae -c "/opt/app/dcae-controller-service-docker-host-manager/bin/manager.sh restart"
+    mkdir -p /var/config/DCAE
+    mkdir -p /var/log/DCAE
+    chown dcae:dcae /var/config/DCAE /var/log/DCAE
+    
+- step: shell
+  command: |
+    echo nameserver 10.0.0.1 >>  /etc/resolv.conf
+    echo "prepend domain-name-servers 10.0.0.1;" >> /etc/dhcp/dhclient.conf
+    echo nameserver 10.0.0.1 >> /etc/resolvconf/resolv.conf.d/head
+    
+- step: shell
+  command: |
+    mkdir /opt/docker
+    curl -L https://github.com/docker/compose/releases/download/1.9.0/docker-compose-`uname -s`-`uname -m` > /opt/docker/docker-compose
+    chmod +x /opt/docker/docker-compose
+    /opt/app/dcae-controller-core-utils/bin/dmaap_mr_prep.sh ${dcae.env('open-ecomp-demo.git.mr-repo')}
+      
+controller-instance-configuration:
+  serviceFqdn: ${dcae.serversFqdn()[0]}
+  dockerHost:
+    url: https://localhost:4243/v1.23
+    remote: 'true'
+openstack-vm-type:
+  volumeSizeGB: 75
+  memorySizeGB: 8
+  needPublicIp: true
+  numberOfCores: 8
+  rootDiskSizeGB: 40
+  diskSizeGB: 80
+  imageName: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
+  openstack-flavor-name: 8 GB Performance
+  disk-partitions:
+    osType: ubuntu
+    volumes:
+      opt:
+        uuid: ephemeral
+        size: 80
+        filesystems:
+          "/opt/tools" :
+            size: 80
+            type: ext4
+            mount_opts: ""
+      data:
+        uuid: cinder
+        size: 75
+        filesystems:
+          /data:
+            size: 75
+            type: ext4
+            mount_opts: ''
+
+vm-setup:
+  configuration-files:
+    main:
+      destination: /tmp/docker-databus-controller.conf
+      content: |-
+        # DMaaP Bus Controller OpenSource environment vars
+        CONT_DOMAIN=dcae.simpledemo.openecomp.org
+        DMAAPBC_INSTANCE_NAME=$dcae.instanceName
+        
+        #   The https port
+        #   set to 0 if certificate is not ready
+        DMAAPBC_INT_HTTPS_PORT=0
+        
+        DMAAPBC_KSTOREFILE=/opt/app/dcae-certificates
+        DMAAPBC_KSTOREPASS=foofoofoo
+        DMAAPBC_PVTKEYPASS=barbarbar
+        
+        DMAAPBC_PG_ENABLED=true
+        #DMAAPBC_PGHOST=zldciad1vipstg00.dcae.simpledemo.openecomp.org
+        DMAAPBC_PGHOST=10.0.4.101
+        DMAAPBC_PGCRED=test234-ftl
+        
+        DMAAPBC_DRPROV_FQDN=zldciad1vidrps00.simpledemo.openecomp.org
+        
+        DMAAPBC_AAF_URL=https://aafapi.\\${CONT_DOMAIN}:8095/proxy/
+        
+        DMAAPBC_TOPICMGR_USER=m99751@dmaapBC.openecomp.org
+        DMAAPBC_TOPICMGR_PWD=enc:zyRL9zbI0py3rJAjMS0dFOnYfEw_mJhO
+        DMAAPBC_ADMIN_USER=m99501@dcae.openecomp.org
+        DMAAPBC_ADMIN_PWD=enc:YEaHwOJrwhDY8a6usetlhbB9mEjUq9m
+        
+        DMAAPBC_PE_ENABLED=false
+        DMAAPBC_PE_AAF_ENV=TBD
+        
+\ No newline at end of file
diff --git a/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml b/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml
new file mode 100644
index 0000000..f9b3fe9
--- /dev/null
+++ b/OPENECOMP-DEMO/vm-templates/vm-postgresql.yaml
@@ -0,0 +1,203 @@
+### Description of VM itself
+description: VM that runs PostgreSQL Data Base as a Service
+short-name: pstg
+number-vms-per-location: 1
+application-ids: [ dcae ]
+admin-id: ubuntu
+dns-cnames: [ global ]
+dns-service: 
+  write: 
+    dns-type : gss
+    cluster-type : gss
+    
+lifecycle-management:
+  use-dcae-manager: yes
+
+installation-steps:
+
+- step: shell
+  command: cp /tmp/ecomp-nexus.crt /usr/local/share/ca-certificates/ ; update-ca-certificates
+  application-id: root
+
+- step: shell
+  command: echo 162.242.254.138 ecomp-nexus >> /etc/hosts
+  application-id: root
+
+- step: shell
+  command: |
+    case \\\\\$(hostname -a) in
+      *openecomp.org*)
+        sed -i /`hostname`/d /etc/hosts
+        cat /tmp/vm-*-hosts >> /etc/hosts
+      ;;
+    esac
+    apt-get update ; apt-get install -y maven openjdk-8-jdk unzip python-pip
+    pip install pyyaml
+  application-id: root
+  
+- step: shell
+  command: |
+    (cd /opt/app ; curl -Lo apache-groovy-binary-2.4.6.zip https://dl.bintray.com/groovy/maven/apache-groovy-binary-2.4.6.zip )
+    (cd /opt/app ; unzip apache-groovy-binary-2.4.6.zip )
+    mkdir -p /opt/app/java/jdk
+    ln -s /usr /opt/app/java/jdk/jdk170
+    mkdir -p /opt/app/groovy
+    ln -s /opt/app/groovy-2.4.6 /opt/app/groovy/246
+  application-id: root
+
+- step: shell
+  command: |
+    echo nameserver 10.0.0.1 >>  /etc/resolv.conf
+    echo "prepend domain-name-servers 10.0.0.1;" >> /etc/dhcp/dhclient.conf
+    echo nameserver 10.0.0.1 >> /etc/resolvconf/resolv.conf.d/head  
+
+#- step: maven-artifact
+#  group-id: org.openecomp.dcae.controller
+#  artifact-id: dcae-controller-core-utils
+#  version: ${dcae.env('open-ecomp-demo.versions.controller')}
+#  type: zip
+#  assembly-id: runtime
+#  application-id: dcae
+  
+- step: http
+  url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae/zip-snapshots/dcae-controller-core-utils-${dcae.env('open-ecomp-demo.versions.controller')}-runtime.zip
+  user-name: ${dcae.env('open-ecomp-demo.maven.user')}
+  password: ${dcae.env('open-ecomp-demo.maven.password')}
+  type: zip
+  artifact-id: dcae-controller-core-utils
+  application-id: dcae
+
+- step: shell
+  command: |
+    /opt/app/dcae-controller-core-utils/bin/fs-init.py
+
+- step: maven-artifact
+  group-id: org.openecomp.dcae.controller
+  artifact-id: dcae-controller-service-common-vm-manager
+  version: ${dcae.env('open-ecomp-demo.versions.controller')}
+  type: zip
+  assembly-id: runtime
+  application-id: dcae
+
+- step: maven-artifact
+  group-id: org.openecomp.dcae.controller
+  artifact-id: dcae-controller-service-storage-postgres-model
+  version: ${dcae.env('open-ecomp-demo.versions.controller')}
+  type: jar
+  application-id: dcae
+  
+- step: shell
+  command: |
+    # prevent servers from starting
+    echo  "exit 101" > /usr/sbin/policy-rc.d; chmod a+x /usr/sbin/policy-rc.d
+    apt-get update ; apt-get install -y postgresql libpq5 repmgr python-psycopg2 python3-psycopg2 libgetopt-java
+    rm -f /usr/sbin/policy-rc.d
+
+  application-id: root
+
+- step: http
+  url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae/deb-snapshots/org.openecomp.dcae.storage.pgaas/cdf_${dcae.env('open-ecomp-demo.versions.postgres')}.deb
+  user-name: ${dcae.env('open-ecomp-demo.maven.user')}
+  password: ${dcae.env('open-ecomp-demo.maven.password')}
+  type: deb
+
+- step: http
+  url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae/deb-snapshots/org.openecomp.dcae.storage.pgaas/postgresql-prep_${dcae.env('open-ecomp-demo.versions.postgres')}.deb
+  user-name: ${dcae.env('open-ecomp-demo.maven.user')}
+  password: ${dcae.env('open-ecomp-demo.maven.password')}
+  type: deb
+
+- step: http
+  url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae/deb-snapshots/org.openecomp.dcae.storage.pgaas/postgresql-config_${dcae.env('open-ecomp-demo.versions.postgres')}.deb
+  user-name: ${dcae.env('open-ecomp-demo.maven.user')}
+  password: ${dcae.env('open-ecomp-demo.maven.password')}
+  type: deb
+
+- step: http
+  url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae/deb-snapshots/org.openecomp.dcae.storage.pgaas/pgaas_${dcae.env('open-ecomp-demo.versions.postgres')}.deb
+  user-name: ${dcae.env('open-ecomp-demo.maven.user')}
+  password: ${dcae.env('open-ecomp-demo.maven.password')}
+  type: deb
+
+- step: http
+  url: ${dcae.env('open-ecomp-demo.maven.rawurl')}/org.openecomp.dcae/deb-snapshots/org.openecomp.dcae.storage.pgaas/pgaas-post_${dcae.env('open-ecomp-demo.versions.postgres')}.deb
+  user-name: ${dcae.env('open-ecomp-demo.maven.user')}
+  password: ${dcae.env('open-ecomp-demo.maven.password')}  
+  type: deb
+
+- step: shell
+  command: |
+    echo "dcae ALL=(postgres) NOPASSWD: ALL" > /etc/sudoers.d/dcae-postgres
+    sudo su dcae -c "/opt/app/dcae-controller-service-common-vm-manager/bin/manager.sh config"
+    sudo su dcae -c "/opt/app/dcae-controller-service-common-vm-manager/bin/manager.sh restart"
+   
+
+openstack-vm-type:  
+  volumeSizeGB: 75
+  memorySizeGB: 8
+  needPublicIp: true
+  numberOfCores: 8
+  rootDiskSizeGB: 40
+  diskSizeGB: 80
+  imageName: Ubuntu 16.04 LTS (Xenial Xerus) (PVHVM)
+  openstack-flavor-name: 8 GB Performance
+  disk-partitions:
+    osType: ubuntu
+    volumes:
+      opt:
+        uuid: ephemeral
+        size: 80
+        filesystems:
+          "/opt/tools" :
+            size: 80
+            type: ext4
+            mount_opts: ""
+      dbroot:
+        uuid: cinder
+        size: 75
+        filesystems:
+          "/dbroot/pgdata" :
+            size: 50
+            type: ext4
+            mount_opts: ""
+          "/dbroot/pglogs" :
+            size: 25
+            type: ext4
+            mount_opts: ""
+
+controller-instance-configuration: 
+  "$class": org.openecomp.dcae.controller.service.common.vm.service.CommonVmServiceInstance
+  script: sudo -u postgres /opt/app/pgaas/bin/dcae_admin_db
+  vmConfiguration: 
+    "$class": org.openecomp.dcae.controller.service.storage.postgres.service.PostgresServiceConfiguration
+    state: master
+    databases:
+      dmaap:
+        description: DMAAP Databus Configuration
+        ownerRole: dmaap_admin
+        roles:
+          dmaap_admin:
+            password: ${dcae.password('postgres.dmaap.admin')}
+            role: admin
+            roleComment: [ admin writer reader]
+          dmaap_user:
+            password: ${dcae.password('postgres.dmaap.user')}
+            role: writer
+            roleComment: [ admin writer reader]
+          dmaap_viewer:
+            password: ${dcae.password('postgres.dmaap.viewer')}
+            role: reader
+            roleComment: [ admin writer reader]
+vm-setup:
+  configuration-files:
+    main:
+      destination: /tmp/postgres.conf
+      content: |-
+        master:  ${ENV.PGAASMASTER ?: "TDB env.yaml@vm-templates.vm-postgresql.PGAASMASTER"}
+        secondmaster: ${ENV.PGAASMASTER2 ?: "TDB env.yaml@vm-templates.vm-postgresql.PGAASMASTER2"}
+        DRTR_NODE_KSTOREFILE: /opt/app/dcae-certificate/keystore.jks
+        DRTR_NODE_KSTOREPASS: "%{certPassword}"
+        DRTR_NODE_PVTKEYPASS: "%{certPassword}"
+        PG_NODES : ${dcae.allServersFqdn().join('|')}
+        PG_JAVA_HOME : /opt/app/java/jdk/jdk170
+        PG_CLUSTER : site
diff --git a/dcae-demo-controller/.classpath b/dcae-demo-controller/.classpath
new file mode 100644
index 0000000..fa00585
--- /dev/null
+++ b/dcae-demo-controller/.classpath
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/docker-build"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/dcae-demo-controller/.gitignore b/dcae-demo-controller/.gitignore
new file mode 100644
index 0000000..b83d222
--- /dev/null
+++ b/dcae-demo-controller/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/dcae-demo-controller/.project b/dcae-demo-controller/.project
new file mode 100644
index 0000000..2000556
--- /dev/null
+++ b/dcae-demo-controller/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>dcae-controller-opensource</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/dcae-demo-controller/.settings/org.eclipse.jdt.core.prefs b/dcae-demo-controller/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..abec6ca
--- /dev/null
+++ b/dcae-demo-controller/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,5 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/dcae-demo-controller/.settings/org.eclipse.m2e.core.prefs b/dcae-demo-controller/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/dcae-demo-controller/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/dcae-demo-controller/LICENSE.txt b/dcae-demo-controller/LICENSE.txt
new file mode 100644
index 0000000..30471b5
--- /dev/null
+++ b/dcae-demo-controller/LICENSE.txt
@@ -0,0 +1,22 @@
+
+/*-
+ * ============LICENSE_START==========================================
+ * OPENECOMP - DCAE
+ * ===================================================================
+ * 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============================================
+ */
+	
+ECOMP and OpenECOMP are trademarks and service marks of AT&T Intellectual Property.
diff --git a/dcae-demo-controller/pom.xml b/dcae-demo-controller/pom.xml
new file mode 100644
index 0000000..ba45ffa
--- /dev/null
+++ b/dcae-demo-controller/pom.xml
@@ -0,0 +1,231 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.openecomp.dcae.demo</groupId>
+	<artifactId>dcae-demo-controller</artifactId>
+	<version>0.1.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
+
+	
+	<pluginRepositories>
+		<!-- Black Duck plugin dependencies -->
+		<pluginRepository>
+			<id>JCenter</id>
+			<name>JCenter Repository</name>
+			<url>http://jcenter.bintray.com</url>
+		</pluginRepository>
+
+		<pluginRepository>
+			<id>Restlet</id>
+			<name>Restlet Repository</name>
+			<url>http://maven.restlet.com</url>
+		</pluginRepository>
+	</pluginRepositories>
+<build>
+		<plugins>
+		<!-- blackduck maven plugin -->
+			<plugin>
+				<groupId>com.blackducksoftware.integration</groupId>
+				<artifactId>hub-maven-plugin</artifactId>
+				<version>1.4.0</version>
+				<inherited>false</inherited>
+				<configuration>
+					<hubProjectName>${project.name}</hubProjectName>
+					<outputDirectory>${project.basedir}</outputDirectory>
+				</configuration>
+				<executions>
+					<execution>
+						<id>create-bdio-file</id>
+						<phase>package</phase>
+						<goals>
+							<goal>createHubOutput</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+       <!-- site maven plugin -->
+       <plugin>
+           <groupId>org.apache.maven.plugins</groupId>
+           <artifactId>maven-site-plugin</artifactId>
+           <version>3.6</version>
+           <dependencies>
+             <dependency>
+               <groupId>org.apache.maven.wagon</groupId>
+               <artifactId>wagon-webdav-jackrabbit</artifactId>
+               <version>2.10</version>
+             </dependency>
+           </dependencies>
+       </plugin>
+    
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<version>2.6</version>
+				<executions>
+					<execution>
+						<id>zipfile</id>
+						<goals>
+							<goal>single</goal>
+						</goals>
+						<phase>package</phase>
+						<configuration>
+							<attach>false</attach>
+							<finalName>${project.artifactId}-${project.version}</finalName>
+							<descriptors>
+								<descriptor>src/assembly/assemble_zip.xml</descriptor>
+							</descriptors>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<version>2.8</version>
+				<executions>
+					<execution>
+						<id>copy-dependencies</id>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<phase>prepare-package</phase>
+						<configuration>
+							<transitive>false</transitive>
+							<outputDirectory>${project.build.directory}/assembly/lib</outputDirectory>
+							<overWriteReleases>false</overWriteReleases>
+							<overWriteSnapshots>true</overWriteSnapshots>
+							<overWriteIfNewer>true</overWriteIfNewer>
+							<useRepositoryLayout>false</useRepositoryLayout>
+							<addParentPoms>false</addParentPoms>
+							<copyPom>false</copyPom>
+							<excludeGroupIds>org.opendaylight,com.brocade.odl,ch.qos.logback,org.bouncycastle</excludeGroupIds>
+							<includeScope>runtime</includeScope>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>sonar-maven-plugin</artifactId>
+				<version>3.2</version>
+			</plugin>
+			<plugin>
+				<artifactId>maven-scm-plugin</artifactId>
+				<version>1.8.1</version>
+				<configuration>
+					<tag>${project.artifactId}-${project.version}</tag>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.9</version>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-site-plugin</artifactId>
+				<version>3.6</version>
+				<dependencies>
+					<dependency>
+						<groupId>org.apache.maven.wagon</groupId>
+						<artifactId>wagon-webdav-jackrabbit</artifactId>
+						<version>2.10</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+		</plugins>
+	</build>
+
+
+	
+		<distributionManagement>
+			<repository>
+				<id>osecomp-nexus-releases</id>
+				<name>OSECOMP Release Repository</name>
+				<url>${openecomp.nexus.releases}</url>
+			</repository>
+			<snapshotRepository>
+				<id>osecomp-nexus-snapshots</id>
+				<name>OSECOMP Snapshot Repository</name>
+				<url>${openecomp.nexus.snapshots}</url>
+			</snapshotRepository>
+			<site>
+				<id>dcae-javadoc</id>
+				<url>${site.urlroot}/${project.artifactId}/${project.version}/</url>
+			</site>
+		</distributionManagement>
+	
+   <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.10.4</version>
+                <configuration>
+                    <failOnError>false</failOnError>
+                    <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
+                    <docletArtifact>
+                        <groupId>org.umlgraph</groupId>
+                        <artifactId>umlgraph</artifactId>
+                        <version>5.6</version>
+                    </docletArtifact>
+                    <additionalparam>-views</additionalparam>
+                    <useStandardDocletOptions>true</useStandardDocletOptions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </reporting>
+
+
+	<dependencies>
+		<dependency>
+			<groupId>org.openecomp.dcae.controller</groupId>
+			<artifactId>dcae-controller-platform-server</artifactId>
+			<version>${project.version}</version>
+			<type>zip</type>
+			<classifier>runtime</classifier>
+		</dependency>
+		<dependency>
+			<groupId>org.openecomp.dcae.controller</groupId>
+			<artifactId>dcae-controller-service-storage-postgres-model</artifactId>
+			<version>${project.version}</version>
+			<type>jar</type>
+		</dependency>
+		<dependency>
+			<groupId>org.openecomp.dcae.controller</groupId>
+			<artifactId>dcae-controller-service-standardeventcollector-manager</artifactId>
+			<version>${project.version}</version>
+			<type>jar</type>
+		</dependency>
+		<dependency>
+			<groupId>org.openecomp.dcae.controller</groupId>
+			<artifactId>dcae-controller-service-common-vm-manager</artifactId>
+			<version>${project.version}</version>
+			<type>jar</type>
+		</dependency>
+		<dependency>
+			<groupId>org.openecomp.dcae.controller</groupId>
+			<artifactId>dcae-controller-service-common-docker-manager</artifactId>
+			<version>${project.version}</version>
+			<type>jar</type>
+		</dependency>
+		<dependency>
+			<groupId>org.openecomp.dcae.controller</groupId>
+			<artifactId>dcae-controller-service-dmaap-drsub-manager</artifactId>
+			<version>${project.version}</version>
+			<type>jar</type>
+		</dependency>
+		<dependency>
+			<groupId>org.openecomp.dcae.controller</groupId>
+			<artifactId>dcae-controller-operation-utils</artifactId>
+			<version>${project.version}</version>
+			<type>jar</type>
+		</dependency>
+		<dependency>
+			<groupId>org.openecomp.dcae.controller.analytics</groupId>
+			<artifactId>dcae-analytics-cdap-common-model</artifactId>
+			<version>${project.version}</version>
+			<type>jar</type>
+		</dependency>
+	</dependencies>
+</project>
+\ No newline at end of file
diff --git a/dcae-demo-controller/set-versions.sh b/dcae-demo-controller/set-versions.sh
new file mode 100644
index 0000000..4f785c4
--- /dev/null
+++ b/dcae-demo-controller/set-versions.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+#set -e
+#set -v
+
+## go to location with clone GIT repositories
+cd $(dirname $(dirname $(dirname $0)))
+
+VERSION=$1
+
+
+
+## handle POM files with no parent
+for file in $(find dcae-* -name pom.xml); do
+   if [ "$(grep -c '<parent>' $file)" == "0" ]; then
+     ( cd $(dirname $file) ;  mvn versions:set versions:commit -DnewVersion=$VERSION -DprocessDependencies=false )
+   fi
+done 
+
+find . -name pom.xml.versionsBackup -delete
+
+## handle complete build pom
+FILE=dcae-org.openecomp.dcae.controller/pom-complete-build.xml
+sed -i "sX<version>.*</version><!--VERSION-->X<version>$VERSION</version><!--VERSION-->X" $FILE
+
diff --git a/dcae-demo-controller/src/assembly/assemble_zip.xml b/dcae-demo-controller/src/assembly/assemble_zip.xml
new file mode 100644
index 0000000..298661d
--- /dev/null
+++ b/dcae-demo-controller/src/assembly/assemble_zip.xml
@@ -0,0 +1,62 @@
+<!-- Defines how we build the .zip file which is our distribution. -->
+
+<assembly
+	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+	<id>runtime</id>
+	<formats>
+		<format>zip</format>
+	</formats>
+
+	<!-- we want "system" and related files right at the root level as this 
+		file is suppose to be unzip on top of a karaf distro. -->
+	<includeBaseDirectory>false</includeBaseDirectory>
+
+	<fileSets>
+		<fileSet>
+			<directory>target</directory>
+			<outputDirectory>lib</outputDirectory>
+			<includes>
+				<include>dcae-controller-platform-server-${project.version}.jar</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>target/assembly/</directory>
+			<outputDirectory>.</outputDirectory>
+			<excludes>
+			</excludes>
+		</fileSet>
+		<fileSet>
+			<directory>.</directory>
+			<outputDirectory>lib</outputDirectory>
+			<includes>
+				<include>*.jar</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>src/main/server-gen/bin</directory>
+			<outputDirectory>bin</outputDirectory>
+			<fileMode>0744</fileMode>
+			<excludes>
+			</excludes>
+		</fileSet>
+		<fileSet>
+			<directory>src/main/server/bin</directory>
+			<outputDirectory>bin</outputDirectory>
+			<fileMode>0744</fileMode>
+			<excludes>
+			</excludes>
+		</fileSet>
+		<fileSet>
+			<directory>src/main/server-gen/scripts</directory>
+			<outputDirectory>scripts</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>src/main/server/scripts</directory>
+			<outputDirectory>scripts</outputDirectory>
+		</fileSet>
+
+	</fileSets>
+
+</assembly>
diff --git a/dcae-demo-controller/src/main/docker-build/.gitignore b/dcae-demo-controller/src/main/docker-build/.gitignore
new file mode 100644
index 0000000..f257a25
--- /dev/null
+++ b/dcae-demo-controller/src/main/docker-build/.gitignore
@@ -0,0 +1,3 @@
+/lib/
+/config.tar.gz
+/controller.zip
diff --git a/dcae-demo-controller/src/main/docker-build/Dockerfile b/dcae-demo-controller/src/main/docker-build/Dockerfile
new file mode 100644
index 0000000..24f7a38
--- /dev/null
+++ b/dcae-demo-controller/src/main/docker-build/Dockerfile
@@ -0,0 +1,18 @@
+FROM ubuntu:14.04
+
+ENV DEBIAN_FRONTEND noninteractive
+
+ADD controller-install.sh /tmp/controller-install.sh
+ADD controller.zip /tmp/controller.zip
+ADD config.tar.gz /opt/app/dcae-controller-platform-server
+ADD controller-startup.sh /opt/app/dcae-controller-platform-server/bin/controller-startup.sh
+ADD controller-shutdown.sh /opt/app/dcae-controller-platform-server/bin/controller-shutdown.sh
+ADD lib /opt/app/dcae-controller-platform-server/lib
+ADD config /opt/app/dcae-controller-platform-server/config
+ADD controller.makefile /opt/app/dcae-controller-platform-server/Makefile
+ADD bash.setup.sh /root/bash.setup.sh
+
+RUN /bin/bash /tmp/controller-install.sh
+
+CMD ["/bin/bash", "-c", "/opt/app/dcae-controller-platform-server/bin/controller-startup.sh"]
+
diff --git a/dcae-demo-controller/src/main/docker-build/bash.setup.sh b/dcae-demo-controller/src/main/docker-build/bash.setup.sh
new file mode 100644
index 0000000..b2120d4
--- /dev/null
+++ b/dcae-demo-controller/src/main/docker-build/bash.setup.sh
@@ -0,0 +1,15 @@
+export JAVA_HOME=/opt/app/java/jdk/jdk170
+export GROOVY_HOME=/opt/app/groovy/246
+
+PATH=$JAVA_HOME/bin:$GROOVY_HOME/bin:$PATH
+
+: ${USER:=root}
+PS1="${USER}@`hostname` \!:: "
+alias ll='ls -lrt'
+alias hi='history 100'
+alias rm='rm -i'
+bind '"\C-p": history-search-backward' '"\C-n": history-search-forward'
+
+cd /opt/app/*server
+
+export ZONE=$(grep ZONE /opt/app/dcae-controller/config.yaml | sed s/ZONE:.//)
diff --git a/dcae-demo-controller/src/main/docker-build/build.sh b/dcae-demo-controller/src/main/docker-build/build.sh
new file mode 100644
index 0000000..df42c9f
--- /dev/null
+++ b/dcae-demo-controller/src/main/docker-build/build.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+set -e
+set -x
+
+## ensure we are in the right directory.
+cd $(dirname $(readlink -e $0))
+
+ROOT=../../..
+
+## setup files
+
+rm -rf lib/
+mkdir -p lib
+
+# copy core controller ZIP file
+
+cp $ROOT/target/assembly/lib/*zip controller.zip
+VERSION=$(grep version $ROOT/pom.xml | head -1 | sed 'sX</.*XX' | sed 's/.*>//')
+
+# copy JAR required by controller
+cp $ROOT/target/assembly/lib/*.jar lib/
+
+# copy configuration files for controller
+( 
+  cd $ROOT/..
+  tar cfz - OPENECOMP-DEMO OPENECOMP-DEMO-RACKSPACE 
+) > config.tar.gz
+
+if [ "$1" == "nobuild" ]; then exit; fi
+
+## build Docker
+
+docker build -t dcae-controller:$VERSION .
+
diff --git a/dcae-demo-controller/src/main/docker-build/config/server.private b/dcae-demo-controller/src/main/docker-build/config/server.private
new file mode 100644
index 0000000..d22abd8
--- /dev/null
+++ b/dcae-demo-controller/src/main/docker-build/config/server.private
@@ -0,0 +1,12 @@
+MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAKvTz/PWFys6+9A0XDVXxWXrwGbb
+xZgLjHRrmTCbHOFN2wRKUMAOuURxJoQ5iYs0mmKCwHqMph2CihQFNQE5oKYXa0LgZTzqLxlkqjso
+J+3hZ5dN2Vai+OUBP6z/ouJz9I+dsUHtjWdhcctXkqOq7eBxLvNVF9m7PrvdNTw3Wc8FAgMBAAEC
+gYAwVA38Vi4EEb37zI5Wzo4N4aYnCA9meXES2aSnoCkaUayVY1Wc/0cqseyUah5+kdgOdxouHdsn
+F61AfkpvQsclGhq9tstZZbX66ogFYJmzDccuKyRzOoJIv2R4wAskCaMirgXkRsPDHQqu/vaCidWP
+rWM3FIA6HV4iiPfP6KofLQJBANOpbMi6zVbxIzTzs0pCHJQRHJ57NlOCuahUTcJb6CC0fwGoRPCh
+k6YQdtVjtLwrId7GQx0UdlMBc3Dk/zyOcWMCQQDP0joQ0WrL+9TgIoaxCbkk3VHkHr/fKz1A7nsi
+K0wy5wJ/OSJdn64cmZcmEfg4EyZNmD+sXR/41tTbxlg4uJ53AkEAj3U+wRIzSKEpjqM6OrNycTzj
+29qA6LsqoJd7GKd4Pmp3xqTJDRtGWoDAOkNY5UyKqVZReK08wWezWaosAFw/JwJATI420aczXj1A
+p+hQEbtxNoFI/23MZJt7DwZK2cV1ZnLu2orje/Wsn+B8a4vHEnELdR4WppoPgw0wkF06dnqb9QJA
+PONjPqdGNsaaZU459UGImdjWXabfiVnbF5kJ1bFxSmleeewagrHL2O9dOJpgkf/izxJh/0K4aV/v
+KtwC4O8dSg==
diff --git a/dcae-demo-controller/src/main/docker-build/config/server.public b/dcae-demo-controller/src/main/docker-build/config/server.public
new file mode 100644
index 0000000..b2d3bb3
--- /dev/null
+++ b/dcae-demo-controller/src/main/docker-build/config/server.public
@@ -0,0 +1,3 @@
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCr08/z1hcrOvvQNFw1V8Vl68Bm28WYC4x0a5kw
+mxzhTdsESlDADrlEcSaEOYmLNJpigsB6jKYdgooUBTUBOaCmF2tC4GU86i8ZZKo7KCft4WeXTdlW
+ovjlAT+s/6Lic/SPnbFB7Y1nYXHLV5Kjqu3gcS7zVRfZuz673TU8N1nPBQIDAQAB
diff --git a/dcae-demo-controller/src/main/docker-build/controller-install.sh b/dcae-demo-controller/src/main/docker-build/controller-install.sh
new file mode 100644
index 0000000..51c4f82
--- /dev/null
+++ b/dcae-demo-controller/src/main/docker-build/controller-install.sh
@@ -0,0 +1,20 @@
+
+set -e
+
+apt-get update ; apt-get install -y maven openjdk-7-jdk curl dnsutils zip telnet
+
+### GROOVY
+(cd /opt/app ; curl -Lo apache-groovy-binary-2.4.6.zip https://dl.bintray.com/groovy/maven/apache-groovy-binary-2.4.6.zip )
+(cd /opt/app ; unzip apache-groovy-binary-2.4.6.zip )
+mkdir -p /opt/app/groovy
+ln -s /opt/app/groovy-2.4.6 /opt/app/groovy/246
+
+### JAVA
+mkdir -p /opt/app/java/jdk
+ln -s /usr /opt/app/java/jdk/jdk170
+
+mkdir -p /opt/app/dcae-controller-platform-server
+
+(cd /opt/app/dcae-controller-platform-server ; unzip -o /tmp/controller.zip)
+
+chmod +x /opt/app/dcae-controller-platform-server/bin/*
diff --git a/dcae-demo-controller/src/main/docker-build/controller-shutdown.sh b/dcae-demo-controller/src/main/docker-build/controller-shutdown.sh
new file mode 100644
index 0000000..7f8c6b3
--- /dev/null
+++ b/dcae-demo-controller/src/main/docker-build/controller-shutdown.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -v
+
+export JAVA_HOME=/opt/app/java/jdk/jdk170
+export GROOVY_HOME=/opt/app/groovy/246
+export PATH=$JAVA_HOME/bin:$GROOVY_HOME/bin:/opt/app/git/2.4.1/bin:$PATH
+
+export ZONE=$(grep ZONE /opt/app/dcae-controller/config.yaml | sed s/ZONE:.//)
+
+cd /opt/app/dcae-controller-platform-server
+
+bin/dcae-controller.sh restart
+
+bin/dcae-controller.sh undeploy-service-instance -i $ZONE -s vm-docker-host-1
+bin/dcae-controller.sh undeploy-service-instance -i $ZONE -s vm-postgresql
+bin/dcae-controller.sh undeploy-service-instance -i $ZONE -s vm-cdap-cluster
diff --git a/dcae-demo-controller/src/main/docker-build/controller-startup.sh b/dcae-demo-controller/src/main/docker-build/controller-startup.sh
new file mode 100644
index 0000000..b64f8cc
--- /dev/null
+++ b/dcae-demo-controller/src/main/docker-build/controller-startup.sh
@@ -0,0 +1,70 @@
+#!/bin/bash
+
+set -v
+
+apt-get install -y make 
+
+export JAVA_HOME=/opt/app/java/jdk/jdk170
+export GROOVY_HOME=/opt/app/groovy/246
+export PATH=$JAVA_HOME/bin:$GROOVY_HOME/bin:/opt/app/git/2.4.1/bin:$PATH
+
+
+cd /opt/app/dcae-controller-platform-server
+
+export ZONE=$(grep ZONE /opt/app/dcae-controller/config.yaml | sed s/ZONE:.//)
+
+OPENSTACK_KEYNAME=$(grep OPENSTACK-KEYNAME /opt/app/dcae-controller/config.yaml | sed s/OPENSTACK-KEYNAME:.//)
+NETWORK=$(grep OPENSTACK-PRIVATE-NETWORK /opt/app/dcae-controller/config.yaml | sed s/OPENSTACK-PRIVATE-NETWORK:.//)
+
+echo nameserver 10.0.0.1 >> /etc/resolv.conf
+
+make gen-config sync restart
+
+## need to do 2 syncs to get all references working.
+make sync
+
+cat OPENECOMP-DEMO-$ZONE/hosts >> /etc/hosts
+
+## Add SSL CAs to Java 
+
+(echo changeit ; echo yes ) | keytool -importcert -keystore /etc/ssl/certs/java/cacerts -alias simpledemo-root-ca -file config/simpledemo-root-ca.crt
+(echo changeit ; echo yes ) | keytool -importcert -keystore /etc/ssl/certs/java/cacerts -alias simpledemo-server-ca -file config/simpledemo-server-ca.crt
+
+bin/dcae-controller.sh undeploy-service-instance -i $ZONE -s vm-docker-host-1 &
+bin/dcae-controller.sh undeploy-service-instance -i $ZONE -s vm-postgresql &
+bin/dcae-controller.sh undeploy-service-instance -i $ZONE -s vm-cdap-cluster &
+
+bin/dcae-controller.sh deploy-user -l $ZONE -p OPEN-ECOMP -u $OPENSTACK_KEYNAME
+
+NETWORKPATH=/openstack/locations/$ZONE/projects/OPEN-ECOMP/networks/$NETWORK
+
+sleep 1m
+bin/dcae-controller.sh wait-for --timeout 300 --frequency 5 --path $NETWORKPATH --exists --verbose
+bin/dcae-controller.sh deploy-service-instance -i $ZONE -s vm-docker-host-1 
+
+sleep 1m
+bin/dcae-controller.sh wait-for --timeout 300 --frequency 5 --path $NETWORKPATH --exists --verbose
+bin/dcae-controller.sh deploy-service-instance -i $ZONE -s vm-postgresql  
+
+sleep 2m
+bin/dcae-controller.sh wait-for --timeout 300 --frequency 5 --path $NETWORKPATH --exists --verbose
+bin/dcae-controller.sh deploy-service-instance -i $ZONE -s vm-cdap-cluster
+
+bin/dcae-controller.sh wait-for --timeout 900 --path /services/vm-docker-host-1/instances/$ZONE --attribute healthTestStatus --match GREEN --verbose
+bin/dcae-controller.sh wait-for --timeout 900 --path /services/vm-postgresql/instances/$ZONE --attribute healthTestStatus --match GREEN --verbose
+
+
+bin/dcae-controller.sh deploy-service-instance -i $ZONE -s docker-databus-controller
+
+
+
+bin/dcae-controller.sh wait-for --timeout 900 --path /services/vm-cdap-cluster/instances/$ZONE --attribute healthTestStatus --match GREEN --verbose
+#bin/dcae-controller.sh wait-for --timeout 900 --path /services/vm-controller/instances/$ZONE --attribute healthTestStatus --match GREEN --verbose
+
+bin/dcae-controller.sh deploy-service-instance -i $ZONE -s cdap-helloworld 
+bin/dcae-controller.sh deploy-service-instance -i $ZONE -s cdap-tca-hi-lo
+bin/dcae-controller.sh deploy-service-instance -i $ZONE -s docker-common-event
+
+
+while [ 1 ]; do sleep 1d; done
+
diff --git a/dcae-demo-controller/src/main/docker-build/controller.makefile b/dcae-demo-controller/src/main/docker-build/controller.makefile
new file mode 100644
index 0000000..40b570e
--- /dev/null
+++ b/dcae-demo-controller/src/main/docker-build/controller.makefile
@@ -0,0 +1,30 @@
+
+restart: stop start
+gen-config:
+	bin/dcae-controller.sh rackspace-substitute --from OPENECOMP-DEMO-RACKSPACE --to OPENECOMP-DEMO-$(ZONE) --file /opt/app/dcae-controller/config.yaml
+	java -cp 'lib/*' org.openecomp.dcae.controller.operation.utils.GenControllerConfiguration $(ZONE) . GITLINK OPENECOMP-DEMO
+sync:
+	bin/dcae-controller.sh sync-configuration --environment OPENECOMP-DEMO-$(ZONE)
+sync-careful:
+	bin/dcae-controller.sh stop
+	rm -r data/resources/databus*
+	rm -r data/resources/services/vm-*/instances/*/steps
+	rm -r data/resources/services/docker-*/instances/*
+	rm -r data/resources/services/cdap-*/instances/*
+	bin/dcae-controller.sh sync-configuration --environment OPENECOMP-DEMO-$(ZONE)
+start:
+	bin/dcae-controller.sh start
+start-debug:
+	bin/controller-platform-server-controller start -Djavax.net.debug=all
+stop:
+	bin/dcae-controller.sh stop
+console:
+	bin/dcae-controller.sh console
+S=3600
+wait:
+	@GROOVY_HOME=/opt/app/groovy/246 bin/dcae-controller.sh wait-for --timeout $S --path /services/docker-common-event/instances/$(ZONE) --attribute healthTestStatus --match GREEN
+	@GROOVY_HOME=/opt/app/groovy/246 bin/dcae-controller.sh wait-for --timeout 300 --path /services/cdap-tca-hi-lo/instances/$(ZONE) --attribute healthTestStatus --match GREEN
+status:
+	@GROOVY_HOME=/opt/app/groovy/246 bin/dcae-controller.sh report -n /reports/dcae/service-instances | cut -d\| -f 2,3,4,5,6 | grep DEP | grep -v cells | cut -c1-120
+	@GROOVY_HOME=/opt/app/groovy/246 bin/dcae-controller.sh report -n /reports/dcae/vms | cut -d\| -f 4,8 | grep zldc | grep -v cells
+	@cat logs/error.log | cut -d\| -f 4,5,13 | sort | uniq -c
diff --git a/dcae-demo-controller/src/main/docker-build/push.sh b/dcae-demo-controller/src/main/docker-build/push.sh
new file mode 100644
index 0000000..dd43aa9
--- /dev/null
+++ b/dcae-demo-controller/src/main/docker-build/push.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -e
+set -x
+
+## ensure we are in the right directory.
+cd $(dirname $(readlink -e $0))
+
+GITROOT=../../../../..
+VERSION=$(grep version $GITROOT/pom.xml | head -1 | sed 'sX</.*XX' | sed 's/.*>//')
+USER=$1
+PASSWORD=$2
+DOCKER_REG=$3
+TAG=$DOCKER_REG/dcae-controller:$VERSION
+
+docker tag dcae-controller:$VERSION $TAG
+docker login -u $USER -p $PASSWORD $DOCKER_REG
+docker push $TAG
+
diff --git a/dcae-demo-controller/src/main/resources/settings.xml b/dcae-demo-controller/src/main/resources/settings.xml
new file mode 100644
index 0000000..6432c83
--- /dev/null
+++ b/dcae-demo-controller/src/main/resources/settings.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+
+	<profiles>
+		<profile>
+			<id>open-ecomp</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<repositories>
+				<repository>
+					<id>osecomp-nexus-releases</id>
+					<name>OSECOMP Release Repository</name>
+					<url>https://ecomp-nexus:8443/repository/maven-releases</url>
+				</repository>
+				<repository>
+					<id>osecomp-nexus-snapshots</id>
+					<name>OSECOMP Snapshot Repository</name>
+					<url>https://ecomp-nexus:8443/repository/maven-snapshots</url>
+				</repository>
+				<repository>
+					<id>eclipse</id>
+					<url>https://repo.eclipse.org/content/repositories/releases</url>
+					<releases>
+						<enabled>true</enabled>
+						<updatePolicy>daily</updatePolicy>
+					</releases>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
+				</repository>
+			</repositories>
+		</profile>
+
+	</profiles>
+
+	<activeProfiles>
+		<activeProfile>open-ecomp</activeProfile>
+	</activeProfiles>
+
+	<servers>
+		<server>
+			<id>osecomp-nexus</id>
+			<username>USER</username>
+			<password>PASSWORD</password>
+		</server>
+		<server>
+			<username>USER</username>
+			<password>PASSWORD</password>
+			<id>osecomp-nexus-releases</id>
+		</server>
+		<server>
+			<username>USER</username>
+			<password>PASSWORD</password>
+			<id>osecomp-nexus-snapshots</id>
+		</server>
+		<server>
+			<username>USER</username>
+			<password>PASSWORD</password>
+			<id>dcae-javadoc</id>
+		</server>
+	</servers>
+</settings>
author	lj1412 <lji@research.att.com>	2017-02-14 15:12:15 +0000
committer	lj1412 <lji@research.att.com>	2017-02-14 15:12:17 +0000
commit	f80e6a127d51d68ff6c77196767ea8ea10e73243 (patch)
tree	4d0cf0ec81578cedcf196940730685f2bbf28870
parent	055adf10fbc9893772f4d799c5af053fe098e144 (diff)