update vLB CDS CBA

Issue-ID: CCSDK-1816
Signed-off-by: Abdelmuhaimen Seaudi <abdelmuhaimen.seaudi@orange.com>
Change-Id: I1b399aae8abca6a2f5d175560053fa0c7b646896
(cherry picked from commit c4fb5230962566bb8e321d1129cee384f70d84e8)

13 files changed, 372 insertions, 341 deletions

diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/base_template-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/base_template-mapping.json
index 62d1b966b..43b0f9dd0 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/base_template-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/base_template-mapping.json
@@ -20,7 +20,7 @@
     "version": 0
   },
     {
-    "name": "vf_module_name",
+    "name": "vf-module-name",
     "property": {
       "description": "",
       "required": false,
@@ -32,10 +32,10 @@
       "entry_schema": {
         "type": ""
       },
-      "default": "${vf_module_name}"
+      "default": "${vf-module-name}"
     },
     "input-param": false,
-    "dictionary-name": "vf_module_name",
+    "dictionary-name": "vf-module-name",
     "dictionary-source": "default",
     "dependencies": [],
     "version": 0
@@ -406,4 +406,4 @@
     ],
     "version": 0
   }
-]
+]
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/base_template-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/base_template-template.vtl
index 8055030c2..58512be2f 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/base_template-template.vtl
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/base_template-template.vtl
@@ -81,15 +81,15 @@
           "payload": [
             {
               "param-name": "resource-name",
-              "param-value": "vf_module_name"
+              "param-value": "vf-module-name"
             },
             {
               "param-name": "resource-value",
-              "param-value": "${vf_module_name}"
+              "param-value": "${vf-module-name}"
             },
             {
               "param-name": "external-key",
-              "param-value": "${vf-module-id}_vf_module_name"
+              "param-value": "${vf-module-id}_vf-module-name"
             },
             {
               "param-name": "policy-instance-name",
@@ -114,8 +114,8 @@
           ],
           "output-key-mapping": [
             {
-              "resource-name": "vf_module_name",
-              "resource-value": "${vf_module_name}"
+              "resource-name": "vf-module-name",
+              "resource-value": "${vf-module-name}"
             }
           ]
         }
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/baseconfig-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/baseconfig-mapping.json
index 0ab26be3b..000cbd039 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/baseconfig-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/baseconfig-mapping.json
@@ -1,113 +1,113 @@
-[

-  {

-    "name": "service-instance-id",

-    "property": {

-      "description": "",

-      "required": false,

-      "type": "string",

-      "status": "",

-      "constraints": [

-        {}

-      ],

-      "entry_schema": {

-        "type": ""

-      }

-    },

-    "input-param": false,

-    "dictionary-name": "service-instance-id",

-    "dictionary-source": "input",

-    "dependencies": [],

-    "version": 0

-  },

-  {

-    "name": "vnf-id",

-    "property": {

-      "description": "",

-      "required": false,

-      "type": "string",

-      "status": "",

-      "constraints": [

-        {}

-      ],

-      "entry_schema": {

-        "type": ""

-      }

-    },

-    "input-param": false,

-    "dictionary-name": "vnf-id",

-    "dictionary-source": "input",

-    "dependencies": [],

-    "version": 0

-  },

-  {

-    "name": "vdns_vf_module_id",

-    "property": {

-      "description": "",

-      "required": false,

-      "type": "string",

-      "status": "",

-      "constraints": [

-        {}

-      ],

-      "entry_schema": {

-        "type": ""

-      }

-    },

-    "input-param": false,

-    "dictionary-name": "vdns_vf_module_id",

-    "dictionary-source": "sdnc",

-    "dependencies": [

-	  "service-instance-id",

-      "vnf-id"

-    ],

-    "version": 0

-  },

-  {

-    "name": "vdns_int_private_ip_0",

-    "property": {

-      "description": "",

-      "required": false,

-      "type": "string",

-      "status": "",

-      "constraints": [

-        {}

-      ],

-      "entry_schema": {

-        "type": ""

-      }

-    },

-    "input-param": false,

-    "dictionary-name": "vdns_int_private_ip_0",

-    "dictionary-source": "sdnc",

-    "dependencies": [

-      "service-instance-id",

-      "vnf-id",

-      "vdns_vf_module_id"

-    ],

-    "version": 0

-  },

-  {

-    "name": "vdns_onap_private_ip_0",

-    "property": {

-      "description": "",

-      "required": false,

-      "type": "string",

-      "status": "",

-      "constraints": [

-        {}

-      ],

-      "entry_schema": {

-        "type": ""

-      }

-    },

-    "input-param": false,

-    "dictionary-name": "vdns_onap_private_ip_0",

-    "dictionary-source": "sdnc",

-    "dependencies": [

-      "service-instance-id",

-      "vnf-id",

-      "vdns_vf_module_id"

-    ],

-    "version": 0

-  }

-]

