diff options
Diffstat (limited to 'components/resource-dict/src')
2 files changed, 5 insertions, 3 deletions
diff --git a/components/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionRepoService.kt b/components/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionRepoService.kt index 6c83e5f9..6d186b59 100644 --- a/components/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionRepoService.kt +++ b/components/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionRepoService.kt @@ -49,10 +49,12 @@ open class ResourceDefinitionFileRepoService : BluePrintRepoFileService, constructor(basePath: String) : this(basePath,
basePath.plus(BluePrintConstants.PATH_DIVIDER)
- .plus(BluePrintConstants.MODEL_DIR_MODEL_TYPE))
+ .plus(BluePrintConstants.MODEL_DIR_MODEL_TYPE)
+ .plus(BluePrintConstants.PATH_DIVIDER)
+ .plus("starter-type"))
constructor(basePath: String, modelTypePath: String) : super(modelTypePath) {
- resourceDefinitionPath = basePath.plus("/resource_dictionary")
+ resourceDefinitionPath = basePath.plus("/resource-dictionary/starter-dictionary")
}
override fun getResourceDefinition(resourceDefinitionName: String): Mono<ResourceDefinition> {
diff --git a/components/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionRepoServiceTest.java b/components/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionRepoServiceTest.java index 1772277d..6789c0e0 100644 --- a/components/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionRepoServiceTest.java +++ b/components/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionRepoServiceTest.java @@ -25,7 +25,7 @@ public class ResourceDefinitionRepoServiceTest { @Test
public void testGetResourceDefinition() throws Exception{
- ResourceDefinitionRepoService resourceDefinitionRepoService = new ResourceDefinitionFileRepoService("load");
+ ResourceDefinitionRepoService resourceDefinitionRepoService = new ResourceDefinitionFileRepoService("./../model-catalog");
ResourceDefinition resourceDefinition = resourceDefinitionRepoService
.getResourceDefinition("db-source").block();
Assert.assertNotNull("Failed to get Resource Definition db-source", resourceDefinition);
|