From b8f16f15fa937db113dbe2e3b3438469fa284a71 Mon Sep 17 00:00:00 2001
From: "Muthuramalingam, Brinda Santh(bs2796)" <bs2796@att.com>
Date: Wed, 12 Dec 2018 16:49:04 -0500
Subject: Add multiple location repo for enhancer.

Change-Id: I5333b30fad8d754caf8dc89956132e4637f28c26
Issue-ID: CCSDK-803
Signed-off-by: Muthuramalingam, Brinda Santh(bs2796) <bs2796@att.com>
---
 .../Definitions/activation-blueprint.json          | 33 ++--------------------
 .../baseconfiguration/Definitions/node_types.json  | 13 ++-------
 2 files changed, 5 insertions(+), 41 deletions(-)

(limited to 'components/model-catalog/blueprint-model')

diff --git a/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/activation-blueprint.json b/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/activation-blueprint.json
index 446932d5..f756ef7e 100644
--- a/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/activation-blueprint.json
+++ b/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/activation-blueprint.json
@@ -39,17 +39,8 @@
     },
     "node_templates": {
       "resource-assignment-process": {
-        "type": "dg-activate",
+        "type": "dg-generic",
         "properties": {
-          "process-name": {
-            "get_input": "action-name"
-          },
-          "version": {
-            "get_property": [
-              "SELF",
-              "process-name"
-            ]
-          },
           "content": {
             "get_artifact": [
               "SELF",
@@ -65,17 +56,8 @@
         }
       },
       "activate-process": {
-        "type": "dg-activate",
+        "type": "dg-generic",
         "properties": {
-          "process-name": {
-            "get_input": "action-name"
-          },
-          "version": {
-            "get_property": [
-              "SELF",
-              "process-name"
-            ]
-          },
           "content": {
             "get_artifact": [
               "SELF",
@@ -91,17 +73,8 @@
         }
       },
       "assign-activate-process": {
-        "type": "dg-activate",
+        "type": "dg-generic",
         "properties": {
-          "process-name": {
-            "get_input": "action-name"
-          },
-          "version": {
-            "get_property": [
-              "SELF",
-              "process-name"
-            ]
-          },
           "content": {
             "get_artifact": [
               "SELF",
diff --git a/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/node_types.json b/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/node_types.json
index 6e8d839e..8227b82f 100644
--- a/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/node_types.json
+++ b/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/node_types.json
@@ -1,21 +1,12 @@
 {
   "node_types": {
-    "dg-activate": {
+    "dg-generic": {
       "description": "This is Generic Directed Graph Type",
       "version": "1.0.0",
       "properties": {
         "content": {
-          "required": false,
-          "type": "string"
-        },
-        "process-name": {
-          "required": false,
+          "required": true,
           "type": "string"
-        },
-        "version": {
-          "required": false,
-          "type": "string",
-          "default": "LATEST"
         }
       },
       "derived_from": "tosca.nodes.DG"
-- 
cgit 1.2.3-korg