From 61f774846a79bd63ad5e1f8999740b556ef49aa3 Mon Sep 17 00:00:00 2001
From: "Muthuramalingam, Brinda Santh(bs2796)" <bs2796@att.com>
Date: Tue, 18 Dec 2018 08:16:28 -0500
Subject: Add attribute definition enhancer.

Change-Id: Ie8ac60910f04dfca477d0276aa451821cfcd8510
Issue-ID: CCSDK-718
Signed-off-by: Muthuramalingam, Brinda Santh(bs2796) <bs2796@att.com>
---
 .../baseconfiguration/Definitions/node_types.json  |  5 +-
 .../Definitions/resources_definition_types.json    | 62 ++++++++++++++++++++++
 .../Definitions/resources_dictionary_types.json    | 62 ----------------------
 3 files changed, 64 insertions(+), 65 deletions(-)
 create mode 100644 components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/resources_definition_types.json
 delete mode 100644 components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/resources_dictionary_types.json

(limited to 'components/model-catalog/blueprint-model')

diff --git a/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/node_types.json b/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/node_types.json
index 7330663c4..6a156ff16 100644
--- a/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/node_types.json
+++ b/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/node_types.json
@@ -37,9 +37,8 @@
     "component-resource-assignment": {
       "description": "This is Resource Assignment Component API",
       "version": "1.0.0",
-      "properties": {
-        "request-id": {
-          "description": "Request Id used to store the generated configuration, in the database along with the template-name",
+      "attributes": {
+        "assignment-params": {
           "required": true,
           "type": "string"
         }
diff --git a/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/resources_definition_types.json
new file mode 100644
index 000000000..557f6efce
--- /dev/null
+++ b/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/resources_definition_types.json
@@ -0,0 +1,62 @@
+{
+  "service-instance-id": {
+    "name": "service-instance-id",
+    "tags": "service-instance-id, tosca.datatypes.Root, data_type",
+    "updated-by": "Singal, Kapil <ks220y@att.com>",
+    "property": {
+      "description": "To be provided",
+      "type": "string"
+    },
+    "sources": {
+      "input": {
+        "type": "source-input",
+        "properties": {}
+      }
+    }
+  },
+  "vnf-id": {
+    "name": "vnf-id",
+    "tags": "vnf-id",
+    "updated-by": "Singal, Kapil <ks220y@att.com>",
+    "property": {
+      "description": "vnf-id",
+      "type": "string"
+    },
+    "sources": {
+      "input": {
+        "type": "source-input",
+        "properties": {}
+      }
+    }
+  },
+  "vnf_name": {
+    "name": "vnf_name",
+    "tags": "vnf_name",
+    "updated-by": "Singal, Kapil <ks220y@att.com>",
+    "property": {
+      "description": "vnf_name",
+      "type": "string"
+    },
+    "sources": {
+      "mdsal": {
+        "type": "source-rest",
+        "properties": {
+          "type": "JSON",
+          "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vnf_name",
+          "path": "/param/0/value",
+          "input-key-mapping": {
+            "service-instance-id": "service-instance-id",
+            "vnf-id": "vnf-id"
+          },
+          "output-key-mapping": {
+            "vnf_name": "value"
+          },
+          "key-dependencies": [
+            "service-instance-id",
+            "vnf-id"
+          ]
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/resources_dictionary_types.json b/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/resources_dictionary_types.json
deleted file mode 100644
index 557f6efce..000000000
--- a/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/resources_dictionary_types.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "service-instance-id": {
-    "name": "service-instance-id",
-    "tags": "service-instance-id, tosca.datatypes.Root, data_type",
-    "updated-by": "Singal, Kapil <ks220y@att.com>",
-    "property": {
-      "description": "To be provided",
-      "type": "string"
-    },
-    "sources": {
-      "input": {
-        "type": "source-input",
-        "properties": {}
-      }
-    }
-  },
-  "vnf-id": {
-    "name": "vnf-id",
-    "tags": "vnf-id",
-    "updated-by": "Singal, Kapil <ks220y@att.com>",
-    "property": {
-      "description": "vnf-id",
-      "type": "string"
-    },
-    "sources": {
-      "input": {
-        "type": "source-input",
-        "properties": {}
-      }
-    }
-  },
-  "vnf_name": {
-    "name": "vnf_name",
-    "tags": "vnf_name",
-    "updated-by": "Singal, Kapil <ks220y@att.com>",
-    "property": {
-      "description": "vnf_name",
-      "type": "string"
-    },
-    "sources": {
-      "mdsal": {
-        "type": "source-rest",
-        "properties": {
-          "type": "JSON",
-          "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vnf_name",
-          "path": "/param/0/value",
-          "input-key-mapping": {
-            "service-instance-id": "service-instance-id",
-            "vnf-id": "vnf-id"
-          },
-          "output-key-mapping": {
-            "vnf_name": "value"
-          },
-          "key-dependencies": [
-            "service-instance-id",
-            "vnf-id"
-          ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
-- 
cgit 1.2.3-korg