Modify the examples

Add example for Stop traffic, Drain traffic, Stop VNF, Create VNF, etc.

Issue-ID: SDC-1210

Change-Id: I4f1859a35ebd2c37a24e50549aae3e5c4713ace4
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>

diff --git a/distribution/src/main/assembly/ext-activities-display-info.json b/distribution/src/main/assembly/ext-activities-display-info.json
index 8a5e10a..72056a5 100644 (file)
--- a/distribution/src/main/assembly/ext-activities-display-info.json
+++ b/distribution/src/main/assembly/ext-activities-display-info.json
@@ -4,8 +4,6 @@
         },
         "apds_service": {
         },
-        "apds_rest": {
-        },
         "apds_scriptA": {
             "category": "aaa"
         },
@@ -15,10 +13,7 @@
         "apds_serviceA": {
             "category": "aaa"
         },
-        "apds_restA": {
-            "category": "aaa"
-        },
-        "apds_restB": {
+        "apds_serviceB": {
             "category": "aaa"
         }
     },
@@ -31,4 +26,4 @@
             "collapse": true
         }
     }
-}
\ No newline at end of file
+}

diff --git a/distribution/src/main/assembly/ext-activities.json b/distribution/src/main/assembly/ext-activities.json
index 0eb1f0e..6defc34 100644 (file)
--- a/distribution/src/main/assembly/ext-activities.json
+++ b/distribution/src/main/assembly/ext-activities.json
@@ -20,32 +20,6 @@
       "inputs": {}
     }
   },
