X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FvFW_CNF_CDS%2Ftemplates%2Fcba%2FDefinitions%2Fresources_definition_types.json;h=64925d4d29f81b93da0fdc75730a9d35a1afc524;hb=734b3d2134b4e1dd3cd946b8badd2baf83f97110;hp=6277e01b1ca10acd5632d76af4af1d5ad283eb9a;hpb=d2c5f361fa3a246dfa23c2c582ec498322a97282;p=demo.git

diff --git a/heat/vFW_CNF_CDS/templates/cba/Definitions/resources_definition_types.json b/heat/vFW_CNF_CDS/templates/cba/Definitions/resources_definition_types.json
index 6277e01b..64925d4d 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Definitions/resources_definition_types.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Definitions/resources_definition_types.json
@@ -1,684 +1,841 @@
 {
     "active-streams": {
-        "tags": "active-streams",
+        "group": "default",
         "name": "active-streams",
         "property": {
             "description": "active-streams",
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
-            },
-            "default": {
-                "type": "source-default",
-                "properties": {}
             }
-        }
+        },
+        "tags": "active-streams",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>"
     },
     "aic-cloud-region": {
-        "tags": "aic-cloud-region",
+        "group": "default",
         "name": "aic-cloud-region",
         "property": {
             "description": "aic-cloud-region",
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "Singal, Kapil <ks220y@att.com>",
         "sources": {
             "input": {
-                "type": "source-input",
-                "properties": {}
+                "properties": {},
+                "type": "source-input"
             }
-        }
+        },
+        "tags": "aic-cloud-region",
+        "updated-by": "Singal, Kapil <ks220y@att.com>"
+    },
+    "config-deploy-setup": {
+        "group": "default",
+        "name": "config-deploy-setup",
+        "property": {
+            "description": "Configuration Input setup for config-deploy operation",
+            "type": "json"
+        },
+        "sources": {
+            "capability": {
+                "properties": {
+                    "instance-dependencies": [],
+                    "script-class-reference": "org.onap.ccsdk.cds.blueprintsprocessor.services.execution.scripts.ConfigDeploySetup",
+                    "script-type": "kotlin"
+                },
+                "type": "source-capability"
+            }
+        },
+        "tags": "config-deploy-setup",
+        "updated-by": "Lukasz Rajewski <lukasz.rajewski@orange.com>"
     },
     "dcae_collector_ip": {
-        "tags": "dcae_collector_ip",
+        "group": "default",
         "name": "dcae_collector_ip",
         "property": {
             "description": "dcae_collector_ip",
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
             },
-            "default": {
-                "type": "source-default",
-                "properties": {}
-            },
             "sdnc": {
-                "type": "source-rest",
                 "properties": {
-                    "verb": "GET",
-                    "type": "JSON",
-                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/dcae_collector_ip",
-                    "path": "/param/0/value",
                     "input-key-mapping": {
                         "service-instance-id": "service-instance-id",
                         "vnf-id": "vnf-id"
                     },
-                    "output-key-mapping": {
-                        "dcae_collector_ip": "value"
-                    },
                     "key-dependencies": [
                         "service-instance-id",
                         "vnf-id"
-                    ]
-                }
+                    ],
+                    "output-key-mapping": {
+                        "dcae_collector_ip": "value"
+                    },
+                    "path": "/param/0/value",
+                    "type": "JSON",
+                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/dcae_collector_ip",
+                    "verb": "GET"
+                },
+                "type": "source-rest"
             }
-        }
+        },
+        "tags": "dcae_collector_ip",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>"
     },
     "dcae_collector_port": {
-        "tags": "dcae_collector_port",
+        "group": "default",
         "name": "dcae_collector_port",
         "property": {
             "description": "dcae_collector_port",
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
             },
-            "default": {
-                "type": "source-default",
-                "properties": {}
-            },
             "sdnc": {
-                "type": "source-rest",
                 "properties": {
-                    "verb": "GET",
-                    "type": "JSON",
-                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/dcae_collector_port",
-                    "path": "/param/0/value",
                     "input-key-mapping": {
                         "service-instance-id": "service-instance-id",
                         "vnf-id": "vnf-id"
                     },
-                    "output-key-mapping": {
-                        "dcae_collector_port": "value"
-                    },
                     "key-dependencies": [
                         "service-instance-id",
                         "vnf-id"
-                    ]
-                }
+                    ],
+                    "output-key-mapping": {
+                        "dcae_collector_port": "value"
+                    },
+                    "path": "/param/0/value",
+                    "type": "JSON",
+                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/dcae_collector_port",
+                    "verb": "GET"
+                },
+                "type": "source-rest"
             }
-        }
+        },
+        "tags": "dcae_collector_port",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>"
     },
     "demo_artifacts_version": {
-        "tags": "demo_artifacts_version",
+        "group": "default",
         "name": "demo_artifacts_version",
         "property": {
             "description": "demo_artifacts_version",
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
             },
-            "default": {
-                "type": "source-default",
-                "properties": {}
-            },
             "sdnc": {
-                "type": "source-rest",
                 "properties": {
-                    "verb": "GET",
-                    "type": "JSON",
-                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/demo_artifacts_version",
-                    "path": "/param/0/value",
                     "input-key-mapping": {
                         "service-instance-id": "service-instance-id",
                         "vnf-id": "vnf-id"
                     },
-                    "output-key-mapping": {
-                        "demo_artifacts_version": "value"
-                    },
                     "key-dependencies": [
                         "service-instance-id",
                         "vnf-id"
-                    ]
-                }
+                    ],
+                    "output-key-mapping": {
+                        "demo_artifacts_version": "value"
+                    },
+                    "path": "/param/0/value",
+                    "type": "JSON",
+                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/demo_artifacts_version",
+                    "verb": "GET"
+                },
+                "type": "source-rest"
             }
