Correct CBA package for vFW_CNF_CDS usecase 88/100588/17
authorKonrad Bańka <k.banka@samsung.com>
Fri, 24 Jan 2020 10:06:14 +0000 (11:06 +0100)
committerKonrad Bańka <k.banka@samsung.com>
Wed, 26 Feb 2020 15:16:41 +0000 (16:16 +0100)
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

38 files changed:
heat/vFW_CNF_CDS/templates/Makefile
heat/vFW_CNF_CDS/templates/base/MANIFEST.json
heat/vFW_CNF_CDS/templates/base/base_template.env
heat/vFW_CNF_CDS/templates/base/base_template.yaml
heat/vFW_CNF_CDS/templates/cba-dd.json
heat/vFW_CNF_CDS/templates/cba/Definitions/data_types.json
heat/vFW_CNF_CDS/templates/cba/Definitions/node_types.json
heat/vFW_CNF_CDS/templates/cba/Definitions/resources_definition_types.json
heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json
heat/vFW_CNF_CDS/templates/cba/Scripts/kotlin/KotlinK8sProfileUpload.kt
heat/vFW_CNF_CDS/templates/cba/TOSCA-Metadata/TOSCA.meta
heat/vFW_CNF_CDS/templates/cba/Templates/base_template-mapping.json
heat/vFW_CNF_CDS/templates/cba/Templates/base_template-template.vtl
heat/vFW_CNF_CDS/templates/cba/Templates/k8s-profiles/vfw-cnf-cds-base-profile.tar.gz [new file with mode: 0644]
heat/vFW_CNF_CDS/templates/cba/Templates/vfw-mapping.json
heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl
heat/vFW_CNF_CDS/templates/cba/Templates/vnf-mapping.json
heat/vFW_CNF_CDS/templates/cba/Templates/vnf-template.vtl
heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-mapping.json
heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-template.vtl
heat/vFW_CNF_CDS/templates/cba/Templates/vsn-mapping.json
heat/vFW_CNF_CDS/templates/cba/Templates/vsn-template.vtl
heat/vFW_CNF_CDS/templates/helm/base_template/templates/network_attachment_definition.yaml
heat/vFW_CNF_CDS/templates/helm/base_template/templates/onap-private-net.yaml
heat/vFW_CNF_CDS/templates/helm/base_template/templates/protected-private-net.yaml
heat/vFW_CNF_CDS/templates/helm/base_template/templates/unprotected-private-net.yaml
heat/vFW_CNF_CDS/templates/helm/base_template/values.yaml
heat/vFW_CNF_CDS/templates/helm/vfw/templates/configmap.yaml
heat/vFW_CNF_CDS/templates/helm/vfw/templates/deployment.yaml
heat/vFW_CNF_CDS/templates/helm/vfw/values.yaml
heat/vFW_CNF_CDS/templates/helm/vpkg/templates/configmap.yaml
heat/vFW_CNF_CDS/templates/helm/vpkg/templates/deployment.yaml
heat/vFW_CNF_CDS/templates/helm/vpkg/templates/service.yaml
heat/vFW_CNF_CDS/templates/helm/vpkg/values.yaml
heat/vFW_CNF_CDS/templates/helm/vsn/templates/configmap.yaml
heat/vFW_CNF_CDS/templates/helm/vsn/templates/deployment.yaml
heat/vFW_CNF_CDS/templates/helm/vsn/templates/service.yaml
heat/vFW_CNF_CDS/templates/helm/vsn/values.yaml

index 244f923..98b2890 100644 (file)
@@ -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
index aebb146..cd971cd 100644 (file)
@@ -2,6 +2,10 @@
     "name": "virtualFirewall",
     "description": "",
     "data": [
+        {
+            "file": "vFW_CDS_CNF.zip",
+            "type": "CONTROLLER_BLUEPRINT_ARCHIVE"
+        },
         {
             "file": "base_template.yaml",
             "type": "HEAT",
index 0a69e08..53735a9 100644 (file)
@@ -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
index 403b0e4..da06507 100644 (file)
@@ -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:
index 1d85d96..7943f13 100644 (file)
@@ -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",
          }
       }
     }
+  },
+  {
+      "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"
+                      ]
+                  }
+              }
+          }
+      }
   }
 ]
index 60b89b7..94b0943 100644 (file)
         "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" : "",
           "type" : "string",
           "status" : "",
           "constraints" : [ { } ],
-          "default" : "vpg_onap_private_ip_0",
+          "default" : "${vpg_onap_private_ip_0}",
           "entry_schema" : {
             "type" : ""
           }
             "type" : ""
           }
         },
+        "vf-module-model-invariant-uuid" : {
+          "type" : "string"
+        },
         "vpg_name_0" : {
           "description" : "",
           "required" : false,
             "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,
           "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",
         "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" : "",
       "derived_from" : "tosca.datatypes.Dynamic"
     }
   }
-}
\ No newline at end of file
+}
index 12eb1bc..b78a311 100644 (file)
       },
       "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",
       "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
