Simplify CBA by removing unnecessary variables

Change scope:
- demo_artifacts_version - default on vnf level, removed vf-module level
- install_script_version - removed
- *image_name - removed
- public_net_id - removed
- key_name - removed
- pub_key - removed
- *flavor_name - removed
- sec_group - removed
- nfc-naming-code - removed
- cloud_env - removed
- nexus_artifact_repo - removed
- *cidr - removed, where applicable
- *ip - removed, where applicable
- dcae* - moved to vnf level
- aic-cloud-region - removed on vf-module level
- vnf_name - removed on base-template level
- vf-module-type - removed
- vnfc-model-version - removed
- vnfc-model-invariant-uuid - removed
- vfccustomizationuuid - removed
- vf-module-id - removed from template result
- service-instance-id - removed from template result
- vnf_name - removed and vf-module level
- vf-module-model-customization-uuid - removed from template result
- vf-module-model-version - removed from template result
- vf-module-model-invariant-uuid - removed from template result
- vnf-model-customization-uuid - removed at vf-module-level
and few other minor tweaks including updating dataDict and enrichment

Issue-ID: INT-1260
Signed-off-by: Konrad Bańka <k.banka@samsung.com>
Change-Id: Ica6073d0270da9d5ff0f0e544a9b329f66d9b5bb

1 files changed, 8 insertions, 1451 deletions

