Data dictionary fixes and improvements from vFW CNF demo

During doing vFW CNF use case CBA model with CDS (See INT-1260)
found some diff/improvements to update to CDS starter dictionary.

Issue-ID: CCSDK-2408

Signed-off-by: Samuli Silvius <s.silvius@partner.samsung.com>
Change-Id: I8e899b3ab34bcd499e917da318f589e69008dc6d
(cherry picked from commit bef1899ac0e9cc77e8c22feffaab95cbc923d6ba)

diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/resources_definition_types.json
index baeafb6..4c74b48 100644 (file)
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/resources_definition_types.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/resources_definition_types.json
@@ -296,7 +296,6 @@
       "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" : { },
@@ -360,7 +359,6 @@
       "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 = \"private2\"",
           "input-key-mapping" : { },
@@ -442,7 +440,6 @@
       "processor-db" : {
         "type" : "source-db",
         "properties" : {
-          "endpoint-selector" : "dynamic-db-source",
           "type" : "SQL",
           "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"management\"",
           "input-key-mapping" : { },
@@ -515,8 +512,7 @@
           "output-key-mapping" : {
             "nfc-naming-code" : "nfc_naming_code"
           },
-          "key-dependencies" : [ "vfccustomizationuuid" ],
-          "endpoint-selector" : "dynamic-db-source"
+          "key-dependencies" : [ "vfccustomizationuuid" ]
         }
       }
     }
@@ -540,7 +536,6 @@
       "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 = \"management\"",
           "input-key-mapping" : { },
@@ -674,7 +669,6 @@
       "processor-db" : {
         "type" : "source-db",
         "properties" : {
-          "endpoint-selector" : "dynamic-db-source",
           "type" : "SQL",
           "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"private1\"",
           "input-key-mapping" : { },
@@ -721,7 +715,6 @@
       "processor-db" : {
         "type" : "source-db",
         "properties" : {
-          "endpoint-selector" : "dynamic-db-source",
           "type" : "SQL",
           "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"private2\"",
           "input-key-mapping" : { },
@@ -957,8 +950,7 @@
           "output-key-mapping" : {
             "vf-module-label" : "vf_module_label"
           },
-          "key-dependencies" : [ "vf-module-model-customization-uuid" ],
-          "endpoint-selector" : "dynamic-db-source"
+          "key-dependencies" : [ "vf-module-model-customization-uuid" ]
         }
       }
     }
@@ -1023,7 +1015,6 @@
           "output-key-mapping" : {
             "vf-module-type" : "vf_module_type"
           },
-          "endpoint-selector" : "dynamic-db-source",
           "input-key-mapping" : {
             "customizationid" : "vf-module-model-customization-uuid"
           },
@@ -1065,7 +1056,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" : {
@@ -1098,7 +1088,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" : {
@@ -1395,7 +1384,6 @@
           "output-key-mapping" : {
             "vnfc-model-invariant-uuid" : "vfc_invariant_uuid"
           },
-          "endpoint-selector" : "dynamic-db-source",
           "input-key-mapping" : {
             "vfccustomizationuuid" : "vfccustomizationuuid"
           },
@@ -1428,7 +1416,6 @@
           "output-key-mapping" : {
             "vnfc-model-version" : "vnfc_model_version"
           },
-          "endpoint-selector" : "dynamic-db-source",
           "input-key-mapping" : {
             "vfccustomizationuuid" : "vfccustomizationuuid"
           },

diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/vFW_CDS.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/vFW_CDS.json
index 5b1af84..09c2255 100644 (file)
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/vFW_CDS.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/vFW_CDS.json
@@ -35,12 +35,6 @@
       "resolution-key" : {
         "get_input" : "resolution-key"
       }
-    },
-    "dynamic-db-source" : {
-      "type" : "maria-db",
-      "url" : "jdbc:mysql://mariadb-galera:3306/sdnctl",
-      "username" : "root",
-      "password" : "secretpassword"
     }
   },
   "topology_template" : {
@@ -184,4 +178,4 @@
       }
     }
   }
-}
\ 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 60612a7..61f6c3d 100644 (file)
--- 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
@@ -2817,4 +2817,4 @@
                        }
                }
        }
-}
\ No newline at end of file
+}

diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/vLB_CDS.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/vLB_CDS.json
index 2db4fea..29be14f 100644 (file)
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/vLB_CDS.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/vLB_CDS.json
@@ -563,4 +563,4 @@
          }
       }
    }
-}
\ No newline at end of file
+}

diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_Kotlin/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_Kotlin/Definitions/resources_definition_types.json
index d4058d2..7c2dcd2 100644 (file)
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_Kotlin/Definitions/resources_definition_types.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_Kotlin/Definitions/resources_definition_types.json
@@ -583,7 +583,6 @@
       "processor-db" : {\r
         "type" : "source-db",\r
         "properties" : {\r
-          "endpoint-selector" : "dynamic-db-source",\r
           "type" : "SQL",\r
           "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"management\"",\r
           "input-key-mapping" : { },\r
@@ -691,8 +690,7 @@
           "output-key-mapping" : {\r
             "nfc-naming-code" : "nfc_naming_code"\r
           },\r
-          "key-dependencies" : [ "vfccustomizationuuid" ],\r
-          "endpoint-selector" : "dynamic-db-source"\r
+          "key-dependencies" : [ "vfccustomizationuuid" ]\r
         }\r
       }\r
     }\r
@@ -716,7 +714,6 @@
       "processor-db" : {\r
         "type" : "source-db",\r
         "properties" : {\r
-          "endpoint-selector" : "dynamic-db-source",\r
           "type" : "SQL",\r
           "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"management\"",\r
           "input-key-mapping" : { },\r
@@ -873,7 +870,6 @@
           "output-key-mapping" : {\r
             "pktgen_private_net_cidr" : "prefix"\r
           },\r
-          "endpoint-selector" : "dynamic-db-source",\r
           "input-key-mapping" : { }\r
         }\r
       },\r
