diff options
Diffstat (limited to 'heat/vFW_CNF_CDS/templates/cba')
6 files changed, 2 insertions, 166 deletions
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 94b09434..52d89c17 100644 --- a/heat/vFW_CNF_CDS/templates/cba/Definitions/data_types.json +++ b/heat/vFW_CNF_CDS/templates/cba/Definitions/data_types.json @@ -264,11 +264,6 @@ "type" : "" } }, - "int_private2_subnet_id" : { - "description" : "Private protected subnetwork identification", - "type" : "string", - "default" : "${int_private2_subnet_id}" - }, "vfccustomizationuuid" : { "description" : "", "required" : false, @@ -388,11 +383,6 @@ "type" : "string", "default" : "default" }, - "int_private1_subnet_id" : { - "description" : "Private unprotected subnetwork identification", - "type" : "string", - "default" : "${int_private1_subnet_id}" - }, "vnf_name" : { "description" : "", "required" : false, @@ -403,16 +393,6 @@ "type" : "" } }, - "onap_private_subnet_id" : { - "description" : "", - "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "entry_schema" : { - "type" : "" - } - }, "aic-cloud-region" : { "description" : "", "required" : false, 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 89342dbf..ba31cfc8 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 @@ -406,42 +406,6 @@ } } }, - "int_private1_subnet_id" : { - "tags" : "k8s, cnf, int_private1_subnet_id", - "name" : "int_private1_subnet_id", - "property" : { - "description" : "Private unprotected subnetwork 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_subnet_id", - "path" : "/param/0/value", - "input-key-mapping" : { - "service-instance-id" : "service-instance-id", - "vnf-id" : "vnf-id" - }, - "output-key-mapping" : { - "int_private1_subnet_id" : "value" - }, - "key-dependencies" : [ "service-instance-id", "vnf-id" ] - } - } - } - }, "int_private2_gw_ip" : { "tags" : "k8s, cnf, int_private2_gw_ip", "name" : "int_private2_gw_ip", @@ -562,44 +526,8 @@ } } }, - "int_private2_subnet_id" : { - "tags" : "k8s, cnf, int_private2_subnet_id", - "name" : "int_private2_subnet_id", - "property" : { - "description" : "Private protected subnetwork 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_subnet_id", - "path" : "/param/0/value", - "input-key-mapping" : { - "service-instance-id" : "service-instance-id", - "vnf-id" : "vnf-id" - }, - "output-key-mapping" : { - "int_private2_subnet_id" : "value" - }, - "key-dependencies" : [ "service-instance-id", "vnf-id" ] - } - } - } - }, "k8s-rb-profile-name" : { - "tags" : "k8s, cnf, profile", + "tags" : "k8s, cnf, profile, k8s-rb-profile-name", "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.", @@ -635,7 +563,7 @@ } }, "k8s-rb-profile-namespace" : { - "tags" : "k8s-rb-profile-namespace", + "tags" : "k8s, cnf, profile, namespace, k8s-rb-profile-namespace", "name" : "k8s-rb-profile-namespace", "property" : { "description" : "Profile name used in multicloud/k8s plugin", @@ -944,42 +872,6 @@ } } }, - "onap_private_subnet_id" : { - "tags" : "onap_private_subnet_id", - "name" : "onap_private_subnet_id", - "property" : { - "description" : "onap_private_subnet_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_subnet_id", - "path" : "/param/0/value", - "input-key-mapping" : { - "service-instance-id" : "service-instance-id", - "vnf-id" : "vnf-id" - }, - "output-key-mapping" : { - "onap_private_subnet_id" : "value" - }, - "key-dependencies" : [ "service-instance-id", "vnf-id" ] - } - } - } - }, "private1-prefix-id" : { "tags" : "private1-prefix-id", "name" : "private1-prefix-id", 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 31067a35..320c1ac4 100644 --- a/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-mapping.json +++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-mapping.json @@ -885,20 +885,6 @@ ] }, { - "name": "onap_private_subnet_id", - "property": { - "description": "onap private subnet id", - "type": "string" - }, - "input-param": false, - "dictionary-name": "onap_private_subnet_id", - "dictionary-source": "sdnc", - "dependencies": [ - "service-instance-id", - "vnf-id" - ] - }, - { "name": "int_private1_net_id", "property": { "description": "private1 net 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 c85af209..820df768 100644 --- a/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl +++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl @@ -180,10 +180,6 @@ "param-value": "${int_private2_net_cidr}" }, { - "param-name": "onap_private_subnet_id", - "param-value": "${onap_private_subnet_id}" - }, - { "param-name": "onap_private_net_cidr", "param-value": "${onap_private_net_cidr}" }, 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 5c665c12..68ae6b06 100644 --- a/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-mapping.json +++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-mapping.json @@ -825,20 +825,6 @@ ] }, { - "name": "onap_private_subnet_id", - "property": { - "description": "onap private subnet id", - "type": "string" - }, - "input-param": false, - "dictionary-name": "onap_private_subnet_id", - "dictionary-source": "sdnc", - "dependencies": [ - "service-instance-id", - "vnf-id" - ] - }, - { "name": "int_private1_net_id", "property": { "description": "private1 net 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 27651e4a..3b0453d1 100644 --- a/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-template.vtl +++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-template.vtl @@ -141,10 +141,6 @@ "param-value": "${int_private1_net_cidr}" }, { - "param-name": "onap_private_subnet_id", - "param-value": "${onap_private_subnet_id}" - }, - { "param-name": "onap_private_net_cidr", "param-value": "${onap_private_net_cidr}" }, |