Deployment changes to support appc rebase

Change-Id: I8217dafeb8fe1f5b93d01bb8f666573d5c652d88
Signed-off-by: Patrick Brady <pb071s@att.com>

3 files changed, 21 insertions, 47 deletions

diff --git a/installation/appc/src/main/docker/Dockerfile b/installation/appc/src/main/docker/Dockerfile
index fc2ec81..212c878 100644
--- a/installation/appc/src/main/docker/Dockerfile
+++ b/installation/appc/src/main/docker/Dockerfile
@@ -1,5 +1,5 @@
 # Base ubuntu with added packages needed for open ecomp
-FROM openecomp/sdnc-image:1.1.0-SNAPSHOT
+FROM openecomp/sdnc-image:1.1.1-SNAPSHOT
 MAINTAINER APP-C Team (appc@lists.openecomp.org)
 
 # copy openecomp
diff --git a/installation/appc/src/main/scripts/installFeatures.sh b/installation/appc/src/main/scripts/installFeatures.sh
index fee9b4b..b4990bb 100644
--- a/installation/appc/src/main/scripts/installFeatures.sh
+++ b/installation/appc/src/main/scripts/installFeatures.sh
@@ -39,15 +39,15 @@ done
 }
 
 APPC_FEATURES=" \
+ appc-metric \
  appc-provider \
+ appc-dmaap-adapter \
  appc-event-listener \
- appc-dispatcher \
  appc-chef-adapter \
  appc-netconf-adapter \
  appc-rest-adapter \
- appc-dmaap-adapter \
+ appc-dispatcher \
  appc-dg-util \
- appc-metric \
  appc-dg-shared \
  appc-asdc-listener"
  
diff --git a/installation/src/main/appc-properties/appc.properties b/installation/src/main/appc-properties/appc.properties
index 0b6dc17..0cc30d9 100644
--- a/installation/src/main/appc-properties/appc.properties
+++ b/installation/src/main/appc-properties/appc.properties
@@ -19,22 +19,19 @@
 ###
 
 ###	                                        ###
-### Closed-Loop 1607 Properties (for demo)  ###
+### Properties for demo  ###
 ###	                                        ###
-appc.ClosedLoop1607.poolMembers=10.0.11.1:3904
-appc.ClosedLoop1607.topic.read=APPC-CL
-appc.ClosedLoop1607.topic.write=APPC-CL
-appc.ClosedLoop1607.client.name=APPC-TEST-CLIENT-DEMO-EXAMPLE
-appc.ClosedLoop1607.client.name.id=0
-#dmaap.client.key=J6JsbtSm4By5CWAr
-#dmaap.client.secret=kmadWKmItZTnajR9rBmcRCXG
-appc.ClosedLoop1607.threads.queuesize.min=1
-appc.ClosedLoop1607.threads.queuesize.max=1000
-appc.ClosedLoop1607.threads.poolsize.min=1
-appc.ClosedLoop1607.threads.poolsize.max=2
-appc.ClosedLoop1607.provider.user=admin
-appc.ClosedLoop1607.provider.pass=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
-appc.ClosedLoop1607.provider.url=http://localhost:8181/restconf/operations/appc-provider
+appc.demo.poolMembers=10.0.11.1:3904
+appc.demo.topic.read=APPC-DEMO-TOPIC
+appc.demo.topic.write=APPC-DEMO-TOPIC
+appc.demo.client.name=appcDemoEventListener
+appc.demo.threads.queuesize.min=1
+appc.demo.threads.queuesize.max=1000
+appc.demo.threads.poolsize.min=1
+appc.demo.threads.poolsize.max=2
+appc.demo.provider.user=admin
+appc.demo.provider.pass=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
+appc.demo.provider.url=http://localhost:8181/restconf/operations/appc-provider
 appc.provider.vfodl.url=http://admin:Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U@10.0.2.1:8282/restconf/config/network-topology:network-topology/topology/topology-netconf/node/NODE_NAME/yang-ext:mount/sample-plugin:sample-plugin/pg-streams/
 
 # The properties right below are needed to properly call the Master DG to serve demo purposes
@@ -72,15 +69,6 @@ provider1.tenant1.password=test
 dmaap.poolMembers=10.0.11.1:3904
 
 
-# appc-event-listener-bundle properties (DMaaP topics need to be defined in default.properties files in src/main and src/test).
-appc.ClosedLoop.poolMembers=10.0.11.1:3904
-appc.ClosedLoop.client.key=testCL
-appc.ClosedLoop.client.secret=testCL
-appc.ClosedLoop.provider.url=https://admin:Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U@localhost:8443/restconf/operations/appc-provider:topology-operation
-appc.ClosedLoop.provider.url.user=admin
-appc.ClosedLoop.provider.url.pass=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
-test.vm_url=http://api.appc.local/vm/9999999/test/99999999-9999-9999-9999-999999999999
-
 # appc-event-listener-bundle properties (only defined in src/test of default.properties)
 appc.LCM.poolMembers=10.0.11.1:3904
 appc.LCM.topic.read=testLCM
@@ -117,23 +105,9 @@ appc.asdc.consumer=APPC-ASDC-CONSUMER
 appc.asdc.consumer.id=APPC-ASDC-CONSUMER-ID
 appc.asdc.provider.url=http://localhost:8181/restconf/operations/AsdcMessage:configuration-document-request
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+# Properties used by EventSenderDmaapImpl.java
+DCAE.dmaap.event.topic.write=EventSenderTest
+DCAE.dmaap.appc.username=test
+DCAE.dmaap.appc.password=test
+DCAE.dmaap.event.pool.members=10.0.11.1:3904