add group notation to resource dictionary

-including changes to (starter-dictionary,test-dictionary)json files -add column in resource dictionary table in database -expose api for getting unique group from resource dictionary table Issue-ID: CCSDK-2004 Signed-off-by: shaaban Altanany <shaaban.eltanany.ext@orange.com> Change-Id: I0998709af2e692717b9b1b4937943c323144594a
author: shaaban Altanany <shaaban.eltanany.ext@orange.com> 2019-12-17 15:45:51 +0200
committer: KAPIL SINGAL <ks220y@att.com> 2019-12-24 14:53:21 +0000
commit: 033e544e10e6c35b9f38c91972eccb7906ecc6c4 (patch)
tree: 97267bc6d28ba55bca237102837769a15a3e0080
parent: 8fd7adbb9428bc0c14f5f08a321eabd582fbaf48 (diff)
153 files changed, 297 insertions, 120 deletions
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/active-streams.json b/components/model-catalog/resource-dictionary/starter-dictionary/active-streams.json
index d136fbf8d..7210a4a41 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/active-streams.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/active-streams.json
@@ -1,6 +1,7 @@
 {
   "tags": "active-streams",
   "name": "active-streams",
+  "group":"default",
   "property": {
     "description": "active-streams",
     "type": "string"
@@ -15,4 +16,4 @@
       "properties": {}
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/address.json b/components/model-catalog/resource-dictionary/starter-dictionary/address.json
index 11f92d76e..23bad6e2a 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/address.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/address.json
@@ -1,6 +1,7 @@
 {
 		"name": "address",
 		"tags": "address",
+	        "group":"default",
 		"updated-by" : "Singal, Kapil <ks220y@att.com>",
 		"property": {
 			"description" : "address",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/aic-cloud-region.json b/components/model-catalog/resource-dictionary/starter-dictionary/aic-cloud-region.json
index 1501a9a63..af8099953 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/aic-cloud-region.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/aic-cloud-region.json
@@ -1,6 +1,7 @@
 {
   "name" : "aic-cloud-region",
   "tags" : "aic-cloud-region",
+  "group":"default",
   "updated-by" : "Singal, Kapil <ks220y@att.com>",
   "property" : {
     "description" : "aic-cloud-region",
@@ -12,4 +13,4 @@
       "properties" : { }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/aic_clli.json b/components/model-catalog/resource-dictionary/starter-dictionary/aic_clli.json
index ccbbe9d43..09516fc1b 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/aic_clli.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/aic_clli.json
@@ -1,6 +1,7 @@
 {
   "name" : "aic_clli",
   "tags" : "aic_clli",
+  "group":"default",
   "updated-by" : "Singal, Kapil <ks220y@att.com>",
   "property" : {
     "description" : "aic_clli",
@@ -12,4 +13,4 @@
       "properties" : { }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/availability_zone_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/availability_zone_0.json
index b9e07a9fa..887d3f330 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/availability_zone_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/availability_zone_0.json
@@ -1,6 +1,7 @@
 {
   "name" : "availability_zone_0",
   "tags" : "availability_zone_0",
+  "group":"default",
   "updated-by" : "Singal, Kapil <ks220y@att.com>",
   "property" : {
     "description" : "availability_zone_0",
@@ -12,4 +13,4 @@
       "properties" : { }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/cloud_env.json b/components/model-catalog/resource-dictionary/starter-dictionary/cloud_env.json
index 28cac3bb5..f5b1aa05c 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/cloud_env.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/cloud_env.json
@@ -1,6 +1,7 @@
 {
 	"tags": "cloud_env",
 	"name": "cloud_env",
+	"group":"default",
 	"property": {
 		"description": "cloud_env",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/create-md-sal-vnf-param.json b/components/model-catalog/resource-dictionary/starter-dictionary/create-md-sal-vnf-param.json
index e19e67c05..db917b6f5 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/create-md-sal-vnf-param.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/create-md-sal-vnf-param.json
@@ -1,6 +1,7 @@
 {
 	"tags": "create-md-sal-vnf-param",
 	"name": "create-md-sal-vnf-param",
+	"group":"default",
 	"property": {
 		"description": "create-md-sal-vnf-param",
 		"type": "string"
@@ -46,4 +47,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/create_netbox_ip.json b/components/model-catalog/resource-dictionary/starter-dictionary/create_netbox_ip.json
index 9e97aa497..09844e508 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/create_netbox_ip.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/create_netbox_ip.json
@@ -1,6 +1,7 @@
 {
     "tags" : "oam-local-ipv4-address",
     "name" : "create_netbox_ip",
+    "group":"default",
     "property" : {
       "description" : "netbox ip",
       "type" : "dt-netbox-ip"
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/db-source.json b/components/model-catalog/resource-dictionary/starter-dictionary/db-source.json
index ce062726a..e6130b04a 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/db-source.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/db-source.json
@@ -1,5 +1,6 @@
 {
   "name": "db-source",
+  "group":"default",
   "property" :{
     "description": "name of the ",
     "type": "string"
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/dcae_collector_ip.json b/components/model-catalog/resource-dictionary/starter-dictionary/dcae_collector_ip.json
index 9339cd263..f0c54553c 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/dcae_collector_ip.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/dcae_collector_ip.json
@@ -1,6 +1,7 @@
 {
 	"tags": "dcae_collector_ip",
 	"name": "dcae_collector_ip",
+	"group":"default",
 	"property": {
 		"description": "dcae_collector_ip",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/dcae_collector_port.json b/components/model-catalog/resource-dictionary/starter-dictionary/dcae_collector_port.json
index 85b561e41..4e055fc56 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/dcae_collector_port.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/dcae_collector_port.json
@@ -1,6 +1,7 @@
 {
 	"tags": "dcae_collector_port",
 	"name": "dcae_collector_port",
+	"group":"default",
 	"property": {
 		"description": "dcae_collector_port",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/default-source.json b/components/model-catalog/resource-dictionary/starter-dictionary/default-source.json
index 42059ad8e..ccd326e0b 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/default-source.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/default-source.json
@@ -1,6 +1,7 @@
 {
   "tags": "v4-ip-type, tosca.datatypes.Root, data_type, brindasanth@onap.com",
   "name": "default-source",
+  "group":"default",
   "property" :{
     "description": "name of the ",
     "type": "string"
@@ -13,4 +14,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/delete_netbox_ip.json b/components/model-catalog/resource-dictionary/starter-dictionary/delete_netbox_ip.json
index c6cb85877..c520ce1b2 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/delete_netbox_ip.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/delete_netbox_ip.json
@@ -1,6 +1,7 @@
 {
   "tags": "oam-local-ipv4-address",
   "name": "delete_netbox_ip",
+  "group":"default",
   "property": {
     "description": "delete netbox ip",
     "type": "string"
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/demo_artifacts_version.json b/components/model-catalog/resource-dictionary/starter-dictionary/demo_artifacts_version.json
index 63f8a3563..9e9568c3a 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/demo_artifacts_version.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/demo_artifacts_version.json
@@ -1,6 +1,7 @@
 {
 	"tags": "demo_artifacts_version",
 	"name": "demo_artifacts_version",
+	"group":"default",
 	"property": {
 		"description": "demo_artifacts_version",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/flavor_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/flavor_name.json
index ad7f3a706..ba062952b 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/flavor_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/flavor_name.json
@@ -1,6 +1,7 @@
 {
 	"tags": "flavor_name",
 	"name": "flavor_name",
+	"group":"default",
 	"property": {
 		"description": "flavor_name",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/golden-vf-module-type.json b/components/model-catalog/resource-dictionary/starter-dictionary/golden-vf-module-type.json
index 4d335776e..104791e79 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/golden-vf-module-type.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/golden-vf-module-type.json
@@ -1,6 +1,7 @@
 {
   "tags" : "golden-vf-module-type",
   "name" : "golden-vf-module-type",
+  "group":"default",
   "property" : {
     "description" : "golden-vf-module-type",
     "type" : "string"
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/gre_ipaddr.json b/components/model-catalog/resource-dictionary/starter-dictionary/gre_ipaddr.json
index a917350cf..70baab9f6 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/gre_ipaddr.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/gre_ipaddr.json
@@ -1,6 +1,7 @@
 {
 	"tags": "gre_ipaddr",
 	"name": "gre_ipaddr",
+	"group":"default",
 	"property": {
 		"description": "gre_ipaddr",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/hostname.json b/components/model-catalog/resource-dictionary/starter-dictionary/hostname.json
index f60751edc..03bfd405a 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/hostname.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/hostname.json
@@ -1,6 +1,7 @@
 {
 		"name": "hostname",
 		"tags": "hostname",
+	        "group":"default",
 		"updated-by" : "Singal, Kapil <ks220y@att.com>",
 		"property": {
 			"description" : "hostname",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/image_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/image_name.json
index 9891caa2f..9964ad088 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/image_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/image_name.json
@@ -1,6 +1,7 @@
 {
 	"tags": "image_name",
 	"name": "image_name",
+	"group":"default",
 	"property": {
 		"description": "image_name",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/input-source.json b/components/model-catalog/resource-dictionary/starter-dictionary/input-source.json
index 6c693848e..d42d28c8c 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/input-source.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/input-source.json
@@ -1,5 +1,6 @@
 {
 	"name": "input-source",
+	"group":"default",
 	"property" :{
 		"description": "name of the ",
 		"type": "string"
@@ -13,4 +14,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/install_script_version.json b/components/model-catalog/resource-dictionary/starter-dictionary/install_script_version.json
index 1f5f79eb1..e352a949c 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/install_script_version.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/install_script_version.json
@@ -1,6 +1,7 @@
 {
 	"tags": "install_script_version",
 	"name": "install_script_version",
+	"group":"default",
 	"property": {
 		"description": "install_script_version",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/int_pktgen_private_net_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/int_pktgen_private_net_id.json
index 2c2c18b66..d5ba0e239 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/int_pktgen_private_net_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/int_pktgen_private_net_id.json
@@ -1,6 +1,7 @@
 {
 	"tags": "int_pktgen_private_net_id",
 	"name": "int_pktgen_private_net_id",
+	"group":"default",
 	"property": {
 		"description": "int_pktgen_private_net_id",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/int_pktgen_private_subnet_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/int_pktgen_private_subnet_id.json
index 6f2203f53..f689923e6 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/int_pktgen_private_subnet_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/int_pktgen_private_subnet_id.json
@@ -1,6 +1,7 @@
 {
 	"tags": "int_pktgen_private_subnet_id",
 	"name": "int_pktgen_private_subnet_id",
+	"group":"default",
 	"property": {
 		"description": "int_pktgen_private_subnet_id",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
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 f450143c5..255e82ea6 100644..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
@@ -1,6 +1,7 @@
 {
 	"tags": "int_private1_net_cidr",
 	"name": "int_private1_net_cidr",
+	"group":"default",
 	"property": {
 		"description": "int_private1_net_cidr",
 		"type": "string"
@@ -47,4 +48,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
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 938f51a7e..f353b6ad1 100644..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
@@ -1,6 +1,7 @@
 {
 	"tags": "int_private1_subnet_id",
 	"name": "int_private1_subnet_id",
+	"group":"default",
 	"property": {
 		"description": "int_private1_subnet_id",
 		"type": "string"
@@ -12,4 +13,4 @@
 			"properties": {}
 		}
 	}
-}
-\ No newline at end of file
+}
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 e018614ea..f7c59d58c 100644..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
@@ -1,6 +1,7 @@
 {
 	"tags": "int_private2_net_cidr",
 	"name": "int_private2_net_cidr",
+	"group":"default",
 	"property": {
 		"description": "int_private2_net_cidr",
 		"type": "string"
@@ -47,4 +48,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/int_private2_subnet_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/int_private2_subnet_id.json
index 1ec9eb30a..fe39c5be9 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/int_private2_subnet_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/int_private2_subnet_id.json
@@ -1,6 +1,7 @@
 {
 	"tags": "int_private2_subnet_id",
 	"name": "int_private2_subnet_id",
+	"group":"default",
 	"property": {
 		"description": "int_private2_subnet_id",
 		"type": "string"
@@ -12,4 +13,4 @@
 			"properties": {}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/int_private_net_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/int_private_net_id.json
index f424da218..6cbb04d06 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/int_private_net_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/int_private_net_id.json
@@ -1,6 +1,7 @@
 {
 	"tags": "int_private_net_id",
 	"name": "int_private_net_id",
+	"group":"default",
 	"property": {
 		"description": "int_private_net_id",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/int_private_subnet_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/int_private_subnet_id.json
index be6f87701..2bfdcb0be 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/int_private_subnet_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/int_private_subnet_id.json
@@ -1,6 +1,7 @@
 {
 	"tags": "int_private_subnet_id",
 	"name": "int_private_subnet_id",
+	"group":"default",
 	"property": {
 		"description": "int_private_subnet_id",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/interface-description.json b/components/model-catalog/resource-dictionary/starter-dictionary/interface-description.json
index 5b3fa4413..9bc001f80 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/interface-description.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/interface-description.json
@@ -1,6 +1,7 @@
 {
   "tags": "interface-description",
   "name": "interface-description",
+  "group":"default",
   "property": {
     "description": "interface-description",
     "type": "string"
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/interface-name.json b/components/model-catalog/resource-dictionary/starter-dictionary/interface-name.json
index 53a11ed70..3fb670027 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/interface-name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/interface-name.json
@@ -1,6 +1,7 @@
 {
   "name" : "interface-name",
   "tags" : "interface-name",
+  "group":"default",
   "updated-by" : "adetalhouet",
   "property" : {
     "description" : "interface-name",
@@ -12,4 +13,4 @@
       "properties" : { }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/key_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/key_name.json
index 909cffb38..ca02f2b36 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/key_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/key_name.json
@@ -1,6 +1,7 @@
 {
 	"tags": "key_name",
 	"name": "key_name",
+	"group":"default",
 	"property": {
 		"description": "key_name",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/keypair.json b/components/model-catalog/resource-dictionary/starter-dictionary/keypair.json
index 5a7fb2194..48ac47215 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/keypair.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/keypair.json
@@ -1,6 +1,7 @@
 {
 	"tags": "keypair",
 	"name": "keypair",
+	"group":"default",
 	"property": {
 		"description": "keypair",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
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 0050bb60d..63480df7c 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/management-prefix-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/management-prefix-id.json
@@ -1,6 +1,7 @@
 {
 	"tags": "management-prefix-id",
 	"name": "management-prefix-id",
+	"group":"default",
 	"property": {
 		"description": "management-prefix-id",
 		"type": "string"
@@ -47,4 +48,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
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 9c516f56c..f8cdac4fb 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/mdsal-source.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/mdsal-source.json
@@ -1,6 +1,7 @@
 {
   "tags": "oam-local-ipv4-address",
   "name": "mdsal-source",
+  "group":"default",
   "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"
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/name_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/name_0.json
index 59d8f9511..e5e6e78b0 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/name_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/name_0.json
@@ -1,6 +1,7 @@
 {
 	"tags": "name_0",
 	"name": "name_0",
+	"group":"default",
 	"property": {
 		"description": "name_0",
 		"type": "string"
@@ -12,4 +13,4 @@
 			"properties": {}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/nb_api_version.json b/components/model-catalog/resource-dictionary/starter-dictionary/nb_api_version.json
index c089dea9c..cf0c009ce 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/nb_api_version.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/nb_api_version.json
@@ -1,6 +1,7 @@
 {
 	"tags": "nb_api_version",
 	"name": "nb_api_version",
+	"group":"default",
 	"property": {
 		"description": "nb_api_version",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/nexus_artifact_repo.json b/components/model-catalog/resource-dictionary/starter-dictionary/nexus_artifact_repo.json
index 1cb2224b7..ee23563eb 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/nexus_artifact_repo.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/nexus_artifact_repo.json
@@ -1,6 +1,7 @@
 {
 	"tags": "nexus_artifact_repo",
 	"name": "nexus_artifact_repo",
+	"group":"default",
 	"property": {
 		"description": "nexus_artifact_repo",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/nf-role.json b/components/model-catalog/resource-dictionary/starter-dictionary/nf-role.json
index f666cf42d..cc72db4df 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/nf-role.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/nf-role.json
@@ -1,6 +1,7 @@
 {
 	"tags": "nf-role",
 	"name": "nf-role",
+	"group":"default",
 	"property": {
 		"description": "vnf/nf-role",
 		"type": "string"
@@ -28,4 +29,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 0a578c9cf..133df5d39 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/nfc-naming-code.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/nfc-naming-code.json
@@ -1,6 +1,7 @@
 {
 	"tags": "nfc-naming-code",
 	"name": "nfc-naming-code",
+	"group":"default",
 	"property": {
 		"description": "nfc-naming-code",
 		"type": "string"
@@ -32,4 +33,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 9c9d677a7..a9f2dfd0e 100644..100755
--- 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
@@ -1,6 +1,7 @@
 {
 	"tags": "onap_private_net_cidr",
 	"name": "onap_private_net_cidr",
+	"group":"default",
 	"property": {
 		"description": "onap_private_net_cidr",
 		"type": "string"
@@ -47,4 +48,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_id.json
index 8c98843e1..267484e29 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_id.json
@@ -1,6 +1,7 @@
 {
 	"tags": "onap_private_net_id",
 	"name": "onap_private_net_id",
+	"group":"default",
 	"property": {
 		"description": "onap_private_net_id",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_subnet_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_subnet_id.json
index e55b0bdef..be73016da 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_subnet_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_subnet_id.json
@@ -1,6 +1,7 @@
 {
 	"tags": "onap_private_subnet_id",
 	"name": "onap_private_subnet_id",
+	"group":"default",
 	"property": {
 		"description": "onap_private_subnet_id",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/pg_int.json b/components/model-catalog/resource-dictionary/starter-dictionary/pg_int.json
index f7ba07655..4faee19fe 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/pg_int.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/pg_int.json
@@ -1,6 +1,7 @@
 {
 	"tags": "pg_int",
 	"name": "pg_int",
+	"group":"default",
 	"property": {
 		"description": "pg_int",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/pktgen_private_net_cidr.json b/components/model-catalog/resource-dictionary/starter-dictionary/pktgen_private_net_cidr.json
index 0eaaf9b36..7b8239ab1 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/pktgen_private_net_cidr.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/pktgen_private_net_cidr.json
@@ -1,6 +1,7 @@
 {
 	"tags": "pktgen_private_net_cidr",
 	"name": "pktgen_private_net_cidr",
+	"group":"default",
 	"property": {
 		"description": "pktgen_private_net_cidr",
 		"type": "string"
@@ -47,4 +48,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/pktgen_private_net_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/pktgen_private_net_id.json
index c72117ffe..c51577804 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/pktgen_private_net_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/pktgen_private_net_id.json
@@ -1,6 +1,7 @@
 {
 	"tags": "pktgen_private_net_id",
 	"name": "pktgen_private_net_id",
+	"group":"default",
 	"property": {
 		"description": "pktgen_private_net_id",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/pnf-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/pnf-id.json
index adafc2997..cfca6a7da 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/pnf-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/pnf-id.json
@@ -1,6 +1,7 @@
 {
   "name" : "pnf-id",
   "tags" : "pnf-id",
+  "group":"default",
   "updated-by" : "Rodrigo Ottero <rodrigo.ottero@est.tech>",
   "property" : {
     "description" : "pnf-id",
@@ -35,4 +36,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/pnf-ipaddress-aai.json b/components/model-catalog/resource-dictionary/starter-dictionary/pnf-ipaddress-aai.json
index f96319266..9ac0a9c10 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/pnf-ipaddress-aai.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/pnf-ipaddress-aai.json
@@ -1,6 +1,7 @@
 {
   "tags": "aai-get",
   "name": "pnf-ipaddress-aai",
+  "group":"default",
   "property": {
     "description": "primary aai data to get resource",
     "type": "string"
@@ -29,4 +30,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/pnf-ipv4-address.json b/components/model-catalog/resource-dictionary/starter-dictionary/pnf-ipv4-address.json
index ce96d5296..e2ae0b1e0 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/pnf-ipv4-address.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/pnf-ipv4-address.json
@@ -1,6 +1,7 @@
 {
   "name" : "pnf-ipv4-address",
   "tags" : "pnf-ipv4-address",
+  "group":"default",
   "updated-by" : "Rodrigo Ottero <rodrigo.ottero@est.tech>",
   "property" : {
     "description" : "pnf-ipv4-address",
@@ -12,4 +13,4 @@
       "properties" : { }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/pnf-name.json b/components/model-catalog/resource-dictionary/starter-dictionary/pnf-name.json
index edcc3e9a0..339e6d664 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/pnf-name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/pnf-name.json
@@ -1,6 +1,7 @@
 {
   "name" : "pnf-name",
   "tags" : "pnf-name",
+  "group":"default",
   "updated-by" : "Rodrigo Ottero <rodrigo.ottero@est.tech>",
   "property" : {
     "description" : "pnf-name",
@@ -12,4 +13,4 @@
       "properties" : { }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/prefix-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/prefix-id.json
index e515eca55..06a444c15 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/prefix-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/prefix-id.json
@@ -1,6 +1,7 @@
 {
   "tags": "prefix-id",
   "name": "prefix-id",
+  "group":"default",
   "property" :{
     "description": "prefix-id",
     "type": "integer"
@@ -13,4 +14,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 c68cf3444..863cea21b 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
@@ -1,6 +1,7 @@
 {
   "tags": "private-prefix-id",
   "name": "private-prefix-id",
+  "group":"default",
   "property": {
     "description": "private-prefix-id",
     "type": "string"
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 b3b9412d6..3122c3e97 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/private1-prefix-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/private1-prefix-id.json
@@ -1,6 +1,7 @@
 {
 	"tags": "private1-prefix-id",
 	"name": "private1-prefix-id",
+	"group":"default",
 	"property": {
 		"description": "private1-prefix-id",
 		"type": "string"
@@ -47,4 +48,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 02dade7c4..291ffe517 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/private2-prefix-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/private2-prefix-id.json
@@ -1,6 +1,7 @@
 {
 	"tags": "private2-prefix-id",
 	"name": "private2-prefix-id",
+	"group":"default",
 	"property": {
 		"description": "private2-prefix-id",
 		"type": "string"
@@ -47,4 +48,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/properties-capability-source.json b/components/model-catalog/resource-dictionary/starter-dictionary/properties-capability-source.json
index 9136c6eea..43bc635fb 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/properties-capability-source.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/properties-capability-source.json
@@ -2,6 +2,7 @@
   "name": "properties-capability-source",
   "updated-by": "Steve Alphonse Siani, alphonse.steve.siani.djissitchi@ibm.com",
   "tags": "properties-capability-source",
+  "group":"default",
   "property" :{
     "description": "Data dictionary used to read properties.",
     "type": "string"
@@ -23,4 +24,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/protected-prefix-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/protected-prefix-id.json
index dc6af51fd..4a9b705f4 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/protected-prefix-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/protected-prefix-id.json
@@ -1,6 +1,7 @@
 {
   "name" : "protected-prefix-id",
   "tags" : "protected-prefix-id",
+  "group":"default",
   "updated-by" : "Singal, Kapil <ks220y@att.com>",
   "property" : {
     "description" : "protected-prefix-id",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/protected_private_net_cidr.json b/components/model-catalog/resource-dictionary/starter-dictionary/protected_private_net_cidr.json
index 62fc05d06..87197a6e7 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/protected_private_net_cidr.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/protected_private_net_cidr.json
@@ -1,6 +1,7 @@
 {
   "name" : "protected_private_net_cidr",
   "tags" : "protected_private_net_cidr",
+  "group":"default",
   "updated-by" : "Singal, Kapil <ks220y@att.com>",
   "property" : {
     "description" : "protected_private_net_cidr",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/protected_private_subnet_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/protected_private_subnet_id.json
index b3daadc49..f6e3c2725 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/protected_private_subnet_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/protected_private_subnet_id.json
@@ -1,6 +1,7 @@
 {
   "name" : "protected_private_subnet_id",
   "tags" : "protected_private_subnet_id",
+  "group":"default",
   "updated-by" : "Singal, Kapil <ks220y@att.com>",
   "property" : {
     "description" : "protected_private_subnet_id",
@@ -13,4 +14,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/pub_key.json b/components/model-catalog/resource-dictionary/starter-dictionary/pub_key.json
index cb25ed47c..f21cf32cc 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/pub_key.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/pub_key.json
@@ -1,6 +1,7 @@
 {
 	"tags": "pub_key",
 	"name": "pub_key",
+	"group":"default",
 	"property": {
 		"description": "pub_key",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/public_net_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/public_net_id.json
index 66e7aeeec..fa6c40b98 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/public_net_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/public_net_id.json
@@ -1,6 +1,7 @@
 {
 	"tags": "public_net_id",
 	"name": "public_net_id",
+	"group":"default",
 	"property": {
 		"description": "public_net_id",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/put-active-streams.json b/components/model-catalog/resource-dictionary/starter-dictionary/put-active-streams.json
index 56237d815..aaa8bdff8 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/put-active-streams.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/put-active-streams.json
@@ -1,6 +1,7 @@
 {
   "name": "put-active-streams",
   "tags": "put-active-streams",
+  "group":"default",
   "property": {
     "description": "put-active-streams",
     "type": "string"
@@ -37,4 +38,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/sample-db-source.json b/components/model-catalog/resource-dictionary/starter-dictionary/sample-db-source.json
index 72abf788f..a7b93159d 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/sample-db-source.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/sample-db-source.json
@@ -1,5 +1,6 @@
 {
   "name": "sample-db-source",
+  "group":"default",
   "property" :{
     "description": "name of the ",
     "type": "string"
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/sample-default-source.json b/components/model-catalog/resource-dictionary/starter-dictionary/sample-default-source.json
index 1db375283..8a60ce288 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/sample-default-source.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/sample-default-source.json
@@ -1,6 +1,7 @@
 {
   "tags": "sample-default-source",
   "name": "sample-default-source",
+  "group":"default",
   "property" :{
     "description": "name of the ",
     "type": "string"
@@ -13,4 +14,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/sample-input-source.json b/components/model-catalog/resource-dictionary/starter-dictionary/sample-input-source.json
index 2483b4300..6eda39cbf 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/sample-input-source.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/sample-input-source.json
@@ -1,5 +1,6 @@
 {
 	"name": "sample-input-source",
+	"group":"default",
 	"property" :{
 		"description": "name of the ",
 		"type": "string"
@@ -14,4 +15,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/sample-licenses.json b/components/model-catalog/resource-dictionary/starter-dictionary/sample-licenses.json
index 7df21d54f..6b0edae68 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/sample-licenses.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/sample-licenses.json
@@ -1,6 +1,7 @@
 {
   "tags": "sample-licenses",
   "name": "sample-licenses",
+  "group":"default",
   "property": {
     "description" : " Sample Data for licences",
     "required": true,
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/sample-mdsal-source.json b/components/model-catalog/resource-dictionary/starter-dictionary/sample-mdsal-source.json
index 8cb4b8130..6785bf1a2 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/sample-mdsal-source.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/sample-mdsal-source.json
@@ -1,6 +1,7 @@
 {
   "tags": "sample-mdsal-source",
   "name": "sample-mdsal-source",
+  "group":"default",
   "property": {
     "description": "Sample sample-mdsal-source",
     "type": "string"
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/sample-v4-ip-type.json b/components/model-catalog/resource-dictionary/starter-dictionary/sample-v4-ip-type.json
index fcca3af66..482311507 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/sample-v4-ip-type.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/sample-v4-ip-type.json
@@ -1,5 +1,6 @@
 {
   "name": "sample-v4-ip-type",
+  "group":"default",
   "property": {
     "description": "sample-v4-ip-type",
     "type": "string"
@@ -14,4 +15,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/sec_group.json b/components/model-catalog/resource-dictionary/starter-dictionary/sec_group.json
index deb0a59b9..e7f27a2e2 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/sec_group.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/sec_group.json
@@ -1,6 +1,7 @@
 {
 	"tags": "sec_group",
 	"name": "sec_group",
+	"group":"default",
 	"property": {
 		"description": "sec_group",
 		"type": "string"
@@ -35,4 +36,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 fdebe5503..0f1810fca 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/service-instance-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/service-instance-id.json
@@ -1,6 +1,7 @@
 {
 	"tags": "service-instance-id, tosca.datatypes.Root, data_type",
 	"name": "service-instance-id",
+	"group":"default",
 	"property": {
 		"description": "To be provided",
 		"type": "string"
@@ -56,4 +57,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/status.json b/components/model-catalog/resource-dictionary/starter-dictionary/status.json
index 47a19d096..77e6cb01c 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/status.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/status.json
@@ -1,6 +1,7 @@
 {
   "name" : "status",
   "tags" : "status",
+  "group":"default",
   "updated-by" : "Singal, Kapil <ks220y@att.com>",
   "property" : {
     "description" : "status",
@@ -13,4 +14,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/unit-number.json b/components/model-catalog/resource-dictionary/starter-dictionary/unit-number.json
index 333fd78eb..ea422247d 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/unit-number.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/unit-number.json
@@ -1,6 +1,7 @@
 {
     "tags": "unit-number",
     "name": "unit-number",
+    "group":"default",
     "property": {
       "description": "unit-number",
       "type": "string"
@@ -11,4 +12,4 @@
         "type": "source-input"
       }
     }
-  }
-\ No newline at end of file
+  }
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/unprotected-prefix-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/unprotected-prefix-id.json
index 895d31c56..1992855b0 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/unprotected-prefix-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/unprotected-prefix-id.json
@@ -1,6 +1,7 @@
 {
   "name" : "unprotected-prefix-id",
   "tags" : "unprotected-prefix-id",
+  "group":"default",
   "updated-by" : "Singal, Kapil <ks220y@att.com>",
   "property" : {
     "description" : "unprotected-prefix-id",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/unprotected_private_net_cidr.json b/components/model-catalog/resource-dictionary/starter-dictionary/unprotected_private_net_cidr.json
index ff68a1940..3836670ce 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/unprotected_private_net_cidr.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/unprotected_private_net_cidr.json
@@ -1,6 +1,7 @@
 {
   "name" : "unprotected_private_net_cidr",
   "tags" : "unprotected_private_net_cidr",
+  "group":"default",
   "updated-by" : "Singal, Kapil <ks220y@att.com>",
   "property" : {
     "description" : "unprotected_private_net_cidr",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/unprotected_private_subnet_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/unprotected_private_subnet_id.json
index 760d611ae..bbbb740d0 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/unprotected_private_subnet_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/unprotected_private_subnet_id.json
@@ -1,6 +1,7 @@
 {
   "name" : "unprotected_private_subnet_id",
   "tags" : "unprotected_private_subnet_id",
+  "group":"default",
   "updated-by" : "Singal, Kapil <ks220y@att.com>",
   "property" : {
     "description" : "unprotected_private_subnet_id",
@@ -13,4 +14,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vault-secrets.json b/components/model-catalog/resource-dictionary/starter-dictionary/vault-secrets.json
index 6b4d6a49d..c8d3db2a0 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vault-secrets.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vault-secrets.json
@@ -1,6 +1,7 @@
 {
   "tags": "vault-secrets",
   "name": "vault-secrets",
+  "group":"default",
   "property": {
     "description": "Vault secret resolution with dynamic endpoint-selector",
     "type": "map",
@@ -33,4 +34,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_flavor_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_flavor_name.json
index 31f55b32d..41068e7d6 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_flavor_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_flavor_name.json
@@ -1,6 +1,7 @@
 {
 	"tags": "vdns_flavor_name",
 	"name": "vdns_flavor_name",
+	"group":"default",
 	"property": {
 		"description": "vdns_flavor_name",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_image_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_image_name.json
index 7ba8f2706..9f399b0e5 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_image_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_image_name.json
@@ -1,6 +1,7 @@
 {
 	"tags": "vdns_image_name",
 	"name": "vdns_image_name",
+	"group":"default",
 	"property": {
 		"description": "vdns_image_name",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_int_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_int_private_ip_0.json
index 6c3f7f473..0f20842e6 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_int_private_ip_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_int_private_ip_0.json
@@ -1,6 +1,7 @@
 {
 	"tags": "vdns_int_private_ip_0",
 	"name": "vdns_int_private_ip_0",
+	"group":"default",
 	"property": {
 		"description": "vdns_int_private_ip_0",
 		"type": "string"
@@ -37,4 +38,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_name_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_name_0.json
index 693d7f15f..709eb2a24 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_name_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_name_0.json
@@ -1,6 +1,7 @@
 {
 	"tags": "vdns_name_0",
 	"name": "vdns_name_0",
+	"group":"default",
 	"property": {
 		"description": "vdns_name_0",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_onap_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_onap_private_ip_0.json
index 96aa4e81a..93a5fa0b6 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_onap_private_ip_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_onap_private_ip_0.json
@@ -1,6 +1,7 @@
 {
 	"tags": "vdns_onap_private_ip_0",
 	"name": "vdns_onap_private_ip_0",
+	"group":"default",
 	"property": {
 		"description": "vdns_onap_private_ip_0",
 		"type": "string"
@@ -37,4 +38,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_vf_module_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_vf_module_id.json
index d428268b6..630061ea5 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_vf_module_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_vf_module_id.json
@@ -1,6 +1,7 @@
 {
 	"tags": "vdns_vf_module_id",
 	"name": "vdns_vf_module_id",
+	"group":"default",
 	"property": {
 		"description": "vdns_vf_module_id",
 		"type": "string"
@@ -50,4 +51,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
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 91aba6369..40fedd951 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-id.json
@@ -1,6 +1,7 @@
 {
   "name" : "vf-module-id",
   "tags" : "vf-module-id",
+  "group": "default",
   "updated-by" : "Singal, Kapil <ks220y@att.com>",
   "property" : {
     "description" : "vf-module-id",
@@ -34,4 +35,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
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 7e52d0801..5c21358a5 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-label.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-label.json
@@ -1,6 +1,7 @@
 {
 	"tags": "vf-module-label",
 	"name": "vf-module-label",
+	"group":"default",
 	"property": {
 		"description": "vf-module-label",
 		"type": "string"
@@ -32,4 +33,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-model-customization-uuid.json b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-model-customization-uuid.json
index 6443235c8..4eb0fedd3 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-model-customization-uuid.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-model-customization-uuid.json
@@ -1,6 +1,7 @@
 {
 	"tags": "vf-module-model-customization-uuid",
 	"name": "vf-module-model-customization-uuid",
+	"group":"default",
 	"property": {
 		"description": "vf-module-model-customization-uuid",
 		"type": "string"
@@ -15,4 +16,4 @@
 			"properties": {}
 		}
 	}
-}
-\ 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 0cd9da12a..78c337d19 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-name.json
@@ -1,6 +1,7 @@
 {
 	"tags": "vf-module-name",
 	"name": "vf-module-name",
+	"group":"default",
 	"property": {
 		"description": "vf_module_name",
 		"type": "string"
@@ -15,4 +16,4 @@
 			"properties": {}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-number.json b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-number.json
index cdd40f669..b26caebf8 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-number.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-number.json
@@ -1,6 +1,7 @@
 {
   "tags": "vf-module-number",
   "name": "vf-module-number",
+  "group":"default",
   "property" :{
     "description": "vf-module-number",
     "type": "string"
@@ -13,4 +14,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 06f36104a..d1d6cca63 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-type.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-type.json
@@ -1,6 +1,7 @@
 {
 	"tags": "vf-module-type",
 	"name": "vf-module-type",
+	"group":"default",
 	"property": {
 		"description": "vf-module-type",
 		"type": "string"
@@ -32,4 +33,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 7af89e193..acb6f882d 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vf-naming-policy.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vf-naming-policy.json
@@ -1,6 +1,7 @@
 {
 	"tags": "vf-naming-policy",
 	"name": "vf-naming-policy",
+	"group":"default",
 	"property": {
 		"description": "vf-naming-policy",
 		"type": "string"
@@ -49,4 +50,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vf-nf-code.json b/components/model-catalog/resource-dictionary/starter-dictionary/vf-nf-code.json
index e4d4e6d5a..89c8035c0 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vf-nf-code.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vf-nf-code.json
@@ -1,6 +1,7 @@
 {
 	"tags": "vf-nf-code",
 	"name": "vf-nf-code",
+	"group":"default",
 	"property": {
 		"description": "vf-nf-code",
 		"type": "string"
@@ -24,4 +25,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
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 231d2c5a5..92e5fad49 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vf_module_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vf_module_id.json
@@ -1,6 +1,7 @@
 {
 	"tags": "vf_module_id",
 	"name": "vf_module_id",
+	"group":"default",
 	"property": {
 		"description": "vf_module_id",
 		"type": "string"
@@ -15,4 +16,4 @@
 			"type": "source-input"
 		}
 	}
-}
-\ 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 20ce458b8..75b0d784d 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vf_module_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vf_module_name.json
@@ -1,6 +1,7 @@
 {
   "name" : "vf_module_name",
   "tags" : "vf_module_name",
+  "group":"default",
   "updated-by" : "Singal, Kapil <ks220y@att.com>",
   "property" : {
     "description" : "vf_module_name",
@@ -12,4 +13,4 @@
       "properties" : { }
     }
   }
-}
-\ 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 694f0e733..c8746e809 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vfccustomizationuuid.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vfccustomizationuuid.json
@@ -1,6 +1,7 @@
 {
 	"tags": "vfccustomizationuuid",
 	"name": "vfccustomizationuuid",
+	"group":"default",
 	"property": {
 		"description": "vfccustomizationuuid",
 		"type": "string"
@@ -32,4 +33,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vfw_flavor_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vfw_flavor_name.json
index bd539cde5..852e38d00 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vfw_flavor_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vfw_flavor_name.json
@@ -1,6 +1,7 @@
 {
 	"tags": "vfw_flavor_name",
 	"name": "vfw_flavor_name",
+	"group":"default",
 	"property": {
 		"description": "vfw_flavor_name",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vfw_image_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vfw_image_name.json
index 4878d572f..2236177f7 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vfw_image_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vfw_image_name.json
@@ -1,6 +1,7 @@
 {
 	"tags": "vfw_image_name",
 	"name": "vfw_image_name",
+	"group":"default",
 	"property": {
 		"description": "vfw_image_name",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vfw_int_private1_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vfw_int_private1_ip_0.json
index 7374f6fb9..888404d66 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vfw_int_private1_ip_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vfw_int_private1_ip_0.json
@@ -1,6 +1,7 @@
 {
 	"tags": "vfw_int_private1_ip_0",
 	"name": "vfw_int_private1_ip_0",
+	"group":"default",
 	"property": {
 		"description": "vfw_int_private1_ip_0",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vfw_int_private2_floating_ip.json b/components/model-catalog/resource-dictionary/starter-dictionary/vfw_int_private2_floating_ip.json
index d6ef22116..d4ad6d576 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vfw_int_private2_floating_ip.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vfw_int_private2_floating_ip.json
@@ -1,6 +1,7 @@
 {
 	"tags": "vfw_int_private2_floating_ip",
 	"name": "vfw_int_private2_floating_ip",
+	"group":"default",
 	"property": {
 		"description": "vfw_int_private2_floating_ip",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vfw_int_private2_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vfw_int_private2_ip_0.json
index c45e549bb..73689ed15 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vfw_int_private2_ip_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vfw_int_private2_ip_0.json
@@ -1,6 +1,7 @@
 {
 	"tags": "vfw_int_private2_ip_0",
 	"name": "vfw_int_private2_ip_0",
+	"group":"default",
 	"property": {
 		"description": "vfw_int_private2_ip_0",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vfw_name_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vfw_name_0.json
index 6f774bf65..43c0473c7 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vfw_name_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vfw_name_0.json
@@ -1,6 +1,7 @@
 {
 	"tags": "vfw_name_0",
 	"name": "vfw_name_0",
+	"group":"default",
 	"property": {
 		"description": "vfw_name_0",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vfw_onap_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vfw_onap_private_ip_0.json
index da65a00eb..d0f0b1d7d 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vfw_onap_private_ip_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vfw_onap_private_ip_0.json
@@ -1,6 +1,7 @@
 {
 	"tags": "vfw_onap_private_ip_0",
 	"name": "vfw_onap_private_ip_0",
+	"group":"default",
 	"property": {
 		"description": "vfw_onap_private_ip_0",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vfw_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vfw_private_ip_0.json
index 1e82e9f8a..3887c3e2c 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vfw_private_ip_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vfw_private_ip_0.json
@@ -1,6 +1,7 @@
 {
   "name" : "vfw_private_ip_0",
   "tags" : "vfw_private_ip_0",
+  "group":"default",
   "updated-by" : "Singal, Kapil <ks220y@att.com>",
   "property" : {
     "description" : "vfw_private_ip_0",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vfw_private_ip_1.json b/components/model-catalog/resource-dictionary/starter-dictionary/vfw_private_ip_1.json
index 9b9fab008..425a789e0 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vfw_private_ip_1.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vfw_private_ip_1.json
@@ -1,6 +1,7 @@
 {
   "name" : "vfw_private_ip_1",
   "tags" : "vfw_private_ip_1",
+  "group":"default",
   "updated-by" : "Singal, Kapil <ks220y@att.com>",
   "property" : {
     "description" : "vfw_private_ip_1",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vfw_private_ip_2.json b/components/model-catalog/resource-dictionary/starter-dictionary/vfw_private_ip_2.json
index f8adf741a..71fb7bc2a 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vfw_private_ip_2.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vfw_private_ip_2.json
@@ -1,6 +1,7 @@
 {
 		"name": "vfw_private_ip_2",
 		"tags": "vfw_private_ip_2",
+	        "group":"default",
 		"updated-by" : "Singal, Kapil <ks220y@att.com>",
 		"property": {
 			"type": "string",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vip.json b/components/model-catalog/resource-dictionary/starter-dictionary/vip.json
index 5c649dfc7..fb26650ac 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vip.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vip.json
@@ -1,6 +1,7 @@
 {
 	"tags": "vip",
 	"name": "vip",
+	"group":"default",
 	"property": {
 		"description": "vip",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_0_int_pktgen_private_port_0_mac.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_0_int_pktgen_private_port_0_mac.json
index 0ab9a5319..938715d7b 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_0_int_pktgen_private_port_0_mac.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_0_int_pktgen_private_port_0_mac.json
@@ -1,6 +1,7 @@
 {
 	"tags": "vlb_0_int_pktgen_private_port_0_mac",
 	"name": "vlb_0_int_pktgen_private_port_0_mac",
+	"group":"default",
 	"property": {
 		"description": "vlb_0_int_pktgen_private_port_0_mac",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_flavor_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_flavor_name.json
index 157170837..380011c52 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_flavor_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_flavor_name.json
@@ -1,6 +1,7 @@
 {
 	"tags": "vlb_flavor_name",
 	"name": "vlb_flavor_name",
+	"group":"default",
 	"property": {
 		"description": "vlb_flavor_name",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_image_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_image_name.json
index 76c7e67af..276d877b7 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_image_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_image_name.json
@@ -1,6 +1,7 @@
 {
 	"tags": "vlb_image_name",
 	"name": "vlb_image_name",
+	"group":"default",
 	"property": {
 		"description": "vlb_image_name",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_int_pktgen_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_int_pktgen_private_ip_0.json
index af55cd741..ac0734cd9 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_int_pktgen_private_ip_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_int_pktgen_private_ip_0.json
@@ -1,6 +1,7 @@
 {
 	"tags": "vlb_int_pktgen_private_ip_0",
 	"name": "vlb_int_pktgen_private_ip_0",
+	"group":"default",
 	"property": {
 		"description": "vlb_int_pktgen_private_ip_0",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_int_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_int_private_ip_0.json
index 1ac5e1950..176522b8a 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_int_private_ip_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_int_private_ip_0.json
@@ -1,6 +1,7 @@
 {
 	"tags": "vlb_int_private_ip_0",
 	"name": "vlb_int_private_ip_0",
+	"group":"default",
 	"property": {
 		"description": "vlb_int_private_ip_0",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_name_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_name_0.json
index acf34949d..acdcfebf4 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_name_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_name_0.json
@@ -1,6 +1,7 @@
 {
 	"tags": "vlb_name_0",
 	"name": "vlb_name_0",
+	"group":"default",
 	"property": {
 		"description": "vlb_name_0",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_onap_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_onap_private_ip_0.json
index 6279e446f..7925f4719 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_onap_private_ip_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_onap_private_ip_0.json
@@ -1,6 +1,7 @@
 {
 	"tags": "vlb_onap_private_ip_0",
 	"name": "vlb_onap_private_ip_0",
+	"group":"default",
 	"property": {
 		"description": "vlb_onap_private_ip_0",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_private_net_cidr.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_private_net_cidr.json
index cf782cc9d..d35a513a8 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_private_net_cidr.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_private_net_cidr.json
@@ -1,6 +1,7 @@
 {
 	"tags": "vlb_private_net_cidr",
 	"name": "vlb_private_net_cidr",
+	"group":"default",
 	"property": {
 		"description": "vlb_private_net_cidr",
 		"type": "string"
@@ -47,4 +48,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_private_net_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_private_net_id.json
index 5e832206e..129823002 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_private_net_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_private_net_id.json
@@ -1,6 +1,7 @@
 {
 	"tags": "vlb_private_net_id",
 	"name": "vlb_private_net_id",
+	"group":"default",
 	"property": {
 		"description": "vlb_private_net_id",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vm-type.json b/components/model-catalog/resource-dictionary/starter-dictionary/vm-type.json
index a514592b5..e1bce9215 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vm-type.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vm-type.json
@@ -1,6 +1,7 @@
 {
 	"tags": "vm-type",
 	"name": "vm-type",
+	"group":"default",
 	"property": {
 		"description": "vm-type",
 		"type": "string"
@@ -32,4 +33,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 97d6b011e..50ca21900 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vnf-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vnf-id.json
@@ -1,6 +1,7 @@
 {
     "tags": "vnf-id",
     "name": "vnf-id",
+    "group":"default",
     "property": {
       "description": "vnf-id",
       "type": "string"
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vnf-model-customization-uuid.json b/components/model-catalog/resource-dictionary/starter-dictionary/vnf-model-customization-uuid.json
index e598f6a4d..7a52c64ad 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vnf-model-customization-uuid.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vnf-model-customization-uuid.json
@@ -1,6 +1,7 @@
 {
 	"tags": "vnf-model-customization-uuid",
 	"name": "vnf-model-customization-uuid",
+	"group":"default",
 	"property": {
 		"description": "vnf-model-customization-uuid",
 		"type": "string"
@@ -12,4 +13,4 @@
 			"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 7d6511935..72304692e 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vnf-name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vnf-name.json
@@ -1,6 +1,7 @@
 {
   "tags": "vnf-name",
   "name": "vnf-name",
+  "group":"default",
   "property": {
     "description": "vnf-name",
     "type": "string"
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 8bbe49c2d..bb6840319 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vnf_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vnf_id.json
@@ -1,6 +1,7 @@
  {
       "tags": "vnf_id",
       "name": "vnf_id",
+      "group":"default",
       "property": {
         "description": "vnf_id",
         "type": "string"
@@ -16,4 +17,4 @@
         }
       }
     
-  }
-\ 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 1794b6a83..cb3061bcd 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vnf_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vnf_name.json
@@ -1,6 +1,7 @@
 {
   "tags": "vnf_name",
   "name": "vnf_name",
+  "group":"default",
   "property": {
     "description": "vnf_name",
     "type": "string"
@@ -34,4 +35,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 d78ee0d29..9d1435bb5 100644..100755
--- 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
@@ -1,6 +1,7 @@
 {
 	"tags": "vnfc-model-invariant-uuid",
 	"name": "vnfc-model-invariant-uuid",
+	"group":"default",
 	"property": {
 		"description": "vnfc-model-invariant-uuid",
 		"type": "string"
@@ -32,4 +33,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 cc9eb62ce..7e0b5a294 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-version.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-version.json
@@ -1,6 +1,7 @@
 {
 	"tags": "vnfc-model-version",
 	"name": "vnfc-model-version",
+	"group":"default",
 	"property": {
 		"description": "vnfc-model-version",
 		"type": "string"
@@ -32,4 +33,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/volume-name.json b/components/model-catalog/resource-dictionary/starter-dictionary/volume-name.json
index 3fe5ab30f..906c046fd 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/volume-name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/volume-name.json
@@ -1,6 +1,7 @@
 {
   "name" : "volume-name",
   "tags" : "volume-name",
+  "group":"default",
   "updated-by" : "Singal, Kapil <ks220y@att.com>",
   "property" : {
     "description" : "volume-name",
@@ -12,4 +13,4 @@
       "properties" : { }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/volume_group_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/volume_group_name.json
index 90b360964..f68d41033 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/volume_group_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/volume_group_name.json
@@ -1,6 +1,7 @@
 {
   "name" : "volume_group_name",
   "tags" : "volume_group_name",
+  "group":"default",
   "updated-by" : "Singal, Kapil <ks220y@att.com>",
   "property" : {
     "description" : "volume_group_name",
@@ -13,4 +14,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_flavor_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_flavor_name.json
index faeccf79b..110e12874 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_flavor_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_flavor_name.json
@@ -1,6 +1,7 @@
 {
 	"tags": "vpg_flavor_name",
 	"name": "vpg_flavor_name",
+	"group":"default",
 	"property": {
 		"description": "vpg_flavor_name",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_image_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_image_name.json
index 1bee33cb3..f284c3109 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_image_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_image_name.json
@@ -1,6 +1,7 @@
 {
 	"tags": "vpg_image_name",
 	"name": "vpg_image_name",
+	"group":"default",
 	"property": {
 		"description": "vpg_image_name",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_int_pktgen_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_int_pktgen_private_ip_0.json
index 42aeed601..9bdd0cacf 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_int_pktgen_private_ip_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_int_pktgen_private_ip_0.json
@@ -1,6 +1,7 @@
 {
 	"tags": "vpg_int_pktgen_private_ip_0",
 	"name": "vpg_int_pktgen_private_ip_0",
+	"group":"default",
 	"property": {
 		"description": "vpg_int_pktgen_private_ip_0",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_int_private1_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_int_private1_ip_0.json
index c54ab2023..dd3462659 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_int_private1_ip_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_int_private1_ip_0.json
@@ -1,6 +1,7 @@
 {
 	"tags": "vpg_int_private1_ip_0",
 	"name": "vpg_int_private1_ip_0",
+	"group":"default",
 	"property": {
 		"description": "vpg_int_private1_ip_0",
 		"type": "string"
@@ -35,4 +36,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 65f54f677..610ffc7a5 100644..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
@@ -1,6 +1,7 @@
 {
 	"tags": "vpg_name_0",
 	"name": "vpg_name_0",
+	"group":"default",
 	"property": {
 		"description": "vlb_name_0",
 		"type": "string"
@@ -35,4 +36,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 f158d53c5..cd6bb42e7 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
@@ -1,6 +1,7 @@
 {
   "name" : "vpg_name_0",
   "tags" : "vpg_name_0",
+  "group":"default",
   "updated-by" : "Singal, Kapil <ks220y@att.com>",
   "property" : {
     "description" : "vpg_name_0",
@@ -12,4 +13,4 @@
       "properties" : { }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_onap_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_onap_private_ip_0.json
index bfb12b8b4..21d57381b 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_onap_private_ip_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_onap_private_ip_0.json
@@ -1,6 +1,7 @@
 {
 	"tags": "vpg_onap_private_ip_0",
 	"name": "vpg_onap_private_ip_0",
+	"group":"default",
 	"property": {
 		"description": "vpg_onap_private_ip_0",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_private_ip_0.json
index 5527f5ec2..70e5c59db 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_private_ip_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_private_ip_0.json
@@ -1,6 +1,7 @@
 {
   "name" : "vpg_private_ip_0",
   "tags" : "vpg_private_ip_0",
+  "group":"default",
   "updated-by" : "Singal, Kapil <ks220y@att.com>",
   "property" : {
     "description" : "vpg_private_ip_0",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_private_ip_1.json b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_private_ip_1.json
index ff58f8afb..1814e20d8 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_private_ip_1.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_private_ip_1.json
@@ -1,6 +1,7 @@
 {
   "name" : "vpg_private_ip_1",
   "tags" : "vpg_private_ip_1",
+  "group":"default",
   "updated-by" : "Singal, Kapil <ks220y@att.com>",
   "property" : {
     "description" : "vpg_private_ip_1",
@@ -13,4 +14,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vsn_flavor_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vsn_flavor_name.json
index 89bd9c4ec..b4a09c6dc 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vsn_flavor_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vsn_flavor_name.json
@@ -1,6 +1,7 @@
 {
 	"tags": "vsn_flavor_name",
 	"name": "vsn_flavor_name",
+	"group":"default",
 	"property": {
 		"description": "vsn_flavor_name",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vsn_image_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vsn_image_name.json
index 8edeb565d..6135b0e19 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vsn_image_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vsn_image_name.json
@@ -1,6 +1,7 @@
 {
 	"tags": "vsn_image_name",
 	"name": "vsn_image_name",
+	"group":"default",
 	"property": {
 		"description": "vsn_image_name",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vsn_int_private2_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vsn_int_private2_ip_0.json
index c0015a682..c929fc6a9 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vsn_int_private2_ip_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vsn_int_private2_ip_0.json
@@ -1,6 +1,7 @@
 {
 	"tags": "vsn_int_private2_ip_0",
 	"name": "vsn_int_private2_ip_0",
+	"group":"default",
 	"property": {
 		"description": "vsn_int_private2_ip_0",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vsn_name_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vsn_name_0.json
index 1ad25b3f9..5f1ee5952 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vsn_name_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vsn_name_0.json
@@ -1,6 +1,7 @@
 {
 	"tags": "vsn_name_0",
 	"name": "vsn_name_0",
+	"group":"default",
 	"property": {
 		"description": "vsn_name_0",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vsn_onap_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vsn_onap_private_ip_0.json
index b769bc6ee..3ec62302b 100644..100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vsn_onap_private_ip_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vsn_onap_private_ip_0.json
@@ -1,6 +1,7 @@
 {
 	"tags": "vsn_onap_private_ip_0",
 	"name": "vsn_onap_private_ip_0",
+	"group":"default",
 	"property": {
 		"description": "vsn_onap_private_ip_0",
 		"type": "string"
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vsn_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vsn_private_ip_0.json
index 290186499..73b236658 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vsn_private_ip_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vsn_private_ip_0.json
@@ -1,6 +1,7 @@
 {
   "name" : "vsn_private_ip_0",
   "tags" : "vsn_private_ip_0",
+  "group":"default",
   "updated-by" : "Singal, Kapil <ks220y@att.com>",
   "property" : {
     "description" : "vsn_private_ip_0",
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vsn_private_ip_1.json b/components/model-catalog/resource-dictionary/starter-dictionary/vsn_private_ip_1.json
index 52de69c62..8a0bd2da5 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vsn_private_ip_1.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vsn_private_ip_1.json
@@ -1,6 +1,7 @@
 {
 		"name": "vsn_private_ip_1",
 		"tags": "vsn_private_ip_1",
+	        "group":"default",
 		"updated-by" : "Singal, Kapil <ks220y@att.com>",
 		"property": {
 			"type": "string",
diff --git a/components/model-catalog/resource-dictionary/test-dictionary/create_netbox_ip.json b/components/model-catalog/resource-dictionary/test-dictionary/create_netbox_ip.json
index 9e97aa497..09844e508 100644..100755
--- a/components/model-catalog/resource-dictionary/test-dictionary/create_netbox_ip.json
+++ b/components/model-catalog/resource-dictionary/test-dictionary/create_netbox_ip.json
@@ -1,6 +1,7 @@
 {
     "tags" : "oam-local-ipv4-address",
     "name" : "create_netbox_ip",
+    "group":"default",
     "property" : {
       "description" : "netbox ip",
       "type" : "dt-netbox-ip"
diff --git a/components/model-catalog/resource-dictionary/test-dictionary/delete_netbox_ip.json b/components/model-catalog/resource-dictionary/test-dictionary/delete_netbox_ip.json
index c6cb85877..c520ce1b2 100644..100755
--- a/components/model-catalog/resource-dictionary/test-dictionary/delete_netbox_ip.json
+++ b/components/model-catalog/resource-dictionary/test-dictionary/delete_netbox_ip.json
@@ -1,6 +1,7 @@
 {
   "tags": "oam-local-ipv4-address",
   "name": "delete_netbox_ip",
+  "group":"default",
   "property": {
     "description": "delete netbox ip",
     "type": "string"
diff --git a/components/model-catalog/resource-dictionary/test-dictionary/hostname.json b/components/model-catalog/resource-dictionary/test-dictionary/hostname.json
index 025cce336..29a901aa9 100644..100755
--- a/components/model-catalog/resource-dictionary/test-dictionary/hostname.json
+++ b/components/model-catalog/resource-dictionary/test-dictionary/hostname.json
@@ -1,6 +1,7 @@
 {
     "tags": "hostname",
     "name": "hostname",
+    "group":"default",
     "property": {
       "description": "hostname",
       "type": "string"
@@ -11,4 +12,4 @@
         "type": "source-input"
       }
     }
-  }
-\ No newline at end of file
+  }
diff --git a/components/model-catalog/resource-dictionary/test-dictionary/interface-description.json b/components/model-catalog/resource-dictionary/test-dictionary/interface-description.json
index d13bfc44b..f2799a449 100644..100755
--- a/components/model-catalog/resource-dictionary/test-dictionary/interface-description.json
+++ b/components/model-catalog/resource-dictionary/test-dictionary/interface-description.json
@@ -1,6 +1,7 @@
 {
   "tags": "interface-description",
   "name": "interface-description",
+  "group":"default",
   "property": {
     "description": "interface-description",
     "type": "string"
@@ -18,4 +19,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/test-dictionary/interface-name.json b/components/model-catalog/resource-dictionary/test-dictionary/interface-name.json
index 53a11ed70..3fb670027 100644..100755
--- a/components/model-catalog/resource-dictionary/test-dictionary/interface-name.json
+++ b/components/model-catalog/resource-dictionary/test-dictionary/interface-name.json
@@ -1,6 +1,7 @@
 {
   "name" : "interface-name",
   "tags" : "interface-name",
+  "group":"default",
   "updated-by" : "adetalhouet",
   "property" : {
     "description" : "interface-name",
@@ -12,4 +13,4 @@
       "properties" : { }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/test-dictionary/prefix-id.json b/components/model-catalog/resource-dictionary/test-dictionary/prefix-id.json
index e515eca55..06a444c15 100644..100755
--- a/components/model-catalog/resource-dictionary/test-dictionary/prefix-id.json
+++ b/components/model-catalog/resource-dictionary/test-dictionary/prefix-id.json
@@ -1,6 +1,7 @@
 {
   "tags": "prefix-id",
   "name": "prefix-id",
+  "group":"default",
   "property" :{
     "description": "prefix-id",
     "type": "integer"
@@ -13,4 +14,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/test-dictionary/unit-number.json b/components/model-catalog/resource-dictionary/test-dictionary/unit-number.json
index 333fd78eb..ea422247d 100644..100755
--- a/components/model-catalog/resource-dictionary/test-dictionary/unit-number.json
+++ b/components/model-catalog/resource-dictionary/test-dictionary/unit-number.json
@@ -1,6 +1,7 @@
 {
     "tags": "unit-number",
     "name": "unit-number",
+    "group":"default",
     "property": {
       "description": "unit-number",
       "type": "string"
@@ -11,4 +12,4 @@
         "type": "source-input"
       }
     }
-  }
-\ No newline at end of file
+  }
diff --git a/components/model-catalog/resource-dictionary/test-dictionary/vf-module-number.json b/components/model-catalog/resource-dictionary/test-dictionary/vf-module-number.json
index cdd40f669..b26caebf8 100644..100755
--- a/components/model-catalog/resource-dictionary/test-dictionary/vf-module-number.json
+++ b/components/model-catalog/resource-dictionary/test-dictionary/vf-module-number.json
@@ -1,6 +1,7 @@
 {
   "tags": "vf-module-number",
   "name": "vf-module-number",
+  "group":"default",
   "property" :{
     "description": "vf-module-number",
     "type": "string"
@@ -13,4 +14,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/test-dictionary/vf-module-type.json b/components/model-catalog/resource-dictionary/test-dictionary/vf-module-type.json
index 358644330..8baf05ddd 100644..100755
--- a/components/model-catalog/resource-dictionary/test-dictionary/vf-module-type.json
+++ b/components/model-catalog/resource-dictionary/test-dictionary/vf-module-type.json
@@ -1,6 +1,7 @@
 {
   "name": "vf-module-type",
   "tags": "vf-module-type",
+  "group":"default",
   "property": {
     "description": "vf-module-type",
     "type": "string"
diff --git a/ms/blueprintsprocessor/application/src/main/resources/sql/schema.sql b/ms/blueprintsprocessor/application/src/main/resources/sql/schema.sql
index 8bf39eed2..6dcd2af89 100644
--- a/ms/blueprintsprocessor/application/src/main/resources/sql/schema.sql
+++ b/ms/blueprintsprocessor/application/src/main/resources/sql/schema.sql
@@ -69,6 +69,7 @@ CREATE TABLE IF NOT EXISTS configurator.RESOURCE_DICTIONARY (
   data_type 		VARCHAR(100) NOT NULL,
   entry_schema 		VARCHAR(100) NULL DEFAULT NULL,
   definition 		LONGTEXT NOT NULL,
+  resource_dictionary_group             VARCHAR(10) NOT NULL,
   description 		LONGTEXT NOT NULL,
   tags 			LONGTEXT NOT NULL,  
   creation_date 	DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
diff --git a/ms/blueprintsprocessor/modules/blueprints/resource-dict/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/resource/dict/ResourceDefinition.kt b/ms/blueprintsprocessor/modules/blueprints/resource-dict/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/resource/dict/ResourceDefinition.kt
index 10930ffab..a746abac5 100644
--- a/ms/blueprintsprocessor/modules/blueprints/resource-dict/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/resource/dict/ResourceDefinition.kt
+++ b/ms/blueprintsprocessor/modules/blueprints/resource-dict/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/resource/dict/ResourceDefinition.kt
@@ -34,6 +34,9 @@ open class ResourceDefinition {
 
     var tags: String? = null
 
+    @JsonProperty(value = "group")
+    lateinit var group: String
+
     @JsonProperty(value = "updated-by")
     lateinit var updatedBy: String
 
diff --git a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/ResourceDictionaryController.kt b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/ResourceDictionaryController.kt
index 562932e23..390207995 100644
--- a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/ResourceDictionaryController.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/ResourceDictionaryController.kt
@@ -71,4 +71,10 @@ open class ResourceDictionaryController(private val resourceDictionaryHandler: R
     fun getResourceSourceMapping(): ResourceSourceMapping = runBlocking {
         resourceDictionaryHandler.getResourceSourceMapping()
     }
+
+    @GetMapping(path = ["/resource_dictionary_group"], produces = [MediaType.APPLICATION_JSON_VALUE])
+    @ResponseBody
+    fun getResourceDictionaryDistinct(): List<String> = runBlocking {
+        resourceDictionaryHandler.getResourceDictionaryDistinct()
+    }
 }
diff --git a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/domain/ResourceDictionary.kt b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/domain/ResourceDictionary.kt
index 209e2bbe8..e91d9e136 100644
--- a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/domain/ResourceDictionary.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/domain/ResourceDictionary.kt
@@ -56,6 +56,10 @@ class ResourceDictionary : Serializable {
     @Column(name = "entry_schema")
     var entrySchema: String? = null
 
+    @Column(name = "resource_dictionary_group")
+    @ApiModelProperty(required = true)
+    var resourceDictionaryGroup: String? = null
+
     @Lob
     @Convert(converter = JpaResourceDefinitionConverter::class)
     @Column(name = "definition", nullable = false)
@@ -86,6 +90,7 @@ class ResourceDictionary : Serializable {
         return "[" + ", name = " + name +
                 ", dataType = " + dataType +
                 ", entrySchema = " + entrySchema +
+                ", resourceDictionaryGroup = " + resourceDictionaryGroup +
                 ", definition =" + definition +
                 ", description = " + description +
                 ", updatedBy = " + updatedBy +
diff --git a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/handler/ResourceDictionaryHandler.kt b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/handler/ResourceDictionaryHandler.kt
index af40f56ed..d7563e821 100644
--- a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/handler/ResourceDictionaryHandler.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/handler/ResourceDictionaryHandler.kt
@@ -89,6 +89,7 @@ class ResourceDictionaryHandler(private val resourceDictionaryRepository: Resour
 
         resourceDictionary.tags = resourceDefinition.tags!!
         resourceDefinition.updatedBy = resourceDictionary.updatedBy
+        resourceDictionary.resourceDictionaryGroup = resourceDefinition.group
         // Set the Property Definitions
         val propertyDefinition = resourceDefinition.property
         resourceDictionary.description = propertyDefinition.description!!
@@ -107,6 +108,7 @@ class ResourceDictionaryHandler(private val resourceDictionaryRepository: Resour
             dbResourceDictionary.definition = resourceDictionary.definition
             dbResourceDictionary.description = resourceDictionary.description
             dbResourceDictionary.tags = resourceDictionary.tags
+            dbResourceDictionary.resourceDictionaryGroup = resourceDictionary.resourceDictionaryGroup
             dbResourceDictionary.updatedBy = resourceDictionary.updatedBy
             dbResourceDictionary.dataType = resourceDictionary.dataType
             dbResourceDictionary.entrySchema = resourceDictionary.entrySchema
@@ -143,4 +145,8 @@ class ResourceDictionaryHandler(private val resourceDictionaryRepository: Resour
         checkNotEmpty(resourceDictionary.updatedBy) { "DataDictionary Definition updatedBy is missing." }
         return true
     }
+
+    fun getResourceDictionaryDistinct(): List<String> {
+        return resourceDictionaryRepository.findDistinctByResourceDictionaryGroup()
+    }
 }
diff --git a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/repository/ResourceDictionaryRepository.kt b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/repository/ResourceDictionaryRepository.kt
index da7893861..fea01992b 100644
--- a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/repository/ResourceDictionaryRepository.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/repository/ResourceDictionaryRepository.kt
@@ -18,6 +18,7 @@ package org.onap.ccsdk.cds.blueprintsprocessor.designer.api.repository
 
 import org.onap.ccsdk.cds.blueprintsprocessor.designer.api.domain.ResourceDictionary
 import org.springframework.data.jpa.repository.JpaRepository
+import org.springframework.data.jpa.repository.Query
 import org.springframework.stereotype.Repository
 
 /**
@@ -59,4 +60,12 @@ interface ResourceDictionaryRepository : JpaRepository<ResourceDictionary, Strin
      * @param name name
      */
     fun deleteByName(name: String)
+
+    /**
+     *this method for getting resource dictionary group distinct
+     * (Dictionary library instances)
+     *
+     * */
+    @Query("SELECT distinct resourceDictionary.resourceDictionaryGroup FROM ResourceDictionary resourceDictionary")
+    fun findDistinctByResourceDictionaryGroup(): List<String>
 }
author	shaaban Altanany <shaaban.eltanany.ext@orange.com>	2019-12-17 15:45:51 +0200
committer	KAPIL SINGAL <ks220y@att.com>	2019-12-24 14:53:21 +0000
commit	033e544e10e6c35b9f38c91972eccb7906ecc6c4 (patch)
tree	97267bc6d28ba55bca237102837769a15a3e0080
parent	8fd7adbb9428bc0c14f5f08a321eabd582fbaf48 (diff)