diff options
Diffstat (limited to 'heat/vFW_CNF_CDS/templates/cba/Definitions')
4 files changed, 218 insertions, 121 deletions
diff --git a/heat/vFW_CNF_CDS/templates/cba/Definitions/data_types.json b/heat/vFW_CNF_CDS/templates/cba/Definitions/data_types.json index 60b89b7e..94b09434 100644 --- a/heat/vFW_CNF_CDS/templates/cba/Definitions/data_types.json +++ b/heat/vFW_CNF_CDS/templates/cba/Definitions/data_types.json @@ -125,7 +125,7 @@ "int_private1_gw_ip" : { "description" : "Private unprotected network gateway ip", "type" : "string", - "default" : "192.168.10.1/24" + "default" : "${int_private1_gw_ip}" }, "sec_group" : { "description" : "", @@ -194,7 +194,7 @@ "type" : "string", "status" : "", "constraints" : [ { } ], - "default" : "vpg_onap_private_ip_0", + "default" : "${vpg_onap_private_ip_0}", "entry_schema" : { "type" : "" } @@ -230,6 +230,9 @@ "type" : "" } }, + "vf-module-model-invariant-uuid" : { + "type" : "string" + }, "vpg_name_0" : { "description" : "", "required" : false, @@ -276,21 +279,13 @@ "type" : "" } }, + "vf-module-model-version" : { + "type" : "string" + }, "k8s-rb-profile-name" : { "description" : "Profile name used in multicloud/k8s plugin to identify Helm chart(s) where this mapping is providing override values.", "type" : "string" }, - "k8s-rb-profile-namespace" : { - "description" : "", - "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "default": "default", - "entry_schema" : { - "type" : "" - } - }, "vsn_name_0" : { "description" : "", "required" : false, @@ -388,6 +383,11 @@ "description" : "Private protected network identification", "type" : "string" }, + "k8s-rb-profile-namespace" : { + "description" : "K8s namespace to create helm chart for specified profile", + "type" : "string", + "default" : "default" + }, "int_private1_subnet_id" : { "description" : "Private unprotected subnetwork identification", "type" : "string", @@ -480,7 +480,7 @@ "onap_private_gw_ip" : { "description" : "Private onap management network gateway ip", "type" : "string", - "default" : "10.10.0.1/16" + "default" : "${onap_private_gw_ip}" }, "dcae_collector_port" : { "description" : "", @@ -645,4 +645,4 @@ "derived_from" : "tosca.datatypes.Dynamic" } } -}
\ No newline at end of file +} diff --git a/heat/vFW_CNF_CDS/templates/cba/Definitions/node_types.json b/heat/vFW_CNF_CDS/templates/cba/Definitions/node_types.json index 12eb1bc3..b78a3114 100644 --- a/heat/vFW_CNF_CDS/templates/cba/Definitions/node_types.json +++ b/heat/vFW_CNF_CDS/templates/cba/Definitions/node_types.json @@ -85,6 +85,63 @@ }, "derived_from" : "tosca.nodes.Component" }, + "component-script-executor" : { + "description" : "This is CLI Transaction Configuration Component API", + "version" : "1.0.0", + "attributes" : { + "response-data" : { + "required" : false, + "type" : "json" + } + }, + "capabilities" : { + "component-node" : { + "type" : "tosca.capabilities.Node" + } + }, + "interfaces" : { + "ComponentScriptExecutor" : { + "operations" : { + "process" : { + "inputs" : { + "script-type" : { + "description" : "Script type, kotlin type is supported", + "required" : true, + "type" : "string", + "constraints" : [ { + "valid_values" : [ "kotlin", "jython", "internal" ] + } ], + "default" : "internal" + }, + "script-class-reference" : { + "description" : "Kotlin Script class name or jython script name.", + "required" : true, + "type" : "string" + }, + "dynamic-properties" : { + "description" : "Dynamic Json Content or DSL Json reference.", + "required" : false, + "type" : "json" + } + }, + "outputs" : { + "response-data" : { + "description" : "Execution Response Data.", + "required" : false, + "type" : "string" + }, + "status" : { + "description" : "Status of the Component Execution ( success or failure )", + "required" : true, + "type" : "string" + } + } + } + } + } + }, + "derived_from" : "tosca.nodes.Component" + }, "source-capability" : { "description" : "This is Component Resource Source Node Type", "version" : "1.0.0", @@ -262,69 +319,6 @@ "description" : "TOSCA base type for Resource Sources", "version" : "1.0.0", "derived_from" : "tosca.nodes.Root" - }, - "component-script-executor":{ - "description": "This is CLI Transaction Configuration Component API", - "version": "1.0.0", - "attributes": { - "response-data": { - "required": false, - "type": "json" - } - }, - "capabilities": { - "component-node": { - "type": "tosca.capabilities.Node" - } - }, - "interfaces": { - "ComponentScriptExecutor": { - "operations": { - "process": { - "inputs": { - "script-type": { - "description": "Script type, kotlin type is supported", - "required": true, - "type": "string", - "default": "internal", - "constraints": [ - { - "valid_values": [ - "kotlin", - "jython", - "internal" - ] - } - ] - }, - "script-class-reference": { - "description": "Kotlin Script class name or jython script name.", - "required": true, - "type": "string" - }, - "dynamic-properties": { - "description": "Dynamic Json Content or DSL Json reference.", - "required": false, - "type": "json" - } - }, - "outputs": { - "response-data": { - "description": "Execution Response Data.", - "required": false, - "type": "string" - }, - "status": { - "description": "Status of the Component Execution ( success or failure )", - "required": true, - "type": "string" - } - } - } - } - } - }, - "derived_from": "tosca.nodes.Component" } } }
\ No newline at end of file diff --git a/heat/vFW_CNF_CDS/templates/cba/Definitions/resources_definition_types.json b/heat/vFW_CNF_CDS/templates/cba/Definitions/resources_definition_types.json index f1c3c803..89342dbf 100644 --- a/heat/vFW_CNF_CDS/templates/cba/Definitions/resources_definition_types.json +++ b/heat/vFW_CNF_CDS/templates/cba/Definitions/resources_definition_types.json @@ -6,6 +6,7 @@ "description" : "active-streams", "type" : "string" }, + "group" : "default", "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { @@ -24,6 +25,7 @@ "description" : "aic-cloud-region", "type" : "string" }, + "group" : "default", "updated-by" : "Singal, Kapil <ks220y@att.com>", "sources" : { "input" : { @@ -39,6 +41,7 @@ "description" : "cloud_env", "type" : "string" }, + "group" : "default", "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { @@ -74,6 +77,7 @@ "description" : "dcae_collector_ip", "type" : "string" }, + "group" : "default", "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { @@ -109,6 +113,7 @@ "description" : "dcae_collector_port", "type" : "string" }, + "group" : "default", "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { @@ -144,6 +149,7 @@ "description" : "demo_artifacts_version", "type" : "string" }, + "group" : "default", "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { @@ -179,6 +185,7 @@ "description" : "flavor_name", "type" : "string" }, + "group" : "default", "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { @@ -214,6 +221,7 @@ "description" : "image_name", "type" : "string" }, + "group" : "default", "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { @@ -249,6 +257,7 @@ "description" : "install_script_version", "type" : "string" }, + "group" : "default", "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { @@ -284,6 +293,7 @@ "description" : "Private unprotected network gateway ip address", "type" : "string" }, + "group" : "default", "updated-by" : "Samuli, Silvius <s.silvius@partner.samsung.com>", "sources" : { "input" : { @@ -319,6 +329,7 @@ "description" : "int_private1_net_cidr", "type" : "string" }, + "group" : "default", "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { @@ -348,8 +359,8 @@ "processor-db" : { "type" : "source-db", "properties" : { - "endpoint-selector" : "dynamic-db-source", "type" : "SQL", + "endpoint-selector" : "dynamic-db-source", "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private1\"", "input-key-mapping" : { }, "output-key-mapping" : { @@ -366,6 +377,7 @@ "description" : "Private network identification", "type" : "string" }, + "group" : "default", "updated-by" : "Samuli, Silvius <s.silvius@partner.samsung.com>", "sources" : { "input" : { @@ -401,6 +413,7 @@ "description" : "Private unprotected subnetwork identification", "type" : "string" }, + "group" : "default", "updated-by" : "Samuli, Silvius <s.silvius@partner.samsung.com>", "sources" : { "input" : { @@ -436,6 +449,7 @@ "description" : "Private protected network gateway ip address", "type" : "string" }, + "group" : "default", "updated-by" : "Samuli, Silvius <s.silvius@partner.samsung.com>", "sources" : { "input" : { @@ -471,6 +485,7 @@ "description" : "int_private2_net_cidr", "type" : "string" }, + "group" : "default", "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { @@ -483,8 +498,8 @@ "processor-db" : { "type" : "source-db", "properties" : { - "endpoint-selector" : "dynamic-db-source", "type" : "SQL", + "endpoint-selector" : "dynamic-db-source", "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private2\"", "output-key-mapping" : { "int_private2_net_cidr" : "prefix" @@ -518,6 +533,7 @@ "description" : "Private protected network identification", "type" : "string" }, + "group" : "default", "updated-by" : "Samuli, Silvius <s.silvius@partner.samsung.com>", "sources" : { "input" : { @@ -553,6 +569,7 @@ "description" : "Private protected subnetwork identification", "type" : "string" }, + "group" : "default", "updated-by" : "Samuli, Silvius <s.silvius@partner.samsung.com>", "sources" : { "input" : { @@ -588,6 +605,7 @@ "description" : "Profile name used in multicloud/k8s plugin to identify Helm chart(s) where this mapping is providing override values.", "type" : "string" }, + "group" : "default", "updated-by" : "Samuli, Silvius <s.silvius@partner.samsung.com>", "sources" : { "input" : { @@ -620,10 +638,11 @@ "tags" : "k8s-rb-profile-namespace", "name" : "k8s-rb-profile-namespace", "property" : { - "description" : "k8s-rb-profile-namespace", + "description" : "Profile name used in multicloud/k8s plugin", "type" : "string" }, - "updated-by" : "Rajewski, Lukasz <lukasz.rajewski@orange.com>", + "group" : "default", + "updated-by" : "Samuli, Silvius <s.silvius@partner.samsung.com>", "sources" : { "input" : { "type" : "source-input" @@ -658,6 +677,7 @@ "description" : "key_name", "type" : "string" }, + "group" : "default", "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { @@ -693,6 +713,7 @@ "description" : "management-prefix-id", "type" : "string" }, + "group" : "default", "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { @@ -722,8 +743,8 @@ "processor-db" : { "type" : "source-db", "properties" : { - "endpoint-selector" : "dynamic-db-source", "type" : "SQL", + "endpoint-selector" : "dynamic-db-source", "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"management\"", "input-key-mapping" : { }, "output-key-mapping" : { @@ -740,6 +761,7 @@ "description" : "nexus_artifact_repo", "type" : "string" }, + "group" : "default", "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { @@ -775,6 +797,7 @@ "description" : "nfc-naming-code", "type" : "string" }, + "group" : "default", "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { @@ -808,6 +831,7 @@ "description" : "Private onap management network gateway ip address", "type" : "string" }, + "group" : "default", "updated-by" : "Samuli, Silvius <s.silvius@partner.samsung.com>", "sources" : { "input" : { @@ -843,6 +867,7 @@ "description" : "onap_private_net_cidr", "type" : "string" }, + "group" : "default", "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { @@ -855,8 +880,8 @@ "processor-db" : { "type" : "source-db", "properties" : { - "endpoint-selector" : "dynamic-db-source", "type" : "SQL", + "endpoint-selector" : "dynamic-db-source", "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"management\"", "input-key-mapping" : { }, "output-key-mapping" : { @@ -890,6 +915,7 @@ "description" : "onap_private_net_id", "type" : "string" }, + "group" : "default", "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { @@ -925,6 +951,7 @@ "description" : "onap_private_subnet_id", "type" : "string" }, + "group" : "default", "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { @@ -960,6 +987,7 @@ "description" : "private1-prefix-id", "type" : "string" }, + "group" : "default", "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { @@ -989,8 +1017,8 @@ "processor-db" : { "type" : "source-db", "properties" : { - "endpoint-selector" : "dynamic-db-source", "type" : "SQL", + "endpoint-selector" : "dynamic-db-source", "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"private1\"", "input-key-mapping" : { }, "output-key-mapping" : { @@ -1007,6 +1035,7 @@ "description" : "private2-prefix-id", "type" : "string" }, + "group" : "default", "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { @@ -1036,8 +1065,8 @@ "processor-db" : { "type" : "source-db", "properties" : { - "endpoint-selector" : "dynamic-db-source", "type" : "SQL", + "endpoint-selector" : "dynamic-db-source", "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"private2\"", "input-key-mapping" : { }, "output-key-mapping" : { @@ -1054,6 +1083,7 @@ "description" : "pub_key", "type" : "string" }, + "group" : "default", "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { @@ -1089,6 +1119,7 @@ "description" : "public_net_id", "type" : "string" }, + "group" : "default", "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { @@ -1124,6 +1155,7 @@ "description" : "put-active-streams", "type" : "string" }, + "group" : "default", "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { @@ -1159,6 +1191,7 @@ "description" : "sec_group", "type" : "string" }, + "group" : "default", "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { @@ -1194,6 +1227,7 @@ "description" : "To be provided", "type" : "string" }, + "group" : "default", "updated-by" : "Singal, Kapil <ks220y@att.com>", "sources" : { "input" : { @@ -1203,7 +1237,7 @@ "any-db" : { "type" : "source-db", "properties" : { - "query" : "SELECT artifact_name FROM BLUEPRINT_MODEL where artifact_version=\"1.0.0\"", + "query" : "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"", "input-key-mapping" : { }, "output-key-mapping" : { "service-instance-id" : "artifact_name" @@ -1213,7 +1247,7 @@ "processor-db" : { "type" : "source-db", "properties" : { - "query" : "SELECT artifact_name FROM BLUEPRINT_MODEL where artifact_version=\"1.0.0\"", + "query" : "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"", "input-key-mapping" : { }, "output-key-mapping" : { "service-instance-id" : "artifact_name" @@ -1227,6 +1261,22 @@ "script-class-reference" : "SampleRAProcessor", "instance-dependencies" : [ ] } + }, + "sdnc" : { + "type" : "source-rest", + "properties" : { + "verb" : "GET", + "type" : "JSON", + "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id", + "path" : "/service/0/service-instance-id", + "input-key-mapping" : { + "service-instance-id" : "service-instance.service-instance-id" + }, + "output-key-mapping" : { + "service-instance-id" : "service-instance-id" + }, + "key-dependencies" : [ "service-instance.service-instance-id" ] + } } } }, @@ -1237,11 +1287,30 @@ "description" : "vf-module-id", "type" : "string" }, + "group" : "default", "updated-by" : "Singal, Kapil <ks220y@att.com>", "sources" : { "input" : { "type" : "source-input", "properties" : { } + }, + "sdnc" : { + "type" : "source-rest", + "properties" : { + "verb" : "GET", + "type" : "JSON", + "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vf-modules/vf-module/$vf-module-id", + "path" : "/vf-module/0/vf-module-id", + "input-key-mapping" : { + "service-instance-id" : "service-instance-id", + "vnf-id" : "vnf-id", + "vf-module-id" : "vf-module.vf-module-id" + }, + "output-key-mapping" : { + "vf-module-id" : "vf-module-id" + }, + "key-dependencies" : [ "service-instance-id", "vnf-id", "vf-module.vf-module-id" ] + } } } }, @@ -1252,6 +1321,7 @@ "description" : "vf-module-label", "type" : "string" }, + "group" : "default", "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { @@ -1285,6 +1355,7 @@ "description" : "vf-module-model-customization-uuid", "type" : "string" }, + "group" : "default", "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { @@ -1303,11 +1374,16 @@ "description" : "vf module model invariant uuid", "type" : "string" }, + "group" : "default", "updated-by" : "Samuli, Silvius <s.silvius@partner.samsung.com>", "sources" : { "input" : { "type" : "source-input" }, + "default" : { + "type" : "source-default", + "properties" : { } + }, "processor-db" : { "type" : "source-db", "properties" : { @@ -1329,14 +1405,19 @@ "tags" : "vnf, vf-module", "name" : "vf-module-model-version", "property" : { - "description" : "vf module model version", + "description" : "vf module model model version", "type" : "string" }, + "group" : "default", "updated-by" : "Samuli, Silvius <s.silvius@partner.samsung.com>", "sources" : { "input" : { "type" : "source-input" }, + "default" : { + "type" : "source-default", + "properties" : { } + }, "processor-db" : { "type" : "source-db", "properties" : { @@ -1358,9 +1439,10 @@ "tags" : "vf-module-name", "name" : "vf-module-name", "property" : { - "description" : "vf-module-name", + "description" : "vf_module_name", "type" : "string" }, + "group" : "default", "updated-by" : "Singal, Kapil <ks220y@att.com>", "sources" : { "input" : { @@ -1379,6 +1461,7 @@ "description" : "vf-module-type", "type" : "string" }, + "group" : "default", "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { @@ -1392,15 +1475,15 @@ "type" : "source-db", "properties" : { "type" : "SQL", - "query" : "select vf_module_type as vf_module_type from sdnctl.VF_MODULE_MODEL where customization_uuid=:customizationid", + "query" : "select sdnctl.VF_MODULE_MODEL.vf_module_type as vf_module_type from sdnctl.VF_MODULE_MODEL where sdnctl.VF_MODULE_MODEL.customization_uuid=:customizationid", "output-key-mapping" : { "vf-module-type" : "vf_module_type" }, - "endpoint-selector" : "dynamic-db-source", "input-key-mapping" : { "customizationid" : "vf-module-model-customization-uuid" }, - "key-dependencies" : [ "vf-module-model-customization-uuid" ] + "key-dependencies" : [ "vf-module-model-customization-uuid" ], + "endpoint-selector" : "dynamic-db-source" } } } @@ -1412,6 +1495,7 @@ "description" : "vf-naming-policy", "type" : "string" }, + "group" : "default", "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "default" : { @@ -1438,7 +1522,6 @@ "processor-db" : { "type" : "source-db", "properties" : { - "endpoint-selector" : "dynamic-db-source", "type" : "SQL", "query" : "select sdnctl.VF_MODEL.naming_policy as vf_naming_policy from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:vnf_model_customization_uuid", "input-key-mapping" : { @@ -1459,6 +1542,7 @@ "description" : "vfccustomizationuuid", "type" : "string" }, + "group" : "default", "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { @@ -1471,7 +1555,6 @@ "processor-db" : { "type" : "source-db", "properties" : { - "endpoint-selector" : "dynamic-db-source", "type" : "SQL", "query" : "select sdnctl.VF_MODULE_TO_VFC_MAPPING.vfc_customization_uuid as vnf_customid from sdnctl.VF_MODULE_TO_VFC_MAPPING where vm_count = 1 and sdnctl.VF_MODULE_TO_VFC_MAPPING.vf_module_customization_uuid=:vfmodulecustomizationuuid", "input-key-mapping" : { @@ -1480,7 +1563,8 @@ "output-key-mapping" : { "vfccustomizationuuid" : "vnf_customid" }, - "key-dependencies" : [ "vf-module-model-customization-uuid" ] + "key-dependencies" : [ "vf-module-model-customization-uuid" ], + "endpoint-selector" : "dynamic-db-source" } } } @@ -1492,6 +1576,7 @@ "description" : "vfw_int_private1_ip_0", "type" : "string" }, + "group" : "default", "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { @@ -1527,6 +1612,7 @@ "description" : "vfw_int_private2_floating_ip", "type" : "string" }, + "group" : "default", "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { @@ -1562,6 +1648,7 @@ "description" : "vfw_int_private2_ip_0", "type" : "string" }, + "group" : "default", "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { @@ -1597,6 +1684,7 @@ "description" : "vfw_name_0", "type" : "string" }, + "group" : "default", "updated-by" : "Singal, Kapil <ks220y@att.com>", "sources" : { "input" : { @@ -1632,6 +1720,7 @@ "description" : "vfw_onap_private_ip_0", "type" : "string" }, + "group" : "default", "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { @@ -1667,6 +1756,7 @@ "description" : "vnf-id", "type" : "string" }, + "group" : "default", "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { @@ -1675,6 +1765,23 @@ "default" : { "type" : "source-default", "properties" : { } + }, + "sdnc" : { + "type" : "source-rest", + "properties" : { + "verb" : "GET", + "type" : "JSON", + "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/", + "path" : "/vnf/0/vnf-id", + "input-key-mapping" : { + "service-instance-id" : "service-instance-id", + "vnf-id" : "generic-vnf.vnf-id" + }, + "output-key-mapping" : { + "vnf-id" : "vnf-id" + }, + "key-dependencies" : [ "service-instance-id", "generic-vnf.vnf-id" ] + } } } }, @@ -1685,6 +1792,7 @@ "description" : "vnf-model-customization-uuid", "type" : "string" }, + "group" : "default", "updated-by" : "Singal, Kapil <ks220y@att.com>", "sources" : { "input" : { @@ -1700,6 +1808,7 @@ "description" : "vnf_name", "type" : "string" }, + "group" : "default", "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { @@ -1735,6 +1844,7 @@ "description" : "vnfc-model-invariant-uuid", "type" : "string" }, + "group" : "default", "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { @@ -1752,7 +1862,6 @@ "output-key-mapping" : { "vnfc-model-invariant-uuid" : "vfc_invariant_uuid" }, - "endpoint-selector" : "dynamic-db-source", "input-key-mapping" : { "vfccustomizationuuid" : "vfccustomizationuuid" }, @@ -1768,6 +1877,7 @@ "description" : "vnfc-model-version", "type" : "string" }, + "group" : "default", "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { @@ -1780,7 +1890,6 @@ "processor-db" : { "type" : "source-db", "properties" : { - "endpoint-selector" : "dynamic-db-source", "type" : "SQL", "query" : "select VFC_MODEL.version as vnfc_model_version from VFC_MODEL where customization_uuid=:vfccustomizationuuid", "input-key-mapping" : { @@ -1801,6 +1910,7 @@ "description" : "vpg_int_private1_ip_0", "type" : "string" }, + "group" : "default", "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { @@ -1836,6 +1946,7 @@ "description" : "vpg_name_0", "type" : "string" }, + "group" : "default", "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { @@ -1871,6 +1982,7 @@ "description" : "vpg_onap_private_ip_0", "type" : "string" }, + "group" : "default", "updated-by" : "Singal, Kapil <ks220y@att.com>", "sources" : { "input" : { @@ -1906,6 +2018,7 @@ "description" : "vsn_int_private2_ip_0", "type" : "string" }, + "group" : "default", "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { @@ -1941,6 +2054,7 @@ "description" : "vsn_name_0", "type" : "string" }, + "group" : "default", "updated-by" : "Singal, Kapil <ks220y@att.com>", "sources" : { "input" : { @@ -1976,6 +2090,7 @@ "description" : "vsn_onap_private_ip_0", "type" : "string" }, + "group" : "default", "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { diff --git a/heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json b/heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json index f4c38ba7..0040e288 100644 --- a/heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json +++ b/heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json @@ -5,7 +5,7 @@ "author-email" : "abdelmuhaimen.seaudi@orange.com", "user-groups" : "ADMIN, OPERATION", "template_name" : "vFW_CNF_CDS", - "template_version" : "1.0.0", + "template_version" : "1.0.13", "template_tags" : "Samuli Silvius, vFW_CNF_CDS", "template_type" : "DEFAULT" }, @@ -21,11 +21,6 @@ "file" : "Definitions/policy_types.json" } ], "dsl_definitions" : { - "ipam-1" : { - "type" : "token-auth", - "url" : "http://netbox-nginx:8080", - "token" : "Token 0123456789abcdef0123456789abcdef01234567" - }, "vpkg-rest-api" : { "type" : "basic-auth", "url" : "http://", @@ -39,10 +34,10 @@ "url" : "http://multicloud-k8s:9015" }, "profile-upload-properties" : { - "assignment-params": { + "assignment-params" : { "get_attribute" : [ "resource-assignment", "assignment-params" ] }, - "api-access": "*multicloud-k8s-api" + "api-access" : "*multicloud-k8s-api" }, "config-deploy-properties" : { "resolution-key" : { @@ -63,23 +58,17 @@ "resource-assignment" : { "description" : "Resource Assign Workflow", "target" : "resource-assignment", - "activities": [ - { - "call_operation": "ResourceResolutionComponent.process" - } - ], - "on_success": [ - "profile-upload" - ] + "activities" : [ { + "call_operation" : "ResourceResolutionComponent.process" + } ], + "on_success" : [ "profile-upload" ] }, "profile-upload" : { "description" : "Upload K8s Profile", "target" : "profile-upload", - "activities": [ - { - "call_operation": "ComponentScriptExecutor.process" - } - ] + "activities" : [ { + "call_operation" : "ComponentScriptExecutor.process" + } ] } }, "inputs" : { @@ -204,7 +193,6 @@ "inputs" : { "script-type" : "kotlin", "script-class-reference" : "org.onap.ccsdk.cds.blueprintsprocessor.services.execution.scripts.K8sProfileUpload", - "instance-dependencies" : [ ], "dynamic-properties" : "*profile-upload-properties" } } @@ -238,4 +226,4 @@ } } } -}
\ No newline at end of file +} |