@@ -932,7 +928,6 @@
       "processor-db" : {\r
         "type" : "source-db",\r
         "properties" : {\r
-          "endpoint-selector" : "dynamic-db-source",\r
           "type" : "SQL",\r
           "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"private1\"",\r
           "input-key-mapping" : { },\r
@@ -979,7 +974,6 @@
       "processor-db" : {\r
         "type" : "source-db",\r
         "properties" : {\r
-          "endpoint-selector" : "dynamic-db-source",\r
           "type" : "SQL",\r
           "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"private2\"",\r
           "input-key-mapping" : { },\r
@@ -1335,8 +1329,7 @@
           "output-key-mapping" : {\r
             "vf-module-label" : "vf_module_label"\r
           },\r
-          "key-dependencies" : [ "vf-module-model-customization-uuid" ],\r
-          "endpoint-selector" : "dynamic-db-source"\r
+          "key-dependencies" : [ "vf-module-model-customization-uuid" ]\r
         }\r
       }\r
     }\r
@@ -1383,7 +1376,6 @@
           "output-key-mapping" : {\r
             "vf-module-type" : "vf_module_type"\r
           },\r
-          "endpoint-selector" : "dynamic-db-source",\r
           "input-key-mapping" : {\r
             "customizationid" : "vf-module-model-customization-uuid"\r
           },\r
@@ -1425,7 +1417,6 @@
       "processor-db" : {\r
         "type" : "source-db",\r
         "properties" : {\r
-          "endpoint-selector" : "dynamic-db-source",\r
           "type" : "SQL",\r
           "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",\r
           "input-key-mapping" : {\r
@@ -1476,7 +1467,6 @@
       "processor-db" : {\r
         "type" : "source-db",\r
         "properties" : {\r
-          "endpoint-selector" : "dynamic-db-source",\r
           "type" : "SQL",\r
           "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",\r
           "input-key-mapping" : {\r
@@ -1701,7 +1691,6 @@
       "processor-db" : {\r
         "type" : "source-db",\r
         "properties" : {\r
-          "endpoint-selector" : "dynamic-db-source",\r
           "type" : "SQL",\r
           "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private1\"",\r
           "input-key-mapping" : { },\r
@@ -1736,7 +1725,6 @@
           "output-key-mapping" : {\r
             "vm-type" : "vm_type"\r
           },\r
-          "endpoint-selector" : "dynamic-db-source",\r
           "input-key-mapping" : {\r
             "vfccustomizationuuid" : "vfccustomizationuuid"\r
           },\r
@@ -1854,7 +1842,6 @@
           "output-key-mapping" : {\r
             "vnfc-model-invariant-uuid" : "vfc_invariant_uuid"\r
           },\r
-          "endpoint-selector" : "dynamic-db-source",\r
           "input-key-mapping" : {\r
             "vfccustomizationuuid" : "vfccustomizationuuid"\r
           },\r
@@ -1887,7 +1874,6 @@
           "output-key-mapping" : {\r
             "vnfc-model-version" : "vnfc_model_version"\r
           },\r
-          "endpoint-selector" : "dynamic-db-source",\r
           "input-key-mapping" : {\r
             "vfccustomizationuuid" : "vfccustomizationuuid"\r
           },\r
@@ -2001,4 +1987,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r

diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_Kotlin/Definitions/vLB_CDS_KOTLIN.json b/components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_Kotlin/Definitions/vLB_CDS_KOTLIN.json
index a623791..90a9b3c 100644 (file)
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_Kotlin/Definitions/vLB_CDS_KOTLIN.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_Kotlin/Definitions/vLB_CDS_KOTLIN.json
@@ -29,12 +29,6 @@
       "resolution-key" : {\r
         "get_input" : "resolution-key"\r
       }\r
-    },\r
-    "dynamic-db-source" : {\r
-      "type" : "maria-db",\r
-      "url" : "jdbc:mysql://mariadb-galera:3306/sdnctl",\r
-      "username" : "root",\r
-      "password" : "secretpassword"\r
     }\r
   },\r
   "topology_template" : {\r
@@ -302,4 +296,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r

diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_RESTCONF/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_RESTCONF/Definitions/resources_definition_types.json
index 9631cbb..b82d44c 100644 (file)
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_RESTCONF/Definitions/resources_definition_types.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_RESTCONF/Definitions/resources_definition_types.json
@@ -583,7 +583,6 @@
       "processor-db" : {
         "type" : "source-db",
         "properties" : {
-          "endpoint-selector" : "dynamic-db-source",
           "type" : "SQL",
           "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"management\"",
           "input-key-mapping" : { },
@@ -691,8 +690,7 @@
           "output-key-mapping" : {
             "nfc-naming-code" : "nfc_naming_code"
           },
-          "key-dependencies" : [ "vfccustomizationuuid" ],
-          "endpoint-selector" : "dynamic-db-source"
+          "key-dependencies" : [ "vfccustomizationuuid" ]
         }
       }
     }
@@ -716,7 +714,6 @@
       "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 = \"management\"",
           "input-key-mapping" : { },
@@ -873,7 +870,6 @@
           "output-key-mapping" : {
             "pktgen_private_net_cidr" : "prefix"
           },
-          "endpoint-selector" : "dynamic-db-source",
           "input-key-mapping" : { }
         }
       },
@@ -932,7 +928,6 @@
       "processor-db" : {
         "type" : "source-db",
         "properties" : {
-          "endpoint-selector" : "dynamic-db-source",
           "type" : "SQL",
           "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"private1\"",
           "input-key-mapping" : { },
@@ -979,7 +974,6 @@
       "processor-db" : {
         "type" : "source-db",
         "properties" : {
-          "endpoint-selector" : "dynamic-db-source",
           "type" : "SQL",
           "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"private2\"",
           "input-key-mapping" : { },
@@ -1335,8 +1329,7 @@
           "output-key-mapping" : {
             "vf-module-label" : "vf_module_label"
           },
-          "key-dependencies" : [ "vf-module-model-customization-uuid" ],
-          "endpoint-selector" : "dynamic-db-source"
+          "key-dependencies" : [ "vf-module-model-customization-uuid" ]
         }
       }
     }
@@ -1383,7 +1376,6 @@
           "output-key-mapping" : {
             "vf-module-type" : "vf_module_type"
           },
-          "endpoint-selector" : "dynamic-db-source",
           "input-key-mapping" : {
             "customizationid" : "vf-module-model-customization-uuid"
           },
@@ -1425,7 +1417,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" : {
@@ -1476,7 +1467,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" : {
@@ -1701,7 +1691,6 @@
       "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" : { },
@@ -1736,7 +1725,6 @@
           "output-key-mapping" : {
             "vm-type" : "vm_type"
           },
-          "endpoint-selector" : "dynamic-db-source",
           "input-key-mapping" : {
             "vfccustomizationuuid" : "vfccustomizationuuid"
           },
@@ -1854,7 +1842,6 @@
           "output-key-mapping" : {
             "vnfc-model-invariant-uuid" : "vfc_invariant_uuid"
           },
-          "endpoint-selector" : "dynamic-db-source",
           "input-key-mapping" : {
             "vfccustomizationuuid" : "vfccustomizationuuid"
           },
@@ -1887,7 +1874,6 @@
           "output-key-mapping" : {
             "vnfc-model-version" : "vnfc_model_version"
           },
-          "endpoint-selector" : "dynamic-db-source",
           "input-key-mapping" : {
             "vfccustomizationuuid" : "vfccustomizationuuid"
           },
@@ -2001,4 +1987,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}

diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_RESTCONF/Definitions/vLB_CDS.json b/components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_RESTCONF/Definitions/vLB_CDS.json
index 16f8fcf..86e35e0 100644 (file)
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_RESTCONF/Definitions/vLB_CDS.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_RESTCONF/Definitions/vLB_CDS.json
@@ -29,12 +29,6 @@
       "resolution-key" : {
         "get_input" : "resolution-key"
       }
-    },
-    "dynamic-db-source" : {
-      "type" : "maria-db",
-      "url" : "jdbc:mysql://mariadb-galera:3306/sdnctl",
-      "username" : "root",
-      "password" : "secretpassword"
     }
   },
   "topology_template" : {

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/int_private1_net_cidr.json b/components/model-catalog/resource-dictionary/starter-dictionary/int_private1_net_cidr.json
index 255e82e..258da51 100755 (executable)
--- a/components/model-catalog/resource-dictionary/starter-dictionary/int_private1_net_cidr.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/int_private1_net_cidr.json
@@ -15,6 +15,17 @@
                        "type": "source-default",
                        "properties": {}
                },
+               "processor-db": {
+                       "type": "source-db",
+                       "properties": {
+                               "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": {
+                                       "int_private1_net_cidr": "prefix"
+                               }
+                       }
+               },
                "sdnc": {
                        "type": "source-rest",
                        "properties": {
@@ -34,18 +45,6 @@
                                        "vnf-id"
                                ]
                        }
-               },
-               "processor-db": {
-                       "type": "source-db",
-                       "properties": {
-                               
-                               "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": {
-                                       "int_private1_net_cidr": "prefix"
-                               }
-                       }
                }
        }
 }

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/int_private1_subnet_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/int_private1_subnet_id.json
index f353b6a..60f95d1 100755 (executable)
--- a/components/model-catalog/resource-dictionary/starter-dictionary/int_private1_subnet_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/int_private1_subnet_id.json
@@ -6,11 +6,32 @@
                "description": "int_private1_subnet_id",
                "type": "string"
        },
