Updates alerts API to read servicefunctionchain instead of sfc from resource specification

src/service/clmcservice/alertsapi/utilities.py

@@ -72,7 +72,8 @@ def get_resource_spec_policy_triggers(resource_spec_reference):
     policy_trigger_ids = {}
     # 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"])
+    sfc = resource_spec["metadata"]["servicefunctionchain"]
+    sfc_i = "{0}_1".format(sfc)
 
     policies = resource_spec["topology_template"]["policies"]
     for policy in policies:

src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-1.yaml

@@ -2,7 +2,7 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
 
 metadata:
   template_name: Flame Test Tosca resource specification
-  sfc: companyA-VR-ERROR
+  servicefunctionchain: companyA-VR-ERROR
 #  sfci: companyA-VR-premium
 
 # Import own definitions of nodes, capabilities and policy syntax.

src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-2.yaml

@@ -4,7 +4,7 @@ metadata:
   template_name: Flame Test Tosca resource specification
 #  sfc: companyA-VR
 #  sfci: companyA-VR-premium-ERROR
-  sfc: companyA-VR-ERROR
+  servicefunctionchain: companyA-VR-ERROR
 
 # Import own definitions of nodes, capabilities and policy syntax.
 imports:

src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-3.yaml

@@ -2,7 +2,7 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
 
 metadata:
   template_name: Flame Test Tosca resource specification
-  sfc: companyA-VR
+  servicefunctionchain: companyA-VR
 #  sfci: companyA-VR-premium
 
 # Import own definitions of nodes, capabilities and policy syntax.

src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-4.yaml

@@ -2,7 +2,7 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
 
 metadata:
   template_name: Flame Test Tosca resource specification
-  sfc: companyA-VR
+  servicefunctionchain: companyA-VR
 #  sfci: companyA-VR-premium
 
 # Import own definitions of nodes, capabilities and policy syntax.

src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-5.yaml

@@ -2,7 +2,7 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
 
 metadata:
   template_name: Flame Test Tosca resource specification
-  sfc: companyA-VR
+  servicefunctionchain: companyA-VR
 #  sfci: companyA-VR-premium
 
 # Import own definitions of nodes, capabilities and policy syntax.

src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-1.yaml

@@ -2,7 +2,7 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
 
 metadata:
   template_name: Flame Test Tosca resource specification
-  sfc: companyA-VR
+  servicefunctionchain: companyA-VR
 #  sfci: companyA-VR-premium
 
 # Import own definitions of nodes, capabilities and policy syntax.

src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-2.yaml

@@ -2,7 +2,7 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
 
 metadata:
   template_name: Flame Test Tosca resource specification
-  sfc: companyA-VR
+  servicefunctionchain: companyA-VR
 #  sfci: companyA-VR-premium
 
 # Import own definitions of nodes, capabilities and policy syntax.

src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-3.yaml

@@ -2,7 +2,7 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
 
 metadata:
   template_name: Flame Test Tosca resource specification
-  sfc: companyA-VR
+  servicefunctionchain: companyA-VR
 #  sfci: companyA-VR-premium
 
 # Import own definitions of nodes, capabilities and policy syntax.

src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-4.yaml

@@ -2,7 +2,7 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
 
 metadata:
   template_name: Flame Test Tosca resource specification
-  sfc: companyA-VR
+  servicefunctionchain: companyA-VR
 #  sfci: companyA-VR-premium
 
 # Import own definitions of nodes, capabilities and policy syntax.

src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-5.yaml

@@ -2,7 +2,7 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
 
 metadata:
   template_name: Flame Test Tosca resource specification
-  sfc: companyA-VR
+  servicefunctionchain: companyA-VR
 #  sfci: companyA-VR-premium
 
 # Import own definitions of nodes, capabilities and policy syntax.

src/test/clmctest/alerts/resources_test_config.yaml

@@ -2,7 +2,7 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
 
 metadata:
   template_name: Flame CLMC Alerts Integration Test
-  sfc: MS_Template_1
+  servicefunctionchain: MS_Template_1
   sfci: MS_I1