From 8360dc945da365c1c33dea2f4e796c51830dd1e6 Mon Sep 17 00:00:00 2001 From: hanybaki Date: Wed, 16 Oct 2019 13:20:27 +0200 Subject: Modified vf-module-name Issue-ID: CCSDK-1816 Signed-off-by: hanybaki Change-Id: Iee947751589ef640a8c519d5ffabe424835bac93 Signed-off-by: Shaaban Ebrahim Signed-off-by: root Signed-off-by: Abdelmuhaimen Seaudi --- .../service-blueprint/vLB/Definitions/data_types.json | 2 +- .../vLB/Definitions/resources_definition_types.json | 12 ++++++------ .../vLB/Scripts/python/ConfigDeploy.py | 8 ++++---- .../vLB/Templates/baseconfig-template.vtl | 18 +++++++++--------- .../vLB/Templates/incremental-config-template.vtl | 18 +++++++++--------- 5 files changed, 29 insertions(+), 29 deletions(-) (limited to 'components/model-catalog/blueprint-model/service-blueprint/vLB') diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/data_types.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/data_types.json index b3d719faa..71e5fa63d 100644 --- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/data_types.json +++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/data_types.json @@ -773,4 +773,4 @@ "derived_from" : "tosca.datatypes.Dynamic" } } -} \ No newline at end of file +} diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/resources_definition_types.json index f7da40904..7172e3a05 100644 --- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/resources_definition_types.json +++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/resources_definition_types.json @@ -63,7 +63,7 @@ "properties" : { "type" : "JSON", "verb" : "PUT", - "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$vnf-id/service-data/vnfs/vnf/$service-instance-id/vnf-data/vnf-topology/vnf-parameters-data/param/vdns_vf_module_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/vdns_vf_module_id", "path" : "", "payload" : "{\n\"GENERIC-RESOURCE-API:param\": [\n{\n\"GENERIC-RESOURCE-API:name\": \"vdns_vf_module_id\",\n\"GENERIC-RESOURCE-API:value\": \"$vf-module-id\"\n}\n]\n}", "input-key-mapping" : { @@ -1263,7 +1263,7 @@ "properties" : { "verb" : "GET", "type" : "JSON", - "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$vnf-id/service-data/vnfs/vnf/$service-instance-id/vnf-data/vnf-topology/vnf-parameters-data/param/vdns_vf_module_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/vdns_vf_module_id", "path" : "/param/0/value", "input-key-mapping" : { "service-instance-id" : "service-instance-id", @@ -1439,11 +1439,11 @@ } } }, - "vf-module-name" : { - "tags" : "vf-module-name", - "name" : "vf-module-name", + "vf_module_name" : { + "tags" : "vf_module_name", + "name" : "vf_module_name", "property" : { - "description" : "vf-module-name", + "description" : "vf_module_name", "type" : "string" }, "updated-by" : "Singal, Kapil ", diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/python/ConfigDeploy.py b/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/python/ConfigDeploy.py index 34fd1404d..388c63ffb 100644 --- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/python/ConfigDeploy.py +++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/python/ConfigDeploy.py @@ -40,11 +40,11 @@ class ConfigDeploy(NetconfComponentFunction): #if not response.isSuccess(): # og.error(response.errorMessage) nc.discard_change() - nc.edit_config(message_content=payloadInterface, edit_default_peration="none") - nc.edit_config(message_content=payloadHostname, edit_default_peration="none") - nc.validate() + nc.edit_config(message_content=payloadInterface, edit_default_peration="merge") + nc.edit_config(message_content=payloadHostname, edit_default_peration="merge") + #nc.validate() nc.commit() - #nc.commit(confirmed = True, confirm_timeout=15) + nc.get_config() #nc.commit(confirmed = True, confirm_timeout=15) nc.unlock() nc.disconnect() diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/baseconfig-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/baseconfig-template.vtl index 9e73a318e..10e448466 100644 --- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/baseconfig-template.vtl +++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/baseconfig-template.vtl @@ -1,9 +1,9 @@ - { - "vdns-instance": [ - { - "ip-addr": "$vdns_int_private_ip_0", - "oam-ip-addr": "$vdns_onap_private_ip_0", - "enabled": false - } - ] -} \ No newline at end of file + + + +$vdns_int_private_ip_0 +$vdns_onap_private_ip_0 +false + + + diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/incremental-config-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/incremental-config-template.vtl index 7ec446f30..d33625739 100644 --- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/incremental-config-template.vtl +++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/incremental-config-template.vtl @@ -1,9 +1,9 @@ -{ - "vdns-instance": [ - { - "ip-addr": "$vdns_int_private_ip_0", - "oam-ip-addr": "$vdns_onap_private_ip_0", - "enabled": true - } - ] -} \ No newline at end of file + + + +$vdns_int_private_ip_0 +$vdns_onap_private_ip_0 +true + + + -- cgit 1.2.3-korg