-       "updated-by": "Singal, Kapil <ks220y@att.com>",
+       "updated-by": "Samuli, Silvius <s.silvius@partner.samsung.com>",
        "sources": {
                "input": {
                        "type": "source-input",
                        "properties": {}
-               }
+               },
+               "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/int_private1_subnet_id",
+                                "path" : "/param/0/value",
+                                "input-key-mapping" : {
+                                        "service-instance-id" : "service-instance-id",
+                                        "vnf-id" : "vnf-id"
+                                },
+                                "output-key-mapping" : {
+                                        "int_private1_subnet_id" : "value"
+                                },
+                                "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+                        }
+                }
        }
 }

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/int_private2_net_cidr.json b/components/model-catalog/resource-dictionary/starter-dictionary/int_private2_net_cidr.json
index f7c59d5..8d711dc 100755 (executable)
--- a/components/model-catalog/resource-dictionary/starter-dictionary/int_private2_net_cidr.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/int_private2_net_cidr.json
@@ -23,7 +23,6 @@
                                "output-key-mapping": {
                                        "int_private2_net_cidr": "prefix"
                                },
-                               
                                "input-key-mapping": {}
                        }
                },

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/management-prefix-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/management-prefix-id.json
index ed53868..756c6a2 100644 (file)
--- a/components/model-catalog/resource-dictionary/starter-dictionary/management-prefix-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/management-prefix-id.json
@@ -47,4 +47,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/nfc-naming-code.json b/components/model-catalog/resource-dictionary/starter-dictionary/nfc-naming-code.json
index 1740aea..1ea0ef0 100644 (file)
--- a/components/model-catalog/resource-dictionary/starter-dictionary/nfc-naming-code.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/nfc-naming-code.json
@@ -32,4 +32,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_cidr.json b/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_cidr.json
index 71d3b02..17e990d 100644 (file)
--- a/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_cidr.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_cidr.json
@@ -47,4 +47,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/private-prefix-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/private-prefix-id.json
index 863cea2..95dd023 100755 (executable)
--- a/components/model-catalog/resource-dictionary/starter-dictionary/private-prefix-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/private-prefix-id.json
@@ -18,7 +18,6 @@
     "processor-db": {
       "type": "source-db",
       "properties": {
-        "endpoint-selector": "dynamic-db-source",
         "type": "SQL",
         "query": "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"private\"",
         "input-key-mapping": {},

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/private1-prefix-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/private1-prefix-id.json
index 7ba15ec..db1eb92 100644 (file)
--- a/components/model-catalog/resource-dictionary/starter-dictionary/private1-prefix-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/private1-prefix-id.json
@@ -47,4 +47,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/private2-prefix-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/private2-prefix-id.json
index 99b790c..83ae2aa 100644 (file)
--- a/components/model-catalog/resource-dictionary/starter-dictionary/private2-prefix-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/private2-prefix-id.json
@@ -47,4 +47,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/service-instance-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/service-instance-id.json
index 0f1810f..9b00cae 100644 (file)
--- a/components/model-catalog/resource-dictionary/starter-dictionary/service-instance-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/service-instance-id.json
@@ -15,7 +15,7 @@
                "any-db": {
                        "type": "source-db",
                        "properties": {
-                               "query": "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
+                               "query": "SELECT artifact_name FROM BLUEPRINT_MODEL where artifact_version=\"1.0.0\"",
                                "input-key-mapping": {},
                                "output-key-mapping": {
                                        "service-instance-id": "artifact_name"
@@ -25,7 +25,7 @@
                "processor-db": {
                        "type": "source-db",
                        "properties": {
-                               "query": "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
+                               "query": "SELECT artifact_name FROM BLUEPRINT_MODEL where artifact_version=\"1.0.0\"",
                                "input-key-mapping": {},
                                "output-key-mapping": {
                                        "service-instance-id": "artifact_name"
@@ -39,22 +39,6 @@
                                "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"]
-                       }
                }
        }
 }

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-id.json
index 40fedd9..d33638a 100644 (file)
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-id.json
@@ -11,28 +11,6 @@
     "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"
-        ]
-      }
     }
   }
 }

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-label.json b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-label.json
index 34ec2c4..a32c76d 100644 (file)
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-label.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-label.json
@@ -32,4 +32,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-name.json
index 12ba519..23af6f2 100644 (file)
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-name.json
@@ -3,7 +3,7 @@
     "name": "vf-module-name",
     "group":"default",
     "property": {
-        "description": "vf_module_name",
+        "description": "vf-module-name",
         "type": "string"
     },
     "updated-by": "Singal, Kapil <ks220y@att.com>",
