Controller Blueprints Microservice

Create resource definition and Create Source Node Type definitions for Input, default, db, mdsal and component sources.

Change-Id: Icc49cb4be2e8700b61c281ff2d01c365321bb311
Issue-ID: CCSDK-487
Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>

4 files changed, 67 insertions, 56 deletions

diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/db-source.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/db-source.json
index 8b97cdeb7..cd4e282b4 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/db-source.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/db-source.json
@@ -1,20 +1,25 @@
 {

   "name": "bundle-id",

-  "description": "name of the ",

+  "property" :{

+    "description": "name of the ",

+    "type": "string"

+  },

   "resource-type": "ONAP",

   "resource-path": "vnf/bundle-id",

   "updated-by": "brindasanth@onap.com",

-  "data-type": "String",

   "tags": "bundle-id, brindasanth@onap.com",

-  "source": {

+  "sources": {

     "db": {

-      "query": "SELECT db-country, db-state FROM DEVICE_PROFILE WHERE profile_name = :profile_name",

-      "input-key-mapping": {

-        "profile_name": "profile_name"

-      },

-      "output-key-mapping": {

-        "db-country": "country",

-        "db-state": "state"

+      "type": "source-db",

+      "properties": {

+        "query": "SELECT db-country, db-state FROM DEVICE_PROFILE WHERE profile_name = :profile_name",

+        "input-key-mapping": {

+          "profile_name": "profile_name"

+        },

+        "output-key-mapping": {

+          "db-country": "country",

+          "db-state": "state"

+        }

       }

     }

   },

diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/default-source.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/default-source.json
index ac23292ed..91921b640 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/default-source.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/default-source.json
@@ -1,14 +1,18 @@
 {

-	"tags": "v4-ip-type, tosca.datatypes.Root, data_type, brindasanth@onap.com",

-	"name": "v4-ip-type",

-	"description": "To be provided",

-	"updated-by": "brindasanth@onap.com",

-	"resource-type": "ONAP",

-	"resource-path": "vnf/v4-ip-type",

-	"data-type": "string",

-	"source": {

-		"default": {

-			

-		}

-	}

+  "tags": "v4-ip-type, tosca.datatypes.Root, data_type, brindasanth@onap.com",

+  "name": "v4-ip-type",

+  "property" :{

+    "description": "name of the ",

+    "type": "string"

+  },

+  "updated-by": "brindasanth@onap.com",

+  "resource-type": "ONAP",

+  "resource-path": "vnf/v4-ip-type",

+  "sources": {

+    "default": {

+      "type": "source-default",

+      "properties": {

+      }

+    }

+  }

 }
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/input-source.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/input-source.json
index 35736b663..c34c252b3 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/input-source.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/input-source.json
@@ -1,17 +1,19 @@
 {

 	"name": "action-name",

+	"property" :{

+		"description": "name of the ",

+		"type": "string"

+	},

 	"resource-path": "action-name",

 	"resource-type": "ONAP",

-	"description": "To be provided",

-	"valid-values": null,

-	"sample-value": null,

 	"updated-by": "brindasanth@onap.com",

 	"tags": null,

-	"default": null,

-	"data-type": "string",

-	"source": {

+	"sources": {

 		"input": {

-			"key": "action-name"

+			"type": "source-input",

+			"properties": {

+				"key": "action-name"

+			}

 		}

 	}

 }
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/mdsal-source.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/mdsal-source.json
index c103f94dc..73d835c10 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/mdsal-source.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/mdsal-source.json
@@ -1,36 +1,36 @@
 {

-  "tags": "oam-local-ipv4-address, tosca.datatypes.Root, data_type, st1848@att.com",

+  "tags": "oam-local-ipv4-address",

   "name": "oam-local-ipv4-address",

-  "description": "based on service-instance-id,network-role,v4-ip-type and vm-type get the ipv4-gateway-prefix from the SDN-GC mdsal",

-  "updated-by": "st1848@att.com",

+  "property" :{

+    "description": "based on service-instance-id,network-role,v4-ip-type and vm-type get the ipv4-gateway-prefix from the SDN-GC mdsal",

+    "type": "string"

+  },

+  "updated-by": "brindasanth@onap.com",

   "resource-type": "ATT",

   "resource-path": "vnf/oam-local-ipv4-address",

-  "data-type": "string",

-  "source": {

+  "sources": {

     "mdsal": {

-      "base": "sdnc-gc",

-      "type": "JSON",

-      "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": {

-        "service-instance-id": "service-instance-id",

-        "network-role": "network-role",

-        "v4-ip-type": "v4-ip-type",

-        "vm-type": "vm-type"

-      },

-      "output-key-mapping": {

-        "oam-local-ipv4-address": "v4-ip-prefix"

+      "type": "source-rest",

+      "properties": {

+        "type": "JSON",

+        "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": {

+          "service-instance-id": "service-instance-id",

+          "network-role": "network-role",

+          "v4-ip-type": "v4-ip-type",

+          "vm-type": "vm-type"

+        },

+        "output-key-mapping": {

+          "oam-local-ipv4-address": "v4-ip-prefix"

+        },

+        "key-dependency": [

+          "service-instance-id",

+          "network-role",

+          "v4-ip-type",

+          "vm-type"

+        ]

       }

     }

-  },

-  "candidate-dependency": {

-    "mdsal": {

-      "names": [

-        "service-instance-id",

-        "network-role",

-        "v4-ip-type",

-        "vm-type"

-      ]

-    }

   }

 }
\ No newline at end of file