Fix VM_Start(2.0.0) and VM_Stop(2.0.0) DG

VM_Start DG was submitted with Rebuild_VM DG content
VM_Stop DG needs an extra block for success path

Issue-Id: APPC-217
Change-Id: I69c43576f1e266383b98383879b936b8f4b9c9c4
Signed-off-by: beili.zhou <beili.zhou@amdocs.com>

1 files changed, 117 insertions, 421 deletions

diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_VM_Start.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_VM_Start.json
index 39bc1bc9d..b01e97cf0 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_VM_Start.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_VM_Start.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "40b86792.424e28",
+    "id": "4c12a5c8.90ab7c",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 118.88888549804688,
-    "y": 77.88888549804688,
-    "z": "d53a62cc.c8145",
+    "x": 179,
+    "y": 322,
+    "z": "3b333f3b.e62d",
     "wires": [
       [
-        "bc032b26.e89658"
+        "3f8e186b.788b58"
       ]
     ]
   },
   {
-    "id": "bc032b26.e89658",
+    "id": "3f8e186b.788b58",
     "type": "service-logic",
     "name": "APPC 2.0.0",
     "module": "APPC",
@@ -22,540 +22,236 @@
     "comments": "",
     "xml": "<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='APPC' version='2.0.0'>",
     "outputs": 1,
-    "x": 295.88897705078125,
-    "y": 77.45555877685547,
-    "z": "d53a62cc.c8145",
+    "x": 362.0001220703125,
+    "y": 322.5666809082031,
+    "z": "3b333f3b.e62d",
     "wires": [
       [
-        "cd1bcdc.c4f313"
+        "e2b2f3.05197d1"
       ]
     ]
   },
   {
-    "id": "cd1bcdc.c4f313",
+    "id": "e2b2f3.05197d1",
     "type": "method",
-    "name": "Rebuild_VM",
-    "xml": "<method rpc='Rebuild_VM' mode='sync'>\n",
+    "name": "VM_Start",
+    "xml": "<method rpc='VM_Start' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 238.3532485961914,
-    "y": 169.27698135375977,
-    "z": "d53a62cc.c8145",
+    "x": 311.75006103515625,
+    "y": 406.816650390625,
+    "z": "3b333f3b.e62d",
     "wires": [
       [
-        "b74d1e6.3a22ce"
+        "9c797c4b.fc3f8"
       ]
     ]
   },
   {
-    "id": "34f167f4.74fba8",
+    "id": "9c797c4b.fc3f8",
     "type": "execute",
-    "name": "Rebuild",
-    "xml": "<execute plugin='org.openecomp.appc.adapter.iaas.ProviderAdapter' method='rebuildServer'>\n<parameter name=\"org.openecomp.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"org.openecomp.appc.instance.url\" value=\"`$rebuild-vm-url`\" />\n<parameter name=\"org.openecomp.appc.identity.url\" value=\"`$AICIdentity`\" />\n",
+    "name": "Start",
+    "xml": "<execute plugin='org.openecomp.appc.adapter.iaas.ProviderAdapter' method='startServer'>\n<parameter name=\"org.openecomp.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"org.openecomp.appc.instance.url\" value=\"`$start-vm-url`\" />\n<parameter name=\"org.openecomp.appc.identity.url\" value=\"`$AICIdentity`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 786.5222053527832,
-    "y": 474.9246606826782,
-    "z": "d53a62cc.c8145",
+    "x": 496,
+    "y": 406,
+    "z": "3b333f3b.e62d",
     "wires": [
       [
-        "c389f8ca.0d8db8",
-        "63bb4f30.2be92"
+        "8ec37e81.db48b",
+        "6a2f0d5b.f084e4"
       ]
     ]
   },
   {
-    "id": "c389f8ca.0d8db8",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 903.6770362854004,
-    "y": 734.2462749481201,
-    "z": "d53a62cc.c8145",
-    "wires": [
-      [
-        "45b189ba.d7c4e8"
-      ]
-    ]
-  },
-  {
-    "id": "63bb4f30.2be92",
+    "id": "6a2f0d5b.f084e4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 942.6393356323242,
-    "y": 441.8532495498657,
-    "z": "d53a62cc.c8145",
+    "x": 675.9735107421875,
+    "y": 407.2143859863281,
+    "z": "3b333f3b.e62d",
     "wires": [
       [
-        "96e74630.8df888"
+        "51fd4bef.090064"
       ]
     ]
   },
   {
-    "id": "a546e205.8a738",
-    "type": "block",
-    "name": "block",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
+    "id": "8ec37e81.db48b",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1582.3176345825195,
-    "y": 724.8893241882324,
-    "z": "d53a62cc.c8145",
+    "x": 670.6187744140625,
+    "y": 633.14306640625,
+    "z": "3b333f3b.e62d",
     "wires": [
       [
-        "17c11aa2.c734e5",
-        "27d3846c.08be6c",
-        "d38bac72.40eca"
+        "8ccb55ea.a7c328"
       ]
     ]
   },
   {
-    "id": "17c11aa2.c734e5",
-    "type": "set",
-    "name": "Set error message",
-    "xml": "<set>\n<parameter name='event-message' value=\"`'Failure while rebuilding the server: ' + $rebuild-vm-url`\"/>\n",
-    "comments": "",
-    "x": 1843.6394386291504,
-    "y": 676.8535795211792,
-    "z": "d53a62cc.c8145",
-    "wires": []
-  },
-  {
-    "id": "27d3846c.08be6c",
-    "type": "record",
-    "name": "Log error",
-    "xml": "<record plugin=\"org.openecomp.sdnc.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$event-message`\"/>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1836.0683631896973,
-    "y": 717.043927192688,
-    "z": "d53a62cc.c8145",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "de90dda7.71a4e",
-    "type": "set",
-    "name": "Set Success Message",
-    "xml": "<set>\n<parameter name='success-message' value=\"`'Rebuild succeeded for the server : ' + $rebuild-vm-url`\"/>\n\n\n",
-    "comments": "",
-    "x": 1597.3530807495117,
-    "y": 272.99626636505127,
-    "z": "d53a62cc.c8145",
-    "wires": []
-  },
-  {
-    "id": "ee54bf93.e9baa",
-    "type": "record",
-    "name": "Log message",
-    "xml": "<record plugin=\"org.openecomp.sdnc.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$success-message`\"/>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1587.2102661132812,
-    "y": 324.5676784515381,
-    "z": "d53a62cc.c8145",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "d7feb7b1.3b6cd8",
+    "id": "51fd4bef.090064",
     "type": "switchNode",
-    "name": "switch:Last Attempt",
-    "xml": "<switch test='`$rebuildRetryCount == $retryIndex`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1232.3013343811035,
-    "y": 730.460786819458,
-    "z": "d53a62cc.c8145",
-    "wires": [
-      [
-        "2cc28296.df8a6e",
-        "9c67fa27.c3ff98"
-      ]
-    ]
-  },
-  {
-    "id": "9c67fa27.c3ff98",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
+    "name": "STATUS",
+    "xml": "<switch test='`$START_STATUS`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1441.1940994262695,
-    "y": 722.7822074890137,
-    "z": "d53a62cc.c8145",
+    "x": 823,
+    "y": 407.0000305175781,
+    "z": "3b333f3b.e62d",
     "wires": [
       [
-        "a546e205.8a738"
+        "8e71a1ab.2673b",
+        "9153a9b0.79c868"
       ]
     ]
   },
   {
-    "id": "2cc28296.df8a6e",
-    "type": "outcomeFalse",
-    "name": "false",
-    "xml": "<outcome value='false'>\n",
+    "id": "8e71a1ab.2673b",
+    "type": "other",
+    "name": "SUCCESS",
+    "xml": "<outcome value='SUCCESS'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1426.5510845184326,
-    "y": 835.4961585998535,
-    "z": "d53a62cc.c8145",
+    "x": 997.7144775390625,
+    "y": 405.4286193847656,
+    "z": "3b333f3b.e62d",
     "wires": [
       [
-        "b3cb1d2b.62265"
+        "218c4c31.746404"
       ]
     ]
   },
   {
-    "id": "87033bf0.a89218",
-    "type": "for",
-    "name": "Loop",
-    "xml": "<for index=\"retryIndex\" start=\"1\" end=\"`$rebuildRetryCount + 1`\" >",
+    "id": "9153a9b0.79c868",
+    "type": "other",
+    "name": "ERROR",
+    "xml": "<outcome value='ERROR'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 295.7502975463867,
-    "y": 479.8532304763794,
-    "z": "d53a62cc.c8145",
+    "x": 998.28564453125,
+    "y": 474.71435546875,
+    "z": "3b333f3b.e62d",
     "wires": [
       [
-        "8f0dac95.828bd"
+        "d6c921e6.f062f"
       ]
     ]
   },
   {
-    "id": "b3cb1d2b.62265",
-    "type": "record",
-    "name": "Log error",
-    "xml": "<record plugin=\"org.openecomp.sdnc.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Rebuild attempt ' + $retryIndex + ' of ' + $rebuildRetryCount + ' failed for server : ' + $rebuild-vm-url + '. Retrying.'`\"/>\n",
+    "id": "91055b26.4540f8",
+    "type": "returnSuccess",
+    "name": "return success",
+    "xml": "<return status='success'>",
     "comments": "",
-    "outputs": 1,
-    "x": 1669.6347026824951,
-    "y": 833.7461585998535,
-    "z": "d53a62cc.c8145",
-    "wires": [
-      []
-    ]
+    "x": 1355.6666259765625,
+    "y": 452,
+    "z": "3b333f3b.e62d",
+    "wires": []
   },
   {
-    "id": "d38bac72.40eca",
+    "id": "be1d8c86.5510c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n",
     "comments": "",
-    "x": 1852.0837440490723,
-    "y": 766.282208442688,
-    "z": "d53a62cc.c8145",
+    "x": 1364.8734130859375,
+    "y": 680.4286499023438,
+    "z": "3b333f3b.e62d",
     "wires": []
   },
   {
-    "id": "8187513d.589d1",
-    "type": "returnSuccess",
-    "name": "return success",
-    "xml": "<return status='success'>",
+    "id": "55a5d83c.b56328",
+    "type": "set",
+    "name": "set success code and message",
+    "xml": "<set>\n<parameter name='error-code' value='400' />\n<parameter name='error-message' value='Success' />\n",
     "comments": "",
-    "x": 1595.4485092163086,
-    "y": 449.1390333175659,
-    "z": "d53a62cc.c8145",
+    "x": 1404,
+    "y": 408,
+    "z": "3b333f3b.e62d",
     "wires": []
   },
   {
-    "id": "96e74630.8df888",
-    "type": "switchNode",
-    "name": "switch STATUS",
-    "xml": "<switch test='`$REBUILD_STATUS`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1103.4325485229492,
-    "y": 443.4086961746216,
-    "z": "d53a62cc.c8145",
-    "wires": [
-      [
-        "ae2b10cb.cec5a",
-        "cd52c85b.5249d8",
-        "59307536.ee844c"
-      ]
-    ]
-  },
-  {
-    "id": "ae2b10cb.cec5a",
-    "type": "other",
-    "name": "ERROR",
-    "xml": "<outcome value='ERROR'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1184.9563446044922,
-    "y": 529.3134174346924,
-    "z": "d53a62cc.c8145",
-    "wires": [
-      [
-        "45b189ba.d7c4e8"
-      ]
-    ]
-  },
-  {
-    "id": "cd52c85b.5249d8",
-    "type": "success",
-    "name": "SUCCESS",
-    "xml": "<outcome value='SUCCESS'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1350.3850173950195,
-    "y": 412.3134517669678,
-    "z": "d53a62cc.c8145",
-    "wires": [
-      [
-        "f91485e2.798dc8"
-      ]
-    ]
-  },
-  {
-    "id": "45b189ba.d7c4e8",
-    "type": "block",
-    "name": "block",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 1064.6191062927246,
-    "y": 731.3493366241455,
-    "z": "d53a62cc.c8145",
-    "wires": [
-      [
-        "d7feb7b1.3b6cd8"
-      ]
-    ]
-  },
-  {
-    "id": "59307536.ee844c",
-    "type": "other",
-    "name": "CONTEXT_NOT_FOUND",
-    "xml": "<outcome value='CONTEXT_NOT_FOUND'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1413.8692588806152,
-    "y": 507.0785312652588,
-    "z": "d53a62cc.c8145",
-    "wires": [
-      [
-        "9a2a7a92.885b08"
-      ]
-    ]
-  },
-  {
-    "id": "b74d1e6.3a22ce",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 297.7976417541504,
-    "y": 386.36428356170654,
-    "z": "d53a62cc.c8145",
-    "wires": [
-      [
-        "8c5bde88.c0aee",
-        "87033bf0.a89218",
-        "2d98dcb5.d16b44"
-      ]
-    ]
-  },
-  {
-    "id": "8c5bde88.c0aee",
-    "type": "switchNode",
-    "name": "switch : rebuildRetryCount >= 0",
-    "xml": "<switch test='`$rebuildRetryCount >= 0`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 567.797679901123,
-    "y": 317.7928533554077,
-    "z": "d53a62cc.c8145",
-    "wires": [
-      [
-        "2451c726.0ffbe8",
-        "6a4082a3.a5778c"
-      ]
-    ]
-  },
-  {
-    "id": "2451c726.0ffbe8",
-    "type": "outcomeFalse",
-    "name": "false",
-    "xml": "<outcome value='false'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 784.9404716491699,
-    "y": 276.3643217086792,
-    "z": "d53a62cc.c8145",
-    "wires": [
-      [
-        "23f87454.807cfc"
-      ]
-    ]
-  },
-  {
-    "id": "6a4082a3.a5778c",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 792.0833587646484,
-    "y": 353.5072250366211,
-    "z": "d53a62cc.c8145",
-    "wires": [
-      [
-        "39be1fd1.165f6"
-      ]
-    ]
-  },
-  {
-    "id": "39be1fd1.165f6",
+    "id": "11e66810.229818",
     "type": "set",
-    "name": "increment rebuildRetryCount",
-    "xml": "<set>\n<parameter name=\"rebuildRetryCount\" value=\"`$rebuildRetryCount + 1`\" />\n",
+    "name": "set error code and message",
+    "xml": "<set>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='Start VM failed' />\n",
     "comments": "",
-    "x": 974.9404563903809,
-    "y": 352.0786123275757,
-    "z": "d53a62cc.c8145",
+    "x": 1117,
+    "y": 602,
+    "z": "3b333f3b.e62d",
     "wires": []
   },
   {
-    "id": "23f87454.807cfc",
+    "id": "18420693.2d9f89",
     "type": "set",
-    "name": "set rebuildRetryCount",
-    "xml": "<set>\n<parameter name='rebuildRetryCount' value='1' />\n",
+    "name": "set error code and message",
+    "xml": "<set>\n<parameter name='error-code' value='401' />\n<parameter name='error-message' value='Start VM status is error' />\n",
     "comments": "",
-    "x": 956.3690452575684,
-    "y": 274.93574237823486,
-    "z": "d53a62cc.c8145",
+    "x": 1398,
+    "y": 507,
+    "z": "3b333f3b.e62d",
     "wires": []
   },
   {
-    "id": "f91485e2.798dc8",
+    "id": "218c4c31.746404",
     "type": "block",
-    "name": "block",
+    "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1372.6388702392578,
-    "y": 319.85316371917725,
-    "z": "d53a62cc.c8145",
+    "x": 1161,
+    "y": 407,
+    "z": "3b333f3b.e62d",
     "wires": [
       [
-        "de90dda7.71a4e",
-        "ee54bf93.e9baa",
-        "8187513d.589d1",
-        "8fdfd6a.1692b28"
+        "55a5d83c.b56328",
+        "91055b26.4540f8"
       ]
     ]
   },
   {
-    "id": "2d98dcb5.d16b44",
-    "type": "set",
-    "name": "initialize exitLoop",
-    "xml": "<set>\n<parameter name='exitLoop' value='false' />\n",
-    "comments": "",
-    "x": 532.6389007568359,
-    "y": 209.85318422317505,
-    "z": "d53a62cc.c8145",
-    "wires": []
-  },
-  {
-    "id": "8fdfd6a.1692b28",
-    "type": "set",
-    "name": "set exitLoop",
-    "xml": "<set>\n<parameter name='exitLoop' value='true' />\n",
-    "comments": "",
-    "x": 1602.6389770507812,
-    "y": 384.1389150619507,
-    "z": "d53a62cc.c8145",
-    "wires": []
-  },
-  {
-    "id": "8f0dac95.828bd",
-    "type": "switchNode",
-    "name": "switch exitLoop",
-    "xml": "<switch test='`$exitLoop`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 462.63885498046875,
-    "y": 478.4245901107788,
-    "z": "d53a62cc.c8145",
-    "wires": [
-      [
-        "82ddebcb.4c72e8",
-        "e243de19.25b81"
-      ]
-    ]
-  },
-  {
-    "id": "82ddebcb.4c72e8",
-    "type": "outcomeFalse",
-    "name": "false",
-    "xml": "<outcome value='false'>\n",
+    "id": "d6c921e6.f062f",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 631.2102127075195,
-    "y": 479.853196144104,
-    "z": "d53a62cc.c8145",
+    "x": 1154,
+    "y": 475,
+    "z": "3b333f3b.e62d",
     "wires": [
       [
-        "34f167f4.74fba8"
+        "18420693.2d9f89",
+        "be1d8c86.5510c"
       ]
     ]
   },
   {
-    "id": "e243de19.25b81",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 628.3532104492188,
-    "y": 545.5675039291382,
-    "z": "d53a62cc.c8145",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "9a2a7a92.885b08",
+    "id": "8ccb55ea.a7c328",
     "type": "block",
-    "name": "block",
+    "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1578.263916015625,
-    "y": 657.8888959884644,
-    "z": "d53a62cc.c8145",
+    "x": 873,
+    "y": 639,
+    "z": "3b333f3b.e62d",
     "wires": [
       [
-        "63a3f95c.1a3338",
-        "27d3846c.08be6c",
-        "d38bac72.40eca"
+        "11e66810.229818",
+        "be1d8c86.5510c"
       ]
     ]
-  },
-  {
-    "id": "63a3f95c.1a3338",
-    "type": "set",
-    "name": "Set error message",
-    "xml": "<set>\n<parameter name='event-message' value=\"`'Failure while rebuilding the server: ' + $rebuild-vm-url + ' due to Invalid AICIdentity or tenant or credentials. Skipping all other VMs'`\"/>\n",
-    "comments": "",
-    "x": 1837.0139465332031,
-    "y": 611.6389179229736,
-    "z": "d53a62cc.c8145",
-    "wires": []
   }
 ]
\ No newline at end of file