Merge "Add declarative acceptance tests"

15 files changed, 0 insertions, 652 deletions

diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/activation-blueprint.json b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/activation-blueprint.json
deleted file mode 100644
index d185128d5..000000000
--- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/activation-blueprint.json
+++ /dev/null
@@ -1,184 +0,0 @@
-{
-  "tosca_definitions_version" : "controller_blueprint_1_0_0",
-  "metadata" : {
-    "template_author" : "Rodrigo Ottero",
-    "author-email" : "rodrigo.ottero@est.tech",
-    "user-groups" : "ADMIN, OPERATION",
-    "template_name" : "configuration_over_restconf",
-    "template_version" : "1.0.0",
-    "template_tags" : "pnf, restconf, config, configuration"
-  },
-  "imports" : [ {
-    "file" : "Definitions/data_types.json"
-  }, {
-    "file" : "Definitions/relationship_types.json"
-  }, {
-    "file" : "Definitions/artifact_types.json"
-  }, {
-    "file" : "Definitions/node_types.json"
-  }, {
-    "file" : "Definitions/policy_types.json"
-  } ],
-  "dsl_definitions" : {
-    "config-deploy-properties" : {
-      "resolution-key" : {
-        "get_input" : "resolution-key"
-      }
-    }
-  },
-  "topology_template" : {
-    "workflows" : {
-      "config-assign" : {
-        "steps" : {
-          "activate-process" : {
-            "description" : "Create a configlet",
-            "target" : "config-assign-process",
-            "activities" : [ {
-              "call_operation" : ""
-            } ]
-          }
-        },
-        "inputs" : {
-          "resolution-key" : {
-            "required" : true,
-            "type" : "string"
-          },
-          "store-result" : {
-            "required" : true,
-            "type" : "boolean"
-          },
-          "config-assign-properties" : {
-            "description" : "Dynamic PropertyDefinition for workflow(config-assign).",
-            "required" : true,
-            "type" : "dt-config-assign-properties"
-          }
-        }
-      },
-      "config-deploy" : {
-        "steps" : {
-          "activate-process" : {
-            "description" : "Send a configlet to the pnf",
-            "target" : "config-deploy-process",
-            "activities" : [ {
-              "call_operation" : ""
-            } ]
-          }
-        },
-        "inputs" : {
-          "resolution-key" : {
-            "required" : true,
-            "type" : "string"
-          },
-          "config-deploy-properties" : {
-            "description" : "Dynamic PropertyDefinition for workflow(config-deploy).",
-            "required" : true,
-            "type" : "dt-config-deploy-properties"
-          }
-        }
-      }
-    },
-    "node_templates" : {
-      "config-assign-process" : {
-        "type" : "dg-generic",
-        "properties" : {
-          "content" : {
-            "get_artifact" : [ "SELF", "dg-config-assign-process" ]
-          },
-          "dependency-node-templates" : [ "config-assign" ]
-        },
-        "artifacts" : {
-          "dg-config-assign-process" : {
-            "type" : "artifact-directed-graph",
-            "file" : "Plans/CONFIG_configAssign.xml"
-          }
-        }
-      },
-      "config-assign" : {
-        "type" : "component-resource-resolution",
-        "interfaces" : {
-          "ResourceResolutionComponent" : {
-            "operations" : {
-              "process" : {
-                "inputs" : {
-                  "resolution-key" : {
-                    "get_input" : "resolution-key"
-                  },
-                  "store-result" : true,
-                  "artifact-prefix-names" : ["config-assign"]
-                },
-                "outputs" : {
-                  "resource-assignment-params" : {
-                    "get_attribute" : [ "SELF", "assignment-params" ]
-                  },
-                  "status" : "success"
-                }
-              }
-            }
-          }
-        },
-        "artifacts" : {
-          "config-assign-template" : {
-            "type" : "artifact-template-velocity",
-            "file" : "Templates/config-assign-restconf-configlet-template.vtl"
-          },
-          "config-assign-mapping" : {
-            "type" : "artifact-mapping-resource",
-            "file" : "Definitions/config-assign-pnf-mapping.json"
-          }
-        }
-      },
-      "config-deploy-process" : {
-        "type" : "dg-generic",
-        "properties" : {
-          "content" : {
-            "get_artifact" : [ "SELF", "dg-config-deploy-process" ]
-          },
-          "dependency-node-templates" : [ "config-deploy" ]
-        },
-        "artifacts" : {
-          "dg-config-assign-process" : {
-            "type" : "artifact-directed-graph",
-            "file" : "Plans/CONFIG_configDeploy.xml"
-          }
-        }
-      },
-      "config-deploy" : {
-        "type" : "component-script-executor",
-        "interfaces" : {
-          "ComponentScriptExecutor" : {
-            "operations" : {
-              "process" : {
-                "implementation" : {
-                  "primary" : "component-script"
-                },
-                "inputs" : {
-                  "script-type" : "jython",
-                  "script-class-reference" : "Scripts/python/RestconfConfigDeploy.py",
-                  "dynamic-properties" : "*config-deploy-properties"
-                },
-                "outputs" : {
-                  "response-data" : "",
-                  "status" : "success"
-                }
-              }
-            }
-          }
-        },
-        "artifacts" : {
-          "config-deploy-template" : {
-            "type" : "artifact-template-velocity",
-            "file" : "Templates/config-deploy-restconf-mount-template.vtl"
-          },
-          "config-deploy-mapping" : {
-            "type" : "artifact-mapping-resource",
-            "file" : "Definitions/config-deploy-pnf-mapping.json"
-          },
-          "component-script" : {
-            "type" : "artifact-script-jython",
-            "file" : "Scripts/python/RestconfConfigDeploy.py"
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/artifact_types.json b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/artifact_types.json
deleted file mode 100644
index aa5295e44..000000000
--- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/artifact_types.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "artifact_types" : {
-    "artifact-directed-graph" : {
-      "description" : "Directed Graph File",
-      "version" : "1.0.0",
-      "derived_from" : "tosca.artifacts.Implementation",
-      "file_ext" : [ "json", "xml" ]
-    },
-    "artifact-mapping-resource" : {
-      "description" : "Resource Mapping File used along with Configuration template",
-      "version" : "1.0.0",
-      "derived_from" : "tosca.artifacts.Implementation",
-      "file_ext" : [ "json" ]
-    },
-    "artifact-script-jython" : {
-      "description" : "Jython Script File",
-      "version" : "1.0.0",
-      "derived_from" : "tosca.artifacts.Implementation",
-      "file_ext" : [ "py" ]
-    },
-    "artifact-template-velocity" : {
-      "description" : " Velocity Template used for Configuration",
-      "version" : "1.0.0",
-      "derived_from" : "tosca.artifacts.Implementation",
-      "file_ext" : [ "vtl" ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/config-assign-pnf-mapping.json b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/config-assign-pnf-mapping.json
deleted file mode 100644
index fe51488c7..000000000
--- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/config-assign-pnf-mapping.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/config-deploy-pnf-mapping.json b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/config-deploy-pnf-mapping.json
deleted file mode 100644
index d87b8d1f1..000000000
--- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/config-deploy-pnf-mapping.json
+++ /dev/null
@@ -1,24 +0,0 @@
-[
-  {
-    "name": "pnf-id",
-    "input-param": true,
-    "property": {
-      "type": "string"
-    },
-    "dictionary-name": "pnf-id",
-    "dictionary-source": "input",
-    "dependencies": [
-    ]
-  },
-  {
-    "name": "pnf-ipv4-address",
-    "input-param": true,
-    "property": {
-      "type": "string"
-    },
-    "dictionary-name": "pnf-ipv4-address",
-    "dictionary-source": "input",
-    "dependencies": [
-    ]
-  }
-]
diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/data_types.json b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/data_types.json
deleted file mode 100644
index a0804bb3f..000000000
--- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/data_types.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "data_types" : {
-    "dt-config-assign-properties" : {
-      "description" : "Dynamic DataType definition for workflow(config-assign).",
-      "version" : "1.0.0",
-      "properties" : { },
-      "derived_from" : "tosca.datatypes.Dynamic"
-    },
-    "dt-config-deploy-properties" : {
-      "description" : "Dynamic DataType definition for workflow(config-deploy).",
-      "version" : "1.0.0",
-      "properties" : {
-        "pnf-ipv4-address" : {
-          "type" : "string"
-        },
-        "pnf-id" : {
-          "type" : "string"
-        }
-      },
-      "derived_from" : "tosca.datatypes.Dynamic"
-    }
-  }
-}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/node_types.json b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/node_types.json
deleted file mode 100644
index 8c2c0abea..000000000
--- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/node_types.json
+++ /dev/null
@@ -1,174 +0,0 @@
-{
-  "node_types" : {
-    "component-resource-resolution" : {
-      "description" : "This is Resource Assignment Component API",
-      "version" : "1.0.0",
-      "attributes" : {
-        "assignment-params" : {
-          "required" : true,
-          "type" : "string"
-        }
-      },
-      "capabilities" : {
-        "component-node" : {
-          "type" : "tosca.capabilities.Node"
-        }
-      },
-      "interfaces" : {
-        "ResourceResolutionComponent" : {
-          "operations" : {
-            "process" : {
-              "inputs" : {
-                "resolution-key" : {
-                  "description" : "Key for service instance related correlation.",
-                  "required" : false,
-                  "type" : "string"
-                },
-                "store-result" : {
-                  "description" : "Whether or not to store the output.",
-                  "required" : false,
-                  "type" : "boolean"
-                },
-                "resource-type" : {
-                  "description" : "Request type.",
-                  "required" : false,
-                  "type" : "string"
-                },
-                "artifact-prefix-names" : {
-                  "description" : "Template , Resource Assignment Artifact Prefix names",
-                  "required" : true,
-                  "type" : "list",
-                  "entry_schema" : {
-                    "type" : "string"
-                  }
-                },
-                "request-id" : {
-                  "description" : "Request Id, Unique Id for the request.",
-                  "required" : true,
-                  "type" : "string"
-                },
-                "resource-id" : {
-                  "description" : "Resource Id.",
-                  "required" : false,
-                  "type" : "string"
-                },
-                "action-name" : {
-                  "description" : "Action Name of the process",
-                  "required" : false,
-                  "type" : "string"
-                },
-                "dynamic-properties" : {
-                  "description" : "Dynamic Json Content or DSL Json reference.",
-                  "required" : false,
-                  "type" : "json"
-                }
-              },
-              "outputs" : {
-                "resource-assignment-params" : {
-                  "required" : true,
-                  "type" : "string"
-                },
-                "status" : {
-                  "required" : true,
-                  "type" : "string"
-                }
-              }
-            }
-          }
-        }
-      },
-      "derived_from" : "tosca.nodes.Component"
-    },
-    "component-script-executor" : {
-      "description" : "This is Restconf Transaction Configuration Component API",
-      "version" : "1.0.0",
-      "capabilities" : {
-        "component-node" : {
-          "type" : "tosca.capabilities.Node"
-        }
-      },
-      "interfaces" : {
-        "ComponentScriptExecutor" : {
-          "operations" : {
-            "process" : {
-              "inputs" : {
-                "script-type" : {
-                  "description" : "Script type, kotlin type is supported",
-                  "required" : true,
-                  "type" : "string",
-                  "constraints" : [ {
-                    "valid_values" : [ "kotlin", "jython", "internal" ]
-                  } ],
-                  "default" : "internal"
-                },
-                "script-class-reference" : {
-                  "description" : "Kotlin Script class name or jython script name.",
-                  "required" : true,
-                  "type" : "string"
-                },
-                "dynamic-properties" : {
-                  "description" : "Dynamic Json Content or DSL Json reference.",
-                  "required" : false,
-                  "type" : "json"
-                }
-              },
-              "outputs" : {
-                "response-data" : {
-                  "description" : "Execution Response Data in JSON format.",
-                  "required" : false,
-                  "type" : "string"
-                },
-                "status" : {
-                  "description" : "Status of the Component Execution ( success or failure )",
-                  "required" : true,
-                  "type" : "string"
-                }
-              }
-            }
-          }
-        }
-      },
-      "derived_from" : "tosca.nodes.Component"
-    },
-    "dg-generic" : {
-      "description" : "This is Generic Directed Graph Type",
-      "version" : "1.0.0",
-      "properties" : {
-        "content" : {
-          "required" : true,
-          "type" : "string"
-        },
-        "dependency-node-templates" : {
-          "description" : "Dependent Step Components NodeTemplate name.",
-          "required" : true,
-          "type" : "list",
-          "entry_schema" : {
-            "type" : "string"
-          }
-        }
-      },
-      "derived_from" : "tosca.nodes.Workflow"
-    },
-    "source-input" : {
-      "description" : "This is Input Resource Source Node Type",
-      "version" : "1.0.0",
-      "properties" : { },
-      "derived_from" : "tosca.nodes.ResourceSource"
-    },
-    "tosca.nodes.Component" : {
-      "description" : "This is default Component Node",
-      "version" : "1.0.0",
-      "derived_from" : "tosca.nodes.Root"
-    },
-    "tosca.nodes.ResourceSource" : {
-      "description" : "TOSCA base type for Resource Sources",
-      "version" : "1.0.0",
-      "derived_from" : "tosca.nodes.Root"
-    },
-    "tosca.nodes.Workflow" : {
-      "description" : "This is Directed Graph Node Type",
-      "version" : "1.0.0",
-      "derived_from" : "tosca.nodes.Root"
-    }
-  }
-}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/policy_types.json b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/policy_types.json
deleted file mode 100644
index 1e44cc70a..000000000
--- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/policy_types.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "policy_types" : { }
-}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/relationship_types.json b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/relationship_types.json
deleted file mode 100644
index 4ddd7a57c..000000000
--- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/relationship_types.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "relationship_types" : { }
-}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/resources_definition_types.json
deleted file mode 100644
index 114eb1992..000000000
--- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/resources_definition_types.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "pnf-id" : {
-    "tags" : "pnf-id",
-    "name" : "pnf-id",
-    "property" : {
-      "description" : "pnf-id",
-      "type" : "string"
-    },
-    "updated-by" : "Rodrigo Ottero <rodrigo.ottero@est.tech>",
-    "sources" : {
-      "input" : {
-        "type" : "source-input",
-        "properties" : { }
-      }
-    }
-  },
-  "pnf-ipv4-address" : {
-    "tags" : "pnf-ipv4-address",
-    "name" : "pnf-ipv4-address",
-    "property" : {
-      "description" : "pnf-ipv4-address",
-      "type" : "string"
-    },
-    "updated-by" : "Rodrigo Ottero <rodrigo.ottero@est.tech>",
-    "sources" : {
-      "input" : {
-        "type" : "source-input",
-        "properties" : { }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Plans/CONFIG_configAssign.xml b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Plans/CONFIG_configAssign.xml
deleted file mode 100644
index 220cba9f7..000000000
--- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Plans/CONFIG_configAssign.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<service-logic xmlns="http://www.onap.org/sdnc/svclogic" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module="CONFIG" version="1.0.0">
-   <method rpc="ResourceAssignAndActivate" mode="sync">
-      <block atomic="true">
-         <execute plugin="config-assign" method="process">
-            <outcome value="failure">
-               <return status="failure" />
-            </outcome>
-            <outcome value="success">
-               <return status="success" />
-            </outcome>
-         </execute>
-      </block>
-   </method>
-</service-logic>
diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Plans/CONFIG_configDeploy.xml b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Plans/CONFIG_configDeploy.xml
deleted file mode 100644
index fbed3d575..000000000
--- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Plans/CONFIG_configDeploy.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<service-logic xmlns="http://www.onap.org/sdnc/svclogic" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module="CONFIG" version="1.0.0">
-   <method rpc="ResourceAssignAndActivate" mode="sync">
-      <block atomic="true">
-         <execute plugin="config-deploy" method="process">
-            <outcome value="failure">
-               <return status="failure" />
-            </outcome>
-            <outcome value="success">
-               <return status="success" />
-            </outcome>
-         </execute>
-      </block>
-   </method>
-</service-logic>
diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Scripts/python/RestconfConfigDeploy.py b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Scripts/python/RestconfConfigDeploy.py
deleted file mode 100644
index 7bda87229..000000000
--- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Scripts/python/RestconfConfigDeploy.py
+++ /dev/null
@@ -1,78 +0,0 @@
-# ============LICENSE_START=======================================================
-#  Copyright (C) 2019 Nordix Foundation.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END=========================================================
-
-from java.lang import Exception as JavaException
-
-from restconf_client import RestconfClient
-from org.onap.ccsdk.cds.blueprintsprocessor.services.execution import AbstractScriptComponentFunction
-
-
-class RestconfConfigDeploy(AbstractScriptComponentFunction):
-    log = globals()["log"]
-    configlet_template_name = "config-assign"
-    configlet_resource_path = "/yang-ext:mount/mynetconf:netconflist"
-    restconf_server_identifier = "sdncodl"
-
-    def process(self, execution_request):
-
-        self.log.info("Started execution of process method")
-        try:
-            restconf_client = RestconfClient(self.log, self)
-            pnf_id, resolution_key = self.retrieve_parameters(execution_request)
-            web_client_service = restconf_client.web_client_service(self.restconf_server_identifier)
-
-            try:
-                # mount the device
-                mount_payload = restconf_client.resolve_and_generate_message_from_template_prefix("config-deploy")
-                restconf_client.mount_device(web_client_service, pnf_id, mount_payload)
-
-                # log the current configuration subtree
-                current_configuration = restconf_client.retrieve_device_configuration_subtree(
-                    web_client_service, pnf_id, self.configlet_resource_path)
-                self.log.info("Current configuration subtree: {}", current_configuration)
-
-                # apply configuration
-                configlet = restconf_client.retrieve_resolved_template_from_database(resolution_key, self.configlet_template_name)
-                restconf_client.configure_device_json_patch(
-                    web_client_service, pnf_id, self.configlet_resource_path, configlet)
-            except Exception, err:
-                self.log.error("an error occurred while configuring device {}", err)
-                raise err
-            finally:
-                restconf_client.unmount_device(web_client_service, pnf_id)
-
-        except JavaException, err:
-            self.log.error("Java Exception in the script", err)
-            raise err
-        except Exception, err:
-            self.log.error("Python Exception in the script:" + str(err), err)
-            raise err
-        self.log.info("Ended execution of process method")
-
-    def retrieve_parameters(self, execution_request):
-        resolution_key = self.getDynamicProperties("resolution-key").asText()
-        self.log.info("resolution_key: {}", resolution_key)
-        pnf_id = execution_request.payload.get("config-deploy-request").get("config-deploy-properties").get("pnf-id")
-        pnf_id = str(pnf_id).strip('\"')
-        self.log.info("pnf-id: {}", pnf_id)
-        return pnf_id, resolution_key
-
-    def recover(self, runtime_exception, execution_request):
-        self.log.info("Recover function called!")
-        self.log.info("Execution request", execution_request)
-        self.log.error("Exception", runtime_exception)
-        print self.bluePrintRuntimeService.getBluePrintError().addError(runtime_exception.getMessage())
-        return None
diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/TOSCA-Metadata/TOSCA.meta b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/TOSCA-Metadata/TOSCA.meta
deleted file mode 100644
index 6ac9caf57..000000000
--- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/TOSCA-Metadata/TOSCA.meta
+++ /dev/null
@@ -1,5 +0,0 @@
-TOSCA-Meta-File-Version: 1.0.0
-CSAR-Version: 1.0
-Created-By: Rodrigo Ottero
-Entry-Definitions: Definitions/activation-blueprint.json
-Template-Tags: activation-blueprint
diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Templates/config-assign-restconf-configlet-template.vtl b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Templates/config-assign-restconf-configlet-template.vtl
deleted file mode 100644
index af91ba00d..000000000
--- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Templates/config-assign-restconf-configlet-template.vtl
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-   "ietf-restconf:yang-patch":{
-      "patch-id":"patch-1",
-      "edit":[
-         {
-            "edit-id":"edit1",
-            "operation":"merge",
-            "target":"/",
-            "value":{
-               "netconflist":{
-                  "netconf":[
-                     {
-                        "netconf-id":"10",
-                        "netconf-param":"1000"
-                     }
-                  ]
-               }
-            }
-         },
-         {
-            "edit-id":"edit2",
-            "operation":"merge",
-            "target":"/",
-            "value":{
-               "netconflist":{
-                  "netconf":[
-                     {
-                        "netconf-id":"20",
-                        "netconf-param":"2000"
-                     }
-                  ]
-               }
-            }
-         },
-         {
-            "edit-id":"edit3",
-            "operation":"merge",
-            "target":"/",
-            "value":{
-               "netconflist":{
-                  "netconf":[
-                     {
-                        "netconf-id":"30",
-                        "netconf-param":"3000"
-                     }
-                  ]
-               }
-            }
-         }
-
-      ]
-   }
-}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Templates/config-deploy-restconf-mount-template.vtl b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Templates/config-deploy-restconf-mount-template.vtl
deleted file mode 100644
index ad03321af..000000000
--- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Templates/config-deploy-restconf-mount-template.vtl
+++ /dev/null
@@ -1,14 +0,0 @@
-<node xmlns="urn:TBD:params:xml:ns:yang:network-topology">
-    <node-id>$pnf-id</node-id>
-    <key-based xmlns="urn:opendaylight:netconf-node-topology">
-        <key-id xmlns="urn:opendaylight:netconf-node-topology">ODL_private_key_0</key-id>
-        <username xmlns="urn:opendaylight:netconf-node-topology">netconf</username>
-     </key-based>
-    <host xmlns="urn:opendaylight:netconf-node-topology">$pnf-ipv4-address</host>
-    <port xmlns="urn:opendaylight:netconf-node-topology">6513</port>
-    <tcp-only xmlns="urn:opendaylight:netconf-node-topology">false</tcp-only>
-    <protocol xmlns="urn:opendaylight:netconf-node-topology">
-        <name xmlns="urn:opendaylight:netconf-node-topology">TLS</name>
-    </protocol>
-    <max-connection-attempts xmlns="urn:opendaylight:netconf-node-topology">5</max-connection-attempts>
-</node>