Data dictionary fixes and improvements from vFW CNF demo

During doing vFW CNF use case CBA model with CDS (See INT-1260)
found some diff/improvements to update to CDS starter dictionary.

Issue-ID: CCSDK-2408

Signed-off-by: Samuli Silvius <s.silvius@partner.samsung.com>
Change-Id: I8e899b3ab34bcd499e917da318f589e69008dc6d

21 files changed, 59 insertions, 99 deletions

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/int_private1_net_cidr.json b/components/model-catalog/resource-dictionary/starter-dictionary/int_private1_net_cidr.json
index 255e82ea6..258da511f 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/int_private1_net_cidr.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/int_private1_net_cidr.json
@@ -15,6 +15,17 @@
 			"type": "source-default",
 			"properties": {}
 		},
+		"processor-db": {
+			"type": "source-db",
+			"properties": {
+				"type": "SQL",
+				"query": "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private1\"",
+				"input-key-mapping": {},
+				"output-key-mapping": {
+					"int_private1_net_cidr": "prefix"
+				}
+			}
+		},
 		"sdnc": {
 			"type": "source-rest",
 			"properties": {
@@ -34,18 +45,6 @@
 					"vnf-id"
 				]
 			}
-		},
-		"processor-db": {
-			"type": "source-db",
-			"properties": {
-				
-				"type": "SQL",
-				"query": "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private1\"",
-				"input-key-mapping": {},
-				"output-key-mapping": {
-					"int_private1_net_cidr": "prefix"
-				}
-			}
 		}
 	}
 }
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/int_private1_subnet_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/int_private1_subnet_id.json
index f353b6ad1..60f95d15a 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/int_private1_subnet_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/int_private1_subnet_id.json
@@ -6,11 +6,32 @@
 		"description": "int_private1_subnet_id",
 		"type": "string"
 	},
-	"updated-by": "Singal, Kapil <ks220y@att.com>",
+	"updated-by": "Samuli, Silvius <s.silvius@partner.samsung.com>",
 	"sources": {
 		"input": {
 			"type": "source-input",
 			"properties": {}
-		}
+		},
+		"default": {
+			"type": "source-default",
+			"properties": {}
+		},
+		"sdnc" : {
+			 "type" : "source-rest",
+			 "properties" : {
+				 "verb" : "GET",
+				 "type" : "JSON",
+				 "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/int_private1_subnet_id",
+				 "path" : "/param/0/value",
+				 "input-key-mapping" : {
+					 "service-instance-id" : "service-instance-id",
+					 "vnf-id" : "vnf-id"
+				 },
+				 "output-key-mapping" : {
+					 "int_private1_subnet_id" : "value"
+				 },
+				 "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+			 }
+		 }
 	}
 }
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/int_private2_net_cidr.json b/components/model-catalog/resource-dictionary/starter-dictionary/int_private2_net_cidr.json
index f7c59d58c..8d711dc6a 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/int_private2_net_cidr.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/int_private2_net_cidr.json
@@ -23,7 +23,6 @@
 				"output-key-mapping": {
 					"int_private2_net_cidr": "prefix"
 				},
