summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMuthuramalingam, Brinda Santh <brindasanth@in.ibm.com>2019-02-18 15:10:25 -0500
committerAlexis de Talhouƫt <adetalhouet89@gmail.com>2019-02-20 21:02:05 +0000
commite0f3198bffd8c5f4945ce0bb91ef3024b5996bbc (patch)
treebae182e77b774b156a788acd4b2ddc922dfe679f
parenta69b9f500b4f15f78e468cce8561af193a7eb83b (diff)
Add component function scripting service
Change-Id: I7c5b49617823dd623566fb4be4d431012420e17c Issue-ID: CCSDK-959 Signed-off-by: Muthuramalingam, Brinda Santh <brindasanth@in.ibm.com>
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Environments/source-rest.properties9
-rw-r--r--components/model-catalog/definition-type/starter-type/node_type/source-rest.json4
-rwxr-xr-xcomponents/model-catalog/resource-dictionary/starter-dictionary/mdsal-source.json1
-rw-r--r--components/parent/pom.xml1
4 files changed, 15 insertions, 0 deletions
diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Environments/source-rest.properties b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Environments/source-rest.properties
new file mode 100644
index 000000000..37bad8d0a
--- /dev/null
+++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Environments/source-rest.properties
@@ -0,0 +1,9 @@
+blueprintsprocessor.restclient.primary-config-data.type=basic-auth
+blueprintsprocessor.restclient.primary-config-data.url=http://127.0.0.1:9111
+blueprintsprocessor.restclient.primary-config-data.userId=sampleuser
+blueprintsprocessor.restclient.primary-config-data.token=sampletoken
+
+blueprintsprocessor.restclient.primary-config-data1.type=basic-auth
+blueprintsprocessor.restclient.primary-config-data1.url=http://127.0.0.1:9111
+blueprintsprocessor.restclient.primary-config-data1.userId=sampleuser
+blueprintsprocessor.restclient.primary-config-data1.token=sampletoken \ No newline at end of file
diff --git a/components/model-catalog/definition-type/starter-type/node_type/source-rest.json b/components/model-catalog/definition-type/starter-type/node_type/source-rest.json
index f8dd8b6fc..044983040 100644
--- a/components/model-catalog/definition-type/starter-type/node_type/source-rest.json
+++ b/components/model-catalog/definition-type/starter-type/node_type/source-rest.json
@@ -14,6 +14,10 @@
}
]
},
+ "endpoint-selector": {
+ "required": false,
+ "type": "string"
+ },
"url-path": {
"required": true,
"type": "string"
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/mdsal-source.json b/components/model-catalog/resource-dictionary/starter-dictionary/mdsal-source.json
index 67661ecd0..ee67b9256 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/mdsal-source.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/mdsal-source.json
@@ -11,6 +11,7 @@
"type": "source-rest",
"properties": {
"type": "JSON",
+ "endpoint-selector" : "",
"url-path": "config/L3VNF-API:services/service-list/$service-instance-id/service-data/vnf-topology-information/vnf-assignments/vnf-vms/$vm-type/vm-networks/$network-role/v4-assigned-ip-list/$v4-ip-type",
"path": "/v4-assigned-ip-list/0/v4-ip-prefix",
"input-key-mapping": {
diff --git a/components/parent/pom.xml b/components/parent/pom.xml
index 761b0fad7..94a06a1fd 100644
--- a/components/parent/pom.xml
+++ b/components/parent/pom.xml
@@ -29,6 +29,7 @@
<name>Components Parent</name>
<packaging>pom</packaging>
<properties>
+ <kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
<spring.boot.version>2.1.2.RELEASE</spring.boot.version>
<spring.version>5.1.4.RELEASE</spring.version>
<kotlin.version>1.3.20</kotlin.version>