index f1c3c80..89342db 100644 (file)
@@ -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" : {
       "description" : "dcae_collector_port",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
     "sources" : {
       "input" : {
       "description" : "demo_artifacts_version",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
     "sources" : {
       "input" : {
       "description" : "flavor_name",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
     "sources" : {
       "input" : {
       "description" : "image_name",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
     "sources" : {
       "input" : {
       "description" : "install_script_version",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
     "sources" : {
       "input" : {
       "description" : "Private unprotected network gateway ip address",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "Samuli, Silvius <s.silvius@partner.samsung.com>",
     "sources" : {
       "input" : {
       "description" : "int_private1_net_cidr",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
     "sources" : {
       "input" : {
       "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" : {
       "description" : "Private network identification",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "Samuli, Silvius <s.silvius@partner.samsung.com>",
     "sources" : {
       "input" : {
       "description" : "Private unprotected subnetwork identification",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "Samuli, Silvius <s.silvius@partner.samsung.com>",
     "sources" : {
       "input" : {
       "description" : "Private protected network gateway ip address",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "Samuli, Silvius <s.silvius@partner.samsung.com>",
     "sources" : {
       "input" : {
       "description" : "int_private2_net_cidr",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
     "sources" : {
       "input" : {
       "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"
       "description" : "Private protected network identification",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "Samuli, Silvius <s.silvius@partner.samsung.com>",
     "sources" : {
       "input" : {
       "description" : "Private protected subnetwork identification",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "Samuli, Silvius <s.silvius@partner.samsung.com>",
     "sources" : {
       "input" : {
       "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" : {
     "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"
       "description" : "key_name",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
     "sources" : {
       "input" : {
       "description" : "management-prefix-id",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
     "sources" : {
       "input" : {
       "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" : {
       "description" : "nexus_artifact_repo",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
     "sources" : {
       "input" : {
       "description" : "nfc-naming-code",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
     "sources" : {
       "input" : {
       "description" : "Private onap management network gateway ip address",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "Samuli, Silvius <s.silvius@partner.samsung.com>",
     "sources" : {
       "input" : {
       "description" : "onap_private_net_cidr",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
     "sources" : {
       "input" : {
       "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" : {
       "description" : "onap_private_net_id",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
     "sources" : {
       "input" : {
       "description" : "onap_private_subnet_id",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
     "sources" : {
       "input" : {
       "description" : "private1-prefix-id",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
     "sources" : {
       "input" : {
       "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" : {
       "description" : "private2-prefix-id",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
     "sources" : {
       "input" : {
       "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" : {
       "description" : "pub_key",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
     "sources" : {
       "input" : {
       "description" : "public_net_id",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
     "sources" : {
       "input" : {
       "description" : "put-active-streams",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
     "sources" : {
       "input" : {
       "description" : "sec_group",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
     "sources" : {
       "input" : {
       "description" : "To be provided",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "input" : {
       "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"
       "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"
           "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" ]
+        }
       }
     }
   },
       "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" ]
+        }
       }
     }
   },
       "description" : "vf-module-label",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
     "sources" : {
       "input" : {
       "description" : "vf-module-model-customization-uuid",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
     "sources" : {
       "input" : {
       "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" : {
     "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" : {
     "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" : {
       "description" : "vf-module-type",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
     "sources" : {
       "input" : {
         "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"
         }
       }
     }
       "description" : "vf-naming-policy",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
     "sources" : {
       "default" : {
       "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" : {
       "description" : "vfccustomizationuuid",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
     "sources" : {
       "input" : {
       "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" : {
           "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"
         }
       }
     }
       "description" : "vfw_int_private1_ip_0",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
     "sources" : {
       "input" : {
       "description" : "vfw_int_private2_floating_ip",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
     "sources" : {
       "input" : {
       "description" : "vfw_int_private2_ip_0",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
     "sources" : {
       "input" : {
       "description" : "vfw_name_0",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "input" : {
       "description" : "vfw_onap_private_ip_0",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
     "sources" : {
       "input" : {
       "description" : "vnf-id",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
     "sources" : {
       "input" : {
       "default" : {
         "type" : "source-default",
         "properties" : { }
+      },
+      "sdnc" : {
+        "type" : "source-rest",
+        "properties" : {
+          "verb" : "GET",
+          "type" : "JSON",
+          "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/",
+          "path" : "/vnf/0/vnf-id",
+          "input-key-mapping" : {
+            "service-instance-id" : "service-instance-id",
+            "vnf-id" : "generic-vnf.vnf-id"
+          },
+          "output-key-mapping" : {
+            "vnf-id" : "vnf-id"
+          },
+          "key-dependencies" : [ "service-instance-id", "generic-vnf.vnf-id" ]
+        }
       }
     }
   },
       "description" : "vnf-model-customization-uuid",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "input" : {
       "description" : "vnf_name",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
     "sources" : {
       "input" : {
       "description" : "vnfc-model-invariant-uuid",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
     "sources" : {
       "input" : {
           "output-key-mapping" : {
             "vnfc-model-invariant-uuid" : "vfc_invariant_uuid"
           },
-          "endpoint-selector" : "dynamic-db-source",
           "input-key-mapping" : {
             "vfccustomizationuuid" : "vfccustomizationuuid"
           },
       "description" : "vnfc-model-version",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
     "sources" : {
       "input" : {
       "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" : {
       "description" : "vpg_int_private1_ip_0",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
     "sources" : {
       "input" : {
       "description" : "vpg_name_0",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
     "sources" : {
       "input" : {
       "description" : "vpg_onap_private_ip_0",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "input" : {
       "description" : "vsn_int_private2_ip_0",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
     "sources" : {
       "input" : {
       "description" : "vsn_name_0",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "input" : {
       "description" : "vsn_onap_private_ip_0",
       "type" : "string"
     },
+    "group" : "default",
     "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
     "sources" : {
       "input" : {
index f4c38ba..0040e28 100644 (file)
@@ -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"
   },
     "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://",
       "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" : {
           "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" : {
                 "inputs" : {
                   "script-type" : "kotlin",
                   "script-class-reference" : "org.onap.ccsdk.cds.blueprintsprocessor.services.execution.scripts.K8sProfileUpload",
-                  "instance-dependencies" : [ ],
                   "dynamic-properties" : "*profile-upload-properties"
                 }
               }
       }
     }
   }
-}
\ No newline at end of file
+}
index 02c0441..30a7b72 100644 (file)
@@ -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)
index d5b8af2..9a58a23 100644 (file)
@@ -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
index f458032..efedb21 100644 (file)
     "dictionary-source": "input",
     "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",
     ],
     "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": {
       "vnf-id"
     ]
   },
-  {
-    "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": {
       "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"
-    ]
-  },
-  {
-    "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": {
       "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"
-    ]
   }
 ]
index 06fc18e..990e720 100644 (file)
 {
-  "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 (file)
index 0000000..e7b49eb
Binary files /dev/null and b/heat/vFW_CNF_CDS/templates/cba/Templates/k8s-profiles/vfw-cnf-cds-base-profile.tar.gz differ
index 5d80f0c..31067a3 100644 (file)
       "vfccustomizationuuid"
     ],
     "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",
       "vnf-id"
     ]
   },
+  {
+    "name": "onap_private_net_id",
+    "property": {
+      "description": "onap private net id",
+      "type": "string"
+    },
+    "input-param": false,
+    "dictionary-name": "onap_private_net_id",
+    "dictionary-source": "sdnc",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id"
+    ]
+  },
+  {
+    "name": "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,
   {
     "name": "int_private2_net_id",
     "property": {
-      "description": "Private protected network identification",
+      "description": "private2 net id",
       "type": "string"
     },
     "input-param": false,
index a321aa4..c85af20 100644 (file)
 {
-  "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}"
         }
-      ]
-    }
-  ]
+    ]
 }
index a1d4119..e072824 100644 (file)
       "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",
     "dependencies": [],
     "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": {
     "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",
     "dependencies": [
     ]
   },
-  {
-    "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",
     "dependencies": [
     ]
   },
-  {
-    "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",
index 617f0b9..e050c97 100644 (file)
 {
-  "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}"
         }
-      ]
-    }
-  ]
+    ]
 }
index 03e9afa..5c665c1 100644 (file)
     ],
     "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": {
     ]
   },
   {
-    "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"
   {
     "name": "int_private1_net_id",
     "property": {
-      "description": "Private unprotected network identification",
+      "description": "private1 net id",
       "type": "string"
     },
     "input-param": false,
       "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"
+    ]
   }
 ]
index a36240d..27651e4 100644 (file)
 {
-  "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}"
         }
-      ]
-    }
-  ]
+    ]
 }
index 63f9770..7b85b54 100644 (file)
     ],
     "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": {
     ],
     "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": {
       "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"
-    ]
   }
 ]
index 1336b8e..a7a61d6 100644 (file)
 {
-  "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}"
         }
-      ]
-    }
-  ]
+    ]
 }
index eee1f51..3d7c136 100644 (file)
@@ -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: |
     {
index 429574b..1b9423f 100644 (file)
@@ -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 }}
index f7dbfc4..6b939d2 100644 (file)
@@ -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 }}
index 18a383c..db2a5b3 100644 (file)
@@ -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 }}
index 9a371fc..8928bed 100644 (file)
@@ -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
index 832afde..6a38b5a 100644 (file)
@@ -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 }}
-
index 4aa1861..2205cf8 100644 (file)
@@ -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": [
index c97ec60..488f61d 100644 (file)
@@ -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
index f697d44..c3a2ad4 100644 (file)
@@ -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 }}
index acd39ab..ace0478 100644 (file)
@@ -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": [
index 7f00ba6..06b1ad8 100644 (file)
@@ -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 }}
index 20f0026..82c208c 100644 (file)
@@ -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
index 42bd634..82f8f8b 100644 (file)
@@ -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 }}
index 4df818e..6f45ed4 100644 (file)
@@ -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": [
index 06708ac..967a160 100644 (file)
@@ -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 }}
index d82ede4..6d12c51 100644 (file)
@@ -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