-        }
+        },
+        "tags": "demo_artifacts_version",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>"
     },
     "int_private1_net_cidr": {
-        "tags": "int_private1_net_cidr",
+        "group": "default",
         "name": "int_private1_net_cidr",
         "property": {
             "description": "int_private1_net_cidr",
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
             },
-            "default": {
-                "type": "source-default",
-                "properties": {}
+            "processor-db": {
+                "properties": {
+                    "input-key-mapping": {},
+                    "output-key-mapping": {
+                        "int_private1_net_cidr": "prefix"
+                    },
+                    "query": "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private1\"",
+                    "type": "SQL"
+                },
+                "type": "source-db"
             },
             "sdnc": {
-                "type": "source-rest",
                 "properties": {
-                    "verb": "GET",
-                    "type": "JSON",
-                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/int_private1_net_cidr",
-                    "path": "/param/0/value",
                     "input-key-mapping": {
                         "service-instance-id": "service-instance-id",
                         "vnf-id": "vnf-id"
                     },
-                    "output-key-mapping": {
-                        "int_private1_net_cidr": "value"
-                    },
                     "key-dependencies": [
                         "service-instance-id",
                         "vnf-id"
-                    ]
-                }
-            },
-            "processor-db": {
-                "type": "source-db",
-                "properties": {
-                    "type": "SQL",
-                    "query": "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private1\"",
-                    "input-key-mapping": {},
+                    ],
                     "output-key-mapping": {
-                        "int_private1_net_cidr": "prefix"
-                    }
-                }
+                        "int_private1_net_cidr": "value"
+                    },
+                    "path": "/param/0/value",
+                    "type": "JSON",
+                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/int_private1_net_cidr",
+                    "verb": "GET"
+                },
+                "type": "source-rest"
             }
-        }
+        },
+        "tags": "int_private1_net_cidr",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>"
     },
     "int_private2_net_cidr": {
-        "tags": "int_private2_net_cidr",
+        "group": "default",
         "name": "int_private2_net_cidr",
         "property": {
             "description": "int_private2_net_cidr",
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
             },
-            "default": {
-                "type": "source-default",
-                "properties": {}
-            },
             "processor-db": {
-                "type": "source-db",
                 "properties": {
-                    "type": "SQL",
-                    "query": "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private2\"",
+                    "input-key-mapping": {},
                     "output-key-mapping": {
                         "int_private2_net_cidr": "prefix"
                     },
-                    "input-key-mapping": {}
-                }
+                    "query": "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private2\"",
+                    "type": "SQL"
+                },
+                "type": "source-db"
             },
             "sdnc": {
-                "type": "source-rest",
                 "properties": {
-                    "verb": "GET",
-                    "type": "JSON",
-                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/int_private2_net_cidr",
-                    "path": "/param/0/value",
                     "input-key-mapping": {
                         "service-instance-id": "service-instance-id",
                         "vnf-id": "vnf-id"
                     },
-                    "output-key-mapping": {
-                        "int_private2_net_cidr": "value"
-                    },
                     "key-dependencies": [
                         "service-instance-id",
                         "vnf-id"
-                    ]
-                }
+                    ],
+                    "output-key-mapping": {
+                        "int_private2_net_cidr": "value"
+                    },
+                    "path": "/param/0/value",
+                    "type": "JSON",
+                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/int_private2_net_cidr",
+                    "verb": "GET"
+                },
+                "type": "source-rest"
             }
-        }
+        },
+        "tags": "int_private2_net_cidr",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>"
     },
-    "k8s-rb-profile-name": {
-        "tags": "k8s, cnf, profile, k8s-rb-profile-name",
-        "name": "k8s-rb-profile-name",
+    "k8s-rb-config-name": {
+        "group": "default",
+        "name": "k8s-rb-config-name",
         "property": {
-            "description": "Profile name used in multicloud/k8s plugin to identify Helm chart(s) where this mapping is providing override values.",
+            "description": "The source of configuration values for config-deploy operation",
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "Samuli, Silvius <s.silvius@partner.samsung.com>",
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
-            },
-            "default": {
-                "type": "source-default",
-                "properties": {}
             }
-        }
+        },
+        "tags": "k8s, cnf, config, k8s-rb-config-name",
+        "updated-by": "Rajewski, Lukasz <lukasz.rajewski@orange.com>"
     },
-    "k8s-rb-profile-namespace": {
-        "tags": "k8s, cnf, profile, namespace, k8s-rb-profile-namespace",
-        "name": "k8s-rb-profile-namespace",
+    "k8s-rb-config-template-name": {
+        "group": "default",
+        "name": "k8s-rb-config-template-name",
         "property": {
-            "description": "Profile name used in multicloud/k8s plugin",
+            "description": "The name of configuration template for config-assign operation",
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "Samuli, Silvius <s.silvius@partner.samsung.com>",
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
-            },
+            }
+        },
+        "tags": "k8s, cnf, config, k8s-rb-config-template-name",
+        "updated-by": "Rajewski, Lukasz <lukasz.rajewski@orange.com>"
+    },
+    "k8s-rb-config-template-source": {
+        "group": "default",
+        "name": "k8s-rb-config-template-source",
+        "property": {
+            "description": "The source of configuration template for config-assign operation",
+            "type": "string"
+        },
+        "sources": {
             "default": {
-                "type": "source-default",
-                "properties": {}
+                "properties": {},
+                "type": "source-default"
             },
-            "sdnc": {
-                "type": "source-rest",
-                "properties": {
-                    "verb": "GET",
-                    "type": "JSON",
-                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/k8s-rb-profile-namespace",
-                    "path": "/param/0/value",
-                    "input-key-mapping": {
-                        "service-instance-id": "service-instance-id",
+            "input": {
+                "type": "source-input"
+            }
+        },
+        "tags": "k8s, cnf, config, k8s-rb-config-template-source",
+        "updated-by": "Rajewski, Lukasz <lukasz.rajewski@orange.com>"
+    },
+    "k8s-rb-config-value-source": {
+        "group": "default",
+        "name": "k8s-rb-config-value-source",
+        "property": {
+            "description": "The source of configuration values for config-deploy operation",
+            "type": "string"
+        },
+        "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
+            "input": {
+                "type": "source-input"
+            }
+        },
+        "tags": "k8s, cnf, config, k8s-rb-config-value-source",
+        "updated-by": "Rajewski, Lukasz <lukasz.rajewski@orange.com>"
+    },
+    "k8s-rb-instance-release-name": {
+        "group": "default",
+        "name": "k8s-rb-instance-release-name",
+        "property": {
+            "description": "Name of the release for the helm package instance in k8s",
+            "type": "string"
+        },
+        "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
+            "input": {
+                "type": "source-input"
+            }
+        },
+        "tags": "k8s, cnf, profile, k8s-rb-instance-release-name",
+        "updated-by": "Rajewski, Lukasz <lukasz.rajewski@orange.com>"
+    },
+    "k8s-rb-profile-k8s-version": {
+        "group": "default",
+        "name": "k8s-rb-profile-k8s-version",
+        "property": {
+            "description": "Profile k8s version used in multicloud/k8s plugin",
+            "type": "string"
+        },
+        "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
+            "input": {
+                "type": "source-input"
+            },
+            "sdnc": {
+                "properties": {
+                    "input-key-mapping": {
+                        "service-instance-id": "service-instance-id",
                         "vnf-id": "vnf-id"
                     },
-                    "output-key-mapping": {
-                        "k8s-rb-profile-namespace": "value"
-                    },
                     "key-dependencies": [
                         "service-instance-id",
                         "vnf-id"
-                    ]
-                }
+                    ],
+                    "output-key-mapping": {
+                        "k8s-rb-profile-k8s-version": "value"
+                    },
+                    "path": "/param/0/value",
+                    "type": "JSON",
+                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/k8s-rb-profile-k8s-version",
+                    "verb": "GET"
+                },
+                "type": "source-rest"
             }
