aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDR695H <dr695h@att.com>2019-05-08 17:49:18 -0400
committerDR695H <dr695h@att.com>2019-05-08 18:00:47 -0400
commit544c38603afce6f6215fbc7b462ee1899c2a1e21 (patch)
tree6ad66bf84c46cc2f699fc61be4f1a2ea1d140200
parentcdb81112b08895c30132a930eb3c8095bbea10e6 (diff)
add service mappings to a folder for each one
this gets rid of the giant service mapping file that has to be maintained in the test repo and lets it live with the demo repo Change-Id: I769ac80bc2238dc1540d6681a94ca471f65384ad Issue-ID: TEST-152 Signed-off-by: DR695H <dr695h@att.com>
-rw-r--r--service_mapping/README.md51
-rw-r--r--service_mapping/vCPE/service_mapping.json20
-rw-r--r--service_mapping/vCPEInfra/service_mapping.json20
-rw-r--r--service_mapping/vCPEResCust/service_mapping.json20
-rw-r--r--service_mapping/vCPEvBNG/service_mapping.json20
-rw-r--r--service_mapping/vCPEvBRGEMU/service_mapping.json20
-rw-r--r--service_mapping/vCPEvGMUX/service_mapping.json20
-rw-r--r--service_mapping/vCPEvGW/service_mapping.json20
-rw-r--r--service_mapping/vFW/service_mapping.json20
-rw-r--r--service_mapping/vFWCL/service_mapping.json22
-rw-r--r--service_mapping/vFWNG/service_mapping.json20
-rw-r--r--service_mapping/vLB/service_mapping.json21
-rw-r--r--service_mapping/vVG/service_mapping.json20
13 files changed, 293 insertions, 1 deletions
diff --git a/service_mapping/README.md b/service_mapping/README.md
index 1752b260..a80334be 100644
--- a/service_mapping/README.md
+++ b/service_mapping/README.md
@@ -7,5 +7,54 @@ In each subdirectory is one file service_mapping.json that is merged with the da
This way the data about basic vFW, vLB etc from previous releases can be merged with new Services/Use Cases without having to edit service_mapping.py in testsuite.
As new VNF Heat and other VIM artifacts are added the matching service_mapping.json can be added in the Demo repository.
-The service mapping to heat template directory, deployment artifacts, VF to VNF mapping etc are the same structures as in the testsuite service_mapping.py.
+The service mapping to heat template directory, deployment artifacts, VF to VNF mapping etc are in the below structure sa required by testsuite
+
+GLOBAL_SERVICE_FOLDER_MAPPING - This metadata identifies the folders to be zipped and uploaded to SDC for model distribution for a given VNF
+Example:
+````json
+"GLOBAL_SERVICE_FOLDER_MAPPING": {
+ "vCPE" : ["vCPE/infra", "vCPE/vbng", "vCPE/vbrgemu", "vCPE/vgmux", "vCPE/vgw"]
+}
+```
+
+GLOBAL_SERVICE_VNF_MAPPING - Map the service to the list of VNFs to be orchestrated
+Example:
+````json
+"GLOBAL_SERVICE_VNF_MAPPING": {
+ "vLB" : ["vLB"]
+}
+```
+
+GLOBAL_SERVICE_GEN_NEUTRON_NETWORK_MAPPING - Map the service to the list of Generic Neutron Networks to be orchestrated
+Example:
+````json
+"GLOBAL_SERVICE_GEN_NEUTRON_NETWORK_MAPPING": {
+ "vCPEvGMUX" : ["MUX_GW"]
+ }
+```
+
+GLOBAL_SERVICE_DEPLOYMENT_ARTIFACT_MAPPING - Map the service to the list of Deployment Artifacts for Closed Loop Control
+Example:
+````json
+"GLOBAL_SERVICE_DEPLOYMENT_ARTIFACT_MAPPING": {
+ "vLB" :["tca_docker_k8s_v4.yaml"]
+ }
+```
+
+GLOBAL_SERVICE_TEMPLATE_MAPPING - This metadata identifes the preloads that need to be done for a VNF as there may be more than one (vLB)
+"template" maps to the parameters in the preload_paramenters.py - GLOBAL_PRELOAD_PARAMETERS[testcase][template] - i.e. GLOBAL_PRELOAD_PARAMETERS['Demo'][dnsscaling_preload.template']
+Example:
+````json
+"GLOBAL_SERVICE_TEMPLATE_MAPPING": {
+ "vCPE" : [{"isBase" : "true", "template" : "vcpe_preload.template", "vnf_index": "0", "name_pattern": "base_clearwater"}]
+ }
+```
+
+GLOBAL_VALIDATE_NAME_MAPPING - Used by the Heatbridge Validate Query to A&AI to locate the vserver name
+Example:
+````json
+"GLOBAL_VALIDATE_NAME_MAPPING": {
+ "vCPE" : "vgw_name_0"
+ }
+``` \ No newline at end of file
diff --git a/service_mapping/vCPE/service_mapping.json b/service_mapping/vCPE/service_mapping.json
new file mode 100644
index 00000000..737db11a
--- /dev/null
+++ b/service_mapping/vCPE/service_mapping.json
@@ -0,0 +1,20 @@
+{
+ "GLOBAL_SERVICE_FOLDER_MAPPING": {
+ "vCPE" : ["vCPE/infra", "vCPE/vbng", "vCPE/vbrgemu", "vCPE/vgmux", "vCPE/vgw"]
+ },
+ "GLOBAL_SERVICE_VNF_MAPPING": {
+ "vCPE" : ["vCPE"]
+ },
+ "GLOBAL_SERVICE_GEN_NEUTRON_NETWORK_MAPPING": {
+ "vCPE" :[]
+ },
+ "GLOBAL_SERVICE_DEPLOYMENT_ARTIFACT_MAPPING": {
+ "vCPE" :[]
+ },
+ "GLOBAL_SERVICE_TEMPLATE_MAPPING": {
+ "vCPE" : [{"isBase" : "true", "template" : "vcpe_preload.template", "vnf_index": "0", "name_pattern": "base_clearwater"}]
+ },
+ "GLOBAL_VALIDATE_NAME_MAPPING": {
+ "vCPE" : "vgw_name_0"
+ }
+}
diff --git a/service_mapping/vCPEInfra/service_mapping.json b/service_mapping/vCPEInfra/service_mapping.json
new file mode 100644
index 00000000..a6213ff2
--- /dev/null
+++ b/service_mapping/vCPEInfra/service_mapping.json
@@ -0,0 +1,20 @@
+{
+ "GLOBAL_SERVICE_FOLDER_MAPPING": {
+ "vCPEInfra" : ["vCPE/infra"]
+ },
+ "GLOBAL_SERVICE_VNF_MAPPING": {
+ "vCPEInfra" : ["vCPEInfra"]
+ },
+ "GLOBAL_SERVICE_GEN_NEUTRON_NETWORK_MAPPING": {
+ "vCPEInfra" : ["CPE_SIGNAL","CPE_PUBLIC"]
+ },
+ "GLOBAL_SERVICE_DEPLOYMENT_ARTIFACT_MAPPING": {
+ "vCPEInfra" :[]
+ },
+ "GLOBAL_SERVICE_TEMPLATE_MAPPING": {
+ "vCPEInfra" : [{"isBase" : "true", "template" : "vcpe_infra_preload.template", "vnf_index": "0", "name_pattern": "base_infra"}]
+ },
+ "GLOBAL_VALIDATE_NAME_MAPPING": {
+ "vCPEInfra" : ""
+ }
+} \ No newline at end of file
diff --git a/service_mapping/vCPEResCust/service_mapping.json b/service_mapping/vCPEResCust/service_mapping.json
new file mode 100644
index 00000000..9b98deb6
--- /dev/null
+++ b/service_mapping/vCPEResCust/service_mapping.json
@@ -0,0 +1,20 @@
+{
+ "GLOBAL_SERVICE_FOLDER_MAPPING": {
+ "vCPEResCust" : ["vCPE/vgw"]
+ },
+ "GLOBAL_SERVICE_VNF_MAPPING": {
+ "vCPEResCust" : ["vCPEvGW"]
+ },
+ "GLOBAL_SERVICE_GEN_NEUTRON_NETWORK_MAPPING": {
+ "vCPEResCust" : []
+ },
+ "GLOBAL_SERVICE_DEPLOYMENT_ARTIFACT_MAPPING": {
+ "vCPEResCust" :[]
+ },
+ "GLOBAL_SERVICE_TEMPLATE_MAPPING": {
+ "vCPEResCust" : [{"isBase" : "true", "template" : "vcpe_vgw_preload.template", "vnf_index": "0", "name_pattern": "base_vgw"}]
+ },
+ "GLOBAL_VALIDATE_NAME_MAPPING": {
+ "vCPEResCust" : "vgw_name_0"
+ }
+} \ No newline at end of file
diff --git a/service_mapping/vCPEvBNG/service_mapping.json b/service_mapping/vCPEvBNG/service_mapping.json
new file mode 100644
index 00000000..3f353359
--- /dev/null
+++ b/service_mapping/vCPEvBNG/service_mapping.json
@@ -0,0 +1,20 @@
+{
+ "GLOBAL_SERVICE_FOLDER_MAPPING": {
+ "vCPEvBNG" : ["vCPE/vbng"]
+ },
+ "GLOBAL_SERVICE_VNF_MAPPING": {
+ "vCPEvBNG" : ["vCPEvBNG"]
+ },
+ "GLOBAL_SERVICE_GEN_NEUTRON_NETWORK_MAPPING": {
+ "vCPEvBNG" : ["BRG_BNG", "BNG_MUX"]
+ },
+ "GLOBAL_SERVICE_DEPLOYMENT_ARTIFACT_MAPPING": {
+ "vCPEvBNG" :[]
+ },
+ "GLOBAL_SERVICE_TEMPLATE_MAPPING": {
+ "vCPEvBNG" : [{"isBase" : "true", "template" : "vcpe_vbng_preload.template", "vnf_index": "0", "name_pattern": "base_vbng"}]
+ },
+ "GLOBAL_VALIDATE_NAME_MAPPING": {
+ "vCPEvBNG" : ""
+ }
+} \ No newline at end of file
diff --git a/service_mapping/vCPEvBRGEMU/service_mapping.json b/service_mapping/vCPEvBRGEMU/service_mapping.json
new file mode 100644
index 00000000..6803983a
--- /dev/null
+++ b/service_mapping/vCPEvBRGEMU/service_mapping.json
@@ -0,0 +1,20 @@
+{
+ "GLOBAL_SERVICE_FOLDER_MAPPING": {
+ "vCPEvBRGEMU" : ["vCPE/vbrgemu"]
+ },
+ "GLOBAL_SERVICE_VNF_MAPPING": {
+ "vCPEvBRGEMU" : ["vCPEvBRGEMU"]
+ },
+ "GLOBAL_SERVICE_GEN_NEUTRON_NETWORK_MAPPING": {
+ "vCPEvBRGEMU" : []
+ },
+ "GLOBAL_SERVICE_DEPLOYMENT_ARTIFACT_MAPPING": {
+ "vCPEvBRGEMU" :[]
+ },
+ "GLOBAL_SERVICE_TEMPLATE_MAPPING": {
+ "vCPEvBRGEMU" : [{"isBase" : "true", "template" : "vcpe_vbrgemu_preload.template", "vnf_index": "0", "name_pattern": "base_vbrgemu"}]
+ },
+ "GLOBAL_VALIDATE_NAME_MAPPING": {
+ "vCPEvBRGEMU" : ""
+ }
+} \ No newline at end of file
diff --git a/service_mapping/vCPEvGMUX/service_mapping.json b/service_mapping/vCPEvGMUX/service_mapping.json
new file mode 100644
index 00000000..47cf5aab
--- /dev/null
+++ b/service_mapping/vCPEvGMUX/service_mapping.json
@@ -0,0 +1,20 @@
+{
+ "GLOBAL_SERVICE_FOLDER_MAPPING": {
+ "vCPEvGMUX" : ["vCPE/vgmux"]
+ },
+ "GLOBAL_SERVICE_VNF_MAPPING": {
+ "vCPEvGMUX" : ["vCPEvGMUX"]
+ },
+ "GLOBAL_SERVICE_GEN_NEUTRON_NETWORK_MAPPING": {
+ "vCPEvGMUX" : ["MUX_GW"]
+ },
+ "GLOBAL_SERVICE_DEPLOYMENT_ARTIFACT_MAPPING": {
+ "vCPEvGMUX" :[]
+ },
+ "GLOBAL_SERVICE_TEMPLATE_MAPPING": {
+ "vCPEvGMUX" : [{"isBase" : "true", "template" : "vcpe_vgmux_preload.template", "vnf_index": "0", "name_pattern": "base_vgmux"}]
+ },
+ "GLOBAL_VALIDATE_NAME_MAPPING": {
+ "vCPEvGMUX" : "vgmux_name_0"
+ }
+} \ No newline at end of file
diff --git a/service_mapping/vCPEvGW/service_mapping.json b/service_mapping/vCPEvGW/service_mapping.json
new file mode 100644
index 00000000..0b99b02c
--- /dev/null
+++ b/service_mapping/vCPEvGW/service_mapping.json
@@ -0,0 +1,20 @@
+{
+ "GLOBAL_SERVICE_FOLDER_MAPPING": {
+ "vCPEvGW" : ["vCPE/vgw"]
+ },
+ "GLOBAL_SERVICE_VNF_MAPPING": {
+ "vCPEvGW" : ["vCPEvGW"]
+ },
+ "GLOBAL_SERVICE_GEN_NEUTRON_NETWORK_MAPPING": {
+ "vCPEvGW" :[]
+ },
+ "GLOBAL_SERVICE_DEPLOYMENT_ARTIFACT_MAPPING": {
+ "vCPEvGW" :[]
+ },
+ "GLOBAL_SERVICE_TEMPLATE_MAPPING": {
+ "vCPEvGW" : [{"isBase" : "true", "template" : "vcpe_vgw_preload.template", "vnf_index": "0", "name_pattern": "base_vgw"}]
+ },
+ "GLOBAL_VALIDATE_NAME_MAPPING": {
+ "vCPEvGW" : "vgw_name_0"
+ }
+} \ No newline at end of file
diff --git a/service_mapping/vFW/service_mapping.json b/service_mapping/vFW/service_mapping.json
new file mode 100644
index 00000000..0c6486fa
--- /dev/null
+++ b/service_mapping/vFW/service_mapping.json
@@ -0,0 +1,20 @@
+{
+ "GLOBAL_SERVICE_FOLDER_MAPPING": {
+ "vFW" : ["vFW"]
+ },
+ "GLOBAL_SERVICE_VNF_MAPPING": {
+ "vFW" : ["vFW"]
+ },
+ "GLOBAL_SERVICE_GEN_NEUTRON_NETWORK_MAPPING": {
+ "vFW" :[]
+ },
+ "GLOBAL_SERVICE_DEPLOYMENT_ARTIFACT_MAPPING": {
+ "vFW" :[]
+ },
+ "GLOBAL_SERVICE_TEMPLATE_MAPPING": {
+ "vFW" : [{"isBase" : "true", "template" : "vfw_preload.template", "vnf_index": "0", "name_pattern": "base_vfw"}]
+ },
+ "GLOBAL_VALIDATE_NAME_MAPPING": {
+ "vFW" : "vfw_name_0"
+ }
+}
diff --git a/service_mapping/vFWCL/service_mapping.json b/service_mapping/vFWCL/service_mapping.json
new file mode 100644
index 00000000..860ccb81
--- /dev/null
+++ b/service_mapping/vFWCL/service_mapping.json
@@ -0,0 +1,22 @@
+{
+ "GLOBAL_SERVICE_FOLDER_MAPPING": {
+ "vFWCL" : ["vFWCL/vFWSNK", "vFWCL/vPKG"]
+ },
+ "GLOBAL_SERVICE_VNF_MAPPING": {
+ "vFWCL" : ["vFWCLvFWSNK", "vFWCLvPKG"]
+ },
+ "GLOBAL_SERVICE_GEN_NEUTRON_NETWORK_MAPPING": {
+ "vFWCL" :[]
+ },
+ "GLOBAL_SERVICE_DEPLOYMENT_ARTIFACT_MAPPING": {
+ "vFWCL" :[]
+ },
+ "GLOBAL_SERVICE_TEMPLATE_MAPPING": {
+ "vFWCLvFWSNK" : [{"isBase" : "true", "template" : "vfwsnk_preload.template", "vnf_index": "0", "name_pattern": "base_vfw"}],
+ "vFWCLvPKG" : [{"isBase" : "true", "template" : "vpkg_preload.template", "vnf_index": "1" , "name_pattern": "base_vpkg"}]
+ },
+ "GLOBAL_VALIDATE_NAME_MAPPING": {
+ "vFWCLvFWSNK" : "vfw_name_0",
+ "vFWCLvPKG" : "vpg_name_0"
+ }
+}
diff --git a/service_mapping/vFWNG/service_mapping.json b/service_mapping/vFWNG/service_mapping.json
new file mode 100644
index 00000000..a9945995
--- /dev/null
+++ b/service_mapping/vFWNG/service_mapping.json
@@ -0,0 +1,20 @@
+{
+ "GLOBAL_SERVICE_FOLDER_MAPPING": {
+ "vLB" : ["vFWNG/templates"]
+ },
+ "GLOBAL_SERVICE_VNF_MAPPING": {
+ "vFWNG" : ["vFWNG"]
+ },
+ "GLOBAL_SERVICE_GEN_NEUTRON_NETWORK_MAPPING": {
+ "vFWNG" :[]
+ },
+ "GLOBAL_SERVICE_DEPLOYMENT_ARTIFACT_MAPPING": {
+ "vFWNG" :[]
+ },
+ "GLOBAL_SERVICE_TEMPLATE_MAPPING": {
+ "vFWNG" : []
+ },
+ "GLOBAL_VALIDATE_NAME_MAPPING": {
+ "vFWNG" : ""
+ }
+}
diff --git a/service_mapping/vLB/service_mapping.json b/service_mapping/vLB/service_mapping.json
new file mode 100644
index 00000000..c9574268
--- /dev/null
+++ b/service_mapping/vLB/service_mapping.json
@@ -0,0 +1,21 @@
+{
+ "GLOBAL_SERVICE_FOLDER_MAPPING": {
+ "vLB" : ["vLBMS"]
+ },
+ "GLOBAL_SERVICE_VNF_MAPPING": {
+ "vLB" : ["vLB"]
+ },
+ "GLOBAL_SERVICE_GEN_NEUTRON_NETWORK_MAPPING": {
+ "vLB" :[]
+ },
+ "GLOBAL_SERVICE_DEPLOYMENT_ARTIFACT_MAPPING": {
+ "vLB" :["tca_docker_k8s_v4.yaml"]
+ },
+ "GLOBAL_SERVICE_TEMPLATE_MAPPING": {
+ "vLB" : [{"isBase" : "true", "template" : "vlb_preload.template", "vnf_index": "0", "name_pattern": "base_vlb"},
+ {"isBase" : "false", "template" : "dnsscaling_preload.template", "vnf_index": "1", "name_pattern": "dnsscaling", "prefix" : "vDNS_"}]
+ },
+ "GLOBAL_VALIDATE_NAME_MAPPING": {
+ "vLB" : "vlb_name_0"
+ }
+}
diff --git a/service_mapping/vVG/service_mapping.json b/service_mapping/vVG/service_mapping.json
new file mode 100644
index 00000000..779619ec
--- /dev/null
+++ b/service_mapping/vVG/service_mapping.json
@@ -0,0 +1,20 @@
+{
+ "GLOBAL_SERVICE_FOLDER_MAPPING": {
+ "vVG" : ["vVG"]
+ },
+ "GLOBAL_SERVICE_VNF_MAPPING": {
+ "vVG" : ["vVG"]
+ },
+ "GLOBAL_SERVICE_GEN_NEUTRON_NETWORK_MAPPING": {
+ "vVG" :[]
+ },
+ "GLOBAL_SERVICE_DEPLOYMENT_ARTIFACT_MAPPING": {
+ "vVG" :[]
+ },
+ "GLOBAL_SERVICE_TEMPLATE_MAPPING": {
+ "vVG" : [{"isBase" : "true", "template" : "vvg_preload.template", "vnf_index": "0", "name_pattern": "base_vvg"}]
+ },
+ "GLOBAL_VALIDATE_NAME_MAPPING": {
+ "vVG" : ""
+ }
+}