Check vm-capabilites on vnf-level OS requests

New per-vm capabilities checking is introduced for vnf-level OpenStack actions
Additional changes per initial review.
Additional changes in TestVnfc.java per second review.

Change-Id: Idd1d834df076c1e525f596b788b69ed63ba9e66b
Issue-ID: APPC-1380
Signed-off-by: Lori Keighron <lk2924@att.com>

1 files changed, 5 insertions, 1 deletions

diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/restartNodep.json b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/restartNodep.json
index bd8167202..fb96abeac 100755
--- a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/restartNodep.json
+++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/restartNodep.json
@@ -22,6 +22,7 @@
           "vnfc":
           {
             "vnfc-type": "SMP",
+            "vnfc-function-code": "pld",
             "vnfc-name": "SMP - Name"
           }
         },
@@ -31,6 +32,7 @@
           "vnfc":
           {
             "vnfc-type": "FE",
+            "vnfc-function-code": "pld",
             "vnfc-name": "FE - Name"
           }
 
@@ -41,6 +43,7 @@
           "vnfc":
           {
             "vnfc-type": "BE",
+            "vnfc-function-code": "pld",
             "vnfc-name": "BE - Name"
           }
 
@@ -51,6 +54,7 @@
           "vnfc":
           {
             "vnfc-type": "BE",
+            "vnfc-function-code": "pld",
             "vnfc-name": "BE - Name"
           }
 
@@ -92,7 +96,7 @@
   "capabilities" : {
     "vnf": ["Stop", "Start", "StartApplication","StopApplication"],
     "vf-module": ["Stop", "Start"],
-    "vm" : ["Stop", "Start"],
+        "vm" : [{"Stop" :["pld", "ssc", "dbo"]}, {"Start" :["pld", "ssc", "dbo"]}, {"Restart" :["pld", "ssc", "dbo"]}],
     "vnfc": ["StopApplication", "StartApplication","HealthCheck"]
   }
 }