aboutsummaryrefslogtreecommitdiffstats
path: root/components/model-catalog
diff options
context:
space:
mode:
authorKAPIL SINGAL <ks220y@att.com>2020-01-23 21:33:19 +0000
committerGerrit Code Review <gerrit@onap.org>2020-01-23 21:33:19 +0000
commit2ca4e2c946b59a4f748bf538f49d93bd78d2da54 (patch)
tree2c7025c770d50ede20d87e657ece3ce27dc438c0 /components/model-catalog
parentb85e6de55f8c697f463584f43325c4777451253a (diff)
parentf29702c7952c99768f7ec2f378ae39916071b420 (diff)
Merge "Update vFW_CDS packages"
Diffstat (limited to 'components/model-catalog')
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/data_types.json292
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/resources_definition_types.json1055
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/vFW_CDS.json (renamed from components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/vFW_spinup.json)113
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vFW/TOSCA-Metadata/TOSCA.meta10
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base-template.vtl77
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base_template-mapping.json (renamed from components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base-mapping.json)187
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base_template-template.vtl109
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/nf-params-mapping.json112
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/nf-params-template.vtl5
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-mapping.json565
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-template.vtl195
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-vnf-mapping.json461
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vnf-mapping.json629
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vnf-template.vtl (renamed from components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-vnf-template.vtl)149
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpkg-mapping.json (renamed from components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpg-mapping.json)511
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpkg-template.vtl (renamed from components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpg-template.vtl)191
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn-mapping.json564
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn-template.vtl188
-rwxr-xr-xcomponents/model-catalog/resource-dictionary/starter-dictionary/vnf-name.json92
-rwxr-xr-xcomponents/model-catalog/resource-dictionary/starter-dictionary/vpg_name_0.json50
20 files changed, 3227 insertions, 2328 deletions
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/data_types.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/data_types.json
index b7109251e..4df92dd3e 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/data_types.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/data_types.json
@@ -1,21 +1,78 @@
{
"data_types" : {
+ "dt-config-deploy-properties" : {
+ "description" : "Dynamic DataType definition for workflow(config-deploy).",
+ "version" : "1.0.0",
+ "properties" : {
+ "vpg_onap_private_ip_0" : {
+ "description" : "",
+ "required" : false,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "vnf-id" : {
+ "description" : "",
+ "required" : false,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "service-instance-id" : {
+ "description" : "",
+ "required" : false,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "active-streams" : {
+ "description" : "",
+ "required" : false,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "put-active-streams" : {
+ "description" : "",
+ "required" : false,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ }
+ },
+ "derived_from" : "tosca.datatypes.Dynamic"
+ },
"dt-resource-assignment-properties" : {
"description" : "Dynamic DataType definition for workflow(resource-assignment).",
"version" : "1.0.0",
"properties" : {
- "nf-role" : {
+ "vf-module-name" : {
"description" : "",
- "required" : true,
+ "required" : false,
"type" : "string",
"status" : "",
"constraints" : [ { } ],
- "default" : "vSN",
+ "default" : "${vf-module-name}",
"entry_schema" : {
"type" : ""
}
},
- "vm-type" : {
+ "private1-prefix-id" : {
"description" : "",
"required" : false,
"type" : "string",
@@ -27,7 +84,27 @@
},
"vnf-id" : {
"description" : "",
- "required" : true,
+ "required" : false,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "vsn_flavor_name" : {
+ "description" : "",
+ "required" : false,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "vfw_int_private2_ip_0" : {
+ "description" : "",
+ "required" : false,
"type" : "string",
"status" : "",
"constraints" : [ { } ],
@@ -37,17 +114,15 @@
},
"public_net_id" : {
"description" : "",
- "required" : true,
+ "required" : false,
"type" : "string",
"status" : "",
"constraints" : [ { } ],
- "value" : "public_net_id",
- "default" : "public_net_id",
"entry_schema" : {
"type" : ""
}
},
- "vnf_name" : {
+ "sec_group" : {
"description" : "",
"required" : false,
"type" : "string",
@@ -57,7 +132,7 @@
"type" : ""
}
},
- "vfw_private_ip_1" : {
+ "nfc-naming-code" : {
"description" : "",
"required" : false,
"type" : "string",
@@ -67,27 +142,28 @@
"type" : ""
}
},
- "unprotected-prefix-id" : {
+ "vnfc-model-invariant-uuid" : {
"description" : "",
"required" : false,
- "type" : "integer",
+ "type" : "string",
"status" : "",
"constraints" : [ { } ],
"entry_schema" : {
"type" : ""
}
},
- "onap_private_subnet_id" : {
+ "vfw_name_0" : {
"description" : "",
"required" : false,
"type" : "string",
"status" : "",
"constraints" : [ { } ],
+ "default" : "${vfw_name_0}",
"entry_schema" : {
"type" : ""
}
},
- "vfw_private_ip_0" : {
+ "nexus_artifact_repo" : {
"description" : "",
"required" : false,
"type" : "string",
@@ -97,9 +173,9 @@
"type" : ""
}
},
- "aic-cloud-region" : {
+ "onap_private_net_cidr" : {
"description" : "",
- "required" : true,
+ "required" : false,
"type" : "string",
"status" : "",
"constraints" : [ { } ],
@@ -107,18 +183,18 @@
"type" : ""
}
},
- "sec_group" : {
+ "vpg_onap_private_ip_0" : {
"description" : "",
- "required" : true,
+ "required" : false,
"type" : "string",
"status" : "",
"constraints" : [ { } ],
- "default" : "onap_sg_PUhf",
+ "default" : "vpg_onap_private_ip_0",
"entry_schema" : {
"type" : ""
}
},
- "vfw_private_ip_2" : {
+ "image_name" : {
"description" : "",
"required" : false,
"type" : "string",
@@ -128,9 +204,9 @@
"type" : ""
}
},
- "vnfc-model-invariant-uuid" : {
+ "flavor_name" : {
"description" : "",
- "required" : true,
+ "required" : false,
"type" : "string",
"status" : "",
"constraints" : [ { } ],
@@ -138,29 +214,31 @@
"type" : ""
}
},
- "nfc-naming-code" : {
+ "dcae_collector_ip" : {
"description" : "",
- "required" : true,
+ "required" : false,
"type" : "string",
"status" : "",
"constraints" : [ { } ],
+ "default" : "10.0.4.1",
"entry_schema" : {
"type" : ""
}
},
- "private-prefix-id" : {
+ "vpg_name_0" : {
"description" : "",
"required" : false,
- "type" : "integer",
+ "type" : "string",
"status" : "",
"constraints" : [ { } ],
+ "default" : "${vpg_name_0}",
"entry_schema" : {
"type" : ""
}
},
- "vf-module-model-customization-uuid" : {
+ "vf-naming-policy" : {
"description" : "",
- "required" : true,
+ "required" : false,
"type" : "string",
"status" : "",
"constraints" : [ { } ],
@@ -168,7 +246,7 @@
"type" : ""
}
},
- "vfw_name_0" : {
+ "int_private2_net_cidr" : {
"description" : "",
"required" : false,
"type" : "string",
@@ -178,7 +256,7 @@
"type" : ""
}
},
- "vf_module_name" : {
+ "vfccustomizationuuid" : {
"description" : "",
"required" : false,
"type" : "string",
@@ -188,21 +266,20 @@
"type" : ""
}
},
- "nexus_artifact_repo" : {
+ "vsn_name_0" : {
"description" : "",
- "required" : true,
+ "required" : false,
"type" : "string",
"status" : "",
"constraints" : [ { } ],
- "value" : "nexus_artifact_repo",
- "default" : "nexus_artifact_repo",
+ "default" : "${vsn_name_0}",
"entry_schema" : {
"type" : ""
}
},
- "onap_private_net_cidr" : {
+ "onap_private_net_id" : {
"description" : "",
- "required" : true,
+ "required" : false,
"type" : "string",
"status" : "",
"constraints" : [ { } ],
@@ -210,7 +287,7 @@
"type" : ""
}
},
- "image_name" : {
+ "demo_artifacts_version" : {
"description" : "",
"required" : false,
"type" : "string",
@@ -220,9 +297,9 @@
"type" : ""
}
},
- "vf-nf-code" : {
+ "vnf-model-customization-uuid" : {
"description" : "",
- "required" : true,
+ "required" : false,
"type" : "string",
"status" : "",
"constraints" : [ { } ],
@@ -230,19 +307,20 @@
"type" : ""
}
},
- "vf-module-id" : {
+ "vfw_int_private1_ip_0" : {
"description" : "",
- "required" : true,
+ "required" : false,
"type" : "string",
"status" : "",
"constraints" : [ { } ],
+ "default" : "${vfw_int_private1_ip_0}",
"entry_schema" : {
"type" : ""
}
},
- "vf-module-label" : {
+ "key_name" : {
"description" : "",
- "required" : true,
+ "required" : false,
"type" : "string",
"status" : "",
"constraints" : [ { } ],
@@ -250,7 +328,7 @@
"type" : ""
}
},
- "vsn_private_ip_0" : {
+ "install_script_version" : {
"description" : "",
"required" : false,
"type" : "string",
@@ -260,7 +338,7 @@
"type" : ""
}
},
- "vpg_name_0" : {
+ "vfw_image_name" : {
"description" : "",
"required" : false,
"type" : "string",
@@ -270,19 +348,20 @@
"type" : ""
}
},
- "vpg_private_ip_1" : {
+ "vfw_onap_private_ip_0" : {
"description" : "",
"required" : false,
"type" : "string",
"status" : "",
"constraints" : [ { } ],
+ "default" : "${vfw_onap_private_ip_0}",
"entry_schema" : {
"type" : ""
}
},
- "protected_private_net_cidr" : {
+ "vnf_name" : {
"description" : "",
- "required" : true,
+ "required" : false,
"type" : "string",
"status" : "",
"constraints" : [ { } ],
@@ -290,18 +369,17 @@
"type" : ""
}
},
- "vf-naming-policy" : {
+ "onap_private_subnet_id" : {
"description" : "",
- "required" : true,
+ "required" : false,
"type" : "string",
"status" : "",
"constraints" : [ { } ],
- "default" : "SDNC_Policy.Config_MS_ONAP_VSN_NAMING_TIMESTAMP",
"entry_schema" : {
"type" : ""
}
},
- "vpg_private_ip_0" : {
+ "aic-cloud-region" : {
"description" : "",
"required" : false,
"type" : "string",
@@ -311,7 +389,7 @@
"type" : ""
}
},
- "vsn_private_ip_1" : {
+ "vsn_int_private2_ip_0" : {
"description" : "",
"required" : false,
"type" : "string",
@@ -321,9 +399,9 @@
"type" : ""
}
},
- "vfccustomizationuuid" : {
+ "vf-module-model-customization-uuid" : {
"description" : "",
- "required" : true,
+ "required" : false,
"type" : "string",
"status" : "",
"constraints" : [ { } ],
@@ -331,9 +409,9 @@
"type" : ""
}
},
- "unprotected_private_net_cidr" : {
+ "vsn_image_name" : {
"description" : "",
- "required" : true,
+ "required" : false,
"type" : "string",
"status" : "",
"constraints" : [ { } ],
@@ -341,7 +419,7 @@
"type" : ""
}
},
- "vsn_name_0" : {
+ "vpg_flavor_name" : {
"description" : "",
"required" : false,
"type" : "string",
@@ -351,7 +429,58 @@
"type" : ""
}
},
- "onap_private_net_id" : {
+ "vf-module-id" : {
+ "description" : "",
+ "required" : false,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "dcae_collector_port" : {
+ "description" : "",
+ "required" : false,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "default" : "30235",
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "vf-module-label" : {
+ "description" : "",
+ "required" : false,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "vfw_int_private2_floating_ip" : {
+ "description" : "",
+ "required" : false,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "vpg_image_name" : {
+ "description" : "",
+ "required" : false,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "private2-prefix-id" : {
"description" : "",
"required" : false,
"type" : "string",
@@ -363,7 +492,7 @@
},
"vnfc-model-version" : {
"description" : "",
- "required" : true,
+ "required" : false,
"type" : "string",
"status" : "",
"constraints" : [ { } ],
@@ -373,7 +502,7 @@
},
"service-instance-id" : {
"description" : "",
- "required" : true,
+ "required" : false,
"type" : "string",
"status" : "",
"constraints" : [ { } ],
@@ -381,19 +510,30 @@
"type" : ""
}
},
- "vf-module-type" : {
+ "vsn_onap_private_ip_0" : {
"description" : "",
- "required" : true,
+ "required" : false,
"type" : "string",
"status" : "",
"constraints" : [ { } ],
+ "default" : "${vsn_onap_private_ip_0}",
"entry_schema" : {
"type" : ""
}
},
- "vnf-model-customization-uuid" : {
+ "vfw_flavor_name" : {
+ "description" : "",
+ "required" : false,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "vf-module-type" : {
"description" : "",
- "required" : true,
+ "required" : false,
"type" : "string",
"status" : "",
"constraints" : [ { } ],
@@ -411,7 +551,17 @@
"type" : ""
}
},
- "key_name" : {
+ "management-prefix-id" : {
+ "description" : "",
+ "required" : false,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "int_private1_net_cidr" : {
"description" : "",
"required" : false,
"type" : "string",
@@ -421,22 +571,24 @@
"type" : ""
}
},
- "protected-prefix-id" : {
+ "vpg_int_private1_ip_0" : {
"description" : "",
"required" : false,
- "type" : "integer",
+ "type" : "string",
"status" : "",
"constraints" : [ { } ],
+ "default" : "${vpg_int_private1_ip_0}",
"entry_schema" : {
"type" : ""
}
},
- "vnf-name" : {
+ "cloud_env" : {
"description" : "",
- "required" : true,
+ "required" : false,
"type" : "string",
"status" : "",
"constraints" : [ { } ],
+ "default" : "openstack",
"entry_schema" : {
"type" : ""
}
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/resources_definition_types.json
index a35974c83..baeafb6bb 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/resources_definition_types.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/resources_definition_types.json
@@ -1,4 +1,22 @@
{
+ "active-streams" : {
+ "tags" : "active-streams",
+ "name" : "active-streams",
+ "property" : {
+ "description" : "active-streams",
+ "type" : "string"
+ },
+ "updated-by" : "Singal, Kapil <ks220y@att.com>",
+ "sources" : {
+ "input" : {
+ "type" : "source-input"
+ },
+ "default" : {
+ "type" : "source-default",
+ "properties" : { }
+ }
+ }
+ },
"aic-cloud-region" : {
"tags" : "aic-cloud-region",
"name" : "aic-cloud-region",
@@ -14,6 +32,181 @@
}
}
},
+ "cloud_env" : {
+ "tags" : "cloud_env",
+ "name" : "cloud_env",
+ "property" : {
+ "description" : "cloud_env",
+ "type" : "string"
+ },
+ "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
+ "sources" : {
+ "input" : {
+ "type" : "source-input"
+ },
+ "default" : {
+ "type" : "source-default",
+ "properties" : { }
+ },
+ "sdnc" : {
+ "type" : "source-rest",
+ "properties" : {
+ "verb" : "GET",
+ "type" : "JSON",
+ "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/cloud_env",
+ "path" : "/param/0/value",
+ "input-key-mapping" : {
+ "service-instance-id" : "service-instance-id",
+ "vnf-id" : "vnf-id"
+ },
+ "output-key-mapping" : {
+ "cloud_env" : "value"
+ },
+ "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+ }
+ }
+ }
+ },
+ "dcae_collector_ip" : {
+ "tags" : "dcae_collector_ip",
+ "name" : "dcae_collector_ip",
+ "property" : {
+ "description" : "dcae_collector_ip",
+ "type" : "string"
+ },
+ "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
+ "sources" : {
+ "input" : {
+ "type" : "source-input"
+ },
+ "default" : {
+ "type" : "source-default",
+ "properties" : { }
+ },
+ "sdnc" : {
+ "type" : "source-rest",
+ "properties" : {
+ "verb" : "GET",
+ "type" : "JSON",
+ "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/dcae_collector_ip",
+ "path" : "/param/0/value",
+ "input-key-mapping" : {
+ "service-instance-id" : "service-instance-id",
+ "vnf-id" : "vnf-id"
+ },
+ "output-key-mapping" : {
+ "dcae_collector_ip" : "value"
+ },
+ "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+ }
+ }
+ }
+ },
+ "dcae_collector_port" : {
+ "tags" : "dcae_collector_port",
+ "name" : "dcae_collector_port",
+ "property" : {
+ "description" : "dcae_collector_port",
+ "type" : "string"
+ },
+ "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
+ "sources" : {
+ "input" : {
+ "type" : "source-input"
+ },
+ "default" : {
+ "type" : "source-default",
+ "properties" : { }
+ },
+ "sdnc" : {
+ "type" : "source-rest",
+ "properties" : {
+ "verb" : "GET",
+ "type" : "JSON",
+ "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/dcae_collector_port",
+ "path" : "/param/0/value",
+ "input-key-mapping" : {
+ "service-instance-id" : "service-instance-id",
+ "vnf-id" : "vnf-id"
+ },
+ "output-key-mapping" : {
+ "dcae_collector_port" : "value"
+ },
+ "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+ }
+ }
+ }
+ },
+ "demo_artifacts_version" : {
+ "tags" : "demo_artifacts_version",
+ "name" : "demo_artifacts_version",
+ "property" : {
+ "description" : "demo_artifacts_version",
+ "type" : "string"
+ },
+ "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
+ "sources" : {
+ "input" : {
+ "type" : "source-input"
+ },
+ "default" : {
+ "type" : "source-default",
+ "properties" : { }
+ },
+ "sdnc" : {
+ "type" : "source-rest",
+ "properties" : {
+ "verb" : "GET",
+ "type" : "JSON",
+ "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/demo_artifacts_version",
+ "path" : "/param/0/value",
+ "input-key-mapping" : {
+ "service-instance-id" : "service-instance-id",
+ "vnf-id" : "vnf-id"
+ },
+ "output-key-mapping" : {
+ "demo_artifacts_version" : "value"
+ },
+ "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+ }
+ }
+ }
+ },
+ "flavor_name" : {
+ "tags" : "flavor_name",
+ "name" : "flavor_name",
+ "property" : {
+ "description" : "flavor_name",
+ "type" : "string"
+ },
+ "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
+ "sources" : {
+ "input" : {
+ "type" : "source-input"
+ },
+ "default" : {
+ "type" : "source-default",
+ "properties" : { }
+ },
+ "sdnc" : {
+ "type" : "source-rest",
+ "properties" : {
+ "verb" : "GET",
+ "type" : "JSON",
+ "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/flavor_name",
+ "path" : "/param/0/value",
+ "input-key-mapping" : {
+ "service-instance-id" : "service-instance-id",
+ "vnf-id" : "vnf-id"
+ },
+ "output-key-mapping" : {
+ "flavor_name" : "value"
+ },
+ "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+ }
+ }
+ }
+ },
"image_name" : {
"tags" : "image_name",
"name" : "image_name",
@@ -21,16 +214,21 @@
"description" : "image_name",
"type" : "string"
},
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
+ "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
"type" : "source-input"
},
+ "default" : {
+ "type" : "source-default",
+ "properties" : { }
+ },
"sdnc" : {
"type" : "source-rest",
"properties" : {
+ "verb" : "GET",
"type" : "JSON",
- "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/image_name",
+ "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/image_name",
"path" : "/param/0/value",
"input-key-mapping" : {
"service-instance-id" : "service-instance-id",
@@ -44,6 +242,135 @@
}
}
},
+ "install_script_version" : {
+ "tags" : "install_script_version",
+ "name" : "install_script_version",
+ "property" : {
+ "description" : "install_script_version",
+ "type" : "string"
+ },
+ "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
+ "sources" : {
+ "input" : {
+ "type" : "source-input"
+ },
+ "default" : {
+ "type" : "source-default",
+ "properties" : { }
+ },
+ "sdnc" : {
+ "type" : "source-rest",
+ "properties" : {
+ "verb" : "GET",
+ "type" : "JSON",
+ "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/install_script_version",
+ "path" : "/param/0/value",
+ "input-key-mapping" : {
+ "service-instance-id" : "service-instance-id",
+ "vnf-id" : "vnf-id"
+ },
+ "output-key-mapping" : {
+ "install_script_version" : "value"
+ },
+ "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+ }
+ }
+ }
+ },
+ "int_private1_net_cidr" : {
+ "tags" : "int_private1_net_cidr",
+ "name" : "int_private1_net_cidr",
+ "property" : {
+ "description" : "int_private1_net_cidr",
+ "type" : "string"
+ },
+ "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
+ "sources" : {
+ "input" : {
+ "type" : "source-input"
+ },
+ "default" : {
+ "type" : "source-default",
+ "properties" : { }
+ },
+ "processor-db" : {
+ "type" : "source-db",
+ "properties" : {
+ "endpoint-selector" : "dynamic-db-source",
+ "type" : "SQL",
+ "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private1\"",
+ "input-key-mapping" : { },
+ "output-key-mapping" : {
+ "int_private1_net_cidr" : "prefix"
+ }
+ }
+ },
+ "sdnc" : {
+ "type" : "source-rest",
+ "properties" : {
+ "verb" : "GET",
+ "type" : "JSON",
+ "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/int_private1_net_cidr",
+ "path" : "/param/0/value",
+ "input-key-mapping" : {
+ "service-instance-id" : "service-instance-id",
+ "vnf-id" : "vnf-id"
+ },
+ "output-key-mapping" : {
+ "int_private1_net_cidr" : "value"
+ },
+ "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+ }
+ }
+ }
+ },
+ "int_private2_net_cidr" : {
+ "tags" : "int_private2_net_cidr",
+ "name" : "int_private2_net_cidr",
+ "property" : {
+ "description" : "int_private2_net_cidr",
+ "type" : "string"
+ },
+ "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
+ "sources" : {
+ "input" : {
+ "type" : "source-input"
+ },
+ "default" : {
+ "type" : "source-default",
+ "properties" : { }
+ },
+ "sdnc" : {
+ "type" : "source-rest",
+ "properties" : {
+ "verb" : "GET",
+ "type" : "JSON",
+ "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/int_private2_net_cidr",
+ "path" : "/param/0/value",
+ "input-key-mapping" : {
+ "service-instance-id" : "service-instance-id",
+ "vnf-id" : "vnf-id"
+ },
+ "output-key-mapping" : {
+ "int_private2_net_cidr" : "value"
+ },
+ "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+ }
+ },
+ "processor-db" : {
+ "type" : "source-db",
+ "properties" : {
+ "endpoint-selector" : "dynamic-db-source",
+ "type" : "SQL",
+ "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private2\"",
+ "input-key-mapping" : { },
+ "output-key-mapping" : {
+ "int_private2_net_cidr" : "prefix"
+ }
+ }
+ }
+ }
+ },
"key_name" : {
"tags" : "key_name",
"name" : "key_name",
@@ -51,16 +378,21 @@
"description" : "key_name",
"type" : "string"
},
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
+ "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
"type" : "source-input"
},
+ "default" : {
+ "type" : "source-default",
+ "properties" : { }
+ },
"sdnc" : {
"type" : "source-rest",
"properties" : {
+ "verb" : "GET",
"type" : "JSON",
- "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/key_name",
+ "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/key_name",
"path" : "/param/0/value",
"input-key-mapping" : {
"service-instance-id" : "service-instance-id",
@@ -74,11 +406,11 @@
}
}
},
- "nexus_artifact_repo" : {
- "tags" : "nexus_artifact_repo",
- "name" : "nexus_artifact_repo",
+ "management-prefix-id" : {
+ "tags" : "management-prefix-id",
+ "name" : "management-prefix-id",
"property" : {
- "description" : "nexus_artifact_repo",
+ "description" : "management-prefix-id",
"type" : "string"
},
"updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
@@ -93,46 +425,65 @@
"sdnc" : {
"type" : "source-rest",
"properties" : {
+ "verb" : "GET",
"type" : "JSON",
- "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/nexus_artifact_repo",
+ "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/management-prefix-id",
"path" : "/param/0/value",
"input-key-mapping" : {
"service-instance-id" : "service-instance-id",
"vnf-id" : "vnf-id"
},
"output-key-mapping" : {
- "nexus_artifact_repo" : "value"
+ "management-prefix-id" : "value"
},
"key-dependencies" : [ "service-instance-id", "vnf-id" ]
}
+ },
+ "processor-db" : {
+ "type" : "source-db",
+ "properties" : {
+ "endpoint-selector" : "dynamic-db-source",
+ "type" : "SQL",
+ "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" : {
+ "management-prefix-id" : "prefix_id"
+ }
+ }
}
}
},
- "nf-role" : {
- "tags" : "nf-role",
- "name" : "nf-role",
+ "nexus_artifact_repo" : {
+ "tags" : "nexus_artifact_repo",
+ "name" : "nexus_artifact_repo",
"property" : {
- "description" : "vnf/nf-role",
+ "description" : "nexus_artifact_repo",
"type" : "string"
},
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
+ "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
+ "input" : {
+ "type" : "source-input"
+ },
"default" : {
"type" : "source-default",
"properties" : { }
},
- "processor-db" : {
- "type" : "source-db",
+ "sdnc" : {
+ "type" : "source-rest",
"properties" : {
- "type" : "SQL",
- "query" : "select sdnctl.VF_MODEL.nf_role as vf_model_role from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:vnfmodelcustomizationuuid",
+ "verb" : "GET",
+ "type" : "JSON",
+ "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/nexus_artifact_repo",
+ "path" : "/param/0/value",
"input-key-mapping" : {
- "vnfmodelcustomizationuuid" : "vnf-model-customization-uuid"
+ "service-instance-id" : "service-instance-id",
+ "vnf-id" : "vnf-id"
},
"output-key-mapping" : {
- "nf-role" : "vf_model_role"
+ "nexus_artifact_repo" : "value"
},
- "key-dependencies" : [ "vnf-model-customization-uuid" ]
+ "key-dependencies" : [ "service-instance-id", "vnf-id" ]
}
}
}
@@ -156,7 +507,6 @@
"processor-db" : {
"type" : "source-db",
"properties" : {
- "endpoint-selector" : "dynamic-db-source",
"type" : "SQL",
"query" : "select nfc_naming_code as nfc_naming_code from sdnctl.VFC_MODEL where customization_uuid=:vfccustomizationuuid",
"input-key-mapping" : {
@@ -165,7 +515,8 @@
"output-key-mapping" : {
"nfc-naming-code" : "nfc_naming_code"
},
- "key-dependencies" : [ "vfccustomizationuuid" ]
+ "key-dependencies" : [ "vfccustomizationuuid" ],
+ "endpoint-selector" : "dynamic-db-source"
}
}
}
@@ -186,11 +537,24 @@
"type" : "source-default",
"properties" : { }
},
+ "processor-db" : {
+ "type" : "source-db",
+ "properties" : {
+ "endpoint-selector" : "dynamic-db-source",
+ "type" : "SQL",
+ "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"management\"",
+ "input-key-mapping" : { },
+ "output-key-mapping" : {
+ "onap_private_net_cidr" : "prefix"
+ }
+ }
+ },
"sdnc" : {
"type" : "source-rest",
"properties" : {
+ "verb" : "GET",
"type" : "JSON",
- "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/onap_private_net_cidr",
+ "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/onap_private_net_cidr",
"path" : "/param/0/value",
"input-key-mapping" : {
"service-instance-id" : "service-instance-id",
@@ -201,18 +565,6 @@
},
"key-dependencies" : [ "service-instance-id", "vnf-id" ]
}
- },
- "processor-db" : {
- "type" : "source-db",
- "properties" : {
- "endpoint-selector" : "dynamic-db-source",
- "type" : "SQL",
- "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"management\"",
- "input-key-mapping" : { },
- "output-key-mapping" : {
- "onap_private_net_cidr" : "prefix"
- }
- }
}
}
},
@@ -235,8 +587,9 @@
"sdnc" : {
"type" : "source-rest",
"properties" : {
+ "verb" : "GET",
"type" : "JSON",
- "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/onap_private_net_id",
+ "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/onap_private_net_id",
"path" : "/param/0/value",
"input-key-mapping" : {
"service-instance-id" : "service-instance-id",
@@ -269,8 +622,9 @@
"sdnc" : {
"type" : "source-rest",
"properties" : {
+ "verb" : "GET",
"type" : "JSON",
- "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/onap_private_subnet_id",
+ "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/onap_private_subnet_id",
"path" : "/param/0/value",
"input-key-mapping" : {
"service-instance-id" : "service-instance-id",
@@ -284,11 +638,11 @@
}
}
},
- "private-prefix-id" : {
- "tags" : "private-prefix-id",
- "name" : "private-prefix-id",
+ "private1-prefix-id" : {
+ "tags" : "private1-prefix-id",
+ "name" : "private1-prefix-id",
"property" : {
- "description" : "private-prefix-id",
+ "description" : "private1-prefix-id",
"type" : "string"
},
"updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
@@ -300,57 +654,79 @@
"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/private1-prefix-id",
+ "path" : "/param/0/value",
+ "input-key-mapping" : {
+ "service-instance-id" : "service-instance-id",
+ "vnf-id" : "vnf-id"
+ },
+ "output-key-mapping" : {
+ "private1-prefix-id" : "value"
+ },
+ "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+ }
+ },
"processor-db" : {
"type" : "source-db",
"properties" : {
"endpoint-selector" : "dynamic-db-source",
"type" : "SQL",
- "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"private\"",
+ "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" : {
- "private-prefix-id" : "prefix_id"
+ "private1-prefix-id" : "prefix_id"
}
}
}
}
},
- "protected-prefix-id" : {
- "tags" : "protected-prefix-id",
- "name" : "protected-prefix-id",
+ "private2-prefix-id" : {
+ "tags" : "private2-prefix-id",
+ "name" : "private2-prefix-id",
"property" : {
- "description" : "protected-prefix-id",
+ "description" : "private2-prefix-id",
"type" : "string"
},
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
+ "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
- "processor-db" : {
- "type" : "source-db",
+ "input" : {
+ "type" : "source-input"
+ },
+ "default" : {
+ "type" : "source-default",
+ "properties" : { }
+ },
+ "sdnc" : {
+ "type" : "source-rest",
"properties" : {
- "type" : "SQL",
- "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"protected\"",
+ "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/private2-prefix-id",
+ "path" : "/param/0/value",
+ "input-key-mapping" : {
+ "service-instance-id" : "service-instance-id",
+ "vnf-id" : "vnf-id"
+ },
"output-key-mapping" : {
- "protected-prefix-id" : "prefix_id"
- }
+ "private2-prefix-id" : "value"
+ },
+ "key-dependencies" : [ "service-instance-id", "vnf-id" ]
}
- }
- }
- },
- "protected_private_net_cidr" : {
- "tags" : "protected_private_net_cidr",
- "name" : "protected_private_net_cidr",
- "property" : {
- "description" : "protected_private_net_cidr",
- "type" : "string"
- },
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "sources" : {
+ },
"processor-db" : {
"type" : "source-db",
"properties" : {
+ "endpoint-selector" : "dynamic-db-source",
"type" : "SQL",
- "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"protected\"",
+ "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" : {
- "protected_private_net_cidr" : "prefix"
+ "private2-prefix-id" : "prefix_id"
}
}
}
@@ -375,8 +751,9 @@
"sdnc" : {
"type" : "source-rest",
"properties" : {
+ "verb" : "GET",
"type" : "JSON",
- "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/pub_key",
+ "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/pub_key",
"path" : "/param/0/value",
"input-key-mapping" : {
"service-instance-id" : "service-instance-id",
@@ -409,8 +786,9 @@
"sdnc" : {
"type" : "source-rest",
"properties" : {
+ "verb" : "GET",
"type" : "JSON",
- "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/public_net_id",
+ "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/public_net_id",
"path" : "/param/0/value",
"input-key-mapping" : {
"service-instance-id" : "service-instance-id",
@@ -424,6 +802,41 @@
}
}
},
+ "put-active-streams" : {
+ "tags" : "put-active-streams",
+ "name" : "put-active-streams",
+ "property" : {
+ "description" : "put-active-streams",
+ "type" : "string"
+ },
+ "updated-by" : "Singal, Kapil <ks220y@att.com>",
+ "sources" : {
+ "sdnc" : {
+ "type" : "source-rest",
+ "properties" : {
+ "verb" : "PUT",
+ "type" : "JSON",
+ "url-path" : "$vpg_onap_private_ip_0:8183/restconf/config/stream-count:stream-count/streams",
+ "path" : "/param/0/value",
+ "input-key-mapping" : {
+ "vpg_onap_private_ip_0" : "vpg_onap_private_ip_0",
+ "active-streams" : "active-streams"
+ },
+ "output-key-mapping" : { },
+ "key-dependencies" : [ "vpg_onap_private_ip_0", "active-streams" ],
+ "endpoint-selector" : "vpkg-rest-api",
+ "payload" : "{\"streams\": {\"active-streams\": $active-streams}}"
+ }
+ },
+ "input" : {
+ "type" : "source-input"
+ },
+ "default" : {
+ "type" : "source-default",
+ "properties" : { }
+ }
+ }
+ },
"sec_group" : {
"tags" : "sec_group",
"name" : "sec_group",
@@ -443,8 +856,9 @@
"sdnc" : {
"type" : "source-rest",
"properties" : {
+ "verb" : "GET",
"type" : "JSON",
- "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/sec_group",
+ "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/sec_group",
"path" : "/param/0/value",
"input-key-mapping" : {
"service-instance-id" : "service-instance-id",
@@ -501,48 +915,6 @@
}
}
},
- "unprotected-prefix-id" : {
- "tags" : "unprotected-prefix-id",
- "name" : "unprotected-prefix-id",
- "property" : {
- "description" : "unprotected-prefix-id",
- "type" : "string"
- },
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "sources" : {
- "processor-db" : {
- "type" : "source-db",
- "properties" : {
- "type" : "SQL",
- "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"unprotected\"",
- "output-key-mapping" : {
- "unprotected-prefix-id" : "prefix_id"
- }
- }
- }
- }
- },
- "unprotected_private_net_cidr" : {
- "tags" : "unprotected_private_net_cidr",
- "name" : "unprotected_private_net_cidr",
- "property" : {
- "description" : "unprotected_private_net_cidr",
- "type" : "string"
- },
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "sources" : {
- "processor-db" : {
- "type" : "source-db",
- "properties" : {
- "type" : "SQL",
- "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"unprotected\"",
- "output-key-mapping" : {
- "unprotected_private_net_cidr" : "prefix"
- }
- }
- }
- }
- },
"vf-module-id" : {
"tags" : "vf-module-id",
"name" : "vf-module-id",
@@ -585,7 +957,8 @@
"output-key-mapping" : {
"vf-module-label" : "vf_module_label"
},
- "key-dependencies" : [ "vf-module-model-customization-uuid" ]
+ "key-dependencies" : [ "vf-module-model-customization-uuid" ],
+ "endpoint-selector" : "dynamic-db-source"
}
}
}
@@ -608,6 +981,24 @@
}
}
},
+ "vf-module-name" : {
+ "tags" : "vf-module-name",
+ "name" : "vf-module-name",
+ "property" : {
+ "description" : "vf-module-name",
+ "type" : "string"
+ },
+ "updated-by" : "Singal, Kapil <ks220y@att.com>",
+ "sources" : {
+ "input" : {
+ "type" : "source-input"
+ },
+ "default" : {
+ "type" : "source-default",
+ "properties" : { }
+ }
+ }
+ },
"vf-module-type" : {
"tags" : "vf-module-type",
"name" : "vf-module-type",
@@ -615,20 +1006,28 @@
"description" : "vf-module-type",
"type" : "string"
},
- "updated-by" : "adetalhouet",
+ "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
+ "input" : {
+ "type" : "source-input"
+ },
+ "default" : {
+ "type" : "source-default",
+ "properties" : { }
+ },
"processor-db" : {
"type" : "source-db",
"properties" : {
"type" : "SQL",
- "query" : "select sdnctl.demo.value as value from sdnctl.demo where sdnctl.demo.id=:vfmoduleid",
- "input-key-mapping" : {
- "vfmoduleid" : "vf-module-number"
- },
+ "query" : "select vf_module_type as vf_module_type from sdnctl.VF_MODULE_MODEL where customization_uuid=:customizationid",
"output-key-mapping" : {
- "vf-module-type" : "value"
+ "vf-module-type" : "vf_module_type"
+ },
+ "endpoint-selector" : "dynamic-db-source",
+ "input-key-mapping" : {
+ "customizationid" : "vf-module-model-customization-uuid"
},
- "key-dependencies" : [ "vf-module-number" ]
+ "key-dependencies" : [ "vf-module-model-customization-uuid" ]
}
}
}
@@ -640,68 +1039,46 @@
"description" : "vf-naming-policy",
"type" : "string"
},
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
+ "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"default" : {
"type" : "source-default",
"properties" : { }
},
- "processor-db" : {
- "type" : "source-db",
+ "sdnc" : {
+ "type" : "source-rest",
"properties" : {
- "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",
+ "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/vf-naming-policy",
+ "path" : "/param/0/value",
"input-key-mapping" : {
- "vnf_model_customization_uuid" : "vnf-model-customization-uuid"
+ "service-instance-id" : "service-instance-id",
+ "vnf-id" : "vnf-id"
},
"output-key-mapping" : {
- "vf-naming-policy" : "vf_naming_policy"
+ "vf-naming-policy" : "value"
},
- "key-dependencies" : [ "vnf-model-customization-uuid" ]
+ "key-dependencies" : [ "service-instance-id", "vnf-id" ]
}
- }
- }
- },
- "vf-nf-code" : {
- "tags" : "vf-nf-code",
- "name" : "vf-nf-code",
- "property" : {
- "description" : "vf-nf-code",
- "type" : "string"
- },
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "sources" : {
+ },
"processor-db" : {
"type" : "source-db",
"properties" : {
+ "endpoint-selector" : "dynamic-db-source",
"type" : "SQL",
- "query" : "select sdnctl.VF_MODEL.nf_code as vf_nf_code from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:customizationid",
+ "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" : {
- "customizationid" : "vnf-model-customization-uuid"
+ "vnf_model_customization_uuid" : "vnf-model-customization-uuid"
},
"output-key-mapping" : {
- "vf-nf-code" : "vf_nf_code"
+ "vf-naming-policy" : "vf_naming_policy"
},
"key-dependencies" : [ "vnf-model-customization-uuid" ]
}
}
}
},
- "vf_module_name" : {
- "tags" : "vf_module_name",
- "name" : "vf_module_name",
- "property" : {
- "description" : "vf_module_name",
- "type" : "string"
- },
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "sources" : {
- "input" : {
- "type" : "source-input",
- "properties" : { }
- }
- }
- },
"vfccustomizationuuid" : {
"tags" : "vfccustomizationuuid",
"name" : "vfccustomizationuuid",
@@ -735,104 +1112,151 @@
}
}
},
- "vfw_name_0" : {
- "tags" : "vfw_name_0",
- "name" : "vfw_name_0",
+ "vfw_int_private1_ip_0" : {
+ "tags" : "vfw_int_private1_ip_0",
+ "name" : "vfw_int_private1_ip_0",
"property" : {
- "description" : "vfw_name_0",
+ "description" : "vfw_int_private1_ip_0",
"type" : "string"
},
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
+ "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
- "type" : "source-input",
+ "type" : "source-input"
+ },
+ "default" : {
+ "type" : "source-default",
"properties" : { }
+ },
+ "sdnc" : {
+ "type" : "source-rest",
+ "properties" : {
+ "verb" : "GET",
+ "type" : "JSON",
+ "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vfw_int_private1_ip_0",
+ "path" : "/param/0/value",
+ "input-key-mapping" : {
+ "service-instance-id" : "service-instance-id",
+ "vnf-id" : "vnf-id"
+ },
+ "output-key-mapping" : {
+ "vfw_int_private1_ip_0" : "value"
+ },
+ "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+ }
}
}
},
- "vfw_private_ip_0" : {
- "tags" : "vfw_private_ip_0",
- "name" : "vfw_private_ip_0",
+ "vfw_int_private2_floating_ip" : {
+ "tags" : "vfw_int_private2_floating_ip",
+ "name" : "vfw_int_private2_floating_ip",
"property" : {
- "description" : "vfw_private_ip_0",
+ "description" : "vfw_int_private2_floating_ip",
"type" : "string"
},
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
+ "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
- "type" : "source-input",
+ "type" : "source-input"
+ },
+ "default" : {
+ "type" : "source-default",
"properties" : { }
},
"sdnc" : {
"type" : "source-rest",
"properties" : {
+ "verb" : "GET",
"type" : "JSON",
- "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vfw_private_ip_0",
+ "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vfw_int_private2_floating_ip",
"path" : "/param/0/value",
- "expression-type" : "JSON_POINTER",
"input-key-mapping" : {
"service-instance-id" : "service-instance-id",
"vnf-id" : "vnf-id"
},
"output-key-mapping" : {
- "vfw_private_ip_0" : "value"
+ "vfw_int_private2_floating_ip" : "value"
},
"key-dependencies" : [ "service-instance-id", "vnf-id" ]
}
}
}
},
- "vfw_private_ip_1" : {
- "tags" : "vfw_private_ip_1",
- "name" : "vfw_private_ip_1",
+ "vfw_int_private2_ip_0" : {
+ "tags" : "vfw_int_private2_ip_0",
+ "name" : "vfw_int_private2_ip_0",
"property" : {
- "description" : "vfw_private_ip_1",
+ "description" : "vfw_int_private2_ip_0",
"type" : "string"
},
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
+ "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
- "type" : "source-input",
+ "type" : "source-input"
+ },
+ "default" : {
+ "type" : "source-default",
"properties" : { }
},
"sdnc" : {
"type" : "source-rest",
"properties" : {
+ "verb" : "GET",
"type" : "JSON",
- "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vfw_private_ip_1",
+ "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vfw_int_private2_ip_0",
"path" : "/param/0/value",
- "expression-type" : "JSON_POINTER",
"input-key-mapping" : {
"service-instance-id" : "service-instance-id",
"vnf-id" : "vnf-id"
},
"output-key-mapping" : {
- "vfw_private_ip_1" : "value"
+ "vfw_int_private2_ip_0" : "value"
},
"key-dependencies" : [ "service-instance-id", "vnf-id" ]
}
}
}
},
- "vfw_private_ip_2" : {
- "tags" : "vfw_private_ip_2",
- "name" : "vfw_private_ip_2",
+ "vfw_name_0" : {
+ "tags" : "vfw_name_0",
+ "name" : "vfw_name_0",
"property" : {
- "description" : "vfw_private_ip_2",
+ "description" : "vfw_name_0",
"type" : "string"
},
"updated-by" : "Singal, Kapil <ks220y@att.com>",
"sources" : {
"input" : {
"type" : "source-input"
+ },
+ "default" : {
+ "type" : "source-default",
+ "properties" : { }
+ },
+ "sdnc" : {
+ "type" : "source-rest",
+ "properties" : {
+ "verb" : "GET",
+ "type" : "JSON",
+ "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vfw_name_0",
+ "path" : "/param/0/value",
+ "input-key-mapping" : {
+ "service-instance-id" : "service-instance-id",
+ "vnf-id" : "vnf-id"
+ },
+ "output-key-mapping" : {
+ "vfw_name_0" : "value"
+ },
+ "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+ }
}
}
},
- "vm-type" : {
- "tags" : "vm-type",
- "name" : "vm-type",
+ "vfw_onap_private_ip_0" : {
+ "tags" : "vfw_onap_private_ip_0",
+ "name" : "vfw_onap_private_ip_0",
"property" : {
- "description" : "vm-type",
+ "description" : "vfw_onap_private_ip_0",
"type" : "string"
},
"updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
@@ -844,19 +1268,21 @@
"type" : "source-default",
"properties" : { }
},
- "processor-db" : {
- "type" : "source-db",
+ "sdnc" : {
+ "type" : "source-rest",
"properties" : {
- "endpoint-selector" : "dynamic-db-source",
- "type" : "SQL",
- "query" : "select VFC_MODEL.vm_type as vm_type from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
+ "verb" : "GET",
+ "type" : "JSON",
+ "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vfw_onap_private_ip_0",
+ "path" : "/param/0/value",
"input-key-mapping" : {
- "vfccustomizationuuid" : "vfccustomizationuuid"
+ "service-instance-id" : "service-instance-id",
+ "vnf-id" : "vnf-id"
},
"output-key-mapping" : {
- "vm-type" : "vm_type"
+ "vfw_onap_private_ip_0" : "value"
},
- "key-dependencies" : [ "vfccustomizationuuid" ]
+ "key-dependencies" : [ "service-instance-id", "vnf-id" ]
}
}
}
@@ -894,11 +1320,11 @@
}
}
},
- "vnf-name" : {
- "tags" : "vnf-name",
- "name" : "vnf-name",
+ "vnf_name" : {
+ "tags" : "vnf_name",
+ "name" : "vnf_name",
"property" : {
- "description" : "vnf-name",
+ "description" : "vnf_name",
"type" : "string"
},
"updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
@@ -913,15 +1339,16 @@
"sdnc" : {
"type" : "source-rest",
"properties" : {
+ "verb" : "GET",
"type" : "JSON",
- "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vnf-name",
+ "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/vnf_name",
"path" : "/param/0/value",
"input-key-mapping" : {
"service-instance-id" : "service-instance-id",
"vnf-id" : "vnf-id"
},
"output-key-mapping" : {
- "vnf-name" : "value"
+ "vnf_name" : "value"
},
"key-dependencies" : [ "service-instance-id", "vnf-id" ]
}
@@ -944,41 +1371,6 @@
}
}
},
- "vnf_name" : {
- "tags" : "vnf_name",
- "name" : "vnf_name",
- "property" : {
- "description" : "vnf_name",
- "type" : "string"
- },
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "sources" : {
- "default" : {
- "type" : "source-default",
- "properties" : { }
- },
- "input" : {
- "type" : "source-input",
- "properties" : { }
- },
- "sdnc" : {
- "type" : "source-rest",
- "properties" : {
- "type" : "JSON",
- "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vnf_name",
- "path" : "/param/0/value",
- "input-key-mapping" : {
- "service-instance-id" : "service-instance-id",
- "vnf-id" : "vnf-id"
- },
- "output-key-mapping" : {
- "vnf_name" : "value"
- },
- "key-dependencies" : [ "service-instance-id", "vnf-id" ]
- }
- }
- }
- },
"vnfc-model-invariant-uuid" : {
"tags" : "vnfc-model-invariant-uuid",
"name" : "vnfc-model-invariant-uuid",
@@ -998,15 +1390,15 @@
"processor-db" : {
"type" : "source-db",
"properties" : {
- "endpoint-selector" : "dynamic-db-source",
"type" : "SQL",
"query" : "select VFC_MODEL.invariant_uuid as vfc_invariant_uuid from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
- "input-key-mapping" : {
- "vfccustomizationuuid" : "vfccustomizationuuid"
- },
"output-key-mapping" : {
"vnfc-model-invariant-uuid" : "vfc_invariant_uuid"
},
+ "endpoint-selector" : "dynamic-db-source",
+ "input-key-mapping" : {
+ "vfccustomizationuuid" : "vfccustomizationuuid"
+ },
"key-dependencies" : [ "vfccustomizationuuid" ]
}
}
@@ -1031,140 +1423,227 @@
"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" : {
- "vfccustomizationuuid" : "vfccustomizationuuid"
- },
"output-key-mapping" : {
"vnfc-model-version" : "vnfc_model_version"
},
+ "endpoint-selector" : "dynamic-db-source",
+ "input-key-mapping" : {
+ "vfccustomizationuuid" : "vfccustomizationuuid"
+ },
"key-dependencies" : [ "vfccustomizationuuid" ]
}
}
}
},
- "vpg_name_0" : {
- "tags" : "vpg_name_0",
- "name" : "vpg_name_0",
+ "vpg_int_private1_ip_0" : {
+ "tags" : "vpg_int_private1_ip_0",
+ "name" : "vpg_int_private1_ip_0",
"property" : {
- "description" : "vpg_name_0",
+ "description" : "vpg_int_private1_ip_0",
"type" : "string"
},
"updated-by" : "Singal, Kapil <ks220y@att.com>",
"sources" : {
"input" : {
- "type" : "source-input",
+ "type" : "source-input"
+ },
+ "default" : {
+ "type" : "source-default",
"properties" : { }
+ },
+ "sdnc" : {
+ "type" : "source-rest",
+ "properties" : {
+ "verb" : "GET",
+ "type" : "JSON",
+ "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vpg_int_private1_ip_0",
+ "path" : "/param/0/value",
+ "input-key-mapping" : {
+ "service-instance-id" : "service-instance-id",
+ "vnf-id" : "vnf-id"
+ },
+ "output-key-mapping" : {
+ "vpg_int_private1_ip_0" : "value"
+ },
+ "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+ }
}
}
},
- "vpg_private_ip_0" : {
- "tags" : "vpg_private_ip_0",
- "name" : "vpg_private_ip_0",
+ "vpg_name_0" : {
+ "tags" : "vpg_name_0",
+ "name" : "vpg_name_0",
"property" : {
- "description" : "vpg_private_ip_0",
+ "description" : "vlb_name_0",
"type" : "string"
},
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
+ "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
- "type" : "source-input",
+ "type" : "source-input"
+ },
+ "default" : {
+ "type" : "source-default",
"properties" : { }
},
"sdnc" : {
"type" : "source-rest",
"properties" : {
+ "verb" : "GET",
"type" : "JSON",
- "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vpg_private_ip_0",
+ "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vpg_name_0",
"path" : "/param/0/value",
- "expression-type" : "JSON_POINTER",
"input-key-mapping" : {
"service-instance-id" : "service-instance-id",
"vnf-id" : "vnf-id"
},
"output-key-mapping" : {
- "vpg_private_ip_0" : "value"
+ "vpg_name_0" : "value"
},
"key-dependencies" : [ "service-instance-id", "vnf-id" ]
}
}
}
},
- "vpg_private_ip_1" : {
- "tags" : "vpg_private_ip_1",
- "name" : "vpg_private_ip_1",
+ "vpg_onap_private_ip_0" : {
+ "tags" : "vpg_onap_private_ip_0",
+ "name" : "vpg_onap_private_ip_0",
"property" : {
- "description" : "vpg_private_ip_1",
+ "description" : "vpg_onap_private_ip_0",
"type" : "string"
},
"updated-by" : "Singal, Kapil <ks220y@att.com>",
"sources" : {
"input" : {
- "type" : "source-input",
+ "type" : "source-input"
+ },
+ "default" : {
+ "type" : "source-default",
"properties" : { }
+ },
+ "sdnc" : {
+ "type" : "source-rest",
+ "properties" : {
+ "verb" : "GET",
+ "type" : "JSON",
+ "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vpg_onap_private_ip_0",
+ "path" : "/param/0/value",
+ "input-key-mapping" : {
+ "service-instance-id" : "service-instance-id",
+ "vnf-id" : "vnf-id"
+ },
+ "output-key-mapping" : {
+ "vpg_onap_private_ip_0" : "value"
+ },
+ "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+ }
}
}
},
- "vsn_name_0" : {
- "tags" : "vsn_name_0",
- "name" : "vsn_name_0",
+ "vsn_int_private2_ip_0" : {
+ "tags" : "vsn_int_private2_ip_0",
+ "name" : "vsn_int_private2_ip_0",
"property" : {
- "description" : "vsn_name_0",
+ "description" : "vsn_int_private2_ip_0",
"type" : "string"
},
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
+ "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
- "type" : "source-input",
+ "type" : "source-input"
+ },
+ "default" : {
+ "type" : "source-default",
"properties" : { }
+ },
+ "sdnc" : {
+ "type" : "source-rest",
+ "properties" : {
+ "verb" : "GET",
+ "type" : "JSON",
+ "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vsn_int_private2_ip_0",
+ "path" : "/param/0/value",
+ "input-key-mapping" : {
+ "service-instance-id" : "service-instance-id",
+ "vnf-id" : "vnf-id"
+ },
+ "output-key-mapping" : {
+ "vsn_int_private2_ip_0" : "value"
+ },
+ "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+ }
}
}
},
- "vsn_private_ip_0" : {
- "tags" : "vsn_private_ip_0",
- "name" : "vsn_private_ip_0",
+ "vsn_name_0" : {
+ "tags" : "vsn_name_0",
+ "name" : "vsn_name_0",
"property" : {
- "description" : "vsn_private_ip_0",
+ "description" : "vsn_name_0",
"type" : "string"
},
"updated-by" : "Singal, Kapil <ks220y@att.com>",
"sources" : {
"input" : {
- "type" : "source-input",
+ "type" : "source-input"
+ },
+ "default" : {
+ "type" : "source-default",
"properties" : { }
},
"sdnc" : {
"type" : "source-rest",
"properties" : {
+ "verb" : "GET",
"type" : "JSON",
- "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vsn_private_ip_0",
+ "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vsn_name_0",
"path" : "/param/0/value",
- "expression-type" : "JSON_POINTER",
"input-key-mapping" : {
"service-instance-id" : "service-instance-id",
"vnf-id" : "vnf-id"
},
"output-key-mapping" : {
- "vsn_private_ip_0" : "value"
+ "vsn_name_0" : "value"
},
"key-dependencies" : [ "service-instance-id", "vnf-id" ]
}
}
}
},
- "vsn_private_ip_1" : {
- "tags" : "vsn_private_ip_1",
- "name" : "vsn_private_ip_1",
+ "vsn_onap_private_ip_0" : {
+ "tags" : "vsn_onap_private_ip_0",
+ "name" : "vsn_onap_private_ip_0",
"property" : {
- "description" : "vsn_private_ip_1",
+ "description" : "vsn_onap_private_ip_0",
"type" : "string"
},
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
+ "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
"sources" : {
"input" : {
"type" : "source-input"
+ },
+ "default" : {
+ "type" : "source-default",
+ "properties" : { }
+ },
+ "sdnc" : {
+ "type" : "source-rest",
+ "properties" : {
+ "verb" : "GET",
+ "type" : "JSON",
+ "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vsn_onap_private_ip_0",
+ "path" : "/param/0/value",
+ "input-key-mapping" : {
+ "service-instance-id" : "service-instance-id",
+ "vnf-id" : "vnf-id"
+ },
+ "output-key-mapping" : {
+ "vsn_onap_private_ip_0" : "value"
+ },
+ "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+ }
}
}
}
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/vFW_spinup.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/vFW_CDS.json
index 9ff4f3a1f..5b1af84cd 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/vFW_spinup.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/vFW_CDS.json
@@ -1,12 +1,12 @@
{
"tosca_definitions_version" : "controller_blueprint_1_0_0",
"metadata" : {
- "template_author" : "Alexis de Talhouët",
- "author-email" : "adetalhouet89@gmail.com",
+ "template_author" : "Abdelmuhaimen Seaudi",
+ "author-email" : "abdelmuhaimen.seaudi@orange.com",
"user-groups" : "ADMIN, OPERATION",
- "template_name" : "vFW_spinup",
+ "template_name" : "vFW_CDS",
"template_version" : "1.0.0",
- "template_tags" : "vFW"
+ "template_tags" : "vFW-CDS, vfw-CDS, SCALE-OUT, MACRO"
},
"imports" : [ {
"file" : "Definitions/data_types.json"
@@ -19,6 +19,30 @@
}, {
"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://",
+ "username" : "admin",
+ "password" : "admin"
+ },
+ "config-deploy-properties" : {
+ "resolution-key" : {
+ "get_input" : "resolution-key"
+ }
+ },
+ "dynamic-db-source" : {
+ "type" : "maria-db",
+ "url" : "jdbc:mysql://mariadb-galera:3306/sdnctl",
+ "username" : "root",
+ "password" : "secretpassword"
+ }
+ },
"topology_template" : {
"workflows" : {
"resource-assignment" : {
@@ -50,6 +74,29 @@
}
}
}
+ },
+ "config-deploy" : {
+ "steps" : {
+ "config-deploy" : {
+ "description" : "Config Deploy Workflow",
+ "target" : "config-deploy-process"
+ }
+ },
+ "inputs" : {
+ "config-deploy-properties" : {
+ "description" : "Dynamic PropertyDefinition for workflow(config-deploy).",
+ "required" : true,
+ "type" : "dt-config-deploy-properties"
+ }
+ },
+ "outputs" : {
+ "dry-run" : {
+ "type" : "json",
+ "value" : {
+ "get_attribute" : [ "config-deploy-process", "assignment-params" ]
+ }
+ }
+ }
}
},
"node_templates" : {
@@ -61,7 +108,7 @@
"process" : {
"inputs" : {
"artifact-prefix-names" : {
- "get_input" : "artifact-name"
+ "get_input" : "template-prefix"
}
}
}
@@ -69,37 +116,37 @@
}
},
"artifacts" : {
- "base-template" : {
+ "base_template-template" : {
"type" : "artifact-template-velocity",
- "file" : "Templates/base-template.vtl"
+ "file" : "Templates/base_template-template.vtl"
},
- "base-mapping" : {
+ "base_template-mapping" : {
"type" : "artifact-mapping-resource",
- "file" : "Templates/base-mapping.json"
+ "file" : "Templates/base_template-mapping.json"
},
- "vfw-template" : {
+ "vpkg-template" : {
"type" : "artifact-template-velocity",
- "file" : "Templates/vfw-template.vtl"
+ "file" : "Templates/vpkg-template.vtl"
},
- "vfw-mapping" : {
+ "vpkg-mapping" : {
"type" : "artifact-mapping-resource",
- "file" : "Templates/vfw-mapping.json"
+ "file" : "Templates/vpkg-mapping.json"
},
- "vfw-vnf-template" : {
+ "vfw-template" : {
"type" : "artifact-template-velocity",
- "file" : "Templates/vfw-vnf-template.vtl"
+ "file" : "Templates/vfw-template.vtl"
},
- "vfw-vnf-mapping" : {
+ "vfw-mapping" : {
"type" : "artifact-mapping-resource",
- "file" : "Templates/vfw-vnf-mapping.json"
+ "file" : "Templates/vfw-mapping.json"
},
- "vpg-template" : {
+ "vnf-template" : {
"type" : "artifact-template-velocity",
- "file" : "Templates/vpg-template.vtl"
+ "file" : "Templates/vnf-template.vtl"
},
- "vpg-mapping" : {
+ "vnf-mapping" : {
"type" : "artifact-mapping-resource",
- "file" : "Templates/vpg-mapping.json"
+ "file" : "Templates/vnf-mapping.json"
},
"vsn-template" : {
"type" : "artifact-template-velocity",
@@ -110,6 +157,30 @@
"file" : "Templates/vsn-mapping.json"
}
}
+ },
+ "config-deploy-process" : {
+ "type" : "component-resource-resolution",
+ "interfaces" : {
+ "ResourceResolutionComponent" : {
+ "operations" : {
+ "process" : {
+ "inputs" : {
+ "artifact-prefix-names" : [ "nf-params" ]
+ }
+ }
+ }
+ }
+ },
+ "artifacts" : {
+ "nf-params-template" : {
+ "type" : "artifact-template-velocity",
+ "file" : "Templates/nf-params-template.vtl"
+ },
+ "nf-params-mapping" : {
+ "type" : "artifact-mapping-resource",
+ "file" : "Templates/nf-params-mapping.json"
+ }
+ }
}
}
}
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/TOSCA-Metadata/TOSCA.meta b/components/model-catalog/blueprint-model/service-blueprint/vFW/TOSCA-Metadata/TOSCA.meta
index edbb54e2d..73d40528a 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/TOSCA-Metadata/TOSCA.meta
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/TOSCA-Metadata/TOSCA.meta
@@ -1,6 +1,8 @@
TOSCA-Meta-File-Version: 1.0.0
CSAR-Version: 1.0
-Created-By: Alexis de Talhouët
-Entry-Definitions: Definitions/vFW_spinup.json
-Template-Tags: test
-Content-Type: application/vnd.oasis.bpmn
+Created-By: PLATANIA, MARCO <platania@research.att.com>
+Entry-Definitions: Definitions/vFW_CDS.json
+Template-Tags: vFW-CDS
+Template-Name: vFW-CDS
+Template-Version: 1.0.0
+Content-Type: application/vnd.oasis.bpmn \ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base-template.vtl
deleted file mode 100644
index 271c50738..000000000
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base-template.vtl
+++ /dev/null
@@ -1,77 +0,0 @@
-{
- "resource-accumulator-resolved-data": [
- {
- "param-name": "service-instance-id",
- "param-value": "${service-instance-id}"
- },
- {
- "param-name": "vnf_id",
- "param-value": "${vnf-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_id",
- "param-value": "${vf-module-id}"
- },
- {
- "param-name": "vf_module_type",
- "param-value": "${vf-module-type}"
- },
- {
- "param-name": "unprotected_private_net_id",
- "param-value": "${vnf-name}_unprotected"
- },
- {
- "param-name": "unprotected_private_subnet_id",
- "param-value": "${vnf-name}_unprotected_sub"
- },
- {
- "param-name": "unprotected_private_net_cidr",
- "param-value": "${unprotected_private_net_cidr}"
- },
- {
- "param-name": "protected_private_net_id",
- "param-value": "${vnf-name}_protected"
- },
- {
- "param-name": "protected_private_subnet_id",
- "param-value": "${vnf-name}_protected_sub"
- },
- {
- "param-name": "protected_private_net_cidr",
- "param-value": "${protected_private_net_cidr}"
- },
- {
- "param-name": "vf_module_name",
- "param-value": "${vnf-name}_base"
- }
- ],
- "capability-data": [
- {
- "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}"
- }
- ]
- }
- ]
- }
- ]
-} \ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base_template-mapping.json
index 8123382ca..7ce97079a 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base_template-mapping.json
@@ -3,13 +3,11 @@
"name": "service-instance-id",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
@@ -18,22 +16,84 @@
"input-param": false,
"dictionary-name": "service-instance-id",
"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",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ }
+ },
+ "input-param": false,
+ "dictionary-name": "vf-module-label",
+ "dictionary-source": "processor-db",
"dependencies": [
-
+ "vf-module-model-customization-uuid"
],
"version": 0
},
{
+ "name": "vf-naming-policy",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ }
+ },
+ "input-param": false,
+ "dictionary-name": "vf-naming-policy",
+ "dictionary-source": "sdnc",
+ "dependencies": [
+ "service-instance-id",
+ "vnf-id"
+ ],
+ "version": 0
+ },
+ {
"name": "vf-module-type",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
@@ -51,13 +111,11 @@
"name": "vf-module-model-customization-uuid",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
@@ -66,22 +124,18 @@
"input-param": false,
"dictionary-name": "vf-module-model-customization-uuid",
"dictionary-source": "input",
- "dependencies": [
-
- ],
+ "dependencies": [],
"version": 0
},
{
"name": "vnf-id",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
@@ -90,22 +144,18 @@
"input-param": false,
"dictionary-name": "vnf-id",
"dictionary-source": "input",
- "dependencies": [
-
- ],
+ "dependencies": [],
"version": 0
},
{
"name": "vf-module-id",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
@@ -114,22 +164,18 @@
"input-param": false,
"dictionary-name": "vf-module-id",
"dictionary-source": "input",
- "dependencies": [
-
- ],
+ "dependencies": [],
"version": 0
},
{
"name": "vnf-model-customization-uuid",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
@@ -138,22 +184,18 @@
"input-param": false,
"dictionary-name": "vnf-model-customization-uuid",
"dictionary-source": "input",
- "dependencies": [
-
- ],
+ "dependencies": [],
"version": 0
},
{
"name": "aic-cloud-region",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
@@ -162,53 +204,48 @@
"input-param": false,
"dictionary-name": "aic-cloud-region",
"dictionary-source": "input",
- "dependencies": [
-
- ],
+ "dependencies": [],
"version": 0
},
{
- "name": "nf-role",
+ "name": "int_private1_net_cidr",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "nf-role",
- "dictionary-source": "processor-db",
+ "dictionary-name": "int_private1_net_cidr",
+ "dictionary-source": "sdnc",
"dependencies": [
- "vnf-model-customization-uuid"
+ "service-instance-id",
+ "vnf-id"
],
"version": 0
},
{
- "name": "vnf-name",
+ "name": "int_private2_net_cidr",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "vnf-name",
+ "dictionary-name": "int_private2_net_cidr",
"dictionary-source": "sdnc",
"dependencies": [
"service-instance-id",
@@ -217,51 +254,51 @@
"version": 0
},
{
- "name": "unprotected_private_net_cidr",
+ "name": "vnf_name",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "unprotected_private_net_cidr",
- "dictionary-source": "processor-db",
+ "dictionary-name": "vnf_name",
+ "dictionary-source": "sdnc",
"dependencies": [
-
+ "service-instance-id",
+ "vnf-id"
],
"version": 0
},
{
- "name": "protected_private_net_cidr",
+ "name": "pub_key",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "protected_private_net_cidr",
- "dictionary-source": "processor-db",
+ "dictionary-name": "pub_key",
+ "dictionary-source": "sdnc",
"dependencies": [
-
+ "service-instance-id",
+ "vnf-id"
],
"version": 0
}
-]
+
+
+] \ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base_template-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base_template-template.vtl
new file mode 100644
index 000000000..f19db4146
--- /dev/null
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base_template-template.vtl
@@ -0,0 +1,109 @@
+{
+ "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_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}"
+ }
+
+ ],
+ "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-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}"
+ }
+ ]
+ }
+ ]
+ }
+ ]
+} \ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/nf-params-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/nf-params-mapping.json
new file mode 100644
index 000000000..50ab8d801
--- /dev/null
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/nf-params-mapping.json
@@ -0,0 +1,112 @@
+[
+ {
+ "name": "service-instance-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ }
+ },
+ "input-param": false,
+ "dictionary-name": "service-instance-id",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "vnf-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ }
+ },
+ "input-param": false,
+ "dictionary-name": "vnf-id",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
+ },
+
+ {
+ "name": "active-streams",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ }
+ },
+ "input-param": false,
+ "dictionary-name": "active-streams",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
+ },
+
+ {
+ "name": "put-active-streams",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ }
+ },
+ "input-param": false,
+ "dictionary-name": "put-active-streams",
+ "dictionary-source": "sdnc",
+ "dependencies": [
+ "vpg_onap_private_ip_0",
+ "active-streams"
+
+ ],
+ "version": 0
+ },
+
+ {
+ "name": "vpg_onap_private_ip_0",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ }
+ },
+ "input-param": false,
+ "dictionary-name": "vpg_onap_private_ip_0",
+ "dictionary-source": "sdnc",
+ "dependencies": [
+ "service-instance-id",
+ "vnf-id"
+ ],
+ "version": 0
+ }
+] \ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/nf-params-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/nf-params-template.vtl
new file mode 100644
index 000000000..90aaecd12
--- /dev/null
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/nf-params-template.vtl
@@ -0,0 +1,5 @@
+{
+ "vpg_onap_private_ip_0": "${vpg_onap_private_ip_0}",
+ "active-streams": "${active-streams}",
+ "status": "${put-active-streams}"
+} \ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-mapping.json
index 148696443..86a5cc857 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-mapping.json
@@ -1,70 +1,66 @@
[
{
- "name": "service-instance-id",
+ "name": "cloud_env",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "service-instance-id",
- "dictionary-source": "input",
+ "dictionary-name": "cloud_env",
+ "dictionary-source": "sdnc",
"dependencies": [
-
+ "service-instance-id",
+ "vnf-id"
],
"version": 0
},
{
- "name": "vnf-id",
+ "name": "vpg_int_private1_ip_0",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "vnf-id",
- "dictionary-source": "input",
+ "dictionary-name": "vpg_int_private1_ip_0",
+ "dictionary-source": "sdnc",
"dependencies": [
-
+ "service-instance-id",
+ "vnf-id"
],
"version": 0
},
- {
- "name": "vnf-name",
+ {
+ "name": "nexus_artifact_repo",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "vnf-name",
+ "dictionary-name": "nexus_artifact_repo",
"dictionary-source": "sdnc",
"dependencies": [
"service-instance-id",
@@ -72,216 +68,237 @@
],
"version": 0
},
+
+
+
{
- "name": "vnf-model-customization-uuid",
+ "name": "vfw_int_private2_floating_ip",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "vnf-model-customization-uuid",
- "dictionary-source": "input",
+ "dictionary-name": "vfw_int_private2_floating_ip",
+ "dictionary-source": "sdnc",
"dependencies": [
-
+ "service-instance-id",
+ "vnf-id"
],
"version": 0
},
{
- "name": "vf-module-id",
+ "name": "vfw_int_private1_ip_0",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "vf-module-id",
- "dictionary-source": "input",
+ "dictionary-name": "vfw_int_private1_ip_0",
+ "dictionary-source": "sdnc",
"dependencies": [
-
+ "service-instance-id",
+ "vnf-id"
],
"version": 0
},
+
{
- "name": "vf-module-type",
+ "name": "vfw_int_private2_ip_0",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "vf-module-type",
- "dictionary-source": "processor-db",
+ "dictionary-name": "vfw_int_private2_ip_0",
+ "dictionary-source": "sdnc",
"dependencies": [
- "vf-module-model-customization-uuid"
+ "service-instance-id",
+ "vnf-id"
],
"version": 0
},
+
+
+
+
+
{
- "name": "vf-module-model-customization-uuid",
+ "name": "private1-prefix-id",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
+
},
"input-param": false,
- "dictionary-name": "vf-module-model-customization-uuid",
- "dictionary-source": "input",
- "dependencies": [
-
- ],
+ "dictionary-name": "private1-prefix-id",
+ "dictionary-source": "processor-db",
+ "dependencies": [],
"version": 0
},
- {
- "name": "vfccustomizationuuid",
+ {
+ "name": "management-prefix-id",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
+
},
"input-param": false,
- "dictionary-name": "vfccustomizationuuid",
+ "dictionary-name": "management-prefix-id",
"dictionary-source": "processor-db",
- "dependencies": [
- "vf-module-model-customization-uuid"
- ],
+ "dependencies": [],
"version": 0
},
{
- "name": "aic-cloud-region",
+ "name": "onap_private_net_cidr",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "aic-cloud-region",
- "dictionary-source": "input",
+ "dictionary-name": "onap_private_net_cidr",
+ "dictionary-source": "sdnc",
"dependencies": [
-
+ "service-instance-id",
+ "vnf-id"
],
"version": 0
},
{
- "name": "vm-type",
+ "name": "vf-module-name",
"property": {
"description": "",
"required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ },
+ "default": "${vf-module-name}"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-module-name",
+ "dictionary-source": "default",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "install_script_version",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
],
"entry_schema": {
"type": ""
}
+
},
"input-param": false,
- "dictionary-name": "vm-type",
- "dictionary-source": "processor-db",
+ "dictionary-name": "install_script_version",
+ "dictionary-source": "sdnc",
"dependencies": [
-
+ "service-instance-id",
+ "vnf-id"
],
"version": 0
},
- {
- "name": "vnfc-model-invariant-uuid",
+ {
+ "name": "demo_artifacts_version",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
+
},
"input-param": false,
- "dictionary-name": "vnfc-model-invariant-uuid",
- "dictionary-source": "processor-db",
+ "dictionary-name": "demo_artifacts_version",
+ "dictionary-source": "sdnc",
"dependencies": [
- "vfccustomizationuuid"
+ "service-instance-id",
+ "vnf-id"
],
"version": 0
},
+
+
+
{
- "name": "vnfc-model-version",
+ "name": "nfc-naming-code",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "vnfc-model-version",
+ "dictionary-name": "nfc-naming-code",
"dictionary-source": "processor-db",
"dependencies": [
"vfccustomizationuuid"
@@ -289,97 +306,90 @@
"version": 0
},
{
- "name": "nf-role",
+ "name": "onap_private_net_id",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
- },
- "default": "vFW"
+ }
},
"input-param": false,
- "dictionary-name": "nf-role",
- "dictionary-source": "default",
+ "dictionary-name": "onap_private_net_id",
+ "dictionary-source": "sdnc",
"dependencies": [
- "vnf-model-customization-uuid"
+ "service-instance-id",
+ "vnf-id"
],
"version": 0
},
{
- "name": "nfc-naming-code",
+ "name": "onap_private_subnet_id",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "nfc-naming-code",
- "dictionary-source": "processor-db",
+ "dictionary-name": "onap_private_subnet_id",
+ "dictionary-source": "sdnc",
"dependencies": [
- "vfccustomizationuuid"
+ "service-instance-id",
+ "vnf-id"
],
"version": 0
},
- {
- "name": "public_net_id",
+ {
+ "name": "int_private1_net_cidr",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
- },
- "default": "public_net_id"
+ }
},
"input-param": false,
- "dictionary-name": "public_net_id",
- "dictionary-source": "default",
+ "dictionary-name": "int_private1_net_cidr",
+ "dictionary-source": "sdnc",
"dependencies": [
-
+ "service-instance-id",
+ "vnf-id"
],
"version": 0
},
- {
- "name": "image_name",
+ {
+ "name": "int_private2_net_cidr",
"property": {
"description": "",
"required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "image_name",
+ "dictionary-name": "int_private2_net_cidr",
"dictionary-source": "sdnc",
"dependencies": [
"service-instance-id",
@@ -388,23 +398,21 @@
"version": 0
},
{
- "name": "key_name",
+ "name": "public_net_id",
"property": {
"description": "",
"required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "key_name",
+ "dictionary-name": "public_net_id",
"dictionary-source": "sdnc",
"dependencies": [
"service-instance-id",
@@ -412,7 +420,8 @@
],
"version": 0
},
- {
+
+ {
"name": "pub_key",
"property": {
"description": "",
@@ -420,9 +429,7 @@
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
@@ -438,23 +445,21 @@
"version": 0
},
{
- "name": "onap_private_net_id",
+ "name": "sec_group",
"property": {
"description": "",
"required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "onap_private_net_id",
+ "dictionary-name": "sec_group",
"dictionary-source": "sdnc",
"dependencies": [
"service-instance-id",
@@ -463,319 +468,351 @@
"version": 0
},
{
- "name": "onap_private_subnet_id",
+ "name": "service-instance-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"
- ],
+ "dictionary-name": "service-instance-id",
+ "dictionary-source": "input",
+ "dependencies": [],
"version": 0
},
+
{
- "name": "unprotected_private_net_cidr",
+ "name": "vfw_name_0",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ },
+ "default": "${vfw_name_0}"
+ },
+ "input-param": false,
+ "dictionary-name": "vfw_name_0",
+ "dictionary-source": "default",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "vfw_onap_private_ip_0",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ },
+ "default": "${vfw_onap_private_ip_0}"
+ },
+ "input-param": false,
+ "dictionary-name": "vfw_onap_private_ip_0",
+ "dictionary-source": "default",
+ "dependencies": [],
+ "version": 0
+ },
+
+ {
+ "name": "vf-module-id",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "unprotected_private_net_cidr",
- "dictionary-source": "processor-db",
- "dependencies": [
-
- ],
+ "dictionary-name": "vf-module-id",
+ "dictionary-source": "input",
+ "dependencies": [],
"version": 0
},
{
- "name": "protected_private_net_cidr",
+ "name": "vf-module-label",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "protected_private_net_cidr",
+ "dictionary-name": "vf-module-label",
"dictionary-source": "processor-db",
"dependencies": [
-
+ "vf-module-model-customization-uuid"
],
"version": 0
},
{
- "name": "nexus_artifact_repo",
+ "name": "vf-module-model-customization-uuid",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
- },
- "default": "nexus_artifact_repo"
+ }
},
"input-param": false,
- "dictionary-name": "nexus_artifact_repo",
- "dictionary-source": "default",
- "dependencies": [
-
- ],
+ "dictionary-name": "vf-module-model-customization-uuid",
+ "dictionary-source": "input",
+ "dependencies": [],
"version": 0
},
{
- "name": "sec_group",
+ "name": "vf-module-type",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
- },
- "default": "onap_sg_PUhf"
+ }
},
"input-param": false,
- "dictionary-name": "sec_group",
- "dictionary-source": "default",
+ "dictionary-name": "vf-module-type",
+ "dictionary-source": "processor-db",
"dependencies": [
-
+ "vf-module-model-customization-uuid"
],
"version": 0
},
+ {
+ "name": "vf-naming-policy",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ }
+ },
+ "input-param": false,
+ "dictionary-name": "vf-naming-policy",
+ "dictionary-source": "sdnc",
+ "dependencies": [
+ "service-instance-id",
+ "vnf-id"
+ ],
+ "version": 0
+ },
+
{
- "name": "onap_private_net_cidr",
+ "name": "vfccustomizationuuid",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "onap_private_net_cidr",
+ "dictionary-name": "vfccustomizationuuid",
"dictionary-source": "processor-db",
"dependencies": [
-
+ "vf-module-model-customization-uuid"
],
"version": 0
},
+
{
- "name": "vfw_name_0",
+ "name": "vnf-id",
"property": {
"description": "",
"required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "vfw_name_0",
+ "dictionary-name": "vnf-id",
"dictionary-source": "input",
- "dependencies": [
-
- ],
+ "dependencies": [],
"version": 0
},
{
- "name": "vf-naming-policy",
+ "name": "vnf-model-customization-uuid",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
- },
- "default": "SDNC_Policy.Config_MS_ONAP_VFW_NAMING_TIMESTAMP"
+ }
},
"input-param": false,
- "dictionary-name": "vf-naming-policy",
- "dictionary-source": "default",
- "dependencies": [
-
- ],
+ "dictionary-name": "vnf-model-customization-uuid",
+ "dictionary-source": "input",
+ "dependencies": [],
"version": 0
},
{
- "name": "vf_module_name",
+ "name": "vnf_name",
"property": {
"description": "",
"required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "vf_module_name",
- "dictionary-source": "input",
+ "dictionary-name": "vnf_name",
+ "dictionary-source": "sdnc",
"dependencies": [
-
+ "service-instance-id",
+ "vnf-id"
],
"version": 0
},
{
- "name": "vf-module-label",
+ "name": "vnfc-model-invariant-uuid",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "vf-module-label",
+ "dictionary-name": "vnfc-model-invariant-uuid",
"dictionary-source": "processor-db",
"dependencies": [
- "vf-module-model-customization-uuid"
+ "vfccustomizationuuid"
],
"version": 0
},
{
- "name": "private-prefix-id",
+ "name": "vfw_image_name",
"property": {
"description": "",
"required": false,
- "type": "integer",
+ "type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
- },
+ },
"input-param": false,
- "dictionary-name": "private-prefix-id",
- "dictionary-source": "processor-db",
+ "dictionary-name": "image_name",
+ "dictionary-source": "sdnc",
"dependencies": [
-
- ],
+ "service-instance-id",
+ "vnf-id"
+ ],
"version": 0
},
- {
- "name": "vfw_private_ip_2",
+ {
+ "name": "vfw_flavor_name",
"property": {
"description": "",
"required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
- },
+ },
"input-param": false,
- "dictionary-name": "vfw_private_ip_2",
- "dictionary-source": "input",
+ "dictionary-name": "flavor_name",
+ "dictionary-source": "sdnc",
"dependencies": [
-
- ],
+ "service-instance-id",
+ "vnf-id"
+ ],
"version": 0
},
{
- "name": "vnf_name",
+ "name": "vnfc-model-version",
"property": {
"description": "",
"required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "vnf_name",
- "dictionary-source": "input",
+ "dictionary-name": "vnfc-model-version",
+ "dictionary-source": "processor-db",
"dependencies": [
-
+ "vfccustomizationuuid"
],
"version": 0
}
-]
+] \ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-template.vtl
index 6864a36fe..c64133e1f 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-template.vtl
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-template.vtl
@@ -4,13 +4,10 @@
"param-name": "service-instance-id",
"param-value": "${service-instance-id}"
},
- {
- "param-name": "vnf_id",
- "param-value": "${vnf-id}"
- },
+
{
"param-name": "vnf_name",
- "param-value": "${vnf-name}"
+ "param-value": "${vnf_name}"
},
{
"param-name": "vnf_model_customization_uuid",
@@ -37,10 +34,6 @@
"param-value": "${aic-cloud-region}"
},
{
- "param-name": "vm-type",
- "param-value": "${vm-type}"
- },
- {
"param-name": "vnfc-model-customization-uuid",
"param-value": "${vfccustomizationuuid}"
},
@@ -53,68 +46,32 @@
"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": "cloud_env",
- "param-value": "openstack"
- },
- {
- "param-name": "repo_url_artifacts",
- "param-value": "https://nexus.onap.org/content/groups/staging"
- },
- {
- "param-name": "repo_url_blob",
- "param-value": "https://nexus.onap.org/content/repositories/raw"
+ "param-name": "vfw_image_name",
+ "param-value": "${vfw_image_name}"
},
{
- "param-name": "dcae_collector_port",
- "param-value": "8080"
- },
- {
- "param-name": "image_name",
- "param-value": "${image_name}"
- },
- {
- "param-name": "flavor_name",
- "param-value": "m1.medium"
- },
- {
- "param-name": "install_script_version",
- "param-value": "1.2.1-SNAPSHOT"
- },
- {
- "param-name": "demo_artifacts_version",
- "param-value": "1.2.1-SNAPSHOT"
+ "param-name": "vfw_flavor_name",
+ "param-value": "${vfw_flavor_name}"
},
{
- "param-name": "dcae_collector_ip",
- "param-value": "10.0.4.1"
- },
- {
- "param-name": "key_name",
- "param-value": "${key_name}"
+ "param-name": "public_net_id",
+ "param-value": "${public_net_id}"
},
{
"param-name": "pub_key",
"param-value": "${pub_key}"
},
- {
- "param-name": "public_net_id",
- "param-value": "${public_net_id}"
+ {
+ "param-name": "int_private1_net_cidr",
+ "param-value": "${int_private1_net_cidr}"
},
- {
- "param-name": "unprotected_private_net_id",
- "param-value": "${vnf-name}_unprotected"
- },
- {
- "param-name": "protected_private_net_id",
- "param-value": "${vnf-name}_protected"
+ {
+ "param-name": "int_private2_net_cidr",
+ "param-value": "${int_private2_net_cidr}"
},
{
"param-name": "onap_private_net_id",
@@ -124,38 +81,59 @@
"param-name": "onap_private_subnet_id",
"param-value": "${onap_private_subnet_id}"
},
- {
- "param-name": "unprotected_private_net_cidr",
- "param-value": "${unprotected_private_net_cidr}"
+ {
+ "param-name": "onap_private_net_cidr",
+ "param-value": "${onap_private_net_cidr}"
},
- {
- "param-name": "protected_private_net_cidr",
- "param-value": "${protected_private_net_cidr}"
+ {
+ "param-name": "vfw_int_private1_ip_0",
+ "param-value": "${vfw_int_private1_ip_0}"
},
- {
- "param-name": "unprotected_private_subnet_id",
- "param-value": "${vnf-name}_unprotected_sub"
+ {
+ "param-name": "vfw_int_private2_ip_0",
+ "param-value": "${vfw_int_private2_ip_0}"
},
- {
- "param-name": "unprotected_private_net_cidr",
- "param-value": "${unprotected_private_net_cidr}"
+ {
+ "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": "protected_private_subnet_id",
- "param-value": "${vnf-name}_protected_sub"
+ "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": "nexus_artifact_repo",
- "param-value": "${nexus_artifact_repo}"
+ "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": "onap_private_net_cidr",
- "param-value": "${onap_private_net_cidr}"
+ {
+ "param-name": "nexus_artifact_repo",
+ "param-value": "${nexus_artifact_repo}"
}
+
],
"capability-data": [
{
@@ -180,16 +158,12 @@
"param-value": "${vf-naming-policy}"
},
{
- "param-name": "nf-role",
- "param-value": "${nf-role}"
- },
- {
"param-name": "naming-type",
"param-value": "VNFC"
},
{
"param-name": "VNF_NAME",
- "param-value": "${vnf-name}"
+ "param-value": "${vnf_name}"
},
{
"param-name": "NFC_NAMING_CODE",
@@ -207,31 +181,27 @@
"payload": [
{
"param-name": "resource-name",
- "param-value": "vf_module_name"
+ "param-value": "vf-module-name"
},
{
"param-name": "resource-value",
- "param-value": "${vf_module_name}"
+ "param-value": "${vf-module-name}"
},
{
"param-name": "external-key",
- "param-value": "${vf-module-id}_vf_module_name"
+ "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-value": "${vnf_name}"
},
{
"param-name": "VF_MODULE_LABEL",
@@ -244,8 +214,8 @@
],
"output-key-mapping": [
{
- "resource-name": "vf_module_name",
- "resource-value": "${vf_module_name}"
+ "resource-name": "vf-module-name",
+ "resource-value": "${vf-module-name}"
}
]
}
@@ -262,21 +232,21 @@
},
{
"param-name": "prefix-id",
- "param-value": "${private-prefix-id}"
+ "param-value": "${management-prefix-id}"
},
{
- "param-name": "vf-module-id",
+ "param-name": "vf_module_id",
"param-value": "${vf-module-id}"
},
{
"param-name": "external_key",
- "param-value": "${vf-module-id}-vfw_private_ip_2"
+ "param-value": "${vf-module-id}-vfw_onap_private_ip_0"
}
],
"output-key-mapping": [
{
- "resource-name": "vfw_private_ip_2",
- "resource-value": "${vfw_private_ip_2}"
+ "resource-name": "vfw_onap_private_ip_0",
+ "resource-value": "${vfw_onap_private_ip_0}"
}
]
}
@@ -290,10 +260,6 @@
{
"param-name": "vf-module",
"param-value": "vf-module"
- },
- {
- "param-name": "vnfc",
- "param-value": "vnfc"
}
],
"output-key-mapping": [
@@ -304,35 +270,6 @@
]
}
]
- },
- {
- "capability-name": "unresolved-composite-data",
- "key-mapping": [
- {
- "output-key-mapping": [
- {
- "resource-name": "KEY",
- "resource-value": "${vnf_name}"
- },
- {
- "resource-name": "vf-module-name",
- "resource-value": "${vf_module_name}"
- },
- {
- "resource-name": "vnfc-name",
- "resource-value": "${vfw_name_0}"
- },
- {
- "resource-name": "ipv4-oam-address",
- "resource-value": "${vfw_private_ip_2}"
- },
- {
- "resource-name": "ipv4-oam-address-prefix",
- "resource-value": "${onap_private_net_cidr}"
- }
- ]
- }
- ]
}
]
} \ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-vnf-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-vnf-mapping.json
deleted file mode 100644
index d764572e4..000000000
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-vnf-mapping.json
+++ /dev/null
@@ -1,461 +0,0 @@
-[
- {
- "name": "service-instance-id",
- "property": {
- "description": "",
- "required": true,
- "type": "string",
- "status": "",
- "constraints": [
- {
-
- }
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "service-instance-id",
- "dictionary-source": "input",
- "dependencies": [
-
- ],
- "version": 0
- },
- {
- "name": "vnf-id",
- "property": {
- "description": "",
- "required": true,
- "type": "string",
- "status": "",
- "constraints": [
- {
-
- }
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vnf-id",
- "dictionary-source": "input",
- "dependencies": [
-
- ],
- "version": 0
- },
- {
- "name": "vnf-model-customization-uuid",
- "property": {
- "description": "",
- "required": true,
- "type": "string",
- "status": "",
- "constraints": [
- {
-
- }
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vnf-model-customization-uuid",
- "dictionary-source": "input",
- "dependencies": [
-
- ],
- "version": 0
- },
- {
- "name": "aic-cloud-region",
- "property": {
- "description": "",
- "required": true,
- "type": "string",
- "status": "",
- "constraints": [
- {
-
- }
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "aic-cloud-region",
- "dictionary-source": "input",
- "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": "key_name",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {
-
- }
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "key_name",
- "dictionary-source": "input",
- "dependencies": [
-
- ],
- "version": 0
- },
- {
- "name": "image_name",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {
-
- }
- ],
- "entry_schema": {
- "type": ""
- },
- "default": "Ubuntu 14.04 LTS Generic"
- },
- "input-param": false,
- "dictionary-name": "image_name",
- "dictionary-source": "input",
- "dependencies": [
-
- ],
- "version": 0
- },
- {
- "name": "pub_key",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {
-
- }
- ],
- "entry_schema": {
- "type": ""
- },
- "default": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh"
- },
- "input-param": false,
- "dictionary-name": "pub_key",
- "dictionary-source": "input",
- "dependencies": [
-
- ],
- "version": 0
- },
- {
- "name": "vnf_name",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {
-
- }
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vnf_name",
- "dictionary-source": "input",
- "dependencies": [
-
- ],
- "version": 0
- },
- {
- "name": "vf-naming-policy",
- "property": {
- "description": "",
- "required": true,
- "type": "string",
- "status": "",
- "constraints": [
- {
-
- }
- ],
- "entry_schema": {
- "type": ""
- },
- "default": "SDNC_Policy.Config_MS_ONAP_VFW_NAMING_TIMESTAMP"
- },
- "input-param": false,
- "dictionary-name": "vf-naming-policy",
- "dictionary-source": "default",
- "dependencies": [
-
- ],
- "version": 0
- },
- {
- "name": "nf-role",
- "property": {
- "description": "",
- "required": true,
- "type": "string",
- "status": "",
- "constraints": [
- {
-
- }
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "nf-role",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vnf-model-customization-uuid"
- ],
- "version": 0
- },
- {
- "name": "vfw_private_ip_1",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {
-
- }
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vfw_private_ip_1",
- "dictionary-source": "input",
- "dependencies": [
-
- ],
- "version": 0
- },
- {
- "name": "vfw_private_ip_0",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {
-
- }
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vfw_private_ip_0",
- "dictionary-source": "input",
- "dependencies": [
-
- ],
- "version": 0
- },
- {
- "name": "vpg_private_ip_0",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {
-
- }
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vpg_private_ip_0",
- "dictionary-source": "input",
- "dependencies": [
-
- ],
- "version": 0
- },
- {
- "name": "vsn_private_ip_0",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {
-
- }
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vsn_private_ip_0",
- "dictionary-source": "input",
- "dependencies": [
-
- ],
- "version": 0
- },
- {
- "name": "protected-prefix-id",
- "property": {
- "description": "",
- "required": false,
- "type": "integer",
- "status": "",
- "constraints": [
- {
-
- }
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "protected-prefix-id",
- "dictionary-source": "processor-db",
- "dependencies": [
-
- ],
- "version": 0
- },
- {
- "name": "unprotected-prefix-id",
- "property": {
- "description": "",
- "required": false,
- "type": "integer",
- "status": "",
- "constraints": [
- {
-
- }
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "unprotected-prefix-id",
- "dictionary-source": "processor-db",
- "dependencies": [
-
- ],
- "version": 0
- },
- {
- "name": "vf-nf-code",
- "property": {
- "description": "",
- "required": true,
- "type": "string",
- "status": "",
- "constraints": [
- {
-
- }
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vf-nf-code",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vnf-model-customization-uuid"
- ],
- "version": 0
- }
-] \ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vnf-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vnf-mapping.json
new file mode 100644
index 000000000..f2cb91935
--- /dev/null
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vnf-mapping.json
@@ -0,0 +1,629 @@
+[
+ {
+ "name": "cloud_env",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ }
+ },
+ "input-param": true,
+ "dictionary-name": "cloud_env",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "management-prefix-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ }
+
+ },
+ "input-param": false,
+ "dictionary-name": "management-prefix-id",
+ "dictionary-source": "processor-db",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "key_name",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ }
+ },
+ "input-param": true,
+ "dictionary-name": "key_name",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "flavor_name",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ }
+ },
+ "input-param": true,
+ "dictionary-name": "flavor_name",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "nexus_artifact_repo",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ },
+ "default":"https://nexus.onap.org"
+ },
+ "input-param": false,
+ "dictionary-name": "nexus_artifact_repo",
+ "dictionary-source": "default",
+ "dependencies": [
+ ],
+ "version": 0
+ },
+ {
+ "name": "vpg_onap_private_ip_0",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ },
+ "default":"vpg_onap_private_ip_0"
+ },
+ "input-param": false,
+ "dictionary-name": "vpg_onap_private_ip_0",
+ "dictionary-source": "default",
+ "dependencies": [
+ ],
+ "version": 0
+ },
+
+ {
+ "name": "int_private1_net_cidr",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ }
+ },
+ "input-param": true,
+ "dictionary-name": "int_private1_net_cidr",
+ "dictionary-source": "processor-db",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "onap_private_net_cidr",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ }
+ },
+ "input-param": true,
+ "dictionary-name": "onap_private_net_cidr",
+ "dictionary-source": "processor-db",
+ "dependencies": [],
+ "version": 0
+ },
+
+
+ {
+ "name": "int_private2_net_cidr",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ }
+ },
+ "input-param": true,
+ "dictionary-name": "int_private2_net_cidr",
+ "dictionary-source": "processor-db",
+ "dependencies": [],
+ "version": 0
+ },
+
+
+ {
+ "name": "demo_artifacts_version",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ }
+ },
+ "input-param": false,
+ "dictionary-name": "demo_artifacts_version",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "image_name",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ }
+ },
+ "input-param": false,
+ "dictionary-name": "image_name",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "install_script_version",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ }
+ },
+ "input-param": false,
+ "dictionary-name": "install_script_version",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "pub_key",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ }
+ },
+ "input-param": false,
+ "dictionary-name": "pub_key",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "public_net_id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ }
+
+ },
+ "input-param": false,
+ "dictionary-name": "public_net_id",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "sec_group",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ }
+ },
+ "input-param": false,
+ "dictionary-name": "sec_group",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "vnf-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ }
+
+ },
+ "input-param": false,
+ "dictionary-name": "vnf-id",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "vnf-model-customization-uuid",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ }
+
+ },
+ "input-param": false,
+ "dictionary-name": "vnf-model-customization-uuid",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "vf-naming-policy",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ },
+ "default": "SDNC_Policy.Config_MS_ONAP_VNF_NAMING_TIMESTAMP"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-naming-policy",
+ "dictionary-source": "default",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "vnf_name",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ },
+ "default": "${vnf_name}"
+ },
+ "input-param": false,
+ "dictionary-name": "vnf_name",
+ "dictionary-source": "default",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "vpg_int_private1_ip_0",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ },
+ "default": "${vpg_int_private1_ip_0}"
+ },
+ "input-param": false,
+ "dictionary-name": "vpg_int_private1_ip_0",
+ "dictionary-source": "default",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "aic-cloud-region",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ }
+
+ },
+ "input-param": false,
+ "dictionary-name": "aic-cloud-region",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "onap_private_net_id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ }
+
+ },
+ "input-param": false,
+ "dictionary-name": "onap_private_net_id",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "onap_private_subnet_id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ }
+
+ },
+ "input-param": false,
+ "dictionary-name": "onap_private_subnet_id",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "vfw_int_private2_ip_0",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ },
+ "default": "${vfw_int_private2_ip_0}"
+ },
+ "input-param": false,
+ "dictionary-name": "vfw_int_private2_ip_0",
+ "dictionary-source": "default",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "vfw_int_private1_ip_0",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ },
+ "default": "${vfw_int_private1_ip_0}"
+ },
+ "input-param": false,
+ "dictionary-name": "vfw_int_private1_ip_0",
+ "dictionary-source": "default",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "vfw_onap_private_ip_0",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ },
+ "default": "${vfw_onap_private_ip_0}"
+ },
+ "input-param": false,
+ "dictionary-name": "vfw_onap_private_ip_0",
+ "dictionary-source": "default",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "vsn_int_private2_ip_0",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ },
+ "default": "${vsn_int_private2_ip_0}"
+ },
+ "input-param": false,
+ "dictionary-name": "vsn_int_private2_ip_0",
+ "dictionary-source": "default",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "service-instance-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ }
+
+ },
+ "input-param": false,
+ "dictionary-name": "service-instance-id",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
+ },
+
+ {
+ "name": "private1-prefix-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ }
+
+ },
+ "input-param": false,
+ "dictionary-name": "private1-prefix-id",
+ "dictionary-source": "processor-db",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "private2-prefix-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ }
+
+ },
+ "input-param": false,
+ "dictionary-name": "private2-prefix-id",
+ "dictionary-source": "processor-db",
+ "dependencies": [],
+ "version": 0
+ }
+] \ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-vnf-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vnf-template.vtl
index f7947ef8f..e114abe48 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-vnf-template.vtl
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vnf-template.vtl
@@ -4,10 +4,7 @@
"param-name": "service-instance-id",
"param-value": "${service-instance-id}"
},
- {
- "param-name": "vnf_id",
- "param-value": "${vnf-id}"
- },
+
{
"param-name": "vnf-model-customization-uuid",
"param-value": "${vnf-model-customization-uuid}"
@@ -17,20 +14,65 @@
"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": "image_name",
- "param-value": "${image_name}"
+ "param-name": "cloud_env",
+ "param-value": "${cloud_env}"
},
{
- "param-name": "onap_private_subnet_id",
- "param-value": "${onap_private_subnet_id}"
+ "param-name": "sec_group",
+ "param-value": "${sec_group}"
+ },
+ {
+ "param-name": "nexus_artifact_repo",
+ "param-value": "${nexus_artifact_repo}"
}
],
"capability-data": [
@@ -56,10 +98,6 @@
"param-value": "${vf-naming-policy}"
},
{
- "param-name": "nf-role",
- "param-value": "${nf-role}"
- },
- {
"param-name": "naming-type",
"param-value": "VNF"
},
@@ -88,7 +126,7 @@
},
{
"param-name": "prefix-id",
- "param-value": "${protected-prefix-id}"
+ "param-value": "${private2-prefix-id}"
},
{
"param-name": "vnf-id",
@@ -96,13 +134,13 @@
},
{
"param-name": "external_key",
- "param-value": "${vnf-id}-vfw_private_ip_1"
+ "param-value": "${vnf-id}-vfw_int_private2_ip_0"
}
],
"output-key-mapping": [
{
- "resource-name": "vfw_private_ip_1",
- "resource-value": "${vfw_private_ip_1}"
+ "resource-name": "vfw_int_private2_ip_0",
+ "resource-value": "${vfw_int_private2_ip_0}"
}
]
},
@@ -114,7 +152,7 @@
},
{
"param-name": "prefix-id",
- "param-value": "${unprotected-prefix-id}"
+ "param-value": "${private1-prefix-id}"
},
{
"param-name": "vnf-id",
@@ -122,13 +160,13 @@
},
{
"param-name": "external_key",
- "param-value": "${vnf-id}-vfw_private_ip_0"
+ "param-value": "${vnf-id}-vfw_int_private1_ip_0"
}
],
"output-key-mapping": [
{
- "resource-name": "vfw_private_ip_0",
- "resource-value": "${vfw_private_ip_0}"
+ "resource-name": "vfw_int_private1_ip_0",
+ "resource-value": "${vfw_int_private1_ip_0}"
}
]
},
@@ -140,7 +178,7 @@
},
{
"param-name": "prefix-id",
- "param-value": "${unprotected-prefix-id}"
+ "param-value": "${private1-prefix-id}"
},
{
"param-name": "vnf-id",
@@ -148,13 +186,13 @@
},
{
"param-name": "external_key",
- "param-value": "${vnf-id}-vpg_private_ip_0"
+ "param-value": "${vnf-id}-vfw_int_private2_floating_ip"
}
],
"output-key-mapping": [
{
- "resource-name": "vpg_private_ip_0",
- "resource-value": "${vpg_private_ip_0}"
+ "resource-name": "vfw_int_private2_floating_ip",
+ "resource-value": "${vfw_int_private2_floating_ip}"
}
]
},
@@ -166,7 +204,7 @@
},
{
"param-name": "prefix-id",
- "param-value": "${protected-prefix-id}"
+ "param-value": "${private2-prefix-id}"
},
{
"param-name": "vnf-id",
@@ -174,26 +212,65 @@
},
{
"param-name": "external_key",
- "param-value": "${vnf-id}-vsn_private_ip_0"
+ "param-value": "${vnf-id}-vsn_int_private2_ip_0"
}
],
"output-key-mapping": [
{
- "resource-name": "vsn_private_ip_0",
- "resource-value": "${vsn_private_ip_0}"
+ "resource-name": "vsn_int_private2_ip_0",
+ "resource-value": "${vsn_int_private2_ip_0}"
}
]
- }
- ]
- },
- {
- "capability-name": "unresolved-composite-data",
- "key-mapping": [
+ },
+ {
+ "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}"
+ }
+ ]
+ },
{
+ "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": "key_name",
- "resource-value": "${vnf_name}_key"
+ "resource-name": "vpg_int_private1_ip_0",
+ "resource-value": "${vpg_int_private1_ip_0}"
}
]
}
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpg-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpkg-mapping.json
index 15531370c..8d17414c4 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpg-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpkg-mapping.json
@@ -1,70 +1,85 @@
[
{
- "name": "service-instance-id",
+ "name": "cloud_env",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
- }
+ },
+ "default": "openstack"
},
"input-param": false,
- "dictionary-name": "service-instance-id",
- "dictionary-source": "input",
- "dependencies": [
-
- ],
+ "dictionary-name": "cloud_env",
+ "dictionary-source": "default",
+ "dependencies": [],
"version": 0
},
{
- "name": "vnf-id",
+ "name": "nexus_artifact_repo",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "vnf-id",
- "dictionary-source": "input",
+ "dictionary-name": "nexus_artifact_repo",
+ "dictionary-source": "sdnc",
"dependencies": [
-
+ "service-instance-id",
+ "vnf-id"
],
"version": 0
},
{
- "name": "vnf-name",
+ "name": "vf-module-name",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ },
+ "default": "${vf-module-name}"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-module-name",
+ "dictionary-source": "default",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "demo_artifacts_version",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "vnf-name",
+ "dictionary-name": "demo_artifacts_version",
"dictionary-source": "sdnc",
"dependencies": [
"service-instance-id",
@@ -73,313 +88,305 @@
"version": 0
},
{
- "name": "vnf-model-customization-uuid",
+ "name": "install_script_version",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "vnf-model-customization-uuid",
- "dictionary-source": "input",
+ "dictionary-name": "install_script_version",
+ "dictionary-source": "sdnc",
"dependencies": [
-
+ "service-instance-id",
+ "vnf-id"
],
"version": 0
},
{
- "name": "vf-module-id",
+ "name": "aic-cloud-region",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "vf-module-id",
+ "dictionary-name": "aic-cloud-region",
"dictionary-source": "input",
- "dependencies": [
-
- ],
+ "dependencies": [],
"version": 0
},
{
- "name": "vf-module-type",
+ "name": "nfc-naming-code",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "vf-module-type",
+ "dictionary-name": "nfc-naming-code",
"dictionary-source": "processor-db",
"dependencies": [
- "vf-module-model-customization-uuid"
+ "vfccustomizationuuid"
],
"version": 0
},
{
- "name": "vf-module-model-customization-uuid",
+ "name": "onap_private_net_cidr",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "vf-module-model-customization-uuid",
- "dictionary-source": "input",
+ "dictionary-name": "onap_private_net_cidr",
+ "dictionary-source": "sdnc",
"dependencies": [
-
+ "service-instance-id",
+ "vnf-id"
],
"version": 0
},
{
- "name": "vfccustomizationuuid",
+ "name": "onap_private_net_id",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "vfccustomizationuuid",
- "dictionary-source": "processor-db",
+ "dictionary-name": "onap_private_net_id",
+ "dictionary-source": "sdnc",
"dependencies": [
- "vf-module-model-customization-uuid"
+ "service-instance-id",
+ "vnf-id"
],
"version": 0
},
{
- "name": "aic-cloud-region",
+ "name": "onap_private_subnet_id",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "aic-cloud-region",
- "dictionary-source": "input",
+ "dictionary-name": "onap_private_subnet_id",
+ "dictionary-source": "sdnc",
"dependencies": [
-
+ "service-instance-id",
+ "vnf-id"
],
"version": 0
},
{
- "name": "vm-type",
+ "name": "public_net_id",
"property": {
"description": "",
"required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "vm-type",
- "dictionary-source": "processor-db",
+ "dictionary-name": "public_net_id",
+ "dictionary-source": "sdnc",
"dependencies": [
-
+ "service-instance-id",
+ "vnf-id"
],
"version": 0
},
{
- "name": "vnfc-model-invariant-uuid",
+ "name": "sec_group",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "vnfc-model-invariant-uuid",
- "dictionary-source": "processor-db",
+ "dictionary-name": "sec_group",
+ "dictionary-source": "sdnc",
"dependencies": [
- "vfccustomizationuuid"
+ "service-instance-id",
+ "vnf-id"
],
"version": 0
},
{
- "name": "vnfc-model-version",
+ "name": "service-instance-id",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "vnfc-model-version",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vfccustomizationuuid"
- ],
+ "dictionary-name": "service-instance-id",
+ "dictionary-source": "input",
+ "dependencies": [],
"version": 0
},
{
- "name": "nf-role",
+ "name": "vf-module-id",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
- },
- "default": "vPG"
+ }
},
"input-param": false,
- "dictionary-name": "nf-role",
- "dictionary-source": "default",
- "dependencies": [
- "vnf-model-customization-uuid"
- ],
+ "dictionary-name": "vf-module-id",
+ "dictionary-source": "input",
+ "dependencies": [],
"version": 0
},
{
- "name": "nfc-naming-code",
+ "name": "vf-module-label",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "nfc-naming-code",
+ "dictionary-name": "vf-module-label",
"dictionary-source": "processor-db",
"dependencies": [
- "vfccustomizationuuid"
+ "vf-module-model-customization-uuid"
],
"version": 0
},
{
- "name": "public_net_id",
+ "name": "vf-module-model-customization-uuid",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
- },
- "default": "public_net_id"
+ }
},
"input-param": false,
- "dictionary-name": "public_net_id",
- "dictionary-source": "default",
+ "dictionary-name": "vf-module-model-customization-uuid",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "vf-module-type",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ }
+ },
+ "input-param": false,
+ "dictionary-name": "vf-module-type",
+ "dictionary-source": "processor-db",
"dependencies": [
-
+ "vf-module-model-customization-uuid"
],
"version": 0
},
{
- "name": "image_name",
+ "name": "vf-naming-policy",
"property": {
"description": "",
"required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "image_name",
+ "dictionary-name": "vf-naming-policy",
"dictionary-source": "sdnc",
"dependencies": [
"service-instance-id",
@@ -388,48 +395,43 @@
"version": 0
},
{
- "name": "key_name",
+ "name": "vfccustomizationuuid",
"property": {
"description": "",
"required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "key_name",
- "dictionary-source": "sdnc",
+ "dictionary-name": "vfccustomizationuuid",
+ "dictionary-source": "processor-db",
"dependencies": [
- "service-instance-id",
- "vnf-id"
+ "vf-module-model-customization-uuid"
],
"version": 0
},
{
- "name": "pub_key",
+ "name": "vpg_flavor_name",
"property": {
"description": "",
"required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "pub_key",
+ "dictionary-name": "flavor_name",
"dictionary-source": "sdnc",
"dependencies": [
"service-instance-id",
@@ -438,23 +440,21 @@
"version": 0
},
{
- "name": "onap_private_net_id",
+ "name": "vpg_image_name",
"property": {
"description": "",
"required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "onap_private_net_id",
+ "dictionary-name": "image_name",
"dictionary-source": "sdnc",
"dependencies": [
"service-instance-id",
@@ -463,23 +463,21 @@
"version": 0
},
{
- "name": "onap_private_subnet_id",
+ "name": "vnf_name",
"property": {
"description": "",
"required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "onap_private_subnet_id",
+ "dictionary-name": "vnf_name",
"dictionary-source": "sdnc",
"dependencies": [
"service-instance-id",
@@ -488,321 +486,288 @@
"version": 0
},
{
- "name": "unprotected_private_net_cidr",
+ "name": "vpg_name_0",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
- }
+ },
+ "default": "${vpg_name_0}"
},
"input-param": false,
- "dictionary-name": "unprotected_private_net_cidr",
- "dictionary-source": "processor-db",
- "dependencies": [
-
- ],
+ "dictionary-name": "vpg_name_0",
+ "dictionary-source": "default",
+ "dependencies": [],
"version": 0
},
{
- "name": "onap_private_net_cidr",
+ "name": "private2-prefix-id",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
+
},
"input-param": false,
- "dictionary-name": "onap_private_net_cidr",
+ "dictionary-name": "private2-prefix-id",
"dictionary-source": "processor-db",
- "dependencies": [
-
- ],
+ "dependencies": [],
"version": 0
},
{
- "name": "vfw_private_ip_0",
+ "name": "management-prefix-id",
"property": {
"description": "",
"required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
+
},
"input-param": false,
- "dictionary-name": "vfw_private_ip_0",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
+ "dictionary-name": "management-prefix-id",
+ "dictionary-source": "processor-db",
+ "dependencies": [],
"version": 0
},
{
- "name": "vsn_private_ip_0",
+ "name": "vnf-id",
"property": {
"description": "",
"required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "vsn_private_ip_0",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
+ "dictionary-name": "vnf-id",
+ "dictionary-source": "input",
+ "dependencies": [],
"version": 0
},
{
- "name": "nexus_artifact_repo",
+ "name": "vnf-model-customization-uuid",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
- },
- "default": "nexus_artifact_repo"
+ }
},
"input-param": false,
- "dictionary-name": "nexus_artifact_repo",
- "dictionary-source": "default",
- "dependencies": [
-
- ],
+ "dictionary-name": "vnf-model-customization-uuid",
+ "dictionary-source": "input",
+ "dependencies": [],
"version": 0
},
{
- "name": "sec_group",
+ "name": "vnfc-model-invariant-uuid",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
- },
- "default": "onap_sg_PUhf"
+ }
},
"input-param": false,
- "dictionary-name": "sec_group",
- "dictionary-source": "default",
+ "dictionary-name": "vnfc-model-invariant-uuid",
+ "dictionary-source": "processor-db",
"dependencies": [
-
+ "vfccustomizationuuid"
],
"version": 0
},
{
- "name": "vpg_private_ip_0",
+ "name": "vnfc-model-version",
"property": {
"description": "",
"required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "vpg_private_ip_0",
- "dictionary-source": "sdnc",
+ "dictionary-name": "vnfc-model-version",
+ "dictionary-source": "processor-db",
"dependencies": [
- "service-instance-id",
- "vnf-id"
+ "vfccustomizationuuid"
],
"version": 0
},
{
- "name": "vpg_name_0",
+ "name": "vfw_int_private1_ip_0",
"property": {
"description": "",
"required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "vpg_name_0",
- "dictionary-source": "input",
+ "dictionary-name": "vfw_int_private1_ip_0",
+ "dictionary-source": "sdnc",
"dependencies": [
-
+ "service-instance-id",
+ "vnf-id"
],
"version": 0
},
{
- "name": "vf-naming-policy",
+ "name": "int_private1_net_cidr",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
- },
- "default": "SDNC_Policy.Config_MS_ONAP_VPG_NAMING_TIMESTAMP"
+ }
},
"input-param": false,
- "dictionary-name": "vf-naming-policy",
- "dictionary-source": "default",
+ "dictionary-name": "int_private1_net_cidr",
+ "dictionary-source": "sdnc",
"dependencies": [
-
+ "service-instance-id",
+ "vnf-id"
],
"version": 0
},
{
- "name": "vf_module_name",
+ "name": "int_private2_net_cidr",
"property": {
"description": "",
"required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "vf_module_name",
- "dictionary-source": "input",
+ "dictionary-name": "int_private2_net_cidr",
+ "dictionary-source": "sdnc",
"dependencies": [
-
+ "service-instance-id",
+ "vnf-id"
],
"version": 0
},
{
- "name": "vf-module-label",
+ "name": "vpg_onap_private_ip_0",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "vf-module-label",
- "dictionary-source": "processor-db",
+ "dictionary-name": "vpg_onap_private_ip_0",
+ "dictionary-source": "sdnc",
"dependencies": [
- "vf-module-model-customization-uuid"
+ "service-instance-id",
+ "vnf-id"
],
"version": 0
},
{
- "name": "private-prefix-id",
+ "name": "vpg_int_private1_ip_0",
"property": {
"description": "",
"required": false,
- "type": "integer",
+ "type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "private-prefix-id",
- "dictionary-source": "processor-db",
+ "dictionary-name": "vpg_int_private1_ip_0",
+ "dictionary-source": "sdnc",
"dependencies": [
-
+ "service-instance-id",
+ "vnf-id"
],
"version": 0
},
{
- "name": "vpg_private_ip_1",
+ "name": "vsn_int_private2_ip_0",
"property": {
"description": "",
"required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "vpg_private_ip_1",
- "dictionary-source": "input",
+ "dictionary-name": "vsn_int_private2_ip_0",
+ "dictionary-source": "sdnc",
"dependencies": [
-
+ "service-instance-id",
+ "vnf-id"
],
"version": 0
}
-]
+] \ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpg-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpkg-template.vtl
index 2ff6596ee..311cb94b8 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpg-template.vtl
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpkg-template.vtl
@@ -4,13 +4,10 @@
"param-name": "service-instance-id",
"param-value": "${service-instance-id}"
},
- {
- "param-name": "vnf_id",
- "param-value": "${vnf-id}"
- },
+
{
"param-name": "vnf_name",
- "param-value": "${vnf-name}"
+ "param-value": "${vnf_name}"
},
{
"param-name": "vnf_model_customization_uuid",
@@ -37,10 +34,6 @@
"param-value": "${aic-cloud-region}"
},
{
- "param-name": "vm-type",
- "param-value": "${vm-type}"
- },
- {
"param-name": "vnfc-model-customization-uuid",
"param-value": "${vfccustomizationuuid}"
},
@@ -60,57 +53,22 @@
"param-name": "nfc-naming-code",
"param-value": "${nfc-naming-code}"
},
+
{
- "param-name": "cloud_env",
- "param-value": "openstack"
- },
- {
- "param-name": "repo_url_artifacts",
- "param-value": "https://nexus.onap.org/content/groups/staging"
- },
- {
- "param-name": "repo_url_blob",
- "param-value": "https://nexus.onap.org/content/repositories/raw"
- },
- {
- "param-name": "dcae_collector_port",
- "param-value": "8080"
- },
- {
- "param-name": "image_name",
- "param-value": "${image_name}"
- },
- {
- "param-name": "flavor_name",
- "param-value": "m1.medium"
- },
- {
- "param-name": "key_name",
- "param-value": "${key_name}"
- },
- {
- "param-name": "pub_key",
- "param-value": "${pub_key}"
- },
- {
- "param-name": "install_script_version",
- "param-value": "1.2.1-SNAPSHOT"
- },
- {
- "param-name": "demo_artifacts_version",
- "param-value": "1.2.1-SNAPSHOT"
+ "param-name": "vpg_image_name",
+ "param-value": "${vpg_image_name}"
},
{
- "param-name": "dcae_collector_ip",
- "param-value": "10.0.4.1"
+ "param-name": "vpg_flavor_name",
+ "param-value": "${vpg_flavor_name}"
},
- {
+ {
"param-name": "public_net_id",
"param-value": "${public_net_id}"
},
{
- "param-name": "protected_private_net_id",
- "param-value": "zdfw1fwl01_protected"
+ "param-name": "int_private1_net_cidr",
+ "param-value": "${int_private1_net_cidr}"
},
{
"param-name": "onap_private_net_id",
@@ -121,49 +79,55 @@
"param-value": "${onap_private_subnet_id}"
},
{
- "param-name": "unprotected_private_net_id",
- "param-value": "${vnf-name}_unprotected"
+ "param-name": "onap_private_net_cidr",
+ "param-value": "${onap_private_net_cidr}"
},
{
- "param-name": "unprotected_private_subnet_id",
- "param-value": "${vnf-name}_unprotected_sub"
+ "param-name": "int_private2_net_cidr",
+ "param-value": "${int_private2_net_cidr}"
},
{
- "param-name": "unprotected_private_net_cidr",
- "param-value": "${unprotected_private_net_cidr}"
+ "param-name": "vfw_int_private1_ip_0",
+ "param-value": "${vfw_int_private1_ip_0}"
},
{
- "param-name": "protected_private_subnet_id",
- "param-value": "${vnf-name}_protected_sub"
+ "param-name": "vpg_int_private1_ip_0",
+ "param-value": "${vpg_int_private1_ip_0}"
},
{
- "param-name": "protected_private_net_id",
- "param-value": "${vnf-name}_protected"
+ "param-name": "vsn_int_private2_ip_0",
+ "param-value": "${vsn_int_private2_ip_0}"
},
{
- "param-name": "onap_private_net_cidr",
- "param-value": "${onap_private_net_cidr}"
+ "param-name": "demo_artifacts_version",
+ "param-value": "${demo_artifacts_version}}"
},
{
- "param-name": "vfw_private_ip_0",
- "param-value": "${vfw_private_ip_0}"
+ "param-name": "install_script_version",
+ "param-value": "${install_script_version}}"
},
- {
- "param-name": "vsn_private_ip_0",
- "param-value": "${vsn_private_ip_0}"
+ {
+ "param-name": "key_name",
+ "param-value": "${vnf_name}_key_name"
},
- {
- "param-name": "nexus_artifact_repo",
- "param-value": "${nexus_artifact_repo}"
+ {
+ "param-name": "cloud_env",
+ "param-value": "$(cloud_env)"
},
- {
+ {
"param-name": "sec_group",
"param-value": "${sec_group}"
},
- {
- "param-name": "vpg_private_ip_0",
- "param-value": "${vpg_private_ip_0}"
+ {
+ "param-name": "nexus_artifact_repo",
+ "param-value": "${nexus_artifact_repo}"
+ },
+ {
+ "param-name": "vpg_onap_private_ip_0",
+ "param-value": "${vpg_onap_private_ip_0}"
}
+
+
],
"capability-data": [
{
@@ -188,16 +152,12 @@
"param-value": "${vf-naming-policy}"
},
{
- "param-name": "nf-role",
- "param-value": "${nf-role}"
- },
- {
"param-name": "naming-type",
"param-value": "VNFC"
},
{
"param-name": "VNF_NAME",
- "param-value": "${vnf-name}"
+ "param-value": "${vnf_name}"
},
{
"param-name": "NFC_NAMING_CODE",
@@ -215,15 +175,15 @@
"payload": [
{
"param-name": "resource-name",
- "param-value": "vf_module_name"
+ "param-value": "vf-module-name"
},
{
"param-name": "resource-value",
- "param-value": "${vf_module_name}"
+ "param-value": "${vf-module-name}"
},
{
"param-name": "external-key",
- "param-value": "${vf-module-id}_vf_module_name"
+ "param-value": "${vf-module-id}_vf-module-name"
},
{
"param-name": "policy-instance-name",
@@ -239,7 +199,7 @@
},
{
"param-name": "VNF_NAME",
- "param-value": "${vnf-name}"
+ "param-value": "${vnf_name}"
},
{
"param-name": "VF_MODULE_LABEL",
@@ -252,44 +212,14 @@
],
"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": "${private-prefix-id}"
- },
- {
- "param-name": "vf-module-id",
- "param-value": "${vf-module-id}"
- },
- {
- "param-name": "external_key",
- "param-value": "${vf-module-id}-vpg_private_ip_1"
- }
- ],
- "output-key-mapping": [
- {
- "resource-name": "vpg_private_ip_1",
- "resource-value": "${vpg_private_ip_1}"
+ "resource-name": "vf-module-name",
+ "resource-value": "${vf-module-name}"
}
]
}
]
},
+
{
"capability-name": "aai-vf-module-put",
"key-mapping": [
@@ -298,10 +228,6 @@
{
"param-name": "vf-module",
"param-value": "vf-module"
- },
- {
- "param-name": "vnfc",
- "param-value": "vnfc"
}
],
"output-key-mapping": [
@@ -312,27 +238,6 @@
]
}
]
- },
- {
- "capability-name": "unresolved-composite-data",
- "key-mapping": [
- {
- "output-key-mapping": [
- {
- "resource-name": "vf-module-name",
- "resource-value": "${vf_module_name}"
- },
- {
- "resource-name": "vnfc-name",
- "resource-value": "${vpg_name_0}"
- },
- {
- "resource-name": "ipv4-oam-address-prefix",
- "resource-value": "${onap_private_net_cidr}"
- }
- ]
- }
- ]
}
]
} \ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn-mapping.json
index 3d9c0370c..532e157f6 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn-mapping.json
@@ -1,360 +1,364 @@
[
{
- "name": "service-instance-id",
+ "name": "cloud_env",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ },
+ "default": "openstack"
+ },
+ "input-param": false,
+ "dictionary-name": "cloud_env",
+ "dictionary-source": "default",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "nexus_artifact_repo",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "service-instance-id",
- "dictionary-source": "input",
+ "dictionary-name": "nexus_artifact_repo",
+ "dictionary-source": "sdnc",
"dependencies": [
-
+ "service-instance-id",
+ "vnf-id"
],
"version": 0
},
+
{
- "name": "vnf-id",
+ "name": "vf-module-name",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
- }
+ },
+ "default": "${vf-module-name}"
},
"input-param": false,
- "dictionary-name": "vnf-id",
- "dictionary-source": "input",
- "dependencies": [
-
- ],
+ "dictionary-name": "vf-module-name",
+ "dictionary-source": "default",
+ "dependencies": [],
"version": 0
},
{
- "name": "vnf-name",
+ "name": "nfc-naming-code",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "vnf-name",
- "dictionary-source": "sdnc",
+ "dictionary-name": "nfc-naming-code",
+ "dictionary-source": "processor-db",
"dependencies": [
- "service-instance-id",
- "vnf-id"
+ "vfccustomizationuuid"
],
"version": 0
},
{
- "name": "vnf-model-customization-uuid",
+ "name": "dcae_collector_ip",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
- }
+ },
+ "default": "10.0.4.1"
},
"input-param": false,
- "dictionary-name": "vnf-model-customization-uuid",
- "dictionary-source": "input",
+ "dictionary-name": "dcae_collector_ip",
+ "dictionary-source": "default",
"dependencies": [
-
+ "service-instance-id",
+ "vnf-id"
],
"version": 0
},
{
- "name": "vf-module-id",
+ "name": "dcae_collector_port",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
- }
+ },
+ "default": "30235"
},
"input-param": false,
- "dictionary-name": "vf-module-id",
- "dictionary-source": "input",
+ "dictionary-name": "dcae_collector_port",
+ "dictionary-source": "default",
"dependencies": [
-
+ "service-instance-id",
+ "vnf-id"
],
"version": 0
},
{
- "name": "vf-module-type",
+ "name": "demo_artifacts_version",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "vf-module-type",
- "dictionary-source": "processor-db",
+ "dictionary-name": "demo_artifacts_version",
+ "dictionary-source": "sdnc",
"dependencies": [
- "vf-module-model-customization-uuid"
+ "service-instance-id",
+ "vnf-id"
],
"version": 0
},
+
{
- "name": "vf-module-model-customization-uuid",
+ "name": "install_script_version",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "vf-module-model-customization-uuid",
- "dictionary-source": "input",
+ "dictionary-name": "install_script_version",
+ "dictionary-source": "sdnc",
"dependencies": [
-
+ "service-instance-id",
+ "vnf-id"
],
"version": 0
},
{
- "name": "vfccustomizationuuid",
+ "name": "vnf_name",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "vfccustomizationuuid",
- "dictionary-source": "processor-db",
+ "dictionary-name": "vnf_name",
+ "dictionary-source": "sdnc",
"dependencies": [
- "vf-module-model-customization-uuid"
+ "service-instance-id",
+ "vnf-id"
],
"version": 0
},
{
- "name": "aic-cloud-region",
+ "name": "onap_private_net_cidr",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "aic-cloud-region",
- "dictionary-source": "input",
+ "dictionary-name": "onap_private_net_cidr",
+ "dictionary-source": "sdnc",
"dependencies": [
-
+ "service-instance-id",
+ "vnf-id"
],
"version": 0
},
{
- "name": "vm-type",
+ "name": "onap_private_net_id",
"property": {
"description": "",
"required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "vm-type",
- "dictionary-source": "processor-db",
+ "dictionary-name": "onap_private_net_id",
+ "dictionary-source": "sdnc",
"dependencies": [
-
+ "service-instance-id",
+ "vnf-id"
],
"version": 0
},
{
- "name": "vnfc-model-invariant-uuid",
+ "name": "int_private2_net_cidr",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "vnfc-model-invariant-uuid",
- "dictionary-source": "processor-db",
+ "dictionary-name": "int_private2_net_cidr",
+ "dictionary-source": "sdnc",
"dependencies": [
- "vfccustomizationuuid"
+ "service-instance-id",
+ "vnf-id"
],
"version": 0
},
{
- "name": "vnfc-model-version",
+ "name": "int_private1_net_cidr",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "vnfc-model-version",
- "dictionary-source": "processor-db",
+ "dictionary-name": "int_private1_net_cidr",
+ "dictionary-source": "sdnc",
"dependencies": [
- "vfccustomizationuuid"
+ "service-instance-id",
+ "vnf-id"
],
"version": 0
},
{
- "name": "nf-role",
+ "name": "onap_private_subnet_id",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
- },
- "default": "vSN"
+ }
},
"input-param": false,
- "dictionary-name": "nf-role",
- "dictionary-source": "default",
+ "dictionary-name": "onap_private_subnet_id",
+ "dictionary-source": "sdnc",
"dependencies": [
- "vnf-model-customization-uuid"
+ "service-instance-id",
+ "vnf-id"
],
"version": 0
},
{
- "name": "nfc-naming-code",
+ "name": "public_net_id",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "nfc-naming-code",
- "dictionary-source": "processor-db",
+ "dictionary-name": "public_net_id",
+ "dictionary-source": "sdnc",
"dependencies": [
- "vfccustomizationuuid"
+ "service-instance-id",
+ "vnf-id"
],
"version": 0
},
{
- "name": "image_name",
+ "name": "sec_group",
"property": {
"description": "",
"required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "image_name",
+ "dictionary-name": "sec_group",
"dictionary-source": "sdnc",
"dependencies": [
"service-instance-id",
@@ -363,124 +367,125 @@
"version": 0
},
{
- "name": "public_net_id",
+ "name": "service-instance-id",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
- },
- "value": "public_net_id",
- "default": "public_net_id"
+ }
},
"input-param": false,
- "dictionary-name": "public_net_id",
- "dictionary-source": "default",
- "dependencies": [
-
- ],
+ "dictionary-name": "service-instance-id",
+ "dictionary-source": "input",
+ "dependencies": [],
"version": 0
},
{
- "name": "key_name",
+ "name": "vf-module-id",
"property": {
"description": "",
"required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "key_name",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
+ "dictionary-name": "vf-module-id",
+ "dictionary-source": "input",
+ "dependencies": [],
"version": 0
},
{
- "name": "pub_key",
+ "name": "vf-module-label",
"property": {
"description": "",
"required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "pub_key",
- "dictionary-source": "sdnc",
+ "dictionary-name": "vf-module-label",
+ "dictionary-source": "processor-db",
"dependencies": [
- "service-instance-id",
- "vnf-id"
+ "vf-module-model-customization-uuid"
],
"version": 0
},
{
- "name": "onap_private_net_id",
+ "name": "vf-module-model-customization-uuid",
"property": {
"description": "",
"required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "onap_private_net_id",
- "dictionary-source": "sdnc",
+ "dictionary-name": "vf-module-model-customization-uuid",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "vf-module-type",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ }
+ },
+ "input-param": false,
+ "dictionary-name": "vf-module-type",
+ "dictionary-source": "processor-db",
"dependencies": [
- "service-instance-id",
- "vnf-id"
+ "vf-module-model-customization-uuid"
],
"version": 0
},
{
- "name": "onap_private_subnet_id",
+ "name": "vf-naming-policy",
"property": {
"description": "",
"required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "onap_private_subnet_id",
+ "dictionary-name": "vf-naming-policy",
"dictionary-source": "sdnc",
"dependencies": [
"service-instance-id",
@@ -489,320 +494,307 @@
"version": 0
},
{
- "name": "unprotected_private_net_cidr",
+ "name": "vfccustomizationuuid",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "unprotected_private_net_cidr",
+ "dictionary-name": "vfccustomizationuuid",
"dictionary-source": "processor-db",
"dependencies": [
-
+ "vf-module-model-customization-uuid"
],
"version": 0
},
+
{
- "name": "protected_private_net_cidr",
+ "name": "vsn_flavor_name",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "protected_private_net_cidr",
- "dictionary-source": "processor-db",
+ "dictionary-name": "flavor_name",
+ "dictionary-source": "sdnc",
"dependencies": [
-
- ],
+ "service-instance-id",
+ "vnf-id"
+ ],
"version": 0
},
{
- "name": "onap_private_net_cidr",
+ "name": "vsn_image_name",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "onap_private_net_cidr",
- "dictionary-source": "processor-db",
+ "dictionary-name": "image_name",
+ "dictionary-source": "sdnc",
"dependencies": [
-
+ "service-instance-id",
+ "vnf-id"
],
"version": 0
},
{
- "name": "nexus_artifact_repo",
+ "name": "vsn_name_0",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
},
- "value": "nexus_artifact_repo",
- "default": "nexus_artifact_repo"
+ "default": "${vsn_name_0}"
},
"input-param": false,
- "dictionary-name": "nexus_artifact_repo",
+ "dictionary-name": "vsn_name_0",
"dictionary-source": "default",
- "dependencies": [
-
- ],
+ "dependencies": [],
"version": 0
},
{
- "name": "sec_group",
+ "name": "vnf-id",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
- },
- "default": "onap_sg_PUhf"
+ }
},
"input-param": false,
- "dictionary-name": "sec_group",
- "dictionary-source": "default",
- "dependencies": [
-
- ],
+ "dictionary-name": "vnf-id",
+ "dictionary-source": "input",
+ "dependencies": [],
"version": 0
},
{
- "name": "vfw_private_ip_1",
+ "name": "vnf-model-customization-uuid",
"property": {
"description": "",
"required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "vfw_private_ip_1",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
+ "dictionary-name": "vnf-model-customization-uuid",
+ "dictionary-source": "input",
+ "dependencies": [],
"version": 0
},
{
- "name": "vsn_name_0",
+ "name": "vnfc-model-invariant-uuid",
"property": {
"description": "",
"required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "vsn_name_0",
- "dictionary-source": "input",
+ "dictionary-name": "vnfc-model-invariant-uuid",
+ "dictionary-source": "processor-db",
"dependencies": [
-
+ "vfccustomizationuuid"
],
"version": 0
},
{
- "name": "vf-naming-policy",
+ "name": "vnfc-model-version",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
- },
- "default": "SDNC_Policy.Config_MS_ONAP_VSN_NAMING_TIMESTAMP"
+ }
},
"input-param": false,
- "dictionary-name": "vf-naming-policy",
- "dictionary-source": "default",
+ "dictionary-name": "vnfc-model-version",
+ "dictionary-source": "processor-db",
"dependencies": [
-
+ "vfccustomizationuuid"
],
"version": 0
},
{
- "name": "vf_module_name",
+ "name": "vsn_int_private2_ip_0",
"property": {
"description": "",
"required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "vf_module_name",
- "dictionary-source": "input",
+ "dictionary-name": "vsn_int_private2_ip_0",
+ "dictionary-source": "sdnc",
"dependencies": [
-
+ "service-instance-id",
+ "vnf-id"
],
"version": 0
},
{
- "name": "vf-module-label",
+ "name": "vfw_int_private2_ip_0",
"property": {
"description": "",
- "required": true,
+ "required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
},
"input-param": false,
- "dictionary-name": "vf-module-label",
- "dictionary-source": "processor-db",
+ "dictionary-name": "vfw_int_private2_ip_0",
+ "dictionary-source": "sdnc",
"dependencies": [
- "vf-module-model-customization-uuid"
+ "service-instance-id",
+ "vnf-id"
],
"version": 0
},
{
- "name": "private-prefix-id",
+ "name": "vsn_onap_private_ip_0",
"property": {
"description": "",
"required": false,
- "type": "integer",
+ "type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
- }
+ },
+ "default": "${vsn_onap_private_ip_0}"
},
"input-param": false,
- "dictionary-name": "private-prefix-id",
- "dictionary-source": "processor-db",
- "dependencies": [
-
- ],
+ "dictionary-name": "vsn_onap_private_ip_0",
+ "dictionary-source": "default",
+ "dependencies": [],
"version": 0
},
{
- "name": "vsn_private_ip_1",
+ "name": "private1-prefix-id",
"property": {
"description": "",
"required": false,
"type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
+
},
"input-param": false,
- "dictionary-name": "vsn_private_ip_1",
- "dictionary-source": "input",
- "dependencies": [
+ "dictionary-name": "private1-prefix-id",
+ "dictionary-source": "processor-db",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "management-prefix-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ }
- ],
+ },
+ "input-param": false,
+ "dictionary-name": "management-prefix-id",
+ "dictionary-source": "processor-db",
+ "dependencies": [],
"version": 0
},
{
- "name": "protected-prefix-id",
+ "name": "private2-prefix-id",
"property": {
"description": "",
"required": false,
- "type": "integer",
+ "type": "string",
"status": "",
"constraints": [
- {
-
- }
+ {}
],
"entry_schema": {
"type": ""
}
+
},
"input-param": false,
- "dictionary-name": "protected-prefix-id",
+ "dictionary-name": "private2-prefix-id",
"dictionary-source": "processor-db",
- "dependencies": [
-
- ],
+ "dependencies": [],
"version": 0
}
-]
+] \ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn-template.vtl
index 11fcea9fd..7faf97739 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn-template.vtl
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn-template.vtl
@@ -4,13 +4,10 @@
"param-name": "service-instance-id",
"param-value": "${service-instance-id}"
},
- {
- "param-name": "vnf_id",
- "param-value": "${vnf-id}"
- },
+
{
"param-name": "vnf_name",
- "param-value": "${vnf-name}"
+ "param-value": "${vnf_name}"
},
{
"param-name": "vnf_model_customization_uuid",
@@ -36,10 +33,7 @@
"param-name": "aic-cloud-region",
"param-value": "${aic-cloud-region}"
},
- {
- "param-name": "vm-type",
- "param-value": "${vm-type}"
- },
+
{
"param-name": "vnfc-model-customization-uuid",
"param-value": "${vfccustomizationuuid}"
@@ -53,72 +47,28 @@
"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": "cloud_env",
- "param-value": "openstack"
- },
- {
- "param-name": "repo_url_artifacts",
- "param-value": "https://nexus.onap.org/content/groups/staging"
- },
- {
- "param-name": "repo_url_blob",
- "param-value": "https://nexus.onap.org/content/repositories/raw"
- },
- {
- "param-name": "dcae_collector_port",
- "param-value": "8080"
- },
- {
- "param-name": "image_name",
- "param-value": "${image_name}"
- },
- {
- "param-name": "flavor_name",
- "param-value": "m1.medium"
- },
- {
- "param-name": "install_script_version",
- "param-value": "1.2.1-SNAPSHOT"
- },
- {
- "param-name": "key_name",
- "param-value": "${key_name}"
- },
- {
- "param-name": "pub_key",
- "param-value": "${pub_key}"
+ "param-name": "vsn_image_name",
+ "param-value": "${vsn_image_name}"
},
{
- "param-name": "demo_artifacts_version",
- "param-value": "1.2.1-SNAPSHOT"
- },
- {
- "param-name": "dcae_collector_ip",
- "param-value": "10.0.4.1"
+ "param-name": "vsn_flavor_name",
+ "param-value": "${vsn_flavor_name}"
},
{
"param-name": "public_net_id",
"param-value": "${public_net_id}"
- },
+ },
+
+
+
{
- "param-name": "unprotected_private_net_id",
- "param-value": "${vnf-name}_unprotected"
- },
- {
- "param-name": "protected_private_subnet_id",
- "param-value": "${vnf-name}_protected_sub"
- },
- {
- "param-name": "protected_private_net_id",
- "param-value": "${vnf-name}_protected"
+ "param-name": "int_private2_net_cidr",
+ "param-value": "${int_private2_net_cidr}"
},
{
"param-name": "onap_private_net_id",
@@ -128,30 +78,45 @@
"param-name": "onap_private_subnet_id",
"param-value": "${onap_private_subnet_id}"
},
- {
- "param-name": "unprotected_private_net_cidr",
- "param-value": "${unprotected_private_net_cidr}"
- },
- {
- "param-name": "protected_private_net_cidr",
- "param-value": "${protected_private_net_cidr}"
- },
- {
+ {
"param-name": "onap_private_net_cidr",
"param-value": "${onap_private_net_cidr}"
},
{
- "param-name": "nexus_artifact_repo",
- "param-value": "${nexus_artifact_repo}"
+ "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": "vfw_private_ip_1",
- "param-value": "${vfw_private_ip_1}"
+ {
+ "param-name": "nexus_artifact_repo",
+ "param-value": "${nexus_artifact_repo}"
}
+
+
+
],
"capability-data": [
{
@@ -176,16 +141,12 @@
"param-value": "${vf-naming-policy}"
},
{
- "param-name": "nf-role",
- "param-value": "${nf-role}"
- },
- {
"param-name": "naming-type",
"param-value": "VNFC"
},
{
"param-name": "VNF_NAME",
- "param-value": "${vnf-name}"
+ "param-value": "${vnf_name}"
},
{
"param-name": "NFC_NAMING_CODE",
@@ -203,31 +164,27 @@
"payload": [
{
"param-name": "resource-name",
- "param-value": "vf_module_name"
+ "param-value": "vf-module-name"
},
{
"param-name": "resource-value",
- "param-value": "${vf_module_name}"
+ "param-value": "${vf-module-name}"
},
{
"param-name": "external-key",
- "param-value": "${vf-module-id}_vf_module_name"
+ "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-value": "${vnf_name}"
},
{
"param-name": "VF_MODULE_LABEL",
@@ -240,8 +197,8 @@
],
"output-key-mapping": [
{
- "resource-name": "vf_module_name",
- "resource-value": "${vf_module_name}"
+ "resource-name": "vf-module-name",
+ "resource-value": "${vf-module-name}"
}
]
}
@@ -258,21 +215,21 @@
},
{
"param-name": "prefix-id",
- "param-value": "${private-prefix-id}"
+ "param-value": "${management-prefix-id}"
},
{
- "param-name": "vf-module-id",
+ "param-name": "vf_module_id",
"param-value": "${vf-module-id}"
},
{
"param-name": "external_key",
- "param-value": "${vf-module-id}-vsn_private_ip_1"
+ "param-value": "${vf-module-id}-vsn_onap_private_ip_0"
}
],
"output-key-mapping": [
{
- "resource-name": "vsn_private_ip_1",
- "resource-value": "${vsn_private_ip_1}"
+ "resource-name": "vsn_onap_private_ip_0",
+ "resource-value": "${vsn_onap_private_ip_0}"
}
]
}
@@ -286,10 +243,6 @@
{
"param-name": "vf-module",
"param-value": "vf-module"
- },
- {
- "param-name": "vnfc",
- "param-value": "vnfc"
}
],
"output-key-mapping": [
@@ -300,35 +253,6 @@
]
}
]
- },
- {
- "capability-name": "unresolved-composite-data",
- "key-mapping": [
- {
- "output-key-mapping": [
- {
- "resource-name": "volume-group-name",
- "resource-value": "${volume_group_name}"
- },
- {
- "resource-name": "vf-module-name",
- "resource-value": "${vf_module_name}"
- },
- {
- "resource-name": "vnfc-name",
- "resource-value": "${vsn_name_0}"
- },
- {
- "resource-name": "ipv4-oam-address",
- "resource-value": "${vsn_private_ip_1}"
- },
- {
- "resource-name": "ipv4-oam-address-prefix",
- "resource-value": "${onap_private_net_cidr}"
- }
- ]
- }
- ]
}
]
} \ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vnf-name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vnf-name.json
index 72304692e..93f86129a 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vnf-name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vnf-name.json
@@ -1,56 +1,38 @@
{
- "tags": "vnf-name",
- "name": "vnf-name",
- "group":"default",
- "property": {
- "description": "vnf-name",
- "type": "string"
- },
- "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
- "sources": {
- "input": {
- "type": "source-input"
- },
- "default": {
- "type": "source-default",
- "properties": {}
- },
- "sdnc": {
- "type": "source-rest",
- "properties": {
- "type": "JSON",
- "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vnf-name",
- "path": "/param/0/value",
- "input-key-mapping": {
- "service-instance-id": "service-instance-id",
- "vnf-id": "vnf-id"
- },
- "output-key-mapping": {
- "vnf-name": "value"
- },
- "key-dependencies": [
- "service-instance-id",
- "vnf-id"
- ]
- }
- },
- "aai-data": {
- "type": "source-rest",
- "properties": {
- "type": "JSON",
- "verb": "GET",
- "url-path": "/aai/v14/network/generic-vnfs/generic-vnf/$vnf-id",
- "path": "",
- "input-key-mapping": {
- "vnf-id": "vnf-id"
- },
- "output-key-mapping": {
- "vnf-name": "vnf-name"
- },
- "key-dependencies": [
- "vnf-id"
- ]
- }
- }
- }
-}
+ "tags": "vnf-name",
+ "name": "vnf-name",
+ "property": {
+ "description": "vnf-name",
+ "type": "string"
+ },
+ "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+ "sources": {
+ "input": {
+ "type": "source-input"
+ },
+ "default": {
+ "type": "source-default",
+ "properties": {}
+ },
+ "sdnc": {
+ "type": "source-rest",
+ "properties": {
+ "verb": "GET",
+ "type": "JSON",
+ "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vnf-name",
+ "path": "/param/0/value",
+ "input-key-mapping": {
+ "service-instance-id": "service-instance-id",
+ "vnf-id": "vnf-id"
+ },
+ "output-key-mapping": {
+ "vnf-name": "value"
+ },
+ "key-dependencies": [
+ "service-instance-id",
+ "vnf-id"
+ ]
+ }
+ }
+ }
+} \ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_name_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_name_0.json
index cd6bb42e7..72a2db395 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_name_0.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_name_0.json
@@ -1,16 +1,38 @@
{
- "name" : "vpg_name_0",
- "tags" : "vpg_name_0",
- "group":"default",
- "updated-by" : "Singal, Kapil <ks220y@att.com>",
- "property" : {
- "description" : "vpg_name_0",
- "type" : "string"
- },
- "sources" : {
- "input" : {
- "type" : "source-input",
- "properties" : { }
- }
- }
+ "tags": "vpg_name_0",
+ "name": "vpg_name_0",
+ "property": {
+ "description": "vpg_name_0",
+ "type": "string"
+ },
+ "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+ "sources": {
+ "input": {
+ "type": "source-input"
+ },
+ "default": {
+ "type": "source-default",
+ "properties": {}
+ },
+ "sdnc": {
+ "type": "source-rest",
+ "properties": {
+ "verb": "GET",
+ "type": "JSON",
+ "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vpg_name_0",
+ "path": "/param/0/value",
+ "input-key-mapping": {
+ "service-instance-id": "service-instance-id",
+ "vnf-id": "vnf-id"
+ },
+ "output-key-mapping": {
+ "vpg_name_0": "value"
+ },
+ "key-dependencies": [
+ "service-instance-id",
+ "vnf-id"
+ ]
+ }
+ }
+ }
}