Refactor test blueprint catalog

Change-Id: I948067b25787c7a79f769ac4055c34ffdd2f172d
Issue-ID: CCSDK-1047
Signed-off-by: Muthuramalingam, Brinda Santh <brindasanth@in.ibm.com>

18 files changed, 15 insertions, 823 deletions

diff --git a/ms/controllerblueprints/application/opt/app/onap/config/application-dev.properties b/ms/controllerblueprints/application/opt/app/onap/config/application-dev.properties
index 81b3061a..1c9029d5 100755
--- a/ms/controllerblueprints/application/opt/app/onap/config/application-dev.properties
+++ b/ms/controllerblueprints/application/opt/app/onap/config/application-dev.properties
@@ -57,7 +57,7 @@ controllerblueprints.blueprintEnrichmentPath=/etc/blueprints/enrichment
 # Controller Blueprint Load Configurations
 controllerblueprints.loadInitialData=true
 controllerblueprints.loadBluePrint=false
-controllerblueprints.loadBluePrintPaths=./../../../components/model-catalog/blueprint-model/starter-blueprint
+controllerblueprints.loadBluePrintPaths=./../../../components/model-catalog/blueprint-model/test-blueprint
 controllerblueprints.loadModelType=true
 controllerblueprints.loadModeTypePaths=./../../../components/model-catalog/definition-type/starter-type
 controllerblueprints.loadResourceDictionary=true
diff --git a/ms/controllerblueprints/application/opt/app/onap/config/application.properties b/ms/controllerblueprints/application/opt/app/onap/config/application.properties
index 5b651e66..049d846e 100755
--- a/ms/controllerblueprints/application/opt/app/onap/config/application.properties
+++ b/ms/controllerblueprints/application/opt/app/onap/config/application.properties
@@ -62,7 +62,7 @@ controllerblueprints.blueprintEnrichmentPath=/etc/blueprints/enrichment
 # blueprints.load.initial-data may be overridden by ENV variables
 controllerblueprints.loadInitialData=true
 controllerblueprints.loadBluePrint=false
-controllerblueprints.loadBluePrintPaths=/model-catalog/blueprint-model/starter-blueprint
+controllerblueprints.loadBluePrintPaths=/model-catalog/blueprint-model/test-blueprint
 controllerblueprints.loadModelType=true
 controllerblueprints.loadModeTypePaths=/model-catalog/definition-type/starter-type
 controllerblueprints.loadResourceDictionary=true
diff --git a/ms/controllerblueprints/application/src/main/resources/application-dev.properties b/ms/controllerblueprints/application/src/main/resources/application-dev.properties
index 30b71fb4..9a5e75d3 100755
--- a/ms/controllerblueprints/application/src/main/resources/application-dev.properties
+++ b/ms/controllerblueprints/application/src/main/resources/application-dev.properties
@@ -57,7 +57,7 @@ controllerblueprints.blueprintEnrichmentPath=/etc/blueprints/enrichment
 # Controller Blueprint Load Configurations
 controllerblueprints.loadInitialData=true
 controllerblueprints.loadBluePrint=false
-controllerblueprints.loadBluePrintPaths=./../../../components/model-catalog/blueprint-model/starter-blueprint
+controllerblueprints.loadBluePrintPaths=./../../../components/model-catalog/blueprint-model/test-blueprint
 controllerblueprints.loadModelType=true
 controllerblueprints.loadModeTypePaths=./../../../components/model-catalog/definition-type/starter-type
 controllerblueprints.loadResourceDictionary=true
diff --git a/ms/controllerblueprints/application/src/main/resources/application.properties b/ms/controllerblueprints/application/src/main/resources/application.properties
index ec61be48..0c789364 100755
--- a/ms/controllerblueprints/application/src/main/resources/application.properties
+++ b/ms/controllerblueprints/application/src/main/resources/application.properties
@@ -61,7 +61,7 @@ controllerblueprints.blueprintEnrichmentPath=/etc/blueprints/enrichment
 # blueprints.load.initial-data may be overridden by ENV variables
 controllerblueprints.loadInitialData=true
 controllerblueprints.loadBluePrint=false
-controllerblueprints.loadBluePrintPaths=/model-catalog/blueprint-model/starter-blueprint
+controllerblueprints.loadBluePrintPaths=/model-catalog/blueprint-model/test-blueprint
 controllerblueprints.loadModelType=true
 controllerblueprints.loadModeTypePaths=/model-catalog/definition-type/starter-type
 controllerblueprints.loadResourceDictionary=true
