summaryrefslogtreecommitdiffstats
path: root/components/model-catalog/blueprint-model
diff options
context:
space:
mode:
authorSamuli Silvius <s.silvius@partner.samsung.com>2020-01-28 08:49:36 +0200
committerYuriy Malakov <Yuriy.Malakov@att.com>2020-06-08 16:10:18 +0000
commit2cdbc524c9d218723f67fb66b55d3c97f9b70869 (patch)
tree9b2ed1cdbba772ef389f9b9053aea7ed9bdf19ef /components/model-catalog/blueprint-model
parent4538cca5ec767a6ec72bbdde6745b1bba18933b0 (diff)
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)
Diffstat (limited to 'components/model-catalog/blueprint-model')
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/resources_definition_types.json17
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/vFW_CDS.json8
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/resources_definition_types.json2
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/vLB_CDS.json2
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_Kotlin/Definitions/resources_definition_types.json20
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_Kotlin/Definitions/vLB_CDS_KOTLIN.json8
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_RESTCONF/Definitions/resources_definition_types.json20
-rw-r--r--components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_RESTCONF/Definitions/vLB_CDS.json6
8 files changed, 12 insertions, 71 deletions
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 baeafb6bb..4c74b4810 100644
--- 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 5b1af84cd..09c2255e0 100644
--- 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 60612a762..61f6c3de3 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
@@ -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 2db4fea84..29be14faa 100644
--- 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 d4058d246..7c2dcd21d 100644
--- 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" : {
"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_Kotlin/Definitions/vLB_CDS_KOTLIN.json b/components/model-catalog/blueprint-model/service-blueprint/vLB_CDS_Kotlin/Definitions/vLB_CDS_KOTLIN.json
index a62379121..90a9b3ceb 100644
--- 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" : {
"get_input" : "resolution-key"
}
- },
- "dynamic-db-source" : {
- "type" : "maria-db",
- "url" : "jdbc:mysql://mariadb-galera:3306/sdnctl",
- "username" : "root",
- "password" : "secretpassword"
}
},
"topology_template" : {
@@ -302,4 +296,4 @@
}
}
}
-} \ No newline at end of file
+}
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 9631cbb46..b82d44c7f 100644
--- 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 16f8fcfce..86e35e0dd 100644
--- 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" : {