X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FvFW_CNF_CDS%2Ftemplates%2Fcba%2FDefinitions%2Fresources_definition_types.json;h=63d83e44379ba44861b891fb62b20307187765c5;hb=3a3e9fcdd1141928473b5f793e224204eafe8f1b;hp=cb5aaeb42e376430ed7463bb5eead11c2dd75701;hpb=89da408dd79bcc7cfb4d89033da435c974c13e70;p=demo.git

diff --git a/heat/vFW_CNF_CDS/templates/cba/Definitions/resources_definition_types.json b/heat/vFW_CNF_CDS/templates/cba/Definitions/resources_definition_types.json
index cb5aaeb4..63d83e44 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Definitions/resources_definition_types.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Definitions/resources_definition_types.json
@@ -192,7 +192,6 @@
                 "type": "source-db",
                 "properties": {
                     "type": "SQL",
-                    "endpoint-selector": "dynamic-db-source",
                     "query": "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private1\"",
                     "input-key-mapping": {},
                     "output-key-mapping": {
@@ -223,7 +222,6 @@
                 "type": "source-db",
                 "properties": {
                     "type": "SQL",
-                    "endpoint-selector": "dynamic-db-source",
                     "query": "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private2\"",
                     "output-key-mapping": {
                         "int_private2_net_cidr": "prefix"
@@ -269,26 +267,6 @@
             "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/k8s-rb-profile-name",
-                    "path": "/param/0/value",
-                    "input-key-mapping": {
-                        "service-instance-id": "service-instance-id",
-                        "vnf-id": "vnf-id"
-                    },
-                    "output-key-mapping": {
-                        "k8s-rb-profile-name": "value"
-                    },
-                    "key-dependencies": [
-                        "service-instance-id",
-                        "vnf-id"
-                    ]
-                }
             }
         }
     },
@@ -331,6 +309,25 @@
             }
         }
     },
+    "k8s-rb-profile-source": {
+        "tags": "k8s, cnf, profile, k8s-rb-profile-source",
+        "name": "k8s-rb-profile-source",
+        "property": {
+            "description": "The source folder or file relative to 'Templates/k8s-profiles' folder",
+            "type": "string"
+        },
+        "group": "default",
+        "updated-by": "Rajewski, Lukasz <lukasz.rajewski@orange.com>",
+        "sources": {
+            "input": {
+                "type": "source-input"
+            },
+            "default": {
+                "type": "source-default",
+                "properties": {}
+            }
+        }
+    },
     "management-prefix-id": {
         "tags": "management-prefix-id",
         "name": "management-prefix-id",
@@ -372,7 +369,6 @@
                 "type": "source-db",
                 "properties": {
                     "type": "SQL",
-                    "endpoint-selector": "dynamic-db-source",
                     "query": "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"management\"",
                     "input-key-mapping": {},
                     "output-key-mapping": {
@@ -403,7 +399,6 @@
                 "type": "source-db",
                 "properties": {
                     "type": "SQL",
-                    "endpoint-selector": "dynamic-db-source",
                     "query": "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"management\"",
                     "input-key-mapping": {},
                     "output-key-mapping": {
@@ -474,7 +469,6 @@
                 "type": "source-db",
                 "properties": {
                     "type": "SQL",
-                    "endpoint-selector": "dynamic-db-source",
                     "query": "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"private1\"",
                     "input-key-mapping": {},
                     "output-key-mapping": {
@@ -525,7 +519,6 @@
                 "type": "source-db",
                 "properties": {
                     "type": "SQL",
-                    "endpoint-selector": "dynamic-db-source",
                     "query": "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"private2\"",
                     "input-key-mapping": {},
                     "output-key-mapping": {
@@ -704,8 +697,7 @@
                     },
                     "key-dependencies": [
                         "vf-module-model-customization-uuid"
-                    ],
-                    "endpoint-selector": "dynamic-db-source"
+                    ]
                 }
             }
         }
@@ -759,8 +751,7 @@
                     },
                     "key-dependencies": [
                         "vf-module-model-customization-uuid"
-                    ],
-                    "endpoint-selector": "dynamic-db-source"
+                    ]
                 }
             }
         }
@@ -795,8 +786,7 @@
                     },
                     "key-dependencies": [
                         "vf-module-model-customization-uuid"
-                    ],
-                    "endpoint-selector": "dynamic-db-source"
+                    ]
                 }
             }
         }
@@ -936,7 +926,7 @@
         "name": "vpg-management-port",
         "property": {
             "description": "vpg-management-port",
-            "type": "string"
+            "type": "integer"
         },
         "group": "default",
         "updated-by": "Rajewski, Lukasz <lukasz.rajewski@orange.com>",