Pretty print json files in service_mapping/

Fixing json files to conform to linter rules.

Change-Id: I2c0e6bf4df7cd921a4860570045bf26bc1ab6c5b
Issue-ID: INT-1482
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>

15 files changed, 485 insertions, 282 deletions

diff --git a/service_mapping/pNF/service_mapping.json b/service_mapping/pNF/service_mapping.json
index 1e19ae3f..f9285bec 100644
--- a/service_mapping/pNF/service_mapping.json
+++ b/service_mapping/pNF/service_mapping.json
@@ -1,17 +1,21 @@
 {
-   "GLOBAL_SERVICE_FOLDER_MAPPING": { 
-	                        "pNF" : ["pNF"]
-   },
-   "GLOBAL_SERVICE_VNF_MAPPING": { 
-	    "pNF"  : ["pNF"]
-   },
-   "GLOBAL_SERVICE_GEN_NEUTRON_NETWORK_MAPPING": {
-        "pNF" :[]
-   },
-   "GLOBAL_SERVICE_DEPLOYMENT_ARTIFACT_MAPPING": {
-    "pNF" :[]
-   },
-   "GLOBAL_SERVICE_TEMPLATE_MAPPING":  {
-    "pNF"  : []
-   } 
+    "GLOBAL_SERVICE_FOLDER_MAPPING": {
+        "pNF": [
+            "pNF"
+        ]
+    },
+    "GLOBAL_SERVICE_VNF_MAPPING": {
+        "pNF": [
+            "pNF"
+        ]
+    },
+    "GLOBAL_SERVICE_GEN_NEUTRON_NETWORK_MAPPING": {
+        "pNF": []
+    },
+    "GLOBAL_SERVICE_DEPLOYMENT_ARTIFACT_MAPPING": {
+        "pNF": []
+    },
+    "GLOBAL_SERVICE_TEMPLATE_MAPPING": {
+        "pNF": []
+    }
 }
