Merge branch 'clmc-service' into 'integration'
Change in alerts integration test and two versions of the threshold alert template See merge request FLAME/flame-clmc!41
Showing
- docs/clmc-service.md 23 additions, 0 deletionsdocs/clmc-service.md
- scripts/clmc-service/nginx.conf 4 additions, 1 deletionscripts/clmc-service/nginx.conf
- src/service/clmcservice/alertsapi/alerts_specification_schema.py 20 additions, 20 deletions...vice/clmcservice/alertsapi/alerts_specification_schema.py
- src/service/clmcservice/alertsapi/tests.py 28 additions, 6 deletionssrc/service/clmcservice/alertsapi/tests.py
- src/service/clmcservice/alertsapi/utilities.py 74 additions, 20 deletionssrc/service/clmcservice/alertsapi/utilities.py
- src/service/clmcservice/alertsapi/views.py 23 additions, 11 deletionssrc/service/clmcservice/alertsapi/views.py
- src/service/resources/TICKscript/deadman-template.tick 3 additions, 1 deletionsrc/service/resources/TICKscript/deadman-template.tick
- src/service/resources/TICKscript/relative-template.tick 3 additions, 1 deletionsrc/service/resources/TICKscript/relative-template.tick
- src/service/resources/TICKscript/threshold-batch-template.tick 2 additions, 1 deletion...ervice/resources/TICKscript/threshold-batch-template.tick
- src/service/resources/TICKscript/threshold-stream-template.tick 30 additions, 0 deletions...rvice/resources/TICKscript/threshold-stream-template.tick
- src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-1.yaml 2 additions, 2 deletions.../test-data/clmc-validator/valid/alerts_test_config-1.yaml
- src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-4.yaml 3 additions, 3 deletions.../test-data/clmc-validator/valid/alerts_test_config-4.yaml
- src/test/clmctest/alerts/alerts_test_config.yaml 6 additions, 6 deletionssrc/test/clmctest/alerts/alerts_test_config.yaml
- src/test/clmctest/alerts/conftest.py 1 addition, 1 deletionsrc/test/clmctest/alerts/conftest.py
- src/test/clmctest/alerts/resources_test_config.yaml 1 addition, 1 deletionsrc/test/clmctest/alerts/resources_test_config.yaml
- src/test/clmctest/alerts/test_alerts.py 1 addition, 1 deletionsrc/test/clmctest/alerts/test_alerts.py
Loading
Please register or sign in to comment