aboutsummaryrefslogtreecommitdiffstats
path: root/ms/controllerblueprints/application
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2018-12-28 02:45:54 +0000
committerGerrit Code Review <gerrit@onap.org>2018-12-28 02:45:54 +0000
commit5a9cc8f332141e2d005ab1f823a8ce311e3b8e84 (patch)
treeea8d59591c5c85f3b9481ab000f36968469fc399 /ms/controllerblueprints/application
parent8e8bfd22535e03f6c7df847813b5eaadd07c73ef (diff)
parenta19a6d1683689ffcc95f160b0c2ed4718505e7f4 (diff)
Merge "Applied comments from review: Change 74622 - Draft"
Diffstat (limited to 'ms/controllerblueprints/application')
-rwxr-xr-x[-rw-r--r--]ms/controllerblueprints/application/opt/app/onap/config/application-dev.properties5
-rwxr-xr-x[-rw-r--r--]ms/controllerblueprints/application/opt/app/onap/config/application.properties5
-rwxr-xr-x[-rw-r--r--]ms/controllerblueprints/application/src/test/resources/application.properties8
3 files changed, 15 insertions, 3 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 46aa2fa0e..46d853076 100644..100755
--- a/ms/controllerblueprints/application/opt/app/onap/config/application-dev.properties
+++ b/ms/controllerblueprints/application/opt/app/onap/config/application-dev.properties
@@ -61,4 +61,7 @@ controllerblueprints.loadBluePrintPaths=./../../../components/model-catalog/blue
controllerblueprints.loadModelType=true
controllerblueprints.loadModeTypePaths=./../../../components/model-catalog/definition-type/starter-type
controllerblueprints.loadResourceDictionary=true
-controllerblueprints.loadResourceDictionaryPaths=./../../../components/model-catalog/resource-dictionary/starter-dictionary \ No newline at end of file
+controllerblueprints.loadResourceDictionaryPaths=./../../../components/model-catalog/resource-dictionary/starter-dictionary
+
+# CBA file extension
+controllerblueprints.loadCbaExtension=zip \ No newline at end of file
diff --git a/ms/controllerblueprints/application/opt/app/onap/config/application.properties b/ms/controllerblueprints/application/opt/app/onap/config/application.properties
index 2ac4ad373..d618e015b 100644..100755
--- a/ms/controllerblueprints/application/opt/app/onap/config/application.properties
+++ b/ms/controllerblueprints/application/opt/app/onap/config/application.properties
@@ -65,4 +65,7 @@ controllerblueprints.loadBluePrintPaths=model-catalog/blueprint-model/starter-bl
controllerblueprints.loadModelType=true
controllerblueprints.loadModeTypePaths=model-catalog/definition-type/starter-type
controllerblueprints.loadResourceDictionary=true
-controllerblueprints.loadResourceDictionaryPaths=model-catalog/resource-dictionary/starter-dictionary \ No newline at end of file
+controllerblueprints.loadResourceDictionaryPaths=model-catalog/resource-dictionary/starter-dictionary
+
+# CBA file extension
+controllerblueprints.loadCbaExtension=zip \ No newline at end of file
diff --git a/ms/controllerblueprints/application/src/test/resources/application.properties b/ms/controllerblueprints/application/src/test/resources/application.properties
index 48f70b0ea..9c8a96cba 100644..100755
--- a/ms/controllerblueprints/application/src/test/resources/application.properties
+++ b/ms/controllerblueprints/application/src/test/resources/application.properties
@@ -46,4 +46,10 @@ controllerblueprints.loadBluePrintPaths=./../../../../components/model-catalog/b
controllerblueprints.loadModelType=false
controllerblueprints.loadModeTypePaths=./../../../../components/model-catalog/definition-type/starter-type
controllerblueprints.loadResourceDictionary=false
-controllerblueprints.loadResourceDictionaryPaths=./../../../../components/model-catalog/resource-dictionary/starter-dictionary \ No newline at end of file
+controllerblueprints.loadResourceDictionaryPaths=./../../../../components/model-catalog/resource-dictionary/starter-dictionary
+
+# CBA file extension
+controllerblueprints.loadCbaExtension=zip
+
+# CBA examples for tests cases
+controllerblueprints.loadBlueprintsExamplesPath=./../../../../components/model-catalog/blueprint-model/test-blueprints \ No newline at end of file