diff --git a/ms/controllerblueprints/application/src/test/resources/application.properties b/ms/controllerblueprints/application/src/test/resources/application.properties
index 9aebd793..e0369aea 100755
--- a/ms/controllerblueprints/application/src/test/resources/application.properties
+++ b/ms/controllerblueprints/application/src/test/resources/application.properties
@@ -42,7 +42,7 @@ controllerblueprints.blueprintEnrichmentPath=./target/blueprints/enrichment
 # Controller Blueprint Load Configurations

 controllerblueprints.loadInitialData=false

 controllerblueprints.loadBluePrint=false

-controllerblueprints.loadBluePrintPaths=./../../../../components/model-catalog/blueprint-model/starter-blueprint

+controllerblueprints.loadBluePrintPaths=./../../../../components/model-catalog/blueprint-model/test-blueprint

 controllerblueprints.loadModelType=false

 controllerblueprints.loadModeTypePaths=./../../../../components/model-catalog/definition-type/starter-type

 controllerblueprints.loadResourceDictionary=false

@@ -52,7 +52,7 @@ controllerblueprints.loadResourceDictionaryPaths=./../../../../components/model-
 controllerblueprints.loadCbaExtension=zip

 

 # CBA examples for tests cases

-controllerblueprints.loadBlueprintsExamplesPath=./../../../../components/model-catalog/blueprint-model/test-blueprints