-        }
+        },
+        "tags": "k8s, cnf, profile, k8s version, k8s-rb-profile-k8s-version",
+        "updated-by": "Rajewski, Lukasz <lukasz.rajewski@orange.com>"
     },
-    "k8s-rb-profile-source": {
-        "tags": "k8s, cnf, profile, k8s-rb-profile-source",
-        "name": "k8s-rb-profile-source",
+    "k8s-rb-profile-name": {
+        "group": "default",
+        "name": "k8s-rb-profile-name",
         "property": {
-            "description": "The source folder or file relative to 'Templates/k8s-profiles' folder",
+            "description": "Profile name used in multicloud/k8s plugin to identify Helm chart(s) where this mapping is providing override values.",
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "Rajewski, Lukasz <lukasz.rajewski@orange.com>",
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
-            },
-            "default": {
-                "type": "source-default",
-                "properties": {}
             }
-        }
+        },
+        "tags": "k8s, cnf, profile, k8s-rb-profile-name",
+        "updated-by": "Samuli, Silvius <s.silvius@partner.samsung.com>"
     },
-    "k8s-rb-config-template-name": {
-        "tags": "k8s, cnf, config, k8s-rb-config-template-name",
-        "name": "k8s-rb-config-template-name",
+    "k8s-rb-profile-namespace": {
+        "group": "default",
+        "name": "k8s-rb-profile-namespace",
         "property": {
-            "description": "The name of configuration template for config-assign operation",
+            "description": "Profile name used in multicloud/k8s plugin",
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "Rajewski, Lukasz <lukasz.rajewski@orange.com>",
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
             },
-            "default": {
-                "type": "source-default",
-                "properties": {}
+            "sdnc": {
+                "properties": {
+                    "input-key-mapping": {
+                        "service-instance-id": "service-instance-id",
+                        "vnf-id": "vnf-id"
+                    },
+                    "key-dependencies": [
+                        "service-instance-id",
+                        "vnf-id"
+                    ],
+                    "output-key-mapping": {
+                        "k8s-rb-profile-namespace": "value"
+                    },
+                    "path": "/param/0/value",
+                    "type": "JSON",
+                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/k8s-rb-profile-namespace",
+                    "verb": "GET"
+                },
+                "type": "source-rest"
             }
-        }
+        },
+        "tags": "k8s, cnf, profile, namespace, k8s-rb-profile-namespace",
+        "updated-by": "Samuli, Silvius <s.silvius@partner.samsung.com>"
     },
-    "k8s-rb-config-template-source": {
-        "tags": "k8s, cnf, config, k8s-rb-config-template-source",
-        "name": "k8s-rb-config-template-source",
+    "k8s-rb-profile-source": {
+        "group": "default",
+        "name": "k8s-rb-profile-source",
         "property": {
-            "description": "The source of configuration template for config-assign operation",
+            "description": "The source folder or file relative to 'Templates/k8s-profiles' folder",
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "Rajewski, Lukasz <lukasz.rajewski@orange.com>",
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
-            },
-            "default": {
-                "type": "source-default",
-                "properties": {}
             }
-        }
+        },
+        "tags": "k8s, cnf, profile, k8s-rb-profile-source",
+        "updated-by": "Rajewski, Lukasz <lukasz.rajewski@orange.com>"
     },
     "management-prefix-id": {
-        "tags": "management-prefix-id",
+        "group": "default",
         "name": "management-prefix-id",
         "property": {
             "description": "management-prefix-id",
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
             },
-            "default": {
-                "type": "source-default",
-                "properties": {}
+            "processor-db": {
+                "properties": {
+                    "input-key-mapping": {},
+                    "output-key-mapping": {
+                        "management-prefix-id": "prefix_id"
+                    },
+                    "query": "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"management\"",
+                    "type": "SQL"
+                },
+                "type": "source-db"
             },
             "sdnc": {
-                "type": "source-rest",
                 "properties": {
-                    "verb": "GET",
-                    "type": "JSON",
-                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/management-prefix-id",
-                    "path": "/param/0/value",
                     "input-key-mapping": {
                         "service-instance-id": "service-instance-id",
                         "vnf-id": "vnf-id"
                     },
-                    "output-key-mapping": {
-                        "management-prefix-id": "value"
-                    },
                     "key-dependencies": [
                         "service-instance-id",
                         "vnf-id"
-                    ]
-                }
-            },
-            "processor-db": {
-                "type": "source-db",
-                "properties": {
-                    "type": "SQL",
-                    "query": "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"management\"",
-                    "input-key-mapping": {},
+                    ],
                     "output-key-mapping": {
-                        "management-prefix-id": "prefix_id"
-                    }
-                }
+                        "management-prefix-id": "value"
+                    },
+                    "path": "/param/0/value",
+                    "type": "JSON",
+                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/management-prefix-id",
+                    "verb": "GET"
+                },
+                "type": "source-rest"
             }
-        }
+        },
+        "tags": "management-prefix-id",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>"
     },
     "onap_private_net_cidr": {
-        "tags": "onap_private_net_cidr",
+        "group": "default",
         "name": "onap_private_net_cidr",
         "property": {
             "description": "onap_private_net_cidr",
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
             },
-            "default": {
-                "type": "source-default",
-                "properties": {}
-            },
             "processor-db": {
-                "type": "source-db",
                 "properties": {
-                    "type": "SQL",
-                    "query": "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"management\"",
                     "input-key-mapping": {},
                     "output-key-mapping": {
                         "onap_private_net_cidr": "prefix"
-                    }
-                }
+                    },
+                    "query": "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"management\"",
+                    "type": "SQL"
+                },
+                "type": "source-db"
             },
             "sdnc": {
-                "type": "source-rest",
                 "properties": {
-                    "verb": "GET",
-                    "type": "JSON",
-                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/onap_private_net_cidr",
-                    "path": "/param/0/value",
                     "input-key-mapping": {
                         "service-instance-id": "service-instance-id",
                         "vnf-id": "vnf-id"
                     },
-                    "output-key-mapping": {
-                        "onap_private_net_cidr": "value"
-                    },
                     "key-dependencies": [
                         "service-instance-id",
                         "vnf-id"
-                    ]
-                }
+                    ],
+                    "output-key-mapping": {
+                        "onap_private_net_cidr": "value"
+                    },
+                    "path": "/param/0/value",
+                    "type": "JSON",
+                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/onap_private_net_cidr",
+                    "verb": "GET"
+                },
+                "type": "source-rest"
             }
-        }
+        },
+        "tags": "onap_private_net_cidr",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>"
     },
     "private1-prefix-id": {
-        "tags": "private1-prefix-id",
+        "group": "default",
         "name": "private1-prefix-id",
         "property": {
             "description": "private1-prefix-id",
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
             },
-            "default": {
-                "type": "source-default",
-                "properties": {}
+            "processor-db": {
+                "properties": {
+                    "input-key-mapping": {},
+                    "output-key-mapping": {
+                        "private1-prefix-id": "prefix_id"
+                    },
+                    "query": "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"private1\"",
+                    "type": "SQL"
+                },
+                "type": "source-db"
             },
             "sdnc": {
-                "type": "source-rest",
                 "properties": {
-                    "verb": "GET",
-                    "type": "JSON",
-                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/private1-prefix-id",
-                    "path": "/param/0/value",
                     "input-key-mapping": {
                         "service-instance-id": "service-instance-id",
                         "vnf-id": "vnf-id"
                     },
-                    "output-key-mapping": {
-                        "private1-prefix-id": "value"
-                    },
                     "key-dependencies": [
                         "service-instance-id",
                         "vnf-id"
-                    ]
-                }
-            },
-            "processor-db": {
-                "type": "source-db",
-                "properties": {
-                    "type": "SQL",
-                    "query": "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"private1\"",
-                    "input-key-mapping": {},
+                    ],
                     "output-key-mapping": {
-                        "private1-prefix-id": "prefix_id"
-                    }
-                }
+                        "private1-prefix-id": "value"
+                    },
+                    "path": "/param/0/value",
+                    "type": "JSON",
+                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/private1-prefix-id",
+                    "verb": "GET"
+                },
+                "type": "source-rest"
             }
-        }
+        },
+        "tags": "private1-prefix-id",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>"
     },
     "private2-prefix-id": {
-        "tags": "private2-prefix-id",
+        "group": "default",
         "name": "private2-prefix-id",
         "property": {
             "description": "private2-prefix-id",
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
             },
-            "default": {
-                "type": "source-default",
-                "properties": {}
+            "processor-db": {
+                "properties": {
+                    "input-key-mapping": {},
+                    "output-key-mapping": {
+                        "private2-prefix-id": "prefix_id"
+                    },
+                    "query": "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"private2\"",
+                    "type": "SQL"
+                },
+                "type": "source-db"
             },
             "sdnc": {
-                "type": "source-rest",
                 "properties": {
-                    "verb": "GET",
-                    "type": "JSON",
-                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/private2-prefix-id",
-                    "path": "/param/0/value",
                     "input-key-mapping": {
                         "service-instance-id": "service-instance-id",
                         "vnf-id": "vnf-id"
                     },
-                    "output-key-mapping": {
-                        "private2-prefix-id": "value"
-                    },
                     "key-dependencies": [
                         "service-instance-id",
                         "vnf-id"
-                    ]
-                }
-            },
-            "processor-db": {
-                "type": "source-db",
-                "properties": {
-                    "type": "SQL",
-                    "query": "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"private2\"",
-                    "input-key-mapping": {},
+                    ],
                     "output-key-mapping": {
-                        "private2-prefix-id": "prefix_id"
-                    }
-                }
+                        "private2-prefix-id": "value"
+                    },
+                    "path": "/param/0/value",
+                    "type": "JSON",
+                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/private2-prefix-id",
+                    "verb": "GET"
+                },
+                "type": "source-rest"
             }
