diff --git a/docs/AlertsSpecification.md b/docs/AlertsSpecification.md index 98ea51f2b0feabdab1f9444881043b97e9f05d01..5201432f1ba42f1322c39dc90f5cfbbcea8f06c6 100644 --- a/docs/AlertsSpecification.md +++ b/docs/AlertsSpecification.md @@ -54,7 +54,7 @@ imports: - flame_clmc_alerts_definitions.yaml metadata: - sfc: companyA-VR + servicefunctionchain: companyA-VR topology_template: @@ -169,7 +169,7 @@ alerts specification relates to. The format is the following: ```yaml metadata: - sfc: <sfc_id> + servicefunctionchain: <sfc_id> ``` ##### Policies diff --git a/src/service/clmcservice/alertsapi/alerts_specification_schema.py b/src/service/clmcservice/alertsapi/alerts_specification_schema.py index 72a8ce843b8495066020193d753a5e6e47e439f8..3db515f5e7ce8be5119edba41664f83829ee706f 100644 --- a/src/service/clmcservice/alertsapi/alerts_specification_schema.py +++ b/src/service/clmcservice/alertsapi/alerts_specification_schema.py @@ -75,7 +75,7 @@ ALERTS_SPECIFICATION_SCHEMA = Schema({ Optional("description"): str, "imports": And([lambda s: s.endswith("flame_clmc_alerts_definitions.yaml")], lambda l: len(l) == 1), "metadata": { - "sfc": str + "servicefunctionchain": str # TODO next release - uncomment # "sfc": str, # "sfci": str diff --git a/src/service/clmcservice/alertsapi/tests.py b/src/service/clmcservice/alertsapi/tests.py index 845f2435c513b1aefbc13fb6269acb7c5bad0148..dd22396a0668642d2fc2b28c7712a20aa933e1e6 100644 --- a/src/service/clmcservice/alertsapi/tests.py +++ b/src/service/clmcservice/alertsapi/tests.py @@ -278,7 +278,7 @@ def extract_alert_spec_data(alert_spec): tosca_tpl = ToscaTemplate(yaml_dict_tpl=yaml_alert_spec) # TODO next release - uncomment # sfc, sfc_instance = tosca_tpl.tpl["metadata"]["sfc"], tosca_tpl.tpl["metadata"]["sfci"] - sfc, sfc_instance = tosca_tpl.tpl["metadata"]["sfc"], "{0}_1".format(tosca_tpl.tpl["metadata"]["sfc"]) + sfc, sfc_instance = tosca_tpl.tpl["metadata"]["servicefunctionchain"], "{0}_1".format(tosca_tpl.tpl["metadata"]["servicefunctionchain"]) alert_ids = [] # saves all alert IDs in a list topic_handlers = {} # saves all topics in a dictionary, each topic is linked to a list of handler pairs (a handler pair consists of handler id and handler url) diff --git a/src/service/clmcservice/alertsapi/views.py b/src/service/clmcservice/alertsapi/views.py index 9418cc660f62c52df1ef69bd59b36f6578600ef1..8e481a92d6b59c84929a15ba14596cd10e45eaba 100644 --- a/src/service/clmcservice/alertsapi/views.py +++ b/src/service/clmcservice/alertsapi/views.py @@ -144,7 +144,8 @@ class AlertsConfigurationAPI(object): alert_spec_policy_triggers = get_alert_spec_policy_triggers(tosca_tpl) # TODO next release - uncomment # sfc, sfc_instance = tosca_tpl.tpl["metadata"]["sfc"], tosca_tpl.tpl["metadata"]["sfci"] - sfc, sfc_instance = tosca_tpl.tpl["metadata"]["sfc"], "{0}_1".format(tosca_tpl.tpl["metadata"]["sfc"]) + sfc = tosca_tpl.tpl["metadata"]["servicefunctionchain"] + sfc_instance = "{0}_1".format(sfc) # do validation between the two TOSCA documents self._compare_alert_and_resource_spec(sfc, sfc_instance, alert_spec_policy_triggers, resource_spec_sfc, resource_spec_sfc_i, resource_spec_policy_triggers) diff --git a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-1.yaml b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-1.yaml index f64e6626979ce6e68a3766f2120c67eb979a5267..03515cfdd0052e5ae42d6c69e61b28423fc7447d 100644 --- a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-1.yaml +++ b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-1.yaml @@ -6,7 +6,7 @@ imports: - flame_clmc_alerts_definitions.yaml metadata: - sfc: companyA-VR + servicefunctionchain: companyA-VR # sfci: companyA-VR-premium topology_template: diff --git a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-10.yaml b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-10.yaml index 52a734f3e2fc436541673d05e01bdf938ad55da4..f17a69769262a100995d3b5ff00f58054217f5b7 100644 --- a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-10.yaml +++ b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-10.yaml @@ -6,7 +6,7 @@ imports: - flame_clmc_alerts_definitions.yaml metadata: - sfc_ID: companyA-VR # correct format is sfc, not sfc_ID + sfc_ID: companyA-VR # correct format is servicefunctionchain, not sfc_ID # sfci_ID: companyA-VR-premium # correct format is sfci, not sfci_ID topology_template: diff --git a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-11.yaml b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-11.yaml index 1b7f49a0e73b3d4a7dc2d9b57484ab7613480334..f18b60b6aef9f53d8afb0ef5ff4d251ba2425279 100644 --- a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-11.yaml +++ b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-11.yaml @@ -6,7 +6,7 @@ imports: - flame_clmc_alerts_definitions.yaml metadata: - sfc: companyA-VR + servicefunctionchain: companyA-VR # sfci: companyA-VR-premium topology_template: diff --git a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-12.yaml b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-12.yaml index c1c0f06e2a50ee8a0f105d3486f31f251f5ba793..8e78967d3555cf84996d473e689f45b98869dd05 100644 --- a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-12.yaml +++ b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-12.yaml @@ -6,7 +6,7 @@ imports: - flame_clmc_alerts_definitions.yaml metadata: - sfc: companyA-VR + servicefunctionchain: companyA-VR # sfci: companyA-VR-premium topology_template: diff --git a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-2.yaml b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-2.yaml index 6373ae5dcbe2edb0ea0ece7869c9f35434ac3f3f..b0fe2f0e3f49f2bafd92d578322f076488eae328 100644 --- a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-2.yaml +++ b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-2.yaml @@ -6,7 +6,7 @@ imports: - flame_clmc_alerts_definitions.yaml metadata: - sfc: companyA-VR + servicefunctionchain: companyA-VR # sfci: companyA-VR-premium topology_template: diff --git a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-3.yaml b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-3.yaml index 6d82ad0c6327cf7666c3fdd6c42a233c0efc61c6..8b9aac9bfd2e4019f5d23fd04ab511b45ffe20b2 100644 --- a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-3.yaml +++ b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-3.yaml @@ -6,7 +6,7 @@ imports: - flame_clmc_alerts_definitions.yaml metadata: - sfc: companyA-VR + servicefunctionchain: companyA-VR # sfci: companyA-VR-premium topology_template: diff --git a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-4.yaml b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-4.yaml index 32a1095f303af8831d80a396f407a7b6a5820eed..afc91e9ceb9900d22c32c563fd932cfb4e0c6e2e 100644 --- a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-4.yaml +++ b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-4.yaml @@ -6,7 +6,7 @@ imports: - flame_clmc_alerts_definitions.yaml metadata: - sfc: companyA-VR + servicefunctionchain: companyA-VR # sfci: companyA-VR-premium topology_template: diff --git a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-5.yaml b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-5.yaml index 292a2d13fdca824085a3ca4cabd57296e3b15eab..bab46dac841d5b5072bbe8137f3449113514f126 100644 --- a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-5.yaml +++ b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-5.yaml @@ -6,7 +6,7 @@ imports: - flame_clmc_alerts_definitions.yaml metadata: - sfc: companyA-VR + servicefunctionchain: companyA-VR # sfci: companyA-VR-premium topology_template: diff --git a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-6.yaml b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-6.yaml index 01e572798ccd4652194e2d615554eaab8dffedc3..51ddff4a6eaeffee3458362e75e49c7d5883af06 100644 --- a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-6.yaml +++ b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-6.yaml @@ -6,7 +6,7 @@ imports: - flame_clmc_alerts_definitions.yaml metadata: - sfc: companyA-VR + servicefunctionchain: companyA-VR # sfci: companyA-VR-premium topology_template: diff --git a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-7.yaml b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-7.yaml index 29fee97090dfd1d6e82f03e0acd535de20b5728a..e411c31f34c08b50f10e44aaf0a0998b4841bf1b 100644 --- a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-7.yaml +++ b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-7.yaml @@ -6,7 +6,7 @@ imports: - flame_clmc_alerts_definitions.yaml metadata: - sfc: companyA-VR + servicefunctionchain: companyA-VR # sfci: companyA-VR-premium topology_template: diff --git a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-8.yaml b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-8.yaml index 9ec4b208000d8e0f046eb360bfc273e1e40f7505..ab7db8a692215e6e8e9abff5085b75d682d754b4 100644 --- a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-8.yaml +++ b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-8.yaml @@ -6,7 +6,7 @@ imports: - flame_clmc_alerts_definitions.yaml metadata: - sfc: companyA-VR + servicefunctionchain: companyA-VR # sfci: companyA-VR-premium topology_template: diff --git a/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-1.yaml b/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-1.yaml index 579367092ca8a0ec33c36729298a50095f953524..6db6518e46b29b9f53d1f09f8f6ce5a43669d9be 100644 --- a/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-1.yaml +++ b/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-1.yaml @@ -6,7 +6,7 @@ imports: - flame_clmc_alerts_definitions.yaml metadata: - sfc: companyA-VR + servicefunctionchain: companyA-VR # sfci: companyA-VR-premium topology_template: diff --git a/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-2.yaml b/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-2.yaml index 2fc7a21197abb00ed8663a221bc36279b95b97de..da3f8d78fa16efa0a4a77d9c213bfad372ddf09a 100644 --- a/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-2.yaml +++ b/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-2.yaml @@ -6,7 +6,7 @@ imports: - flame_clmc_alerts_definitions.yaml metadata: - sfc: companyA-VR + servicefunctionchain: companyA-VR # sfci: companyA-VR-premium topology_template: diff --git a/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-3.yaml b/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-3.yaml index 28c08f9002267ba132926b0ea3587b35b0c146a6..11bcdb2b1413d414ba0cf7e9125453625442e217 100644 --- a/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-3.yaml +++ b/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-3.yaml @@ -6,7 +6,7 @@ imports: - flame_clmc_alerts_definitions.yaml metadata: - sfc: companyA-VR + servicefunctionchain: companyA-VR # sfci: companyA-VR-premium topology_template: diff --git a/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-4.yaml b/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-4.yaml index 04c8944b0068f0278fd7bc23a06e6f573721997e..25b250c18798f193425960ecc2897649b4343383 100644 --- a/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-4.yaml +++ b/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-4.yaml @@ -6,7 +6,7 @@ imports: - flame_clmc_alerts_definitions.yaml metadata: - sfc: companyA-VR + servicefunctionchain: companyA-VR # sfci: companyA-VR-premium topology_template: diff --git a/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-5.yaml b/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-5.yaml index 1cd95f5665691c5d881b462fad91b0c5d6edee4d..d88fb000f852eacbf27f1bdb195c80d635edce0e 100644 --- a/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-5.yaml +++ b/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-5.yaml @@ -6,7 +6,7 @@ imports: - flame_clmc_alerts_definitions.yaml metadata: - sfc: companyA-VR + servicefunctionchain: companyA-VR # sfci: companyA-VR-premium topology_template: diff --git a/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-1.yaml b/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-1.yaml index 93bc161486cf8c57960163639fd5784d4c07b7f7..96ac8e0c6aeb9747d0a20d610dad4bed2699e78a 100644 --- a/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-1.yaml +++ b/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-1.yaml @@ -1,7 +1,7 @@ # Fails since it doesn't specify tosca version, imports and topology_template root node is missing. metadata: - sfc: companyA-VR + servicefunctionchain: companyA-VR # sfci: companyA-VR-premium triggers: high_latency: diff --git a/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-2.yaml b/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-2.yaml index 409d5ec24b824a32e7f99ccecba84d6e0c67c13b..80dcc2cfaff06850fb80ca8afea3bb7503186c5d 100644 --- a/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-2.yaml +++ b/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-2.yaml @@ -5,7 +5,7 @@ imports: - flame_clmc_alerts_definitions.yaml metadata: - sfc: companyA-VR + servicefunctionchain: companyA-VR # sfci: companyA-VR-premium topology_template: diff --git a/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-3.yaml b/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-3.yaml index 799a0b77fa59d3f540c1ce867273d7c8e201a820..8536373fab16f915f192fc5e6874ddd32a65b584 100644 --- a/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-3.yaml +++ b/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-3.yaml @@ -6,7 +6,7 @@ imports: - flame_clmc_alerts_definitions.yaml metadata: - sfc: companyA-VR + servicefunctionchain: companyA-VR # sfci: companyA-VR-premium topology_template: diff --git a/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-4.yaml b/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-4.yaml index 53da2130cbefb96d8b08af0652176ac0bdfe734b..0c5293aff401e626e99f99973393e11e4442c4e1 100644 --- a/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-4.yaml +++ b/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-4.yaml @@ -6,7 +6,7 @@ imports: - flame_clmc_alerts_definitions.yaml metadata: - sfc: companyA-VR + servicefunctionchain: companyA-VR # sfci: companyA-VR-premium # Wrong section name, must be topology_template, not alerts diff --git a/src/service/resources/tosca/test-data/tosca-parser/valid/alerts_test_config-1.yaml b/src/service/resources/tosca/test-data/tosca-parser/valid/alerts_test_config-1.yaml index f60228331ebc16b0bf2d2ab954c63711b26c024a..ec4238022ff60c0a6da4c15563af2463d964d6ed 100644 --- a/src/service/resources/tosca/test-data/tosca-parser/valid/alerts_test_config-1.yaml +++ b/src/service/resources/tosca/test-data/tosca-parser/valid/alerts_test_config-1.yaml @@ -6,7 +6,7 @@ imports: - flame_clmc_alerts_definitions.yaml metadata: - sfc: companyA-VR + servicefunctionchain: companyA-VR # sfci: companyA-VR-premium topology_template: diff --git a/src/service/resources/tosca/test-data/tosca-parser/valid/alerts_test_config-2.yaml b/src/service/resources/tosca/test-data/tosca-parser/valid/alerts_test_config-2.yaml index 3e8f706144cad9ca13fe4598d5bd03a2c61feb93..d92076a1f731689b08d9bc082860ccc01bb575b4 100644 --- a/src/service/resources/tosca/test-data/tosca-parser/valid/alerts_test_config-2.yaml +++ b/src/service/resources/tosca/test-data/tosca-parser/valid/alerts_test_config-2.yaml @@ -6,7 +6,7 @@ imports: - flame_clmc_alerts_definitions.yaml metadata: - sfc: companyA-VirtualReality + servicefunctionchain: companyA-VirtualReality # sfci: premium topology_template: diff --git a/src/service/resources/tosca/test-data/tosca-parser/valid/alerts_test_config-3.yaml b/src/service/resources/tosca/test-data/tosca-parser/valid/alerts_test_config-3.yaml index 45366373d33e0818d99d84684dcaaa1b3b5deb30..b11a1d1d5fec39536b24566b5d217df5e127a824 100644 --- a/src/service/resources/tosca/test-data/tosca-parser/valid/alerts_test_config-3.yaml +++ b/src/service/resources/tosca/test-data/tosca-parser/valid/alerts_test_config-3.yaml @@ -6,7 +6,7 @@ imports: - flame_clmc_alerts_definitions.yaml metadata: - sfc: companyA-VR + servicefunctionchain: companyA-VR # sfci: companyA-VR-premium topology_template: diff --git a/src/service/resources/tosca/test-data/tosca-parser/valid/alerts_test_config-4.yaml b/src/service/resources/tosca/test-data/tosca-parser/valid/alerts_test_config-4.yaml index 43c7936c17f470141a98784a43ed6d255bcc86b7..9e4d7a50627874966f6756d84b179f16d7b9ff51 100644 --- a/src/service/resources/tosca/test-data/tosca-parser/valid/alerts_test_config-4.yaml +++ b/src/service/resources/tosca/test-data/tosca-parser/valid/alerts_test_config-4.yaml @@ -6,7 +6,7 @@ imports: - flame_clmc_alerts_definitions.yaml metadata: - sfc: companyA-VR + servicefunctionchain: companyA-VR # sfci: companyA-VR-premium topology_template: diff --git a/src/test/clmctest/alerts/alerts_test_config.yaml b/src/test/clmctest/alerts/alerts_test_config.yaml index 829b55e19dc1120ab5e0734b5d9b486708d90974..4d5bca9c7387996bace7a0d96f5124bcf0485c64 100644 --- a/src/test/clmctest/alerts/alerts_test_config.yaml +++ b/src/test/clmctest/alerts/alerts_test_config.yaml @@ -6,7 +6,7 @@ imports: - flame_clmc_alerts_definitions.yaml metadata: - sfc: MS_Template_1 + servicefunctionchain: MS_Template_1 # sfci: MS_I1 topology_template: