diff --git a/docs/AlertsSpecification.md b/docs/AlertsSpecification.md
index 34561023aa686e2085114dc94eb1f0b1d4da4e11..98ea51f2b0feabdab1f9444881043b97e9f05d01 100644
--- a/docs/AlertsSpecification.md
+++ b/docs/AlertsSpecification.md
@@ -55,7 +55,6 @@ imports:
metadata:
sfc: companyA-VR
- sfci: companyA-VR-premium
topology_template:
@@ -165,13 +164,12 @@ topology_template:
##### Metadata
-The ***metadata*** section specifies the service function chain ID and the service function chain instance ID, for which this
+The ***metadata*** section specifies the service function chain ID, for which this
alerts specification relates to. The format is the following:
```yaml
metadata:
sfc: <sfc_id>
- sfci: <sfc_i_id>
```
##### Policies
diff --git a/docs/clmc-service.md b/docs/clmc-service.md
index c75df3c2471b180ed3b078fd9f78deb47b0052ff..d0aaf30f796cd6c12a0ec6ef3eeb61afe1b041d8 100644
--- a/docs/clmc-service.md
+++ b/docs/clmc-service.md
@@ -110,7 +110,7 @@ with **/clmc-service** so that the nginx reverse proxy server (listening on port
The alert specification document is then parsed with the openstack TOSCA parser (https://github.com/openstack/tosca-parser/tree/master/toscaparser)
and validated against the CLMC alerts specification schema (again check [documentation](AlertsSpecification.md) for more info on this). The TOSCA resource
specification document is used only for consistency verification between the two documents - ensuring that they refer
- to the same service function chain and service function chain instance, as well as making sure that there is at least one
+ to the same service function chain, as well as making sure that there is at least one
trigger alert in the alerts specification that relates to a state change policy in the resources specification.
* Example for sending a request with curl:
diff --git a/src/service/clmcservice/alertsapi/alerts_specification_schema.py b/src/service/clmcservice/alertsapi/alerts_specification_schema.py
index 212f301775fc725ea14ac3e0048f8e5502f9b237..72a8ce843b8495066020193d753a5e6e47e439f8 100644
--- a/src/service/clmcservice/alertsapi/alerts_specification_schema.py
+++ b/src/service/clmcservice/alertsapi/alerts_specification_schema.py
@@ -75,8 +75,10 @@ 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,
- "sfci": str
+ "sfc": str
+ # TODO next release - uncomment
+ # "sfc": str,
+ # "sfci": str
},
"topology_template": {
"policies": [
diff --git a/src/service/clmcservice/alertsapi/tests.py b/src/service/clmcservice/alertsapi/tests.py
index 535db2350d8d3e19f038d275170a512f91c213b5..845f2435c513b1aefbc13fb6269acb7c5bad0148 100644
--- a/src/service/clmcservice/alertsapi/tests.py
+++ b/src/service/clmcservice/alertsapi/tests.py
@@ -276,7 +276,9 @@ def extract_alert_spec_data(alert_spec):
yaml_alert_spec = load(alert_spec)
adjust_tosca_definitions_import(yaml_alert_spec)
tosca_tpl = ToscaTemplate(yaml_dict_tpl=yaml_alert_spec)
- sfc, sfc_instance = tosca_tpl.tpl["metadata"]["sfc"], tosca_tpl.tpl["metadata"]["sfci"]
+ # 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"])
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/utilities.py b/src/service/clmcservice/alertsapi/utilities.py
index 53a144beb4797736746651526c2eafcf667c0d41..3ec7a248e446d42efd48c1f1720884016d10a3a3 100644
--- a/src/service/clmcservice/alertsapi/utilities.py
+++ b/src/service/clmcservice/alertsapi/utilities.py
@@ -70,7 +70,9 @@ def get_resource_spec_policy_triggers(resource_spec_reference):
resource_spec = load(resource_spec_reference.file)
policy_trigger_ids = {}
- sfc, sfc_i = resource_spec["metadata"]["sfc"], resource_spec["metadata"]["sfci"]
+ # TODO next release - uncomment
+ # sfc, sfc_i = resource_spec["metadata"]["sfc"], resource_spec["metadata"]["sfci"]
+ sfc, sfc_i = resource_spec["metadata"]["sfc"], "{0}_1".format(resource_spec["metadata"]["sfc"])
policies = resource_spec["topology_template"]["policies"]
for policy in policies:
diff --git a/src/service/clmcservice/alertsapi/views.py b/src/service/clmcservice/alertsapi/views.py
index 72681ac34eb3e398971cbf3fddb41140c14b81ad..9418cc660f62c52df1ef69bd59b36f6578600ef1 100644
--- a/src/service/clmcservice/alertsapi/views.py
+++ b/src/service/clmcservice/alertsapi/views.py
@@ -142,7 +142,9 @@ class AlertsConfigurationAPI(object):
raise HTTPBadRequest("Request alert specification file could not be validated as a CLMC TOSCA alerts specification document.")
alert_spec_policy_triggers = get_alert_spec_policy_triggers(tosca_tpl)
- sfc, sfc_instance = tosca_tpl.tpl["metadata"]["sfc"], tosca_tpl.tpl["metadata"]["sfci"]
+ # 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"])
# 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 7812392af8dc3e50301843c84c38adf4e67cc9e4..f64e6626979ce6e68a3766f2120c67eb979a5267 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
@@ -7,7 +7,7 @@ imports:
metadata:
sfc: companyA-VR
- sfci: companyA-VR-premium
+# 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 c2a855080832457c3f8a6f83975696542ea1b08f..52a734f3e2fc436541673d05e01bdf938ad55da4 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
@@ -7,7 +7,7 @@ imports:
metadata:
sfc_ID: companyA-VR # correct format is sfc, not sfc_ID
- sfci_ID: companyA-VR-premium # correct format is sfci, not sfci_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 d9110e5a69aa61f631d5b836774257ce299ee92d..1b7f49a0e73b3d4a7dc2d9b57484ab7613480334 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
@@ -7,7 +7,7 @@ imports:
metadata:
sfc: companyA-VR
- sfci: companyA-VR-premium
+# 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 818823f8139ca1b8493a26e3d7fa1bcdb8be890d..c1c0f06e2a50ee8a0f105d3486f31f251f5ba793 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
@@ -7,7 +7,7 @@ imports:
metadata:
sfc: companyA-VR
- sfci: companyA-VR-premium
+# 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 da58e71b7c08918707ac362dc4328d306fd74115..6373ae5dcbe2edb0ea0ece7869c9f35434ac3f3f 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
@@ -7,7 +7,7 @@ imports:
metadata:
sfc: companyA-VR
- sfci: companyA-VR-premium
+# 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 8a89ae9f89af2abbf6f5b380066a1041d863f9f1..6d82ad0c6327cf7666c3fdd6c42a233c0efc61c6 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
@@ -7,7 +7,7 @@ imports:
metadata:
sfc: companyA-VR
- sfci: companyA-VR-premium
+# 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 6a2884270313c3d2a3b5e4ba520a237947f7c666..32a1095f303af8831d80a396f407a7b6a5820eed 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
@@ -7,7 +7,7 @@ imports:
metadata:
sfc: companyA-VR
- sfci: companyA-VR-premium
+# 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 b558ac97aff5b0e44c31f811f9fd8161e1d4e43d..292a2d13fdca824085a3ca4cabd57296e3b15eab 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
@@ -7,7 +7,7 @@ imports:
metadata:
sfc: companyA-VR
- sfci: companyA-VR-premium
+# 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 7a7688658d90ef1dfc036410b752366976e488de..01e572798ccd4652194e2d615554eaab8dffedc3 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
@@ -7,7 +7,7 @@ imports:
metadata:
sfc: companyA-VR
- sfci: companyA-VR-premium
+# 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 312b5e4e1b27f8cde5c346173fd2d29e2d3819aa..29fee97090dfd1d6e82f03e0acd535de20b5728a 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
@@ -7,7 +7,7 @@ imports:
metadata:
sfc: companyA-VR
- sfci: companyA-VR-premium
+# 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 de10ba0aeba3acd63743dfe669c8838aa6698e25..9ec4b208000d8e0f046eb360bfc273e1e40f7505 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
@@ -7,7 +7,7 @@ imports:
metadata:
sfc: companyA-VR
- sfci: companyA-VR-premium
+# 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 c3b3a227f9825f29f570a44a2ad84959b4cbd716..579367092ca8a0ec33c36729298a50095f953524 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
@@ -7,7 +7,7 @@ imports:
metadata:
sfc: companyA-VR
- sfci: companyA-VR-premium
+# 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 a3ea67cafc811d0e313e866e9ddfc62b8e792030..2fc7a21197abb00ed8663a221bc36279b95b97de 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
@@ -7,7 +7,7 @@ imports:
metadata:
sfc: companyA-VR
- sfci: companyA-VR-premium
+# 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 266fa3152806f66f52101e3230d7605e33a11772..28c08f9002267ba132926b0ea3587b35b0c146a6 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
@@ -7,7 +7,7 @@ imports:
metadata:
sfc: companyA-VR
- sfci: companyA-VR-premium
+# 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 3993c088f0a2fbe6fc9f7e388563d9a3fd072478..04c8944b0068f0278fd7bc23a06e6f573721997e 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
@@ -7,7 +7,7 @@ imports:
metadata:
sfc: companyA-VR
- sfci: companyA-VR-premium
+# 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 83195048c010fb0b4f9f7ce9e5a06002e69f36ca..1cd95f5665691c5d881b462fad91b0c5d6edee4d 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
@@ -7,7 +7,7 @@ imports:
metadata:
sfc: companyA-VR
- sfci: companyA-VR-premium
+# sfci: companyA-VR-premium
topology_template:
diff --git a/src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-1.yaml b/src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-1.yaml
index abb5ed1af95604c29c2443622ffa5a09a00b1848..6b86a032b13ba1054d30072901192a8d1dd2c8d8 100644
--- a/src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-1.yaml
+++ b/src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-1.yaml
@@ -3,7 +3,7 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
metadata:
template_name: Flame Test Tosca resource specification
sfc: companyA-VR-ERROR
- sfci: companyA-VR-premium
+# sfci: companyA-VR-premium
# Import own definitions of nodes, capabilities and policy syntax.
imports:
diff --git a/src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-2.yaml b/src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-2.yaml
index 93b04a935175eace39fb59358aa90be12a2b1e92..69996667aa2832144ebdda099f84563eb8862a1e 100644
--- a/src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-2.yaml
+++ b/src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-2.yaml
@@ -2,8 +2,9 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
metadata:
template_name: Flame Test Tosca resource specification
- sfc: companyA-VR
- sfci: companyA-VR-premium-ERROR
+# sfc: companyA-VR
+# sfci: companyA-VR-premium-ERROR
+ sfc: companyA-VR-ERROR
# Import own definitions of nodes, capabilities and policy syntax.
imports:
diff --git a/src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-3.yaml b/src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-3.yaml
index cd5fea81620ebe515ab2bd0bb2ff70ca0ef4be51..29b96ed22056a83c086f41f7b6ccb79559e1c561 100644
--- a/src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-3.yaml
+++ b/src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-3.yaml
@@ -3,7 +3,7 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
metadata:
template_name: Flame Test Tosca resource specification
sfc: companyA-VR
- sfci: companyA-VR-premium
+# sfci: companyA-VR-premium
# Import own definitions of nodes, capabilities and policy syntax.
imports:
diff --git a/src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-4.yaml b/src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-4.yaml
index deabe9040b5619d9e0b95c4a70fbbcefb92b46e2..b57c83d524a3e391a66c1b27406c78bc57d5a4da 100644
--- a/src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-4.yaml
+++ b/src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-4.yaml
@@ -3,7 +3,7 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
metadata:
template_name: Flame Test Tosca resource specification
sfc: companyA-VR
- sfci: companyA-VR-premium
+# sfci: companyA-VR-premium
# Import own definitions of nodes, capabilities and policy syntax.
imports:
diff --git a/src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-5.yaml b/src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-5.yaml
index 20c1e78bf6027213a6caf1823a97aa307f79746d..7584f49633b951f80e2786e4fb74484bcbb081cd 100644
--- a/src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-5.yaml
+++ b/src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-5.yaml
@@ -3,7 +3,7 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
metadata:
template_name: Flame Test Tosca resource specification
sfc: companyA-VR
- sfci: companyA-VR-premium
+# sfci: companyA-VR-premium
# Import own definitions of nodes, capabilities and policy syntax.
imports:
diff --git a/src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-1.yaml b/src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-1.yaml
index a17b840e608e6a4af4654ae464d9dc516452b7f4..cbaa52c244a711f19faae6c94df48cab5f0ec92e 100644
--- a/src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-1.yaml
+++ b/src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-1.yaml
@@ -3,7 +3,7 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
metadata:
template_name: Flame Test Tosca resource specification
sfc: companyA-VR
- sfci: companyA-VR-premium
+# sfci: companyA-VR-premium
# Import own definitions of nodes, capabilities and policy syntax.
imports:
diff --git a/src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-2.yaml b/src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-2.yaml
index f2530f59e6e03ee793977ff63bb89266586de5ac..6ad505f41cdba4d53afc8b6256fda7b24d591c76 100644
--- a/src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-2.yaml
+++ b/src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-2.yaml
@@ -3,7 +3,7 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
metadata:
template_name: Flame Test Tosca resource specification
sfc: companyA-VR
- sfci: companyA-VR-premium
+# sfci: companyA-VR-premium
# Import own definitions of nodes, capabilities and policy syntax.
imports:
diff --git a/src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-3.yaml b/src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-3.yaml
index 4ca88b33a0fd4186b85e2668e66accb8787d6d2b..99fb147f966000f9fc682e5d5ef488e302d9f212 100644
--- a/src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-3.yaml
+++ b/src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-3.yaml
@@ -3,7 +3,7 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
metadata:
template_name: Flame Test Tosca resource specification
sfc: companyA-VR
- sfci: companyA-VR-premium
+# sfci: companyA-VR-premium
# Import own definitions of nodes, capabilities and policy syntax.
imports:
diff --git a/src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-4.yaml b/src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-4.yaml
index 496e972b73e5fad39016c118e1824cacbac33399..dbcc8cbc9fd542ca3099ae3673bed0337bddea6b 100644
--- a/src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-4.yaml
+++ b/src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-4.yaml
@@ -3,7 +3,7 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
metadata:
template_name: Flame Test Tosca resource specification
sfc: companyA-VR
- sfci: companyA-VR-premium
+# sfci: companyA-VR-premium
# Import own definitions of nodes, capabilities and policy syntax.
imports:
diff --git a/src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-5.yaml b/src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-5.yaml
index 0466063c748d5a5f8a470a2cf253cfb9c5c31460..e1ab90ef5f45e494c19866acff0ae1e35e67b80f 100644
--- a/src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-5.yaml
+++ b/src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-5.yaml
@@ -3,7 +3,7 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
metadata:
template_name: Flame Test Tosca resource specification
sfc: companyA-VR
- sfci: companyA-VR-premium
+# sfci: companyA-VR-premium
# Import own definitions of nodes, capabilities and policy syntax.
imports:
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 a5e9ed304db8f77be067a18b0cb4561b85dd8ce7..93bc161486cf8c57960163639fd5784d4c07b7f7 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
@@ -2,7 +2,7 @@
metadata:
sfc: companyA-VR
- sfci: companyA-VR-premium
+# sfci: companyA-VR-premium
triggers:
high_latency:
description: This event triggers when the mean network latency in a given location exceeds a given threshold (in ms).
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 ad61f4b578a0343a1b8e3597ee258ec7d16e7027..409d5ec24b824a32e7f99ccecba84d6e0c67c13b 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
@@ -6,7 +6,7 @@ imports:
metadata:
sfc: companyA-VR
- sfci: companyA-VR-premium
+# 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 326d6b59833f805a506a1125efae9cf9824ab428..799a0b77fa59d3f540c1ce867273d7c8e201a820 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
@@ -7,7 +7,7 @@ imports:
metadata:
sfc: companyA-VR
- sfci: companyA-VR-premium
+# sfci: companyA-VR-premium
topology_template:
# missing policies section
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 f1056c6cfd66a62627a0a5c55c1c5a5858e0d537..53da2130cbefb96d8b08af0652176ac0bdfe734b 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
@@ -7,7 +7,7 @@ imports:
metadata:
sfc: companyA-VR
- sfci: companyA-VR-premium
+# sfci: companyA-VR-premium
# Wrong section name, must be topology_template, not alerts
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 5df5321036a8239fc3b746fa491d621e268d7a13..f60228331ebc16b0bf2d2ab954c63711b26c024a 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
@@ -7,7 +7,7 @@ imports:
metadata:
sfc: companyA-VR
- sfci: companyA-VR-premium
+# 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 07f1cb69fe23aacec07a2fddcc31c3a657624a82..3e8f706144cad9ca13fe4598d5bd03a2c61feb93 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
@@ -7,7 +7,7 @@ imports:
metadata:
sfc: companyA-VirtualReality
- sfci: premium
+# 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 13f05f89427fcfba330254fc87198fba8eaeedf7..45366373d33e0818d99d84684dcaaa1b3b5deb30 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
@@ -7,7 +7,7 @@ imports:
metadata:
sfc: companyA-VR
- sfci: companyA-VR-premium
+# 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 db5a6d2dd3c3d6851e0437d19432dcae2be79038..43c7936c17f470141a98784a43ed6d255bcc86b7 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
@@ -7,7 +7,7 @@ imports:
metadata:
sfc: companyA-VR
- sfci: companyA-VR-premium
+# 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 fed474de91b22d9c17e81cfaaedf42e3a4b0cce5..829b55e19dc1120ab5e0734b5d9b486708d90974 100644
--- a/src/test/clmctest/alerts/alerts_test_config.yaml
+++ b/src/test/clmctest/alerts/alerts_test_config.yaml
@@ -7,7 +7,7 @@ imports:
metadata:
sfc: MS_Template_1
- sfci: MS_I1
+# sfci: MS_I1
topology_template:
diff --git a/src/test/clmctest/rspec.json b/src/test/clmctest/rspec.json
index 5cc7a75aa3cda35da6270fe2198d3f0e31c5ff80..310cdfbcbe0986feaa4bf1da33e1f5cae8ed4ebd 100644
--- a/src/test/clmctest/rspec.json
+++ b/src/test/clmctest/rspec.json
@@ -11,7 +11,7 @@
"ip_address": "172.40.231.150",
"location": "DC1",
"sfc_id": "MS_Template_1",
- "sfc_instance_id": "MS_I1",
+ "sfc_instance_id": "MS_Template_1_1",
"sf_package_id": "apache",
"sf_id": "adaptive_streaming_I1",
"sf_endpoint_id": "adaptive_streaming_I1_apache1",
@@ -22,7 +22,7 @@
"ip_address": "172.40.231.151",
"location": "DC1",
"sfc_id": "MS_Template_1",
- "sfc_instance_id": "MS_I1",
+ "sfc_instance_id": "MS_Template_1_1",
"sf_package_id": "nginx",
"sf_id": "adaptive_streaming_nginx_I1",
"sf_endpoint_id": "adaptive_streaming_nginx_I1_apache1",
@@ -34,7 +34,7 @@
"ip_address": "172.40.231.152",
"location": "DC1",
"sfc_id": "MS_Template_1",
- "sfc_instance_id": "MS_I1",
+ "sfc_instance_id": "MS_Template_1_1",
"sf_package_id": "mongo",
"sf_id": "metadata_database_I1",
"sf_endpoint_id": "metadata_database_I1_apache1",
@@ -46,7 +46,7 @@
"ip_address": "172.40.231.154",
"location": "DC1",
"sfc_id": "MS_Template_1",
- "sfc_instance_id": "MS_I1",
+ "sfc_instance_id": "MS_Template_1_1",
"sf_package_id": "host",
"sf_id": "adaptive_streaming_I1",
"sf_endpoint_id": "adaptive_streaming_I1_apache1",
@@ -57,7 +57,7 @@
"ip_address": "172.40.231.155",
"location": "DC1",
"sfc_id": "MS_Template_1",
- "sfc_instance_id": "MS_I1",
+ "sfc_instance_id": "MS_Template_1_1",
"sf_package_id": "minio",
"sf_id": "adaptive_streaming_I1",
"sf_endpoint_id": "adaptive_streaming_I1_minio",
@@ -68,7 +68,7 @@
"ip_address": "172.40.231.170",
"location": "nova",
"sfc_id": "media_service_A",
- "sfc_instance_id": "StackID",
+ "sfc_instance_id": "media_service_A_1",
"sf_package_id": "ipendpoint",
"sf_id": "ms-A.ict-flame.eu",
"sf_endpoint_id": "endpoint1.ms-A.ict-flame.eu",
@@ -79,7 +79,7 @@
"ip_address": "172.40.231.171",
"location": "nova",
"sfc_id": "media_service_A",
- "sfc_instance_id": "StackID",
+ "sfc_instance_id": "media_service_A_1",
"sf_package_id": "ipendpoint",
"sf_id": "ms-A.ict-flame.eu",
"sf_endpoint_id": "endpoint2.ms-A.ict-flame.eu",