-        }
+        },
+        "tags": "private2-prefix-id",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>"
     },
     "put-active-streams": {
-        "tags": "put-active-streams",
+        "group": "default",
         "name": "put-active-streams",
         "property": {
             "description": "put-active-streams",
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
             },
-            "default": {
-                "type": "source-default",
-                "properties": {}
-            },
             "sdnc": {
-                "type": "source-rest",
                 "properties": {
-                    "verb": "PUT",
-                    "type": "JSON",
-                    "url-path": "$vpg_onap_private_ip_0:8183/restconf/config/stream-count:stream-count/streams",
-                    "path": "/param/0/value",
+                    "endpoint-selector": "vpkg-rest-api",
                     "input-key-mapping": {
-                        "vpg_onap_private_ip_0": "vpg_onap_private_ip_0",
-                        "active-streams": "active-streams"
+                        "active-streams": "active-streams",
+                        "vpg_onap_private_ip_0": "vpg_onap_private_ip_0"
                     },
-                    "output-key-mapping": {},
                     "key-dependencies": [
                         "vpg_onap_private_ip_0",
                         "active-streams"
                     ],
-                    "endpoint-selector": "vpkg-rest-api",
-                    "payload": "{\"streams\": {\"active-streams\": $active-streams}}"
-                }
+                    "output-key-mapping": {},
+                    "path": "/param/0/value",
+                    "payload": "{\"streams\": {\"active-streams\": $active-streams}}",
+                    "type": "JSON",
+                    "url-path": "$vpg_onap_private_ip_0:8183/restconf/config/stream-count:stream-count/streams",
+                    "verb": "PUT"
+                },
+                "type": "source-rest"
             }
-        }
+        },
+        "tags": "put-active-streams",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>"
     },
     "service-instance-id": {
-        "tags": "service-instance-id, tosca.datatypes.Root, data_type",
+        "group": "default",
         "name": "service-instance-id",
         "property": {
             "description": "To be provided",
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "Singal, Kapil <ks220y@att.com>",
         "sources": {
-            "input": {
-                "type": "source-input",
-                "properties": {}
-            },
             "any-db": {
-                "type": "source-db",
                 "properties": {
-                    "query": "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
                     "input-key-mapping": {},
                     "output-key-mapping": {
                         "service-instance-id": "artifact_name"
-                    }
-                }
+                    },
+                    "query": "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\""
+                },
+                "type": "source-db"
+            },
+            "capability": {
+                "properties": {
+                    "instance-dependencies": [],
+                    "script-class-reference": "SampleRAProcessor",
+                    "script-type": "jython"
+                },
+                "type": "source-capability"
+            },
+            "input": {
+                "properties": {},
+                "type": "source-input"
             },
             "processor-db": {
-                "type": "source-db",
                 "properties": {
-                    "query": "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
                     "input-key-mapping": {},
                     "output-key-mapping": {
                         "service-instance-id": "artifact_name"
-                    }
-                }
-            },
-            "capability": {
-                "type": "source-capability",
-                "properties": {
-                    "script-type": "jython",
-                    "script-class-reference": "SampleRAProcessor",
-                    "instance-dependencies": []
-                }
+                    },
+                    "query": "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\""
+                },
+                "type": "source-db"
             },
             "sdnc": {
-                "type": "source-rest",
                 "properties": {
-                    "verb": "GET",
-                    "type": "JSON",
-                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id",
-                    "path": "/service/0/service-instance-id",
                     "input-key-mapping": {
                         "service-instance-id": "service-instance.service-instance-id"
                     },
+                    "key-dependencies": [
+                        "service-instance.service-instance-id"
+                    ],
                     "output-key-mapping": {
                         "service-instance-id": "service-instance-id"
                     },
-                    "key-dependencies": [
-                        "service-instance.service-instance-id"
-                    ]
-                }
+                    "path": "/service/0/service-instance-id",
+                    "type": "JSON",
+                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id",
+                    "verb": "GET"
+                },
+                "type": "source-rest"
             }
-        }
+        },
+        "tags": "service-instance-id, tosca.datatypes.Root, data_type",
+        "updated-by": "Singal, Kapil <ks220y@att.com>"
     },
     "vf-module-id": {
-        "tags": "vf-module-id",
+        "group": "default",
         "name": "vf-module-id",
         "property": {
             "description": "vf-module-id",
             "type": "string"
         },
+        "sources": {
+            "input": {
+                "properties": {},
+                "type": "source-input"
+            },
+            "sdnc": {
+                "properties": {
+                    "input-key-mapping": {
+                        "service-instance-id": "service-instance-id",
+                        "vf-module-id": "vf-module.vf-module-id",
+                        "vnf-id": "vnf-id"
+                    },
+                    "key-dependencies": [
+                        "service-instance-id",
+                        "vnf-id",
+                        "vf-module.vf-module-id"
+                    ],
+                    "output-key-mapping": {
+                        "vf-module-id": "vf-module-id"
+                    },
+                    "path": "/vf-module/0/vf-module-id",
+                    "type": "JSON",
+                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vf-modules/vf-module/$vf-module-id",
+                    "verb": "GET"
+                },
+                "type": "source-rest"
+            }
+        },
+        "tags": "vf-module-id",
+        "updated-by": "Singal, Kapil <ks220y@att.com>"
+    },
+    "vf-module-name": {
+        "tags": "vf-module-name",
+        "name": "vf-module-name",
+        "property": {
+            "description": "vf-module-name",
+            "type": "string"
+        },
         "group": "default",
         "updated-by": "Singal, Kapil <ks220y@att.com>",
         "sources": {
             "input": {
-                "type": "source-input",
+                "type": "source-input"
+            },
+            "default": {
+                "type": "source-default",
                 "properties": {}
             },
             "sdnc": {
@@ -686,30 +843,59 @@
                 "properties": {
                     "verb": "GET",
                     "type": "JSON",
-                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vf-modules/vf-module/$vf-module-id",
-                    "path": "/vf-module/0/vf-module-id",
+                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vf-modules/vf-module/$vf_module_id/vf-module-data/vf-module-topology/vf-module-parameters/param/vf-module-name",
+                    "path": "/param/0/value",
                     "input-key-mapping": {
                         "service-instance-id": "service-instance-id",
-                        "vnf-id": "vnf-id",
-                        "vf-module-id": "vf-module.vf-module-id"
+                        "vnf-id": "vnf-id"
                     },
                     "output-key-mapping": {
-                        "vf-module-id": "vf-module-id"
+                        "vf-module-name": "value"
                     },
                     "key-dependencies": [
                         "service-instance-id",
                         "vnf-id",
-                        "vf-module.vf-module-id"
+                        "vf_module_id"
+                    ]
+                }
+            },
+            "rest": {
+                "type": "source-rest",
+                "properties": {
+                    "endpoint-selector": "naming-resolution",
+                    "verb": "POST",
+                    "type": "JSON",
+                    "headers": {
+                        "Accept": "application/json",
+                        "Content-Type": "application/json"
+                    },
+                    "url-path": "/v1/genNetworkElementName",
+                    "payload": "{\r\n  \"elements\": [\r\n    {\r\n      \"resource-name\": \"vf-module-name\",\r\n      \"resource-value\": \"${vf-module-name}\",\r\n      \"external-key\": \"${vf-module-id}\",\r\n      \"policy-instance-name\": \"${vf-naming-policy}\",\r\n      \"naming-type\": \"VF-MODULE\",\r\n      \"VNF_NAME\": \"${vnf_name}\",\r\n      \"VF_MODULE_LABEL\":\"${vf-module-label}\",\r\n      \"VF_MODULE_TYPE\":\"vfmt\"\r\n    }\r\n  ]\r\n}",
+                    "path": "/elements/0/resource-value",
+                    "input-key-mapping": {
+                        "vf-naming-policy": "vf-naming-policy",
+                        "vnf_name": "vnf_name",
+                        "vf-module-label": "vf-module-label",
+                        "vf-module-id": "vf-module-id"
+                    },
+                    "output-key-mapping": {
+                        "vf-module-name": "resource-value"
+                    },
+                    "key-dependencies": [
+                        "vf-naming-policy",
+                        "vnf_name",
+                        "vf-module-label",
+                        "vf-module-id"
                     ]
                 }
             }
         }
     },