+controllerblueprints.loadBlueprintsExamplesPath=./../../../../components/model-catalog/blueprint-model/test-blueprint

 

 # Web server config

 server.port=8080
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintContextTest.kt b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintContextTest.kt
index 0c4d94f3..d06ce234 100644
--- a/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintContextTest.kt
+++ b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintContextTest.kt
@@ -34,7 +34,7 @@ class BluePrintContextTest {
 
     private val log: EELFLogger = EELFManager.getInstance().getLogger(this::class.toString())
 
-    val blueprintBasePath: String = ("./../../../../components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration")
+    val blueprintBasePath: String = ("./../../../../components/model-catalog/blueprint-model/test-blueprint/baseconfiguration")
 
     @Test
     fun testBluePrintContextCreation() {
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeServiceTest.kt b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeServiceTest.kt
index 7a178758..03e233ff 100644
--- a/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeServiceTest.kt
+++ b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeServiceTest.kt
@@ -132,7 +132,7 @@ class BluePrintRuntimeServiceTest {
     }
 
     private fun getBluePrintRuntimeService(): BluePrintRuntimeService<MutableMap<String, JsonNode>> {
-        val blueprintBasePath: String = ("./../../../../components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration")
+        val blueprintBasePath: String = ("./../../../../components/model-catalog/blueprint-model/test-blueprint/baseconfiguration")
         val blueprintRuntime = BluePrintMetadataUtils.getBluePrintRuntime("1234", blueprintBasePath)
         val checkBasePath = blueprintRuntime.get(BluePrintConstants.PROPERTY_BLUEPRINT_BASE_PATH)
 
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintValidatorDefaultServiceTest.kt b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintValidatorDefaultServiceTest.kt
index 861f7d09..be360d90 100644
--- a/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintValidatorDefaultServiceTest.kt
+++ b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintValidatorDefaultServiceTest.kt
@@ -39,7 +39,7 @@ class BluePrintValidatorDefaultServiceTest {
     @Test
     fun testValidateBluePrint() {
 
-        val blueprintBasePath: String = ("./../../../../components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration")
+        val blueprintBasePath: String = ("./../../../../components/model-catalog/blueprint-model/test-blueprint/baseconfiguration")
         val bluePrintContext = BluePrintMetadataUtils.getBluePrintContext(blueprintBasePath)
         val properties: MutableMap<String, Any> = hashMapOf()
 
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintFileUtilsTest.kt b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintFileUtilsTest.kt
index 528f2c6f..12931731 100644
--- a/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintFileUtilsTest.kt
+++ b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintFileUtilsTest.kt
@@ -35,7 +35,7 @@ class BluePrintFileUtilsTest {
 
     @Test
     fun testBlueprintCopy() = runBlocking {
-        val sourcePath: String = "./../../../../components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration"
+        val sourcePath: String = "./../../../../components/model-catalog/blueprint-model/test-blueprint/baseconfiguration"
 
         val targetPath: String = Paths.get("target").toUri().toURL().path.plus("/bp-copy-test")
 
diff --git a/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintMetadataUtilsTest.kt b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintMetadataUtilsTest.kt
index 80daad5d..599bb3be 100644
--- a/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintMetadataUtilsTest.kt
+++ b/ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/BluePrintMetadataUtilsTest.kt
@@ -27,7 +27,7 @@ class BluePrintMetadataUtilsTest {
     @Test
     fun testToscaMetaData(){
 
-        val basePath : String = "./../../../../components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration"
+        val basePath : String = "./../../../../components/model-catalog/blueprint-model/test-blueprint/baseconfiguration"
 
         val toscaMetaData : ToscaMetaData =  BluePrintMetadataUtils.toscaMetaData(basePath)
         assertNotNull(toscaMetaData, "Missing Tosca Definition Object")
diff --git a/ms/controllerblueprints/modules/blueprint-validation/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/validation/BluePrintValidatorServiceImplTest.kt b/ms/controllerblueprints/modules/blueprint-validation/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/validation/BluePrintValidatorServiceImplTest.kt
index e48035bc..f5d157dd 100644
--- a/ms/controllerblueprints/modules/blueprint-validation/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/validation/BluePrintValidatorServiceImplTest.kt
+++ b/ms/controllerblueprints/modules/blueprint-validation/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/validation/BluePrintValidatorServiceImplTest.kt
@@ -32,7 +32,7 @@ import kotlin.test.assertTrue
 
 class BluePrintValidatorServiceImplTest {
 
-    private val blueprintBasePath: String = ("./../../../../components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration")
+    private val blueprintBasePath: String = ("./../../../../components/model-catalog/blueprint-model/test-blueprint/baseconfiguration")
     private val bluePrintRuntime = BluePrintMetadataUtils.getBluePrintRuntime("1234", blueprintBasePath)
     private val mockBluePrintTypeValidatorService = MockBluePrintTypeValidatorService()
     private val defaultBluePrintValidatorService = BluePrintValidatorServiceImpl(mockBluePrintTypeValidatorService)
diff --git a/ms/controllerblueprints/modules/service/load/blueprints/vrr-test/Definitions/vrr-test.json b/ms/controllerblueprints/modules/service/load/blueprints/vrr-test/Definitions/vrr-test.json
deleted file mode 100644
index 41f6e92f..00000000
--- a/ms/controllerblueprints/modules/service/load/blueprints/vrr-test/Definitions/vrr-test.json
+++ /dev/null
@@ -1,759 +0,0 @@
-{

-  "metadata": {

-    "template_author": "Brinda Santh ( bs2796@onap.com )",

-    "template_name": "vrr-test",

-    "template_version": "1.0.0",

-    "template_tags": "brinda, VRR",

-    "release": "201802",

-    "service-type": "AVPN",

-    "vnf-type": "VRR"

-  },

-  "topology_template": {

-    "inputs": {

-      "request-id": {

-        "required": true,

-        "type": "string"

-      },

-      "service-instance-id": {

-        "required": true,

-        "type": "string"

-      },

-      "action-name": {

-        "required": true,

-        "type": "string"

-      },

-      "scope-type": {

-        "required": true,

-        "type": "string"

-      },

-      "hostname": {

-        "required": true,

-        "type": "string"

-      },

-      "resource-assignment-request": {

-        "description": "This is Dynamic Data type for the receipe resource-assignment-action.",

-        "required": false,

-        "type": "dt-resource-assignment-request"

-      }

-    },

-    "node_templates": {

-      "base-config-template": {

-        "type": "artifact-config-template",

-        "properties": {

-          "action-names": [

-            "resource-assignment-action"

-          ]

-        },

-        "capabilities": {

-          "content": {

-            "properties": {

-              "content": "db://base-config-template"

-            }

-          },

-          "mapping": {

-            "properties": {

-              "mapping": [

-                {

-                  "name": "vnf-id",

-                  "input-param": true,

-                  "property": {

-                    "type": "string",

-                    "required": true

-                  },

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

-                  "dictionary-source": "input"

-                },

-                {

-                  "name": "group-name",

-                  "input-param": true,

-                  "property": {

-                    "type": "string",

-                    "required": true

-                  },

-                  "dictionary-name": "group-name",

-                  "dictionary-source": "input"

-                }

-              ]

-            }

-          }

-        }

-      },

-      "activate-action": {

-        "type": "dg-activate-netconf",

-        "interfaces": {

-          "CONFIG": {

-            "operations": {

-              "ActivateNetconf": {}

-            }

-          }

-        },

-        "capabilities": {

-          "dg-node": {}

-        },

-        "requirements": {

-          "component-dependency": {

-            "capability": "component-node",

-            "node": "transaction-netconf-baseconfig",

-            "relationship": "tosca.relationships.DependsOn"

-          }

-        }

-      },

-      "resource-assignment-action": {

-        "type": "dg-resource-assignment",

-        "interfaces": {

-          "CONFIG": {

-            "operations": {

-              "ResourceAssignment": {}

-            }

-          }

-        },

-        "capabilities": {

-          "dg-node": {}

-        },

-        "requirements": {

-          "component-dependency": {

-            "capability": "component-node",

-            "node": "resource-assignment",

-            "relationship": "tosca.relationships.DependsOn"

-          }

-        }

-      },

-      "licence-template": {

-        "type": "artifact-config-template",

-        "properties": {

-          "action-names": [

-            "resource-assignment-action"

-          ]

-        },

-        "capabilities": {

-          "content": {

-            "properties": {

-              "content": "db://licence-template"

-            }

-          },

-          "mapping": {

-            "properties": {

-              "mapping": [

-                {

-                  "name": "licence-key",

-                  "input-param": true,

-                  "property": {

-                    "type": "string",

-                    "required": true

-                  },

-                  "dictionary-name": "licence-key",

-                  "dictionary-source": "input"

-                }

-              ]

-            }

-          }

-        }

-      },

-      "runningconfig-template": {

-        "type": "artifact-config-template",

-        "properties": {

-          "action-names": [

-            "resource-assignment-action"

-          ]

-        },

-        "capabilities": {

-          "content": {

-            "properties": {

-              "content": "db://runningconfig-template"

-            }

-          },

-          "mapping": {

-            "properties": {

-              "mapping": []

-            }

-          }

-        }

-      },

-      "resource-assignment": {

-        "type": "component-resource-assignment",

-        "interfaces": {

-          "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {

-            "operations": {

-              "process": {

-                "inputs": {

-                  "template-name": {

-                    "get_input": "template_name"

-                  },

-                  "template-version": {

-                    "get_input": "template_version"

-                  },

-                  "action-name": {

-                    "get_input": "action-name"

-                  },

-                  "resource-type": "vnf-type",

-                  "template-names": [

-                    "base-config-template",

-                    "licence-template"

-                  ],

-                  "request-id": {

-                    "get_input": "request-id"

-                  },

-                  "resource-id": {

-                    "get_input": "vnf-id"

-                  }

-                },

-                "outputs": {

-                  "resource-assignment-params": "",

-                  "status": ""

-                }

-              }

-            }

-          }

-        },

-        "capabilities": {

-          "component-node": {}

-        }

-      },

-      "vrr-netconf-device": {

-        "type": "vnf-netconf-device",

-        "capabilities": {

-          "netconf": {

-            "properties": {

-              "profile-name": "sample",

-              "oam-ipv4-address": {

-                "get_input": "hostname"

-              },

-              "port-number": {

-                "get_input": "host-port"

-              },

-              "connection-time-out": 30

-            }

-          }

-        }

-      },

-      "transaction-netconf-baseconfig": {

-        "type": "component-netconf-executor",

-        "interfaces": {

-          "org-openecomp-sdnc-netconf-adaptor-service-NetconfExecutorNode": {

-            "operations": {

-              "process": {

-                "implementation": {

-                  "primary": "file://netconf-adaptor/DefaultGetConfig.py"

-                },

-                "inputs": {

-                  "action-name": {

-                    "get_input": "action-name"

-                  },

-                  "resource-type": "vnf-type",

-                  "request-id": {

-                    "get_input": "request-id"

-                  },

-                  "resource-id": {

-                    "get_input": "vnf-id"

-                  },

-                  "execution-script": "execution-script"

-                },

-                "outputs": {

-                  "response-data": {

-                    "get_attribute": ["SELF",  "netconf-executor-baseconfig.response-data"]

-                  },

-                  "status": {

-                    "get_attribute": ["SELF", "netconf-executor-baseconfig.status"]

-                  }

-                }

-              }

-            }

-          }

-        },

-        "capabilities": {

-          "component-node": {

-          }

-        },

-        "requirements": {

-          "netconf-connection": {

-            "capability": "netconf",

-            "node": "vrr-netconf-device",

-            "relationship": "tosca.relationships.ConnectsTo"

-          }

-        }

-      }

-    }

-  },

-  "node_types": {

-    "dg-resource-assignment": {

-      "description": "This is Resource Assignment Directed Graph",

-      "version": "1.0.0",

-      "properties": {

-        "mode": {

-          "required": false,

-          "type": "string",

-          "default": "sync"

-        },

-        "version": {

-          "required": false,

-          "type": "string",

-          "default": "LATEST"

-        },

-        "is-start-flow": {

-          "required": false,

-          "type": "boolean",

-          "default": false

-        }

-      },

-      "capabilities": {

-        "dg-node": {

-          "type": "tosca.capabilities.Node"

-        }

-      },

-      "requirements": {

-        "component-dependency": {

-          "capability": "component-node",

-          "node": "component-resource-assignment",

-          "relationship": "tosca.relationships.DependsOn"

-        }

-      },

-      "interfaces": {

-        "CONFIG": {

-          "operations": {

-            "ResourceAssignment": {

-              "inputs": {

-                "params": {

-                  "required": false,

-                  "type": "list",

-                  "entry_schema": {

-                    "type": "datatype-property"

-                  }

-                }

-              }

-            }

-          }

-        }

-      },

-      "derived_from": "tosca.nodes.DG"

-    },

-    "component-resource-assignment": {

-      "description": "This is Resource Assignment Component API",

-      "version": "1.0.0",

-      "capabilities": {

-        "component-node": {

-          "type": "tosca.capabilities.Node"

-        }

-      },

-      "interfaces": {

-        "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {

-          "operations": {

-            "process": {

-              "inputs": {

-                "action-name": {

-                  "description": "Action Name of the process",

-                  "required": true,

-                  "type": "string"

-                },

-                "template-name": {

-                  "description": "Service Template Name.",

-                  "required": true,

-                  "type": "string"

-                },

-                "template-version": {

-                  "description": "Service Template Version.",

-                  "required": true,

-                  "type": "string"

-                },

-                "resource-type": {

-                  "description": "Request type.",

-                  "required": true,

-                  "type": "string"

-                },

-                "template-names": {

-                  "description": "Name of the artifact Node Templates, to get the template Content.",

-                  "required": true,

-                  "type": "list",

-                  "entry_schema": {

-                    "type": "string"

-                  }

-                },

-                "request-id": {

-                  "description": "Request Id, Unique Id for the request.",

-                  "required": true,

-                  "type": "string"

-                },

-                "resource-id": {

-                  "description": "Resource Id.",

-                  "required": true,

-                  "type": "string"

-                }

-              },

-              "outputs": {

-                "resource-assignment-params": {

-                  "required": true,

-                  "type": "string"

-                },

-                "status": {

-                  "required": true,

-                  "type": "string"

-                }

-              }

-            }

-          }

-        }

-      },

-      "derived_from": "tosca.nodes.Component"

-    },

-    "artifact-config-template": {

-      "description": "This is Configuration Velocity Template",

-      "version": "1.0.0",

-      "properties": {

-        "action-names": {

-          "required": true,

-          "type": "list",

-          "entry_schema": {

-            "type": "string"

-          }

-        }

-      },

-      "capabilities": {

-        "content": {

-          "type": "tosca.capabilities.Content",

-          "properties": {

-            "content": {

-              "required": true,

-              "type": "string"

-            }

-          }

-        },

-        "mapping": {

-          "type": "tosca.capabilities.Mapping",

-          "properties": {

-            "mapping": {

-              "required": false,

-              "type": "list",

-              "entry_schema": {

-                "type": "datatype-resource-assignment"

-              }

-            }

-          }

-        }

-      },

-      "derived_from": "tosca.nodes.Artifact"

-    },

-    "vnf-netconf-device": {

-      "description": "This is VNF Device with Netconf and SSH Capability",

-      "version": "1.0.0",

-      "capabilities": {

-        "netconf": {

-          "type": "tosca.capabilities.Netconf",

-          "properties": {

-            "profile-name": {

-              "required": true,

-              "type": "string"

-            },

-            "oam-ipv4-address": {

-              "required": true,

-              "type": "string"

-            },

-            "port-number": {

-              "required": true,

-              "type": "integer",

-              "default": 830

-            },

-            "connection-time-out": {

-              "required": false,

-              "type": "integer",

-              "default": 30

-            }

-          }

-        },

-        "ssh": {

-          "type": "tosca.capabilities.Ssh",

-          "properties": {

-            "profile-name": {

-              "required": true,

-              "type": "string"

-            },

-            "oam-ipv4-address": {

-              "required": true,

-              "type": "string"

-            },

-            "port-number": {

-              "required": true,

-              "type": "integer",

-              "default": 22

-            },

-            "message-time-out": {

-              "required": false,

-              "type": "integer",

-              "default": 3000

-            },

-            "connection-time-out": {

-              "required": false,

-              "type": "integer",

-              "default": 3000

-            }

-          }

-        },

-        "sftp": {

-          "type": "tosca.capabilities.Sftp",

-          "properties": {

-            "profile-name": {

-              "required": true,

-              "type": "string"

-            },

-            "oam-ipv4-address": {

-              "required": true,

-              "type": "string"

-            },

-            "port-number": {

-              "required": true,

-              "type": "integer",

-              "default": 22

-            },

-            "message-time-out": {

-              "required": false,

-              "type": "integer",

-              "default": 3000

-            },

-            "connection-time-out": {

-              "required": false,

-              "type": "integer",

-              "default": 3000

-            }

-          }

-        }

-      },

-      "derived_from": "tosca.nodes.Vnf"

-    },

-    "dg-activate-netconf": {

-      "description": "This is Download Netconf Directed Graph",

-      "version": "1.0.0",

-      "properties": {

-        "mode": {

-          "required": false,

-          "type": "string",

-          "default": "sync"

-        },

-        "version": {

-          "required": false,

-          "type": "string",

-          "default": "LATEST"

-        },

-        "is-start-flow": {

-          "required": false,

-          "type": "boolean",

-          "default": false

-        }

-      },

-      "capabilities": {

-        "dg-node": {

-          "type": "tosca.capabilities.Node"

-        }

-      },

-      "requirements": {

-        "component-dependency": {

-          "capability": "component-node",

-          "node": "component-netconf-executor",

-          "relationship": "tosca.relationships.DependsOn"

-        }

-      },

-      "interfaces": {

-        "CONFIG": {

-          "operations": {

-            "ActivateNetconf": {

-              "inputs": {

-                "params": {

-                  "required": false,

-                  "type": "list",

-                  "entry_schema": {

-                    "type": "datatype-property"

-                  }

-                }

-              }

-            }

-          }

-        }

-      },

-      "derived_from": "tosca.nodes.DG"

-    },

-    "component-netconf-executor": {

-      "description": "This is Netconf Transaction Configuration Component API",

-      "version": "1.0.0",

-      "capabilities": {

-        "component-node": {

-          "type": "tosca.capabilities.Node"

-        }

-      },

-      "requirements": {

-        "netconf-connection": {

-          "capability": "netconf",

-          "node": "vnf-netconf-device",

-          "relationship": "tosca.relationships.ConnectsTo"

-        }

-      },

-      "interfaces": {

-        "org-openecomp-sdnc-netconf-adaptor-service-NetconfExecutorNode": {

-          "operations": {

-            "process": {

-              "inputs": {

-                "request-id": {

-                  "description": "Request Id used to store the generated configuration, in the database along with the template-name",

-                  "required": true,

-                  "type": "string"

-                },

-                "template-name": {

-                  "description": "Service Template Name",

-                  "required": true,

-                  "type": "string"

-                },

-                "template-version": {

-                  "description": "Service Template Version",

-                  "required": true,

-                  "type": "string"

-                },

-                "action-name": {

-                  "description": "Action Name to get from Database, Either (message & mask-info ) or ( resource-id & resource-type & action-name & template-name ) should be present. Message will be given higest priority",

-                  "required": false,

-                  "type": "string"

-                },

-                "resource-type": {

-                  "description": "Resource Type to get from Database, Either (message & mask-info ) or( resource-id & resource-type & action-name & template-name ) should be present. Message will be given higest priority",

-                  "required": false,

-                  "type": "string"

-                },

-                "resource-id": {

-                  "description": "Resource Id to get from Database, Either (message & mask-info ) or ( resource-id & resource-type & action-name & template-name ) should be present. Message will be given higest priority",

-                  "required": false,

-                  "type": "string"

-                },

-                "execution-script": {

-                  "description": "Python Script to Execute for this Component action, It should refer any one of Prython Artifact Definition for this Node Template.",

-                  "required": true,

-                  "type": "string"

-                }

-              },

-              "outputs": {

-                "response-data": {

-                  "description": "Execution Response Data in JSON format.",

-                  "type": "string"

-                },

-                "status": {

-                  "description": "Status of the Component Execution ( success or failure )",

-                  "required": true,

-                  "type": "string"

-                }

-              }

-            }

-          }

-        }

-      },

-      "derived_from": "tosca.nodes.Component"

-    },

-    "tosca.nodes.DG": {

-      "description": "This is Directed Graph Node Type",

-      "version": "1.0.0",

-      "derived_from": "tosca.nodes.Root"

-    },

-    "tosca.nodes.Vnf": {

-      "description": "This is VNF Node Type",

-      "version": "1.0.0",

-      "derived_from": "tosca.nodes.Root"

-    },

-    "tosca.nodes.Artifact": {

-      "description": "This is Deprecated Artifact Node Type.",

-      "version": "1.0.0",

-      "derived_from": "tosca.nodes.Root"

-    },

-    "tosca.nodes.Component": {

-      "description": "This is default Component Node",

-      "version": "1.0.0",

-      "derived_from": "tosca.nodes.Root"

-    }

-  },

-  "data_types": {

-    "datatype-resource-assignment": {

-      "version": "1.0.0",

-      "description": "This is Resource Assignment Data Type",

-      "properties": {

-        "property": {

-          "required": true,

-          "type": "datatype-property"

-        },

-        "input-param": {

-          "required": true,

-          "type": "boolean"

-        },

-        "dictionary-name": {

-          "required": false,

-          "type": "string"

-        },

-        "dictionary-source": {

-          "required": false,

-          "type": "string"

-        },

-        "dependencies": {

-          "required": true,

-          "type": "list",

-          "entry_schema": {

-            "type": "string"

-          }

-        },

-        "status": {

-          "required": false,

-          "type": "string"

-        },

-        "message": {

-          "required": false,

-          "type": "string"

-        },

-        "updated-date": {

-          "required": false,

-          "type": "string"

-        },

-        "updated-by": {

-          "required": false,

-          "type": "string"

-        }

-      },

-      "derived_from": "tosca.datatypes.Root"

-    },

-    "datatype-property": {

-      "version": "1.0.0",

-      "description": "This is Entry point Input Data Type, which is dynamic datatype, The parameter names will be populated during the Design time for each inputs",

-      "properties": {

-        "type": {

-          "required": true,

-          "type": "string"

-        },

-        "description": {

-          "required": false,

-          "type": "string"

-        },

-        "required": {

-          "required": false,

-          "type": "boolean"

-        },

-        "default": {

-          "required": false,

-          "type": "string"

-        },

-        "entry_schema": {

-          "required": false,

-          "type": "string"

-        }

-      },

-      "derived_from": "tosca.datatypes.Root"

-    },

-    "dt-resource-assignment-request": {

-      "version": "1.0.0",

-      "description": "This is Dynamic Data type definition generated from resource mapping for the config template name base-config-template.",

-      "properties": {

-        "vnf-id": {

-          "required": true,

-          "type": "string"

-        },

-        "group-name": {

-          "required": true,

-          "type": "string"

-        },

-        "licence-key": {

-          "required": true,

-          "type": "string"

-        }

-      },

-      "derived_from": "tosca.datatypes.Dynamic"

-    }

-  }

-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/service/load/blueprints/vrr-test/TOSCA-Metadata/TOSCA.meta b/ms/controllerblueprints/modules/service/load/blueprints/vrr-test/TOSCA-Metadata/TOSCA.meta
deleted file mode 100644
index a4e1df3d..00000000
--- a/ms/controllerblueprints/modules/service/load/blueprints/vrr-test/TOSCA-Metadata/TOSCA.meta
+++ /dev/null
@@ -1,5 +0,0 @@
-TOSCA-Meta-File-Version: 1.0.0

-CSAR-Version: 1.0

-Created-By: Brinda Santh M

-Entry-Definitions: Definitions/vrr-test.json

-Template-Tags: vrr-test, Brinda Santh

diff --git a/ms/controllerblueprints/modules/service/load/blueprints/vrr-test/Templates/base-config-template.vtl b/ms/controllerblueprints/modules/service/load/blueprints/vrr-test/Templates/base-config-template.vtl
deleted file mode 100644
index 92dba102..00000000
--- a/ms/controllerblueprints/modules/service/load/blueprints/vrr-test/Templates/base-config-template.vtl
+++ /dev/null
@@ -1,40 +0,0 @@
- <config>

-	        <configuration>

-	        	<groups>

-				<name>${group-name}</name>

-				<routing-instances>

-					<instance>

-						<name>&lt;*&gt;</name>

-						<protocols>

-							<pim>

-								<dense-groups>

-									<dynamic-reject />

-									<pim-dense-group-type>

-										<name>224.0.1.40/32</name>

-									</pim-dense-group-type>

-									<pim-dense-group-type>

-										<name>224.0.1.39/32</name>

-									</pim-dense-group-type>

-									<pim-dense-group-type>

-										<name>224.0.0.0/4</name>

-										<reject />

-									</pim-dense-group-type>

-								</dense-groups>

-								<rp>

-									<auto-rp>

-										<discovery />

-									</auto-rp>

-								</rp>

-								<interface>

-									<name>&lt;*&gt;</name>

-									<disable />

-									<priority>1000</priority>

-								</interface>

-								<reset-tracking-bit />

-							</pim>

-						</protocols>

-					</instance>

-				</routing-instances>

-			</groups>

-		</configuration>

-	</config>
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/service/load/blueprints/vrr-test/Templates/licence-template.vtl b/ms/controllerblueprints/modules/service/load/blueprints/vrr-test/Templates/licence-template.vtl
deleted file mode 100644
index 626974f2..00000000
--- a/ms/controllerblueprints/modules/service/load/blueprints/vrr-test/Templates/licence-template.vtl
+++ /dev/null
@@ -1,4 +0,0 @@
- <config>

-	        <configuration>

-	        </configuration>

-	         </config>

diff --git a/ms/controllerblueprints/modules/service/load/blueprints/vrr-test/__init__.py b/ms/controllerblueprints/modules/service/load/blueprints/vrr-test/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/ms/controllerblueprints/modules/service/load/blueprints/vrr-test/__init__.py
+++ /dev/null
diff --git a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/enhancer/BluePrintEnhancerServiceImplTest.kt b/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/enhancer/BluePrintEnhancerServiceImplTest.kt
index 4ab67084..8d32413f 100644
--- a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/enhancer/BluePrintEnhancerServiceImplTest.kt
+++ b/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/enhancer/BluePrintEnhancerServiceImplTest.kt
@@ -61,7 +61,7 @@ class BluePrintEnhancerServiceImplTest {
     @Throws(Exception::class)
     fun testEnhancementAndValidation() {
 
-        val basePath = "./../../../../components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration"
+        val basePath = "./../../../../components/model-catalog/blueprint-model/test-blueprint/baseconfiguration"
 
         val targetPath = Paths.get("target", "bp-enhance").toUri().path
 
diff --git a/ms/controllerblueprints/modules/service/src/test/resources/application.properties b/ms/controllerblueprints/modules/service/src/test/resources/application.properties
index 1c2c1c08..20450f44 100755
--- a/ms/controllerblueprints/modules/service/src/test/resources/application.properties
+++ b/ms/controllerblueprints/modules/service/src/test/resources/application.properties
@@ -28,7 +28,7 @@ controllerblueprints.blueprintEnrichmentPath=./target/blueprints/enrichment
 # Controller Blueprint Load Configurations
 controllerblueprints.loadInitialData=false
 controllerblueprints.loadBluePrint=false
-controllerblueprints.loadBluePrintPaths=./../../../../components/model-catalog/blueprint-model/starter-blueprint
+controllerblueprints.loadBluePrintPaths=./../../../../components/model-catalog/blueprint-model/test-blueprint
 controllerblueprints.loadModelType=false
 controllerblueprints.loadModeTypePaths=./../../../../components/model-catalog/definition-type/starter-type
 controllerblueprints.loadResourceDictionary=false
@@ -38,4 +38,4 @@ controllerblueprints.loadResourceDictionaryPaths=./../../../../components/model-
 controllerblueprints.loadCbaExtension=zip
 
 # CBA examples for tests cases
-controllerblueprints.loadBlueprintsExamplesPath=./../../../../components/model-catalog/blueprint-model/test-blueprints
\ No newline at end of file
+controllerblueprints.loadBlueprintsExamplesPath=./../../../../components/model-catalog/blueprint-model/test-blueprint
\ No newline at end of file