aboutsummaryrefslogtreecommitdiffstats
path: root/heat/vFW_CNF_CDS/templates
diff options
context:
space:
mode:
authorKonrad Bańka <k.banka@samsung.com>2020-03-06 09:24:23 +0100
committerKonrad Bańka <k.banka@samsung.com>2020-03-13 14:07:49 +0100
commita1ffe0ce52a4efa1ed56474417aa525d60518a5b (patch)
tree6e9cc4feb917a93d8a228d154a6cdf38068b91b0 /heat/vFW_CNF_CDS/templates
parent523796ad09130868e8e31e942cd4d9712eb75934 (diff)
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
Diffstat (limited to 'heat/vFW_CNF_CDS/templates')
-rw-r--r--heat/vFW_CNF_CDS/templates/.gitignore2
-rw-r--r--heat/vFW_CNF_CDS/templates/Makefile5
-rw-r--r--heat/vFW_CNF_CDS/templates/cba-dd.json1459
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Definitions/data_types.json536
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Definitions/node_types.json5
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Definitions/resources_definition_types.json1112
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json42
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/TOSCA-Metadata/TOSCA.meta2
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Templates/base_template-mapping.json561
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Templates/base_template-template.vtl126
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Templates/vfw-mapping.json1021
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl134
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Templates/vnf-mapping.json781
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Templates/vnf-template.vtl122
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-mapping.json997
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-template.vtl161
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Templates/vsn-mapping.json888
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Templates/vsn-template.vtl114
18 files changed, 990 insertions, 7078 deletions
diff --git a/heat/vFW_CNF_CDS/templates/.gitignore b/heat/vFW_CNF_CDS/templates/.gitignore
index b3b0d6bf..a6967843 100644
--- a/heat/vFW_CNF_CDS/templates/.gitignore
+++ b/heat/vFW_CNF_CDS/templates/.gitignore
@@ -1,2 +1,2 @@
csar/
-vfw_k8s_demo.csar
+vfw_k8s_demo.zip
diff --git a/heat/vFW_CNF_CDS/templates/Makefile b/heat/vFW_CNF_CDS/templates/Makefile
index 98b2890d..72e93f2a 100644
--- a/heat/vFW_CNF_CDS/templates/Makefile
+++ b/heat/vFW_CNF_CDS/templates/Makefile
@@ -1,7 +1,10 @@
-.PHONY: all clean helm base cba
+.PHONY: all clean helm base cba clean_all
CSAR_NAME ?= vfw_k8s_demo
CBA_NAME ?= vFW_CDS_CNF
+clean_all:
+ $(MAKE) clean
+ $(MAKE) all
all: csar/ helm base cba
#Can't use .csar extension or SDC will panic
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"
- ]
- }
- }
- }
- }
}
]
diff --git a/heat/vFW_CNF_CDS/templates/cba/Definitions/data_types.json b/heat/vFW_CNF_CDS/templates/cba/Definitions/data_types.json
index 988d059c..4ce487b8 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Definitions/data_types.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Definitions/data_types.json
@@ -61,570 +61,112 @@
"description" : "Dynamic DataType definition for workflow(resource-assignment).",
"version" : "1.0.0",
"properties" : {
- "vf-module-name" : {
- "description" : "",
- "required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "default" : "${vf-module-name}",
- "entry_schema" : {
- "type" : ""
- }
- },
- "private1-prefix-id" : {
- "description" : "",
- "required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "entry_schema" : {
- "type" : ""
- }
- },
- "vnf-id" : {
- "description" : "",
- "required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "entry_schema" : {
- "type" : ""
- }
- },
- "vsn_flavor_name" : {
- "description" : "",
- "required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "entry_schema" : {
- "type" : ""
- }
- },
- "vfw_int_private2_ip_0" : {
- "description" : "",
- "required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "entry_schema" : {
- "type" : ""
- }
- },
- "public_net_id" : {
- "description" : "",
- "required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "entry_schema" : {
- "type" : ""
- }
- },
- "int_private1_gw_ip" : {
- "description" : "Private unprotected network gateway ip",
- "type" : "string",
- "default" : "${int_private1_gw_ip}"
- },
- "sec_group" : {
- "description" : "",
- "required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "entry_schema" : {
- "type" : ""
- }
- },
- "nfc-naming-code" : {
- "description" : "",
- "required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "entry_schema" : {
- "type" : ""
- }
- },
- "vnfc-model-invariant-uuid" : {
- "description" : "",
- "required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "entry_schema" : {
- "type" : ""
- }
- },
- "vfw_name_0" : {
- "description" : "",
- "required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "default" : "${vfw_name_0}",
- "entry_schema" : {
- "type" : ""
- }
- },
- "nexus_artifact_repo" : {
- "description" : "",
- "required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "entry_schema" : {
- "type" : ""
- }
- },
- "onap_private_net_cidr" : {
- "description" : "",
- "required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "entry_schema" : {
- "type" : ""
- }
- },
- "vpg_onap_private_ip_0" : {
- "description" : "",
- "required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "default" : "${vpg_onap_private_ip_0}",
- "entry_schema" : {
- "type" : ""
- }
- },
- "image_name" : {
- "description" : "",
- "required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "entry_schema" : {
- "type" : ""
- }
- },
- "flavor_name" : {
- "description" : "",
- "required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "entry_schema" : {
- "type" : ""
- }
- },
- "dcae_collector_ip" : {
- "description" : "",
- "required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "default" : "10.0.4.1",
- "entry_schema" : {
- "type" : ""
- }
- },
- "vf-module-model-invariant-uuid" : {
- "type" : "string"
- },
- "vpg_name_0" : {
- "description" : "",
- "required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "default" : "${vpg_name_0}",
- "entry_schema" : {
- "type" : ""
- }
- },
- "vf-naming-policy" : {
- "description" : "",
- "required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "entry_schema" : {
- "type" : ""
- }
- },
- "int_private2_net_cidr" : {
- "description" : "",
- "required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "entry_schema" : {
- "type" : ""
- }
- },
- "vfccustomizationuuid" : {
- "description" : "",
- "required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "entry_schema" : {
- "type" : ""
- }
+ "vpg-management-port" : {
+ "description" : "SSH external port of ssh. When 0 ssh service will not be exposed",
+ "type" : "string",
+ "default" : "0"
},
- "vf-module-model-version" : {
+ "k8s-rb-profile-namespace" : {
+ "description" : "K8s namespace to create helm chart for specified profile",
"type" : "string"
},
"k8s-rb-profile-name" : {
"description" : "Profile name used in multicloud/k8s plugin to identify Helm chart(s) where this mapping is providing override values.",
"type" : "string"
},
- "vsn_name_0" : {
- "description" : "",
- "required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "default" : "${vsn_name_0}",
- "entry_schema" : {
- "type" : ""
- }
- },
- "onap_private_net_id" : {
- "description" : "",
- "required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "entry_schema" : {
- "type" : ""
- }
- },
- "demo_artifacts_version" : {
+ "private1-prefix-id" : {
"description" : "",
"required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "entry_schema" : {
- "type" : ""
- }
+ "type" : "string"
},
- "vnf-model-customization-uuid" : {
+ "private2-prefix-id" : {
"description" : "",
"required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "entry_schema" : {
- "type" : ""
- }
+ "type" : "string"
},
- "vfw_int_private1_ip_0" : {
+ "vnf-id" : {
"description" : "",
"required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "default" : "${vfw_int_private1_ip_0}",
- "entry_schema" : {
- "type" : ""
- }
+ "type" : "string"
},
- "key_name" : {
+ "service-instance-id" : {
"description" : "",
"required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "entry_schema" : {
- "type" : ""
- }
+ "type" : "string"
},
- "install_script_version" : {
+ "vnf_name" : {
"description" : "",
"required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "entry_schema" : {
- "type" : ""
- }
+ "type" : "string"
},
- "vfw_image_name" : {
+ "demo_artifacts_version" : {
"description" : "",
"required" : false,
"type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "entry_schema" : {
- "type" : ""
- }
+ "default" : "1.5.0"
},
- "vfw_onap_private_ip_0" : {
+ "aic-cloud-region" : {
"description" : "",
"required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "default" : "${vfw_onap_private_ip_0}",
- "entry_schema" : {
- "type" : ""
- }
- },
- "int_private2_net_id" : {
- "description" : "Private protected network identification",
"type" : "string"
},
- "k8s-rb-profile-namespace" : {
- "description" : "K8s namespace to create helm chart for specified profile",
- "type" : "string",
- "default" : "default"
- },
- "vpg-management-port" : {
- "description" : "SSH external port of ssh. When 0 ssh service will not be exposed",
- "type" : "string",
- "default": "0"
- },
- "vnf_name" : {
- "description" : "",
- "required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "entry_schema" : {
- "type" : ""
- }
- },
- "aic-cloud-region" : {
+ "vf-module-model-customization-uuid" : {
"description" : "",
"required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "entry_schema" : {
- "type" : ""
- }
+ "type" : "string"
},
- "vsn_int_private2_ip_0" : {
+ "onap_private_net_cidr" : {
"description" : "",
"required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "entry_schema" : {
- "type" : ""
- }
+ "type" : "string"
},
- "vf-module-model-customization-uuid" : {
+ "management-prefix-id" : {
"description" : "",
"required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "entry_schema" : {
- "type" : ""
- }
- },
- "int_private2_gw_ip" : {
- "description" : "Private protected network gateway ip",
"type" : "string"
},
- "vsn_image_name" : {
+ "dcae_collector_ip" : {
"description" : "",
"required" : false,
"type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "entry_schema" : {
- "type" : ""
- }
+ "default" : "10.0.4.1"
},
- "vpg_flavor_name" : {
+ "int_private1_net_cidr" : {
"description" : "",
"required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "entry_schema" : {
- "type" : ""
- }
+ "type" : "string"
},
"vf-module-id" : {
"description" : "",
"required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "entry_schema" : {
- "type" : ""
- }
- },
- "onap_private_gw_ip" : {
- "description" : "Private onap management network gateway ip",
- "type" : "string",
- "default" : "${onap_private_gw_ip}"
+ "type" : "string"
},
"dcae_collector_port" : {
"description" : "",
"required" : false,
"type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "default" : "30235",
- "entry_schema" : {
- "type" : ""
- }
+ "default" : "30235"
},
"vf-module-label" : {
"description" : "",
"required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "entry_schema" : {
- "type" : ""
- }
- },
- "vfw_int_private2_floating_ip" : {
- "description" : "",
- "required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "entry_schema" : {
- "type" : ""
- }
- },
- "vpg_image_name" : {
- "description" : "",
- "required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "entry_schema" : {
- "type" : ""
- }
- },
- "private2-prefix-id" : {
- "description" : "",
- "required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "entry_schema" : {
- "type" : ""
- }
- },
- "vnfc-model-version" : {
- "description" : "",
- "required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "entry_schema" : {
- "type" : ""
- }
- },
- "service-instance-id" : {
- "description" : "",
- "required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "entry_schema" : {
- "type" : ""
- }
- },
- "vsn_onap_private_ip_0" : {
- "description" : "",
- "required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "default" : "${vsn_onap_private_ip_0}",
- "entry_schema" : {
- "type" : ""
- }
- },
- "vfw_flavor_name" : {
- "description" : "",
- "required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "entry_schema" : {
- "type" : ""
- }
- },
- "vf-module-type" : {
- "description" : "",
- "required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "entry_schema" : {
- "type" : ""
- }
- },
- "pub_key" : {
- "description" : "",
- "required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "entry_schema" : {
- "type" : ""
- }
- },
- "management-prefix-id" : {
- "description" : "",
- "required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "entry_schema" : {
- "type" : ""
- }
+ "type" : "string"
},
- "int_private1_net_cidr" : {
- "description" : "",
- "required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "entry_schema" : {
- "type" : ""
- }
+ "vf-module-model-invariant-uuid" : {
+ "type" : "string"
},
- "vpg_int_private1_ip_0" : {
+ "vf-naming-policy" : {
"description" : "",
"required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "default" : "${vpg_int_private1_ip_0}",
- "entry_schema" : {
- "type" : ""
- }
+ "type" : "string"
},
- "cloud_env" : {
+ "int_private2_net_cidr" : {
"description" : "",
"required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "default" : "openstack",
- "entry_schema" : {
- "type" : ""
- }
+ "type" : "string"
},
- "int_private1_net_id" : {
- "description" : "Private unprotected network identification",
- "type" : "string",
- "default" : "${int_private1_net_id}"
+ "vf-module-model-version" : {
+ "type" : "string"
}
},
"derived_from" : "tosca.datatypes.Dynamic"
diff --git a/heat/vFW_CNF_CDS/templates/cba/Definitions/node_types.json b/heat/vFW_CNF_CDS/templates/cba/Definitions/node_types.json
index b78a3114..66b0d7c5 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Definitions/node_types.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Definitions/node_types.json
@@ -40,6 +40,11 @@
"required" : false,
"type" : "string"
},
+ "resolution-summary" : {
+ "description" : "Enable resolution-summary output",
+ "required" : false,
+ "type" : "boolean"
+ },
"artifact-prefix-names" : {
"description" : "Template , Resource Assignment Artifact Prefix names",
"required" : true,
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 17e4dcbb..ab2abcde 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
@@ -34,42 +34,6 @@
}
}
},
- "cloud_env" : {
- "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" ]
- }
- }
- }
- },
"dcae_collector_ip" : {
"tags" : "dcae_collector_ip",
"name" : "dcae_collector_ip",
@@ -178,150 +142,6 @@
}
}
},
- "flavor_name" : {
- "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" ]
- }
- }
- }
- },
- "image_name" : {
- "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" ]
- }
- }
- }
- },
- "install_script_version" : {
- "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" ]
- }
- }
- }
- },
- "int_private1_gw_ip" : {
- "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" ]
- }
- }
- }
- },
"int_private1_net_cidr" : {
"tags" : "int_private1_net_cidr",
"name" : "int_private1_net_cidr",
@@ -370,78 +190,6 @@
}
}
},
- "int_private1_net_id" : {
- "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" ]
- }
- }
- }
- },
- "int_private2_gw_ip" : {
- "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" ]
- }
- }
- }
- },
"int_private2_net_cidr" : {
"tags" : "int_private2_net_cidr",
"name" : "int_private2_net_cidr",
@@ -490,42 +238,6 @@
}
}
},
- "int_private2_net_id" : {
- "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" ]
- }
- }
- }
- },
"k8s-rb-profile-name" : {
"tags" : "k8s, cnf, profile, k8s-rb-profile-name",
"name" : "k8s-rb-profile-name",
@@ -598,60 +310,6 @@
}
}
},
- "vpg-management-port" : {
- "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" : { }
- }
- }
- },
- "key_name" : {
- "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" ]
- }
- }
- }
- },
"management-prefix-id" : {
"tags" : "management-prefix-id",
"name" : "management-prefix-id",
@@ -700,112 +358,6 @@
}
}
},
- "nexus_artifact_repo" : {
- "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" ]
- }
- }
- }
- },
- "nfc-naming-code" : {
- "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"
- }
- }
- }
- },
- "onap_private_gw_ip" : {
- "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" ]
- }
- }
- }
- },
"onap_private_net_cidr" : {
"tags" : "onap_private_net_cidr",
"name" : "onap_private_net_cidr",
@@ -854,42 +406,6 @@
}
}
},
- "onap_private_net_id" : {
- "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" ]
- }
- }
- }
- },
"private1-prefix-id" : {
"tags" : "private1-prefix-id",
"name" : "private1-prefix-id",
@@ -986,78 +502,6 @@
}
}
},
- "pub_key" : {
- "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" ]
- }
- }
- }
- },
- "public_net_id" : {
- "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" ]
- }
- }
- }
- },
"put-active-streams" : {
"tags" : "put-active-streams",
"name" : "put-active-streams",
@@ -1094,42 +538,6 @@
}
}
},
- "sec_group" : {
- "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" ]
- }
- }
- }
- },
"service-instance-id" : {
"tags" : "service-instance-id, tosca.datatypes.Root, data_type",
"name" : "service-instance-id",
@@ -1345,59 +753,6 @@
}
}
},
- "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"
- },
- "default" : {
- "type" : "source-default",
- "properties" : { }
- }
- }
- },
- "vf-module-type" : {
- "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"
- }
- }
- }
- },
"vf-naming-policy" : {
"tags" : "vf-naming-policy",
"name" : "vf-naming-policy",
@@ -1445,220 +800,6 @@
}
}
},
- "vfccustomizationuuid" : {
- "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"
- }
- }
- }
- },
- "vfw_int_private1_ip_0" : {
- "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" ]
- }
- }
- }
- },
- "vfw_int_private2_floating_ip" : {
- "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" ]
- }
- }
- }
- },
- "vfw_int_private2_ip_0" : {
- "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" ]
- }
- }
- }
- },
- "vfw_name_0" : {
- "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" ]
- }
- }
- }
- },
- "vfw_onap_private_ip_0" : {
- "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" ]
- }
- }
- }
- },
"vnf-id" : {
"tags" : "vnf-id",
"name" : "vnf-id",
@@ -1695,22 +836,6 @@
}
}
},
- "vnf-model-customization-uuid" : {
- "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" : { }
- }
- }
- },
"vnf_name" : {
"tags" : "vnf_name",
"name" : "vnf_name",
@@ -1747,117 +872,15 @@
}
}
},
- "vnfc-model-invariant-uuid" : {
- "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" ]
- }
- }
- }
- },
- "vnfc-model-version" : {
- "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" ]
- }
- }
- }
- },
- "vpg_int_private1_ip_0" : {
- "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" ]
- }
- }
- }
- },
- "vpg_name_0" : {
- "tags" : "vpg_name_0",
- "name" : "vpg_name_0",
+ "vpg-management-port" : {
+ "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"
@@ -1865,23 +888,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" ]
- }
}
}
},
@@ -1920,113 +926,5 @@
}
}
}
- },
- "vsn_int_private2_ip_0" : {
- "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" ]
- }
- }
- }
- },
- "vsn_name_0" : {
- "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" ]
- }
- }
- }
- },
- "vsn_onap_private_ip_0" : {
- "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" ]
- }
- }
- }
}
}
diff --git a/heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json b/heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json
index 5f7fa0e2..4a0ec295 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json
@@ -5,7 +5,7 @@
"author-email" : "abdelmuhaimen.seaudi@orange.com",
"user-groups" : "ADMIN, OPERATION",
"template_name" : "vFW_CNF_CDS",
- "template_version" : "1.0.25",
+ "template_version" : "1.0.44",
"template_tags" : "Samuli Silvius, vFW_CNF_CDS",
"template_type" : "DEFAULT"
},
@@ -34,16 +34,16 @@
"url" : "http://multicloud-k8s:9015"
},
"profile-upload-properties" : {
- "assignment-params": {
+ "assignment-params" : {
"get_attribute" : [ "resource-assignment", "assignment-params" ]
},
- "profile-modification-decision-data": {
+ "profile-modification-decision-data" : {
"get_input" : "vpg-management-port"
},
- "profile-artifacts": {
+ "profile-artifacts" : {
"get_attribute" : [ "profile-modification", "assignment-params" ]
},
- "api-access": "*multicloud-k8s-api"
+ "api-access" : "*multicloud-k8s-api"
},
"config-deploy-properties" : {
"resolution-key" : {
@@ -64,35 +64,25 @@
"resource-assignment" : {
"description" : "Resource Assign Workflow",
"target" : "resource-assignment",
- "activities": [
- {
- "call_operation": "ResourceResolutionComponent.process"
- }
- ],
- "on_success": [
- "profile-modification"
- ]
+ "activities" : [ {
+ "call_operation" : "ResourceResolutionComponent.process"
+ } ],
+ "on_success" : [ "profile-modification" ]
},
"profile-modification" : {
"description" : "Profile Modification Resources",
"target" : "profile-modification",
- "activities": [
- {
- "call_operation": "ResourceResolutionComponent.process"
- }
- ],
- "on_success": [
- "profile-upload"
- ]
+ "activities" : [ {
+ "call_operation" : "ResourceResolutionComponent.process"
+ } ],
+ "on_success" : [ "profile-upload" ]
},
"profile-upload" : {
"description" : "Upload K8s Profile",
"target" : "profile-upload",
- "activities": [
- {
- "call_operation": "ComponentScriptExecutor.process"
- }
- ]
+ "activities" : [ {
+ "call_operation" : "ComponentScriptExecutor.process"
+ } ]
}
},
"inputs" : {
diff --git a/heat/vFW_CNF_CDS/templates/cba/TOSCA-Metadata/TOSCA.meta b/heat/vFW_CNF_CDS/templates/cba/TOSCA-Metadata/TOSCA.meta
index 9a32b5ca..8405b709 100644
--- a/heat/vFW_CNF_CDS/templates/cba/TOSCA-Metadata/TOSCA.meta
+++ b/heat/vFW_CNF_CDS/templates/cba/TOSCA-Metadata/TOSCA.meta
@@ -3,6 +3,6 @@ CSAR-Version: 1.0
Created-By: Samuli Silvius <s.silvius@partner.samsung.com>
Entry-Definitions: Definitions/vFW_CNF_CDS.json
Template-Name: vFW_CNF_CDS
-Template-Version: 1.0.25
+Template-Version: 1.0.44
Template-Type: DEFAULT
Template-Tags: Samuli Silvius, vFW_CNF_CDS
diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/base_template-mapping.json b/heat/vFW_CNF_CDS/templates/cba/Templates/base_template-mapping.json
index efedb214..dd49ad28 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/base_template-mapping.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/base_template-mapping.json
@@ -1,399 +1,166 @@
[
- {
- "name": "service-instance-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "service-instance-id",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vf-module-label",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vf-module-label",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vf-module-model-customization-uuid"
- ],
- "version": 0
- },
- {
- "name": "vf-naming-policy",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vf-naming-policy",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vf-module-type",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vf-module-type",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vf-module-model-customization-uuid"
- ],
- "version": 0
- },
- {
- "name": "vf-module-model-customization-uuid",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vf-module-model-customization-uuid",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vnf-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vnf-id",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vf-module-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vf-module-id",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vnf-model-customization-uuid",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vnf-model-customization-uuid",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "aic-cloud-region",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "aic-cloud-region",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "int_private1_net_cidr",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "int_private1_net_cidr",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "onap_private_net_cidr",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "onap_private_net_cidr",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "int_private2_net_cidr",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "int_private2_net_cidr",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vnf_name",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vnf_name",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "pub_key",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "pub_key",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vf-module-model-invariant-uuid",
- "property": {
- "type": "string"
- },
- "input-param": false,
- "dictionary-name": "vf-module-model-invariant-uuid",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vf-module-model-customization-uuid"
- ]
- },
- {
- "name": "vf-module-model-version",
- "property": {
- "type": "string"
- },
- "input-param": false,
- "dictionary-name": "vf-module-model-version",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vf-module-model-customization-uuid"
- ]
- },
- {
- "name": "k8s-rb-profile-name",
- "property": {
- "description": "Profile name used in multicloud/k8s plugin to identify Helm chart(s) where this mapping is providing override values.",
- "type": "string"
- },
- "input-param": false,
- "dictionary-name": "k8s-rb-profile-name",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ]
- },
- {
- "name": "k8s-rb-profile-namespace",
- "property": {
- "description": "K8s namespace to create helm chart for specified profile",
- "type": "string",
- "default": "default"
- },
- "input-param": false,
- "dictionary-name": "k8s-rb-profile-namespace",
- "dictionary-source": "default",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ]
- },
- {
- "name": "int_private1_gw_ip",
- "property": {
- "description": "Private unprotected network gateway ip",
- "type": "string"
- },
- "input-param": false,
- "dictionary-name": "int_private1_gw_ip",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ]
- },
- {
- "name": "int_private2_gw_ip",
- "property": {
- "description": "Private protected network gateway ip",
- "type": "string"
- },
- "input-param": false,
- "dictionary-name": "int_private2_gw_ip",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ]
- },
- {
- "name": "onap_private_gw_ip",
- "property": {
- "description": "Private onap management network gateway ip",
- "type": "string"
- },
- "input-param": false,
- "dictionary-name": "onap_private_gw_ip",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ]
- }
+ {
+ "name": "vf-module-model-invariant-uuid",
+ "property": {
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-module-model-invariant-uuid",
+ "dictionary-source": "processor-db",
+ "dependencies": [
+ "vf-module-model-customization-uuid"
+ ]
+ },
+ {
+ "name": "vf-module-model-version",
+ "property": {
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-module-model-version",
+ "dictionary-source": "processor-db",
+ "dependencies": [
+ "vf-module-model-customization-uuid"
+ ]
+ },
+ {
+ "name": "management-prefix-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "management-prefix-id",
+ "dictionary-source": "processor-db",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "vnf_name",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vnf_name",
+ "dictionary-source": "sdnc",
+ "dependencies": [
+ "service-instance-id",
+ "vnf-id"
+ ],
+ "version": 0
+ },
+ {
+ "name": "service-instance-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "service-instance-id",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "vf-module-label",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-module-label",
+ "dictionary-source": "processor-db",
+ "dependencies": [
+ "vf-module-model-customization-uuid"
+ ],
+ "version": 0
+ },
+ {
+ "name": "vf-naming-policy",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-naming-policy",
+ "dictionary-source": "sdnc",
+ "dependencies": [
+ "service-instance-id",
+ "vnf-id"
+ ],
+ "version": 0
+ },
+ {
+ "name": "vf-module-model-customization-uuid",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-module-model-customization-uuid",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "vnf-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vnf-id",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "vf-module-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-module-id",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "k8s-rb-profile-namespace",
+ "property": {
+ "description": "K8s namespace to create helm chart for specified profile",
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "k8s-rb-profile-namespace",
+ "dictionary-source": "sdnc",
+ "dependencies": [
+ "service-instance-id",
+ "vnf-id"
+ ]
+ },
+ {
+ "name": "k8s-rb-profile-name",
+ "property": {
+ "description": "Profile name used in multicloud/k8s plugin to identify Helm chart(s) where this mapping is providing override values.",
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "k8s-rb-profile-name",
+ "dictionary-source": "sdnc",
+ "dependencies": [
+ "service-instance-id",
+ "vnf-id"
+ ]
+ }
]
diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/base_template-template.vtl b/heat/vFW_CNF_CDS/templates/cba/Templates/base_template-template.vtl
index 76eda6d3..888b8421 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/base_template-template.vtl
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/base_template-template.vtl
@@ -1,71 +1,105 @@
{
"capability-data": [
{
- "capability-name": "aai-vf-module-put",
+ "capability-name": "netbox-ip-assign",
"key-mapping": [
{
"output-key-mapping": [
{
- "resource-name": "aai-vf-module-put",
- "resource-value": "${status}"
+ "resource-name": "onap_private_gw_ip",
+ "resource-value": "${onap_private_gw_ip}"
}
],
"payload": [
{
- "param-name": "vf-module",
- "param-value": "vf-module"
+ "param-name": "service-instance-id",
+ "param-value": "${service-instance-id}"
+ },
+ {
+ "param-name": "prefix-id",
+ "param-value": "${management-prefix-id}"
+ },
+ {
+ "param-name": "vnf-id",
+ "param-value": "${vnf-id}"
+ },
+ {
+ "param-name": "external_key",
+ "param-value": "${vnf-id}-onap_private_gw_ip"
}
]
}
]
- }
- ],
- "resource-accumulator-resolved-data": [
- {
- "param-name": "service-instance-id",
- "param-value": "${service-instance-id}"
},
{
- "param-name": "vnf_name",
- "param-value": "${vnf_name}"
+ "capability-name": "generate-name",
+ "key-mapping": [
+ {
+ "output-key-mapping": [
+ {
+ "resource-name": "vf_module_name",
+ "resource-value": "${vf-module-name}"
+ }
+ ],
+ "payload": [
+ {
+ "param-name": "resource-name",
+ "param-value": "vf_module_name"
+ },
+ {
+ "param-name": "resource-value",
+ "param-value": "${vf-module-name}"
+ },
+ {
+ "param-name": "external-key",
+ "param-value": "${vf-module-id}_vf-module-name"
+ },
+ {
+ "param-name": "policy-instance-name",
+ "param-value": "${vf-naming-policy}"
+ },
+ {
+ "param-name": "naming-type",
+ "param-value": "VF-MODULE"
+ },
+ {
+ "param-name": "VNF_NAME",
+ "param-value": "${vnf_name}"
+ },
+ {
+ "param-name": "VF_MODULE_LABEL",
+ "param-value": "${vf-module-label}"
+ }
+ ]
+ }
+ ]
},
{
- "param-name": "vnf_model_customization_uuid",
- "param-value": "${vnf-model-customization-uuid}"
- },
+ "capability-name": "aai-vf-module-put",
+ "key-mapping": [
+ {
+ "output-key-mapping": [
+ {
+ "resource-name": "aai-vf-module-put",
+ "resource-value": ""
+ }
+ ]
+ }
+ ]
+ }
+ ],
+ "resource-accumulator-resolved-data": [
+##RB name
{
"param-name": "vf-module-model-invariant-uuid",
"param-value": "${vf-module-model-invariant-uuid}"
},
+##RB version
{
"param-name": "vf-module-model-version",
"param-value": "${vf-module-model-version}"
},
{
- "param-name": "vf_module_id",
- "param-value": "${vf-module-id}"
- },
- {
- "param-name": "vf_module_type",
- "param-value": "${vf-module-type}"
- },
- {
- "param-name": "int_private1_net_cidr",
- "param-value": "${int_private1_net_cidr}"
- },
- {
- "param-name": "int_private2_net_cidr",
- "param-value": "${int_private2_net_cidr}"
- },
- {
- "param-name": "onap_private_net_cidr",
- "param-value": "${onap_private_net_cidr}"
- },
- {
- "param-name": "pub_key",
- "param-value": "${pub_key}"
- },
- {
"param-name": "k8s-rb-profile-name",
"param-value": "${k8s-rb-profile-name}"
},
@@ -74,26 +108,14 @@
"param-value": "${k8s-rb-profile-namespace}"
},
{
- "param-name": "int_private1_gw_ip",
- "param-value": "${int_private1_gw_ip}"
- },
- {
"param-name": "int_private1_subnet_id",
"param-value": "unprotected-network-subnet-1"
},
{
- "param-name": "int_private2_gw_ip",
- "param-value": "${int_private2_gw_ip}"
- },
- {
"param-name": "int_private2_subnet_id",
"param-value": "protected-network-subnet-1"
},
{
- "param-name": "onap_private_gw_ip",
- "param-value": "${onap_private_gw_ip}"
- },
- {
"param-name": "onap_private_subnet_id",
"param-value": "management-network-subnet-1"
}
diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-mapping.json b/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-mapping.json
index 508c7339..2eae129f 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-mapping.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-mapping.json
@@ -1,893 +1,166 @@
[
- {
- "name": "cloud_env",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "cloud_env",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vpg_int_private1_ip_0",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vpg_int_private1_ip_0",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
{
- "name": "nexus_artifact_repo",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "nexus_artifact_repo",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
-
-
-
- {
- "name": "vfw_int_private2_floating_ip",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vfw_int_private2_floating_ip",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vfw_int_private1_ip_0",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vfw_int_private1_ip_0",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
-
- {
- "name": "vfw_int_private2_ip_0",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
+ "name": "vf-module-model-invariant-uuid",
+ "property": {
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-module-model-invariant-uuid",
+ "dictionary-source": "processor-db",
+ "dependencies": [
+ "vf-module-model-customization-uuid"
+ ]
},
- "input-param": false,
- "dictionary-name": "vfw_int_private2_ip_0",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
-
-
-
-
-
- {
- "name": "private1-prefix-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
-
- },
- "input-param": false,
- "dictionary-name": "private1-prefix-id",
- "dictionary-source": "processor-db",
- "dependencies": [],
- "version": 0
- },
{
- "name": "management-prefix-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
-
- },
- "input-param": false,
- "dictionary-name": "management-prefix-id",
- "dictionary-source": "processor-db",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "onap_private_net_cidr",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "onap_private_net_cidr",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vf-module-name",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- },
- "default": "${vf-module-name}"
- },
- "input-param": false,
- "dictionary-name": "vf-module-name",
- "dictionary-source": "default",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "install_script_version",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
-
+ "name": "vf-module-model-version",
+ "property": {
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-module-model-version",
+ "dictionary-source": "processor-db",
+ "dependencies": [
+ "vf-module-model-customization-uuid"
+ ]
},
- "input-param": false,
- "dictionary-name": "install_script_version",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
{
- "name": "demo_artifacts_version",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
-
+ "name": "management-prefix-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "management-prefix-id",
+ "dictionary-source": "processor-db",
+ "dependencies": [],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "demo_artifacts_version",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
-
-
-
- {
- "name": "nfc-naming-code",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "nfc-naming-code",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vfccustomizationuuid"
- ],
- "version": 0
- },
{
- "name": "int_private1_net_cidr",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "int_private1_net_cidr",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "int_private2_net_cidr",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "int_private2_net_cidr",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "public_net_id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "public_net_id",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
-
- {
- "name": "pub_key",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
+ "name": "service-instance-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "service-instance-id",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "pub_key",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "sec_group",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "sec_group",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "service-instance-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "service-instance-id",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
{
- "name": "vfw_onap_private_ip_0",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- },
- "default": "${vfw_onap_private_ip_0}"
- },
- "input-param": false,
- "dictionary-name": "vfw_onap_private_ip_0",
- "dictionary-source": "default",
- "dependencies": [],
- "version": 0
- },
-
- {
- "name": "vf-module-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vf-module-id",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vf-module-label",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
+ "name": "vf-module-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-module-id",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "vf-module-label",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vf-module-model-customization-uuid"
- ],
- "version": 0
- },
- {
- "name": "vf-module-model-customization-uuid",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vf-module-model-customization-uuid",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vf-module-type",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vf-module-type",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vf-module-model-customization-uuid"
- ],
- "version": 0
- },
{
- "name": "vf-naming-policy",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vf-naming-policy",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
-
- {
- "name": "vfccustomizationuuid",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vfccustomizationuuid",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vf-module-model-customization-uuid"
- ],
- "version": 0
- },
-
- {
- "name": "vnf-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vnf-id",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vnf-model-customization-uuid",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vnf-model-customization-uuid",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vnf_name",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vnf_name",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vnfc-model-invariant-uuid",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vnfc-model-invariant-uuid",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vfccustomizationuuid"
- ],
- "version": 0
- },
- {
- "name": "vfw_image_name",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "image_name",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vfw_flavor_name",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "flavor_name",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vnfc-model-version",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vnfc-model-version",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vfccustomizationuuid"
- ],
- "version": 0
- },
- {
- "name": "dcae_collector_ip",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- },
- "default": "10.0.4.1"
- },
- "input-param": false,
- "dictionary-name": "dcae_collector_ip",
- "dictionary-source": "default",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "dcae_collector_port",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- },
- "default": "30235"
+ "name": "vf-module-label",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-module-label",
+ "dictionary-source": "processor-db",
+ "dependencies": [
+ "vf-module-model-customization-uuid"
+ ],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "dcae_collector_port",
- "dictionary-source": "default",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vf-module-model-invariant-uuid",
- "property": {
- "type": "string"
- },
- "input-param": false,
- "dictionary-name": "vf-module-model-invariant-uuid",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vf-module-model-customization-uuid"
- ]
- },
- {
- "name": "vf-module-model-version",
- "property": {
- "type": "string"
- },
- "input-param": false,
- "dictionary-name": "vf-module-model-version",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vf-module-model-customization-uuid"
- ]
- },
- {
- "name": "k8s-rb-profile-name",
- "property": {
- "description": "Profile name used in multicloud/k8s plugin to identify Helm chart(s) where this mapping is providing override values.",
- "type": "string"
+ {
+ "name": "vf-module-model-customization-uuid",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-module-model-customization-uuid",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "k8s-rb-profile-name",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ]
- },
- {
- "name": "k8s-rb-profile-namespace",
- "property": {
- "description": "K8s namespace to create helm chart for specified profile",
- "type": "string",
- "default": "default"
+ {
+ "name": "vf-naming-policy",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-naming-policy",
+ "dictionary-source": "sdnc",
+ "dependencies": [
+ "service-instance-id",
+ "vnf-id"
+ ],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "k8s-rb-profile-namespace",
- "dictionary-source": "default",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ]
- },
- {
- "name": "onap_private_net_id",
- "property": {
- "description": "onap private net id",
- "type": "string"
+ {
+ "name": "vnf-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vnf-id",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "onap_private_net_id",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ]
- },
- {
- "name": "int_private1_net_id",
- "property": {
- "description": "private1 net id",
- "type": "string"
+ {
+ "name": "vnf_name",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vnf_name",
+ "dictionary-source": "sdnc",
+ "dependencies": [
+ "service-instance-id",
+ "vnf-id"
+ ],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "int_private1_net_id",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ]
- },
- {
- "name": "int_private2_net_id",
- "property": {
- "description": "private2 net id",
- "type": "string"
+ {
+ "name": "k8s-rb-profile-namespace",
+ "property": {
+ "description": "K8s namespace to create helm chart for specified profile",
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "k8s-rb-profile-namespace",
+ "dictionary-source": "sdnc",
+ "dependencies": [
+ "service-instance-id",
+ "vnf-id"
+ ]
},
- "input-param": false,
- "dictionary-name": "int_private2_net_id",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ]
- }
+ {
+ "name": "k8s-rb-profile-name",
+ "property": {
+ "description": "Profile name used in multicloud/k8s plugin to identify Helm chart(s) where this mapping is providing override values.",
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "k8s-rb-profile-name",
+ "dictionary-source": "sdnc",
+ "dependencies": [
+ "service-instance-id",
+ "vnf-id"
+ ]
+ }
]
diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl b/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl
index 414d6865..754ff731 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl
@@ -81,13 +81,7 @@
"output-key-mapping": [
{
"resource-name": "aai-vf-module-put",
- "resource-value": "${status}"
- }
- ],
- "payload": [
- {
- "param-name": "vf-module",
- "param-value": "vf-module"
+ "resource-value": ""
}
]
}
@@ -108,139 +102,17 @@
}
],
"resource-accumulator-resolved-data": [
- {
- "param-name": "service-instance-id",
- "param-value": "${service-instance-id}"
- },
- {
- "param-name": "vnf_name",
- "param-value": "${vnf_name}"
- },
- {
- "param-name": "vnf_model_customization_uuid",
- "param-value": "${vnf-model-customization-uuid}"
- },
+##RB name
{
"param-name": "vf-module-model-invariant-uuid",
"param-value": "${vf-module-model-invariant-uuid}"
},
+##RB version
{
"param-name": "vf-module-model-version",
"param-value": "${vf-module-model-version}"
},
{
- "param-name": "vf_module_id",
- "param-value": "${vf-module-id}"
- },
- {
- "param-name": "vf_module_type",
- "param-value": "${vf-module-type}"
- },
- {
- "param-name": "vf_module_customization_uuid",
- "param-value": "${vf-module-model-customization-uuid}"
- },
- {
- "param-name": "vfc_customization_uuid",
- "param-value": "${vfccustomizationuuid}"
- },
- {
- "param-name": "aic-cloud-region",
- "param-value": "${aic-cloud-region}"
- },
- {
- "param-name": "vnfc-model-customization-uuid",
- "param-value": "${vfccustomizationuuid}"
- },
- {
- "param-name": "vnfc-model-invariant-uuid",
- "param-value": "${vnfc-model-invariant-uuid}"
- },
- {
- "param-name": "vnfc-model-version",
- "param-value": "${vnfc-model-version}"
- },
- {
- "param-name": "nfc-naming-code",
- "param-value": "${nfc-naming-code}"
- },
- {
- "param-name": "vfw_image_name",
- "param-value": "${vfw_image_name}"
- },
- {
- "param-name": "vfw_flavor_name",
- "param-value": "${vfw_flavor_name}"
- },
- {
- "param-name": "public_net_id",
- "param-value": "${public_net_id}"
- },
- {
- "param-name": "pub_key",
- "param-value": "${pub_key}"
- },
- {
- "param-name": "int_private1_net_cidr",
- "param-value": "${int_private1_net_cidr}"
- },
- {
- "param-name": "int_private2_net_cidr",
- "param-value": "${int_private2_net_cidr}"
- },
- {
- "param-name": "onap_private_net_cidr",
- "param-value": "${onap_private_net_cidr}"
- },
- {
- "param-name": "vfw_int_private1_ip_0",
- "param-value": "${vfw_int_private1_ip_0}"
- },
- {
- "param-name": "vfw_int_private2_ip_0",
- "param-value": "${vfw_int_private2_ip_0}"
- },
- {
- "param-name": "vpg_int_private1_ip_0",
- "param-value": "${vpg_int_private1_ip_0}"
- },
- {
- "param-name": "vfw_int_private2_floating_ip",
- "param-value": "${vfw_int_private2_floating_ip}"
- },
- {
- "param-name": "dcae_collector_ip",
- "param-value": "${dcae_collector_ip}"
- },
- {
- "param-name": "dcae_collector_port",
- "param-value": "${dcae_collector_port}"
- },
- {
- "param-name": "demo_artifacts_version",
- "param-value": "${demo_artifacts_version}}"
- },
- {
- "param-name": "install_script_version",
- "param-value": "${install_script_version}"
- },
- {
- "param-name": "key_name",
- "param-value": "${vnf_name}_key_name"
- },
- {
- "param-name": "cloud_env",
- "param-value": "${cloud_env}"
- },
- {
- "param-name": "sec_group",
- "param-value": "${sec_group}"
- },
- {
- "param-name": "nexus_artifact_repo",
- "param-value": "${nexus_artifact_repo}"
- },
- {
"param-name": "k8s-rb-profile-name",
"param-value": "${k8s-rb-profile-name}"
},
diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-mapping.json b/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-mapping.json
index 4dfdaff4..70a95cb8 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-mapping.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-mapping.json
@@ -1,633 +1,186 @@
[
- {
- "name": "cloud_env",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": true,
- "dictionary-name": "cloud_env",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "management-prefix-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
-
- },
- "input-param": false,
- "dictionary-name": "management-prefix-id",
- "dictionary-source": "processor-db",
- "dependencies": [],
- "version": 0
- },
{
- "name": "key_name",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
+ "name": "dcae_collector_ip",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "default": "10.0.4.1"
+ },
+ "input-param": false,
+ "dictionary-name": "dcae_collector_ip",
+ "dictionary-source": "default",
+ "dependencies": [],
+ "version": 0
},
- "input-param": true,
- "dictionary-name": "key_name",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "flavor_name",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": true,
- "dictionary-name": "flavor_name",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
{
- "name": "nexus_artifact_repo",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- },
- "default":"https://nexus.onap.org"
- },
- "input-param": false,
- "dictionary-name": "nexus_artifact_repo",
- "dictionary-source": "default",
- "dependencies": [
- ],
- "version": 0
- },
- {
- "name": "vpg_onap_private_ip_0",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- },
- "default":"${vpg_onap_private_ip_0}"
+ "name": "dcae_collector_port",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "default": "30235"
+ },
+ "input-param": false,
+ "dictionary-name": "dcae_collector_port",
+ "dictionary-source": "default",
+ "dependencies": [],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "vpg_onap_private_ip_0",
- "dictionary-source": "default",
- "dependencies": [
- ],
- "version": 0
- },
-
{
- "name": "int_private1_net_cidr",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
+ "name": "int_private1_net_cidr",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": true,
+ "dictionary-name": "int_private1_net_cidr",
+ "dictionary-source": "processor-db",
+ "dependencies": [],
+ "version": 0
},
- "input-param": true,
- "dictionary-name": "int_private1_net_cidr",
- "dictionary-source": "processor-db",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "onap_private_net_cidr",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": true,
- "dictionary-name": "onap_private_net_cidr",
- "dictionary-source": "processor-db",
- "dependencies": [],
- "version": 0
- },
-
-
{
- "name": "int_private2_net_cidr",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": true,
- "dictionary-name": "int_private2_net_cidr",
- "dictionary-source": "processor-db",
- "dependencies": [],
- "version": 0
- },
-
-
- {
- "name": "demo_artifacts_version",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "demo_artifacts_version",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "image_name",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "image_name",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "install_script_version",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "install_script_version",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "pub_key",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "pub_key",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "public_net_id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
-
- },
- "input-param": false,
- "dictionary-name": "public_net_id",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "sec_group",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "sec_group",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vnf-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
-
- },
- "input-param": false,
- "dictionary-name": "vnf-id",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vnf-model-customization-uuid",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
-
- },
- "input-param": false,
- "dictionary-name": "vnf-model-customization-uuid",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vf-naming-policy",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- },
- "default": "SDNC_Policy.Config_MS_ONAP_CNF_NAMING_TIMESTAMP"
- },
- "input-param": false,
- "dictionary-name": "vf-naming-policy",
- "dictionary-source": "default",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vnf_name",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- },
- "default": "${vnf_name}"
+ "name": "onap_private_net_cidr",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": true,
+ "dictionary-name": "onap_private_net_cidr",
+ "dictionary-source": "processor-db",
+ "dependencies": [],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "vnf_name",
- "dictionary-source": "default",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vpg_int_private1_ip_0",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- },
- "default": "${vpg_int_private1_ip_0}"
- },
- "input-param": false,
- "dictionary-name": "vpg_int_private1_ip_0",
- "dictionary-source": "default",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "aic-cloud-region",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
-
- },
- "input-param": false,
- "dictionary-name": "aic-cloud-region",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vfw_int_private2_ip_0",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- },
- "default": "${vfw_int_private2_ip_0}"
- },
- "input-param": false,
- "dictionary-name": "vfw_int_private2_ip_0",
- "dictionary-source": "default",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vfw_int_private1_ip_0",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- },
- "default": "${vfw_int_private1_ip_0}"
- },
- "input-param": false,
- "dictionary-name": "vfw_int_private1_ip_0",
- "dictionary-source": "default",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vsn_int_private2_ip_0",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- },
- "default": "${vsn_int_private2_ip_0}"
+ {
+ "name": "int_private2_net_cidr",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": true,
+ "dictionary-name": "int_private2_net_cidr",
+ "dictionary-source": "processor-db",
+ "dependencies": [],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "vsn_int_private2_ip_0",
- "dictionary-source": "default",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "service-instance-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
-
+ {
+ "name": "demo_artifacts_version",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "default": "1.5.0"
+ },
+ "input-param": false,
+ "dictionary-name": "demo_artifacts_version",
+ "dictionary-source": "default",
+ "dependencies": [],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "service-instance-id",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
-
- {
- "name": "private1-prefix-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
-
+ {
+ "name": "vnf-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vnf-id",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "private1-prefix-id",
- "dictionary-source": "processor-db",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "private2-prefix-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
-
+ {
+ "name": "vf-naming-policy",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "default": "SDNC_Policy.Config_MS_ONAP_CNF_NAMING_TIMESTAMP"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-naming-policy",
+ "dictionary-source": "default",
+ "dependencies": [],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "private2-prefix-id",
- "dictionary-source": "processor-db",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "k8s-rb-profile-name",
- "property": {
- "description": "Profile name used in multicloud/k8s plugin to identify Helm chart(s) where this mapping is providing override values.",
- "type": "string",
- "default": "vfw-cnf-cds-base-profile"
+ {
+ "name": "aic-cloud-region",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "aic-cloud-region",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "k8s-rb-profile-name",
- "dictionary-source": "default",
- "dependencies": [
- ]
- },
- {
- "name": "k8s-rb-profile-namespace",
- "property": {
- "description": "K8s namespace to create helm chart for specified profile",
- "type": "string",
- "default": "default"
+ {
+ "name": "service-instance-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "service-instance-id",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "k8s-rb-profile-namespace",
- "dictionary-source": "default",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ]
- },
- {
- "name": "int_private1_gw_ip",
- "property": {
- "description": "Private unprotected network gateway ip",
- "type": "string",
- "default": "${int_private1_gw_ip}"
+ {
+ "name": "private1-prefix-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "private1-prefix-id",
+ "dictionary-source": "processor-db",
+ "dependencies": [],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "int_private1_gw_ip",
- "dictionary-source": "default",
- "dependencies": [
- ]
- },
- {
- "name": "int_private2_gw_ip",
- "property": {
- "description": "Private protected network gateway ip",
- "type": "string",
- "default": "${int_private2_gw_ip}"
+ {
+ "name": "private2-prefix-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "private2-prefix-id",
+ "dictionary-source": "processor-db",
+ "dependencies": [],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "int_private2_gw_ip",
- "dictionary-source": "default",
- "dependencies": [
- ]
- },
- {
- "name": "onap_private_gw_ip",
- "property": {
- "description": "Private onap management network gateway ip",
- "type": "string",
- "default": "${onap_private_gw_ip}"
+ {
+ "name": "k8s-rb-profile-name",
+ "property": {
+ "description": "Profile name used in multicloud/k8s plugin to identify Helm chart(s) where this mapping is providing override values.",
+ "type": "string",
+ "default": "vfw-cnf-cds-base-profile"
+ },
+ "input-param": false,
+ "dictionary-name": "k8s-rb-profile-name",
+ "dictionary-source": "default",
+ "dependencies": []
},
- "input-param": false,
- "dictionary-name": "onap_private_gw_ip",
- "dictionary-source": "default",
- "dependencies": [
- ]
- }
+ {
+ "name": "k8s-rb-profile-namespace",
+ "property": {
+ "description": "K8s namespace to create helm chart for specified profile",
+ "type": "string",
+ "default": "default"
+ },
+ "input-param": false,
+ "dictionary-name": "k8s-rb-profile-namespace",
+ "dictionary-source": "default",
+ "dependencies": []
+ }
]
diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-template.vtl b/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-template.vtl
index 3e235e26..7acdc544 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-template.vtl
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-template.vtl
@@ -97,32 +97,6 @@
{
"output-key-mapping": [
{
- "resource-name": "onap_private_gw_ip",
- "resource-value": "${onap_private_gw_ip}"
- }
- ],
- "payload": [
- {
- "param-name": "service-instance-id",
- "param-value": "${service-instance-id}"
- },
- {
- "param-name": "prefix-id",
- "param-value": "${management-prefix-id}"
- },
- {
- "param-name": "vnf-id",
- "param-value": "${vnf-id}"
- },
- {
- "param-name": "external_key",
- "param-value": "${vnf-id}-onap_private_gw_ip"
- }
- ]
- },
- {
- "output-key-mapping": [
- {
"resource-name": "vfw_int_private2_ip_0",
"resource-value": "${vfw_int_private2_ip_0}"
}
@@ -175,32 +149,6 @@
{
"output-key-mapping": [
{
- "resource-name": "vfw_int_private2_floating_ip",
- "resource-value": "${vfw_int_private2_floating_ip}"
- }
- ],
- "payload": [
- {
- "param-name": "service-instance-id",
- "param-value": "${service-instance-id}"
- },
- {
- "param-name": "prefix-id",
- "param-value": "${private1-prefix-id}"
- },
- {
- "param-name": "vnf-id",
- "param-value": "${vnf-id}"
- },
- {
- "param-name": "external_key",
- "param-value": "${vnf-id}-vfw_int_private2_floating_ip"
- }
- ]
- },
- {
- "output-key-mapping": [
- {
"resource-name": "vsn_int_private2_ip_0",
"resource-value": "${vsn_int_private2_ip_0}"
}
@@ -227,32 +175,6 @@
{
"output-key-mapping": [
{
- "resource-name": "vpg_onap_private_ip_0",
- "resource-value": "${vpg_onap_private_ip_0}"
- }
- ],
- "payload": [
- {
- "param-name": "service-instance-id",
- "param-value": "${service-instance-id}"
- },
- {
- "param-name": "prefix-id",
- "param-value": "${management-prefix-id}"
- },
- {
- "param-name": "vnf-id",
- "param-value": "${vnf-id}"
- },
- {
- "param-name": "external_key",
- "param-value": "${vnf-id}-vpg_onap_private_ip_0"
- }
- ]
- },
- {
- "output-key-mapping": [
- {
"resource-name": "vpg_int_private1_ip_0",
"resource-value": "${vpg_int_private1_ip_0}"
}
@@ -306,32 +228,16 @@
],
"resource-accumulator-resolved-data": [
{
- "param-name": "service-instance-id",
- "param-value": "${service-instance-id}"
- },
- {
- "param-name": "vnf-model-customization-uuid",
- "param-value": "${vnf-model-customization-uuid}"
- },
- {
- "param-name": "aic-cloud-region",
- "param-value": "${aic-cloud-region}"
- },
- {
"param-name": "vf-naming-policy",
"param-value": "${vf-naming-policy}"
},
{
- "param-name": "image_name",
- "param-value": "${image_name}"
- },
- {
- "param-name": "flavor_name",
- "param-value": "${flavor_name}"
+ "param-name": "dcae_collector_ip",
+ "param-value": "${dcae_collector_ip}"
},
{
- "param-name": "public_net_id",
- "param-value": "${public_net_id}"
+ "param-name": "dcae_collector_port",
+ "param-value": "${dcae_collector_port}"
},
{
"param-name": "int_private1_net_cidr",
@@ -350,26 +256,6 @@
"param-value": "${demo_artifacts_version}"
},
{
- "param-name": "install_script_version",
- "param-value": "${install_script_version}"
- },
- {
- "param-name": "pub_key",
- "param-value": "${pub_key}"
- },
- {
- "param-name": "cloud_env",
- "param-value": "${cloud_env}"
- },
- {
- "param-name": "sec_group",
- "param-value": "${sec_group}"
- },
- {
- "param-name": "nexus_artifact_repo",
- "param-value": "${nexus_artifact_repo}"
- },
- {
"param-name": "k8s-rb-profile-name",
"param-value": "${k8s-rb-profile-name}"
},
diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-mapping.json b/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-mapping.json
index 2e3905cc..4a1b9150 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-mapping.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-mapping.json
@@ -1,835 +1,166 @@
[
- {
- "name": "cloud_env",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- },
- "default": "openstack"
- },
- "input-param": false,
- "dictionary-name": "cloud_env",
- "dictionary-source": "default",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "nexus_artifact_repo",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "nexus_artifact_repo",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vf-module-name",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- },
- "default": "${vf-module-name}"
- },
- "input-param": false,
- "dictionary-name": "vf-module-name",
- "dictionary-source": "default",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "demo_artifacts_version",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "demo_artifacts_version",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "install_script_version",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "install_script_version",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "aic-cloud-region",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "aic-cloud-region",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "nfc-naming-code",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "nfc-naming-code",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vfccustomizationuuid"
- ],
- "version": 0
- },
- {
- "name": "onap_private_net_cidr",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "onap_private_net_cidr",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "public_net_id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "public_net_id",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "sec_group",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "sec_group",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "service-instance-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "service-instance-id",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vf-module-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vf-module-id",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vf-module-label",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vf-module-label",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vf-module-model-customization-uuid"
- ],
- "version": 0
- },
- {
- "name": "vf-module-model-customization-uuid",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vf-module-model-customization-uuid",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vf-module-type",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vf-module-type",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vf-module-model-customization-uuid"
- ],
- "version": 0
- },
- {
- "name": "vf-naming-policy",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vf-naming-policy",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vfccustomizationuuid",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vfccustomizationuuid",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vf-module-model-customization-uuid"
- ],
- "version": 0
- },
- {
- "name": "vpg_flavor_name",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "flavor_name",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vpg_image_name",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "image_name",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vnf_name",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vnf_name",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "private2-prefix-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
-
- },
- "input-param": false,
- "dictionary-name": "private2-prefix-id",
- "dictionary-source": "processor-db",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "management-prefix-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
-
- },
- "input-param": false,
- "dictionary-name": "management-prefix-id",
- "dictionary-source": "processor-db",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vnf-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vnf-id",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vnf-model-customization-uuid",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vnf-model-customization-uuid",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vnfc-model-invariant-uuid",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vnfc-model-invariant-uuid",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vfccustomizationuuid"
- ],
- "version": 0
- },
- {
- "name": "vnfc-model-version",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vnfc-model-version",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vfccustomizationuuid"
- ],
- "version": 0
- },
- {
- "name": "vfw_int_private1_ip_0",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vfw_int_private1_ip_0",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "int_private1_net_cidr",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "int_private1_net_cidr",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "int_private2_net_cidr",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "int_private2_net_cidr",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vpg_onap_private_ip_0",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vpg_onap_private_ip_0",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vpg_int_private1_ip_0",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vpg_int_private1_ip_0",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vsn_int_private2_ip_0",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vsn_int_private2_ip_0",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "dcae_collector_ip",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- },
- "default": "10.0.4.1"
- },
- "input-param": false,
- "dictionary-name": "dcae_collector_ip",
- "dictionary-source": "default",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "dcae_collector_port",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- },
- "default": "30235"
- },
- "input-param": false,
- "dictionary-name": "dcae_collector_port",
- "dictionary-source": "default",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vf-module-model-invariant-uuid",
- "property": {
- "type": "string"
- },
- "input-param": false,
- "dictionary-name": "vf-module-model-invariant-uuid",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vf-module-model-customization-uuid"
- ]
- },
- {
- "name": "vf-module-model-version",
- "property": {
- "type": "string"
- },
- "input-param": false,
- "dictionary-name": "vf-module-model-version",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vf-module-model-customization-uuid"
- ]
- },
- {
- "name": "k8s-rb-profile-name",
- "property": {
- "description": "Profile name used in multicloud/k8s plugin to identify Helm chart(s) where this mapping is providing override values.",
- "type": "string"
- },
- "input-param": false,
- "dictionary-name": "k8s-rb-profile-name",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ]
- },
- {
- "name": "onap_private_net_id",
- "property": {
- "description": "onap private net id",
- "type": "string"
- },
- "input-param": false,
- "dictionary-name": "onap_private_net_id",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ]
- },
- {
- "name": "int_private1_net_id",
- "property": {
- "description": "private1 net id",
- "type": "string"
- },
- "input-param": false,
- "dictionary-name": "int_private1_net_id",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ]
- },
- {
- "name": "k8s-rb-profile-namespace",
- "property": {
- "description": "K8s namespace to create helm chart for specified profile",
- "type": "string",
- "default": "default"
- },
- "input-param": false,
- "dictionary-name": "k8s-rb-profile-namespace",
- "dictionary-source": "default",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ]
- }
+ {
+ "name": "vf-module-model-invariant-uuid",
+ "property": {
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-module-model-invariant-uuid",
+ "dictionary-source": "processor-db",
+ "dependencies": [
+ "vf-module-model-customization-uuid"
+ ]
+ },
+ {
+ "name": "vf-module-model-version",
+ "property": {
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-module-model-version",
+ "dictionary-source": "processor-db",
+ "dependencies": [
+ "vf-module-model-customization-uuid"
+ ]
+ },
+ {
+ "name": "management-prefix-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "management-prefix-id",
+ "dictionary-source": "processor-db",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "service-instance-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "service-instance-id",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "vf-module-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-module-id",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "vf-module-label",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-module-label",
+ "dictionary-source": "processor-db",
+ "dependencies": [
+ "vf-module-model-customization-uuid"
+ ],
+ "version": 0
+ },
+ {
+ "name": "vf-module-model-customization-uuid",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-module-model-customization-uuid",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "vf-naming-policy",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-naming-policy",
+ "dictionary-source": "sdnc",
+ "dependencies": [
+ "service-instance-id",
+ "vnf-id"
+ ],
+ "version": 0
+ },
+ {
+ "name": "vnf_name",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vnf_name",
+ "dictionary-source": "sdnc",
+ "dependencies": [
+ "service-instance-id",
+ "vnf-id"
+ ],
+ "version": 0
+ },
+ {
+ "name": "vnf-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vnf-id",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "k8s-rb-profile-namespace",
+ "property": {
+ "description": "K8s namespace to create helm chart for specified profile",
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "k8s-rb-profile-namespace",
+ "dictionary-source": "sdnc",
+ "dependencies": [
+ "service-instance-id",
+ "vnf-id"
+ ]
+ },
+ {
+ "name": "k8s-rb-profile-name",
+ "property": {
+ "description": "Profile name used in multicloud/k8s plugin to identify Helm chart(s) where this mapping is providing override values.",
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "k8s-rb-profile-name",
+ "dictionary-source": "sdnc",
+ "dependencies": [
+ "service-instance-id",
+ "vnf-id"
+ ]
+ }
]
diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-template.vtl b/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-template.vtl
index 55ad7906..6f0461bb 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-template.vtl
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-template.vtl
@@ -1,6 +1,37 @@
{
"capability-data": [
{
+ "capability-name": "netbox-ip-assign",
+ "key-mapping": [
+ {
+ "output-key-mapping": [
+ {
+ "resource-name": "vpg_onap_private_ip_0",
+ "resource-value": "${vpg_onap_private_ip_0}"
+ }
+ ],
+ "payload": [
+ {
+ "param-name": "service-instance-id",
+ "param-value": "${service-instance-id}"
+ },
+ {
+ "param-name": "prefix-id",
+ "param-value": "${management-prefix-id}"
+ },
+ {
+ "param-name": "vnf-id",
+ "param-value": "${vnf-id}"
+ },
+ {
+ "param-name": "external_key",
+ "param-value": "${vnf-id}-vpg_onap_private_ip_0"
+ }
+ ]
+ }
+ ]
+ },
+ {
"capability-name": "generate-name",
"key-mapping": [
{
@@ -50,13 +81,7 @@
"output-key-mapping": [
{
"resource-name": "aai-vf-module-put",
- "resource-value": "${status}"
- }
- ],
- "payload": [
- {
- "param-name": "vf-module",
- "param-value": "vf-module"
+ "resource-value": ""
}
]
}
@@ -77,135 +102,17 @@
}
],
"resource-accumulator-resolved-data": [
- {
- "param-name": "service-instance-id",
- "param-value": "${service-instance-id}"
- },
- {
- "param-name": "vnf_name",
- "param-value": "${vnf_name}"
- },
- {
- "param-name": "vnf_model_customization_uuid",
- "param-value": "${vnf-model-customization-uuid}"
- },
+##RB name
{
"param-name": "vf-module-model-invariant-uuid",
"param-value": "${vf-module-model-invariant-uuid}"
},
+##RB version
{
"param-name": "vf-module-model-version",
"param-value": "${vf-module-model-version}"
},
{
- "param-name": "vf_module_id",
- "param-value": "${vf-module-id}"
- },
- {
- "param-name": "vf_module_type",
- "param-value": "${vf-module-type}"
- },
- {
- "param-name": "vf_module_customization_uuid",
- "param-value": "${vf-module-model-customization-uuid}"
- },
- {
- "param-name": "vfc_customization_uuid",
- "param-value": "${vfccustomizationuuid}"
- },
- {
- "param-name": "aic-cloud-region",
- "param-value": "${aic-cloud-region}"
- },
- {
- "param-name": "vnfc-model-customization-uuid",
- "param-value": "${vfccustomizationuuid}"
- },
- {
- "param-name": "vnfc-model-invariant-uuid",
- "param-value": "${vnfc-model-invariant-uuid}"
- },
- {
- "param-name": "vnfc-model-version",
- "param-value": "${vnfc-model-version}"
- },
- {
- "param-name": "nfc-naming-code",
- "param-value": "${nfc-naming-code}"
- },
- {
- "param-name": "vpg_image_name",
- "param-value": "${vpg_image_name}"
- },
- {
- "param-name": "vpg_flavor_name",
- "param-value": "${vpg_flavor_name}"
- },
- {
- "param-name": "public_net_id",
- "param-value": "${public_net_id}"
- },
- {
- "param-name": "int_private1_net_cidr",
- "param-value": "${int_private1_net_cidr}"
- },
- {
- "param-name": "onap_private_net_cidr",
- "param-value": "${onap_private_net_cidr}"
- },
- {
- "param-name": "int_private2_net_cidr",
- "param-value": "${int_private2_net_cidr}"
- },
- {
- "param-name": "vfw_int_private1_ip_0",
- "param-value": "${vfw_int_private1_ip_0}"
- },
- {
- "param-name": "vpg_int_private1_ip_0",
- "param-value": "${vpg_int_private1_ip_0}"
- },
- {
- "param-name": "vsn_int_private2_ip_0",
- "param-value": "${vsn_int_private2_ip_0}"
- },
- {
- "param-name": "dcae_collector_ip",
- "param-value": "${dcae_collector_ip}"
- },
- {
- "param-name": "dcae_collector_port",
- "param-value": "${dcae_collector_port}"
- },
- {
- "param-name": "demo_artifacts_version",
- "param-value": "${demo_artifacts_version}}"
- },
- {
- "param-name": "install_script_version",
- "param-value": "${install_script_version}}"
- },
- {
- "param-name": "key_name",
- "param-value": "${vnf_name}_key_name"
- },
- {
- "param-name": "cloud_env",
- "param-value": "${cloud_env}"
- },
- {
- "param-name": "sec_group",
- "param-value": "${sec_group}"
- },
- {
- "param-name": "nexus_artifact_repo",
- "param-value": "${nexus_artifact_repo}"
- },
- {
- "param-name": "vpg_onap_private_ip_0",
- "param-value": "${vpg_onap_private_ip_0}"
- },
- {
"param-name": "k8s-rb-profile-name",
"param-value": "${k8s-rb-profile-name}"
},
diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-mapping.json b/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-mapping.json
index 5803ea65..3d3bbd22 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-mapping.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-mapping.json
@@ -1,752 +1,166 @@
[
- {
- "name": "cloud_env",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- },
- "default": "openstack"
- },
- "input-param": false,
- "dictionary-name": "cloud_env",
- "dictionary-source": "default",
- "dependencies": [],
- "version": 0
- },
{
- "name": "nexus_artifact_repo",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "nexus_artifact_repo",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
-
- {
- "name": "vf-module-name",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- },
- "default": "${vf-module-name}"
- },
- "input-param": false,
- "dictionary-name": "vf-module-name",
- "dictionary-source": "default",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "nfc-naming-code",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "nfc-naming-code",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vfccustomizationuuid"
- ],
- "version": 0
- },
- {
- "name": "demo_artifacts_version",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "demo_artifacts_version",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
-
- {
- "name": "install_script_version",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "install_script_version",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vnf_name",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vnf_name",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "onap_private_net_cidr",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "onap_private_net_cidr",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "int_private2_net_cidr",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "int_private2_net_cidr",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "int_private1_net_cidr",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "int_private1_net_cidr",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "public_net_id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "public_net_id",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "sec_group",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "sec_group",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "service-instance-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "service-instance-id",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vf-module-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vf-module-id",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vf-module-label",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vf-module-label",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vf-module-model-customization-uuid"
- ],
- "version": 0
- },
- {
- "name": "vf-module-model-customization-uuid",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vf-module-model-customization-uuid",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vf-module-type",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vf-module-type",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vf-module-model-customization-uuid"
- ],
- "version": 0
- },
- {
- "name": "vf-naming-policy",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vf-naming-policy",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vfccustomizationuuid",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
+ "name": "vf-module-model-invariant-uuid",
+ "property": {
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-module-model-invariant-uuid",
+ "dictionary-source": "processor-db",
+ "dependencies": [
+ "vf-module-model-customization-uuid"
+ ]
},
- "input-param": false,
- "dictionary-name": "vfccustomizationuuid",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vf-module-model-customization-uuid"
- ],
- "version": 0
- },
-
- {
- "name": "vsn_flavor_name",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "flavor_name",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vsn_image_name",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "image_name",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vnf-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vnf-id",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vnf-model-customization-uuid",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vnf-model-customization-uuid",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vnfc-model-invariant-uuid",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vnfc-model-invariant-uuid",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vfccustomizationuuid"
- ],
- "version": 0
- },
- {
- "name": "vnfc-model-version",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vnfc-model-version",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vfccustomizationuuid"
- ],
- "version": 0
- },
- {
- "name": "vsn_int_private2_ip_0",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vsn_int_private2_ip_0",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vfw_int_private2_ip_0",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
+ {
+ "name": "vf-module-model-version",
+ "property": {
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-module-model-version",
+ "dictionary-source": "processor-db",
+ "dependencies": [
+ "vf-module-model-customization-uuid"
+ ]
},
- "input-param": false,
- "dictionary-name": "vfw_int_private2_ip_0",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vsn_onap_private_ip_0",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- },
- "default": "${vsn_onap_private_ip_0}"
+ {
+ "name": "vnf_name",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vnf_name",
+ "dictionary-source": "sdnc",
+ "dependencies": [
+ "service-instance-id",
+ "vnf-id"
+ ],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "vsn_onap_private_ip_0",
- "dictionary-source": "default",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "private1-prefix-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
-
+ {
+ "name": "service-instance-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "service-instance-id",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "private1-prefix-id",
- "dictionary-source": "processor-db",
- "dependencies": [],
- "version": 0
- },
{
- "name": "management-prefix-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
-
+ "name": "vf-module-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-module-id",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "management-prefix-id",
- "dictionary-source": "processor-db",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "private2-prefix-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
-
+ {
+ "name": "vf-module-label",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-module-label",
+ "dictionary-source": "processor-db",
+ "dependencies": [
+ "vf-module-model-customization-uuid"
+ ],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "private2-prefix-id",
- "dictionary-source": "processor-db",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vf-module-model-invariant-uuid",
- "property": {
- "type": "string"
+ {
+ "name": "vf-module-model-customization-uuid",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-module-model-customization-uuid",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "vf-module-model-invariant-uuid",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vf-module-model-customization-uuid"
- ]
- },
- {
- "name": "vf-module-model-version",
- "property": {
- "type": "string"
+ {
+ "name": "vf-naming-policy",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-naming-policy",
+ "dictionary-source": "sdnc",
+ "dependencies": [
+ "service-instance-id",
+ "vnf-id"
+ ],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "vf-module-model-version",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vf-module-model-customization-uuid"
- ]
- },
- {
- "name": "k8s-rb-profile-name",
- "property": {
- "description": "Profile name used in multicloud/k8s plugin to identify Helm chart(s) where this mapping is providing override values.",
- "type": "string"
+ {
+ "name": "vnf-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vnf-id",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "k8s-rb-profile-name",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ]
- },
- {
- "name": "k8s-rb-profile-namespace",
- "property": {
- "description": "K8s namespace to create helm chart for specified profile",
- "type": "string",
- "default": "default"
+ {
+ "name": "management-prefix-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "management-prefix-id",
+ "dictionary-source": "processor-db",
+ "dependencies": [],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "k8s-rb-profile-namespace",
- "dictionary-source": "default",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ]
- },
- {
- "name": "int_private2_gw_ip",
- "property": {
- "description": "Private protected network gateway ip",
- "type": "string"
+ {
+ "name": "k8s-rb-profile-namespace",
+ "property": {
+ "description": "K8s namespace to create helm chart for specified profile",
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "k8s-rb-profile-namespace",
+ "dictionary-source": "sdnc",
+ "dependencies": [
+ "service-instance-id",
+ "vnf-id"
+ ]
},
- "input-param": false,
- "dictionary-name": "int_private2_gw_ip",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ]
- }
+ {
+ "name": "k8s-rb-profile-name",
+ "property": {
+ "description": "Profile name used in multicloud/k8s plugin to identify Helm chart(s) where this mapping is providing override values.",
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "k8s-rb-profile-name",
+ "dictionary-source": "sdnc",
+ "dependencies": [
+ "service-instance-id",
+ "vnf-id"
+ ]
+ }
]
diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-template.vtl b/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-template.vtl
index f71379c2..394bf16c 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-template.vtl
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-template.vtl
@@ -81,13 +81,7 @@
"output-key-mapping": [
{
"resource-name": "aai-vf-module-put",
- "resource-value": "${status}"
- }
- ],
- "payload": [
- {
- "param-name": "vf-module",
- "param-value": "vf-module"
+ "resource-value": ""
}
]
}
@@ -108,125 +102,23 @@
}
],
"resource-accumulator-resolved-data": [
- {
- "param-name": "service-instance-id",
- "param-value": "${service-instance-id}"
- },
- {
- "param-name": "vnf_name",
- "param-value": "${vnf_name}"
- },
- {
- "param-name": "vnf_model_customization_uuid",
- "param-value": "${vnf-model-customization-uuid}"
- },
+##RB name
{
"param-name": "vf-module-model-invariant-uuid",
"param-value": "${vf-module-model-invariant-uuid}"
},
+##RB version
{
"param-name": "vf-module-model-version",
"param-value": "${vf-module-model-version}"
},
{
- "param-name": "vf_module_id",
- "param-value": "${vf-module-id}"
- },
- {
- "param-name": "vf_module_type",
- "param-value": "${vf-module-type}"
- },
- {
- "param-name": "vf_module_customization_uuid",
- "param-value": "${vf-module-model-customization-uuid}"
- },
- {
- "param-name": "vfc_customization_uuid",
- "param-value": "${vfccustomizationuuid}"
- },
- {
- "param-name": "aic-cloud-region",
- "param-value": "${aic-cloud-region}"
- },
- {
- "param-name": "vnfc-model-customization-uuid",
- "param-value": "${vfccustomizationuuid}"
- },
- {
- "param-name": "vnfc-model-invariant-uuid",
- "param-value": "${vnfc-model-invariant-uuid}"
- },
- {
- "param-name": "vnfc-model-version",
- "param-value": "${vnfc-model-version}"
- },
- {
- "param-name": "nfc-naming-code",
- "param-value": "${nfc-naming-code}"
- },
- {
- "param-name": "vsn_image_name",
- "param-value": "${vsn_image_name}"
- },
- {
- "param-name": "vsn_flavor_name",
- "param-value": "${vsn_flavor_name}"
- },
- {
- "param-name": "public_net_id",
- "param-value": "${public_net_id}"
- },
- {
- "param-name": "int_private2_net_cidr",
- "param-value": "${int_private2_net_cidr}"
- },
- {
- "param-name": "onap_private_net_cidr",
- "param-value": "${onap_private_net_cidr}"
- },
- {
- "param-name": "vfw_int_private2_ip_0",
- "param-value": "${vfw_int_private2_ip_0}"
- },
- {
- "param-name": "vsn_int_private2_ip_0",
- "param-value": "${vsn_int_private2_ip_0}"
- },
- {
- "param-name": "demo_artifacts_version",
- "param-value": "${demo_artifacts_version}"
- },
- {
- "param-name": "install_script_version",
- "param-value": "${install_script_version}"
- },
- {
- "param-name": "key_name",
- "param-value": "${vnf_name}_key_name"
- },
- {
- "param-name": "cloud_env",
- "param-value": "openstack"
- },
- {
- "param-name": "sec_group",
- "param-value": "${sec_group}"
- },
- {
- "param-name": "nexus_artifact_repo",
- "param-value": "${nexus_artifact_repo}"
- },
- {
"param-name": "k8s-rb-profile-name",
"param-value": "${k8s-rb-profile-name}"
},
{
"param-name": "k8s-rb-profile-namespace",
"param-value": "${k8s-rb-profile-namespace}"
- },
- {
- "param-name": "int_private2_gw_ip",
- "param-value": "${int_private2_gw_ip}"
}
]
}