2 files changed, 5 insertions, 5 deletions
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vFW_vNF_Artifact.vtl b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vFW_vNF_Artifact.vtl
index 0faf09ca..f7947ef8 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vFW_vNF_Artifact.vtl
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vFW_vNF_Artifact.vtl
@@ -30,7 +30,7 @@
     },
     {
       "param-name": "onap_private_subnet_id",
-      "param-value": "${onap_private_net_id}_sub"
+      "param-value": "${onap_private_subnet_id}"
     }
   ],
   "capability-data": [
diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ModelTypeRest.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ModelTypeRest.java
index 988cad06..0f485a08 100644
--- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ModelTypeRest.java
+++ b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ModelTypeRest.java
@@ -44,18 +44,18 @@ public class ModelTypeRest {
     }
 
     @GetMapping(path = "/{name}", produces = MediaType.APPLICATION_JSON_VALUE)
-    public ModelType getModelTypeByName(@PathVariable(value = "name") String name) throws BluePrintException {
+    public ModelType getModelTypeByName(@PathVariable(value = "name") String name) {
         return modelTypeService.getModelTypeByName(name);
     }
 
     @GetMapping(path = "/search/{tags}", produces = MediaType.APPLICATION_JSON_VALUE)
-    public List<ModelType> searchModelTypes(@PathVariable(value = "tags") String tags) throws BluePrintException {
+    public List<ModelType> searchModelTypes(@PathVariable(value = "tags") String tags) {
         return modelTypeService.searchModelTypes(tags);
     }
 
     @GetMapping(path = "/by-definition/{definitionType}", produces = MediaType.APPLICATION_JSON_VALUE)
     public @ResponseBody
-    List<ModelType> getModelTypeByDefinitionType(@PathVariable(value = "definitionType") String definitionType) throws BluePrintException {
+    List<ModelType> getModelTypeByDefinitionType(@PathVariable(value = "definitionType") String definitionType) {
         return modelTypeService.getModelTypeByDefinitionType(definitionType);
     }
 
@@ -66,7 +66,7 @@ public class ModelTypeRest {
     }
 
     @DeleteMapping(path = "/{name}")
-    public void deleteModelTypeByName(@PathVariable(value = "name") String name) throws BluePrintException {
+    public void deleteModelTypeByName(@PathVariable(value = "name") String name) {
         modelTypeService.deleteByModelName(name);
     }
 }