+[
+  {
+    "name": "service-instance-id",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {}
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "service-instance-id",
+    "dictionary-source": "input",
+    "dependencies": [],
+    "version": 0
+  },
+  {
+    "name": "vnf-id",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {}
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vnf-id",
+    "dictionary-source": "input",
+    "dependencies": [],
+    "version": 0
+  },
+  {
+    "name": "vdns_vf_module_id",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {}
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vdns_vf_module_id",
+    "dictionary-source": "sdnc",
+    "dependencies": [
+	  "service-instance-id",
+      "vnf-id"
+    ],
+    "version": 0
+  },
+  {
+    "name": "vdns_int_private_ip_0",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {}
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vdns_int_private_ip_0",
+    "dictionary-source": "sdnc",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id",
+      "vdns_vf_module_id"
+    ],
+    "version": 0
+  },
+  {
+    "name": "vdns_onap_private_ip_0",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {}
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vdns_onap_private_ip_0",
+    "dictionary-source": "sdnc",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id",
+      "vdns_vf_module_id"
+    ],
+    "version": 0
+  }
+]
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/incremental-config-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/incremental-config-mapping.json
index db29b5aa5..1aece7315 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/incremental-config-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/incremental-config-mapping.json
@@ -1,113 +1,113 @@
-[

-  {

-    "name": "service-instance-id",

-    "property": {

-      "description": "",

-      "required": false,

-      "type": "string",

-      "status": "",

-      "constraints": [

-        {}

-      ],

-      "entry_schema": {

-        "type": ""

-      }

-    },

-    "input-param": false,

-    "dictionary-name": "service-instance-id",

-    "dictionary-source": "input",

-    "dependencies": [],

-    "version": 0

-  },

-  {

-    "name": "vnf-id",

-    "property": {

-      "description": "",

-      "required": false,

-      "type": "string",

-      "status": "",

-      "constraints": [

-        {}

-      ],

-      "entry_schema": {

-        "type": ""

-      }

-    },

-    "input-param": false,

-    "dictionary-name": "vnf-id",

-    "dictionary-source": "input",

-    "dependencies": [],

-    "version": 0

-  },

-  {

-    "name": "vdns_vf_module_id",

-    "property": {

-      "description": "",

-      "required": false,

-      "type": "string",

-      "status": "",

-      "constraints": [

-        {}

-      ],

-      "entry_schema": {

-        "type": ""

-      }

-    },

-    "input-param": false,

-    "dictionary-name": "vdns_vf_module_id",

-    "dictionary-source": "sdnc",

-    "dependencies": [

-       "service-instance-id",

-      "vnf-id"

-    ],

-    "version": 0

-  },

-  {

-    "name": "vdns_int_private_ip_0",

-    "property": {

-      "description": "",

-      "required": false,

-      "type": "string",

-      "status": "",

-      "constraints": [

-        {}

-      ],

-      "entry_schema": {

-        "type": ""

-      }

-    },

-    "input-param": false,

-    "dictionary-name": "vdns_int_private_ip_0",

-    "dictionary-source": "sdnc",

-    "dependencies": [

-      "service-instance-id",

-      "vnf-id",

-      "vdns_vf_module_id"

-    ],

-    "version": 0

-  },

-  {

-    "name": "vdns_onap_private_ip_0",

-    "property": {

-      "description": "",

-      "required": false,

-      "type": "string",

-      "status": "",

-      "constraints": [

-        {}

-      ],

-      "entry_schema": {

-        "type": ""

-      }

-    },

-    "input-param": false,

-    "dictionary-name": "vdns_onap_private_ip_0",

-    "dictionary-source": "sdnc",

-    "dependencies": [

-      "service-instance-id",

-      "vnf-id",

-      "vdns_vf_module_id"

-    ],

-    "version": 0

-  }

-]

