Fix vFWDT Preload

Issue-ID: INT-829
Change-Id: I2dd1f857547524fa393d7891618a4c7cc4c2f04d
Signed-off-by: Brian Freeman <bf1936@att.com>

diff --git a/service_mapping/vFWDT/service_mapping.json b/service_mapping/vFWDT/service_mapping.json
index 74abccd..be9c5b7 100644 (file)
--- a/service_mapping/vFWDT/service_mapping.json
+++ b/service_mapping/vFWDT/service_mapping.json
@@ -3,7 +3,7 @@
                                "vFWDT" : ["vFWDT/vFWSNK", "vFWDT/vPKG"]
    },
    "GLOBAL_SERVICE_VNF_MAPPING": { 
-           "vFWDT"  : ["vFWSNK", "vPKG", "vFWSNK"]
+           "vFWDT"  : ["vFWDTvPKG", "vFWDTvFWSNK", "vFWDTvFWSNK"]
    },
    "GLOBAL_SERVICE_GEN_NEUTRON_NETWORK_MAPPING": {
     "vFWDT": []
@@ -12,13 +12,12 @@
     "vFWDT": []
    },
    "GLOBAL_SERVICE_TEMPLATE_MAPPING":  {
-    "vFWDT": [{"isBase" : "true",   "template" : "vfwdt_vfw0_preload.template", "name_pattern": "base_vfw0"},
-                 {"isBase" : "true",   "template" : "vfwdt_vfw1_preload.template", "name_pattern": "base_vfw1"},
-                 {"isBase" : "true",  "template" : "vfwdt_vfwsnk0_preload.template", "name_pattern": "base_vsnk0"},
-                 {"isBase" : "true",  "template" : "vfwdt_vfwsnk1_preload.template", "name_pattern": "base_vsnk1"},
-                 {"isBase" : "true",  "template" : "vfwdt_vpkg_preload.template", "name_pattern": "base_vpkg"}]
+    "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": {
-          "vFWDT": "vfw_name_0"
+          "vFWDTvPKG": "vpg_name_0",
+          "vFWDTvFWSNK": "vfw_name_0"
    } 
 }