-    "vf-module-label": {
-        "tags": "vf-module-label",
-        "name": "vf-module-label",
+    "vf-module-type": {
+        "tags": "vf-module-type",
+        "name": "vf-module-type",
         "property": {
-            "description": "vf-module-label",
+            "description": "vf-module-type",
             "type": "string"
         },
         "group": "default",
@@ -726,13 +912,13 @@
                 "type": "source-db",
                 "properties": {
                     "type": "SQL",
-                    "query": "select sdnctl.VF_MODULE_MODEL.vf_module_label as vf_module_label from sdnctl.VF_MODULE_MODEL where sdnctl.VF_MODULE_MODEL.customization_uuid=:customizationid",
+                    "query": "select vf_module_type as vf_module_type from sdnctl.VF_MODULE_MODEL where customization_uuid=:customizationid",
+                    "output-key-mapping": {
+                        "vf-module-type": "vf_module_type"
+                    },
                     "input-key-mapping": {
                         "customizationid": "vf-module-model-customization-uuid"
                     },
-                    "output-key-mapping": {
-                        "vf-module-label": "vf_module_label"
-                    },
                     "key-dependencies": [
                         "vf-module-model-customization-uuid"
                     ]
@@ -740,185 +926,277 @@
             }
         }
     },
+    "vf-module-label": {
+        "group": "default",
+        "name": "vf-module-label",
+        "property": {
+            "description": "vf-module-label",
+            "type": "string"
+        },
+        "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
+            "input": {
+                "type": "source-input"
+            },
+            "processor-db": {
+                "properties": {
+                    "input-key-mapping": {
+                        "customizationid": "vf-module-model-customization-uuid"
+                    },
+                    "key-dependencies": [
+                        "vf-module-model-customization-uuid"
+                    ],
+                    "output-key-mapping": {
+                        "vf-module-label": "vf_module_label"
+                    },
+                    "query": "select sdnctl.VF_MODULE_MODEL.vf_module_label as vf_module_label from sdnctl.VF_MODULE_MODEL where sdnctl.VF_MODULE_MODEL.customization_uuid=:customizationid",
+                    "type": "SQL"
+                },
+                "type": "source-db"
+            }
+        },
+        "tags": "vf-module-label",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>"
+    },
     "vf-module-model-customization-uuid": {
-        "tags": "vf-module-model-customization-uuid",
+        "group": "default",
         "name": "vf-module-model-customization-uuid",
         "property": {
             "description": "vf-module-model-customization-uuid",
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
-            },
-            "default": {
-                "type": "source-default",
-                "properties": {}
             }
-        }
+        },
+        "tags": "vf-module-model-customization-uuid",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>"
     },
     "vf-module-model-invariant-uuid": {
-        "tags": "vnf, vf-module",
+        "group": "default",
         "name": "vf-module-model-invariant-uuid",
         "property": {
             "description": "vf module model invariant uuid",
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "Samuli, Silvius <s.silvius@partner.samsung.com>",
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
             },
-            "default": {
-                "type": "source-default",
-                "properties": {}
-            },
             "processor-db": {
-                "type": "source-db",
                 "properties": {
-                    "type": "SQL",
-                    "query": "select sdnctl.VF_MODULE_MODEL.invariant_uuid as vf_module_model_invariant_uuid from sdnctl.VF_MODULE_MODEL where sdnctl.VF_MODULE_MODEL.customization_uuid=:customizationid",
                     "input-key-mapping": {
                         "customizationid": "vf-module-model-customization-uuid"
                     },
+                    "key-dependencies": [
+                        "vf-module-model-customization-uuid"
+                    ],
                     "output-key-mapping": {
                         "vf-module-model-invariant-uuid": "vf_module_model_invariant_uuid"
                     },
-                    "key-dependencies": [
-                        "vf-module-model-customization-uuid"
-                    ]
-                }
+                    "query": "select sdnctl.VF_MODULE_MODEL.invariant_uuid as vf_module_model_invariant_uuid from sdnctl.VF_MODULE_MODEL where sdnctl.VF_MODULE_MODEL.customization_uuid=:customizationid",
+                    "type": "SQL"
+                },
+                "type": "source-db"
             }