+[
+  {
+    "name": "service-instance-id",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {}
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "service-instance-id",
+    "dictionary-source": "input",
+    "dependencies": [],
+    "version": 0
+  },
+  {
+    "name": "vnf-id",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {}
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vnf-id",
+    "dictionary-source": "input",
+    "dependencies": [],
+    "version": 0
+  },
+  {
+    "name": "vdns_vf_module_id",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {}
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vdns_vf_module_id",
+    "dictionary-source": "sdnc",
+    "dependencies": [
+       "service-instance-id",
+      "vnf-id"
+    ],
+    "version": 0
+  },
+  {
+    "name": "vdns_int_private_ip_0",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {}
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vdns_int_private_ip_0",
+    "dictionary-source": "sdnc",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id",
+      "vdns_vf_module_id"
+    ],
+    "version": 0
+  },
+  {
+    "name": "vdns_onap_private_ip_0",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {}
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vdns_onap_private_ip_0",
+    "dictionary-source": "sdnc",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id",
+      "vdns_vf_module_id"
+    ],
+    "version": 0
+  }
+]
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/nf-params-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/nf-params-mapping.json
index f36701d89..30004521b 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/nf-params-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/nf-params-mapping.json
@@ -1,65 +1,65 @@
-[

-  {

-    "name": "service-instance-id",

-    "property": {

-      "description": "",

-      "required": false,

-      "type": "string",

-      "status": "",

-      "constraints": [

-        {}

-      ],

-      "entry_schema": {

-        "type": ""

-      }

-    },

-    "input-param": false,

-    "dictionary-name": "service-instance-id",

-    "dictionary-source": "input",

-    "dependencies": [],

-    "version": 0

-  },

-  {

-    "name": "vnf-id",

-    "property": {

-      "description": "",

-      "required": false,

-      "type": "string",

-      "status": "",

-      "constraints": [

-        {}

-      ],

-      "entry_schema": {

-        "type": ""

-      }

-    },

-    "input-param": false,

-    "dictionary-name": "vnf-id",

-    "dictionary-source": "input",

-    "dependencies": [],

-    "version": 0

-  },

-  {

-    "name": "ip",

-    "property": {

-      "description": "",

-      "required": false,

-      "type": "string",

-      "status": "",

-      "constraints": [

-        {}

-      ],

-      "entry_schema": {

-        "type": ""

-      }

-    },

-    "input-param": false,

-    "dictionary-name": "vlb_onap_private_ip_0",

-    "dictionary-source": "sdnc",

-    "dependencies": [

-      "service-instance-id",

-      "vnf-id"

-    ],

-    "version": 0

-  }

-]

