Simplify CBA by removing unnecessary variables

[demo.git] / heat / vFW_CNF_CDS / templates / cba / Definitions / vFW_CNF_CDS.json

diff --git a/heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json b/heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json
index c4b6516..4a0ec29 100644 (file)
--- a/heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json
@@ -5,7 +5,7 @@
     "author-email" : "abdelmuhaimen.seaudi@orange.com",
     "user-groups" : "ADMIN, OPERATION",
     "template_name" : "vFW_CNF_CDS",
-    "template_version" : "1.0.0",
+    "template_version" : "1.0.44",
     "template_tags" : "Samuli Silvius, vFW_CNF_CDS",
     "template_type" : "DEFAULT"
   },
@@ -21,11 +21,6 @@
     "file" : "Definitions/policy_types.json"
   } ],
   "dsl_definitions" : {
-    "ipam-1" : {
-      "type" : "token-auth",
-      "url" : "http://netbox-nginx:8080",
-      "token" : "Token 0123456789abcdef0123456789abcdef01234567"
-    },
     "vpkg-rest-api" : {
       "type" : "basic-auth",
       "url" : "http://",
@@ -39,10 +34,16 @@
       "url" : "http://multicloud-k8s:9015"
     },
     "profile-upload-properties" : {
-      "resolution-key" : {
-        "get_input" : "resolution-key"
+      "assignment-params" : {
+        "get_attribute" : [ "resource-assignment", "assignment-params" ]
+      },
+      "profile-modification-decision-data" : {
+        "get_input" : "vpg-management-port"
       },
-      "api-access": "*multicloud-k8s-api"
+      "profile-artifacts" : {
+        "get_attribute" : [ "profile-modification", "assignment-params" ]
+      },
+      "api-access" : "*multicloud-k8s-api"
     },
     "config-deploy-properties" : {
       "resolution-key" : {
@@ -63,23 +64,25 @@
           "resource-assignment" : {
             "description" : "Resource Assign Workflow",
             "target" : "resource-assignment",
-            "activities": [
-              {
-                "call_operation": "ResourceResolutionComponent.process"
-              }
-            ],
-            "on_success": [
-              "profile-upload"
-            ]
+            "activities" : [ {
+              "call_operation" : "ResourceResolutionComponent.process"
+            } ],
+            "on_success" : [ "profile-modification" ]
+          },
+          "profile-modification" : {
+            "description" : "Profile Modification Resources",
+            "target" : "profile-modification",
+            "activities" : [ {
+              "call_operation" : "ResourceResolutionComponent.process"
+            } ],
+            "on_success" : [ "profile-upload" ]
           },
           "profile-upload" : {
             "description" : "Upload K8s Profile",
             "target" : "profile-upload",
-            "activities": [
-              {
-                "call_operation": "ComponentScriptExecutor.process"
-              }
-            ]
+            "activities" : [ {
+              "call_operation" : "ComponentScriptExecutor.process"
+            } ]
           }
         },
         "inputs" : {
@@ -147,10 +150,6 @@
                   "artifact-prefix-names" : {
                     "get_input" : "template-prefix"
                   }
-                },
-                "store-result": true,
-                "resolution-key": {
-                  "get_input" : "resolution-key"
                 }
               }
             }
@@ -199,6 +198,30 @@
           }
         }
       },
+      "profile-modification" : {
+        "type" : "component-resource-resolution",
+        "interfaces" : {
+          "ResourceResolutionComponent" : {
+            "operations" : {
+              "process" : {
+                "inputs" : {
+                  "artifact-prefix-names" : [ "ssh-service" ]
+                }
+              }
+            }
+          }
+        },
+        "artifacts" : {
+          "ssh-service-template" : {
+            "type" : "artifact-template-velocity",
+            "file" : "Templates/k8s-profiles/ssh-service-template.vtl"
+          },
+          "ssh-service-mapping" : {
+            "type" : "artifact-mapping-resource",
+            "file" : "Templates/k8s-profiles/ssh-service-mapping.json"
+          }
+        }
+      },
       "profile-upload" : {
         "type" : "component-script-executor",
         "interfaces" : {
@@ -208,7 +231,6 @@
                 "inputs" : {
                   "script-type" : "kotlin",
                   "script-class-reference" : "org.onap.ccsdk.cds.blueprintsprocessor.services.execution.scripts.K8sProfileUpload",
-                  "instance-dependencies" : [ ],
                   "dynamic-properties" : "*profile-upload-properties"
                 }
               }
@@ -242,4 +264,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}