-        }
+        },
+        "tags": "vnf, vf-module",
+        "updated-by": "Samuli, Silvius <s.silvius@partner.samsung.com>"
     },
     "vf-module-model-version": {
-        "tags": "vnf, vf-module",
+        "group": "default",
         "name": "vf-module-model-version",
         "property": {
             "description": "vf module model model version",
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "Samuli, Silvius <s.silvius@partner.samsung.com>",
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
             },
-            "default": {
-                "type": "source-default",
-                "properties": {}
-            },
             "processor-db": {
-                "type": "source-db",
                 "properties": {
-                    "type": "SQL",
-                    "query": "select sdnctl.VF_MODULE_MODEL.uuid as vf_module_model_version from sdnctl.VF_MODULE_MODEL where sdnctl.VF_MODULE_MODEL.customization_uuid=:customizationid",
                     "input-key-mapping": {
                         "customizationid": "vf-module-model-customization-uuid"
                     },
+                    "key-dependencies": [
+                        "vf-module-model-customization-uuid"
+                    ],
                     "output-key-mapping": {
                         "vf-module-model-version": "vf_module_model_version"
                     },
-                    "key-dependencies": [
-                        "vf-module-model-customization-uuid"
-                    ]
-                }
+                    "query": "select sdnctl.VF_MODULE_MODEL.uuid as vf_module_model_version from sdnctl.VF_MODULE_MODEL where sdnctl.VF_MODULE_MODEL.customization_uuid=:customizationid",
+                    "type": "SQL"
+                },
+                "type": "source-db"
             }
-        }
+        },
+        "tags": "vnf, vf-module",
+        "updated-by": "Samuli, Silvius <s.silvius@partner.samsung.com>"
     },
-    "vf-naming-policy": {
-        "tags": "vf-naming-policy",
-        "name": "vf-naming-policy",
+    "vf-modules-list": {
+        "group": "default",
+        "name": "vf-modules-list",
         "property": {
-            "description": "vf-naming-policy",
-            "type": "string"
+            "description": "List of vf-modules associated with vnf",
+            "type": "json"
         },
-        "group": "default",
-        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
         "sources": {
+            "aai-data": {
+                "properties": {
+                    "input-key-mapping": {
+                        "vnf-id": "vnf-id"
+                    },
+                    "key-dependencies": [
+                        "vnf-id"
+                    ],
+                    "output-key-mapping": {
+                        "vf-modules": "vf-module"
+                    },
+                    "path": "/vf-modules",
+                    "type": "JSON",
+                    "url-path": "/aai/v19/network/generic-vnfs/generic-vnf/${vnf-id}?depth=1",
+                    "verb": "GET"
+                },
+                "type": "source-rest"
+            },
             "default": {
-                "type": "source-default",
-                "properties": {}
+                "properties": {},
+                "type": "source-default"
+            },
+            "input": {
+                "type": "source-input"
             },
             "sdnc": {
-                "type": "source-rest",
                 "properties": {
-                    "verb": "GET",
-                    "type": "JSON",
-                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vf-naming-policy",
-                    "path": "/param/0/value",
                     "input-key-mapping": {
                         "service-instance-id": "service-instance-id",
                         "vnf-id": "vnf-id"
                     },
-                    "output-key-mapping": {
-                        "vf-naming-policy": "value"
-                    },
                     "key-dependencies": [
                         "service-instance-id",
                         "vnf-id"
-                    ]
-                }
+                    ],
+                    "output-key-mapping": {
+                        "vf-modules": "vf-module"
+                    },
+                    "path": "/vf-modules",
+                    "type": "JSON",
+                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vf-modules",
+                    "verb": "GET"
+                },
+                "type": "source-rest"
+            }
+        },
+        "tags": "vf-modules-list",
+        "updated-by": "Lukasz Rajewski <lukasz.rajewski@orange.com>"
+    },
+    "vf-naming-policy": {
+        "group": "default",
+        "name": "vf-naming-policy",
+        "property": {
+            "description": "vf-naming-policy",
+            "type": "string"
+        },
+        "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
             },
             "processor-db": {
-                "type": "source-db",
                 "properties": {
-                    "type": "SQL",
-                    "query": "select sdnctl.VF_MODEL.naming_policy as vf_naming_policy from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:vnf_model_customization_uuid",
                     "input-key-mapping": {
                         "vnf_model_customization_uuid": "vnf-model-customization-uuid"
                     },
+                    "key-dependencies": [
+                        "vnf-model-customization-uuid"
+                    ],
                     "output-key-mapping": {
                         "vf-naming-policy": "vf_naming_policy"
                     },
+                    "query": "select sdnctl.VF_MODEL.naming_policy as vf_naming_policy from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:vnf_model_customization_uuid",
+                    "type": "SQL"
+                },
+                "type": "source-db"
+            },
+            "sdnc": {
+                "properties": {
+                    "input-key-mapping": {
+                        "service-instance-id": "service-instance-id",
+                        "vnf-id": "vnf-id"
+                    },
                     "key-dependencies": [
-                        "vnf-model-customization-uuid"
-                    ]
-                }
+                        "service-instance-id",
+                        "vnf-id"
+                    ],
+                    "output-key-mapping": {
+                        "vf-naming-policy": "value"
+                    },
+                    "path": "/param/0/value",
+                    "type": "JSON",
+                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vf-naming-policy",
+                    "verb": "GET"
+                },
+                "type": "source-rest"
             }
-        }
+        },
+        "tags": "vf-naming-policy",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>"
     },
     "vnf-id": {
-        "tags": "vnf-id",
+        "group": "default",
         "name": "vnf-id",
         "property": {
             "description": "vnf-id",
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
             },
-            "default": {
-                "type": "source-default",
-                "properties": {}
-            },
             "sdnc": {
-                "type": "source-rest",
                 "properties": {
-                    "verb": "GET",
-                    "type": "JSON",
-                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/",
-                    "path": "/vnf/0/vnf-id",
                     "input-key-mapping": {
                         "service-instance-id": "service-instance-id",
                         "vnf-id": "generic-vnf.vnf-id"
                     },
-                    "output-key-mapping": {
-                        "vnf-id": "vnf-id"
-                    },
                     "key-dependencies": [
                         "service-instance-id",
                         "generic-vnf.vnf-id"
-                    ]
-                }
+                    ],
+                    "output-key-mapping": {
+                        "vnf-id": "vnf-id"
+                    },
+                    "path": "/vnf/0/vnf-id",
+                    "type": "JSON",
+                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/",
+                    "verb": "GET"
+                },
+                "type": "source-rest"
             }
