aboutsummaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2019-03-22 16:06:26 +0000
committerGerrit Code Review <gerrit@onap.org>2019-03-22 16:06:26 +0000
commitcbcb12452a06ae3cdd9de0335a716210f1406147 (patch)
tree2d7832654b5603805d2a2c049e6e936b4a2726f5 /components
parent61f4924a42bf9a3e4f52e89f2d4f84395a34acd2 (diff)
parent2d0bfb6f58496fc52cad29a3f9b9064bcae67ed3 (diff)
Merge "Ressource resolution using configurable database"
Diffstat (limited to 'components')
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/node_types.json2
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/resources_definition_types.json4
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/node_types.json2
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/resources_definition_types.json4
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/golden/Templates/vf-module-1-mapping.json2
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/golden/Templates/vfw-interface-mapping.json2
-rw-r--r--components/model-catalog/definition-type/starter-type/node_type/source-processor-db.json48
-rw-r--r--components/model-catalog/resource-dictionary/test-dictionary/vf-module-type.json4
8 files changed, 58 insertions, 10 deletions
diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/node_types.json b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/node_types.json
index 8f6c44f94..68a8ae6bd 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/node_types.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/node_types.json
@@ -223,7 +223,7 @@
},
"derived_from": "tosca.nodes.ResourceSource"
},
- "source-primary-db": {
+ "source-processor-db": {
"description": "This is Database Resource Source Node Type",
"version": "1.0.0",
"properties": {
diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/resources_definition_types.json
index eaf45b35f..6e3d5e94f 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/resources_definition_types.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/resources_definition_types.json
@@ -26,8 +26,8 @@
"type": "source-input",
"properties": {}
},
- "primary-db": {
- "type": "source-primary-db",
+ "processor-db": {
+ "type": "source-processor-db",
"properties": {
"endpoint-selector": "dynamic-db-source",
"query": "SELECT artifact_name FROM sdnctl.BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
diff --git a/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/node_types.json b/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/node_types.json
index b05869217..f143e560b 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/node_types.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/node_types.json
@@ -236,7 +236,7 @@
},
"derived_from" : "tosca.nodes.ResourceSource"
},
- "source-primary-db" : {
+ "source-processor-db" : {
"description" : "This is Database Resource Source Node Type",
"version" : "1.0.0",
"properties" : {
diff --git a/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/resources_definition_types.json
index 446a8a681..15f02a1ce 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/resources_definition_types.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/resources_definition_types.json
@@ -129,8 +129,8 @@
},
"updated-by" : "adetalhouet",
"sources" : {
- "primary-db" : {
- "type" : "source-primary-db",
+ "processor-db" : {
+ "type" : "source-processor-db",
"properties" : {
"type" : "SQL",
"query" : "select sdnctl.demo.value as value from sdnctl.demo where sdnctl.demo.id=:vfmoduleid",
diff --git a/components/model-catalog/blueprint-model/test-blueprint/golden/Templates/vf-module-1-mapping.json b/components/model-catalog/blueprint-model/test-blueprint/golden/Templates/vf-module-1-mapping.json
index eba259e33..b7335b513 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/golden/Templates/vf-module-1-mapping.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/golden/Templates/vf-module-1-mapping.json
@@ -18,7 +18,7 @@
"type": "string"
},
"dictionary-name": "vf-module-type",
- "dictionary-source": "primary-db",
+ "dictionary-source": "processor-db",
"dependencies": [
"vf-module-number"
]
diff --git a/components/model-catalog/blueprint-model/test-blueprint/golden/Templates/vfw-interface-mapping.json b/components/model-catalog/blueprint-model/test-blueprint/golden/Templates/vfw-interface-mapping.json
index 149d3eb20..c1ebe5688 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/golden/Templates/vfw-interface-mapping.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/golden/Templates/vfw-interface-mapping.json
@@ -55,7 +55,7 @@
"type": "string"
},
"dictionary-name": "vf-module-type",
- "dictionary-source": "primary-db",
+ "dictionary-source": "processor-db",
"dependencies": [
"vf-module-number"
]
diff --git a/components/model-catalog/definition-type/starter-type/node_type/source-processor-db.json b/components/model-catalog/definition-type/starter-type/node_type/source-processor-db.json
new file mode 100644
index 000000000..702748f8a
--- /dev/null
+++ b/components/model-catalog/definition-type/starter-type/node_type/source-processor-db.json
@@ -0,0 +1,48 @@
+{
+ "description": "This is Database Resource Source Node Type",
+ "version": "1.0.0",
+ "properties": {
+ "type": {
+ "required": true,
+ "type": "string",
+ "constraints": [
+ {
+ "valid_values": [
+ "SQL",
+ "PLSQL"
+ ]
+ }
+ ]
+ },
+ "endpoint-selector": {
+ "required": false,
+ "type": "string"
+ },
+ "query": {
+ "required": true,
+ "type": "string"
+ },
+ "input-key-mapping": {
+ "required": false,
+ "type": "map",
+ "entry_schema": {
+ "type": "string"
+ }
+ },
+ "output-key-mapping": {
+ "required": false,
+ "type": "map",
+ "entry_schema": {
+ "type": "string"
+ }
+ },
+ "key-dependencies": {
+ "required": true,
+ "type": "list",
+ "entry_schema": {
+ "type": "string"
+ }
+ }
+ },
+ "derived_from": "tosca.nodes.ResourceSource"
+} \ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/test-dictionary/vf-module-type.json b/components/model-catalog/resource-dictionary/test-dictionary/vf-module-type.json
index b06057c45..9e8c4096f 100644
--- a/components/model-catalog/resource-dictionary/test-dictionary/vf-module-type.json
+++ b/components/model-catalog/resource-dictionary/test-dictionary/vf-module-type.json
@@ -7,8 +7,8 @@
},
"updated-by": "adetalhouet",
"sources": {
- "primary-db": {
- "type": "source-primary-db",
+ "processor-db": {
+ "type": "source-processor-db",
"properties": {
"type": "SQL",
"query": "select sdnctl.demo.value as value from sdnctl.demo where sdnctl.demo.id=:vfmoduleid",