diff --git a/service_mapping/vCPE/service_mapping.json b/service_mapping/vCPE/service_mapping.json
index 737db11a..29d43931 100644
--- a/service_mapping/vCPE/service_mapping.json
+++ b/service_mapping/vCPE/service_mapping.json
@@ -1,20 +1,35 @@
 {
-   "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"
-   } 
+    "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
index a6213ff2..a39118f6 100644
--- a/service_mapping/vCPEInfra/service_mapping.json
+++ b/service_mapping/vCPEInfra/service_mapping.json
@@ -1,20 +1,34 @@
 {
-   "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
+    "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": ""
+    }
+}
diff --git a/service_mapping/vCPEResCust/service_mapping.json b/service_mapping/vCPEResCust/service_mapping.json
index 9b98deb6..c5a0bfa1 100644
--- a/service_mapping/vCPEResCust/service_mapping.json
+++ b/service_mapping/vCPEResCust/service_mapping.json
@@ -1,20 +1,31 @@
 {
-   "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
+    "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"
+    }
+}
diff --git a/service_mapping/vCPEvBNG/service_mapping.json b/service_mapping/vCPEvBNG/service_mapping.json
index 3f353359..b0a8c763 100644
--- a/service_mapping/vCPEvBNG/service_mapping.json
+++ b/service_mapping/vCPEvBNG/service_mapping.json
@@ -1,20 +1,34 @@
 {
-   "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
+    "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": ""
+    }
+}
diff --git a/service_mapping/vCPEvBRGEMU/service_mapping.json b/service_mapping/vCPEvBRGEMU/service_mapping.json
index 6803983a..104d2b36 100644
--- a/service_mapping/vCPEvBRGEMU/service_mapping.json
+++ b/service_mapping/vCPEvBRGEMU/service_mapping.json
@@ -1,20 +1,31 @@
 {
-   "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
+    "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": ""
+    }
+}
diff --git a/service_mapping/vCPEvGMUX/service_mapping.json b/service_mapping/vCPEvGMUX/service_mapping.json
index 47cf5aab..de1cc6c0 100644
--- a/service_mapping/vCPEvGMUX/service_mapping.json
+++ b/service_mapping/vCPEvGMUX/service_mapping.json
@@ -1,20 +1,33 @@
 {
-   "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
+    "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"
+    }
+}
diff --git a/service_mapping/vCPEvGW/service_mapping.json b/service_mapping/vCPEvGW/service_mapping.json
index 0b99b02c..011af3cd 100644
--- a/service_mapping/vCPEvGW/service_mapping.json
+++ b/service_mapping/vCPEvGW/service_mapping.json
@@ -1,20 +1,31 @@
 {
-   "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
+    "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"
+    }
+}
diff --git a/service_mapping/vFW/service_mapping.json b/service_mapping/vFW/service_mapping.json
index 0c6486fa..f1798b6a 100644
--- a/service_mapping/vFW/service_mapping.json
+++ b/service_mapping/vFW/service_mapping.json
@@ -1,20 +1,31 @@
 {
-   "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"
-   } 
+    "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
index 860ccb81..4e485b7a 100644
--- a/service_mapping/vFWCL/service_mapping.json
+++ b/service_mapping/vFWCL/service_mapping.json
@@ -1,22 +1,42 @@
 {
-   "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"
-   } 
+    "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/vFWDT/service_mapping.json b/service_mapping/vFWDT/service_mapping.json
index be9c5b76..6bb70f57 100644
--- a/service_mapping/vFWDT/service_mapping.json
+++ b/service_mapping/vFWDT/service_mapping.json
@@ -1,23 +1,49 @@
 {
-   "GLOBAL_SERVICE_FOLDER_MAPPING": { 
-	                        "vFWDT" : ["vFWDT/vFWSNK", "vFWDT/vPKG"]
-   },
-   "GLOBAL_SERVICE_VNF_MAPPING": { 
-	    "vFWDT"  : ["vFWDTvPKG", "vFWDTvFWSNK", "vFWDTvFWSNK"]
-   },
-   "GLOBAL_SERVICE_GEN_NEUTRON_NETWORK_MAPPING": {
-    "vFWDT": []
-   },
-   "GLOBAL_SERVICE_DEPLOYMENT_ARTIFACT_MAPPING": {
-    "vFWDT": []
-   },
-   "GLOBAL_SERVICE_TEMPLATE_MAPPING":  {
-    "vFWDTvPKG": [{"isBase" : "true",  "template" : "vfwdt_vpkg_preload.template", "vnf_index": "0", "name_pattern": "base_vpkg"}],
-    "vFWDTvFWSNK": [{"isBase" : "true",   "template" : "vfwdt_vfwsnk0_preload.template", "vnf_index": "1", "name_pattern": "base_vfw"},
-                 {"isBase" : "true",   "template" : "vfwdt_vfwsnk1_preload.template", "vnf_index": "2", "name_pattern": "base_vfw"}]
-   },
-   "GLOBAL_VALIDATE_NAME_MAPPING": {
-	   "vFWDTvPKG": "vpg_name_0",
-	   "vFWDTvFWSNK": "vfw_name_0"
-   } 
+    "GLOBAL_SERVICE_FOLDER_MAPPING": {
+        "vFWDT": [
+            "vFWDT/vFWSNK",
+            "vFWDT/vPKG"
+        ]
+    },
+    "GLOBAL_SERVICE_VNF_MAPPING": {
+        "vFWDT": [
+            "vFWDTvPKG",
+            "vFWDTvFWSNK",
+            "vFWDTvFWSNK"
+        ]
+    },
+    "GLOBAL_SERVICE_GEN_NEUTRON_NETWORK_MAPPING": {
+        "vFWDT": []
+    },
+    "GLOBAL_SERVICE_DEPLOYMENT_ARTIFACT_MAPPING": {
+        "vFWDT": []
+    },
+    "GLOBAL_SERVICE_TEMPLATE_MAPPING": {
+        "vFWDTvPKG": [
+            {
+                "isBase": "true",
+                "template": "vfwdt_vpkg_preload.template",
+                "vnf_index": "0",
+                "name_pattern": "base_vpkg"
+            }
+        ],
+        "vFWDTvFWSNK": [
+            {
+                "isBase": "true",
+                "template": "vfwdt_vfwsnk0_preload.template",
+                "vnf_index": "1",
+                "name_pattern": "base_vfw"
+            },
+            {
+                "isBase": "true",
+                "template": "vfwdt_vfwsnk1_preload.template",
+                "vnf_index": "2",
+                "name_pattern": "base_vfw"
+            }
+        ]
+    },
+    "GLOBAL_VALIDATE_NAME_MAPPING": {
+        "vFWDTvPKG": "vpg_name_0",
+        "vFWDTvFWSNK": "vfw_name_0"
+    }
 }