-        }
+        },
+        "tags": "vnf-id",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>"
     },
     "vnf_name": {
         "tags": "vnf_name",
@@ -944,6 +1222,10 @@
                     "type": "JSON",
                     "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vnf_name",
                     "path": "/param/0/value",
+                    "headers": {
+                        "Accept": "application/json",
+                        "Content-Type": "application/json"
+                    },
                     "input-key-mapping": {
                         "service-instance-id": "service-instance-id",
                         "vnf-id": "vnf-id"
@@ -956,142 +1238,93 @@
                         "vnf-id"
                     ]
                 }
+            },
+            "rest": {
+                "type": "source-rest",
+                "properties": {
+                    "endpoint-selector": "naming-resolution",
+                    "verb": "POST",
+                    "type": "JSON",
+                    "headers": {
+                        "Accept": "application/json",
+                        "Content-Type": "application/json"
+                    },
+                    "url-path": "/v1/genNetworkElementName",
+                    "payload": "{\r\n  \"elements\": [\r\n    {\r\n      \"resource-name\": \"vnf_name\",\r\n      \"resource-value\": \"${vnf_name}\",\r\n      \"external-key\": \"${vnf-id}\",\r\n      \"policy-instance-name\": \"${vf-naming-policy}\",\r\n      \"naming-type\": \"VNF\",\r\n      \"AIC_CLOUD_REGION\": \"${aic-cloud-region}\"\r\n    }\r\n  ]\r\n}",
+                    "path": "/elements/0/resource-value",
+                    "input-key-mapping": {
+                        "vnf-id": "vnf-id",
+                        "aic-cloud-region": "aic-cloud-region",
+                        "vf-naming-policy": "vf-naming-policy"
+                    },
+                    "output-key-mapping": {
+                        "vnf_name": "resource-value"
+                    },
+                    "key-dependencies": [
+                        "vnf-id",
+                        "aic-cloud-region",
+                        "vf-naming-policy"
+                    ]
+                }
             }
         }
     },
     "vpg-management-port": {
-        "tags": "vpg-management-port",
+        "group": "default",
         "name": "vpg-management-port",
         "property": {
             "description": "vpg-management-port",
             "type": "integer"
         },
-        "group": "default",
-        "updated-by": "Rajewski, Lukasz <lukasz.rajewski@orange.com>",
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
-            },
-            "default": {
-                "type": "source-default",
-                "properties": {}
             }
-        }
+        },
+        "tags": "vpg-management-port",
+        "updated-by": "Rajewski, Lukasz <lukasz.rajewski@orange.com>"
     },
     "vpg_onap_private_ip_0": {
-        "tags": "vpg_onap_private_ip_0",
+        "group": "default",
         "name": "vpg_onap_private_ip_0",
         "property": {
             "description": "vpg_onap_private_ip_0",
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "Singal, Kapil <ks220y@att.com>",
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
             },
-            "default": {
-                "type": "source-default",
-                "properties": {}
-            },
             "sdnc": {
-                "type": "source-rest",
                 "properties": {
-                    "verb": "GET",
-                    "type": "JSON",
-                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vpg_onap_private_ip_0",
-                    "path": "/param/0/value",
                     "input-key-mapping": {
                         "service-instance-id": "service-instance-id",
                         "vnf-id": "vnf-id"
                     },
-                    "output-key-mapping": {
-                        "vpg_onap_private_ip_0": "value"
-                    },
                     "key-dependencies": [
                         "service-instance-id",
                         "vnf-id"
-                    ]
-                }
-            }
-        }
-    },
-    "vf-modules-list": {
-        "tags": "vf-modules-list",
-        "name": "vf-modules-list",
-        "property": {
-            "description": "List of vf-modules associated with vnf",
-            "type": "json"
-        },
-        "group": "default",
-        "updated-by": "Lukasz Rajewski <lukasz.rajewski@orange.com>",
-        "sources": {
-            "input": {
-                "type": "source-input"
-            },
-            "default": {
-                "type": "source-default",
-                "properties": {}
-            },
-            "aai-data": {
-                "type": "source-rest",
-                "properties": {
-                    "verb": "GET",
-                    "type": "JSON",
-                    "url-path": "/aai/v19/network/generic-vnfs/generic-vnf/${vnf-id}?depth=1",
-                    "path": "/vf-modules",
-                    "input-key-mapping": {
-                        "vnf-id": "vnf-id"
-                    },
+                    ],
                     "output-key-mapping": {
-                        "vf-modules": "vf-module"
+                        "vpg_onap_private_ip_0": "value"
                     },
-                    "key-dependencies": [
-                        "vnf-id"
-                    ]
-                }
-            },
-            "sdnc": {
-                "type": "source-rest",
-                "properties": {
-                    "verb": "GET",
+                    "path": "/param/0/value",
                     "type": "JSON",
-                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vf-modules",
-                    "path": "/vf-modules",
-                    "input-key-mapping": {
-                        "service-instance-id": "service-instance-id",
-                        "vnf-id": "vnf-id"
-                    },
-                    "output-key-mapping": {
-                        "vf-modules": "vf-module"
-                    },
-                    "key-dependencies": [
-                        "service-instance-id",
-                        "vnf-id"
-                    ]
-                }
+                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vpg_onap_private_ip_0",
+                    "verb": "GET"
+                },
+                "type": "source-rest"
             }
-        }
-    },
-    "config-deploy-setup": {
-        "tags": "config-deploy-setup",
-        "name": "config-deploy-setup",
-        "property": {
-            "description": "Configuration Input setup for config-deploy operation",
-            "type": "json"
         },
-        "group": "default",
-        "updated-by": "Lukasz Rajewski <lukasz.rajewski@orange.com>",
-        "sources": {
-            "capability": {
-                "type": "source-capability",
-                "properties": {
-                    "script-type": "kotlin",
-                    "script-class-reference": "org.onap.ccsdk.cds.blueprintsprocessor.services.execution.scripts.ConfigDeploySetup",
-                    "instance-dependencies": []
-                }
-            }
-        }
+        "tags": "vpg_onap_private_ip_0",
+        "updated-by": "Singal, Kapil <ks220y@att.com>"
     }
 }