1 files changed, 2 insertions, 110 deletions
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 89342dbf..ba31cfc8 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
@@ -406,42 +406,6 @@
       }
     }
   },
-  "int_private1_subnet_id" : {
-    "tags" : "k8s, cnf, int_private1_subnet_id",
-    "name" : "int_private1_subnet_id",
-    "property" : {
-      "description" : "Private unprotected subnetwork identification",
-      "type" : "string"
-    },
-    "group" : "default",
-    "updated-by" : "Samuli, Silvius <s.silvius@partner.samsung.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/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" ]
-        }
-      }
-    }
-  },
   "int_private2_gw_ip" : {
     "tags" : "k8s, cnf, int_private2_gw_ip",
     "name" : "int_private2_gw_ip",
@@ -562,44 +526,8 @@
       }
     }
   },
-  "int_private2_subnet_id" : {
-    "tags" : "k8s, cnf, int_private2_subnet_id",
-    "name" : "int_private2_subnet_id",
-    "property" : {
-      "description" : "Private protected subnetwork identification",
-      "type" : "string"
-    },
-    "group" : "default",
-    "updated-by" : "Samuli, Silvius <s.silvius@partner.samsung.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/int_private2_subnet_id",
-          "path" : "/param/0/value",
-          "input-key-mapping" : {
-            "service-instance-id" : "service-instance-id",
-            "vnf-id" : "vnf-id"
-          },
-          "output-key-mapping" : {
-            "int_private2_subnet_id" : "value"
-          },
-          "key-dependencies" : [ "service-instance-id", "vnf-id" ]
-        }
-      }
-    }
-  },
   "k8s-rb-profile-name" : {
-    "tags" : "k8s, cnf, profile",
+    "tags" : "k8s, cnf, profile, k8s-rb-profile-name",
     "name" : "k8s-rb-profile-name",
     "property" : {
       "description" : "Profile name used in multicloud/k8s plugin to identify Helm chart(s) where this mapping is providing override values.",
@@ -635,7 +563,7 @@
     }
   },
   "k8s-rb-profile-namespace" : {
-    "tags" : "k8s-rb-profile-namespace",
+    "tags" : "k8s, cnf, profile, namespace, k8s-rb-profile-namespace",
     "name" : "k8s-rb-profile-namespace",
     "property" : {
       "description" : "Profile name used in multicloud/k8s plugin",
@@ -944,42 +872,6 @@
       }
     }
   },
-  "onap_private_subnet_id" : {
-    "tags" : "onap_private_subnet_id",
-    "name" : "onap_private_subnet_id",
-    "property" : {
-      "description" : "onap_private_subnet_id",
-      "type" : "string"
-    },
-    "group" : "default",
-    "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/onap_private_subnet_id",
-          "path" : "/param/0/value",
-          "input-key-mapping" : {
-            "service-instance-id" : "service-instance-id",
-            "vnf-id" : "vnf-id"
-          },
-          "output-key-mapping" : {
-            "onap_private_subnet_id" : "value"
-          },
-          "key-dependencies" : [ "service-instance-id", "vnf-id" ]
-        }
-      }
-    }
-  },
   "private1-prefix-id" : {
     "tags" : "private1-prefix-id",
     "name" : "private1-prefix-id",