From c751a9532c263b542f7f420071c545844fa56dc7 Mon Sep 17 00:00:00 2001 From: Lori Keighron Date: Mon, 11 Feb 2019 17:21:37 -0500 Subject: 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 --- .../src/test/resources/input/WrongDependencyModel.json | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/WrongDependencyModel.json') diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/WrongDependencyModel.json b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/WrongDependencyModel.json index 07a389f9d..b4e10943c 100755 --- a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/WrongDependencyModel.json +++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/WrongDependencyModel.json @@ -21,6 +21,7 @@ "vnfc": { "vnfc-type": "BE", + "vnfc-function-code": "pld", "vnfc-name": "BE - Name" } @@ -31,6 +32,7 @@ "vnfc": { "vnfc-type": "FE", + "vnfc-function-code": "pld", "vnfc-name": "FE - Name" } @@ -41,6 +43,7 @@ "vnfc": { "vnfc-type": "FE", + "vnfc-function-code": "pld", "vnfc-name": "FE - Name" } @@ -51,6 +54,7 @@ "vnfc": { "vnfc-type": "BE", + "vnfc-function-code": "pld", "vnfc-name": "BE - Name" } @@ -61,6 +65,7 @@ "vnfc": { "vnfc-type": "BE", + "vnfc-function-code": "pld", "vnfc-name": "BE - Name" } @@ -72,6 +77,7 @@ "vnfc": { "vnfc-type": "BE", + "vnfc-function-code": "pld", "vnfc-name": "BE - Name" } @@ -82,6 +88,7 @@ "vnfc": { "vnfc-type": "BE", + "vnfc-function-code": "pld", "vnfc-name": "BE - Name" } @@ -118,8 +125,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"] } } - -- cgit 1.2.3-korg