Merge SW Upgrade Blueprint into PNF_AAI and create one UAT BP for PNF

UAT: Add support to multiple responses for a single request
     Set property IN_UAT=1 during UAT execution
     so blueprints can tune their settings to values more
     suitable for testing (like timeouts)
     Add 'times' field to specify expected number of invocations
     Add UAT blueprint script for PNF SW Upgrade UC
     Add current thread check for Hazelcast distributed lock
     Resolve URI before returning

Issue-ID: CCSDK-2091
Change-Id: Id256bad043488f88f1b60015ebf9ade4be607fa2
Signed-off-by: gummar <raj.gumma@est.tech>

18 files changed, 0 insertions, 881 deletions

diff --git a/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/Definitions/artifact_types.json b/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/Definitions/artifact_types.json
deleted file mode 100644
index 6ec3b4105..000000000
--- a/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/Definitions/artifact_types.json
+++ /dev/null
@@ -1,22 +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-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/uat-blueprints/pnf_config_aai/Definitions/config-assign-pnf-mapping.json b/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/Definitions/config-assign-pnf-mapping.json
deleted file mode 100644
index fe51488c7..000000000
--- a/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/Definitions/config-assign-pnf-mapping.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
diff --git a/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/Definitions/config-deploy-pnf-mapping.json b/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/Definitions/config-deploy-pnf-mapping.json
deleted file mode 100644
index dd8889c80..000000000
--- a/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/Definitions/config-deploy-pnf-mapping.json
+++ /dev/null
@@ -1,25 +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": false,
-    "property": {
-      "type": "string"
-    },
-    "dictionary-name": "pnf-ipaddress-aai",
-    "dictionary-source": "aai-data",
-    "dependencies": [
-      "pnf-id"
-    ]
-  }
-]
diff --git a/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/Definitions/data_types.json b/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/Definitions/data_types.json
deleted file mode 100644
index a0804bb3f..000000000
--- a/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/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/uat-blueprints/pnf_config_aai/Definitions/node_types.json b/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/Definitions/node_types.json
deleted file mode 100644
index bfae6779e..000000000
--- a/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/Definitions/node_types.json
+++ /dev/null
@@ -1,262 +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"
-                },
-                "occurrence" : {
-                  "description" : "Number of time to perform the resolution.",
-                  "required" : false,
-                  "type" : "integer",
-                  "default" : 1
-                },
-                "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 CLI Transaction Configuration Component API",
-      "version" : "1.0.0",
-      "attributes" : {
-        "response-data" : {
-          "required" : false,
-          "type" : "json"
-        }
-      },
-      "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.",
-                  "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"
-    },
-    "source-rest" : {
-      "description" : "This is Rest Resource Source Node Type",
-      "version" : "1.0.0",
-      "properties" : {
-        "type" : {
-          "required" : true,
-          "type" : "string",
-          "constraints" : [ {
-            "valid_values" : [ "JSON" ]
-          } ],
-          "default" : "JSON"
-        },
-        "headers" : {
-          "required" : false,
-          "type" : "map",
-          "entry_schema" : {
-            "type" : "string"
-          }
-        },
-        "verb" : {
-          "required" : true,
-          "type" : "string",
-          "constraints" : [ {
-            "valid_values" : [ "GET", "POST", "DELETE", "PUT" ]
-          } ],
-          "default" : "GET"
-        },
-        "payload" : {
-          "required" : false,
-          "type" : "string",
-          "default" : ""
-        },
-        "endpoint-selector" : {
-          "required" : false,
-          "type" : "string"
-        },
-        "url-path" : {
-          "required" : true,
-          "type" : "string"
-        },
-        "path" : {
-          "required" : true,
-          "type" : "string"
-        },
-        "expression-type" : {
-          "required" : false,
-          "type" : "string",
-          "constraints" : [ {
-            "valid_values" : [ "JSON_PATH", "JSON_POINTER" ]
-          } ],
-          "default" : "JSON_PATH"
-        },
-        "input-key-mapping" : {
-          "required" : false,
-          "type" : "map",
-          "entry_schema" : {
-            "type" : "string"
-          }
-        },
-        "output-key-mapping" : {
-          "required" : false,
-          "type" : "map",
-          "entry_schema" : {
-            "type" : "string"
-          }
-        },
-        "key-dependencies" : {
-          "required" : true,
-          "type" : "list",
-          "entry_schema" : {
-            "type" : "string"
-          }
-        }
-      },
-      "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/uat-blueprints/pnf_config_aai/Definitions/pnf_config_aai.json b/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/Definitions/pnf_config_aai.json
deleted file mode 100644
index 3ef585cb4..000000000
--- a/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/Definitions/pnf_config_aai.json
+++ /dev/null
@@ -1,152 +0,0 @@
-{
-  "tosca_definitions_version" : "controller_blueprint_1_0_0",
-  "metadata" : {
-    "template_author" : "Rahul Tyagi",
-    "author-email" : "rahul.tyagi@est.tech",
-    "user-groups" : "ADMIN, OPERATION",
-    "template_name" : "pnf_config_aai",
-    "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",
-            "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",
-            "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" : {
-        "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" : {
-        "type" : "component-script-executor",
-        "interfaces" : {
-          "ComponentScriptExecutor" : {
-            "operations" : {
-              "process" : {
-                "implementation" : {
-                  "primary" : "component-script",
-                  "timeout" : 180,
-                  "operation_host" : "SELF"
-                },
-                "inputs" : {
-                  "script-type" : "kotlin",
-                  "script-class-reference" : "cba.pnf.config.aai.RestconfConfigDeploy",
-                  "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"
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/Definitions/policy_types.json b/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/Definitions/policy_types.json
deleted file mode 100644
index 1e44cc70a..000000000
--- a/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/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/uat-blueprints/pnf_config_aai/Definitions/relationship_types.json b/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/Definitions/relationship_types.json
deleted file mode 100644
index 4ddd7a57c..000000000
--- a/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/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/uat-blueprints/pnf_config_aai/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/Definitions/resources_definition_types.json
deleted file mode 100644
index 235a05d27..000000000
--- a/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/Definitions/resources_definition_types.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "pnf-id" : {
-    "tags" : "pnf-id",
-    "name" : "pnf-id",
-    "property" : {
-      "description" : "pnf-id",
-      "type" : "string"
-    },
-    "updated-by" : "Rahul Tyagi <rahul.tyagi@est.tech>",
-    "sources" : {
-      "input" : {
-        "type" : "source-input",
-        "properties" : { }
-      }
-    }
-  },
-  "pnf-ipaddress-aai" : {
-    "tags" : "aai-get",
-    "name" : "pnf-ipaddress-aai",
-    "property" : {
-      "description" : "primary aai data to get resource",
-      "type" : "string"
-    },
-    "updated-by" : "Rahul, Tyagi <rahul.tyagi@est.tech>",
-    "sources" : {
-      "aai-data" : {
-        "type" : "source-rest",
-        "properties" : {
-          "type" : "JSON",
-          "verb" : "GET",
-          "url-path" : "/aai/v14/network/pnfs/pnf/$pnf-id",
-          "path" : "/ipaddress-v4-oam",
-          "input-key-mapping" : {
-            "pnf-id" : "pnf-id"
-          },
-          "headers" : {
-            "Accept" : "application/json"
-          },
-          "output-key-mapping" : {
-            "ipaddress-v4-oam" : "value"
-          },
-          "key-dependencies" : [ "pnf-id" ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/Environments/source-db.properties b/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/Environments/source-db.properties
deleted file mode 100644
index 49a7eb47b..000000000
--- a/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/Environments/source-db.properties
+++ /dev/null
@@ -1 +0,0 @@
-dynamic-db-source.password=sdnctl
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/Environments/source-rest.properties b/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/Environments/source-rest.properties
deleted file mode 100644
index bc1eb7417..000000000
--- a/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/Environments/source-rest.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-blueprintsprocessor.restclient.sdnc.type=basic-auth
-blueprintsprocessor.restclient.sdnc.url=http://127.0.0.1:9111
-blueprintsprocessor.restclient.sdnc.userId=sampleuser
-blueprintsprocessor.restclient.sdnc.token=sampletoken
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/Plans/CONFIG_configAssign.xml b/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/Plans/CONFIG_configAssign.xml
deleted file mode 100644
index a3eedf172..000000000
--- a/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/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/uat-blueprints/pnf_config_aai/Plans/CONFIG_configDeploy.xml b/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/Plans/CONFIG_configDeploy.xml
deleted file mode 100644
index f4e1b996f..000000000
--- a/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/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/uat-blueprints/pnf_config_aai/Scripts/kotlin/RestconfConfigDeploy.kt b/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/Scripts/kotlin/RestconfConfigDeploy.kt
deleted file mode 100644
index f0190e8ec..000000000
--- a/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/Scripts/kotlin/RestconfConfigDeploy.kt
+++ /dev/null
@@ -1,93 +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=========================================================
- */
-
-
-package cba.pnf.config.aai
-
-
-import org.onap.ccsdk.cds.blueprintsprocessor.core.api.data.ExecutionServiceInput
-import org.onap.ccsdk.cds.blueprintsprocessor.functions.resource.resolution.contentFromResolvedArtifactNB
-import org.onap.ccsdk.cds.blueprintsprocessor.functions.resource.resolution.storedContentFromResolvedArtifactNB
-import org.onap.ccsdk.cds.blueprintsprocessor.functions.restconf.executor.restconfMountDevice
-import org.onap.ccsdk.cds.blueprintsprocessor.functions.restconf.executor.restconfApplyDeviceConfig
-import org.onap.ccsdk.cds.blueprintsprocessor.functions.restconf.executor.restconfUnMountDevice
-import org.onap.ccsdk.cds.blueprintsprocessor.functions.restconf.executor.restconfDeviceConfig
-import org.onap.ccsdk.cds.blueprintsprocessor.functions.restconf.executor.restconfClientService
-import org.onap.ccsdk.cds.blueprintsprocessor.services.execution.AbstractScriptComponentFunction
-import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintProcessorException
-import org.onap.ccsdk.cds.controllerblueprints.core.logger
-import com.fasterxml.jackson.databind.ObjectMapper
-import org.onap.ccsdk.cds.blueprintsprocessor.rest.service.BlueprintWebClientService.WebClientResponse
-
-class RestconfConfigDeploy : AbstractScriptComponentFunction() {
-    private val CONFIGLET_TEMPLATE_NAME = "config-assign"
-    private val CONFIGLET_RESOURCE_PATH = "yang-ext:mount/mynetconf:netconflist"
-    private val RESTCONF_SERVER_IDENTIFIER = "sdnc"
-    private val mapper = ObjectMapper()
-    private val log = logger(AbstractScriptComponentFunction::class.java)
-
-    override suspend fun processNB(executionRequest: ExecutionServiceInput) {
-        log.info("Started execution of process method")
-        try {
-            // Extract Resolution key & Device ID
-            val resolutionKey = getDynamicProperties("resolution-key").asText()
-            log.info("resolution_key: $resolutionKey")
-            val deviceID: String = requestPayloadActionProperty("config-deploy-properties")?.get(0)?.get("pnf-id")?.textValue()!!
-            log.info("device_id: $deviceID")
-            val webclientService = restconfClientService(RESTCONF_SERVER_IDENTIFIER)
-
-            try {
-                // Mount the device
-                val mountPayload = contentFromResolvedArtifactNB("config-deploy")
-                log.debug("Mounting Device : $deviceID")
-                restconfMountDevice(webclientService, deviceID, mountPayload, mutableMapOf("Content-Type" to "application/json"))
-
-                //Log the current configuration for the subtree
-                val currentConfig: Any = restconfDeviceConfig(webclientService, deviceID, CONFIGLET_RESOURCE_PATH)
-                log.info("Current configuration subtree : $currentConfig")
-                //Apply configlet
-                val result = restconfApplyDeviceConfig(webclientService, deviceID, CONFIGLET_RESOURCE_PATH,
-                        storedContentFromResolvedArtifactNB(resolutionKey, CONFIGLET_TEMPLATE_NAME),
-                        mutableMapOf("Content-Type" to "application/yang.patch+json")) as WebClientResponse<*>
-
-                val jsonResult = mapper.readTree((result.body).toString())
-
-                if(jsonResult.get("ietf-yang-patch:yang-patch-status").get("errors") != null) {
-                    log.error("There was an error configuring device")
-                }  else {
-                    log.info("Device has been configured succesfully")
-                }
-
-            } catch (err: Exception) {
-                log.error("an error occurred while configuring device {}", err)
-            } finally {
-                //Un mount device
-                restconfUnMountDevice(webclientService, deviceID, "")
-            }
-        } catch (bpe: BluePrintProcessorException) {
-            log.error("Error looking up server identifier ", bpe)
-        }
-    }
-
-
-    override suspend fun recoverNB(runtimeException: RuntimeException, executionRequest: ExecutionServiceInput) {
-        log.info("Recover function called!")
-        log.info("Execution request : $executionRequest")
-        log.error("Exception", runtimeException)
-    }
-}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/TOSCA-Metadata/TOSCA.meta b/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/TOSCA-Metadata/TOSCA.meta
deleted file mode 100644
index 903600836..000000000
--- a/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/TOSCA-Metadata/TOSCA.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-TOSCA-Meta-File-Version: 1.0.0
-CSAR-Version: 1.0
-Created-By: Rahul Tyagi
-Entry-Definitions: Definitions/pnf_config_aai.json
-Template-Name: pnf_config_aai
-Template-Version: 1.0.0
-Template-Tags: pnf_config_aai
diff --git a/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/Templates/config-assign-restconf-configlet-template.vtl b/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/Templates/config-assign-restconf-configlet-template.vtl
deleted file mode 100644
index af91ba00d..000000000
--- a/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/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/uat-blueprints/pnf_config_aai/Templates/config-deploy-restconf-mount-template.vtl b/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/Templates/config-deploy-restconf-mount-template.vtl
deleted file mode 100644
index 8098b05d8..000000000
--- a/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/Templates/config-deploy-restconf-mount-template.vtl
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "node": [
-    {
-      "node-id": "${pnf-id}",
-      "netconf-node-topology:protocol": {
-        "name": "TLS"
-      },
-      "netconf-node-topology:host": "${pnf-ipv4-address}",
-      "netconf-node-topology:key-based": {
-        "username": "netconf",
-        "key-id": "ODL_private_key_0"
-      },
-      "netconf-node-topology:port": 6513,
-      "netconf-node-topology:tcp-only": false,
-      "netconf-node-topology:max-connection-attempts": 5
-    }
-  ]
-}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/Tests/uat.yaml b/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/Tests/uat.yaml
deleted file mode 100644
index 13e10f34b..000000000
--- a/components/model-catalog/blueprint-model/uat-blueprints/pnf_config_aai/Tests/uat.yaml
+++ /dev/null
@@ -1,137 +0,0 @@
-%YAML 1.1
----
-processes:
-  - name: config-assign
-    request:
-      commonHeader: &commonHeader
-        originatorId: sdnc
-        requestId: "123456-1000"
-        subRequestId: sub-123456-1000
-      actionIdentifiers: &assign-ai
-        blueprintName: pnf_config_aai
-        blueprintVersion: "1.0.0"
-        actionName: config-assign
-        mode: sync
-      payload:
-        config-assign-request:
-          resolution-key: &resKey "RES-KEY 61"
-          config-assign-properties:
-            service-instance-id: siid_1234
-            pnf-id: &pnfId pnf-id-2019-07-12
-            service-model-uuid: service-model-uuid
-            pnf-customization-uuid: pnf-customization-uuid
-    expectedResponse:
-      commonHeader: *commonHeader
-      actionIdentifiers: *assign-ai
-      status:
-        code: 200
-        eventType: EVENT_COMPONENT_EXECUTED
-        errorMessage: null
-        message: success
-      payload:
-        config-assign-response: {}
-  - name: config-deploy
-    request:
-      commonHeader: *commonHeader
-      actionIdentifiers: &deploy-ai
-        actionName: config-deploy
-        blueprintName: pnf_config_aai
-        blueprintVersion: "1.0.0"
-        mode: sync
-      payload:
-        config-deploy-request:
-          resolution-key: *resKey
-          config-deploy-properties:
-            service-instance-id: siid_1234
-            pnf-id: *pnfId
-            service-model-uuid: service-model-uuid
-            pnf-customization-uuid: pnf-customization-uuid
-    expectedResponse:
-      commonHeader: *commonHeader
-      actionIdentifiers: *deploy-ai
-      payload:
-        config-deploy-response: {}
-      status:
-        code: 200
-        errorMessage: null
-        eventType: EVENT_COMPONENT_EXECUTED
-        message: success
-
-external-services:
-  - selector: aai-data
-    expectations:
-      - request:
-          method: GET
-          path: [ /aai/v14/network/pnfs/pnf, *pnfId]
-          headers:
-            Accept: application/json
-        response:
-          headers:
-            Content-Type: application/json
-          body:
-            ipaddress-v4-oam: &pnfAddress 13.13.13.13
-            ipaddress-v6-oam: 1::13
-  - selector: sdnc
-    expectations:
-      - request:
-          method: PUT
-          path: &configUri [ restconf/config, &nodeIdentifier [network-topology:network-topology/topology/topology-netconf/node, *pnfId]]
-          headers:
-            Content-Type: application/json
-          body:
-            node:
-              - node-id: *pnfId
-                netconf-node-topology:protocol: { name: TLS }
-                netconf-node-topology:host: *pnfAddress
-                netconf-node-topology:key-based:
-                  username: netconf
-                  key-id: ODL_private_key_0
-                netconf-node-topology:port: 6513
-                netconf-node-topology:tcp-only: false
-                netconf-node-topology:max-connection-attempts: 5
-        response:
-          status: 201
-      - request:
-          method: GET
-          path: [ restconf/operational, *nodeIdentifier]
-        response:
-          body:
-            node: [ { netconf-node-topology:connection-status: connected }]
-      - request:
-          method: GET
-          path: [*configUri, &configletResourcePath yang-ext:mount/mynetconf:netconflist]
-        response:
-          body: {}
-      - request:
-          method: PATCH
-          path: [*configUri, *configletResourcePath]
-          headers:
-            Content-Type: application/yang.patch+json
-          body:
-            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" }]}}
-        response:
-          body:
-            ietf-yang-patch:yang-patch-status:
-              patch-id: patch-1
-              ok: [
-                null
-              ]
-      - request:
-          method: DELETE
-          path: *configUri
-
-