-				
 				"input-key-mapping": {}
 			}
 		},
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/management-prefix-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/management-prefix-id.json
index ed53868c7..756c6a262 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/management-prefix-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/management-prefix-id.json
@@ -47,4 +47,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/nfc-naming-code.json b/components/model-catalog/resource-dictionary/starter-dictionary/nfc-naming-code.json
index 1740aea54..1ea0ef0fa 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/nfc-naming-code.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/nfc-naming-code.json
@@ -32,4 +32,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_cidr.json b/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_cidr.json
index 71d3b026b..17e990dce 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_cidr.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_cidr.json
@@ -47,4 +47,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/private-prefix-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/private-prefix-id.json
index 863cea21b..95dd023c7 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/private-prefix-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/private-prefix-id.json
@@ -18,7 +18,6 @@
     "processor-db": {
       "type": "source-db",
       "properties": {
-        "endpoint-selector": "dynamic-db-source",
         "type": "SQL",
         "query": "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"private\"",
         "input-key-mapping": {},
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/private1-prefix-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/private1-prefix-id.json
index 7ba15ecd0..db1eb92b2 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/private1-prefix-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/private1-prefix-id.json
@@ -47,4 +47,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/private2-prefix-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/private2-prefix-id.json
index 99b790c46..83ae2aa69 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/private2-prefix-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/private2-prefix-id.json
@@ -47,4 +47,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/service-instance-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/service-instance-id.json
index 0f1810fca..9b00cae59 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/service-instance-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/service-instance-id.json
@@ -15,7 +15,7 @@
 		"any-db": {
 			"type": "source-db",
 			"properties": {
-				"query": "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
+				"query": "SELECT artifact_name FROM BLUEPRINT_MODEL where artifact_version=\"1.0.0\"",
 				"input-key-mapping": {},
 				"output-key-mapping": {
 					"service-instance-id": "artifact_name"
@@ -25,7 +25,7 @@
 		"processor-db": {
 			"type": "source-db",
 			"properties": {
-				"query": "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
+				"query": "SELECT artifact_name FROM BLUEPRINT_MODEL where artifact_version=\"1.0.0\"",
 				"input-key-mapping": {},
 				"output-key-mapping": {
 					"service-instance-id": "artifact_name"
@@ -39,22 +39,6 @@
 				"script-class-reference": "SampleRAProcessor",
 				"instance-dependencies": []
 			}
-		},
-		"sdnc": {
-			"type": "source-rest",
-			"properties": {
-				"verb": "GET",
-				"type": "JSON",
-				"url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id",
-				"path": "/service/0/service-instance-id",
-				"input-key-mapping": {
-					"service-instance-id": "service-instance.service-instance-id"
-				},
-				"output-key-mapping": {
-					"service-instance-id": "service-instance-id"
-				},
-				"key-dependencies": ["service-instance.service-instance-id"]
-			}
 		}
 	}
 }
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-id.json
index 40fedd951..d33638aa4 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-id.json
@@ -11,28 +11,6 @@
     "input" : {
       "type" : "source-input",
       "properties" : { }
-    },
-    "sdnc": {
-      "type": "source-rest",
-      "properties": {
-        "verb": "GET",
-        "type": "JSON",
-        "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vf-modules/vf-module/$vf-module-id",
-        "path": "/vf-module/0/vf-module-id",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id",
-          "vf-module-id": "vf-module.vf-module-id"
-        },
-        "output-key-mapping": {
-          "vf-module-id": "vf-module-id"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id",
-          "vf-module.vf-module-id"
-        ]
-      }
     }
   }
 }
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-label.json b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-label.json
index 34ec2c449..a32c76d49 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-label.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-label.json
@@ -32,4 +32,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-name.json
index 12ba519c7..23af6f247 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-name.json
@@ -3,7 +3,7 @@
     "name": "vf-module-name",
     "group":"default",
     "property": {
-        "description": "vf_module_name",
+        "description": "vf-module-name",
         "type": "string"
     },
     "updated-by": "Singal, Kapil <ks220y@att.com>",
@@ -69,4 +69,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-type.json b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-type.json
index 8c563cf61..4230a9cb1 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-type.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-type.json
@@ -32,4 +32,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vf-naming-policy.json b/components/model-catalog/resource-dictionary/starter-dictionary/vf-naming-policy.json
index 97344da97..a7953a97e 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vf-naming-policy.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vf-naming-policy.json
@@ -49,4 +49,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vfccustomizationuuid.json b/components/model-catalog/resource-dictionary/starter-dictionary/vfccustomizationuuid.json
index 4abd7a37d..3ae9e7a8b 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vfccustomizationuuid.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vfccustomizationuuid.json
@@ -32,4 +32,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vnf-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/vnf-id.json
index 97d3d73fa..e8c451b2b 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vnf-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vnf-id.json
@@ -8,32 +8,12 @@
     },
     "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
     "sources": {
-        "input": {
-            "type": "source-input"
-        },
-        "default": {
-            "type": "source-default",
-            "properties": {}
-        },
-        "sdnc": {
-            "type": "source-rest",
-            "properties": {
-                "verb": "GET",
-                "type": "JSON",
-                "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vnf-id",
-                "path": "/param/0/value",
-                "input-key-mapping": {
-                    "service-instance-id": "service-instance-id",
-                    "vnf-id": "vnf-id"
-                },
-                "output-key-mapping": {
-                    "vnf-id": "value"
-                },
-                "key-dependencies": [
-                    "service-instance-id",
-                    "vnf-id"
-                ]
-            }
-        }
+      "input": {
+        "type": "source-input"
+      },
+      "default": {
+        "type": "source-default",
+        "properties": {}
+      }
     }
-}
\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vnf_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vnf_name.json
index fd679f68f..3deacf5c9 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vnf_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vnf_name.json
@@ -68,4 +68,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-invariant-uuid.json b/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-invariant-uuid.json
index a7a58addc..01acf18e5 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-invariant-uuid.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-invariant-uuid.json
@@ -32,4 +32,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-version.json b/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-version.json
index 59282c078..f54ac4ffa 100644
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-version.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-version.json
@@ -32,4 +32,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_name_0 .json b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_name_0 .json
index 610ffc7a5..2785a033a 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_name_0 .json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_name_0 .json
@@ -3,7 +3,7 @@
 	"name": "vpg_name_0",
 	"group":"default",
 	"property": {
-		"description": "vlb_name_0",
+		"description": "vpg_name_0",
 		"type": "string"
 	},
 	"updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",