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>
(cherry picked from commit 919a7aa6ecbb06a4d04afba280202bdedef0eb52)

1 files changed, 15 insertions, 41 deletions

diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_RESTCONF/Definitions/data_types.json b/components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_RESTCONF/Definitions/data_types.json
index 84134b3af..645dde711 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_RESTCONF/Definitions/data_types.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_RESTCONF/Definitions/data_types.json
@@ -61,16 +61,6 @@
       "description" : "Dynamic DataType definition for workflow(config-deploy).",
       "version" : "1.0.0",
       "properties" : {
-        "vdns_int_private_ip_0" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
         "vnf-id" : {
           "description" : "",
           "required" : false,
@@ -81,16 +71,6 @@
             "type" : ""
           }
         },
-        "vdns_vf_module_id" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
         "service-instance-id" : {
           "description" : "",
           "required" : false,
@@ -101,16 +81,6 @@
             "type" : ""
           }
         },
-        "vdns_onap_private_ip_0" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
         "ip" : {
           "description" : "",
           "required" : false,
@@ -138,12 +108,24 @@
             "type" : ""
           }
         },
+        "vf-module-name" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "default" : "${vf-module-name}",
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
         "private1-prefix-id" : {
           "description" : "",
           "required" : false,
           "type" : "string",
           "status" : "",
           "constraints" : [ { } ],
+          "default" : "",
           "entry_schema" : {
             "type" : ""
           }
@@ -505,6 +487,7 @@
           "type" : "string",
           "status" : "",
           "constraints" : [ { } ],
+          "default" : "",
           "entry_schema" : {
             "type" : ""
           }
@@ -530,17 +513,6 @@
             "type" : ""
           }
         },
-        "vf_module_name" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "status" : "",
-          "constraints" : [ { } ],
-          "default" : "${vf_module_name}",
-          "entry_schema" : {
-            "type" : ""
-          }
-        },
         "pg_int" : {
           "description" : "",
           "required" : false,
@@ -629,6 +601,7 @@
           "type" : "string",
           "status" : "",
           "constraints" : [ { } ],
+          "default" : "",
           "entry_schema" : {
             "type" : ""
           }
@@ -712,6 +685,7 @@
           "type" : "string",
           "status" : "",
           "constraints" : [ { } ],
+          "default" : "",
           "entry_schema" : {
             "type" : ""
           }