@@ -69,4 +69,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-type.json b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-type.json
index 8c563cf..4230a9c 100644 (file)
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-type.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-type.json
@@ -32,4 +32,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vf-naming-policy.json b/components/model-catalog/resource-dictionary/starter-dictionary/vf-naming-policy.json
index 97344da..a7953a9 100644 (file)
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vf-naming-policy.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vf-naming-policy.json
@@ -49,4 +49,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vfccustomizationuuid.json b/components/model-catalog/resource-dictionary/starter-dictionary/vfccustomizationuuid.json
index 4abd7a3..3ae9e7a 100644 (file)
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vfccustomizationuuid.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vfccustomizationuuid.json
@@ -32,4 +32,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vnf-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/vnf-id.json
index 97d3d73..e8c451b 100644 (file)
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vnf-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vnf-id.json
@@ -8,32 +8,12 @@
     },
     "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/vnf-id",
-                "path": "/param/0/value",
-                "input-key-mapping": {
-                    "service-instance-id": "service-instance-id",
-                    "vnf-id": "vnf-id"
-                },
-                "output-key-mapping": {
-                    "vnf-id": "value"
-                },
-                "key-dependencies": [
-                    "service-instance-id",
-                    "vnf-id"
-                ]
-            }
-        }
+      "input": {
+        "type": "source-input"
+      },
+      "default": {
+        "type": "source-default",
+        "properties": {}
+      }
     }
-}
\ No newline at end of file
+}

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vnf_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vnf_name.json
index fd679f6..3deacf5 100644 (file)
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vnf_name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vnf_name.json
@@ -68,4 +68,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-invariant-uuid.json b/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-invariant-uuid.json
index a7a58ad..01acf18 100644 (file)
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-invariant-uuid.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-invariant-uuid.json
@@ -32,4 +32,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-version.json b/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-version.json
index 59282c0..f54ac4f 100644 (file)
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-version.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-version.json
@@ -32,4 +32,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_name_0 .json b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_name_0 .json
index 610ffc7..2785a03 100755 (executable)
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_name_0 .json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_name_0 .json
@@ -3,7 +3,7 @@
        "name": "vpg_name_0",
        "group":"default",
        "property": {
-               "description": "vlb_name_0",
+               "description": "vpg_name_0",
                "type": "string"
        },
        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",