aboutsummaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
authorAlexis de Talhouët <adetalhouet89@gmail.com>2019-09-04 14:10:48 -0400
committerAlexis de Talhouët <adetalhouet89@gmail.com>2019-09-04 14:10:48 -0400
commit23edb472bde9cf4fc119bc538dc51f5e16c9865f (patch)
tree2470fcb75619bab9356059b4380431ceaa2081aa /components
parent1a7d92d35a4fdadd162b2eece4a75c04037b9c7e (diff)
Fix vFW CBA
Change-Id: I3e45644a216daba1317d1052a054c3cbbb3a20be Issue-ID: CCSDK-1689 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
Diffstat (limited to 'components')
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/data_types.json447
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/node_types.json35
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/resources_definition_types.json257
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/vFW_spinup.json122
4 files changed, 755 insertions, 106 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 8c304c40b..b7109251e 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,3 +1,448 @@
{
- "data_types" : { }
+ "data_types" : {
+ "dt-resource-assignment-properties" : {
+ "description" : "Dynamic DataType definition for workflow(resource-assignment).",
+ "version" : "1.0.0",
+ "properties" : {
+ "nf-role" : {
+ "description" : "",
+ "required" : true,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "default" : "vSN",
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "vm-type" : {
+ "description" : "",
+ "required" : false,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "vnf-id" : {
+ "description" : "",
+ "required" : true,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "public_net_id" : {
+ "description" : "",
+ "required" : true,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "value" : "public_net_id",
+ "default" : "public_net_id",
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "vnf_name" : {
+ "description" : "",
+ "required" : false,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "vfw_private_ip_1" : {
+ "description" : "",
+ "required" : false,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "unprotected-prefix-id" : {
+ "description" : "",
+ "required" : false,
+ "type" : "integer",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "onap_private_subnet_id" : {
+ "description" : "",
+ "required" : false,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "vfw_private_ip_0" : {
+ "description" : "",
+ "required" : false,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "aic-cloud-region" : {
+ "description" : "",
+ "required" : true,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "sec_group" : {
+ "description" : "",
+ "required" : true,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "default" : "onap_sg_PUhf",
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "vfw_private_ip_2" : {
+ "description" : "",
+ "required" : false,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "vnfc-model-invariant-uuid" : {
+ "description" : "",
+ "required" : true,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "nfc-naming-code" : {
+ "description" : "",
+ "required" : true,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "private-prefix-id" : {
+ "description" : "",
+ "required" : false,
+ "type" : "integer",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "vf-module-model-customization-uuid" : {
+ "description" : "",
+ "required" : true,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "vfw_name_0" : {
+ "description" : "",
+ "required" : false,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "vf_module_name" : {
+ "description" : "",
+ "required" : false,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "nexus_artifact_repo" : {
+ "description" : "",
+ "required" : true,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "value" : "nexus_artifact_repo",
+ "default" : "nexus_artifact_repo",
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "onap_private_net_cidr" : {
+ "description" : "",
+ "required" : true,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "image_name" : {
+ "description" : "",
+ "required" : false,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "vf-nf-code" : {
+ "description" : "",
+ "required" : true,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "vf-module-id" : {
+ "description" : "",
+ "required" : true,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "vf-module-label" : {
+ "description" : "",
+ "required" : true,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "vsn_private_ip_0" : {
+ "description" : "",
+ "required" : false,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "vpg_name_0" : {
+ "description" : "",
+ "required" : false,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "vpg_private_ip_1" : {
+ "description" : "",
+ "required" : false,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "protected_private_net_cidr" : {
+ "description" : "",
+ "required" : true,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "vf-naming-policy" : {
+ "description" : "",
+ "required" : true,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "default" : "SDNC_Policy.Config_MS_ONAP_VSN_NAMING_TIMESTAMP",
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "vpg_private_ip_0" : {
+ "description" : "",
+ "required" : false,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "vsn_private_ip_1" : {
+ "description" : "",
+ "required" : false,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "vfccustomizationuuid" : {
+ "description" : "",
+ "required" : true,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "unprotected_private_net_cidr" : {
+ "description" : "",
+ "required" : true,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "vsn_name_0" : {
+ "description" : "",
+ "required" : false,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "onap_private_net_id" : {
+ "description" : "",
+ "required" : false,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "vnfc-model-version" : {
+ "description" : "",
+ "required" : true,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "service-instance-id" : {
+ "description" : "",
+ "required" : true,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "vf-module-type" : {
+ "description" : "",
+ "required" : true,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "vnf-model-customization-uuid" : {
+ "description" : "",
+ "required" : true,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "pub_key" : {
+ "description" : "",
+ "required" : false,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "key_name" : {
+ "description" : "",
+ "required" : false,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "protected-prefix-id" : {
+ "description" : "",
+ "required" : false,
+ "type" : "integer",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
+ "vnf-name" : {
+ "description" : "",
+ "required" : true,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ }
+ },
+ "derived_from" : "tosca.datatypes.Dynamic"
+ }
+ }
} \ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/node_types.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/node_types.json
index 599e37704..e812db1cf 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/node_types.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/node_types.json
@@ -24,6 +24,12 @@
"required" : false,
"type" : "string"
},
+ "occurrence" : {
+ "description" : "Number of time to perform the resolution.",
+ "required" : false,
+ "type" : "integer",
+ "default" : 1
+ },
"store-result" : {
"description" : "Whether or not to store the output.",
"required" : false,
@@ -115,18 +121,6 @@
},
"derived_from" : "tosca.nodes.ResourceSource"
},
- "source-default" : {
- "description" : "This is Default Resource Source Node Type",
- "version" : "1.0.0",
- "properties" : { },
- "derived_from" : "tosca.nodes.ResourceSource"
- },
- "source-input" : {
- "description" : "This is Input Resource Source Node Type",
- "version" : "1.0.0",
- "properties" : { },
- "derived_from" : "tosca.nodes.ResourceSource"
- },
"source-db" : {
"description" : "This is Database Resource Source Node Type",
"version" : "1.0.0",
@@ -136,7 +130,8 @@
"type" : "string",
"constraints" : [ {
"valid_values" : [ "SQL", "PLSQL" ]
- } ]
+ } ],
+ "default" : "SQL"
},
"endpoint-selector" : {
"required" : false,
@@ -170,6 +165,18 @@
},
"derived_from" : "tosca.nodes.ResourceSource"
},
+ "source-default" : {
+ "description" : "This is Default Resource Source Node Type",
+ "version" : "1.0.0",
+ "properties" : { },
+ "derived_from" : "tosca.nodes.ResourceSource"
+ },
+ "source-input" : {
+ "description" : "This is Input Resource Source Node Type",
+ "version" : "1.0.0",
+ "properties" : { },
+ "derived_from" : "tosca.nodes.ResourceSource"
+ },
"source-rest" : {
"description" : "This is Rest Resource Source Node Type",
"version" : "1.0.0",
@@ -250,4 +257,4 @@
"derived_from" : "tosca.nodes.Root"
}
}
-}
+} \ No newline at end of file
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 1a62972ca..240624094 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
@@ -81,15 +81,30 @@
"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" : { }
},
- "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/nexus_artifact_repo",
+ "path" : "/param/0/value",
+ "input-key-mapping" : {
+ "service-instance-id" : "service-instance-id",
+ "vnf-id" : "vnf-id"
+ },
+ "output-key-mapping" : {
+ "nexus_artifact_repo" : "value"
+ },
+ "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+ }
}
}
},
@@ -129,11 +144,19 @@
"description" : "nfc-naming-code",
"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",
"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" : {
@@ -154,13 +177,38 @@
"description" : "onap_private_net_cidr",
"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" : {
+ "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",
+ "path" : "/param/0/value",
+ "input-key-mapping" : {
+ "service-instance-id" : "service-instance-id",
+ "vnf-id" : "vnf-id"
+ },
+ "output-key-mapping" : {
+ "onap_private_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 = \"private\"",
+ "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"
}
@@ -175,11 +223,15 @@
"description" : "onap_private_net_id",
"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" : {
@@ -205,11 +257,15 @@
"description" : "onap_private_subnet_id",
"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" : {
@@ -235,13 +291,22 @@
"description" : "private-prefix-id",
"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",
"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\"",
+ "input-key-mapping" : { },
"output-key-mapping" : {
"private-prefix-id" : "prefix_id"
}
@@ -298,11 +363,15 @@
"description" : "pub_key",
"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" : {
@@ -328,14 +397,30 @@
"description" : "public_net_id",
"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" : { }
},
- "input" : {
- "type" : "source-input"
+ "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/public_net_id",
+ "path" : "/param/0/value",
+ "input-key-mapping" : {
+ "service-instance-id" : "service-instance-id",
+ "vnf-id" : "vnf-id"
+ },
+ "output-key-mapping" : {
+ "public_net_id" : "value"
+ },
+ "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+ }
}
}
},
@@ -346,15 +431,30 @@
"description" : "sec_group",
"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" : { }
},
- "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/sec_group",
+ "path" : "/param/0/value",
+ "input-key-mapping" : {
+ "service-instance-id" : "service-instance-id",
+ "vnf-id" : "vnf-id"
+ },
+ "output-key-mapping" : {
+ "sec_group" : "value"
+ },
+ "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+ }
}
}
},
@@ -465,8 +565,15 @@
"description" : "vf-module-label",
"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",
"properties" : {
@@ -490,10 +597,13 @@
"description" : "vf-module-model-customization-uuid",
"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" : { }
}
}
@@ -593,17 +703,25 @@
}
},
"vfccustomizationuuid" : {
- "tags" : "vfccustomizationuuid, tosca.datatypes.Root, data_type",
+ "tags" : "vfccustomizationuuid",
"name" : "vfccustomizationuuid",
"property" : {
"description" : "vfccustomizationuuid",
"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",
"properties" : {
+ "endpoint-selector" : "dynamic-db-source",
"type" : "SQL",
"query" : "select sdnctl.VF_MODULE_TO_VFC_MAPPING.vfc_customization_uuid as vnf_customid from sdnctl.VF_MODULE_TO_VFC_MAPPING where vm_count = 1 and sdnctl.VF_MODULE_TO_VFC_MAPPING.vf_module_customization_uuid=:vfmodulecustomizationuuid",
"input-key-mapping" : {
@@ -717,11 +835,19 @@
"description" : "vm-type",
"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",
"properties" : {
+ "endpoint-selector" : "dynamic-db-source",
"type" : "SQL",
"query" : "select VFC_MODEL.vm_type as vm_type from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
"input-key-mapping" : {
@@ -742,11 +868,30 @@
"description" : "vnf-id",
"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" : {
+ "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-id",
+ "path" : "/param/0/value",
+ "input-key-mapping" : {
+ "service-instance-id" : "service-instance-id",
+ "vnf-id" : "vnf-id"
+ },
+ "output-key-mapping" : {
+ "vnf-id" : "value"
+ },
+ "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+ }
}
}
},
@@ -766,29 +911,51 @@
}
},
"vnf-name" : {
- "tags" : "vnf-name, tosca.datatypes.Root, data_type",
+ "tags" : "vnf-name",
"name" : "vnf-name",
"property" : {
"description" : "vnf-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" : {
"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" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-name/vnf-data/vnf-topology/vnf-parameters-data/param/vnf-name",
"path" : "/param/0/value",
- "expression-type" : "JSON_POINTER",
"input-key-mapping" : {
"service-instance-id" : "service-instance-id",
- "vnf-id" : "vnf-id"
+ "vnf-name" : "vnf-name"
},
"output-key-mapping" : {
"vnf-name" : "value"
},
- "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+ "key-dependencies" : [ "service-instance-id", "vnf-name" ]
+ }
+ },
+ "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" ]
}
}
}
@@ -832,14 +999,22 @@
"tags" : "vnfc-model-invariant-uuid",
"name" : "vnfc-model-invariant-uuid",
"property" : {
- "description" : "vnfc-model-invariant-uuid for SRIOV VPE template",
+ "description" : "vnfc-model-invariant-uuid",
"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",
"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" : {
@@ -857,14 +1032,22 @@
"tags" : "vnfc-model-version",
"name" : "vnfc-model-version",
"property" : {
- "description" : "vnfc-model-version for SRIOV VPE template",
+ "description" : "vnfc-model-version",
"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",
"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" : {
@@ -1001,4 +1184,4 @@
}
}
}
-}
+} \ No newline at end of file
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_spinup.json
index a4d90adfe..9ff4f3a1f 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_spinup.json
@@ -1,19 +1,31 @@
{
- "metadata": {
- "template_author": "Alexis de Talhouët",
- "author-email": "adetalhouet89@gmail.com",
- "user-groups": "ADMIN, OPERATION",
- "template_name": "vFW_spinup",
- "template_version": "1.0.0",
- "template_tags": "vFW"
+ "tosca_definitions_version" : "controller_blueprint_1_0_0",
+ "metadata" : {
+ "template_author" : "Alexis de Talhouët",
+ "author-email" : "adetalhouet89@gmail.com",
+ "user-groups" : "ADMIN, OPERATION",
+ "template_name" : "vFW_spinup",
+ "template_version" : "1.0.0",
+ "template_tags" : "vFW"
},
- "topology_template": {
- "workflows": {
- "resource-assignment": {
- "steps": {
- "resource-assignment": {
- "description": "Resource Assign Workflow",
- "target": "resource-assignment"
+ "imports" : [ {
+ "file" : "Definitions/data_types.json"
+ }, {
+ "file" : "Definitions/relationship_types.json"
+ }, {
+ "file" : "Definitions/artifact_types.json"
+ }, {
+ "file" : "Definitions/node_types.json"
+ }, {
+ "file" : "Definitions/policy_types.json"
+ } ],
+ "topology_template" : {
+ "workflows" : {
+ "resource-assignment" : {
+ "steps" : {
+ "resource-assignment" : {
+ "description" : "Resource Assign Workflow",
+ "target" : "resource-assignment"
}
},
"inputs" : {
@@ -23,22 +35,24 @@
"entry_schema" : {
"type" : "string"
}
+ },
+ "resource-assignment-properties" : {
+ "description" : "Dynamic PropertyDefinition for workflow(resource-assignment).",
+ "required" : true,
+ "type" : "dt-resource-assignment-properties"
}
},
- "outputs": {
- "meshed-template": {
- "type": "json",
- "value": {
- "get_attribute": [
- "resource-assignment",
- "assignment-params"
- ]
+ "outputs" : {
+ "meshed-template" : {
+ "type" : "json",
+ "value" : {
+ "get_attribute" : [ "resource-assignment", "assignment-params" ]
}
}
}
}
},
- "node_templates": {
+ "node_templates" : {
"resource-assignment" : {
"type" : "component-resource-resolution",
"interfaces" : {
@@ -54,46 +68,46 @@
}
}
},
- "artifacts": {
- "base-template": {
- "type": "artifact-template-velocity",
- "file": "Templates/base-template.vtl"
+ "artifacts" : {
+ "base-template" : {
+ "type" : "artifact-template-velocity",
+ "file" : "Templates/base-template.vtl"
},
- "base-mapping": {
- "type": "artifact-mapping-resource",
- "file": "Templates/base-mapping.json"
+ "base-mapping" : {
+ "type" : "artifact-mapping-resource",
+ "file" : "Templates/base-mapping.json"
},
- "vfw-template": {
- "type": "artifact-template-velocity",
- "file": "Templates/vfw-template.vtl"
+ "vfw-template" : {
+ "type" : "artifact-template-velocity",
+ "file" : "Templates/vfw-template.vtl"
},
- "vfw-mapping": {
- "type": "artifact-mapping-resource",
- "file": "Templates/vfw-mapping.json"
+ "vfw-mapping" : {
+ "type" : "artifact-mapping-resource",
+ "file" : "Templates/vfw-mapping.json"
},
- "vfw-vnf-template": {
- "type": "artifact-template-velocity",
- "file": "Templates/vfw-vnf-template.vtl"
+ "vfw-vnf-template" : {
+ "type" : "artifact-template-velocity",
+ "file" : "Templates/vfw-vnf-template.vtl"
},
- "vfw-vnf-mapping": {
- "type": "artifact-mapping-resource",
- "file": "Templates/vfw-vnf-mapping.json"
+ "vfw-vnf-mapping" : {
+ "type" : "artifact-mapping-resource",
+ "file" : "Templates/vfw-vnf-mapping.json"
},
- "vpg-template": {
- "type": "artifact-template-velocity",
- "file": "Templates/vpg-template.vtl"
+ "vpg-template" : {
+ "type" : "artifact-template-velocity",
+ "file" : "Templates/vpg-template.vtl"
},
- "vpg-mapping": {
- "type": "artifact-mapping-resource",
- "file": "Templates/vpg-mapping.json"
+ "vpg-mapping" : {
+ "type" : "artifact-mapping-resource",
+ "file" : "Templates/vpg-mapping.json"
},
- "vsn-template": {
- "type": "artifact-template-velocity",
- "file": "Templates/vsn-template.vtl"
+ "vsn-template" : {
+ "type" : "artifact-template-velocity",
+ "file" : "Templates/vsn-template.vtl"
},
- "vsn-mapping": {
- "type": "artifact-mapping-resource",
- "file": "Templates/vsn-mapping.json"
+ "vsn-mapping" : {
+ "type" : "artifact-mapping-resource",
+ "file" : "Templates/vsn-mapping.json"
}
}
}