diff --git a/heat/vFW_CNF_CDS/templates/cba-dd.json b/heat/vFW_CNF_CDS/templates/cba-dd.json
index 12644d4c..4afa6a42 100644
--- a/heat/vFW_CNF_CDS/templates/cba-dd.json
+++ b/heat/vFW_CNF_CDS/templates/cba-dd.json
@@ -51,53 +51,6 @@
         }
     },
     {
-        "name": "cloud_env",
-        "tags": "cloud_env",
-        "data_type": "string",
-        "description": "cloud_env",
-        "entry_schema": "string",
-        "updatedBy": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-        "definition": {
-            "tags": "cloud_env",
-            "name": "cloud_env",
-            "property": {
-                "description": "cloud_env",
-                "type": "string"
-            },
-            "group": "default",
-            "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-            "sources": {
-                "input": {
-                    "type": "source-input"
-                },
-                "default": {
-                    "type": "source-default",
-                    "properties": {}
-                },
-                "sdnc": {
-                    "type": "source-rest",
-                    "properties": {
-                        "verb": "GET",
-                        "type": "JSON",
-                        "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/cloud_env",
-                        "path": "/param/0/value",
-                        "input-key-mapping": {
-                            "service-instance-id": "service-instance-id",
-                            "vnf-id": "vnf-id"
-                        },
-                        "output-key-mapping": {
-                            "cloud_env": "value"
-                        },
-                        "key-dependencies": [
-                            "service-instance-id",
-                            "vnf-id"
-                        ]
-                    }
-                }
-            }
-        }
-    },
-    {
         "name": "dcae_collector_ip",
         "tags": "dcae_collector_ip",
         "data_type": "string",
@@ -239,194 +192,6 @@
         }
     },
     {
-        "name": "flavor_name",
-        "tags": "flavor_name",
-        "data_type": "string",
-        "description": "flavor_name",
-        "entry_schema": "string",
-        "updatedBy": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-        "definition": {
-            "tags": "flavor_name",
-            "name": "flavor_name",
-            "property": {
-                "description": "flavor_name",
-                "type": "string"
-            },
-            "group": "default",
-            "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-            "sources": {
-                "input": {
-                    "type": "source-input"
-                },
-                "default": {
-                    "type": "source-default",
-                    "properties": {}
-                },
-                "sdnc": {
-                    "type": "source-rest",
-                    "properties": {
-                        "verb": "GET",
-                        "type": "JSON",
-                        "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/flavor_name",
-                        "path": "/param/0/value",
-                        "input-key-mapping": {
-                            "service-instance-id": "service-instance-id",
-                            "vnf-id": "vnf-id"
-                        },
-                        "output-key-mapping": {
-                            "flavor_name": "value"
-                        },
-                        "key-dependencies": [
-                            "service-instance-id",
-                            "vnf-id"
-                        ]
-                    }
-                }
-            }
-        }
-    },
-    {
-        "name": "image_name",
-        "tags": "image_name",
-        "data_type": "string",
-        "description": "image_name",
-        "entry_schema": "string",
-        "updatedBy": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-        "definition": {
-            "tags": "image_name",
-            "name": "image_name",
-            "property": {
-                "description": "image_name",
-                "type": "string"
-            },
-            "group": "default",
-            "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-            "sources": {
-                "input": {
-                    "type": "source-input"
-                },
-                "default": {
-                    "type": "source-default",
-                    "properties": {}
-                },
-                "sdnc": {
-                    "type": "source-rest",
-                    "properties": {
-                        "verb": "GET",
-                        "type": "JSON",
-                        "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/image_name",
-                        "path": "/param/0/value",
-                        "input-key-mapping": {
-                            "service-instance-id": "service-instance-id",
-                            "vnf-id": "vnf-id"
-                        },
-                        "output-key-mapping": {
-                            "image_name": "value"
-                        },
-                        "key-dependencies": [
-                            "service-instance-id",
-                            "vnf-id"
-                        ]
-                    }
-                }
-            }
-        }
-    },
-    {
-        "name": "install_script_version",
-        "tags": "install_script_version",
-        "data_type": "string",
-        "description": "install_script_version",
-        "entry_schema": "string",
-        "updatedBy": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-        "definition": {
-            "tags": "install_script_version",
-            "name": "install_script_version",
-            "property": {
-                "description": "install_script_version",
-                "type": "string"
-            },
-            "group": "default",
-            "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-            "sources": {
-                "input": {
-                    "type": "source-input"
-                },
-                "default": {
-                    "type": "source-default",
-                    "properties": {}
-                },
-                "sdnc": {
-                    "type": "source-rest",
-                    "properties": {
-                        "verb": "GET",
-                        "type": "JSON",
-                        "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/install_script_version",
-                        "path": "/param/0/value",
-                        "input-key-mapping": {
-                            "service-instance-id": "service-instance-id",
-                            "vnf-id": "vnf-id"
-                        },
-                        "output-key-mapping": {
-                            "install_script_version": "value"
-                        },
-                        "key-dependencies": [
-                            "service-instance-id",
-                            "vnf-id"
-                        ]
-                    }
-                }
-            }
-        }
-    },
-    {
-        "name": "int_private1_gw_ip",
-        "tags": "k8s, cnf, int_private1_gw_ip",
-        "data_type": "string",
-        "description": "Private unprotected network gateway ip address",
-        "entry_schema": "string",
-        "updatedBy": "Samuli, Silvius <s.silvius@partner.samsung.com>",
-        "definition": {
-            "tags": "k8s, cnf, int_private1_gw_ip",
-            "name": "int_private1_gw_ip",
-            "property": {
-                "description": "Private unprotected network gateway ip address",
-                "type": "string"
-            },
-            "group": "default",
-            "updated-by": "Samuli, Silvius <s.silvius@partner.samsung.com>",
-            "sources": {
-                "input": {
-                    "type": "source-input"
-                },
-                "default": {
-                    "type": "source-default",
-                    "properties": {}
-                },
-                "sdnc": {
-                    "type": "source-rest",
-                    "properties": {
-                        "verb": "GET",
-                        "type": "JSON",
-                        "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/int_private1_gw_ip",
-                        "path": "/param/0/value",
-                        "input-key-mapping": {
-                            "service-instance-id": "service-instance-id",
-                            "vnf-id": "vnf-id"
-                        },
-                        "output-key-mapping": {
-                            "int_private1_gw_ip": "value"
-                        },
-                        "key-dependencies": [
-                            "service-instance-id",
-                            "vnf-id"
-                        ]
-                    }
-                }
-            }
-        }
-    },
-    {
         "name": "int_private1_net_cidr",
         "tags": "int_private1_net_cidr",
         "data_type": "string",
@@ -486,100 +251,6 @@
         }
     },
     {
-        "name": "int_private1_net_id",
-        "tags": "k8s, cnf, int_private1_net_id",
-        "data_type": "string",
-        "description": "Private network identification",
-        "entry_schema": "string",
-        "updatedBy": "Samuli, Silvius <s.silvius@partner.samsung.com>",
-        "definition": {
-            "tags": "k8s, cnf, int_private1_net_id",
-            "name": "int_private1_net_id",
-            "property": {
-                "description": "Private network identification",
-                "type": "string"
-            },
-            "group": "default",
-            "updated-by": "Samuli, Silvius <s.silvius@partner.samsung.com>",
-            "sources": {
-                "input": {
-                    "type": "source-input"
-                },
-                "default": {
-                    "type": "source-default",
-                    "properties": {}
-                },
-                "sdnc": {
-                    "type": "source-rest",
-                    "properties": {
-                        "verb": "GET",
-                        "type": "JSON",
-                        "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/int_private1_net_id",
-                        "path": "/param/0/value",
-                        "input-key-mapping": {
-                            "service-instance-id": "service-instance-id",
-                            "vnf-id": "vnf-id"
-                        },
-                        "output-key-mapping": {
-                            "int_private1_net_id": "value"
-                        },
-                        "key-dependencies": [
-                            "service-instance-id",
-                            "vnf-id"
-                        ]
-                    }
-                }
-            }
-        }
-    },
-    {
-        "name": "int_private2_gw_ip",
-        "tags": "k8s, cnf, int_private2_gw_ip",
-        "data_type": "string",
-        "description": "Private protected network gateway ip address",
-        "entry_schema": "string",
-        "updatedBy": "Samuli, Silvius <s.silvius@partner.samsung.com>",
-        "definition": {
-            "tags": "k8s, cnf, int_private2_gw_ip",
-            "name": "int_private2_gw_ip",
-            "property": {
-                "description": "Private protected network gateway ip address",
-                "type": "string"
-            },
-            "group": "default",
-            "updated-by": "Samuli, Silvius <s.silvius@partner.samsung.com>",
-            "sources": {
-                "input": {
-                    "type": "source-input"
-                },
-                "default": {
-                    "type": "source-default",
-                    "properties": {}
-                },
-                "sdnc": {
-                    "type": "source-rest",
-                    "properties": {
-                        "verb": "GET",
-                        "type": "JSON",
-                        "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/int_private2_gw_ip",
-                        "path": "/param/0/value",
-                        "input-key-mapping": {
-                            "service-instance-id": "service-instance-id",
-                            "vnf-id": "vnf-id"
-                        },
-                        "output-key-mapping": {
-                            "int_private2_gw_ip": "value"
-                        },
-                        "key-dependencies": [
-                            "service-instance-id",
-                            "vnf-id"
-                        ]
-                    }
-                }
-            }
-        }
-    },
-    {
         "name": "int_private2_net_cidr",
         "tags": "int_private2_net_cidr",
         "data_type": "string",
@@ -639,53 +310,6 @@
         }
     },
     {
-        "name": "int_private2_net_id",
-        "tags": "k8s, cnf, int_private2_net_id",
-        "data_type": "string",
-        "description": "Private protected network identification",
-        "entry_schema": "string",
-        "updatedBy": "Samuli, Silvius <s.silvius@partner.samsung.com>",
-        "definition": {
-            "tags": "k8s, cnf, int_private2_net_id",
-            "name": "int_private2_net_id",
-            "property": {
-                "description": "Private protected network identification",
-                "type": "string"
-            },
-            "group": "default",
-            "updated-by": "Samuli, Silvius <s.silvius@partner.samsung.com>",
-            "sources": {
-                "input": {
-                    "type": "source-input"
-                },
-                "default": {
-                    "type": "source-default",
-                    "properties": {}
-                },
-                "sdnc": {
-                    "type": "source-rest",
-                    "properties": {
-                        "verb": "GET",
-                        "type": "JSON",
-                        "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/int_private2_net_id",
-                        "path": "/param/0/value",
-                        "input-key-mapping": {
-                            "service-instance-id": "service-instance-id",
-                            "vnf-id": "vnf-id"
-                        },
-                        "output-key-mapping": {
-                            "int_private2_net_id": "value"
-                        },
-                        "key-dependencies": [
-                            "service-instance-id",
-                            "vnf-id"
-                        ]
-                    }
-                }
-            }
-        }
-    },
-    {
         "name": "k8s-rb-profile-name",
         "tags": "k8s, cnf, profile, k8s-rb-profile-name",
         "data_type": "string",
@@ -780,79 +404,6 @@
         }
     },
     {
-        "name": "vpg-management-port",
-        "tags": "vpg-management-port",
-        "data_type": "string",
-        "description": "vpg-management-port",
-        "entry_schema": "string",
-        "updatedBy": "Rajewski, Lukasz <lukasz.rajewski@orange.com>",
-        "definition": {
-            "tags": "vpg-management-port",
-            "name": "vpg-management-port",
-            "property": {
-                "description": "vpg-management-port",
-                "type": "string"
-            },
-            "updated-by": "Rajewski, Lukasz <lukasz.rajewski@orange.com>",
-            "sources": {
-                "input": {
-                    "type": "source-input"
-                },
-                "default": {
-                    "type": "source-default",
-                    "properties": {}
-                }
-            }
-        }
-    },
-    {
-        "name": "key_name",
-        "tags": "key_name",
-        "data_type": "string",
-        "description": "key_name",
-        "entry_schema": "string",
-        "updatedBy": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-        "definition": {
-            "tags": "key_name",
-            "name": "key_name",
-            "property": {
-                "description": "key_name",
-                "type": "string"
-            },
-            "group": "default",
-            "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-            "sources": {
-                "input": {
-                    "type": "source-input"
-                },
-                "default": {
-                    "type": "source-default",
-                    "properties": {}
-                },
-                "sdnc": {
-                    "type": "source-rest",
-                    "properties": {
-                        "verb": "GET",
-                        "type": "JSON",
-                        "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/key_name",
-                        "path": "/param/0/value",
-                        "input-key-mapping": {
-                            "service-instance-id": "service-instance-id",
-                            "vnf-id": "vnf-id"
-                        },
-                        "output-key-mapping": {
-                            "key_name": "value"
-                        },
-                        "key-dependencies": [
-                            "service-instance-id",
-                            "vnf-id"
-                        ]
-                    }
-                }
-            }
-        }
-    },
-    {
         "name": "management-prefix-id",
         "tags": "management-prefix-id",
         "data_type": "string",
@@ -912,144 +463,6 @@
         }
     },
     {
-        "name": "nexus_artifact_repo",
-        "tags": "nexus_artifact_repo",
-        "data_type": "string",
-        "description": "nexus_artifact_repo",
-        "entry_schema": "string",
-        "updatedBy": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-        "definition": {
-            "tags": "nexus_artifact_repo",
-            "name": "nexus_artifact_repo",
-            "property": {
-                "description": "nexus_artifact_repo",
-                "type": "string"
-            },
-            "group": "default",
-            "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-            "sources": {
-                "input": {
-                    "type": "source-input"
-                },
-                "default": {
-                    "type": "source-default",
-                    "properties": {}
-                },
-                "sdnc": {
-                    "type": "source-rest",
-                    "properties": {
-                        "verb": "GET",
-                        "type": "JSON",
-                        "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/nexus_artifact_repo",
-                        "path": "/param/0/value",
-                        "input-key-mapping": {
-                            "service-instance-id": "service-instance-id",
-                            "vnf-id": "vnf-id"
-                        },
-                        "output-key-mapping": {
-                            "nexus_artifact_repo": "value"
-                        },
-                        "key-dependencies": [
-                            "service-instance-id",
-                            "vnf-id"
-                        ]
-                    }
-                }
-            }
-        }
-    },
-    {
-        "name": "nfc-naming-code",
-        "tags": "nfc-naming-code",
-        "data_type": "string",
-        "description": "nfc-naming-code",
-        "entry_schema": "string",
-        "updatedBy": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-        "definition": {
-            "tags": "nfc-naming-code",
-            "name": "nfc-naming-code",
-            "property": {
-                "description": "nfc-naming-code",
-                "type": "string"
-            },
-            "group": "default",
-            "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-            "sources": {
-                "input": {
-                    "type": "source-input"
-                },
-                "default": {
-                    "type": "source-default",
-                    "properties": {}
-                },
-                "processor-db": {
-                    "type": "source-db",
-                    "properties": {
-                        "type": "SQL",
-                        "query": "select nfc_naming_code as nfc_naming_code from sdnctl.VFC_MODEL where customization_uuid=:vfccustomizationuuid",
-                        "input-key-mapping": {
-                            "vfccustomizationuuid": "vfccustomizationuuid"
-                        },
-                        "output-key-mapping": {
-                            "nfc-naming-code": "nfc_naming_code"
-                        },
-                        "key-dependencies": [
-                            "vfccustomizationuuid"
-                        ],
-                        "endpoint-selector": "dynamic-db-source"
-                    }
-                }
-            }
-        }
-    },
-    {
-        "name": "onap_private_gw_ip",
-        "tags": "k8s, cnf, onap_private_gw_ip",
-        "data_type": "string",
-        "description": "Private onap management network gateway ip address",
-        "entry_schema": "string",
-        "updatedBy": "Samuli, Silvius <s.silvius@partner.samsung.com>",
-        "definition": {
-            "tags": "k8s, cnf, onap_private_gw_ip",
-            "name": "onap_private_gw_ip",
-            "property": {
-                "description": "Private onap management network gateway ip address",
-                "type": "string"
-            },
-            "group": "default",
-            "updated-by": "Samuli, Silvius <s.silvius@partner.samsung.com>",
-            "sources": {
-                "input": {
-                    "type": "source-input"
-                },
-                "default": {
-                    "type": "source-default",
-                    "properties": {}
-                },
-                "sdnc": {
-                    "type": "source-rest",
-                    "properties": {
-                        "verb": "GET",
-                        "type": "JSON",
-                        "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/onap_private_gw_ip",
-                        "path": "/param/0/value",
-                        "input-key-mapping": {
-                            "service-instance-id": "service-instance-id",
-                            "vnf-id": "vnf-id"
-                        },
-                        "output-key-mapping": {
-                            "onap_private_gw_ip": "value"
-                        },
-                        "key-dependencies": [
-                            "service-instance-id",
-                            "vnf-id"
-                        ]
-                    }
-                }
-            }
-        }
-    },
-    {
         "name": "onap_private_net_cidr",
         "tags": "onap_private_net_cidr",
         "data_type": "string",
@@ -1109,53 +522,6 @@
         }
     },
     {
-        "name": "onap_private_net_id",
-        "tags": "onap_private_net_id",
-        "data_type": "string",
-        "description": "onap_private_net_id",
-        "entry_schema": "string",
-        "updatedBy": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-        "definition": {
-            "tags": "onap_private_net_id",
-            "name": "onap_private_net_id",
-            "property": {
-                "description": "onap_private_net_id",
-                "type": "string"
-            },
-            "group": "default",
-            "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-            "sources": {
-                "input": {
-                    "type": "source-input"
-                },
-                "default": {
-                    "type": "source-default",
-                    "properties": {}
-                },
-                "sdnc": {
-                    "type": "source-rest",
-                    "properties": {
-                        "verb": "GET",
-                        "type": "JSON",
-                        "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/onap_private_net_id",
-                        "path": "/param/0/value",
-                        "input-key-mapping": {
-                            "service-instance-id": "service-instance-id",
-                            "vnf-id": "vnf-id"
-                        },
-                        "output-key-mapping": {
-                            "onap_private_net_id": "value"
-                        },
-                        "key-dependencies": [
-                            "service-instance-id",
-                            "vnf-id"
-                        ]
-                    }
-                }
-            }
-        }
-    },
-    {
         "name": "private1-prefix-id",
         "tags": "private1-prefix-id",
         "data_type": "string",
@@ -1274,100 +640,6 @@
         }
     },
     {
-        "name": "pub_key",
-        "tags": "pub_key",
-        "data_type": "string",
-        "description": "pub_key",
-        "entry_schema": "string",
-        "updatedBy": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-        "definition": {
-            "tags": "pub_key",
-            "name": "pub_key",
-            "property": {
-                "description": "pub_key",
-                "type": "string"
-            },
-            "group": "default",
-            "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-            "sources": {
-                "input": {
-                    "type": "source-input"
-                },
-                "default": {
-                    "type": "source-default",
-                    "properties": {}
-                },
-                "sdnc": {
-                    "type": "source-rest",
-                    "properties": {
-                        "verb": "GET",
-                        "type": "JSON",
-                        "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/pub_key",
-                        "path": "/param/0/value",
-                        "input-key-mapping": {
-                            "service-instance-id": "service-instance-id",
-                            "vnf-id": "vnf-id"
-                        },
-                        "output-key-mapping": {
-                            "pub_key": "value"
-                        },
-                        "key-dependencies": [
-                            "service-instance-id",
-                            "vnf-id"
-                        ]
-                    }
-                }
-            }
-        }
-    },
-    {
-        "name": "public_net_id",
-        "tags": "public_net_id",
-        "data_type": "string",
-        "description": "public_net_id",
-        "entry_schema": "string",
-        "updatedBy": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-        "definition": {
-            "tags": "public_net_id",
-            "name": "public_net_id",
-            "property": {
-                "description": "public_net_id",
-                "type": "string"
-            },
-            "group": "default",
-            "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-            "sources": {
-                "input": {
-                    "type": "source-input"
-                },
-                "default": {
-                    "type": "source-default",
-                    "properties": {}
-                },
-                "sdnc": {
-                    "type": "source-rest",
-                    "properties": {
-                        "verb": "GET",
-                        "type": "JSON",
-                        "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/public_net_id",
-                        "path": "/param/0/value",
-                        "input-key-mapping": {
-                            "service-instance-id": "service-instance-id",
-                            "vnf-id": "vnf-id"
-                        },
-                        "output-key-mapping": {
-                            "public_net_id": "value"
-                        },
-                        "key-dependencies": [
-                            "service-instance-id",
-                            "vnf-id"
-                        ]
-                    }
-                }
-            }
-        }
-    },
-    {
         "name": "put-active-streams",
         "tags": "put-active-streams",
         "data_type": "string",
@@ -1415,53 +687,6 @@
         }
     },
     {
-        "name": "sec_group",
-        "tags": "sec_group",
-        "data_type": "string",
-        "description": "sec_group",
-        "entry_schema": "string",
-        "updatedBy": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-        "definition": {
-            "tags": "sec_group",
-            "name": "sec_group",
-            "property": {
-                "description": "sec_group",
-                "type": "string"
-            },
-            "group": "default",
-            "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-            "sources": {
-                "input": {
-                    "type": "source-input"
-                },
-                "default": {
-                    "type": "source-default",
-                    "properties": {}
-                },
-                "sdnc": {
-                    "type": "source-rest",
-                    "properties": {
-                        "verb": "GET",
-                        "type": "JSON",
-                        "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/sec_group",
-                        "path": "/param/0/value",
-                        "input-key-mapping": {
-                            "service-instance-id": "service-instance-id",
-                            "vnf-id": "vnf-id"
-                        },
-                        "output-key-mapping": {
-                            "sec_group": "value"
-                        },
-                        "key-dependencies": [
-                            "service-instance-id",
-                            "vnf-id"
-                        ]
-                    }
-                }
-            }
-        }
-    },
-    {
         "name": "service-instance-id",
         "tags": "service-instance-id, tosca.datatypes.Root, data_type",
         "data_type": "string",
@@ -1737,77 +962,6 @@
         }
     },
     {
-        "name": "vf-module-name",
-        "tags": "vf-module-name",
-        "data_type": "string",
-        "description": "vf_module_name",
-        "entry_schema": "string",
-        "updatedBy": "Singal, Kapil <ks220y@att.com>",
-        "definition": {
-            "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"
-                },
-                "default": {
-                    "type": "source-default",
-                    "properties": {}
-                }
-            }
-        }
-    },
-    {
-        "name": "vf-module-type",
-        "tags": "vf-module-type",
-        "data_type": "string",
-        "description": "vf-module-type",
-        "entry_schema": "string",
-        "updatedBy": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-        "definition": {
-            "tags": "vf-module-type",
-            "name": "vf-module-type",
-            "property": {
-                "description": "vf-module-type",
-                "type": "string"
-            },
-            "group": "default",
-            "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-            "sources": {
-                "input": {
-                    "type": "source-input"
-                },
-                "default": {
-                    "type": "source-default",
-                    "properties": {}
-                },
-                "processor-db": {
-                    "type": "source-db",
-                    "properties": {
-                        "type": "SQL",
-                        "query": "select sdnctl.VF_MODULE_MODEL.vf_module_type as vf_module_type from sdnctl.VF_MODULE_MODEL where sdnctl.VF_MODULE_MODEL.customization_uuid=:customizationid",
-                        "output-key-mapping": {
-                            "vf-module-type": "vf_module_type"
-                        },
-                        "input-key-mapping": {
-                            "customizationid": "vf-module-model-customization-uuid"
-                        },
-                        "key-dependencies": [
-                            "vf-module-model-customization-uuid"
-                        ],
-                        "endpoint-selector": "dynamic-db-source"
-                    }
-                }
-            }
-        }
-    },
-    {
         "name": "vf-naming-policy",
         "tags": "vf-naming-policy",
         "data_type": "string",
@@ -1868,285 +1022,6 @@
         }
     },
     {
-        "name": "vfccustomizationuuid",
-        "tags": "vfccustomizationuuid",
-        "data_type": "string",
-        "description": "vfccustomizationuuid",
-        "entry_schema": "string",
-        "updatedBy": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-        "definition": {
-            "tags": "vfccustomizationuuid",
-            "name": "vfccustomizationuuid",
-            "property": {
-                "description": "vfccustomizationuuid",
-                "type": "string"
-            },
-            "group": "default",
-            "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-            "sources": {
-                "input": {
-                    "type": "source-input"
-                },
-                "default": {
-                    "type": "source-default",
-                    "properties": {}
-                },
-                "processor-db": {
-                    "type": "source-db",
-                    "properties": {
-                        "type": "SQL",
-                        "query": "select sdnctl.VF_MODULE_TO_VFC_MAPPING.vfc_customization_uuid as vnf_customid from sdnctl.VF_MODULE_TO_VFC_MAPPING where vm_count = 1 and sdnctl.VF_MODULE_TO_VFC_MAPPING.vf_module_customization_uuid=:vfmodulecustomizationuuid",
-                        "input-key-mapping": {
-                            "vfmodulecustomizationuuid": "vf-module-model-customization-uuid"
-                        },
-                        "output-key-mapping": {
-                            "vfccustomizationuuid": "vnf_customid"
-                        },
-                        "key-dependencies": [
-                            "vf-module-model-customization-uuid"
-                        ],
-                        "endpoint-selector": "dynamic-db-source"
-                    }
-                }
-            }
-        }
-    },
-    {
-        "name": "vfw_int_private1_ip_0",
-        "tags": "vfw_int_private1_ip_0",
-        "data_type": "string",
-        "description": "vfw_int_private1_ip_0",
-        "entry_schema": "string",
-        "updatedBy": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-        "definition": {
-            "tags": "vfw_int_private1_ip_0",
-            "name": "vfw_int_private1_ip_0",
-            "property": {
-                "description": "vfw_int_private1_ip_0",
-                "type": "string"
-            },
-            "group": "default",
-            "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-            "sources": {
-                "input": {
-                    "type": "source-input"
-                },
-                "default": {
-                    "type": "source-default",
-                    "properties": {}
-                },
-                "sdnc": {
-                    "type": "source-rest",
-                    "properties": {
-                        "verb": "GET",
-                        "type": "JSON",
-                        "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vfw_int_private1_ip_0",
-                        "path": "/param/0/value",
-                        "input-key-mapping": {
-                            "service-instance-id": "service-instance-id",
-                            "vnf-id": "vnf-id"
-                        },
-                        "output-key-mapping": {
-                            "vfw_int_private1_ip_0": "value"
-                        },
-                        "key-dependencies": [
-                            "service-instance-id",
-                            "vnf-id"
-                        ]
-                    }
-                }
-            }
-        }
-    },
-    {
-        "name": "vfw_int_private2_floating_ip",
-        "tags": "vfw_int_private2_floating_ip",
-        "data_type": "string",
-        "description": "vfw_int_private2_floating_ip",
-        "entry_schema": "string",
-        "updatedBy": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-        "definition": {
-            "tags": "vfw_int_private2_floating_ip",
-            "name": "vfw_int_private2_floating_ip",
-            "property": {
-                "description": "vfw_int_private2_floating_ip",
-                "type": "string"
-            },
-            "group": "default",
-            "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-            "sources": {
-                "input": {
-                    "type": "source-input"
-                },
-                "default": {
-                    "type": "source-default",
-                    "properties": {}
-                },
-                "sdnc": {
-                    "type": "source-rest",
-                    "properties": {
-                        "verb": "GET",
-                        "type": "JSON",
-                        "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vfw_int_private2_floating_ip",
-                        "path": "/param/0/value",
-                        "input-key-mapping": {
-                            "service-instance-id": "service-instance-id",
-                            "vnf-id": "vnf-id"
-                        },
-                        "output-key-mapping": {
-                            "vfw_int_private2_floating_ip": "value"
-                        },
-                        "key-dependencies": [
-                            "service-instance-id",
-                            "vnf-id"
-                        ]
-                    }
-                }
-            }
-        }
-    },
-    {
-        "name": "vfw_int_private2_ip_0",
-        "tags": "vfw_int_private2_ip_0",
-        "data_type": "string",
-        "description": "vfw_int_private2_ip_0",
-        "entry_schema": "string",
-        "updatedBy": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-        "definition": {
-            "tags": "vfw_int_private2_ip_0",
-            "name": "vfw_int_private2_ip_0",
-            "property": {
-                "description": "vfw_int_private2_ip_0",
-                "type": "string"
-            },
-            "group": "default",
-            "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-            "sources": {
-                "input": {
-                    "type": "source-input"
-                },
-                "default": {
-                    "type": "source-default",
-                    "properties": {}
-                },
-                "sdnc": {
-                    "type": "source-rest",
-                    "properties": {
-                        "verb": "GET",
-                        "type": "JSON",
-                        "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vfw_int_private2_ip_0",
-                        "path": "/param/0/value",
-                        "input-key-mapping": {
-                            "service-instance-id": "service-instance-id",
-                            "vnf-id": "vnf-id"
-                        },
-                        "output-key-mapping": {
-                            "vfw_int_private2_ip_0": "value"
-                        },
-                        "key-dependencies": [
-                            "service-instance-id",
-                            "vnf-id"
-                        ]
-                    }
-                }
-            }
-        }
-    },
-    {
-        "name": "vfw_name_0",
-        "tags": "vfw_name_0",
-        "data_type": "string",
-        "description": "vfw_name_0",
-        "entry_schema": "string",
-        "updatedBy": "Singal, Kapil <ks220y@att.com>",
-        "definition": {
-            "tags": "vfw_name_0",
-            "name": "vfw_name_0",
-            "property": {
-                "description": "vfw_name_0",
-                "type": "string"
-            },
-            "group": "default",
-            "updated-by": "Singal, Kapil <ks220y@att.com>",
-            "sources": {
-                "input": {
-                    "type": "source-input"
-                },
-                "default": {
-                    "type": "source-default",
-                    "properties": {}
-                },
-                "sdnc": {
-                    "type": "source-rest",
-                    "properties": {
-                        "verb": "GET",
-                        "type": "JSON",
-                        "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vfw_name_0",
-                        "path": "/param/0/value",
-                        "input-key-mapping": {
-                            "service-instance-id": "service-instance-id",
-                            "vnf-id": "vnf-id"
-                        },
-                        "output-key-mapping": {
-                            "vfw_name_0": "value"
-                        },
-                        "key-dependencies": [
-                            "service-instance-id",
-                            "vnf-id"
-                        ]
-                    }
-                }
-            }
-        }
-    },
-    {
-        "name": "vfw_onap_private_ip_0",
-        "tags": "vfw_onap_private_ip_0",
-        "data_type": "string",
-        "description": "vfw_onap_private_ip_0",
-        "entry_schema": "string",
-        "updatedBy": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-        "definition": {
-            "tags": "vfw_onap_private_ip_0",
-            "name": "vfw_onap_private_ip_0",
-            "property": {
-                "description": "vfw_onap_private_ip_0",
-                "type": "string"
-            },
-            "group": "default",
-            "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-            "sources": {
-                "input": {
-                    "type": "source-input"
-                },
-                "default": {
-                    "type": "source-default",
-                    "properties": {}
-                },
-                "sdnc": {
-                    "type": "source-rest",
-                    "properties": {
-                        "verb": "GET",
-                        "type": "JSON",
-                        "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vfw_onap_private_ip_0",
-                        "path": "/param/0/value",
-                        "input-key-mapping": {
-                            "service-instance-id": "service-instance-id",
-                            "vnf-id": "vnf-id"
-                        },
-                        "output-key-mapping": {
-                            "vfw_onap_private_ip_0": "value"
-                        },
-                        "key-dependencies": [
-                            "service-instance-id",
-                            "vnf-id"
-                        ]
-                    }
-                }
-            }
-        }
-    },
-    {
         "name": "vnf-id",
         "tags": "vnf-id",
         "data_type": "string",
@@ -2194,30 +1069,6 @@
         }
     },
     {
-        "name": "vnf-model-customization-uuid",
-        "tags": "vnf-model-customization-uuid",
-        "data_type": "string",
-        "description": "vnf-model-customization-uuid",
-        "entry_schema": "string",
-        "updatedBy": "Singal, Kapil <ks220y@att.com>",
-        "definition": {
-            "tags": "vnf-model-customization-uuid",
-            "name": "vnf-model-customization-uuid",
-            "property": {
-                "description": "vnf-model-customization-uuid",
-                "type": "string"
-            },
-            "group": "default",
-            "updated-by": "Singal, Kapil <ks220y@att.com>",
-            "sources": {
-                "input": {
-                    "type": "source-input",
-                    "properties": {}
-                }
-            }
-        }
-    },
-    {
         "name": "vnf_name",
         "tags": "vnf_name",
         "data_type": "string",
@@ -2265,154 +1116,21 @@
         }
     },
     {
-        "name": "vnfc-model-invariant-uuid",
-        "tags": "vnfc-model-invariant-uuid",
-        "data_type": "string",
-        "description": "vnfc-model-invariant-uuid",
-        "entry_schema": "string",
-        "updatedBy": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-        "definition": {
-            "tags": "vnfc-model-invariant-uuid",
-            "name": "vnfc-model-invariant-uuid",
-            "property": {
-                "description": "vnfc-model-invariant-uuid",
-                "type": "string"
-            },
-            "group": "default",
-            "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-            "sources": {
-                "input": {
-                    "type": "source-input"
-                },
-                "default": {
-                    "type": "source-default",
-                    "properties": {}
-                },
-                "processor-db": {
-                    "type": "source-db",
-                    "properties": {
-                        "type": "SQL",
-                        "query": "select VFC_MODEL.invariant_uuid as vfc_invariant_uuid from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
-                        "output-key-mapping": {
-                            "vnfc-model-invariant-uuid": "vfc_invariant_uuid"
-                        },
-                        "input-key-mapping": {
-                            "vfccustomizationuuid": "vfccustomizationuuid"
-                        },
-                        "key-dependencies": [
-                            "vfccustomizationuuid"
-                        ]
-                    }
-                }
-            }
-        }
-    },
-    {
-        "name": "vnfc-model-version",
-        "tags": "vnfc-model-version",
-        "data_type": "string",
-        "description": "vnfc-model-version",
-        "entry_schema": "string",
-        "updatedBy": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-        "definition": {
-            "tags": "vnfc-model-version",
-            "name": "vnfc-model-version",
-            "property": {
-                "description": "vnfc-model-version",
-                "type": "string"
-            },
-            "group": "default",
-            "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-            "sources": {
-                "input": {
-                    "type": "source-input"
-                },
-                "default": {
-                    "type": "source-default",
-                    "properties": {}
-                },
-                "processor-db": {
-                    "type": "source-db",
-                    "properties": {
-                        "type": "SQL",
-                        "query": "select VFC_MODEL.version as vnfc_model_version from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
-                        "input-key-mapping": {
-                            "vfccustomizationuuid": "vfccustomizationuuid"
-                        },
-                        "output-key-mapping": {
-                            "vnfc-model-version": "vnfc_model_version"
-                        },
-                        "key-dependencies": [
-                            "vfccustomizationuuid"
-                        ]
-                    }
-                }
-            }
-        }
-    },
-    {
-        "name": "vpg_int_private1_ip_0",
-        "tags": "vpg_int_private1_ip_0",
-        "data_type": "string",
-        "description": "vpg_int_private1_ip_0",
-        "entry_schema": "string",
-        "updatedBy": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-        "definition": {
-            "tags": "vpg_int_private1_ip_0",
-            "name": "vpg_int_private1_ip_0",
-            "property": {
-                "description": "vpg_int_private1_ip_0",
-                "type": "string"
-            },
-            "group": "default",
-            "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-            "sources": {
-                "input": {
-                    "type": "source-input"
-                },
-                "default": {
-                    "type": "source-default",
-                    "properties": {}
-                },
-                "sdnc": {
-                    "type": "source-rest",
-                    "properties": {
-                        "verb": "GET",
-                        "type": "JSON",
-                        "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vpg_int_private1_ip_0",
-                        "path": "/param/0/value",
-                        "input-key-mapping": {
-                            "service-instance-id": "service-instance-id",
-                            "vnf-id": "vnf-id"
-                        },
-                        "output-key-mapping": {
-                            "vpg_int_private1_ip_0": "value"
-                        },
-                        "key-dependencies": [
-                            "service-instance-id",
-                            "vnf-id"
-                        ]
-                    }
-                }
-            }
-        }
-    },
-    {
-        "name": "vpg_name_0",
-        "tags": "vpg_name_0",
+        "name": "vpg-management-port",
+        "tags": "vpg-management-port",
         "data_type": "string",
-        "description": "vpg_name_0",
+        "description": "vpg-management-port",
         "entry_schema": "string",
-        "updatedBy": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+        "updatedBy": "Rajewski, Lukasz <lukasz.rajewski@orange.com>",
         "definition": {
-            "tags": "vpg_name_0",
-            "name": "vpg_name_0",
+            "tags": "vpg-management-port",
+            "name": "vpg-management-port",
             "property": {
-                "description": "vpg_name_0",
+                "description": "vpg-management-port",
                 "type": "string"
             },
             "group": "default",
-            "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+            "updated-by": "Rajewski, Lukasz <lukasz.rajewski@orange.com>",
             "sources": {
                 "input": {
                     "type": "source-input"
@@ -2420,26 +1138,6 @@
                 "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_name_0",
-                        "path": "/param/0/value",
-                        "input-key-mapping": {
-                            "service-instance-id": "service-instance-id",
-                            "vnf-id": "vnf-id"
-                        },
-                        "output-key-mapping": {
-                            "vpg_name_0": "value"
-                        },
-                        "key-dependencies": [
-                            "service-instance-id",
-                            "vnf-id"
-                        ]
-                    }
                 }
             }
         }
