summaryrefslogtreecommitdiffstats
path: root/dcae-analytics
diff options
context:
space:
mode:
authorKai <lukai@chinamobile.com>2020-04-23 13:38:24 +0800
committerKai <lukai@chinamobile.com>2020-05-01 14:53:26 +0800
commit92f2ade3327391adfc7dcafd3e11cf4111d6691d (patch)
treefd4b6dfe62d30e181ab0cb55e4e3a5d5617ea38a /dcae-analytics
parent53292c2237225f7451557c7cbe72af836ffefa24 (diff)
Enable TCAgen2 to policy flow
Issue-ID: DCAEGEN2-2198 Signed-off-by: Kai Lu <lukai@chinamobile.com> Change-Id: I316f4e3ad8e11320dae7c5bfa29333b6a48c1eeb
Diffstat (limited to 'dcae-analytics')
-rw-r--r--dcae-analytics/dcae-analytics-model/pom.xml2
-rw-r--r--dcae-analytics/dcae-analytics-model/src/main/java/org/onap/dcae/analytics/model/configbindingservice/ConfigBindingServiceConstants.java51
-rw-r--r--dcae-analytics/dcae-analytics-tca-core/pom.xml2
-rw-r--r--dcae-analytics/dcae-analytics-tca-model/pom.xml2
-rw-r--r--dcae-analytics/dcae-analytics-tca-web/pom.xml2
-rw-r--r--dcae-analytics/dcae-analytics-tca-web/src/main/java/org/onap/dcae/analytics/tca/web/TcaAppProperties.java27
-rw-r--r--dcae-analytics/dcae-analytics-tca-web/src/main/resources/config/application-dev.yaml97
-rw-r--r--dcae-analytics/dcae-analytics-test/pom.xml2
-rw-r--r--dcae-analytics/dcae-analytics-web/pom.xml2
-rw-r--r--dcae-analytics/pom.xml2
-rw-r--r--dcae-analytics/version.properties4
11 files changed, 111 insertions, 82 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 ========================= //
diff --git a/dcae-analytics/dcae-analytics-tca-core/pom.xml b/dcae-analytics/dcae-analytics-tca-core/pom.xml
index 2f386d8..2a2ba83 100644
--- a/dcae-analytics/dcae-analytics-tca-core/pom.xml
+++ b/dcae-analytics/dcae-analytics-tca-core/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-tca-core</artifactId>
diff --git a/dcae-analytics/dcae-analytics-tca-model/pom.xml b/dcae-analytics/dcae-analytics-tca-model/pom.xml
index b71b419..f400d58 100644
--- a/dcae-analytics/dcae-analytics-tca-model/pom.xml
+++ b/dcae-analytics/dcae-analytics-tca-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-tca-model</artifactId>
diff --git a/dcae-analytics/dcae-analytics-tca-web/pom.xml b/dcae-analytics/dcae-analytics-tca-web/pom.xml
index 2c8957a..1275c71 100644
--- a/dcae-analytics/dcae-analytics-tca-web/pom.xml
+++ b/dcae-analytics/dcae-analytics-tca-web/pom.xml
@@ -29,7 +29,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-tca-web</artifactId>
diff --git a/dcae-analytics/dcae-analytics-tca-web/src/main/java/org/onap/dcae/analytics/tca/web/TcaAppProperties.java b/dcae-analytics/dcae-analytics-tca-web/src/main/java/org/onap/dcae/analytics/tca/web/TcaAppProperties.java
index fe905f4..0214a3d 100644
--- a/dcae-analytics/dcae-analytics-tca-web/src/main/java/org/onap/dcae/analytics/tca/web/TcaAppProperties.java
+++ b/dcae-analytics/dcae-analytics-tca-web/src/main/java/org/onap/dcae/analytics/tca/web/TcaAppProperties.java
@@ -30,6 +30,11 @@ import org.onap.dcae.analytics.model.configbindingservice.BaseConfigBindingServi
import org.onap.dcae.analytics.model.configbindingservice.ConfigBindingServiceConstants;
import org.springframework.core.env.Environment;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+
import lombok.Data;
import lombok.ToString;
@@ -78,7 +83,7 @@ public class TcaAppProperties extends BaseConfigBindingServiceProperties {
public Tca getTca() {
Tca tca = new Tca();
- tca.setPolicy(environment.getProperty(ConfigBindingServiceConstants.POLICY));
+ tca.setPolicy(getPolicy());
tca.setProcessingBatchSize(environment.getProperty(ConfigBindingServiceConstants.PROCESSINGBATCHSIZE, Integer.class));
tca.setEnableAbatement(environment.getProperty(ConfigBindingServiceConstants.ENABLEABATEMENT, Boolean.class));
tca.setEnableEcompLogging(environment.getProperty(ConfigBindingServiceConstants.ENABLEECOMPLOGGING, Boolean.class));
@@ -95,6 +100,26 @@ public class TcaAppProperties extends BaseConfigBindingServiceProperties {
return tca;
}
+ /**
+ * Check policies items exist, and return policy.
+ * @return Policy policy
+ */
+ private String getPolicy() {
+
+ String policies = environment.getProperty(ConfigBindingServiceConstants.POLICIES);
+ if (policies == null) {
+ return environment.getProperty(ConfigBindingServiceConstants.POLICY);
+ }
+ JsonObject policiesObject = new JsonParser().parse(policies).getAsJsonObject();
+ JsonArray items = policiesObject.get(ConfigBindingServiceConstants.ITEMS).getAsJsonArray();
+ JsonElement policy = items.get(0)
+ .getAsJsonObject().get(ConfigBindingServiceConstants.CONFIG)
+ .getAsJsonObject().get(ConfigBindingServiceConstants.TCAPOLICY);
+
+ return policy.toString();
+
+ }
+
@Override
public Map<String, PublisherDetails> getStreamsPublishes() {
DmaapInfo dmaapInfo = new DmaapInfo();
diff --git a/dcae-analytics/dcae-analytics-tca-web/src/main/resources/config/application-dev.yaml b/dcae-analytics/dcae-analytics-tca-web/src/main/resources/config/application-dev.yaml
index e8f2fe8..93f953c 100644
--- a/dcae-analytics/dcae-analytics-tca-web/src/main/resources/config/application-dev.yaml
+++ b/dcae-analytics/dcae-analytics-tca-web/src/main/resources/config/application-dev.yaml
@@ -1,50 +1,51 @@
# DEV PROFILE SETTINGS
config-binding-service:
- tca:
- policy: "{\"domain\":\"measurementsForVfScaling\",\"metricsPerEventName\":[{\"eventName\":\"Mfvs_eNodeB_RANKPI\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"resource=vFirewall;type=configuration\",\"policyName\":\"configuration.dcae.microservice.tca.xml\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"CL-FRWL-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8\",\"closedLoopEventStatus\":\"ONSET\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\",\"thresholdValue\":4000,\"direction\":\"LESS_OR_EQUAL\",\"severity\":\"MAJOR\"},{\"closedLoopControlName\":\"CL-FRWL-HIGH-TRAFFIC-SIG-EA36FE84-9342-5E13-A656-EC5F21309A09\",\"closedLoopEventStatus\":\"ONSET\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\",\"thresholdValue\":20000,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\"},{\"closedLoopControlName\":\"CL-FRWL-HIGH-TRAFFIC-SIG-EA36FE84-9342-5E13-A656-EC5F21309A09\",\"closedLoopEventStatus\":\"ABATED\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\",\"thresholdValue\":0,\"direction\":\"EQUAL\",\"severity\":\"CRITICAL\"}]},{\"eventName\":\"vLoadBalancer\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"resource=vLoadBalancer;type=configuration\",\"policyName\":\"configuration.dcae.microservice.tca.xml\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"CL-LBAL-LOW-TRAFFIC-SIG-FB480F95-A453-6F24-B767-FD703241AB1A\",\"closedLoopEventStatus\":\"ONSET\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\",\"thresholdValue\":500,\"direction\":\"LESS_OR_EQUAL\",\"severity\":\"MAJOR\"},{\"closedLoopControlName\":\"CL-LBAL-LOW-TRAFFIC-SIG-0C5920A6-B564-8035-C878-0E814352BC2B\",\"closedLoopEventStatus\":\"ONSET\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\",\"thresholdValue\":5000,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\"}]},{\"eventName\":\"virtualVMEventName\",\"controlLoopSchemaType\":\"VM\",\"policyScope\":\"resource=virtualVM;type=configuration\",\"policyName\":\"configuration.dcae.microservice.tca.xml\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"CL-LBAL-LOW-TRAFFIC-SIG-FB480F95-A453-6F24-B767-FD703241AB1A\",\"closedLoopEventStatus\":\"ONSET\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\",\"thresholdValue\":500,\"direction\":\"LESS_OR_EQUAL\",\"severity\":\"MAJOR\"}]}]}"
- processing_batch_size: 10000
- enable_abatement: true
- enable_ecomp_logging: true
- aai:
- enable_enrichment: true
- url: "http://localhost:8443"
- username: "DCAE"
- password: "DCAE"
- generic_vnf_path: "aai/v11/network/generic-vnfs/generic-vnf"
- node_query_path: "aai/v11/search/nodes-query"
- service_calls:
- aai_broker_handle:
- - "135.205.226.128:32768"
- streams_publishes:
- tca_handle_out:
- type: "message_router"
- aaf_username: "USER"
- aaf_password: "PASSWORD"
- dmaap_info:
- client_role: "publisher"
- client_id: "tca-pub-0"
- location: "ecomp"
- topic_url: "http://localhost:8080/events/PubTopic"
- streams_subscribes:
- tca_handle_in:
- type: "message_router"
- aaf_username: "USER"
- aaf_password : "PASSWORD"
- dmaap_info:
- client_role: "subscriber"
- client_id: "tca-sub-0"
- location: "ecomp"
- topic_url: "http://localhost:8080/events/SubTopic"
- consumer_group: "cg1"
- consumer_ids:
- - "c0"
- - "c1"
- message_limit: 50000
- timeout: -1
- polling:
- fixed_rate: 0
- auto_adjusting:
- min: 30000
- step_up: 10000
- max: 60000
- step_down: 30000
+ config:
+ tca:
+ policy: "{\"domain\":\"measurementsForVfScaling\",\"metricsPerEventName\":[{\"eventName\":\"Mfvs_eNodeB_RANKPI\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"resource=vFirewall;type=configuration\",\"policyName\":\"configuration.dcae.microservice.tca.xml\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"CL-FRWL-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8\",\"closedLoopEventStatus\":\"ONSET\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\",\"thresholdValue\":4000,\"direction\":\"LESS_OR_EQUAL\",\"severity\":\"MAJOR\"},{\"closedLoopControlName\":\"CL-FRWL-HIGH-TRAFFIC-SIG-EA36FE84-9342-5E13-A656-EC5F21309A09\",\"closedLoopEventStatus\":\"ONSET\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\",\"thresholdValue\":20000,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\"},{\"closedLoopControlName\":\"CL-FRWL-HIGH-TRAFFIC-SIG-EA36FE84-9342-5E13-A656-EC5F21309A09\",\"closedLoopEventStatus\":\"ABATED\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\",\"thresholdValue\":0,\"direction\":\"EQUAL\",\"severity\":\"CRITICAL\"}]},{\"eventName\":\"vLoadBalancer\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"resource=vLoadBalancer;type=configuration\",\"policyName\":\"configuration.dcae.microservice.tca.xml\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"CL-LBAL-LOW-TRAFFIC-SIG-FB480F95-A453-6F24-B767-FD703241AB1A\",\"closedLoopEventStatus\":\"ONSET\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\",\"thresholdValue\":500,\"direction\":\"LESS_OR_EQUAL\",\"severity\":\"MAJOR\"},{\"closedLoopControlName\":\"CL-LBAL-LOW-TRAFFIC-SIG-0C5920A6-B564-8035-C878-0E814352BC2B\",\"closedLoopEventStatus\":\"ONSET\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\",\"thresholdValue\":5000,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"CRITICAL\"}]},{\"eventName\":\"virtualVMEventName\",\"controlLoopSchemaType\":\"VM\",\"policyScope\":\"resource=virtualVM;type=configuration\",\"policyName\":\"configuration.dcae.microservice.tca.xml\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"CL-LBAL-LOW-TRAFFIC-SIG-FB480F95-A453-6F24-B767-FD703241AB1A\",\"closedLoopEventStatus\":\"ONSET\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated\",\"thresholdValue\":500,\"direction\":\"LESS_OR_EQUAL\",\"severity\":\"MAJOR\"}]}]}"
+ processing_batch_size: 10000
+ enable_abatement: true
+ enable_ecomp_logging: true
+ aai:
+ enable_enrichment: true
+ url: "http://localhost:8443"
+ username: "DCAE"
+ password: "DCAE"
+ generic_vnf_path: "aai/v11/network/generic-vnfs/generic-vnf"
+ node_query_path: "aai/v11/search/nodes-query"
+ service_calls:
+ aai_broker_handle:
+ - "135.205.226.128:32768"
+ streams_publishes:
+ tca_handle_out:
+ type: "message_router"
+ aaf_username: "USER"
+ aaf_password: "PASSWORD"
+ dmaap_info:
+ client_role: "publisher"
+ client_id: "tca-pub-0"
+ location: "ecomp"
+ topic_url: "http://localhost:8080/events/PubTopic"
+ streams_subscribes:
+ tca_handle_in:
+ type: "message_router"
+ aaf_username: "USER"
+ aaf_password : "PASSWORD"
+ dmaap_info:
+ client_role: "subscriber"
+ client_id: "tca-sub-0"
+ location: "ecomp"
+ topic_url: "http://localhost:8080/events/SubTopic"
+ consumer_group: "cg1"
+ consumer_ids:
+ - "c0"
+ - "c1"
+ message_limit: 50000
+ timeout: -1
+ polling:
+ fixed_rate: 0
+ auto_adjusting:
+ min: 30000
+ step_up: 10000
+ max: 60000
+ step_down: 30000
diff --git a/dcae-analytics/dcae-analytics-test/pom.xml b/dcae-analytics/dcae-analytics-test/pom.xml
index 2474820..43afaed 100644
--- a/dcae-analytics/dcae-analytics-test/pom.xml
+++ b/dcae-analytics/dcae-analytics-test/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-test</artifactId>
diff --git a/dcae-analytics/dcae-analytics-web/pom.xml b/dcae-analytics/dcae-analytics-web/pom.xml
index db4cf29..9d87508 100644
--- a/dcae-analytics/dcae-analytics-web/pom.xml
+++ b/dcae-analytics/dcae-analytics-web/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-web</artifactId>
diff --git a/dcae-analytics/pom.xml b/dcae-analytics/pom.xml
index fbcc749..22fdccc 100644
--- a/dcae-analytics/pom.xml
+++ b/dcae-analytics/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.onap.dcaegen2.analytics.tca-gen2</groupId>
<artifactId>tca-gen2-parent</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<artifactId>dcae-analytics</artifactId>
diff --git a/dcae-analytics/version.properties b/dcae-analytics/version.properties
index 215e9a6..aeffff6 100644
--- a/dcae-analytics/version.properties
+++ b/dcae-analytics/version.properties
@@ -17,8 +17,8 @@
#
#
major=1
-minor=0
-patch=1
+minor=1
+patch=0
base_version=${major}.${minor}.${patch}
release_version=${base_version}
snapshot_version=${base_version}-SNAPSHOT