aboutsummaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
authorAbdelmuhaimen Seaudi <abdelmuhaimen.seaudi@orange.com>2019-10-08 14:41:50 +0000
committerAbdelmuhaimen Seaudi <abdelmuhaimen.seaudi@orange.com>2019-10-08 19:55:52 +0000
commitc4fb5230962566bb8e321d1129cee384f70d84e8 (patch)
tree740eb7fb8b2f93de6336697eeb406d0953c34647 /components
parent809993fe658026f4cb953e49ab0331e2d4e5c8f8 (diff)
update vLB CDS CBA
Issue-ID: CCSDK-1816 Signed-off-by: Abdelmuhaimen Seaudi <abdelmuhaimen.seaudi@orange.com> Change-Id: I1b399aae8abca6a2f5d175560053fa0c7b646896
Diffstat (limited to 'components')
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/data_types.json20
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/node_types.json38
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/resources_definition_types.json188
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/vLB_CDS.json (renamed from components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/vDNS-CDS.json)10
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vLB/Plans/CONFIG_ConfigDeploy.xml52
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/python/ConfigDeploy.py106
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vLB/TOSCA-Metadata/TOSCA.meta2
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/base_template-mapping.json8
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/base_template-template.vtl10
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/baseconfig-mapping.json2
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/incremental-config-mapping.json2
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/nf-params-mapping.json2
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-mapping.json17
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-template.vtl10
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vlb-mapping.json22
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vlb-template.vtl10
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vnf-mapping.json (renamed from components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-vnf-mapping.json)20
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vnf-template.vtl (renamed from components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-vnf-template.vtl)4
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vpkg-mapping.json20
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vpkg-template.vtl10
20 files changed, 265 insertions, 288 deletions
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 346bc4b2c..b3d719faa 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
@@ -144,7 +144,6 @@
"type" : "string",
"status" : "",
"constraints" : [ { } ],
- "default" : "",
"entry_schema" : {
"type" : ""
}
@@ -293,6 +292,16 @@
"type" : ""
}
},
+ "flavor_name" : {
+ "description" : "",
+ "required" : false,
+ "type" : "string",
+ "status" : "",
+ "constraints" : [ { } ],
+ "entry_schema" : {
+ "type" : ""
+ }
+ },
"dcae_collector_ip" : {
"description" : "",
"required" : false,
@@ -497,7 +506,6 @@
"type" : "string",
"status" : "",
"constraints" : [ { } ],
- "default" : "",
"entry_schema" : {
"type" : ""
}
@@ -523,13 +531,13 @@
"type" : ""
}
},
- "vf_module_name" : {
+ "vf-module-name" : {
"description" : "",
"required" : false,
"type" : "string",
"status" : "",
"constraints" : [ { } ],
- "default" : "${vf_module_name}",
+ "default" : "${vf-module-name}",
"entry_schema" : {
"type" : ""
}
@@ -551,7 +559,6 @@
"type" : "string",
"status" : "",
"constraints" : [ { } ],
- "default" : "m1.medium",
"entry_schema" : {
"type" : ""
}
@@ -593,7 +600,6 @@
"type" : "string",
"status" : "",
"constraints" : [ { } ],
- "default" : "m1.medium",
"entry_schema" : {
"type" : ""
}
@@ -624,7 +630,6 @@
"type" : "string",
"status" : "",
"constraints" : [ { } ],
- "default" : "",
"entry_schema" : {
"type" : ""
}
@@ -708,7 +713,6 @@
"type" : "string",
"status" : "",
"constraints" : [ { } ],
- "default" : "",
"entry_schema" : {
"type" : ""
}
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/node_types.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/node_types.json
index 7a44860e2..e3f915e33 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/node_types.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/node_types.json
@@ -3,6 +3,12 @@
"component-netconf-executor" : {
"description" : "This is Netconf Transaction Configuration Component API",
"version" : "1.0.0",
+ "attributes" : {
+ "response-data" : {
+ "required" : false,
+ "type" : "json"
+ }
+ },
"capabilities" : {
"component-node" : {
"type" : "tosca.capabilities.Node"
@@ -90,6 +96,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,
@@ -200,18 +212,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",
@@ -256,6 +256,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",
@@ -387,4 +399,4 @@
"derived_from" : "tosca.nodes.Vnf"
}
}
-}
+} \ 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 ef1c5e24f..aa49e1ee9 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
@@ -75,7 +75,7 @@
"key-dependencies" : [ "vf-module-id", "service-instance-id", "vnf-id" ]
}
},
- "aai-data" : {
+ "primary-aai-data" : {
"type" : "source-rest",
"properties" : {
"verb" : "PATCH",
@@ -197,6 +197,41 @@
}
}
},
+ "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" ]
+ }
+ }
+ }
+ },
"gre_ipaddr" : {
"tags" : "gre_ipaddr",
"name" : "gre_ipaddr",
@@ -1076,7 +1111,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"
@@ -1086,7 +1121,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"
@@ -1103,41 +1138,6 @@
}
}
},
- "vdns_flavor_name" : {
- "tags" : "vdns_flavor_name",
- "name" : "vdns_flavor_name",
- "property" : {
- "description" : "vdns_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/vdns_flavor_name",
- "path" : "/param/0/value",
- "input-key-mapping" : {
- "service-instance-id" : "service-instance-id",
- "vnf-id" : "vnf-id"
- },
- "output-key-mapping" : {
- "vdns_flavor_name" : "value"
- },
- "key-dependencies" : [ "service-instance-id", "vnf-id" ]
- }
- }
- }
- },
"vdns_int_private_ip_0" : {
"tags" : "vdns_int_private_ip_0",
"name" : "vdns_int_private_ip_0",
@@ -1275,7 +1275,7 @@
"key-dependencies" : [ "service-instance-id", "vnf-id" ]
}
},
- "aai-data" : {
+ "primary-aai-data" : {
"type" : "source-rest",
"properties" : {
"verb" : "GET",
@@ -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 <ks220y@att.com>",
@@ -1525,41 +1525,6 @@
}
}
},
- "vlb_flavor_name" : {
- "tags" : "vlb_flavor_name",
- "name" : "vlb_flavor_name",
- "property" : {
- "description" : "vlb_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/vlb_flavor_name",
- "path" : "/param/0/value",
- "input-key-mapping" : {
- "service-instance-id" : "service-instance-id",
- "vnf-id" : "vnf-id"
- },
- "output-key-mapping" : {
- "vlb_flavor_name" : "value"
- },
- "key-dependencies" : [ "service-instance-id", "vnf-id" ]
- }
- }
- }
- },
"vlb_int_pktgen_private_ip_0" : {
"tags" : "vlb_int_pktgen_private_ip_0",
"name" : "vlb_int_pktgen_private_ip_0",
@@ -1716,18 +1681,6 @@
"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" : {
- "vlb_private_net_cidr" : "prefix"
- }
- }
- },
"sdnc" : {
"type" : "source-rest",
"properties" : {
@@ -1744,6 +1697,18 @@
},
"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 = \"private1\"",
+ "input-key-mapping" : { },
+ "output-key-mapping" : {
+ "vlb_private_net_cidr" : "prefix"
+ }
+ }
}
}
},
@@ -1917,51 +1882,16 @@
"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"
},
- "key-dependencies" : [ "vfccustomizationuuid" ]
- }
- }
- }
- },
- "vpg_flavor_name" : {
- "tags" : "vpg_flavor_name",
- "name" : "vpg_flavor_name",
- "property" : {
- "description" : "vpg_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/vpg_flavor_name",
- "path" : "/param/0/value",
+ "endpoint-selector" : "dynamic-db-source",
"input-key-mapping" : {
- "service-instance-id" : "service-instance-id",
- "vnf-id" : "vnf-id"
- },
- "output-key-mapping" : {
- "vpg_flavor_name" : "value"
+ "vfccustomizationuuid" : "vfccustomizationuuid"
},
- "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+ "key-dependencies" : [ "vfccustomizationuuid" ]
}
}
}
@@ -2071,4 +2001,4 @@
}
}
}
-}
+} \ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/vDNS-CDS.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/vLB_CDS.json
index fa9f69f37..9b03a5ef3 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/vDNS-CDS.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/vLB_CDS.json
@@ -4,7 +4,7 @@
"template_author" : "Abdelmuhaimen Seaudi",
"author-email" : "abdelmuhaimen.seaudi@orange.com",
"user-groups" : "ADMIN, OPERATION",
- "template_name" : "test",
+ "template_name" : "vLB_CDS",
"template_version" : "1.0.0",
"template_tags" : "test, vDNS-CDS, SCALE-OUT, MARCO"
},
@@ -167,13 +167,13 @@
"type" : "artifact-mapping-resource",
"file" : "Templates/vdns-mapping.json"
},
- "vdns-vnf-template" : {
+ "vnf-template" : {
"type" : "artifact-template-velocity",
- "file" : "Templates/vdns-vnf-template.vtl"
+ "file" : "Templates/vnf-template.vtl"
},
- "vdns-vnf-mapping" : {
+ "vnf-mapping" : {
"type" : "artifact-mapping-resource",
- "file" : "Templates/vdns-vnf-mapping.json"
+ "file" : "Templates/vnf-mapping.json"
},
"vlb-template" : {
"type" : "artifact-template-velocity",
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Plans/CONFIG_ConfigDeploy.xml b/components/model-catalog/blueprint-model/service-blueprint/vLB/Plans/CONFIG_ConfigDeploy.xml
index 519aecf4d..92fb2aa48 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Plans/CONFIG_ConfigDeploy.xml
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Plans/CONFIG_ConfigDeploy.xml
@@ -1,27 +1,27 @@
-<service-logic
- xmlns='http://www.onap.org/sdnc/svclogic'
- xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
- xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='CONFIG' version='1.0.0'>
- <method rpc='ConfigDeploy' mode='sync'>
- <block atomic="true">
- <execute plugin="nf-account-collection" method="process">
- <outcome value='failure'>
- <return status="failure">
- </return>
- </outcome>
- <outcome value='success'>
- <execute plugin="execute" method="process">
- <outcome value='failure'>
- <return status="failure">
- </return>
- </outcome>
- <outcome value='success'>
- <return status='success'>
- </return>
- </outcome>
- </execute>
- </outcome>
- </execute>
- </block>
- </method>
+<service-logic
+ xmlns='http://www.onap.org/sdnc/svclogic'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+ xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='CONFIG' version='1.0.0'>
+ <method rpc='ConfigDeploy' mode='sync'>
+ <block atomic="true">
+ <execute plugin="nf-account-collection" method="process">
+ <outcome value='failure'>
+ <return status="failure">
+ </return>
+ </outcome>
+ <outcome value='success'>
+ <execute plugin="execute" method="process">
+ <outcome value='failure'>
+ <return status="failure">
+ </return>
+ </outcome>
+ <outcome value='success'>
+ <return status='success'>
+ </return>
+ </outcome>
+ </execute>
+ </outcome>
+ </execute>
+ </block>
+ </method>
</service-logic> \ No newline at end of file
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 04ea82ea9..34fd1404d 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
@@ -1,54 +1,54 @@
-# Copyright (c) 2019 Bell Canada.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import netconf_constant
-from common import ResolutionHelper
-from time import sleep
-from netconfclient import NetconfClient
-from org.onap.ccsdk.cds.blueprintsprocessor.functions.netconf.executor import \
- NetconfComponentFunction
-
-
-class ConfigDeploy(NetconfComponentFunction):
-
- def process(self, execution_request):
- log = globals()[netconf_constant.SERVICE_LOG]
- print(globals())
- print("Waiting 4 minutes until NETCONF server is UP on vLB ...")
- sleep (240)
- nc = NetconfClient(log, self, "netconf-connection")
- rr = ResolutionHelper(self)
-
- # Get meshed template from DB
- resolution_key = self.getDynamicProperties("resolution-key").asText()
- payloadHostname = rr.retrieve_resolved_template_from_database(resolution_key, "baseconfig")
- payloadInterface = rr.retrieve_resolved_template_from_database(resolution_key, "incremental-config")
-
- nc.connect()
- nc.lock()
- #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.commit()
- #nc.commit(confirmed = True, confirm_timeout=15)
- nc.unlock()
- nc.disconnect()
-
- def recover(self, runtime_exception, execution_request):
- log.error("Exception in the script {}", runtime_exception)
- print self.addError(runtime_exception.cause.message)
+# Copyright (c) 2019 Bell Canada.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import netconf_constant
+from common import ResolutionHelper
+from time import sleep
+from netconfclient import NetconfClient
+from org.onap.ccsdk.cds.blueprintsprocessor.functions.netconf.executor import \
+ NetconfComponentFunction
+
+
+class ConfigDeploy(NetconfComponentFunction):
+
+ def process(self, execution_request):
+ log = globals()[netconf_constant.SERVICE_LOG]
+ print(globals())
+# print("Waiting 4 minutes until NETCONF server is UP on vLB ...")
+# sleep (240)
+ nc = NetconfClient(log, self, "netconf-connection")
+ rr = ResolutionHelper(self)
+
+ # Get meshed template from DB
+ resolution_key = self.getDynamicProperties("resolution-key").asText()
+ payloadHostname = rr.retrieve_resolved_template_from_database(resolution_key, "baseconfig")
+ payloadInterface = rr.retrieve_resolved_template_from_database(resolution_key, "incremental-config")
+
+ nc.connect()
+ nc.lock()
+ #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.commit()
+ #nc.commit(confirmed = True, confirm_timeout=15)
+ nc.unlock()
+ nc.disconnect()
+
+ def recover(self, runtime_exception, execution_request):
+ log.error("Exception in the script {}", runtime_exception)
+ print self.addError(runtime_exception.cause.message)
return None \ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/TOSCA-Metadata/TOSCA.meta b/components/model-catalog/blueprint-model/service-blueprint/vLB/TOSCA-Metadata/TOSCA.meta
index ea1a90340..37c59ee56 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/TOSCA-Metadata/TOSCA.meta
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/TOSCA-Metadata/TOSCA.meta
@@ -1,6 +1,6 @@
TOSCA-Meta-File-Version: 1.0.0
CSAR-Version: 1.0
Created-By: PLATANIA, MARCO <platania@research.att.com>
-Entry-Definitions: Definitions/vDNS-CDS.json
+Entry-Definitions: Definitions/vLB_CDS.json
Template-Tags: vDNS-CDS-test1
Content-Type: application/vnd.oasis.bpmn \ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/base_template-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/base_template-mapping.json
index 62d1b966b..43b0f9dd0 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/base_template-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/base_template-mapping.json
@@ -20,7 +20,7 @@
"version": 0
},
{
- "name": "vf_module_name",
+ "name": "vf-module-name",
"property": {
"description": "",
"required": false,
@@ -32,10 +32,10 @@
"entry_schema": {
"type": ""
},
- "default": "${vf_module_name}"
+ "default": "${vf-module-name}"
},
"input-param": false,
- "dictionary-name": "vf_module_name",
+ "dictionary-name": "vf-module-name",
"dictionary-source": "default",
"dependencies": [],
"version": 0
@@ -406,4 +406,4 @@
],
"version": 0
}
-]
+] \ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/base_template-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/base_template-template.vtl
index 8055030c2..58512be2f 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/base_template-template.vtl
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/base_template-template.vtl
@@ -81,15 +81,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",
@@ -114,8 +114,8 @@
],
"output-key-mapping": [
{
- "resource-name": "vf_module_name",
- "resource-value": "${vf_module_name}"
+ "resource-name": "vf-module-name",
+ "resource-value": "${vf-module-name}"
}
]
}
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/baseconfig-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/baseconfig-mapping.json
index 000cbd039..ad12a6cb9 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/baseconfig-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/baseconfig-mapping.json
@@ -110,4 +110,4 @@
],
"version": 0
}
-]
+] \ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/incremental-config-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/incremental-config-mapping.json
index 1aece7315..99218d213 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/incremental-config-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/incremental-config-mapping.json
@@ -110,4 +110,4 @@
],
"version": 0
}
-]
+] \ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/nf-params-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/nf-params-mapping.json
index 30004521b..9cf71fc59 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/nf-params-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/nf-params-mapping.json
@@ -62,4 +62,4 @@
],
"version": 0
}
-]
+] \ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-mapping.json
index cf3099467..2dee19ccb 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-mapping.json
@@ -113,7 +113,7 @@
"version": 0
},
{
- "name": "vf_module_name",
+ "name": "vf-module-name",
"property": {
"description": "",
"required": false,
@@ -125,10 +125,10 @@
"entry_schema": {
"type": ""
},
- "default": "${vf_module_name}"
+ "default": "${vf-module-name}"
},
"input-param": false,
- "dictionary-name": "vf_module_name",
+ "dictionary-name": "vf-module-name",
"dictionary-source": "default",
"dependencies": [],
"version": 0
@@ -370,9 +370,12 @@
"default": "m1.medium"
},
"input-param": false,
- "dictionary-name": "vdns_flavor_name",
- "dictionary-source": "default",
- "dependencies": [],
+ "dictionary-name": "flavor_name",
+ "dictionary-source": "sdnc",
+ "dependencies": [
+ "service-instance-id",
+ "vnf-id"
+ ],
"version": 0
},
@@ -811,4 +814,4 @@
],
"version": 0
}
-]
+] \ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-template.vtl
index 9c493dc45..84fab0d63 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-template.vtl
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-template.vtl
@@ -182,15 +182,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",
@@ -215,8 +215,8 @@
],
"output-key-mapping": [
{
- "resource-name": "vf_module_name",
- "resource-value": "${vf_module_name}"
+ "resource-name": "vf-module-name",
+ "resource-value": "${vf-module-name}"
}
]
}
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vlb-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vlb-mapping.json
index 9e3b693ca..0104579c3 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vlb-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vlb-mapping.json
@@ -21,7 +21,7 @@
"version": 0
},
{
- "name": "vf_module_name",
+ "name": "vf-module-name",
"property": {
"description": "",
"required": false,
@@ -33,10 +33,10 @@
"entry_schema": {
"type": ""
},
- "default": "${vf_module_name}"
+ "default": "${vf-module-name}"
},
"input-param": false,
- "dictionary-name": "vf_module_name",
+ "dictionary-name": "vf-module-name",
"dictionary-source": "default",
"dependencies": [],
"version": 0
@@ -610,13 +610,15 @@
],
"entry_schema": {
"type": ""
- },
- "default": "m1.medium"
- },
+ }
+ },
"input-param": false,
- "dictionary-name": "vlb_flavor_name",
- "dictionary-source": "default",
- "dependencies": [],
+ "dictionary-name": "flavor_name",
+ "dictionary-source": "sdnc",
+ "dependencies": [
+ "service-instance-id",
+ "vnf-id"
+ ],
"version": 0
},
{
@@ -924,4 +926,4 @@
"dependencies": [],
"version": 0
}
-]
+] \ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vlb-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vlb-template.vtl
index bc495bd2d..458423e6f 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vlb-template.vtl
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vlb-template.vtl
@@ -209,15 +209,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",
@@ -242,8 +242,8 @@
],
"output-key-mapping": [
{
- "resource-name": "vf_module_name",
- "resource-value": "${vf_module_name}"
+ "resource-name": "vf-module-name",
+ "resource-value": "${vf-module-name}"
}
]
}
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-vnf-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vnf-mapping.json
index 20e2a2720..82dbe66a2 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-vnf-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vnf-mapping.json
@@ -40,6 +40,26 @@
"dependencies": [],
"version": 0
},
+ {
+ "name": "flavor_name",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "status": "",
+ "constraints": [
+ {}
+ ],
+ "entry_schema": {
+ "type": ""
+ }
+ },
+ "input-param": false,
+ "dictionary-name": "flavor_name",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
+ },
{
"name": "image_name",
"property": {
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-vnf-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vnf-template.vtl
index ec43a5a4a..0080e2b2d 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-vnf-template.vtl
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vnf-template.vtl
@@ -44,6 +44,10 @@
"param-name": "cloud_env",
"param-value": "${cloud_env}"
},
+ {
+ "param-name": "flavor_name",
+ "param-value": "${flavor_name}"
+ },
{
"param-name": "install_script_version",
"param-value": "${install_script_version}"
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vpkg-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vpkg-mapping.json
index 554d45fc2..25721e299 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vpkg-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vpkg-mapping.json
@@ -21,7 +21,7 @@
"version": 0
},
{
- "name": "vf_module_name",
+ "name": "vf-module-name",
"property": {
"description": "",
"required": false,
@@ -33,10 +33,10 @@
"entry_schema": {
"type": ""
},
- "default": "${vf_module_name}"
+ "default": "${vf-module-name}"
},
"input-param": false,
- "dictionary-name": "vf_module_name",
+ "dictionary-name": "vf-module-name",
"dictionary-source": "default",
"dependencies": [],
"version": 0
@@ -538,13 +538,15 @@
],
"entry_schema": {
"type": ""
- },
- "default": "m1.medium"
+ }
},
"input-param": false,
- "dictionary-name": "vpg_flavor_name",
- "dictionary-source": "default",
- "dependencies": [],
+ "dictionary-name": "flavor_name",
+ "dictionary-source": "sdnc",
+ "dependencies": [
+ "service-instance-id",
+ "vnf-id"
+ ],
"version": 0
},
{
@@ -829,4 +831,4 @@
],
"version": 0
}
-]
+] \ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vpkg-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vpkg-template.vtl
index 98d541d69..bd745b179 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vpkg-template.vtl
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vpkg-template.vtl
@@ -175,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",
@@ -212,8 +212,8 @@
],
"output-key-mapping": [
{
- "resource-name": "vf_module_name",
- "resource-value": "${vf_module_name}"
+ "resource-name": "vf-module-name",
+ "resource-value": "${vf-module-name}"
}
]
}