aboutsummaryrefslogtreecommitdiffstats
path: root/heat
diff options
context:
space:
mode:
authorKonrad Bańka <k.banka@samsung.com>2020-01-24 11:06:14 +0100
committerKonrad Bańka <k.banka@samsung.com>2020-02-26 16:16:41 +0100
commitbe3024dfe9b6c06419c6f4a5f724a01b7e0ab103 (patch)
treedf44d4b265d40fd225844485c1de860c13d9966a /heat
parent42ecc70c1f5a05c4de5dda414a7964398552b47d (diff)
Correct CBA package for vFW_CNF_CDS usecase
This fixes change helm and cba content to enable instantiation with some workarounds. Data dictionary in this review is not ready yet, as well as there are many workarounds within. Signed-off-by: Konrad Bańka <k.banka@samsung.com> Issue-ID: INT-1260 Change-Id: I4833fa11772b7bd2b65d04f0d81ffad22570d309
Diffstat (limited to 'heat')
-rw-r--r--heat/vFW_CNF_CDS/templates/Makefile19
-rw-r--r--heat/vFW_CNF_CDS/templates/base/MANIFEST.json4
-rw-r--r--heat/vFW_CNF_CDS/templates/base/base_template.env4
-rw-r--r--heat/vFW_CNF_CDS/templates/base/base_template.yaml14
-rw-r--r--heat/vFW_CNF_CDS/templates/cba-dd.json91
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Definitions/data_types.json30
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Definitions/node_types.json120
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Definitions/resources_definition_types.json155
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json34
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Scripts/kotlin/KotlinK8sProfileUpload.kt11
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/TOSCA-Metadata/TOSCA.meta3
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Templates/base_template-mapping.json128
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Templates/base_template-template.vtl265
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Templates/k8s-profiles/vfw-cnf-cds-base-profile.tar.gzbin0 -> 251 bytes
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Templates/vfw-mapping.json78
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl553
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Templates/vnf-mapping.json102
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Templates/vnf-template.vtl663
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-mapping.json88
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-template.vtl485
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Templates/vsn-mapping.json60
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Templates/vsn-template.vtl506
-rw-r--r--heat/vFW_CNF_CDS/templates/helm/base_template/templates/network_attachment_definition.yaml6
-rw-r--r--heat/vFW_CNF_CDS/templates/helm/base_template/templates/onap-private-net.yaml4
-rw-r--r--heat/vFW_CNF_CDS/templates/helm/base_template/templates/protected-private-net.yaml4
-rw-r--r--heat/vFW_CNF_CDS/templates/helm/base_template/templates/unprotected-private-net.yaml4
-rw-r--r--heat/vFW_CNF_CDS/templates/helm/base_template/values.yaml12
-rw-r--r--heat/vFW_CNF_CDS/templates/helm/vfw/templates/configmap.yaml5
-rw-r--r--heat/vFW_CNF_CDS/templates/helm/vfw/templates/deployment.yaml15
-rw-r--r--heat/vFW_CNF_CDS/templates/helm/vfw/values.yaml29
-rw-r--r--heat/vFW_CNF_CDS/templates/helm/vpkg/templates/configmap.yaml4
-rw-r--r--heat/vFW_CNF_CDS/templates/helm/vpkg/templates/deployment.yaml15
-rw-r--r--heat/vFW_CNF_CDS/templates/helm/vpkg/templates/service.yaml7
-rw-r--r--heat/vFW_CNF_CDS/templates/helm/vpkg/values.yaml7
-rw-r--r--heat/vFW_CNF_CDS/templates/helm/vsn/templates/configmap.yaml6
-rw-r--r--heat/vFW_CNF_CDS/templates/helm/vsn/templates/deployment.yaml15
-rw-r--r--heat/vFW_CNF_CDS/templates/helm/vsn/templates/service.yaml7
-rw-r--r--heat/vFW_CNF_CDS/templates/helm/vsn/values.yaml18
38 files changed, 1673 insertions, 1898 deletions
diff --git a/heat/vFW_CNF_CDS/templates/Makefile b/heat/vFW_CNF_CDS/templates/Makefile
index 244f9232..98b2890d 100644
--- a/heat/vFW_CNF_CDS/templates/Makefile
+++ b/heat/vFW_CNF_CDS/templates/Makefile
@@ -1,20 +1,27 @@
-.PHONY: all clean helm base
+.PHONY: all clean helm base cba
+CSAR_NAME ?= vfw_k8s_demo
+CBA_NAME ?= vFW_CDS_CNF
-all: csar/ helm base
- cd csar/ && zip -r vfw_k8s_demo.csar .
- mv csar/vfw_k8s_demo.csar .
+all: csar/ helm base cba
+ #Can't use .csar extension or SDC will panic
+ cd csar/ && zip -r $(CSAR_NAME).zip .
+ mv csar/$(CSAR_NAME).zip .
helm: csar/
make -C helm
- cp helm/*.tgz csar/
+ mv helm/*.tgz csar/
base: csar/
cp base/* csar/
+cba: csar/
+ cd cba/ && zip -r $(CBA_NAME).zip .
+ mv cba/$(CBA_NAME).zip csar/
+
csar/:
mkdir csar/
clean:
rm -rf csar/
- rm -f vfw_k8s_demo.csar
+ rm -f $(CSAR_NAME).zip
diff --git a/heat/vFW_CNF_CDS/templates/base/MANIFEST.json b/heat/vFW_CNF_CDS/templates/base/MANIFEST.json
index aebb1462..cd971cd6 100644
--- a/heat/vFW_CNF_CDS/templates/base/MANIFEST.json
+++ b/heat/vFW_CNF_CDS/templates/base/MANIFEST.json
@@ -3,6 +3,10 @@
"description": "",
"data": [
{
+ "file": "vFW_CDS_CNF.zip",
+ "type": "CONTROLLER_BLUEPRINT_ARCHIVE"
+ },
+ {
"file": "base_template.yaml",
"type": "HEAT",
"isBase": "true",
diff --git a/heat/vFW_CNF_CDS/templates/base/base_template.env b/heat/vFW_CNF_CDS/templates/base/base_template.env
index 0a69e08d..53735a9f 100644
--- a/heat/vFW_CNF_CDS/templates/base/base_template.env
+++ b/heat/vFW_CNF_CDS/templates/base/base_template.env
@@ -2,4 +2,6 @@ parameters:
int_private1_net_cidr: 192.168.10.0/24
int_private2_net_cidr: 192.168.20.0/24
pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
- vnf_name: vFW_NextGen \ No newline at end of file
+ vnf_name: vFW_NextGen
+ vnf_id: 12345
+ vf_module_id: 123456
diff --git a/heat/vFW_CNF_CDS/templates/base/base_template.yaml b/heat/vFW_CNF_CDS/templates/base/base_template.yaml
index 403b0e4c..da065076 100644
--- a/heat/vFW_CNF_CDS/templates/base/base_template.yaml
+++ b/heat/vFW_CNF_CDS/templates/base/base_template.yaml
@@ -48,6 +48,14 @@ parameters:
vnf_name:
type: string
description: VNF_NAME
+ vnf_id:
+ type: string
+ label: VNF ID
+ description: The VNF ID is provided by ONAP
+ vf_module_id:
+ type: string
+ label: VF Module ID
+ description: The VF Module ID is provided by ONAP
#############
# #
@@ -67,8 +75,12 @@ resources:
get_param: pub_key
vnf_name:
get_param: vnf_name
+ vnf_id:
+ get_param: vnf_id
+ vf_module_id:
+ get_param: vf_module_id
- #SDC won't allow too dummy resource as it has to find `topology_template` TOSCA equivalent in heat templates
+ #SDC won't allow too dummy resource as it has to find 'topology_template' TOSCA equivalent in heat templates
dummy_base:
type: OS::Nova::Server
properties:
diff --git a/heat/vFW_CNF_CDS/templates/cba-dd.json b/heat/vFW_CNF_CDS/templates/cba-dd.json
index 1d85d963..7943f13d 100644
--- a/heat/vFW_CNF_CDS/templates/cba-dd.json
+++ b/heat/vFW_CNF_CDS/templates/cba-dd.json
@@ -1,4 +1,50 @@
[
+ {
+ "name": "k8s-rb-profile-namespace",
+ "tags": "k8s, cnf, profile",
+ "data_type": "string",
+ "description": "Profile namespace used in multicloud/k8s plugin",
+ "entry_schema": "string",
+ "updatedBy": "Samuli, Silvius <s.silvius@partner.samsung.com>",
+ "definition": {
+ "tags": "k8s-rb-profile-namespace",
+ "name": "k8s-rb-profile-namespace",
+ "property": {
+ "description": "Profile name used in multicloud/k8s plugin",
+ "type": "string"
+ },
+ "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/k8s-rb-profile-namespace",
+ "path": "/param/0/value",
+ "input-key-mapping": {
+ "service-instance-id": "service-instance-id",
+ "vnf-id": "vnf-id"
+ },
+ "output-key-mapping": {
+ "k8s-rb-profile-namespace": "value"
+ },
+ "key-dependencies": [
+ "service-instance-id",
+ "vnf-id"
+ ]
+ }
+ }
+ }
+ }
+ },
{
"name": "k8s-rb-profile-name",
"tags": "k8s, cnf, profile",
@@ -424,5 +470,50 @@
}
}
}
+ },
+ {
+ "name": "int_private1_subnet_id",
+ "tags": "k8s, cnf",
+ "data_type": "string",
+ "description": "Private unprotected subnetwork identification",
+ "entry_schema": "string",
+ "updatedBy": "Bańka, Konrad <k.banka@samsung.com>",
+ "definition": {
+ "tags": "k8s, cnf",
+ "name": "int_private1_subnet_id",
+ "property": {
+ "description": "Private unprotected subnetwork identification",
+ "type": "string"
+ },
+ "updated-by": "Bańka, Konrad <k.banka@samsung.com>",
+ "sources": {
+ "input": {
+ "type": "source-input"
+ },
+ "default": {
+ "type": "source-default"
+ },
+ "sdnc": {
+ "type": "source-rest",
+ "properties": {
+ "verb": "GET",
+ "type": "JSON",
+ "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/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"
+ ]
+ }
+ }
+ }
+ }
}
]
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 60b89b7e..94b09434 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Definitions/data_types.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Definitions/data_types.json
@@ -125,7 +125,7 @@
"int_private1_gw_ip" : {
"description" : "Private unprotected network gateway ip",
"type" : "string",
- "default" : "192.168.10.1/24"
+ "default" : "${int_private1_gw_ip}"
},
"sec_group" : {
"description" : "",
@@ -194,7 +194,7 @@
"type" : "string",
"status" : "",
"constraints" : [ { } ],
- "default" : "vpg_onap_private_ip_0",
+ "default" : "${vpg_onap_private_ip_0}",
"entry_schema" : {
"type" : ""
}
@@ -230,6 +230,9 @@
"type" : ""
}
},
+ "vf-module-model-invariant-uuid" : {
+ "type" : "string"
+ },
"vpg_name_0" : {
"description" : "",
"required" : false,
@@ -276,21 +279,13 @@
"type" : ""
}
},
+ "vf-module-model-version" : {
+ "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"
},
- "k8s-rb-profile-namespace" : {
- "description" : "",
- "required" : false,
- "type" : "string",
- "status" : "",
- "constraints" : [ { } ],
- "default": "default",
- "entry_schema" : {
- "type" : ""
- }
- },
"vsn_name_0" : {
"description" : "",
"required" : false,
@@ -388,6 +383,11 @@
"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"
+ },
"int_private1_subnet_id" : {
"description" : "Private unprotected subnetwork identification",
"type" : "string",
@@ -480,7 +480,7 @@
"onap_private_gw_ip" : {
"description" : "Private onap management network gateway ip",
"type" : "string",
- "default" : "10.10.0.1/16"
+ "default" : "${onap_private_gw_ip}"
},
"dcae_collector_port" : {
"description" : "",
@@ -645,4 +645,4 @@
"derived_from" : "tosca.datatypes.Dynamic"
}
}
-} \ No newline at end of file
+}
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 12eb1bc3..b78a3114 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Definitions/node_types.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Definitions/node_types.json
@@ -85,6 +85,63 @@
},
"derived_from" : "tosca.nodes.Component"
},
+ "component-script-executor" : {
+ "description" : "This is CLI Transaction Configuration Component API",
+ "version" : "1.0.0",
+ "attributes" : {
+ "response-data" : {
+ "required" : false,
+ "type" : "json"
+ }
+ },
+ "capabilities" : {
+ "component-node" : {
+ "type" : "tosca.capabilities.Node"
+ }
+ },
+ "interfaces" : {
+ "ComponentScriptExecutor" : {
+ "operations" : {
+ "process" : {
+ "inputs" : {
+ "script-type" : {
+ "description" : "Script type, kotlin type is supported",
+ "required" : true,
+ "type" : "string",
+ "constraints" : [ {
+ "valid_values" : [ "kotlin", "jython", "internal" ]
+ } ],
+ "default" : "internal"
+ },
+ "script-class-reference" : {
+ "description" : "Kotlin Script class name or jython script name.",
+ "required" : true,
+ "type" : "string"
+ },
+ "dynamic-properties" : {
+ "description" : "Dynamic Json Content or DSL Json reference.",
+ "required" : false,
+ "type" : "json"
+ }
+ },
+ "outputs" : {
+ "response-data" : {
+ "description" : "Execution Response Data.",
+ "required" : false,
+ "type" : "string"
+ },
+ "status" : {
+ "description" : "Status of the Component Execution ( success or failure )",
+ "required" : true,
+ "type" : "string"
+ }
+ }
+ }
+ }
+ }
+ },
+ "derived_from" : "tosca.nodes.Component"
+ },
"source-capability" : {
"description" : "This is Component Resource Source Node Type",
"version" : "1.0.0",
@@ -262,69 +319,6 @@
"description" : "TOSCA base type for Resource Sources",
"version" : "1.0.0",
"derived_from" : "tosca.nodes.Root"
- },
- "component-script-executor":{
- "description": "This is CLI Transaction Configuration Component API",
- "version": "1.0.0",
- "attributes": {
- "response-data": {
- "required": false,
- "type": "json"
- }
- },
- "capabilities": {
- "component-node": {
- "type": "tosca.capabilities.Node"
- }
- },
- "interfaces": {
- "ComponentScriptExecutor": {
- "operations": {
- "process": {
- "inputs": {
- "script-type": {
- "description": "Script type, kotlin type is supported",
- "required": true,
- "type": "string",
- "default": "internal",
- "constraints": [
- {
- "valid_values": [
- "kotlin",
- "jython",
- "internal"
- ]
- }
- ]
- },
- "script-class-reference": {
- "description": "Kotlin Script class name or jython script name.",
- "required": true,
- "type": "string"
- },
- "dynamic-properties": {
- "description": "Dynamic Json Content or DSL Json reference.",
- "required": false,
- "type": "json"
- }
- },
- "outputs": {
- "response-data": {
- "description": "Execution Response Data.",
- "required": false,
- "type": "string"
- },
- "status": {
- "description": "Status of the Component Execution ( success or failure )",
- "required": true,
- "type": "string"
- }
- }
- }
- }
- }
- },
- "derived_from": "tosca.nodes.Component"
}
}
} \ No newline at end of file
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 f1c3c803..89342dbf 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
@@ -6,6 +6,7 @@
"description" : "active-streams",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
@@ -24,6 +25,7 @@
"description" : "aic-cloud-region",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "Singal, Kapil <ks220y@att.com>",
"sources" : {
"input" : {
@@ -39,6 +41,7 @@
"description" : "cloud_env",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
@@ -74,6 +77,7 @@
"description" : "dcae_collector_ip",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
@@ -109,6 +113,7 @@
"description" : "dcae_collector_port",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
@@ -144,6 +149,7 @@
"description" : "demo_artifacts_version",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
@@ -179,6 +185,7 @@
"description" : "flavor_name",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
@@ -214,6 +221,7 @@
"description" : "image_name",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
@@ -249,6 +257,7 @@
"description" : "install_script_version",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
@@ -284,6 +293,7 @@
"description" : "Private unprotected network gateway ip address",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "Samuli, Silvius <s.silvius@partner.samsung.com>",
"sources" : {
"input" : {
@@ -319,6 +329,7 @@
"description" : "int_private1_net_cidr",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
@@ -348,8 +359,8 @@
"processor-db" : {
"type" : "source-db",
"properties" : {
- "endpoint-selector" : "dynamic-db-source",
"type" : "SQL",
+ "endpoint-selector" : "dynamic-db-source",
"query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private1\"",
"input-key-mapping" : { },
"output-key-mapping" : {
@@ -366,6 +377,7 @@
"description" : "Private network identification",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "Samuli, Silvius <s.silvius@partner.samsung.com>",
"sources" : {
"input" : {
@@ -401,6 +413,7 @@
"description" : "Private unprotected subnetwork identification",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "Samuli, Silvius <s.silvius@partner.samsung.com>",
"sources" : {
"input" : {
@@ -436,6 +449,7 @@
"description" : "Private protected network gateway ip address",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "Samuli, Silvius <s.silvius@partner.samsung.com>",
"sources" : {
"input" : {
@@ -471,6 +485,7 @@
"description" : "int_private2_net_cidr",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
@@ -483,8 +498,8 @@
"processor-db" : {
"type" : "source-db",
"properties" : {
- "endpoint-selector" : "dynamic-db-source",
"type" : "SQL",
+ "endpoint-selector" : "dynamic-db-source",
"query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private2\"",
"output-key-mapping" : {
"int_private2_net_cidr" : "prefix"
@@ -518,6 +533,7 @@
"description" : "Private protected network identification",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "Samuli, Silvius <s.silvius@partner.samsung.com>",
"sources" : {
"input" : {
@@ -553,6 +569,7 @@
"description" : "Private protected subnetwork identification",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "Samuli, Silvius <s.silvius@partner.samsung.com>",
"sources" : {
"input" : {
@@ -588,6 +605,7 @@
"description" : "Profile name used in multicloud/k8s plugin to identify Helm chart(s) where this mapping is providing override values.",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "Samuli, Silvius <s.silvius@partner.samsung.com>",
"sources" : {
"input" : {
@@ -620,10 +638,11 @@
"tags" : "k8s-rb-profile-namespace",
"name" : "k8s-rb-profile-namespace",
"property" : {
- "description" : "k8s-rb-profile-namespace",
+ "description" : "Profile name used in multicloud/k8s plugin",
"type" : "string"
},
- "updated-by" : "Rajewski, Lukasz <lukasz.rajewski@orange.com>",
+ "group" : "default",
+ "updated-by" : "Samuli, Silvius <s.silvius@partner.samsung.com>",
"sources" : {
"input" : {
"type" : "source-input"
@@ -658,6 +677,7 @@
"description" : "key_name",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
@@ -693,6 +713,7 @@
"description" : "management-prefix-id",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
@@ -722,8 +743,8 @@
"processor-db" : {
"type" : "source-db",
"properties" : {
- "endpoint-selector" : "dynamic-db-source",
"type" : "SQL",
+ "endpoint-selector" : "dynamic-db-source",
"query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"management\"",
"input-key-mapping" : { },
"output-key-mapping" : {
@@ -740,6 +761,7 @@
"description" : "nexus_artifact_repo",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
@@ -775,6 +797,7 @@
"description" : "nfc-naming-code",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
@@ -808,6 +831,7 @@
"description" : "Private onap management network gateway ip address",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "Samuli, Silvius <s.silvius@partner.samsung.com>",
"sources" : {
"input" : {
@@ -843,6 +867,7 @@
"description" : "onap_private_net_cidr",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
@@ -855,8 +880,8 @@
"processor-db" : {
"type" : "source-db",
"properties" : {
- "endpoint-selector" : "dynamic-db-source",
"type" : "SQL",
+ "endpoint-selector" : "dynamic-db-source",
"query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"management\"",
"input-key-mapping" : { },
"output-key-mapping" : {
@@ -890,6 +915,7 @@
"description" : "onap_private_net_id",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
@@ -925,6 +951,7 @@
"description" : "onap_private_subnet_id",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
@@ -960,6 +987,7 @@
"description" : "private1-prefix-id",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
@@ -989,8 +1017,8 @@
"processor-db" : {
"type" : "source-db",
"properties" : {
- "endpoint-selector" : "dynamic-db-source",
"type" : "SQL",
+ "endpoint-selector" : "dynamic-db-source",
"query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"private1\"",
"input-key-mapping" : { },
"output-key-mapping" : {
@@ -1007,6 +1035,7 @@
"description" : "private2-prefix-id",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
@@ -1036,8 +1065,8 @@
"processor-db" : {
"type" : "source-db",
"properties" : {
- "endpoint-selector" : "dynamic-db-source",
"type" : "SQL",
+ "endpoint-selector" : "dynamic-db-source",
"query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"private2\"",
"input-key-mapping" : { },
"output-key-mapping" : {
@@ -1054,6 +1083,7 @@
"description" : "pub_key",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
@@ -1089,6 +1119,7 @@
"description" : "public_net_id",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
@@ -1124,6 +1155,7 @@
"description" : "put-active-streams",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
@@ -1159,6 +1191,7 @@
"description" : "sec_group",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
@@ -1194,6 +1227,7 @@
"description" : "To be provided",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "Singal, Kapil <ks220y@att.com>",
"sources" : {
"input" : {
@@ -1203,7 +1237,7 @@
"any-db" : {
"type" : "source-db",
"properties" : {
- "query" : "SELECT artifact_name FROM BLUEPRINT_MODEL where artifact_version=\"1.0.0\"",
+ "query" : "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
"input-key-mapping" : { },
"output-key-mapping" : {
"service-instance-id" : "artifact_name"
@@ -1213,7 +1247,7 @@
"processor-db" : {
"type" : "source-db",
"properties" : {
- "query" : "SELECT artifact_name FROM BLUEPRINT_MODEL where artifact_version=\"1.0.0\"",
+ "query" : "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
"input-key-mapping" : { },
"output-key-mapping" : {
"service-instance-id" : "artifact_name"
@@ -1227,6 +1261,22 @@
"script-class-reference" : "SampleRAProcessor",
"instance-dependencies" : [ ]
}
+ },
+ "sdnc" : {
+ "type" : "source-rest",
+ "properties" : {
+ "verb" : "GET",
+ "type" : "JSON",
+ "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id",
+ "path" : "/service/0/service-instance-id",
+ "input-key-mapping" : {
+ "service-instance-id" : "service-instance.service-instance-id"
+ },
+ "output-key-mapping" : {
+ "service-instance-id" : "service-instance-id"
+ },
+ "key-dependencies" : [ "service-instance.service-instance-id" ]
+ }
}
}
},
@@ -1237,11 +1287,30 @@
"description" : "vf-module-id",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "Singal, Kapil <ks220y@att.com>",
"sources" : {
"input" : {
"type" : "source-input",
"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/vf-modules/vf-module/$vf-module-id",
+ "path" : "/vf-module/0/vf-module-id",
+ "input-key-mapping" : {
+ "service-instance-id" : "service-instance-id",
+ "vnf-id" : "vnf-id",
+ "vf-module-id" : "vf-module.vf-module-id"
+ },
+ "output-key-mapping" : {
+ "vf-module-id" : "vf-module-id"
+ },
+ "key-dependencies" : [ "service-instance-id", "vnf-id", "vf-module.vf-module-id" ]
+ }
}
}
},
@@ -1252,6 +1321,7 @@
"description" : "vf-module-label",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
@@ -1285,6 +1355,7 @@
"description" : "vf-module-model-customization-uuid",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
@@ -1303,11 +1374,16 @@
"description" : "vf module model invariant uuid",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "Samuli, Silvius <s.silvius@partner.samsung.com>",
"sources" : {
"input" : {
"type" : "source-input"
},
+ "default" : {
+ "type" : "source-default",
+ "properties" : { }
+ },
"processor-db" : {
"type" : "source-db",
"properties" : {
@@ -1329,14 +1405,19 @@
"tags" : "vnf, vf-module",
"name" : "vf-module-model-version",
"property" : {
- "description" : "vf module model version",
+ "description" : "vf module model model version",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "Samuli, Silvius <s.silvius@partner.samsung.com>",
"sources" : {
"input" : {
"type" : "source-input"
},
+ "default" : {
+ "type" : "source-default",
+ "properties" : { }
+ },
"processor-db" : {
"type" : "source-db",
"properties" : {
@@ -1358,9 +1439,10 @@
"tags" : "vf-module-name",
"name" : "vf-module-name",
"property" : {
- "description" : "vf-module-name",
+ "description" : "vf_module_name",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "Singal, Kapil <ks220y@att.com>",
"sources" : {
"input" : {
@@ -1379,6 +1461,7 @@
"description" : "vf-module-type",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
@@ -1392,15 +1475,15 @@
"type" : "source-db",
"properties" : {
"type" : "SQL",
- "query" : "select vf_module_type as vf_module_type from sdnctl.VF_MODULE_MODEL where customization_uuid=:customizationid",
+ "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"
},
- "endpoint-selector" : "dynamic-db-source",
"input-key-mapping" : {
"customizationid" : "vf-module-model-customization-uuid"
},
- "key-dependencies" : [ "vf-module-model-customization-uuid" ]
+ "key-dependencies" : [ "vf-module-model-customization-uuid" ],
+ "endpoint-selector" : "dynamic-db-source"
}
}
}
@@ -1412,6 +1495,7 @@
"description" : "vf-naming-policy",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"default" : {
@@ -1438,7 +1522,6 @@
"processor-db" : {
"type" : "source-db",
"properties" : {
- "endpoint-selector" : "dynamic-db-source",
"type" : "SQL",
"query" : "select sdnctl.VF_MODEL.naming_policy as vf_naming_policy from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:vnf_model_customization_uuid",
"input-key-mapping" : {
@@ -1459,6 +1542,7 @@
"description" : "vfccustomizationuuid",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
@@ -1471,7 +1555,6 @@
"processor-db" : {
"type" : "source-db",
"properties" : {
- "endpoint-selector" : "dynamic-db-source",
"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" : {
@@ -1480,7 +1563,8 @@
"output-key-mapping" : {
"vfccustomizationuuid" : "vnf_customid"
},
- "key-dependencies" : [ "vf-module-model-customization-uuid" ]
+ "key-dependencies" : [ "vf-module-model-customization-uuid" ],
+ "endpoint-selector" : "dynamic-db-source"
}
}
}
@@ -1492,6 +1576,7 @@
"description" : "vfw_int_private1_ip_0",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
@@ -1527,6 +1612,7 @@
"description" : "vfw_int_private2_floating_ip",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
@@ -1562,6 +1648,7 @@
"description" : "vfw_int_private2_ip_0",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
@@ -1597,6 +1684,7 @@
"description" : "vfw_name_0",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "Singal, Kapil <ks220y@att.com>",
"sources" : {
"input" : {
@@ -1632,6 +1720,7 @@
"description" : "vfw_onap_private_ip_0",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
@@ -1667,6 +1756,7 @@
"description" : "vnf-id",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
@@ -1675,6 +1765,23 @@
"default" : {
"type" : "source-default",
"properties" : { }
+ },
+ "sdnc" : {
+ "type" : "source-rest",
+ "properties" : {
+ "verb" : "GET",
+ "type" : "JSON",
+ "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/",
+ "path" : "/vnf/0/vnf-id",
+ "input-key-mapping" : {
+ "service-instance-id" : "service-instance-id",
+ "vnf-id" : "generic-vnf.vnf-id"
+ },
+ "output-key-mapping" : {
+ "vnf-id" : "vnf-id"
+ },
+ "key-dependencies" : [ "service-instance-id", "generic-vnf.vnf-id" ]
+ }
}
}
},
@@ -1685,6 +1792,7 @@
"description" : "vnf-model-customization-uuid",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "Singal, Kapil <ks220y@att.com>",
"sources" : {
"input" : {
@@ -1700,6 +1808,7 @@
"description" : "vnf_name",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
@@ -1735,6 +1844,7 @@
"description" : "vnfc-model-invariant-uuid",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
@@ -1752,7 +1862,6 @@
"output-key-mapping" : {
"vnfc-model-invariant-uuid" : "vfc_invariant_uuid"
},
- "endpoint-selector" : "dynamic-db-source",
"input-key-mapping" : {
"vfccustomizationuuid" : "vfccustomizationuuid"
},
@@ -1768,6 +1877,7 @@
"description" : "vnfc-model-version",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
@@ -1780,7 +1890,6 @@
"processor-db" : {
"type" : "source-db",
"properties" : {
- "endpoint-selector" : "dynamic-db-source",
"type" : "SQL",
"query" : "select VFC_MODEL.version as vnfc_model_version from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
"input-key-mapping" : {
@@ -1801,6 +1910,7 @@
"description" : "vpg_int_private1_ip_0",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
@@ -1836,6 +1946,7 @@
"description" : "vpg_name_0",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
@@ -1871,6 +1982,7 @@
"description" : "vpg_onap_private_ip_0",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "Singal, Kapil <ks220y@att.com>",
"sources" : {
"input" : {
@@ -1906,6 +2018,7 @@
"description" : "vsn_int_private2_ip_0",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
@@ -1941,6 +2054,7 @@
"description" : "vsn_name_0",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "Singal, Kapil <ks220y@att.com>",
"sources" : {
"input" : {
@@ -1976,6 +2090,7 @@
"description" : "vsn_onap_private_ip_0",
"type" : "string"
},
+ "group" : "default",
"updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
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 f4c38ba7..0040e288 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.0",
+ "template_version" : "1.0.13",
"template_tags" : "Samuli Silvius, vFW_CNF_CDS",
"template_type" : "DEFAULT"
},
@@ -21,11 +21,6 @@
"file" : "Definitions/policy_types.json"
} ],
"dsl_definitions" : {
- "ipam-1" : {
- "type" : "token-auth",
- "url" : "http://netbox-nginx:8080",
- "token" : "Token 0123456789abcdef0123456789abcdef01234567"
- },
"vpkg-rest-api" : {
"type" : "basic-auth",
"url" : "http://",
@@ -39,10 +34,10 @@
"url" : "http://multicloud-k8s:9015"
},
"profile-upload-properties" : {
- "assignment-params": {
+ "assignment-params" : {
"get_attribute" : [ "resource-assignment", "assignment-params" ]
},
- "api-access": "*multicloud-k8s-api"
+ "api-access" : "*multicloud-k8s-api"
},
"config-deploy-properties" : {
"resolution-key" : {
@@ -63,23 +58,17 @@
"resource-assignment" : {
"description" : "Resource Assign Workflow",
"target" : "resource-assignment",
- "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" : {
@@ -204,7 +193,6 @@
"inputs" : {
"script-type" : "kotlin",
"script-class-reference" : "org.onap.ccsdk.cds.blueprintsprocessor.services.execution.scripts.K8sProfileUpload",
- "instance-dependencies" : [ ],
"dynamic-properties" : "*profile-upload-properties"
}
}
@@ -238,4 +226,4 @@
}
}
}
-} \ No newline at end of file
+}
diff --git a/heat/vFW_CNF_CDS/templates/cba/Scripts/kotlin/KotlinK8sProfileUpload.kt b/heat/vFW_CNF_CDS/templates/cba/Scripts/kotlin/KotlinK8sProfileUpload.kt
index 02c04415..30a7b72e 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Scripts/kotlin/KotlinK8sProfileUpload.kt
+++ b/heat/vFW_CNF_CDS/templates/cba/Scripts/kotlin/KotlinK8sProfileUpload.kt
@@ -74,8 +74,10 @@ open class K8sProfileUpload : AbstractScriptComponentFunction() {
val prefixList: ArrayList<String> = getTemplatePrefixList(executionRequest)
for (prefix in prefixList) {
- if (prefix.toLowerCase().equals("vnf"))
+ if (prefix.toLowerCase().equals("vnf")) {
+ log.info("For vnf-level resource-assignment, profile upload is not performed")
continue
+ }
val assignmentParams = getDynamicProperties("assignment-params")
val payloadObject = JacksonUtils.jsonNode(assignmentParams.get(prefix).asText()) as ObjectNode
@@ -95,7 +97,10 @@ open class K8sProfileUpload : AbstractScriptComponentFunction() {
log.info("k8s-rb-profile-name: $k8sRbProfileName")
if (k8sRbProfileName.equals("")) {
- log.info("Profile Name Not Defined - skipping upload")
+ throw BluePrintProcessorException("K8s rb profile name is empty! Either define profile name to use or choose default")
+ }
+ if (k8sRbProfileName.equals("default") and api.hasProfile(k8sRbProfileName)) {
+ log.info("Using default profile - skipping upload")
} else {
if (api.hasProfile(k8sRbProfileName)) {
log.info("Profile Already Existing - skipping upload")
@@ -164,7 +169,7 @@ open class K8sProfileUpload : AbstractScriptComponentFunction() {
var basicAuthRestClientProperties: BasicAuthRestClientProperties = BasicAuthRestClientProperties()
basicAuthRestClientProperties.username = username
basicAuthRestClientProperties.password = password
- basicAuthRestClientProperties.url = "$baseUrl/api/multicloud-k8s/v1/v1/rb/definition/${definition}/${definitionVersion}"
+ basicAuthRestClientProperties.url = "$baseUrl/v1/rb/definition/${definition}/${definitionVersion}"
basicAuthRestClientProperties.additionalHeaders = mapOfHeaders
this.service = UploadFileRestClientService(basicAuthRestClientProperties)
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 d5b8af25..9a58a238 100644
--- a/heat/vFW_CNF_CDS/templates/cba/TOSCA-Metadata/TOSCA.meta
+++ b/heat/vFW_CNF_CDS/templates/cba/TOSCA-Metadata/TOSCA.meta
@@ -1,8 +1,9 @@
+# FIXME vim :set makeprg=make -j1 clean all
TOSCA-Meta-File-Version: 1.0.0
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.0
+Template-Version: 1.0.13
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 f4580325..efedb214 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
@@ -19,27 +19,6 @@
"dependencies": [],
"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": "vf-module-label",
"property": {
@@ -231,6 +210,29 @@
"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": "",
@@ -367,34 +369,6 @@
]
},
{
- "name": "int_private1_net_id",
- "property": {
- "description": "Private unprotected network identification",
- "type": "string"
- },
- "input-param": false,
- "dictionary-name": "int_private1_net_id",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ]
- },
- {
- "name": "int_private1_subnet_id",
- "property": {
- "description": "Private unprotected subnetwork identification",
- "type": "string"
- },
- "input-param": false,
- "dictionary-name": "int_private1_subnet_id",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ]
- },
- {
"name": "int_private2_gw_ip",
"property": {
"description": "Private protected network gateway ip",
@@ -409,34 +383,6 @@
]
},
{
- "name": "int_private2_net_id",
- "property": {
- "description": "Private protected network identification",
- "type": "string"
- },
- "input-param": false,
- "dictionary-name": "int_private2_net_id",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ]
- },
- {
- "name": "int_private2_subnet_id",
- "property": {
- "description": "Private protected subnetwork identification",
- "type": "string"
- },
- "input-param": false,
- "dictionary-name": "int_private2_subnet_id",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ]
- },
- {
"name": "onap_private_gw_ip",
"property": {
"description": "Private onap management network gateway ip",
@@ -449,33 +395,5 @@
"service-instance-id",
"vnf-id"
]
- },
- {
- "name": "onap_private_net_id",
- "property": {
- "description": "Private onap management network identification",
- "type": "string"
- },
- "input-param": false,
- "dictionary-name": "onap_private_net_id",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ]
- },
- {
- "name": "onap_private_subnet_id",
- "property": {
- "description": "Private onap management subnetwork identification",
- "type": "string"
- },
- "input-param": false,
- "dictionary-name": "onap_private_subnet_id",
- "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 06fc18eb..990e7200 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,160 +1,113 @@
{
- "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}"
- },
- {
- "param-name": "vf-module-model-invariant-uuid",
- "param-value": "${vf-module-model-invariant-uuid}"
- },
- {
- "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": "pub_key",
- "param-value": "${pub_key}"
- },
- {
- "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_private1_gw_ip",
- "param-value": "${int_private1_gw_ip}"
- },
- {
- "param-name": "int_private1_net_id",
- "param-value": "${int_private1_net_id}"
- },
- {
- "param-name": "int_private1_subnet_id",
- "param-value": "${int_private1_subnet_id}"
- },
- {
- "param-name": "int_private2_gw_ip",
- "param-value": "${int_private2_gw_ip}"
- },
- {
- "param-name": "int_private2_net_id",
- "param-value": "${int_private2_net_id}"
- },
- {
- "param-name": "int_private2_subnet_id",
- "param-value": "${int_private2_subnet_id}"
- },
- {
- "param-name": "onap_private_gw_ip",
- "param-value": "${onap_private_gw_ip}"
- },
- {
- "param-name": "onap_private_net_id",
- "param-value": "${onap_private_net_id}"
- },
- {
- "param-name": "onap_private_subnet_id",
- "param-value": "${onap_private_subnet_id}"
- }
- ],
- "capability-data": [
- {
- "capability-name": "generate-name",
- "key-mapping": [
- {
- "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": "VF_MODULE_TYPE",
- "param-value": "${vf-module-type}"
- }
- ],
- "output-key-mapping": [
- {
- "resource-name": "vf-module-name",
- "resource-value": "${vf-module-name}"
- }
- ]
+ "capability-data": [
+ {
+ "capability-name": "aai-vf-module-put",
+ "key-mapping": [
+ {
+ "output-key-mapping": [
+ {
+ "resource-name": "aai-vf-module-put",
+ "resource-value": "${status}"
+ }
+ ],
+ "payload": [
+ {
+ "param-name": "vf-module",
+ "param-value": "vf-module"
+ }
+ ]
+ }
+ ]
}
- ]
- },
- {
- "capability-name": "aai-vf-module-put",
- "key-mapping": [
- {
- "payload": [
- {
- "param-name": "vf-module",
- "param-value": "vf-module"
- }
- ],
- "output-key-mapping": [
- {
- "resource-name": "aai-vf-module-put",
- "resource-value": "${status}"
- }
- ]
+ ],
+ "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}"
+ },
+ {
+ "param-name": "vf-module-model-invariant-uuid",
+ "param-value": "${vf-module-model-invariant-uuid}"
+ },
+ {
+ "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}"
+ },
+ {
+ "param-name": "k8s-rb-profile-namespace",
+ "param-value": "${k8s-rb-profile-namespace}"
+ },
+ {
+ "param-name": "int_private1_gw_ip",
+ "param-value": "${int_private1_gw_ip}"
+ },
+ {
+ "param-name": "int_private1_net_id",
+ "param-value": "${vnf-id}-unprotected-network"
+ },
+ {
+ "param-name": "int_private1_subnet_id",
+ "param-value": "${vnf-id}-unprotected-network-subnet-1"
+ },
+ {
+ "param-name": "int_private2_gw_ip",
+ "param-value": "${int_private2_gw_ip}"
+ },
+ {
+ "param-name": "int_private2_net_id",
+ "param-value": "${vnf-id}-protected-network"
+ },
+ {
+ "param-name": "int_private2_subnet_id",
+ "param-value": "${vnf-id}-protected-network-subnet-1"
+ },
+ {
+ "param-name": "onap_private_gw_ip",
+ "param-value": "${onap_private_gw_ip}"
+ },
+ {
+ "param-name": "onap_private_net_id",
+ "param-value": "${vnf-id}-management-network"
+ },
+ {
+ "param-name": "onap_private_subnet_id",
+ "param-value": "${vnf-id}-namagement-network-subnet-1"
}
- ]
- }
- ]
+ ]
}
diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/k8s-profiles/vfw-cnf-cds-base-profile.tar.gz b/heat/vFW_CNF_CDS/templates/cba/Templates/k8s-profiles/vfw-cnf-cds-base-profile.tar.gz
new file mode 100644
index 00000000..e7b49eb9
--- /dev/null
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/k8s-profiles/vfw-cnf-cds-base-profile.tar.gz
Binary files differ
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 5d80f0c8..31067a35 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-mapping.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-mapping.json
@@ -305,52 +305,6 @@
],
"version": 0
},
- {
- "name": "onap_private_net_id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "onap_private_net_id",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "onap_private_subnet_id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "onap_private_subnet_id",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
{
"name": "int_private1_net_cidr",
"property": {
@@ -917,9 +871,37 @@
]
},
{
+ "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": "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": "Private unprotected network identification",
+ "description": "private1 net id",
"type": "string"
},
"input-param": false,
@@ -933,7 +915,7 @@
{
"name": "int_private2_net_id",
"property": {
- "description": "Private protected network identification",
+ "description": "private2 net id",
"type": "string"
},
"input-param": false,
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 a321aa44..c85af209 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl
@@ -1,298 +1,263 @@
{
- "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}"
- },
- {
- "param-name": "vf-module-model-invariant-uuid",
- "param-value": "${vf-module-model-invariant-uuid}"
- },
- {
- "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_id",
- "param-value": "${onap_private_net_id}"
- },
- {
- "param-name": "onap_private_subnet_id",
- "param-value": "${onap_private_subnet_id}"
- },
- {
- "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}"
- },
- {
- "param-name": "k8s-rb-profile-namespace",
- "param-value": "${k8s-rb-profile-namespace}"
- },
- {
- "param-name": "int_private1_net_id",
- "param-value": "${int_private1_net_id}"
- },
- {
- "param-name": "int_private2_net_id",
- "param-value": "${int_private2_net_id}"
- }
- ],
- "capability-data": [
- {
- "capability-name": "generate-name",
- "key-mapping": [
- {
- "payload": [
- {
- "param-name": "resource-name",
- "param-value": "vfw_name_0"
- },
- {
- "param-name": "resource-value",
- "param-value": "${vfw_name_0}"
- },
- {
- "param-name": "external-key",
- "param-value": "${vf-module-id}_vfw_name_0"
- },
- {
- "param-name": "policy-instance-name",
- "param-value": "${vf-naming-policy}"
- },
- {
- "param-name": "naming-type",
- "param-value": "VNFC"
- },
- {
- "param-name": "VNF_NAME",
- "param-value": "${vnf_name}"
- },
- {
- "param-name": "NFC_NAMING_CODE",
- "param-value": "${nfc-naming-code}"
- }
- ],
- "output-key-mapping": [
- {
- "resource-name": "vfw_name_0",
- "resource-value": "${vfw_name_0}"
- }
- ]
- },
- {
- "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": "VF_MODULE_TYPE",
- "param-value": "${vf-module-type}"
- }
- ],
- "output-key-mapping": [
- {
- "resource-name": "vf-module-name",
- "resource-value": "${vf-module-name}"
- }
- ]
- }
- ]
- },
- {
- "capability-name": "netbox-ip-assign",
- "key-mapping": [
- {
- "payload": [
- {
- "param-name": "service-instance-id",
- "param-value": "${service-instance-id}"
- },
- {
- "param-name": "prefix-id",
- "param-value": "${management-prefix-id}"
- },
- {
- "param-name": "vf_module_id",
- "param-value": "${vf-module-id}"
- },
- {
- "param-name": "external_key",
- "param-value": "${vf-module-id}-vfw_onap_private_ip_0"
- }
- ],
- "output-key-mapping": [
- {
- "resource-name": "vfw_onap_private_ip_0",
- "resource-value": "${vfw_onap_private_ip_0}"
- }
- ]
+ "capability-data": [
+ {
+ "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": "VF_MODULE_TYPE",
+ "param-value": "${vf-module-type}"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "capability-name": "netbox-ip-assign",
+ "key-mapping": [
+ {
+ "output-key-mapping": [
+ {
+ "resource-name": "vfw_onap_private_ip_0",
+ "resource-value": "${vfw_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": "vf_module_id",
+ "param-value": "${vf-module-id}"
+ },
+ {
+ "param-name": "external_key",
+ "param-value": "${vf-module-id}-vfw_onap_private_ip_0"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "capability-name": "aai-vf-module-put",
+ "key-mapping": [
+ {
+ "output-key-mapping": [
+ {
+ "resource-name": "aai-vf-module-put",
+ "resource-value": "${status}"
+ }
+ ],
+ "payload": [
+ {
+ "param-name": "vf-module",
+ "param-value": "vf-module"
+ }
+ ]
+ }
+ ]
}
- ]
- },
- {
- "capability-name": "aai-vf-module-put",
- "key-mapping": [
- {
- "payload": [
- {
- "param-name": "vf-module",
- "param-value": "vf-module"
- }
- ],
- "output-key-mapping": [
- {
- "resource-name": "aai-vf-module-put",
- "resource-value": "${status}"
- }
- ]
+ ],
+ "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}"
+ },
+ {
+ "param-name": "vf-module-model-invariant-uuid",
+ "param-value": "${vf-module-model-invariant-uuid}"
+ },
+ {
+ "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_subnet_id",
+ "param-value": "${onap_private_subnet_id}"
+ },
+ {
+ "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}"
+ },
+ {
+ "param-name": "k8s-rb-profile-namespace",
+ "param-value": "${k8s-rb-profile-namespace}"
+ },
+ {
+ "param-name": "onap_private_net_id",
+ "param-value": "${vnf-id}-management-network"
+ },
+ {
+ "param-name": "int_private2_net_id",
+ "param-value": "${vnf-id}-protected-network"
+ },
+ {
+ "param-name": "int_private1_net_id",
+ "param-value": "${vnf-id}-unprotected-network"
+ },
+ {
+ "param-name": "vfw_name_0",
+ "param-value": "vfw-${vf-module-id}"
}
- ]
- }
- ]
+ ]
}
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 a1d41199..e0728241 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-mapping.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-mapping.json
@@ -115,7 +115,7 @@
"entry_schema": {
"type": ""
},
- "default":"vpg_onap_private_ip_0"
+ "default":"${vpg_onap_private_ip_0}"
},
"input-param": false,
"dictionary-name": "vpg_onap_private_ip_0",
@@ -437,48 +437,6 @@
"version": 0
},
{
- "name": "onap_private_net_id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
-
- },
- "input-param": false,
- "dictionary-name": "onap_private_net_id",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "onap_private_subnet_id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
-
- },
- "input-param": false,
- "dictionary-name": "onap_private_subnet_id",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
"name": "vfw_int_private2_ip_0",
"property": {
"description": "",
@@ -638,7 +596,7 @@
"property": {
"description": "Private unprotected network gateway ip",
"type": "string",
- "default": "192.168.10.1/24"
+ "default": "${int_private1_gw_ip}"
},
"input-param": false,
"dictionary-name": "int_private1_gw_ip",
@@ -647,37 +605,11 @@
]
},
{
- "name": "int_private1_net_id",
- "property": {
- "description": "Private unprotected network identification",
- "type": "string",
- "default": "${int_private1_net_id}"
- },
- "input-param": false,
- "dictionary-name": "int_private1_net_id",
- "dictionary-source": "default",
- "dependencies": [
- ]
- },
- {
- "name": "int_private1_subnet_id",
- "property": {
- "description": "Private unprotected subnetwork identification",
- "type": "string",
- "default": "${int_private1_subnet_id}"
- },
- "input-param": false,
- "dictionary-name": "int_private1_subnet_id",
- "dictionary-source": "default",
- "dependencies": [
- ]
- },
- {
"name": "int_private2_gw_ip",
"property": {
"description": "Private protected network gateway ip",
"type": "string",
- "default": "192.168.20.1/24"
+ "default": "${int_private2_gw_ip}"
},
"input-param": false,
"dictionary-name": "int_private2_gw_ip",
@@ -686,37 +618,11 @@
]
},
{
- "name": "int_private2_net_id",
- "property": {
- "description": "Private protected network identification",
- "type": "string",
- "default": "${int_private2_net_id}"
- },
- "input-param": false,
- "dictionary-name": "int_private2_net_id",
- "dictionary-source": "default",
- "dependencies": [
- ]
- },
- {
- "name": "int_private2_subnet_id",
- "property": {
- "description": "Private protected subnetwork identification",
- "type": "string",
- "default": "${int_private2_subnet_id}"
- },
- "input-param": false,
- "dictionary-name": "int_private2_subnet_id",
- "dictionary-source": "default",
- "dependencies": [
- ]
- },
- {
"name": "onap_private_gw_ip",
"property": {
"description": "Private onap management network gateway ip",
"type": "string",
- "default": "10.10.0.1/16"
+ "default": "${onap_private_gw_ip}"
},
"input-param": false,
"dictionary-name": "onap_private_gw_ip",
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 617f0b97..e050c977 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-template.vtl
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-template.vtl
@@ -1,335 +1,360 @@
{
- "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": "public_net_id",
- "param-value": "${public_net_id}"
- },
- {
- "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_id",
- "param-value": "${onap_private_net_id}"
- },
- {
- "param-name": "onap_private_subnet_id",
- "param-value": "${onap_private_subnet_id}"
- },
- {
- "param-name": "onap_private_net_cidr",
- "param-value": "${onap_private_net_cidr}"
- },
- {
- "param-name": "demo_artifacts_version",
- "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}"
- },
- {
- "param-name": "k8s-rb-profile-namespace",
- "param-value": "${k8s-rb-profile-namespace}"
- },
- {
- "param-name": "int_private1_gw_ip",
- "param-value": "${int_private1_gw_ip}"
- },
- {
- "param-name": "int_private1_net_id",
- "param-value": "${vnf_name}-unprotected-network"
- },
- {
- "param-name": "int_private1_subnet_id",
- "param-value": "${int_private1_net_id}-subnet-1"
- },
- {
- "param-name": "int_private2_gw_ip",
- "param-value": "${int_private2_gw_ip}"
- },
- {
- "param-name": "int_private2_net_id",
- "param-value": "${vnf_name}-protected-network"
- },
- {
- "param-name": "int_private2_subnet_id",
- "param-value": "${int_private2_net_id}-subnet-1"
- },
- {
- "param-name": "onap_private_gw_ip",
- "param-value": "${onap_private_gw_ip}"
- }
- ],
- "capability-data": [
- {
- "capability-name": "generate-name",
- "key-mapping": [
+ "capability-data": [
{
- "payload": [
- {
- "param-name": "resource-name",
- "param-value": "vnf_name"
- },
- {
- "param-name": "resource-value",
- "param-value": "${vnf_name}"
- },
- {
- "param-name": "external-key",
- "param-value": "${vnf-id}_vnf_name"
- },
- {
- "param-name": "policy-instance-name",
- "param-value": "${vf-naming-policy}"
- },
- {
- "param-name": "naming-type",
- "param-value": "VNF"
- },
- {
- "param-name": "AIC_CLOUD_REGION",
- "param-value": "${aic-cloud-region}"
- }
- ],
- "output-key-mapping": [
- {
- "resource-name": "vnf_name",
- "resource-value": "${vnf_name}"
- }
- ]
+ "capability-name": "generate-name",
+ "key-mapping": [
+ {
+ "output-key-mapping": [
+ {
+ "resource-name": "vnf_name",
+ "resource-value": "${vnf_name}"
+ }
+ ],
+ "payload": [
+ {
+ "param-name": "resource-name",
+ "param-value": "vnf_name"
+ },
+ {
+ "param-name": "resource-value",
+ "param-value": "${vnf_name}"
+ },
+ {
+ "param-name": "external-key",
+ "param-value": "${vnf-id}_vnf_name"
+ },
+ {
+ "param-name": "policy-instance-name",
+ "param-value": "${vf-naming-policy}"
+ },
+ {
+ "param-name": "naming-type",
+ "param-value": "VNF"
+ },
+ {
+ "param-name": "AIC_CLOUD_REGION",
+ "param-value": "${aic-cloud-region}"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "capability-name": "netbox-ip-assign",
+ "key-mapping": [
+ {
+ "output-key-mapping": [
+ {
+ "resource-name": "int_private1_gw_ip",
+ "resource-value": "${int_private1_gw_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}-int_private1_gw_ip"
+ }
+ ]
+ },
+ {
+ "output-key-mapping": [
+ {
+ "resource-name": "int_private2_gw_ip",
+ "resource-value": "${int_private2_gw_ip}"
+ }
+ ],
+ "payload": [
+ {
+ "param-name": "service-instance-id",
+ "param-value": "${service-instance-id}"
+ },
+ {
+ "param-name": "prefix-id",
+ "param-value": "${private2-prefix-id}"
+ },
+ {
+ "param-name": "vnf-id",
+ "param-value": "${vnf-id}"
+ },
+ {
+ "param-name": "external_key",
+ "param-value": "${vnf-id}-int_private2_gw_ip"
+ }
+ ]
+ },
+ {
+ "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}"
+ }
+ ],
+ "payload": [
+ {
+ "param-name": "service-instance-id",
+ "param-value": "${service-instance-id}"
+ },
+ {
+ "param-name": "prefix-id",
+ "param-value": "${private2-prefix-id}"
+ },
+ {
+ "param-name": "vnf-id",
+ "param-value": "${vnf-id}"
+ },
+ {
+ "param-name": "external_key",
+ "param-value": "${vnf-id}-vfw_int_private2_ip_0"
+ }
+ ]
+ },
+ {
+ "output-key-mapping": [
+ {
+ "resource-name": "vfw_int_private1_ip_0",
+ "resource-value": "${vfw_int_private1_ip_0}"
+ }
+ ],
+ "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_private1_ip_0"
+ }
+ ]
+ },
+ {
+ "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}"
+ }
+ ],
+ "payload": [
+ {
+ "param-name": "service-instance-id",
+ "param-value": "${service-instance-id}"
+ },
+ {
+ "param-name": "prefix-id",
+ "param-value": "${private2-prefix-id}"
+ },
+ {
+ "param-name": "vnf-id",
+ "param-value": "${vnf-id}"
+ },
+ {
+ "param-name": "external_key",
+ "param-value": "${vnf-id}-vsn_int_private2_ip_0"
+ }
+ ]
+ },
+ {
+ "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}"
+ }
+ ],
+ "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}-vpg_int_private1_ip_0"
+ }
+ ]
+ }
+ ]
}
- ]
- },
- {
- "capability-name": "netbox-ip-assign",
- "key-mapping": [
+ ],
+ "resource-accumulator-resolved-data": [
{
- "payload": [
- {
- "param-name": "service-instance-id",
- "param-value": "${service-instance-id}"
- },
- {
- "param-name": "prefix-id",
- "param-value": "${private2-prefix-id}"
- },
- {
- "param-name": "vnf-id",
- "param-value": "${vnf-id}"
- },
- {
- "param-name": "external_key",
- "param-value": "${vnf-id}-vfw_int_private2_ip_0"
- }
- ],
- "output-key-mapping": [
- {
- "resource-name": "vfw_int_private2_ip_0",
- "resource-value": "${vfw_int_private2_ip_0}"
- }
- ]
+ "param-name": "service-instance-id",
+ "param-value": "${service-instance-id}"
},
{
- "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_private1_ip_0"
- }
- ],
- "output-key-mapping": [
- {
- "resource-name": "vfw_int_private1_ip_0",
- "resource-value": "${vfw_int_private1_ip_0}"
- }
- ]
+ "param-name": "vnf-model-customization-uuid",
+ "param-value": "${vnf-model-customization-uuid}"
},
{
- "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": "vfw_int_private2_floating_ip",
- "resource-value": "${vfw_int_private2_floating_ip}"
- }
- ]
+ "param-name": "aic-cloud-region",
+ "param-value": "${aic-cloud-region}"
},
{
- "payload": [
- {
- "param-name": "service-instance-id",
- "param-value": "${service-instance-id}"
- },
- {
- "param-name": "prefix-id",
- "param-value": "${private2-prefix-id}"
- },
- {
- "param-name": "vnf-id",
- "param-value": "${vnf-id}"
- },
- {
- "param-name": "external_key",
- "param-value": "${vnf-id}-vsn_int_private2_ip_0"
- }
- ],
- "output-key-mapping": [
- {
- "resource-name": "vsn_int_private2_ip_0",
- "resource-value": "${vsn_int_private2_ip_0}"
- }
- ]
+ "param-name": "vf-naming-policy",
+ "param-value": "${vf-naming-policy}"
},
- {
- "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_onap_private_ip_0",
- "resource-value": "${vpg_onap_private_ip_0}"
- }
- ]
+ {
+ "param-name": "image_name",
+ "param-value": "${image_name}"
},
{
- "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}-vpg_int_private1_ip_0"
- }
- ],
- "output-key-mapping": [
- {
- "resource-name": "vpg_int_private1_ip_0",
- "resource-value": "${vpg_int_private1_ip_0}"
- }
- ]
- }
- ]
- },
- {
- "capability-name": "aai-vnf-put",
- "key-mapping": [
+ "param-name": "flavor_name",
+ "param-value": "${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": "int_private2_net_cidr",
+ "param-value": "${int_private2_net_cidr}"
+ },
+ {
+ "param-name": "onap_private_net_cidr",
+ "param-value": "${onap_private_net_cidr}"
+ },
+ {
+ "param-name": "demo_artifacts_version",
+ "param-value": "${demo_artifacts_version}"
+ },
+ {
+ "param-name": "install_script_version",
+ "param-value": "${install_script_version}"
+ },
+ {
+ "param-name": "net_attachment_definition",
+ "param-value": "${vnf-id}-ovn-nat"
+ },
+ {
+ "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}"
+ },
{
- "payload": [
- {
- "param-name": "generic-vnf",
- "param-value": "generic-vnf"
- }
- ],
- "output-key-mapping": [
- {
- "resource-name": "aai-vnf-put",
- "resource-value": "${status}"
- }
- ]
+ "param-name": "k8s-rb-profile-namespace",
+ "param-value": "${k8s-rb-profile-namespace}"
}
- ]
- }
- ]
+ ]
}
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 03e9afa3..5c665c12 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-mapping.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-mapping.json
@@ -176,52 +176,6 @@
"version": 0
},
{
- "name": "onap_private_net_id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "onap_private_net_id",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "onap_private_subnet_id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "onap_private_subnet_id",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
"name": "public_net_id",
"property": {
"description": "",
@@ -857,15 +811,28 @@
]
},
{
- "name": "k8s-rb-profile-namespace",
+ "name": "onap_private_net_id",
"property": {
- "description": "K8s namespace to create helm chart for specified profile",
- "type": "string",
- "default": "default"
+ "description": "onap private net id",
+ "type": "string"
},
"input-param": false,
- "dictionary-name": "k8s-rb-profile-namespace",
- "dictionary-source": "default",
+ "dictionary-name": "onap_private_net_id",
+ "dictionary-source": "sdnc",
+ "dependencies": [
+ "service-instance-id",
+ "vnf-id"
+ ]
+ },
+ {
+ "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"
@@ -874,7 +841,7 @@
{
"name": "int_private1_net_id",
"property": {
- "description": "Private unprotected network identification",
+ "description": "private1 net id",
"type": "string"
},
"input-param": false,
@@ -884,5 +851,20 @@
"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"
+ ]
}
]
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 a36240dd..27651e4a 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-template.vtl
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-template.vtl
@@ -1,269 +1,224 @@
{
- "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}"
- },
- {
- "param-name": "vf-module-model-invariant-uuid",
- "param-value": "${vf-module-model-invariant-uuid}"
- },
- {
- "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-function",
- "param-value": "${nf-role}"
- },
- {
- "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_id",
- "param-value": "${onap_private_net_id}"
- },
- {
- "param-name": "onap_private_subnet_id",
- "param-value": "${onap_private_subnet_id}"
- },
- {
- "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}"
- },
- {
- "param-name": "k8s-rb-profile-namespace",
- "param-value": "${k8s-rb-profile-namespace}"
- },
- {
- "param-name": "int_private1_net_id",
- "param-value": "${int_private1_net_id}"
- }
- ],
- "capability-data": [
- {
- "capability-name": "generate-name",
- "key-mapping": [
- {
- "payload": [
- {
- "param-name": "resource-name",
- "param-value": "vpg_name_0"
- },
- {
- "param-name": "resource-value",
- "param-value": "${vpg_name_0}"
- },
- {
- "param-name": "external-key",
- "param-value": "${vf-module-id}_vpg_name_0"
- },
- {
- "param-name": "policy-instance-name",
- "param-value": "${vf-naming-policy}"
- },
- {
- "param-name": "naming-type",
- "param-value": "VNFC"
- },
- {
- "param-name": "VNF_NAME",
- "param-value": "${vnf_name}"
- },
- {
- "param-name": "NFC_NAMING_CODE",
- "param-value": "${nfc-naming-code}"
- }
- ],
- "output-key-mapping": [
- {
- "resource-name": "vpg_name_0",
- "resource-value": "${vpg_name_0}"
- }
- ]
- },
- {
- "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": "nf-role",
- "param-value": "${nf-role}"
- },
- {
- "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": "VF_MODULE_TYPE",
- "param-value": "${vf-module-type}"
- }
- ],
- "output-key-mapping": [
- {
- "resource-name": "vf-module-name",
- "resource-value": "${vf-module-name}"
- }
- ]
+ "capability-data": [
+ {
+ "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": "VF_MODULE_TYPE",
+ "param-value": "${vf-module-type}"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "capability-name": "aai-vf-module-put",
+ "key-mapping": [
+ {
+ "output-key-mapping": [
+ {
+ "resource-name": "aai-vf-module-put",
+ "resource-value": "${status}"
+ }
+ ],
+ "payload": [
+ {
+ "param-name": "vf-module",
+ "param-value": "vf-module"
+ }
+ ]
+ }
+ ]
}
- ]
- },
-
- {
- "capability-name": "aai-vf-module-put",
- "key-mapping": [
- {
- "payload": [
- {
- "param-name": "vf-module",
- "param-value": "vf-module"
- }
- ],
- "output-key-mapping": [
- {
- "resource-name": "aai-vf-module-put",
- "resource-value": "${status}"
- }
- ]
+ ],
+ "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}"
+ },
+ {
+ "param-name": "vf-module-model-invariant-uuid",
+ "param-value": "${vf-module-model-invariant-uuid}"
+ },
+ {
+ "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_subnet_id",
+ "param-value": "${onap_private_subnet_id}"
+ },
+ {
+ "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}"
+ },
+ {
+ "param-name": "k8s-rb-profile-namespace",
+ "param-value": "${k8s-rb-profile-namespace}"
+ },
+ {
+ "param-name": "onap_private_net_id",
+ "param-value": "${vnf-id}-management-network"
+ },
+ {
+ "param-name": "int_private1_net_id",
+ "param-value": "${vnf-id}-unprotected-network"
+ },
+ {
+ "param-name": "vpg_name_0",
+ "param-value": "vpg-${vf-module-id}"
}
- ]
- }
- ]
+ ]
}
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 63f9770f..7b85b54e 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-mapping.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-mapping.json
@@ -181,29 +181,6 @@
"version": 0
},
{
- "name": "onap_private_net_id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "onap_private_net_id",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
"name": "int_private2_net_cidr",
"property": {
"description": "",
@@ -250,29 +227,6 @@
"version": 0
},
{
- "name": "onap_private_subnet_id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "onap_private_subnet_id",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
"name": "public_net_id",
"property": {
"description": "",
@@ -815,19 +769,5 @@
"service-instance-id",
"vnf-id"
]
- },
- {
- "name": "int_private2_net_id",
- "property": {
- "description": "Private protected network identification",
- "type": "string"
- },
- "input-param": false,
- "dictionary-name": "int_private2_net_id",
- "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 1336b8e5..a7a61d6b 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-template.vtl
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-template.vtl
@@ -1,279 +1,235 @@
{
- "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}"
- },
- {
- "param-name": "vf-module-model-invariant-uuid",
- "param-value": "${vf-module-model-invariant-uuid}"
- },
- {
- "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_id",
- "param-value": "${onap_private_net_id}"
- },
- {
- "param-name": "onap_private_subnet_id",
- "param-value": "${onap_private_subnet_id}"
- },
- {
- "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}"
- },
- {
- "param-name": "int_private2_net_id",
- "param-value": "${int_private2_net_id}"
- }
- ],
- "capability-data": [
- {
- "capability-name": "generate-name",
- "key-mapping": [
- {
- "payload": [
- {
- "param-name": "resource-name",
- "param-value": "vsn_name_0"
- },
- {
- "param-name": "resource-value",
- "param-value": "${vsn_name_0}"
- },
- {
- "param-name": "external-key",
- "param-value": "${vf-module-id}_vsn_name_0"
- },
- {
- "param-name": "policy-instance-name",
- "param-value": "${vf-naming-policy}"
- },
- {
- "param-name": "naming-type",
- "param-value": "VNFC"
- },
- {
- "param-name": "VNF_NAME",
- "param-value": "${vnf_name}"
- },
- {
- "param-name": "NFC_NAMING_CODE",
- "param-value": "${nfc-naming-code}"
- }
- ],
- "output-key-mapping": [
- {
- "resource-name": "vsn_name_0",
- "resource-value": "${vsn_name_0}"
- }
- ]
- },
- {
- "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": "VF_MODULE_TYPE",
- "param-value": "${vf-module-type}"
- }
- ],
- "output-key-mapping": [
- {
- "resource-name": "vf-module-name",
- "resource-value": "${vf-module-name}"
- }
- ]
- }
- ]
- },
- {
- "capability-name": "netbox-ip-assign",
- "key-mapping": [
- {
- "payload": [
- {
- "param-name": "service-instance-id",
- "param-value": "${service-instance-id}"
- },
- {
- "param-name": "prefix-id",
- "param-value": "${management-prefix-id}"
- },
- {
- "param-name": "vf_module_id",
- "param-value": "${vf-module-id}"
- },
- {
- "param-name": "external_key",
- "param-value": "${vf-module-id}-vsn_onap_private_ip_0"
- }
- ],
- "output-key-mapping": [
- {
- "resource-name": "vsn_onap_private_ip_0",
- "resource-value": "${vsn_onap_private_ip_0}"
- }
- ]
+ "capability-data": [
+ {
+ "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": "VF_MODULE_TYPE",
+ "param-value": "${vf-module-type}"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "capability-name": "netbox-ip-assign",
+ "key-mapping": [
+ {
+ "output-key-mapping": [
+ {
+ "resource-name": "vsn_onap_private_ip_0",
+ "resource-value": "${vsn_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": "vf_module_id",
+ "param-value": "${vf-module-id}"
+ },
+ {
+ "param-name": "external_key",
+ "param-value": "${vf-module-id}-vsn_onap_private_ip_0"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "capability-name": "aai-vf-module-put",
+ "key-mapping": [
+ {
+ "output-key-mapping": [
+ {
+ "resource-name": "aai-vf-module-put",
+ "resource-value": "${status}"
+ }
+ ],
+ "payload": [
+ {
+ "param-name": "vf-module",
+ "param-value": "vf-module"
+ }
+ ]
+ }
+ ]
}
- ]
- },
- {
- "capability-name": "aai-vf-module-put",
- "key-mapping": [
- {
- "payload": [
- {
- "param-name": "vf-module",
- "param-value": "vf-module"
- }
- ],
- "output-key-mapping": [
- {
- "resource-name": "aai-vf-module-put",
- "resource-value": "${status}"
- }
- ]
+ ],
+ "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}"
+ },
+ {
+ "param-name": "vf-module-model-invariant-uuid",
+ "param-value": "${vf-module-model-invariant-uuid}"
+ },
+ {
+ "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_id",
+ "param-value": "${vnf-id}-management-network"
+ },
+ {
+ "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}"
+ },
+ {
+ "param-name": "int_private2_net_id",
+ "param-value": "${vnf-id}-protected-network"
+ },
+ {
+ "param-name": "vsn_name_0",
+ "param-value": "vsn-${vf-module-id}"
}
- ]
- }
- ]
+ ]
}
diff --git a/heat/vFW_CNF_CDS/templates/helm/base_template/templates/network_attachment_definition.yaml b/heat/vFW_CNF_CDS/templates/helm/base_template/templates/network_attachment_definition.yaml
index eee1f516..3d7c1360 100644
--- a/heat/vFW_CNF_CDS/templates/helm/base_template/templates/network_attachment_definition.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/base_template/templates/network_attachment_definition.yaml
@@ -1,9 +1,11 @@
apiVersion: k8s.cni.cncf.io/v1
kind: NetworkAttachmentDefinition
metadata:
- name: {{ .Values.vnf_name }}-ovn-attachment
+ name: {{ .Values.net_attachment_definition }}
labels:
- vnf-name: {{ .Values.vnf_name }}
+ vnf-name: {{ .Values.vnf_name }}
+ release: {{ .Release.Name }}
+ chart: {{ .Chart.Name }}
spec:
config: |
{
diff --git a/heat/vFW_CNF_CDS/templates/helm/base_template/templates/onap-private-net.yaml b/heat/vFW_CNF_CDS/templates/helm/base_template/templates/onap-private-net.yaml
index 429574bd..1b9423f6 100644
--- a/heat/vFW_CNF_CDS/templates/helm/base_template/templates/onap-private-net.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/base_template/templates/onap-private-net.yaml
@@ -4,9 +4,11 @@ metadata:
name: {{ .Values.onap_private_net_id }}
labels:
vnf-name: {{ .Values.vnf_name }}
+ release: {{ .Release.Name }}
+ chart: {{ .Chart.Name }}
spec:
cniType : ovn4nfv
ipv4Subnets:
- name: {{ .Values.onap_private_subnet_id }}
subnet: {{ .Values.onap_private_net_cidr }}
- gateway: {{ .Values.onap_private_gw_ip }}
+ gateway: {{ .Values.onap_private_gw_ip }}/{{ (splitn "/" 2 .Values.onap_private_net_cidr)._1 }}
diff --git a/heat/vFW_CNF_CDS/templates/helm/base_template/templates/protected-private-net.yaml b/heat/vFW_CNF_CDS/templates/helm/base_template/templates/protected-private-net.yaml
index f7dbfc46..6b939d2a 100644
--- a/heat/vFW_CNF_CDS/templates/helm/base_template/templates/protected-private-net.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/base_template/templates/protected-private-net.yaml
@@ -4,9 +4,11 @@ metadata:
name: {{ .Values.int_private2_net_id }}
labels:
vnf-name: {{ .Values.vnf_name }}
+ release: {{ .Release.Name }}
+ chart: {{ .Chart.Name }}
spec:
cniType : ovn4nfv
ipv4Subnets:
- name: {{ .Values.int_private2_subnet_id }}
subnet: {{ .Values.int_private2_net_cidr }}
- gateway: {{ .Values.int_private2_gw_ip }}
+ gateway: {{ .Values.int_private2_gw_ip }}/{{ (splitn "/" 2 .Values.int_private2_net_cidr)._1 }}
diff --git a/heat/vFW_CNF_CDS/templates/helm/base_template/templates/unprotected-private-net.yaml b/heat/vFW_CNF_CDS/templates/helm/base_template/templates/unprotected-private-net.yaml
index 18a383c6..db2a5b32 100644
--- a/heat/vFW_CNF_CDS/templates/helm/base_template/templates/unprotected-private-net.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/base_template/templates/unprotected-private-net.yaml
@@ -4,9 +4,11 @@ metadata:
name: {{ .Values.int_private1_net_id }}
labels:
vnf-name: {{ .Values.vnf_name }}
+ release: {{ .Release.Name }}
+ chart: {{ .Chart.Name }}
spec:
cniType : ovn4nfv
ipv4Subnets:
- name: {{ .Values.int_private1_subnet_id }}
subnet: {{ .Values.int_private1_net_cidr }}
- gateway: {{ .Values.int_private1_gw_ip }}
+ gateway: {{ .Values.int_private1_gw_ip }}/{{ (splitn "/" 2 .Values.int_private1_net_cidr)._1 }}
diff --git a/heat/vFW_CNF_CDS/templates/helm/base_template/values.yaml b/heat/vFW_CNF_CDS/templates/helm/base_template/values.yaml
index 9a371fc8..8928bedd 100644
--- a/heat/vFW_CNF_CDS/templates/helm/base_template/values.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/base_template/values.yaml
@@ -1,18 +1,18 @@
-# Kubernetes PARAMETERS
+vnf_name: test-vnf
#unprotected
int_private1_net_cidr: 192.168.10.0/24
-int_private1_gw_ip: 192.168.10.1/24 #No typo here
+int_private1_gw_ip: 192.168.10.1
int_private1_net_id: unprotected-net
int_private1_subnet_id: unprotected-subnet-1
#protected
int_private2_net_cidr: 192.168.20.0/24
-int_private2_gw_ip: 192.168.20.1/24 #No typo here
+int_private2_gw_ip: 192.168.20.1
int_private2_net_id: protected-net
int_private2_subnet_id: protected-subnet-1
#onap mgmt net
onap_private_net_cidr: 10.10.0.0/16
-onap_private_gw_ip: 10.10.0.1/16 #No typo here
+onap_private_gw_ip: 10.10.0.1
onap_private_net_id: onap-private-net
onap_private_subnet_id: onap-subnet-1
-#vnf name
-vnf_name: test-vnf
+#Network attachment
+net_attachment_definition: vfw-net-attach
diff --git a/heat/vFW_CNF_CDS/templates/helm/vfw/templates/configmap.yaml b/heat/vFW_CNF_CDS/templates/helm/vfw/templates/configmap.yaml
index 832afde7..6a38b5a5 100644
--- a/heat/vFW_CNF_CDS/templates/helm/vfw/templates/configmap.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vfw/templates/configmap.yaml
@@ -3,10 +3,10 @@ kind: ConfigMap
metadata:
name: {{ .Values.vfw_name_0 }}-configmap
labels:
+ vnf-name: {{ .Values.vnf_name }}
+ vf-module-name: {{ .Values.vfw_name_0 }}
release: {{ .Release.Name }}
- app: {{ .Values.vfw_name_0 }}
chart: {{ .Chart.Name }}
- vnf-name: {{ .Values.vnf_name }}
data:
demo_artifacts_version: {{ .Values.demo_artifacts_version | quote }}
dcae_collector_ip: {{ .Values.dcae_collector_ip | quote }}
@@ -14,4 +14,3 @@ data:
vfw_private_ip_0: {{ .Values.vfw_int_private1_ip_0 | quote }}
vsn_private_ip_0: {{ .Values.vsn_int_private2_ip_0 | quote }}
protected_net_cidr: {{ .Values.int_private2_net_cidr | quote }}
-
diff --git a/heat/vFW_CNF_CDS/templates/helm/vfw/templates/deployment.yaml b/heat/vFW_CNF_CDS/templates/helm/vfw/templates/deployment.yaml
index 4aa1861c..2205cf89 100644
--- a/heat/vFW_CNF_CDS/templates/helm/vfw/templates/deployment.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vfw/templates/deployment.yaml
@@ -3,22 +3,23 @@ kind: Deployment
metadata:
name: {{ .Values.vfw_name_0 }}
labels:
+ vnf-name: {{ .Values.vnf_name }}
+ vf-module-name: {{ .Values.vfw_name_0 }}
release: {{ .Release.Name }}
- app: {{ .Values.vfw_name_0 }}
chart: {{ .Chart.Name }}
- vnf-name: {{ .Values.vnf_name }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
- app: {{ .Values.vfw_name_0 }}
- release: {{ .Release.Name }}
+ vnf-name: {{ .Values.vnf_name }}
+ vf-module-name: {{ .Values.vfw_name_0 }}
template:
metadata:
labels:
- app: {{ .Values.vfw_name_0 }}
- release: {{ .Release.Name }}
vnf-name: {{ .Values.vnf_name }}
+ vf-module-name: {{ .Values.vfw_name_0 }}
+ release: {{ .Release.Name }}
+ chart: {{ .Chart.Name }}
annotations:
VirtletLibvirtCPUSetting: |
mode: host-model
@@ -37,7 +38,7 @@ spec:
- wget -O firewall.sh https://git.onap.org/multicloud/k8s/plain/kud/tests/vFW/firewall
- bash -c 'set -a; . /etc/cloud/environment; bash firewall.sh'
VirtletRootVolumeSize: 5Gi
- k8s.v1.cni.cncf.io/networks: "{{ .Values.vnf_name }}-ovn-attachment"
+ k8s.v1.cni.cncf.io/networks: "{{ .Values.net_attachment_definition }}"
k8s.plugin.opnfv.org/nfn-network: |
{ "type": "ovn4nfv",
"interface": [
diff --git a/heat/vFW_CNF_CDS/templates/helm/vfw/values.yaml b/heat/vFW_CNF_CDS/templates/helm/vfw/values.yaml
index c97ec60d..488f61d3 100644
--- a/heat/vFW_CNF_CDS/templates/helm/vfw/values.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vfw/values.yaml
@@ -1,30 +1,3 @@
-# global:
-#
-# #Networks
-# unprotectedNetworkName: unprotected-private-net
-# protectedPrivateNetCidr: 192.168.10.0/24
-# protectedPrivateNetGw: 192.168.10.1/24
-#
-# onapPrivateNetworkName: onap-private-net
-# onapPrivateNetCidr: 10.10.0.0/16
-# onapPrivateNetGw: 10.10.0.1/16
-#
-# protectedNetworkName: protected-private-net
-# protectedNetCidr: 192.168.20.0/24
-# protectedNetGwIp: 192.168.20.100
-# protectedNetGw: 192.168.20.100/24
-#
-# #vFirewall container
-# vfwPrivateIp0: 192.168.10.3
-# vfwPrivateIp1: 192.168.20.2
-# vfwPrivateIp2: 10.10.100.3
-# #Packetgen container
-# vpgPrivateIp0: 192.168.10.2
-# vpgPrivateIp1: 10.0.100.2
-# #Sink container
-# vsnPrivateIp0: 192.168.20.3
-# vsnPrivateIp1: 10.10.100.4
-
# Static Defaults
replicaCount: 1
image:
@@ -35,13 +8,13 @@ resources:
limits:
memory: 4Gi
-# Kubernetes PARAMETERS
# Names
vnf_name: test-vnf
vfw_name_0: test-vnf-vfw
int_private1_net_id: unprotected-net
int_private2_net_id: protected-net
onap_private_net_id: onap-private-net
+net_attachment_definition: vfw-net-attach
# OWN Addresses
vfw_int_private1_ip_0: 192.168.10.3
vfw_int_private2_ip_0: 192.168.20.2
diff --git a/heat/vFW_CNF_CDS/templates/helm/vpkg/templates/configmap.yaml b/heat/vFW_CNF_CDS/templates/helm/vpkg/templates/configmap.yaml
index f697d448..c3a2ad4c 100644
--- a/heat/vFW_CNF_CDS/templates/helm/vpkg/templates/configmap.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vpkg/templates/configmap.yaml
@@ -3,10 +3,10 @@ kind: ConfigMap
metadata:
name: {{ .Values.vpg_name_0 }}-configmap
labels:
+ vnf-name: {{ .Values.vnf_name }}
+ vf-module-name: {{ .Values.vpg_name_0 }}
release: {{ .Release.Name }}
- app: {{ .Values.vpg_name_0 }}
chart: {{ .Chart.Name }}
- vnf-name: {{ .Values.vnf_name }}
data:
vfw_private_ip_0: {{ .Values.vfw_int_private1_ip_0 | quote }}
vsn_private_ip_0: {{ .Values.vsn_int_private2_ip_0 | quote }}
diff --git a/heat/vFW_CNF_CDS/templates/helm/vpkg/templates/deployment.yaml b/heat/vFW_CNF_CDS/templates/helm/vpkg/templates/deployment.yaml
index acd39ab6..ace04784 100644
--- a/heat/vFW_CNF_CDS/templates/helm/vpkg/templates/deployment.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vpkg/templates/deployment.yaml
@@ -3,22 +3,23 @@ kind: Deployment
metadata:
name: {{ .Values.vpg_name_0 }}
labels:
+ vnf-name: {{ .Values.vnf_name }}
+ vf-module-name: {{ .Values.vpg_name_0 }}
release: {{ .Release.Name }}
- app: {{ .Values.vpg_name_0 }}
chart: {{ .Chart.Name }}
- vnf-name: {{ .Values.vnf_name }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
- app: {{ .Values.vpg_name_0 }}
- release: {{ .Release.Name }}
+ vnf-name: {{ .Values.vnf_name }}
+ vf-module-name: {{ .Values.vpg_name_0 }}
template:
metadata:
labels:
- app: {{ .Values.vpg_name_0 }}
- release: {{ .Release.Name }}
vnf-name: {{ .Values.vnf_name }}
+ vf-module-name: {{ .Values.vpg_name_0 }}
+ release: {{ .Release.Name }}
+ chart: {{ .Chart.Name }}
annotations:
VirtletLibvirtCPUSetting: |
mode: host-model
@@ -37,7 +38,7 @@ spec:
- wget -O packetgen.sh https://git.onap.org/multicloud/k8s/plain/kud/tests/vFW/packetgen
- bash -c 'set -a; . /etc/cloud/environment; bash packetgen.sh'
VirtletRootVolumeSize: 5Gi
- k8s.v1.cni.cncf.io/networks: "{{ .Values.vnf_name }}-ovn-attachment"
+ k8s.v1.cni.cncf.io/networks: "{{ .Values.net_attachment_definition }}"
k8s.plugin.opnfv.org/nfn-network: |
{ "type": "ovn4nfv",
"interface": [
diff --git a/heat/vFW_CNF_CDS/templates/helm/vpkg/templates/service.yaml b/heat/vFW_CNF_CDS/templates/helm/vpkg/templates/service.yaml
index 7f00ba61..06b1ad8f 100644
--- a/heat/vFW_CNF_CDS/templates/helm/vpkg/templates/service.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vpkg/templates/service.yaml
@@ -1,12 +1,12 @@
apiVersion: v1
kind: Service
metadata:
- name: "{{ .Values.vpg_name_0 }}-management-api"
+ name: {{ .Values.vpg_name_0 }}-management-api
labels:
- app: {{ .Values.vpg_name_0 }}
+ vnf-name: {{ .Values.vnf_name }}
+ vf-module-name: {{ .Values.vpg_name_0 }}
release: {{ .Release.Name }}
chart: {{ .Chart.Name }}
- vnf-name: {{ .Values.vnf_name }}
spec:
type: {{ .Values.service.type }}
ports:
@@ -15,3 +15,4 @@ spec:
selector:
app: {{ .Values.vpg_name_0 }}
release: {{ .Release.Name }}
+ chart: {{ .Chart.Name }}
diff --git a/heat/vFW_CNF_CDS/templates/helm/vpkg/values.yaml b/heat/vFW_CNF_CDS/templates/helm/vpkg/values.yaml
index 20f00265..82c208cb 100644
--- a/heat/vFW_CNF_CDS/templates/helm/vpkg/values.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vpkg/values.yaml
@@ -7,19 +7,18 @@ image:
resources:
limits:
memory: 4Gi
-service:
-#service port value for packetgen service
+service: #service for packetgen management
type: NodePort
ports:
port: 2831
nodePort: 30831
-# Kubernetes PARAMETERS
# Names
-vpg_name_0: test-vnf-vpg
vnf_name: test-vnf
+vpg_name_0: test-vnf-vpg
int_private1_net_id: unprotected-net
onap_private_net_id: onap-private-net
+net_attachment_definition: vfw-net-attach
# Own Addresses
vpg_int_private1_ip_0: 192.168.10.2
vpg_onap_private_ip_0: 10.10.100.2
diff --git a/heat/vFW_CNF_CDS/templates/helm/vsn/templates/configmap.yaml b/heat/vFW_CNF_CDS/templates/helm/vsn/templates/configmap.yaml
index 42bd634d..82f8f8b0 100644
--- a/heat/vFW_CNF_CDS/templates/helm/vsn/templates/configmap.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vsn/templates/configmap.yaml
@@ -3,10 +3,10 @@ kind: ConfigMap
metadata:
name: {{ .Values.vsn_name_0 }}-configmap
labels:
+ vnf-name: {{ .Values.vnf_name }}
+ vf-module-name: {{ .Values.vsn_name_0 }}
release: {{ .Release.Name }}
- app: {{ .Values.vsn_name_0 }}
chart: {{ .Chart.Name }}
- vnf-name: {{ .Values.vnf_name }}
data:
- protected_net_gw: {{ (splitn "/" 2 .Values.int_private2_gw_ip)._0 | quote }}
+ protected_net_gw: {{ .Values.int_private2_gw_ip | quote }}
protected_private_net_cidr: {{ .Values.int_private1_net_cidr | quote }}
diff --git a/heat/vFW_CNF_CDS/templates/helm/vsn/templates/deployment.yaml b/heat/vFW_CNF_CDS/templates/helm/vsn/templates/deployment.yaml
index 4df818e9..6f45ed4a 100644
--- a/heat/vFW_CNF_CDS/templates/helm/vsn/templates/deployment.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vsn/templates/deployment.yaml
@@ -3,24 +3,25 @@ kind: Deployment
metadata:
name: {{ .Values.vsn_name_0 }}
labels:
+ vnf-name: {{ .Values.vnf_name }}
+ vf-module-name: {{ .Values.vsn_name_0 }}
release: {{ .Release.Name }}
- app: {{ .Values.vsn_name_0 }}
chart: {{ .Chart.Name }}
- vnf-name: {{ .Values.vnf_name }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
- app: {{ .Values.vsn_name_0 }}
- release: {{ .Release.Name }}
+ vnf-name: {{ .Values.vnf_name }}
+ vf-module-name: {{ .Values.vsn_name_0 }}
template:
metadata:
labels:
- app: {{ .Values.vsn_name_0 }}
- release: {{ .Release.Name }}
vnf-name: {{ .Values.vnf_name }}
+ vf-module-name: {{ .Values.vsn_name_0 }}
+ release: {{ .Release.Name }}
+ chart: {{ .Chart.Name }}
annotations:
- k8s.v1.cni.cncf.io/networks: "{{ .Values.vnf_name }}-ovn-attachment"
+ k8s.v1.cni.cncf.io/networks: "{{ .Values.net_attachment_definition }}"
k8s.plugin.opnfv.org/nfn-network: |
{ "type": "ovn4nfv",
"interface": [
diff --git a/heat/vFW_CNF_CDS/templates/helm/vsn/templates/service.yaml b/heat/vFW_CNF_CDS/templates/helm/vsn/templates/service.yaml
index 06708ace..967a160d 100644
--- a/heat/vFW_CNF_CDS/templates/helm/vsn/templates/service.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vsn/templates/service.yaml
@@ -1,12 +1,12 @@
apiVersion: v1
kind: Service
metadata:
- name: "{{ .Values.vsn_name_0 }}-darkstat-ui"
+ name: {{ .Values.vsn_name_0 }}-darkstat-ui
labels:
- app: {{ .Values.vsn_name_0 }}
+ vnf-name: {{ .Values.vnf_name }}
+ vf-module-name: {{ .Values.vsn_name_0 }}
release: {{ .Release.Name }}
chart: {{ .Chart.Name }}
- vnf-name: {{ .Values.vnf_name }}
spec:
type: {{ .Values.service.type }}
ports:
@@ -15,3 +15,4 @@ spec:
selector:
app: {{ .Values.vsn_name_0 }}
release: {{ .Release.Name }}
+ chart: {{ .Chart.Name }}
diff --git a/heat/vFW_CNF_CDS/templates/helm/vsn/values.yaml b/heat/vFW_CNF_CDS/templates/helm/vsn/values.yaml
index d82ede4a..6d12c514 100644
--- a/heat/vFW_CNF_CDS/templates/helm/vsn/values.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vsn/values.yaml
@@ -1,36 +1,26 @@
-# Default values for sink.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
+# Static Defaults
replicaCount: 1
-
image:
sinkrepo: rtsood/onap-vfw-demo-sink
sinktag: 0.2.0
pullPolicy: IfNotPresent
darkstatrepo: electrocucaracha/darkstat
darkstattag: latest
-
-service:
-#serivce port value for sink service
+service: #service for sink darkstat-ui
type: NodePort
ports:
port: 667
nodePort: 30667
-
-# Static Defaults
-#
-# Kubernetes PARAMETERS
# Names
vnf_name: test-vnf
vsn_name_0: test-vnf-vsn
int_private2_net_id: protected-net
onap_private_net_id: onap-private-net
-
+net_attachment_definition: vfw-net-attach
# OWN Addresses
vsn_int_private2_ip_0: 192.168.20.3
vsn_onap_private_ip_0: 10.10.100.4
# Env Variables
-int_private2_gw_ip: 192.168.20.1/24
+int_private2_gw_ip: 192.168.20.1
int_private1_net_cidr: 192.168.10.0/24