Enable TCAgen2 to policy flow

Issue-ID: DCAEGEN2-2198
Signed-off-by: Kai Lu <lukai@chinamobile.com>
Change-Id: I316f4e3ad8e11320dae7c5bfa29333b6a48c1eeb

2 files changed, 28 insertions, 25 deletions

diff --git a/dcae-analytics/dcae-analytics-model/pom.xml b/dcae-analytics/dcae-analytics-model/pom.xml
index 16a7369..67a35a4 100644
--- a/dcae-analytics/dcae-analytics-model/pom.xml
+++ b/dcae-analytics/dcae-analytics-model/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
         <artifactId>dcae-analytics</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>dcae-analytics-model</artifactId>
diff --git a/dcae-analytics/dcae-analytics-model/src/main/java/org/onap/dcae/analytics/model/configbindingservice/ConfigBindingServiceConstants.java b/dcae-analytics/dcae-analytics-model/src/main/java/org/onap/dcae/analytics/model/configbindingservice/ConfigBindingServiceConstants.java
index 423e951..173293d 100644
--- a/dcae-analytics/dcae-analytics-model/src/main/java/org/onap/dcae/analytics/model/configbindingservice/ConfigBindingServiceConstants.java
+++ b/dcae-analytics/dcae-analytics-model/src/main/java/org/onap/dcae/analytics/model/configbindingservice/ConfigBindingServiceConstants.java
@@ -44,33 +44,36 @@ public abstract class ConfigBindingServiceConstants {
     // CONVERT JSON TO MAP
     public static final String KEY_SEPARATOR = ".";
     public static final String CONFIG = "config";
+    public static final String TCAPOLICY = "tca.policy";
+    public static final String ITEMS = "items";
     public static final int CONFIG_SERVICE_REFRESHPERIOD = 1;
 
-    public static final String POLICY = "config-binding-service.tca.policy";
-    public static final String PROCESSINGBATCHSIZE = "config-binding-service.tca.processing_batch_size";
-    public static final String ENABLEABATEMENT = "config-binding-service.tca.enable_abatement";
-    public static final String ENABLEECOMPLOGGING = "config-binding-service.tca.enable_ecomp_logging";
-    public static final String ENABLEENRICHMENT = "config-binding-service.tca.aai.enable_enrichment";
-    public static final String AAIURL = "config-binding-service.tca.aai.url";
-    public static final String AAIUSERNAME = "config-binding-service.tca.aai.username";
-    public static final String AAIPASSWORD = "config-binding-service.tca.aai.password";
-    public static final String AAIGENERICVNFPATH = "config-binding-service.tca.aai.generic_vnf_path";
-    public static final String AAINODEQUERYPATH = "config-binding-service.tca.aai.node_query_path";
-    public static final String PUBTOPICURL = "config-binding-service.streams_publishes.tca_handle_out.dmaap_info.topic_url";
-    public static final String PUBTYPE = "config-binding-service.streams_publishes.tca_handle_out.type";
+    public static final String POLICY = "config-binding-service.config.tca.policy";
+    public static final String POLICIES = "config-binding-service.policies";
+    public static final String PROCESSINGBATCHSIZE = "config-binding-service.config.tca.processing_batch_size";
+    public static final String ENABLEABATEMENT = "config-binding-service.config.tca.enable_abatement";
+    public static final String ENABLEECOMPLOGGING = "config-binding-service.config.tca.enable_ecomp_logging";
+    public static final String ENABLEENRICHMENT = "config-binding-service.config.tca.aai.enable_enrichment";
+    public static final String AAIURL = "config-binding-service.config.tca.aai.url";
+    public static final String AAIUSERNAME = "config-binding-service.config.tca.aai.username";
+    public static final String AAIPASSWORD = "config-binding-service.config.tca.aai.password";
+    public static final String AAIGENERICVNFPATH = "config-binding-service.config.tca.aai.generic_vnf_path";
+    public static final String AAINODEQUERYPATH = "config-binding-service.config.tca.aai.node_query_path";
+    public static final String PUBTOPICURL = "config-binding-service.config.streams_publishes.tca_handle_out.dmaap_info.topic_url";
+    public static final String PUBTYPE = "config-binding-service.config.streams_publishes.tca_handle_out.type";
     public static final String PUBKEY = "tca_handle_out";
-    public static final String SUBAUTOADJUSTINGSTEPUP = "config-binding-service.streams_subscribes.tca_handle_in.polling.auto_adjusting.step_up";
-    public static final String SUBAUTOADJUSTINGSTEPDOWN = "config-binding-service.streams_subscribes.tca_handle_in.polling.auto_adjusting.step_down";
-    public static final String SUBAUTOADJUSTINGMAX = "config-binding-service.streams_subscribes.tca_handle_in.polling.auto_adjusting.max";
-    public static final String SUBAUTOADJUSTINGMIN = "config-binding-service.streams_subscribes.tca_handle_in.polling.auto_adjusting.min";
-    public static final String SUBTOPICURL = "config-binding-service.streams_subscribes.tca_handle_in.dmaap_info.topic_url";
-    public static final String SUBFIXEDRATE = "config-binding-service.streams_subscribes.tca_handle_in.polling.fixed_rate";
-    public static final String SUBTYPE = "config-binding-service.streams_subscribes.tca_handle_in.type";
-    public static final String SUBCONSUMERGROUP = "config-binding-service.streams_subscribes.tca_handle_in.consumer_group";
-    public static final String SUBMESSAGELIMIT = "config-binding-service.streams_subscribes.tca_handle_in.message_limit";
-    public static final String SUBTIMEOUT = "config-binding-service.streams_subscribes.tca_handle_in.timeout";
-    public static final String SUBCONSUMERIDS0 = "config-binding-service.streams_subscribes.tca_handle_in.consumer_ids[0]";
-    public static final String SUBCONSUMERIDS1 = "config-binding-service.streams_subscribes.tca_handle_in.consumer_ids[1]";
+    public static final String SUBAUTOADJUSTINGSTEPUP = "config-binding-service.config.streams_subscribes.tca_handle_in.polling.auto_adjusting.step_up";
+    public static final String SUBAUTOADJUSTINGSTEPDOWN = "config-binding-service.config.streams_subscribes.tca_handle_in.polling.auto_adjusting.step_down";
+    public static final String SUBAUTOADJUSTINGMAX = "config-binding-service.config.streams_subscribes.tca_handle_in.polling.auto_adjusting.max";
+    public static final String SUBAUTOADJUSTINGMIN = "config-binding-service.config.streams_subscribes.tca_handle_in.polling.auto_adjusting.min";
+    public static final String SUBTOPICURL = "config-binding-service.config.streams_subscribes.tca_handle_in.dmaap_info.topic_url";
+    public static final String SUBFIXEDRATE = "config-binding-service.config.streams_subscribes.tca_handle_in.polling.fixed_rate";
+    public static final String SUBTYPE = "config-binding-service.config.streams_subscribes.tca_handle_in.type";
+    public static final String SUBCONSUMERGROUP = "config-binding-service.config.streams_subscribes.tca_handle_in.consumer_group";
+    public static final String SUBMESSAGELIMIT = "config-binding-service.config.streams_subscribes.tca_handle_in.message_limit";
+    public static final String SUBTIMEOUT = "config-binding-service.config.streams_subscribes.tca_handle_in.timeout";
+    public static final String SUBCONSUMERIDS0 = "config-binding-service.config.streams_subscribes.tca_handle_in.consumer_ids[0]";
+    public static final String SUBCONSUMERIDS1 = "config-binding-service.config.streams_subscribes.tca_handle_in.consumer_ids[1]";
     public static final String SUBKEY = "tca_handle_in";
 
     // ============== CONFIG BINDING SERVICE UTILS ========================= //