+[
+  {
+    "name": "service-instance-id",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {}
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "service-instance-id",
+    "dictionary-source": "input",
+    "dependencies": [],
+    "version": 0
+  },
+  {
+    "name": "vnf-id",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {}
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vnf-id",
+    "dictionary-source": "input",
+    "dependencies": [],
+    "version": 0
+  },
+  {
+    "name": "ip",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {}
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "vlb_onap_private_ip_0",
+    "dictionary-source": "sdnc",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id"
+    ],
+    "version": 0
+  }
+]
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-mapping.json
index cf3099467..2dee19ccb 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-mapping.json
@@ -113,7 +113,7 @@
     "version": 0
   },
   {
-    "name": "vf_module_name",
+    "name": "vf-module-name",
     "property": {
       "description": "",
       "required": false,
@@ -125,10 +125,10 @@
       "entry_schema": {
         "type": ""
       },
-      "default": "${vf_module_name}"
+      "default": "${vf-module-name}"
     },
     "input-param": false,
-    "dictionary-name": "vf_module_name",
+    "dictionary-name": "vf-module-name",
     "dictionary-source": "default",
     "dependencies": [],
     "version": 0
@@ -370,9 +370,12 @@
       "default": "m1.medium"
     },
     "input-param": false,
-    "dictionary-name": "vdns_flavor_name",
-    "dictionary-source": "default",
-    "dependencies": [],
+   "dictionary-name": "flavor_name",
+    "dictionary-source": "sdnc",
+    "dependencies": [
+	  "service-instance-id",
+      "vnf-id"
+	],
     "version": 0
   },
   
@@ -811,4 +814,4 @@
     ],
     "version": 0
   }
-]
+]
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-template.vtl
index 9c493dc45..84fab0d63 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-template.vtl
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-template.vtl
@@ -182,15 +182,15 @@
           "payload": [
             {
               "param-name": "resource-name",
-              "param-value": "vf_module_name"
+              "param-value": "vf-module-name"
             },
             {
               "param-name": "resource-value",
-              "param-value": "${vf_module_name}"
+              "param-value": "${vf-module-name}"
             },
             {
               "param-name": "external-key",
-              "param-value": "${vf-module-id}_vf_module_name"
+              "param-value": "${vf-module-id}_vf-module-name"
             },
             {
               "param-name": "policy-instance-name",
@@ -215,8 +215,8 @@
           ],
           "output-key-mapping": [
             {
-              "resource-name": "vf_module_name",
-              "resource-value": "${vf_module_name}"
+              "resource-name": "vf-module-name",
+              "resource-value": "${vf-module-name}"
             }
           ]
         }
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vlb-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vlb-mapping.json
index 9e3b693ca..0104579c3 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vlb-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vlb-mapping.json
@@ -21,7 +21,7 @@
     "version": 0
   },
   {
-    "name": "vf_module_name",
+    "name": "vf-module-name",
     "property": {
       "description": "",
       "required": false,
@@ -33,10 +33,10 @@
       "entry_schema": {
         "type": ""
       },
-      "default": "${vf_module_name}"
+      "default": "${vf-module-name}"
     },
     "input-param": false,
-    "dictionary-name": "vf_module_name",
+    "dictionary-name": "vf-module-name",
     "dictionary-source": "default",
     "dependencies": [],
     "version": 0
@@ -610,13 +610,15 @@
       ],
       "entry_schema": {
         "type": ""
-      },
-      "default": "m1.medium"
-    },
+      }
+	  },
     "input-param": false,
-    "dictionary-name": "vlb_flavor_name",
-    "dictionary-source": "default",
-    "dependencies": [],
+    "dictionary-name": "flavor_name",
+    "dictionary-source": "sdnc",
+    "dependencies": [
+	  "service-instance-id",
+      "vnf-id"
+	],
     "version": 0
   },
   {
@@ -924,4 +926,4 @@
     "dependencies": [],
     "version": 0
   }