-  {
-    "id": "apds_rest",
-    "displayName": {
-      "zh_CN": "REST",
-      "en_US": "REST"
-    },
-    "description": {
-      "zh_CN": "REST 节点",
-      "en_US": "REST Node"
-    },
-    "type": "restTask",
-    "icon": {
-      "name": "apds_rest",
-      "width": 56,
-      "height": 56
-    },
-    "content": {
-      "url": "",
-      "name": "",
-      "version": "",
-      "path": "",
-      "method": "",
-      "accept": "",
-      "inputs": {}
-    }
-  },
   {
     "id": "apds_script",
     "displayName": {
@@ -70,12 +44,12 @@
   {
     "id": "apds_scriptA",
     "displayName": {
-      "zh_CN": "JavaScript",
-      "en_US": "JavaScript"
+      "zh_CN": "Stop traffic",
+      "en_US": "Stop traffic"
     },
     "description": {
-      "zh_CN": "脚本节点",
-      "en_US": "Script Node"
+      "zh_CN": "Stop traffic",
+      "en_US": "Stop traffic"
     },
     "type": "scriptTask",
     "icon": {
@@ -91,12 +65,12 @@
   {
     "id": "apds_scriptB",
     "displayName": {
-      "zh_CN": "Groovy Task",
-      "en_US": "Groovy Task"
+      "zh_CN": "Drain traffic",
+      "en_US": "Drain traffic"
     },
     "description": {
-      "zh_CN": "Groovy Task",
-      "en_US": "Groovy Task"
+      "zh_CN": "Drain traffic",
+      "en_US": "Drain traffic"
     },
     "type": "scriptTask",
     "icon": {
@@ -112,12 +86,12 @@
   {
     "id": "apds_serviceA",
     "displayName": {
-      "zh_CN": "Java Task",
-      "en_US": "Java Task"
+      "zh_CN": "Stop VNF",
+      "en_US": "Stop VNF"
     },
     "description": {
-      "zh_CN": "Java Task",
-      "en_US": "Java Task"
+      "zh_CN": "Stop VNF",
+      "en_US": "Stop VNF"
     },
     "type": "serviceTask",
     "icon": {
@@ -126,7 +100,7 @@
       "height": 56
     },
     "content": {
-      "class": "com.zte.ums.workflow.activitiext.restservicetask.HttpUtil",
+      "class": "org.onap.sdc.workflow.task.StopVNFDelegate",
       "inputs": {
         "param1": {
           "type": "string",
@@ -176,187 +150,69 @@
     }
   },
   {
-    "id": "apds_restA",
-    "displayName": {
-      "zh_CN": "REST无参数",
-      "en_US": "REST No Parameters"
-    },
-    "description": {
-      "zh_CN": "REST无参数",
-      "en_US": "REST No Parameters"
-    },
-    "type": "restTask",
-    "icon": {
-      "name": "apds_rest",
-      "width": 56,
-      "height": 56
-    },
-    "content": {
-      "serviceName": "name",
-      "serviceVersion": "v1",
-      "baseUrl": "url",
-      "path": "/test/",
-      "method": "put",
-      "consumes": "application/json, text/plain",
-      "produces": "application/json, text/plain",
-      "inputs": {}
-    }
-  },
-  {
-    "id": "apds_restB",
+    "id": "apds_serviceB",
     "displayName": {
-      "zh_CN": "REST复杂参数",
-      "en_US": "REST Complex Parameters"
+      "zh_CN": "Create VNF",
+      "en_US": "Create VNF"
     },
     "description": {
-      "zh_CN": "REST复杂参数",
-      "en_US": "REST Complex Parameters"
+      "zh_CN": "Create VNF",
+      "en_US": "Create VNF"
     },
-    "type": "restTask",
+    "type": "serviceTask",
     "icon": {
-      "name": "apds_rest",
+      "name": "apds_service",
       "width": 56,
       "height": 56
     },
     "content": {
-      "serviceName": "ServiceName",
-      "serviceVersion": "v1",
-      "baseUrl": "url",
-      "path": "/test/",
-      "method": "put",
-      "consumes": "application/json, text/plain",
-      "produces": "application/json, text/plain",
+      "class": "org.onap.sdc.workflow.task.CreateVNFDelegate",
       "inputs": {
-        "param1": {
-          "in": "query",
+        "id": {
           "type": "string",
           "default": "default",
           "required": false,
-          "show": false,
+          "displayName": {
+            "zh_CN": "id",
+            "en_US": "id"
+          },
+          "show": true,
           "editable": true
         },
-        "param2": {
-          "in": "body",
-          "schema": {
-            "type": "object",
-            "properties": {
-              "a": {
-                "type": "number",
-                "default": 123
-              },
-              "b": {
-                "type": "string",
-                "default": "xyz"
-              },
-              "c": {
-                "type": "array",
-                "items": {
-                  "type": "string",
-                  "enum": [
-                    "a",
-                    "b",
-                    "c"
-                  ]
-                }
-              },
-              "d": {
-                "type": "array",
-                "items": {
-                  "type": "object",
-                  "properties": {
-                    "p1": {
-                      "type": "number"
-                    },
-                    "p2": {
-                      "type": "boolean"
-                    }
-                  }
-                }
-              },
-              "y": {
-                "type": "object",
-                "additionalProperties": {
-                  "type": "string"
-                }
-              },
-              "z": {
-                "type": "object",
-                "additionalProperties": {
-                  "type": "integer"
-                }
-              }
-            }
-          },
+        "name": {
+          "type": "string",
           "required": true,
+          "displayName": {
+            "zh_CN": "name",
+            "en_US": "name"
+          },
           "show": true,
           "editable": true
         },
-        "param3": {
-          "in": "path",
+        "type": {
           "type": "string",
           "default": "value3",
           "required": true,
+          "displayName": {
+            "zh_CN": "type",
+            "en_US": "type"
+          },
           "show": true,
           "editable": false
         }
       },
       "outputs": {
-        "body": {
+        "status": {
+          "type": "string",
+          "required": false,
           "displayName": {
-            "zh_CN": "消息体",
-            "en_US": "Message Body"
-          },
-          "schema": {
-            "type": "object",
-            "properties": {
-              "a": {
-                "type": "number"
-              },
-              "b": {
-                "type": "string"
-              },
-              "c": {
-                "type": "array",
-                "items": {
-                  "type": "string",
-                  "enum": [
-                    "a",
-                    "b",
-                    "c"
-                  ]
-                }
-              },
-              "d": {
-                "type": "array",
-                "items": {
-                  "type": "object",
-                  "properties": {
-                    "p1": {
-                      "type": "number"
-                    },
-                    "p2": {
-                      "type": "boolean"
-                    }
-                  }
-                }
-              },
-              "y": {
-                "type": "object",
-                "additionalProperties": {
-                  "type": "string"
-                }
-              },
-              "z": {
-                "type": "object",
-                "additionalProperties": {
-                  "type": "integer"
-                }
-              }
-            }
+            "zh_CN": "status",
+            "en_US": "status of vnf"
           },
-          "editable": false
+          "show": true,
+          "editable": true
         }
       }
     }
   }
-]
\ No newline at end of file
+]

diff --git a/distribution/src/main/assembly/temp_workflow.json b/distribution/src/main/assembly/temp_workflow.json
index f12f892..3b3fa1c 100644 (file)
--- a/distribution/src/main/assembly/temp_workflow.json
+++ b/distribution/src/main/assembly/temp_workflow.json
@@ -5,109 +5,121 @@
   "data": {\r
     "nodes": [\r
       {\r
-        "id": "node0",\r
+        "id": "startEvent",\r
         "type": "startEvent",\r
         "name": "Start",\r
         "parentId": "root",\r
         "position": {\r
-          "left": 99,\r
-          "top": 131,\r
+          "left": 73,\r
+          "top": 160,\r
           "width": 56,\r
           "height": 56\r
         },\r
         "connection": [\r
           {\r
-            "sourceRef": "node0",\r
-            "targetRef": "serviceTask"\r
+            "sourceRef": "startEvent",\r
+            "targetRef": "scriptTask"\r
           }\r
         ],\r
-        "parameters": [\r
-          {\r
-            "name": "aaa",\r
-            "value": "a111",\r
-            "valueSource": "string",\r
-            "type": "string",\r
-            "required": false,\r
-            "show": true,\r
-            "errorMsg": ""\r
-          },\r
+        "parameters": []\r
+      },\r
+      {\r
+        "id": "scriptTask",\r
+        "type": "scriptTask",\r
+        "typeId": "apds_scriptA",\r
+        "icon": "apds_script",\r
+        "name": "Stop traffic",\r
+        "parentId": "root",\r
+        "position": {\r
+          "left": 175,\r
+          "top": 160,\r
+          "width": 56,\r
+          "height": 56\r
+        },\r
+        "connection": [\r
           {\r
-            "name": "bbb",\r
-            "value": "b111",\r
-            "valueSource": "string",\r
-            "type": "string",\r
-            "required": false,\r
-            "show": true,\r
-            "errorMsg": ""\r
+            "sourceRef": "scriptTask",\r
+            "targetRef": "scriptTask_2"\r
           }\r
-        ]\r
+        ],\r
+        "scriptFormat": "JavaScript",\r
+        "script": "abc"\r
       },\r
       {\r
-        "id": "node2",\r
-        "type": "endEvent",\r
-        "name": "End",\r
+        "id": "scriptTask_2",\r
+        "type": "scriptTask",\r
+        "typeId": "apds_scriptB",\r
+        "icon": "apds_script",\r
+        "name": "Drain traffic",\r
         "parentId": "root",\r
         "position": {\r
-          "left": 459,\r
-          "top": 131,\r
+          "left": 289,\r
+          "top": 160,\r
           "width": 56,\r
           "height": 56\r
         },\r
-        "connection": []\r
+        "connection": [\r
+          {\r
+            "sourceRef": "scriptTask_2",\r
+            "targetRef": "serviceTask"\r
+          }\r
+        ],\r
+        "scriptFormat": "Groovy",\r
+        "script": "xyz"\r
       },\r
       {\r
         "id": "serviceTask",\r
         "type": "serviceTask",\r
         "typeId": "apds_serviceA",\r
         "icon": "apds_service",\r
-        "name": "Java Task",\r
+        "name": "Stop VNF",\r
         "parentId": "root",\r
         "position": {\r
-          "left": 232,\r
-          "top": 131,\r
+          "left": 392,\r
+          "top": 160,\r
           "width": 56,\r
           "height": 56\r
         },\r
         "connection": [\r
           {\r
             "sourceRef": "serviceTask",\r
-            "targetRef": "scriptTask"\r
+            "targetRef": "serviceTask_2"\r
           }\r
         ],\r
-        "className": "org.onap.sdc.workflowdesigner.JavaTask",\r
+        "className": "",\r
         "inputs": [\r
           {\r
             "name": "param1",\r
+            "value": "default",\r
             "valueSource": "string",\r
             "type": "string",\r
             "required": false,\r
             "show": true,\r
-            "errorMsg": "",\r
-            "value": "a111"\r
+            "errorMsg": ""\r
           },\r
           {\r
             "name": "param2",\r
+            "value": null,\r
             "valueSource": "string",\r
             "type": "string",\r
             "required": true,\r
             "show": true,\r
-            "errorMsg": "",\r
-            "value": "b111"\r
+            "errorMsg": ""\r
           },\r
           {\r
             "name": "param3",\r
+            "value": "value3",\r
             "valueSource": "string",\r
             "type": "string",\r
             "required": true,\r
             "show": true,\r
-            "errorMsg": "",\r
-            "value": "c111"\r
+            "errorMsg": ""\r
           }\r
         ],\r
         "outputs": [\r
           {\r
             "name": "out1",\r
-            "value": "",\r
+            "value": null,\r
             "valueSource": "string",\r
             "type": "string",\r
             "required": false,\r
@@ -117,27 +129,61 @@
         ]\r
       },\r
       {\r
-        "id": "scriptTask",\r
-        "type": "scriptTask",\r
-        "typeId": "apds_scriptB",\r
-        "icon": "apds_script",\r
-        "name": "Groovy Task",\r
+        "id": "serviceTask_2",\r
+        "type": "serviceTask",\r
+        "typeId": "apds_serviceB",\r
+        "icon": "apds_service",\r
+        "name": "Create VNF",\r
         "parentId": "root",\r
         "position": {\r
-          "left": 335,\r
-          "top": 131,\r
+          "left": 500,\r
+          "top": 160,\r
           "width": 56,\r
           "height": 56\r
         },\r
         "connection": [\r
           {\r
-            "sourceRef": "scriptTask",\r
-            "targetRef": "node2"\r
+            "sourceRef": "serviceTask_2",\r
+            "targetRef": "serviceTask_3"\r
+          }\r
+        ]\r
+      },\r
+      {\r
+        "id": "serviceTask_3",\r
+        "type": "serviceTask",\r
+        "typeId": "apds_service",\r
+        "icon": "apds_service",\r
+        "name": "Start VNF",\r
+        "parentId": "root",\r
+        "position": {\r
+          "left": 620,\r
+          "top": 160,\r
+          "width": 56,\r
+          "height": 56\r
+        },\r
+        "connection": [\r
+          {\r
+            "sourceRef": "serviceTask_3",\r
+            "targetRef": "endEvent"\r
           }\r
         ],\r
-        "scriptFormat": "Groovy",\r
-        "script": "xyz"\r
+        "className": "",\r
+        "inputs": [],\r
+        "outputs": []\r
+      },\r
+      {\r
+        "id": "endEvent",\r
+        "type": "endEvent",\r
+        "name": "End",\r
+        "parentId": "root",\r
+        "position": {\r
+          "left": 744,\r
+          "top": 160,\r
+          "width": 56,\r
+          "height": 56\r
+        },\r
+        "connection": []\r
       }\r
     ]\r
   }\r
-}
\ No newline at end of file
+}\r