From 095404cfd4adaa66ca0a186873498a8ee8822e39 Mon Sep 17 00:00:00 2001
From: Nikolay Stanchev <ns17@it-innovation.soton.ac.uk>
Date: Tue, 30 Oct 2018 14:20:08 +0000
Subject: [PATCH] Updates CLMC alerts API, tests and documentation to exclude
sfci from metadata
---
docs/AlertsSpecification.md | 4 +---
docs/clmc-service.md | 2 +-
.../alertsapi/alerts_specification_schema.py | 6 ++++--
src/service/clmcservice/alertsapi/tests.py | 4 +++-
src/service/clmcservice/alertsapi/utilities.py | 4 +++-
src/service/clmcservice/alertsapi/views.py | 4 +++-
.../invalid/alerts_test_config-1.yaml | 2 +-
.../invalid/alerts_test_config-10.yaml | 2 +-
.../invalid/alerts_test_config-11.yaml | 2 +-
.../invalid/alerts_test_config-12.yaml | 2 +-
.../invalid/alerts_test_config-2.yaml | 2 +-
.../invalid/alerts_test_config-3.yaml | 2 +-
.../invalid/alerts_test_config-4.yaml | 2 +-
.../invalid/alerts_test_config-5.yaml | 2 +-
.../invalid/alerts_test_config-6.yaml | 2 +-
.../invalid/alerts_test_config-7.yaml | 2 +-
.../invalid/alerts_test_config-8.yaml | 2 +-
.../clmc-validator/valid/alerts_test_config-1.yaml | 2 +-
.../clmc-validator/valid/alerts_test_config-2.yaml | 2 +-
.../clmc-validator/valid/alerts_test_config-3.yaml | 2 +-
.../clmc-validator/valid/alerts_test_config-4.yaml | 2 +-
.../clmc-validator/valid/alerts_test_config-5.yaml | 2 +-
.../resources_invalid_test_config-1.yaml | 2 +-
.../resources_invalid_test_config-2.yaml | 5 +++--
.../resources_invalid_test_config-3.yaml | 2 +-
.../resources_invalid_test_config-4.yaml | 2 +-
.../resources_invalid_test_config-5.yaml | 2 +-
.../resources_valid_test_config-1.yaml | 2 +-
.../resources_valid_test_config-2.yaml | 2 +-
.../resources_valid_test_config-3.yaml | 2 +-
.../resources_valid_test_config-4.yaml | 2 +-
.../resources_valid_test_config-5.yaml | 2 +-
.../tosca-parser/invalid/alerts_test_config-1.yaml | 2 +-
.../tosca-parser/invalid/alerts_test_config-2.yaml | 2 +-
.../tosca-parser/invalid/alerts_test_config-3.yaml | 2 +-
.../tosca-parser/invalid/alerts_test_config-4.yaml | 2 +-
.../tosca-parser/valid/alerts_test_config-1.yaml | 2 +-
.../tosca-parser/valid/alerts_test_config-2.yaml | 2 +-
.../tosca-parser/valid/alerts_test_config-3.yaml | 2 +-
.../tosca-parser/valid/alerts_test_config-4.yaml | 2 +-
src/test/clmctest/alerts/alerts_test_config.yaml | 2 +-
src/test/clmctest/rspec.json | 14 +++++++-------
42 files changed, 59 insertions(+), 52 deletions(-)
diff --git a/docs/AlertsSpecification.md b/docs/AlertsSpecification.md
index 3456102..98ea51f 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 c75df3c..d0aaf30 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 212f301..72a8ce8 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 535db23..845f243 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 53a144b..3ec7a24 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 72681ac..9418cc6 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 7812392..f64e662 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 c2a8550..52a734f 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 d9110e5..1b7f49a 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 818823f..c1c0f06 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 da58e71..6373ae5 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 8a89ae9..6d82ad0 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 6a28842..32a1095 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 b558ac9..292a2d1 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 7a76886..01e5727 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 312b5e4..29fee97 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 de10ba0..9ec4b20 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 c3b3a22..5793670 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 a3ea67c..2fc7a21 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 266fa31..28c08f9 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 3993c08..04c8944 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 8319504..1cd95f5 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 abb5ed1..6b86a03 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 93b04a9..6999666 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 cd5fea8..29b96ed 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 deabe90..b57c83d 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 20c1e78..7584f49 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 a17b840..cbaa52c 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 f2530f5..6ad505f 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 4ca88b3..99fb147 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 496e972..dbcc8cb 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 0466063..e1ab90e 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 a5e9ed3..93bc161 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 ad61f4b..409d5ec 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 326d6b5..799a0b7 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 f1056c6..53da213 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 5df5321..f602283 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 07f1cb6..3e8f706 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 13f05f8..4536637 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 db5a6d2..43c7936 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 fed474d..829b55e 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 5cc7a75..310cdfb 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",
--
GitLab