-]
+]
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vlb-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vlb-template.vtl
index bc495bd2d..458423e6f 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vlb-template.vtl
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vlb-template.vtl
@@ -209,15 +209,15 @@
           "payload": [
             {
               "param-name": "resource-name",
-              "param-value": "vf_module_name"
+              "param-value": "vf-module-name"
             },
             {
               "param-name": "resource-value",
-              "param-value": "${vf_module_name}"
+              "param-value": "${vf-module-name}"
             },
             {
               "param-name": "external-key",
-              "param-value": "${vf-module-id}_vf_module_name"
+              "param-value": "${vf-module-id}_vf-module-name"
             },
             {
               "param-name": "policy-instance-name",
@@ -242,8 +242,8 @@
           ],
           "output-key-mapping": [
             {
-              "resource-name": "vf_module_name",
-              "resource-value": "${vf_module_name}"
+              "resource-name": "vf-module-name",
+              "resource-value": "${vf-module-name}"
             }
           ]
         }
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-vnf-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vnf-mapping.json
index 20e2a2720..82dbe66a2 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-vnf-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vnf-mapping.json
@@ -40,6 +40,26 @@
     "dependencies": [],
     "version": 0
   },
+    {
+    "name": "flavor_name",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {}
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "flavor_name",
+    "dictionary-source": "input",
+    "dependencies": [],
+    "version": 0
+  },
   {
     "name": "image_name",
     "property": {
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-vnf-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vnf-template.vtl
index ec43a5a4a..0080e2b2d 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-vnf-template.vtl
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vnf-template.vtl
@@ -44,6 +44,10 @@
       "param-name": "cloud_env",
       "param-value": "${cloud_env}"
     },
+	   {
+      "param-name": "flavor_name",
+      "param-value": "${flavor_name}"
+    },
     {
       "param-name": "install_script_version",
       "param-value": "${install_script_version}"
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vpkg-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vpkg-mapping.json
index 554d45fc2..25721e299 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vpkg-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vpkg-mapping.json
@@ -21,7 +21,7 @@
     "version": 0
   },
   {
-    "name": "vf_module_name",
+    "name": "vf-module-name",
     "property": {
       "description": "",
       "required": false,
@@ -33,10 +33,10 @@
       "entry_schema": {
         "type": ""
       },
-      "default": "${vf_module_name}"
+      "default": "${vf-module-name}"
     },
     "input-param": false,
-    "dictionary-name": "vf_module_name",
+    "dictionary-name": "vf-module-name",
     "dictionary-source": "default",
     "dependencies": [],
     "version": 0
@@ -538,13 +538,15 @@
       ],
       "entry_schema": {
         "type": ""
-      },
-      "default": "m1.medium"
+      }
     },
     "input-param": false,
-    "dictionary-name": "vpg_flavor_name",
-    "dictionary-source": "default",
-    "dependencies": [],
+   "dictionary-name": "flavor_name",
+    "dictionary-source": "sdnc",
+    "dependencies": [
+	  "service-instance-id",
+      "vnf-id"
+	],
     "version": 0
   },
   {
@@ -829,4 +831,4 @@
     ],
     "version": 0
   }
-]
+]
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vpkg-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vpkg-template.vtl
index 98d541d69..bd745b179 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vpkg-template.vtl
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vpkg-template.vtl
@@ -175,15 +175,15 @@
           "payload": [
             {
               "param-name": "resource-name",
-              "param-value": "vf_module_name"
+              "param-value": "vf-module-name"
             },
             {
               "param-name": "resource-value",
-              "param-value": "${vf_module_name}"
+              "param-value": "${vf-module-name}"
             },
             {
               "param-name": "external-key",
-              "param-value": "${vf-module-id}_vf_module_name"
+              "param-value": "${vf-module-id}_vf-module-name"
             },
             {
               "param-name": "policy-instance-name",
@@ -212,8 +212,8 @@
           ],
           "output-key-mapping": [
             {
-              "resource-name": "vf_module_name",
-              "resource-value": "${vf_module_name}"
+              "resource-name": "vf-module-name",
+              "resource-value": "${vf-module-name}"
             }
           ]
         }