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, 148 insertions, 137 deletions

diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/no-strategy.json b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/no-strategy.json
index 4a1975b2f..e74c6ac56 100644
--- a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/no-strategy.json
+++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/no-strategy.json
@@ -1,147 +1,158 @@
+
+
 {
-	"request-info": {
-		"action": "Start",
-		"action-level": "vnf",
-		"action-identifier": {
-			"vnf-id": "dbgx0001v"
-		},
-		"payload": "ABC"
-	},
-	"inventory-info": {
-		"vnf-info": {
-			"vnf-id" : "abc",
-			"vnf-name": "vSCP",
-			"vnf-type": "vSCP",
-			"vnf-version" : "1.0",
-			"identity-url" : "test_url",
-			"vm": [
-					{
-						"vserver-id" : "be_vserverid1",
-						"vm-id" : "vm_id1",
-						"vnfc":
-								{
-									"vnfc-type": "BE",
-									"vnfc-name": "BE - Name"
-								}
+    "request-info": {
+        "action": "Start",
+        "action-level": "vnf",
+        "action-identifier": {
+            "vnf-id": "dbgx0001v"
+        },
+        "payload": "ABC"
+    },
+    "inventory-info": {
+        "vnf-info": {
+            "vnf-id" : "abc",
+            "vnf-name": "vSCP",
+            "vnf-type": "vSCP",
+            "vnf-version" : "1.0",
+            "identity-url" : "test_url",
+            "vm": [
+                    {
+                        "vserver-id" : "be_vserverid1",
+                        "vm-id" : "vm_id1",
+                        "vnfc":
+                                {
+                                    "vnfc-type": "BE",
+                                    "vnfc-function-code": "pld",
+                                    "vnfc-name": "BE - Name"
+                                }
 
-					},
-					{
-						"vserver-id" : "fe_vserverid1",
-						"vm-id" : "vm_id1",
-						"vnfc":
-								{
-									"vnfc-type": "FE",
-									"vnfc-name": "FE - Name"
-								}
+                    },
+                    {
+                        "vserver-id" : "fe_vserverid1",
+                        "vm-id" : "vm_id1",
+                        "vnfc":
+                                {
+                                    "vnfc-type": "FE",
+                                    "vnfc-function-code": "pld",
+                                    "vnfc-name": "FE - Name"
+                                }
 
-					},
-					{
-						"vserver-id" : "fe_vserverid2",
-						"vm-id" : "vm_id1",
-						"vnfc":
-								{
-									"vnfc-type": "FE",
-									"vnfc-name": "FE - Name"
-								}
+                    },
+                    {
+                        "vserver-id" : "fe_vserverid2",
+                        "vm-id" : "vm_id1",
+                        "vnfc":
+                                {
+                                    "vnfc-type": "FE",
+                                    "vnfc-function-code": "pld",
+                                    "vnfc-name": "FE - Name"
+                                }
 
-					},
-					{
-						"vserver-id" : "be_vserverid2",
-						"vm-id" : "vm_id1",
-						"vnfc":
-								{
-									"vnfc-type": "BE",
-									"vnfc-name": "BE - Name"
-								}
+                    },
+                    {
+                        "vserver-id" : "be_vserverid2",
+                        "vm-id" : "vm_id1",
+                        "vnfc":
+                                {
+                                    "vnfc-type": "BE",
+                                    "vnfc-function-code": "pld",
+                                    "vnfc-name": "BE - Name"
+                                }
 
-					},
-					{
-						"vserver-id" : "be_vserverid3",
-						"vm-id" : "vm_id1",
-						"vnfc":
-								{
-									"vnfc-type": "BE",
-									"vnfc-name": "BE - Name"
-								}
+                    },
+                    {
+                        "vserver-id" : "be_vserverid3",
+                        "vm-id" : "vm_id1",
+                        "vnfc":
+                                {
+                                    "vnfc-type": "BE",
+                                    "vnfc-function-code": "pld",
+                                    "vnfc-name": "BE - Name"
+                                }
 
-					},
-					{
-						"vserver-id" : "smp_vserverid1",
-						"vm-id" : "vm_id1",
-						"vnfc":
-								{
-									"vnfc-type": "SMP",
-									"vnfc-name": "SMP - Name"
-								}
+                    },
+                    {
+                        "vserver-id" : "smp_vserverid1",
+                        "vm-id" : "vm_id1",
+                        "vnfc":
+                                {
+                                    "vnfc-type": "SMP",
+                                    "vnfc-function-code": "pld",
+                                    "vnfc-name": "SMP - Name"
+                                }
 
-					},
-					{
-						"vserver-id" : "smp_vserverid2",
-						"vm-id" : "vm_id1",
-						"vnfc":
-								{
-									"vnfc-type": "SMP",
-									"vnfc-name": "SMP - Name"
-								}
-					},
-					{
-						"vserver-id" : "be_vserverid4",
-						"vm-id" : "vm_id1",
-						"vnfc":
-						{
-							"vnfc-type": "BE",
-							"vnfc-name": "BE - Name"
-						}
+                    },
+                    {
+                        "vserver-id" : "smp_vserverid2",
+                        "vm-id" : "vm_id1",
+                        "vnfc":
+                                {
+                                    "vnfc-type": "SMP",
+                                    "vnfc-function-code": "pld",
+                                    "vnfc-name": "SMP - Name"
+                                }
+                    },
+                    {
+                        "vserver-id" : "be_vserverid4",
+                        "vm-id" : "vm_id1",
+                        "vnfc":
+                        {
+                            "vnfc-type": "BE",
+                            "vnfc-function-code": "pld",
+                            "vnfc-name": "BE - Name"
+                        }
 
-					},
-					{
-						"vserver-id" : "be_vserverid5",
-						"vm-id" : "vm_id1",
-						"vnfc":
-						{
-							"vnfc-type": "BE",
-							"vnfc-name": "BE - Name"
-						}
+                    },
+                    {
+                        "vserver-id" : "be_vserverid5",
+                        "vm-id" : "vm_id1",
+                        "vnfc":
+                        {
+                            "vnfc-type": "BE",
+                            "vnfc-function-code": "pld",
+                            "vnfc-name": "BE - Name"
+                        }
 
-					}
-			]
-		}
-	},
-	"dependency-info": {
-		"vnfcs" : [
-			{
-				"vnfc-type" : "BE",
-				"mandatory" : "true",
-				"resilience": "Active-Active",
-				"parents" : [
-					"SMP"
-				]
-			},
-			{
-				"vnfc-type" : "FE",
-				"mandatory" : "true",
-				"resilience": "Active-Active",
-				"parents" : [
-					"BE"
-				]
-			},
-			{
-				"vnfc-type" : "SMP",
-				"mandatory" : "true",
-				"resilience": "Active-Passive",
-				"parents" : []
-			}
-		]
-	},
-	"tunable-parameters": {
-		"strategy" : "",
-		"wait-time": "120",
-		"retry-count": "5"
-	},
-	"capabilities" : {
-		"vnf": ["Stop", "Start", "StartApplication","StopApplication"],
-		"vf-module": ["Stop", "Start"],
-		"vm" : ["Stop", "Start"],
-		"vnfc": ["StopApplication", "StartApplication","HealthCheck"]
-	}
+                    }
+            ]
+        }
+    },
+    "dependency-info": {
+        "vnfcs" : [
+            {
+                "vnfc-type" : "BE",
+                "mandatory" : "true",
+                "resilience": "Active-Active",
+                "parents" : [
+                    "SMP"
+                ]
+            },
+            {
+                "vnfc-type" : "FE",
+                "mandatory" : "true",
+                "resilience": "Active-Active",
+                "parents" : [
+                    "BE"
+                ]
+            },
+            {
+                "vnfc-type" : "SMP",
+                "mandatory" : "true",
+                "resilience": "Active-Passive",
+                "parents" : []
+            }
+        ]
+    },
+    "tunable-parameters": {
+        "strategy" : "",
+        "wait-time": "120",
+        "retry-count": "5"
+    },
+    "capabilities" : {
+        "vnf": ["Stop", "Start", "StartApplication","StopApplication"],
+        "vf-module": ["Stop", "Start"],
+        "vm" : [{"Stop" :["pld", "ssc", "dbo"]}, {"Start" :["pld", "ssc", "dbo"]}, {"Restart" :["pld", "ssc", "dbo"]}],
+        "vnfc": ["StopApplication", "StartApplication","HealthCheck"]
+    }
 }