aboutsummaryrefslogtreecommitdiffstats
path: root/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/kotlin
diff options
context:
space:
mode:
authorJozsef Csongvai <jozsef.csongvai@bell.ca>2020-09-28 10:09:36 -0400
committerKAPIL SINGAL <ks220y@att.com>2020-09-30 19:47:24 +0000
commit919a7aa6ecbb06a4d04afba280202bdedef0eb52 (patch)
treee0196b09e2d63972657b76ff6e9c3ccf8a06bf2d /components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/kotlin
parentdbe66e54324e65264185011b5fa51a0438d15c60 (diff)
Fix service blueprints
Blueprints were failing enrichment. Cba's were referencing requirement restconf-connection which is not defined in component-netconf-executor. Added new capability for restconf and fixed referencing Issue-ID: CCSDK-2859 Change-Id: I13f8800ea5fad9daed8a8b7b81cc3649efbebbc9 Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca>
Diffstat (limited to 'components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/kotlin')
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/kotlin/ConfigDeploy.kt2
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/kotlin/HealthCheck.kt2
2 files changed, 2 insertions, 2 deletions
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/kotlin/ConfigDeploy.kt b/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/kotlin/ConfigDeploy.kt
index 61cde0521..737fb4234 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/kotlin/ConfigDeploy.kt
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/kotlin/ConfigDeploy.kt
@@ -51,7 +51,7 @@ open class ConfigDeploy : AbstractScriptComponentFunction() {
val vdns_ip: String = payloadObject.get("vdns-instance")[0].get("ip-addr").asText()
val blueprintContext = bluePrintRuntimeService.bluePrintContext()
- val requirement = blueprintContext.nodeTemplateRequirement(nodeTemplateName, "restconf-connection")
+ val requirement = blueprintContext.nodeTemplateRequirement(nodeTemplateName, "netconf-connection")
val capabilityProperties = bluePrintRuntimeService.resolveNodeTemplateCapabilityProperties(requirement.node!!, requirement.capability!!)
val netconfDeviceInfo = JacksonUtils.getInstanceFromMap(capabilityProperties, NetconfDeviceInfo::class.java)
log.info("Waiting for 2 minutes until vLB intializes ...")
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/kotlin/HealthCheck.kt b/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/kotlin/HealthCheck.kt
index 04993cdae..0441a1d13 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/kotlin/HealthCheck.kt
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/kotlin/HealthCheck.kt
@@ -50,7 +50,7 @@ open class HealthCheck : AbstractScriptComponentFunction() {
// val vdns_ip: String = payloadObject.get("vdns-instance")[0].get("ip-addr").asText()
val blueprintContext = bluePrintRuntimeService.bluePrintContext()
- val requirement = blueprintContext.nodeTemplateRequirement(nodeTemplateName, "restconf-connection")
+ val requirement = blueprintContext.nodeTemplateRequirement(nodeTemplateName, "netconf-connection")
val capabilityProperties = bluePrintRuntimeService.resolveNodeTemplateCapabilityProperties(requirement.node!!, requirement.capability!!)
val netconfDeviceInfo = JacksonUtils.getInstanceFromMap(capabilityProperties, NetconfDeviceInfo2::class.java)
// log.info("Waiting for 2 minutes until vLB intializes ...")