@@ -2490,146 +1188,5 @@
                 }
             }
         }
-    },
-    {
-        "name": "vsn_int_private2_ip_0",
-        "tags": "vsn_int_private2_ip_0",
-        "data_type": "string",
-        "description": "vsn_int_private2_ip_0",
-        "entry_schema": "string",
-        "updatedBy": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-        "definition": {
-            "tags": "vsn_int_private2_ip_0",
-            "name": "vsn_int_private2_ip_0",
-            "property": {
-                "description": "vsn_int_private2_ip_0",
-                "type": "string"
-            },
-            "group": "default",
-            "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-            "sources": {
-                "input": {
-                    "type": "source-input"
-                },
-                "default": {
-                    "type": "source-default",
-                    "properties": {}
-                },
-                "sdnc": {
-                    "type": "source-rest",
-                    "properties": {
-                        "verb": "GET",
-                        "type": "JSON",
-                        "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vsn_int_private2_ip_0",
-                        "path": "/param/0/value",
-                        "input-key-mapping": {
-                            "service-instance-id": "service-instance-id",
-                            "vnf-id": "vnf-id"
-                        },
-                        "output-key-mapping": {
-                            "vsn_int_private2_ip_0": "value"
-                        },
-                        "key-dependencies": [
-                            "service-instance-id",
-                            "vnf-id"
-                        ]
-                    }
-                }
-            }
-        }
-    },
-    {
-        "name": "vsn_name_0",
-        "tags": "vsn_name_0",
-        "data_type": "string",
-        "description": "vsn_name_0",
-        "entry_schema": "string",
-        "updatedBy": "Singal, Kapil <ks220y@att.com>",
-        "definition": {
-            "tags": "vsn_name_0",
-            "name": "vsn_name_0",
-            "property": {
-                "description": "vsn_name_0",
-                "type": "string"
-            },
-            "group": "default",
-            "updated-by": "Singal, Kapil <ks220y@att.com>",
-            "sources": {
-                "input": {
-                    "type": "source-input"
-                },
-                "default": {
-                    "type": "source-default",
-                    "properties": {}
-                },
-                "sdnc": {
-                    "type": "source-rest",
-                    "properties": {
-                        "verb": "GET",
-                        "type": "JSON",
-                        "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vsn_name_0",
-                        "path": "/param/0/value",
-                        "input-key-mapping": {
-                            "service-instance-id": "service-instance-id",
-                            "vnf-id": "vnf-id"
-                        },
-                        "output-key-mapping": {
-                            "vsn_name_0": "value"
-                        },
-                        "key-dependencies": [
-                            "service-instance-id",
-                            "vnf-id"
-                        ]
-                    }
-                }
-            }
-        }
-    },
-    {
-        "name": "vsn_onap_private_ip_0",
-        "tags": "vsn_onap_private_ip_0",
-        "data_type": "string",
-        "description": "vsn_onap_private_ip_0",
-        "entry_schema": "string",
-        "updatedBy": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-        "definition": {
-            "tags": "vsn_onap_private_ip_0",
-            "name": "vsn_onap_private_ip_0",
-            "property": {
-                "description": "vsn_onap_private_ip_0",
-                "type": "string"
-            },
-            "group": "default",
-            "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
-            "sources": {
-                "input": {
-                    "type": "source-input"
-                },
-                "default": {
-                    "type": "source-default",
-                    "properties": {}
-                },
-                "sdnc": {
-                    "type": "source-rest",
-                    "properties": {
-                        "verb": "GET",
-                        "type": "JSON",
-                        "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vsn_onap_private_ip_0",
-                        "path": "/param/0/value",
-                        "input-key-mapping": {
-                            "service-instance-id": "service-instance-id",
-                            "vnf-id": "vnf-id"
-                        },
-                        "output-key-mapping": {
-                            "vsn_onap_private_ip_0": "value"
-                        },
-                        "key-dependencies": [
-                            "service-instance-id",
-                            "vnf-id"
-                        ]
-                    }
-                }
-            }
-        }
     }
 ]