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
commitf5e7b450adf2392f5748ad0a95b1243527e65bee (patch)
treeaea924a729d3fbcf1e31696fadfa19ffb4b9b80d /ms/controllerblueprints/application
parentd35235fd2ec0c9108594150c4f710622d59efc8a (diff)
parentbeb4b741c0093384bd39e8e4b1a917bf198ff953 (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 46aa2fa0..46d85307 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 2ac4ad37..d618e015 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 48f70b0e..9c8a96cb 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