summaryrefslogtreecommitdiffstats
path: root/components/model-catalog/blueprint-model/test-blueprint
diff options
context:
space:
mode:
authorBrinda Santh Muthuramalingam <brindasanth@in.ibm.com>2019-08-29 14:28:34 +0000
committerGerrit Code Review <gerrit@onap.org>2019-08-29 14:28:34 +0000
commitb4151a70dfa7660de27ff467461769808c45871d (patch)
tree8531eb8eedd1ba6d6f53b1cfcf334d2438a9b542 /components/model-catalog/blueprint-model/test-blueprint
parent2da7588cfb51016b85d84a139af5cf8a7824e59d (diff)
parent48954cba71208f0b3adfe4abf5480b493f25737c (diff)
Merge "rename config-data=>sdnc"
Diffstat (limited to 'components/model-catalog/blueprint-model/test-blueprint')
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/another-mapping.json2
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/baseconfig-mapping.json2
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/resources_definition_types.json2
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Environments/source-rest.properties16
-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
7 files changed, 15 insertions, 15 deletions
diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/another-mapping.json b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/another-mapping.json
index 9b155c23d..a9be3204f 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/another-mapping.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/another-mapping.json
@@ -27,7 +27,7 @@
"type": "string"
},
"dictionary-name": "vnf_name",
- "dictionary-source": "config-data",
+ "dictionary-source": "sdnc",
"dependencies": [
"service-instance-id",
"vnf-id"
diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/baseconfig-mapping.json b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/baseconfig-mapping.json
index 9b155c23d..a9be3204f 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/baseconfig-mapping.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/baseconfig-mapping.json
@@ -27,7 +27,7 @@
"type": "string"
},
"dictionary-name": "vnf_name",
- "dictionary-source": "config-data",
+ "dictionary-source": "sdnc",
"dependencies": [
"service-instance-id",
"vnf-id"
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 ecd48289d..aa0836232 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
@@ -65,7 +65,7 @@
},
"updated-by": "Singal, Kapil <ks220y@att.com>",
"sources": {
- "config-data": {
+ "sdnc": {
"type": "source-rest",
"properties": {
"verb": "GET",
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
index 178d2be3a..21a54cff4 100644
--- 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
@@ -1,9 +1,9 @@
-blueprintsprocessor.restclient.config-data.type=basic-auth
-blueprintsprocessor.restclient.config-data.url=http://127.0.0.1:9111
-blueprintsprocessor.restclient.config-data.userId=sampleuser
-blueprintsprocessor.restclient.config-data.token=sampletoken
+blueprintsprocessor.restclient.sdnc.type=basic-auth
+blueprintsprocessor.restclient.sdnc.url=http://127.0.0.1:9111
+blueprintsprocessor.restclient.sdnc.userId=sampleuser
+blueprintsprocessor.restclient.sdnc.token=sampletoken
-blueprintsprocessor.restclient.config-data1.type=basic-auth
-blueprintsprocessor.restclient.config-data1.url=http://127.0.0.1:9111
-blueprintsprocessor.restclient.config-data1.userId=sampleuser
-blueprintsprocessor.restclient.config-data1.token=sampletoken
+blueprintsprocessor.restclient.sdnc1.type=basic-auth
+blueprintsprocessor.restclient.sdnc1.url=http://127.0.0.1:9111
+blueprintsprocessor.restclient.sdnc1.userId=sampleuser
+blueprintsprocessor.restclient.sdnc1.token=sampletoken
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 73ee86174..475d8641a 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
@@ -8,7 +8,7 @@
},
"updated-by" : "adetalhouet",
"sources" : {
- "config-data" : {
+ "sdnc" : {
"type" : "source-rest",
"properties" : {
"type" : "JSON",
@@ -145,4 +145,4 @@
}
}
}
-} \ No newline at end of file
+}
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 738b0d4d6..6d1f24054 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
@@ -56,7 +56,7 @@
"type": "dt-netbox-ip"
},
"dictionary-name": "create_netbox_ip",
- "dictionary-source": "config-data",
+ "dictionary-source": "sdnc",
"dependencies": [
"prefix-id"
]
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 427df73f2..d38f4185d 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
@@ -73,7 +73,7 @@
"type": "dt-netbox-ip"
},
"dictionary-name": "create_netbox_ip",
- "dictionary-source": "config-data",
+ "dictionary-source": "sdnc",
"dependencies": [
"prefix-id"
]