aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2019-03-28Remove IO monad usage from simulatorsIzabela Zawadzka10-179/+148
Change-Id: I1c470777b91230f4a44a4960ca534e4b20c1ac43 Issue-ID: DCAEGEN2-1372 Signed-off-by: Izabela Zawadzka <izabela.zawadzka@nokia.com>
2019-03-28Added partial config merger and updated config file formatpbiniek11-60/+298
Change-Id: I470d3a8b2d43f5b45d958320b620205457d1cf23 Issue-ID: DCAEGEN2-1370 Signed-off-by: Pawel Biniek <pawel.biniek@nokia.com>
2019-03-27Move routing functionality inside RouterFilip Krzywka7-95/+37
- also removed Routing-DSL as it won't be needed anymore Change-Id: Ifc7bc7641a60936b5257c0bff7a8c51dddc30687 Issue-ID: DCAEGEN2-1347 Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
2019-03-27Remove routing from configuration fileFilip Krzywka11-336/+57
Routing should only be available from CBS. Change-Id: Idfada36dcda4192d84a5b601907d27fe0db942ce Issue-ID: DCAEGEN2-1347 Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
2019-03-27Remove dummyMode configuration optionFilip Krzywka13-94/+14
As it's not really used by anyone and it's functionality does not bring much value Change-Id: I99b07e484a8494a036f1f1b07e21666e044edbdb Issue-ID: DCAEGEN2-1347 Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
2019-03-27Update SDK usage to comply with new APIFilip Krzywka7-20/+19
Change-Id: Ifa5847617b7cadaadd80a82a3b279ac2beb4b258 Issue-ID: DCAEGEN2-1347 Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
2019-03-26Merge "Use DataStream API from CBS client"Piotr Jaszczyk11-140/+176
2019-03-26Revert "Read HV-VES healtcheck api port from cmd line"Piotr Jaszczyk6-78/+14
This reverts commit f3d3e6745328b9ec8bb68dfbfb3d3d57aa47b36f. Change-Id: I9d8813484831483812b0f7062d39e3d031dd7083 Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com> Issue-ID: DCAEGEN2-1364
2019-03-26Use DataStream API from CBS clientkjaniak11-140/+176
Change-Id: Ief92f793282288938c6663616e9613c6df2d8ddb Issue-ID: DCAEGEN2-1346 Signed-off-by: kjaniak <kornel.janiak@nokia.com>
2019-03-25Read HV-VES healtcheck api port from cmd linekjaniak6-14/+78
Issue-ID: DCAEGEN2-1364 Change-Id: I17c38d7397174fadc7d382cfa3dd0b3a7f4d97ff Signed-off-by: kjaniak <kornel.janiak@nokia.com>
2019-03-22Use updated CBS Client APIPiotr Jaszczyk1-2/+2
Change-Id: I476900dd81d6b23e3b35a3f93c71742efdca7a6e Issue-ID: DCAEGEN2-1363 Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
2019-03-21Simplify consul usageFilip Krzywka3-13/+36
Change-Id: I707b6c52eb356cab471215b534f1143be3e4cbae Issue-ID: DCAEGEN2-710 Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
2019-03-21Make security keys optional with SSL disabledFilip Krzywka7-74/+300
Change-Id: I0b0dd63cb3609cddf6aa5e63cf0a0f147a0aca91 Issue-ID: DCAEGEN2-1340 Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
2019-03-21Include basic configuration in Docker imagePiotr Jaszczyk10-6/+103
Makes the collector start out of the box, even without valid CBS configuration. Note: the basic configuration will need to be changed later. Issue-ID: DCAEGEN2-1340 Change-Id: I3c2b502f253677e78a4f4990002e683613b8869e Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
2019-03-20Remove environment variables and program argumentsJakub Dudycz49-877/+954
- Move all command line program arguments to json file. - Reorganize configuration classes and the way they are passed through application - Implement HV VES configuration stream - Create concrete configuration from partial one - Modify main HV-VES server starting pipeline Change-Id: I6cf874b6904ed768e4820b8132f5f760299c929e Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com> Issue-ID: DCAEGEN2-1340
2019-03-15Use Netty HttpServer in XnfApiServerIzabela Zawadzka7-138/+59
Change-Id: I86e06bd540c961098ee11af99735a5b35ce760fd Issue-ID: DCAEGEN2-1325 Signed-off-by: Izabela Zawadzka <izabela.zawadzka@nokia.com>
2019-03-14Extract HV-VES configuration moduleFilip Krzywka69-186/+304
To avoid cyclic dependency between "modules trio" configuration-core-ssl some classes from core.model were also extracted. Change-Id: Ie11029ae3500964f67f4d72279ddd68cdb2a1f0c Issue-ID: DCAEGEN2-1332 Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
2019-03-12Use proper Consul version in docker-compose.ymlPiotr Bocheński1-1/+1
Change-Id: I90c430c15832ef85cc6ef4e197cae141f246cf7b Issue-ID: DCAEGEN2-1302 Signed-off-by: Piotr Bocheński <piotr.bochenski@nokia.com>
2019-03-12Use netty HttpServer in DcaeAppApiServerIzabela Zawadzka5-66/+125
Change-Id: I895ad192babd9cc40266d0bec3830fcd4b0e054b Issue-ID: DCAEGEN2-1325 Signed-off-by: Izabela Zawadzka <izabela.zawadzka@nokia.com>
2019-03-11Use CBS by means of SDK in place of ConsulFilip Krzywka24-322/+519
- changed IO creation in main to fix error with too early calling changeState method on collector HealthState - increased coverage a little with few tests - corrected coverage-report pom file to include new modules - temporarily changed to 1.1.4-SNAPSHOT version of sdk due to need of new version of CBSLookup Change-Id: Ic73b46cf881ab4fabf52bef0327b09082aa90dc6 Issue-ID: DCAEGEN2-1302 Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
2019-03-11Merge "Assure coverage is checked for all modules"Piotr Wielebski14-126/+142
2019-03-11Assure coverage is checked for all modulesPiotr Jaszczyk14-126/+142
Change-Id: Ia9bb6cef9154d64cfa45455e38c9fe7603a64c74 Issue-ID: DCAEGEN2-1328 Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
2019-03-11Added JSON config file format utilspbiniek12-4/+521
Change-Id: I97fdd72324495b4c838e44c306cbcacac6b11bc1 Signed-off-by: Pawel Biniek <pawel.biniek@nokia.com> Issue-ID: DCAEGEN2-1323
2019-03-07Remove Guava 19 dependency via protobuf-java-utilJakub Dudycz5-2/+34
Change-Id: Ic11cab5bce064817a954a462b3d2eea463198bd8 Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com> Issue-ID: DCAEGEN2-1311
2019-03-05Extract module for ArgBasedConfigurationJakub Dudycz24-99/+149
Change-Id: Ib11700650583378eb347451950a24c5f238382e4 Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com> Issue-ID: DCAEGEN2-1292
2019-03-05Use DCAE SDK 1.1.3 (no snapshot)Piotr Jaszczyk1-1/+1
Issue-ID: DCAEGEN2-1069 Change-Id: I48c1011873d31254df5e99ad970dd0ff18cc4c3f Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
2019-03-05Fix ssl related bug in xnf simulatorJakub Dudycz11-66/+90
Fix bug when xnf simnulator was using same SecurityKeys object instance for every new VesClient, which resulted in fault while trying to connect to collector. With new implementation simulator reuses same HvVesProdcuer from SDK for every VesEvent request received and creates new Producer for every WireFrameEvent request. This allows to continue testing cases in which there is need to assert if connection was dropped from malicious client. Change-Id: I5f51a58de85cccf7de6ab2392f86259502be31dd Issue-ID: DCAEGEN2-1291 Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com> Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
2019-02-27Fix bug when xnf simulator was not sending eventsJakub Dudycz1-1/+1
Change-Id: I53cdf572d2df66d6021651424931a67108c482d3 Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com> Issue-ID: DCAEGEN2-1291
2019-02-21Use sdk/hvves-producer in hvves/xnf-simulatorJakub Dudycz25-228/+351
Change-Id: I8f493b0edd2cbaef136a22d914ad24198bb63a7f Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com> Issue-ID: DCAEGEN2-1253
2019-02-19Use SDK/SSL in HV-VESPiotr Jaszczyk20-557/+310
Issue-ID: DCAEGEN2-1226 Change-Id: I7cfc09001f7315c1b6f4fcf150ad631630c810ef Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
2019-02-18Merge "Generate VesEvents in hv-ves/message-generator"Piotr Jaszczyk28-625/+826
2019-02-15Generate VesEvents in hv-ves/message-generatorJakub Dudycz28-625/+826
- Split message generator on two specialized generators for VesEvent and WireFrame related message types - Refactor whole message-generator module Change-Id: I1266b549a9a4d27213d03e8921298deab2dacb59 Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com> Issue-ID: DCAEGEN2-1162
2019-02-14Use protobuf definitions from SDKFilip Krzywka4-145/+12
Change-Id: I22163f3239769070e1e04c8d0e8f0da179069632 Issue-ID: DCAEGEN2-1218 Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
2019-02-05Add sdk to dependencies of XNF simulatorkjaniak2-1/+30
Change-Id: Ib1e96c71dcddcd5228f8d186a66c924a25e32dec Issue-ID: DCAEGEN2-1163 Signed-off-by: kjaniak <kornel.janiak@nokia.com>
2019-01-29Correct totalConnections metricFilip Krzywka5-69/+175
In previous implementation performed healthcheck on container was counted as client connection, because metric was notified for every TCP channel opened. This was making this metric less useful (to avoid saying "useless" ;) ). - refactored NettyTcpServer trying to extract functions with logic not so strictly related to HV-VES behavior. This also resolves discussions in https://gerrit.onap.org/r/#/c/76274/ - some renames and methods splitting was made in attempt to make code more readable - hv-ves should not count connections from either "127.0.0.1" or "localhost" to his `totalConnections` metric - removed redundant logging by adding new methods to Logger Change-Id: I5f10dac8dac82eafd3b0de92a7ec43f2c23b8c16 Issue-ID: DCAEGEN2-1119 Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
2019-01-29Change Health Status when shutting downPiotr Jaszczyk4-5/+84
Change-Id: I889c934f29d34c1211c6e07f18cb16bbe35d711f Issue-ID: DCAEGEN2-1065 Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
2019-01-25Mitigation of unexpected hv-ves shutdownkjaniak3-3/+8
Change-Id: I96183e2358ac10457568d223f37d69c61dfd252d Issue-ID: DCAEGEN2-1117 Signed-off-by: kjaniak <kornel.janiak@nokia.com>
2019-01-23Add grafana to docker-composeFilip Krzywka5-0/+1537
With default HV-VES dashboards included. Change-Id: I8c15a2d609676218dce2e63d2a0730a359abf0af Issue-ID: DCAEGEN2-1115 Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
2019-01-22Merge "Close KafkaSender when handling SIGINT"Piotr Wielebski18-48/+174
2019-01-22Close KafkaSender when handling SIGINTPiotr Jaszczyk18-48/+174
Closing KafkaSender should result in flushing any pending messages. Change-Id: Ib251f5ca3527266831189df542784cc17173d8dc Issue-ID: DCAEGEN2-1065 Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
2019-01-22Enable percentile histograms in metricsFilip Krzywka1-2/+7
To allow more precise graphing. Change-Id: I3c498b24c01e599eec316f552e25d06d653a08bb Issue-ID: DCAEGEN2-1107 Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
2019-01-16Fix inconsistencies with logging guidelinePiotr Jaszczyk3-21/+28
Change-Id: I527ba0b3c313d946ae979b599e87bb4267a1793d Issue-ID: DCAEGEN2-1085 Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
2019-01-10Merge "Align kafka properties with VESHV_MAX_PAYLOAD_SIZE"Piotr Jaszczyk4-4/+18
2019-01-10Align kafka properties with VESHV_MAX_PAYLOAD_SIZEkjaniak4-4/+18
Change-Id: I5cbfb8a982cd1efbdf58c2c0aed71f064f7b7cb8 Issue-ID: DCAEGEN2-1066 Signed-off-by: kjaniak <kornel.janiak@nokia.com>
2019-01-10Update development scriptsFilip Krzywka3-31/+76
This changeset is mostly follow-up after merges in DCAEGEN2-1063 - new options for hv-ves hostname and port in xnf simulations scripts - new option for disabling SSL in xnf simulations scripts - fail start-simulation script on not completing all simulations - use docker-healthchecks to determine xNF simulator readiness in development scripts - fix logging in xNF simulator on closing connection - minor corrections in logs and usage for development scripts Change-Id: Ic939a139fdaf86ad487e0b31d6abcfc6c8a28885 Issue-ID: DCAEGEN2-1063 Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
2019-01-08Merge "Align XNF simulator batch with Netty's queue size"Piotr Jaszczyk1-2/+2
2019-01-08Merge "Handle sigterm signal"Piotr Wielebski6-8/+77
2019-01-08Handle sigterm signalPiotr Jaszczyk6-8/+77
Change-Id: If6f431bfdc42f8d53497078b18813147cad1bad0 Issue-ID: DCAEGEN2-1065 Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
2019-01-08Align XNF simulator batch with Netty's queue sizeJakub Dudycz1-2/+2
This change will lessen the probability of out of memory errors Change-Id: I96c735f4d7f5cedf3fddd66830e6557ea35ad1ea Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com> Issue-ID: DCAEGEN2-1062
2019-01-08Merge Healthcheck descriptionsFilip Krzywka28-120/+205
- start new API server for healthchecks in xNF simulator on port 6063 - changed DCAE App default port to 6064 - switched to InetSocketAddresses usage in components configurations Change-Id: I398f9ea6e887f78d88286ed717d310d3297b1571 Issue-ID: DCAEGEN2-1063 Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>