diff --git a/service_mapping/vFWNG/service_mapping.json b/service_mapping/vFWNG/service_mapping.json
index a9945995..46d250c8 100644
--- a/service_mapping/vFWNG/service_mapping.json
+++ b/service_mapping/vFWNG/service_mapping.json
@@ -1,20 +1,24 @@
 {
-   "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" : ""
-   } 
+    "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
index 8f23aa89..dae67b88 100644
--- a/service_mapping/vLB/service_mapping.json
+++ b/service_mapping/vLB/service_mapping.json
@@ -1,22 +1,41 @@
 {
-   "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" :["k8s-tca-clamp-policy-05082019.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",
-                                 "vDNS" : "vdns_name_0"
-   } 
+    "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": [
+            "k8s-tca-clamp-policy-05082019.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",
+        "vDNS": "vdns_name_0"
+    }
 }
diff --git a/service_mapping/vLB_CDS/service_mapping.json b/service_mapping/vLB_CDS/service_mapping.json
index 880448b7..d7e395df 100644
--- a/service_mapping/vLB_CDS/service_mapping.json
+++ b/service_mapping/vLB_CDS/service_mapping.json
@@ -1,22 +1,41 @@
 {
-   "GLOBAL_SERVICE_FOLDER_MAPPING": { 
-                                "vLB_CDS" : ["vLB_CDS"]
-   },
-   "GLOBAL_SERVICE_VNF_MAPPING": { 
-            "vLB_CDS"  : ["vLB_CDS"]
-   },
-   "GLOBAL_SERVICE_GEN_NEUTRON_NETWORK_MAPPING": {
-        "vLB_CDS" :[]
-   },
-   "GLOBAL_SERVICE_DEPLOYMENT_ARTIFACT_MAPPING": {
-    "vLB_CDS" :["k8s-tca-clamp-policy-05082019.yaml"]
-   },
-   "GLOBAL_SERVICE_TEMPLATE_MAPPING":  {
-    "vLB_CDS"  : [{"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_CDS" : "vlb_name_0",
-                                 "vDNS_CDS" : "vdns_name_0"
-   } 
+    "GLOBAL_SERVICE_FOLDER_MAPPING": {
+        "vLB_CDS": [
+            "vLB_CDS"
+        ]
+    },
+    "GLOBAL_SERVICE_VNF_MAPPING": {
+        "vLB_CDS": [
+            "vLB_CDS"
+        ]
+    },
+    "GLOBAL_SERVICE_GEN_NEUTRON_NETWORK_MAPPING": {
+        "vLB_CDS": []
+    },
+    "GLOBAL_SERVICE_DEPLOYMENT_ARTIFACT_MAPPING": {
+        "vLB_CDS": [
+            "k8s-tca-clamp-policy-05082019.yaml"
+        ]
+    },
+    "GLOBAL_SERVICE_TEMPLATE_MAPPING": {
+        "vLB_CDS": [
+            {
+                "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_CDS": "vlb_name_0",
+        "vDNS_CDS": "vdns_name_0"
+    }
 }
diff --git a/service_mapping/vVG/service_mapping.json b/service_mapping/vVG/service_mapping.json
index 779619ec..4b71b088 100644
--- a/service_mapping/vVG/service_mapping.json
+++ b/service_mapping/vVG/service_mapping.json
@@ -1,20 +1,31 @@
 {
-   "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" : ""
-   } 
+    "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": ""
+    }
 }