diff options
Diffstat (limited to 'appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input')
22 files changed, 1001 insertions, 936 deletions
diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/CheckMandatoryVnfc.json b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/CheckMandatoryVnfc.json index 8af3e7332..0a4f5fce5 100644 --- a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/CheckMandatoryVnfc.json +++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/CheckMandatoryVnfc.json @@ -1,124 +1,130 @@ { - "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", - "vm": [ - { - "vserver-id" : "be_vserverid1", - "vnfc": - { - "vnfc-type": "BE", - "vnfc-name": "BE - Name" - } - - }, - { - "vserver-id" : "fe_vserverid1", - "vnfc": - { - "vnfc-type": "FE", - "vnfc-name": "FE - Name" - } - - }, - { - "vserver-id" : "fe_vserverid2", - "vnfc": - { - "vnfc-type": "FE", - "vnfc-name": "FE - Name" - } - - }, - { - "vserver-id" : "be_vserverid2", - "vnfc": - { - "vnfc-type": "BE", - "vnfc-name": "BE - Name" - } - - }, - { - "vserver-id" : "be_vserverid3", - "vnfc": - { - "vnfc-type": "BE", - "vnfc-name": "BE - Name" - } - - }, - { - "vserver-id" : "be_vserverid4", - "vnfc": - { - "vnfc-type": "BE", - "vnfc-name": "BE - Name" - } - +"request-info": { + "action": "Start", + "action-level": "vnf", + "action-identifier": { + "vnf-id": "dbgx0001v" }, - { - "vserver-id" : "be_vserverid5", - "vnfc": - { - "vnfc-type": "BE", - "vnfc-name": "BE - Name" - } - + "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-id", + "vnfc": { + "vnfc-type": "BE", + "vnfc-name": "BE - Name" + } + }, + { + "vserver-id": "fe_vserverid1", + "vm-id": "vm-id", + "vnfc": { + "vnfc-type": "FE", + "vnfc-name": "FE - Name" + } + }, + { + "vserver-id": "fe_vserverid2", + "vm-id": "vm-id", + "vnfc": { + "vnfc-type": "FE", + "vnfc-name": "FE - Name" + } + }, + { + "vserver-id": "be_vserverid2", + "vm-id": "vm-id", + "vnfc": { + "vnfc-type": "BE", + "vnfc-name": "BE - Name" + } + }, + { + "vserver-id": "be_vserverid3", + "vm-id": "vm-id", + "vnfc": { + "vnfc-type": "BE", + "vnfc-name": "BE - Name" + } + }, + { + "vserver-id": "be_vserverid4", + "vm-id": "vm-id", + "vnfc": { + "vnfc-type": "BE", + "vnfc-name": "BE - Name" + } + }, + { + "vserver-id": "be_vserverid5", + "vm-id": "vm-id", + "vnfc": { + "vnfc-type": "BE", + "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" + }, + "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": [] + } ] - }, - { - "vnfc-type" : "SMP", - "mandatory" : "true", - "resilience": "Active-Passive", - "parents" : [ - + }, + "tunable-parameters": { + "strategy": "FORWARD", + "wait-time": "120", + "retry-count": "5" + }, + "capabilities": { + "vnf": [ + "Stop", + "Start", + "StartApplication", + "StopApplication" + ], + "vf-module": [ + "Stop", + "Start" + ], + "vm": [ + "Stop", + "Start" + ], + "vnfc": [ + "StopApplication", + "StartApplication", + "HealthCheck" ] - } - - ] - }, - "tunable-parameters": { - "strategy" : "FORWARD", - "wait-time": "120", - "retry-count": "5" - }, - "capabilities" : { - "vnf": ["Stop", "Start", "StartApplication","StopApplication"], - "vf-module": ["Stop", "Start"], - "vm" : ["Stop", "Start"], - "vnfc": ["StopApplication", "StartApplication","HealthCheck"] - } + } } diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/CheckVNfcInInventory.json b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/CheckVNfcInInventory.json index 2630ee749..8a4d22622 100644 --- a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/CheckVNfcInInventory.json +++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/CheckVNfcInInventory.json @@ -1,130 +1,136 @@ - { - "request-info": +"request-info": { - "action": "Start", - "action-level": "vnf", - "action-identifier": + "action": "Start", + "action-level": "vnf", + "action-identifier": { - "vnf-id": "dbgx0001v" - }, - "payload": "ABC" - }, - "inventory-info": + "vnf-id": "dbgx0001v" + }, + "payload": "ABC" + }, + "inventory-info": { - "vnf-info": + "vnf-info": { - "vnf-id" : "abc", - "vnf-name": "vSCP", - "vnf-type": "vSCP", - "vnf-version" : "1.0", - "vm": [ - { - "vserver-id" : "be_vserverid1", - "vnfc": - { - "vnfc-type": "BE", - "vnfc-name": "BE - Name" - } + "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" + } - }, - { - "vserver-id" : "fe_vserverid1", - "vnfc": - { - "vnfc-type": "FE", - "vnfc-name": "FE - Name" - } + }, + { + "vserver-id" : "fe_vserverid1", + "vm-id" : "vm-id1", + "vnfc": + { + "vnfc-type": "FE", + "vnfc-name": "FE - Name" + } - }, - { - "vserver-id" : "fe_vserverid2", - "vnfc": - { - "vnfc-type": "FE", - "vnfc-name": "FE - Name" - } + }, + { + "vserver-id" : "fe_vserverid2", + "vm-id" : "vm-id1", + "vnfc": + { + "vnfc-type": "FE", + "vnfc-name": "FE - Name" + } - }, - { - "vserver-id" : "be_vserverid2", - "vnfc": - { - "vnfc-type": "BE", - "vnfc-name": "BE - Name" - } + }, + { + "vserver-id" : "be_vserverid2", + "vm-id" : "vm-id1", + "vnfc": + { + "vnfc-type": "BE", + "vnfc-name": "BE - Name" + } - }, - { - "vserver-id" : "be_vserverid3", - "vnfc": - { - "vnfc-type": "BE", - "vnfc-name": "BE - Name" - } + }, + { + "vserver-id" : "be_vserverid3", + "vm-id" : "vm-id1", + "vnfc": + { + "vnfc-type": "BE", + "vnfc-name": "BE - Name" + } - }, - { - "vserver-id" : "be_vserverid4", - "vnfc": - { - "vnfc-type": "BE", - "vnfc-name": "BE - Name" - } + }, + { + "vserver-id" : "be_vserverid4", + "vm-id" : "vm-id1", + "vnfc": + { + "vnfc-type": "BE", + "vnfc-name": "BE - Name" + } - }, - { - "vserver-id" : "be_vserverid5", - "vnfc": - { - "vnfc-type": "BE", - "vnfc-name": "BE - Name" - } + }, + { + "vserver-id" : "be_vserverid5", + "vm-id" : "vm-id1", + "vnfc": + { + "vnfc-type": "BE", + "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" : "false", - "resilience": "Active-Passive", - "parents" : [] - } - ] - }, - "tunable-parameters" : + } + ] + } + }, + "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" : "false", + "resilience": "Active-Passive", + "parents" : [] + } + ] + }, + "tunable-parameters" : { - "strategy" : "FORWARD", - "wait-time" : "120", - "retry-count" : "5" - }, - "capabilities" : + "strategy" : "FORWARD", + "wait-time" : "120", + "retry-count" : "5" + }, + "capabilities" : { - "vnf": ["Stop", "Start", "StartApplication","StopApplication"], - "vf-module": ["Stop", "Start"], - "vm" : ["Stop", "Start"], - "vnfc": ["StopApplication", "StartApplication","HealthCheck"] - } + "vnf": ["Stop", "Start", "StartApplication","StopApplication"], + "vf-module": ["Stop", "Start"], + "vm" : ["Stop", "Start"], + "vnfc": ["StopApplication", "StartApplication","HealthCheck"] + } } - diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/MissingDependencyInfo.json b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/MissingDependencyInfo.json index 667565d0a..372445f15 100644 --- a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/MissingDependencyInfo.json +++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/MissingDependencyInfo.json @@ -1,5 +1,5 @@ { - "request-info": { +"request-info": { "action": "Start", "action-level": "vnf", "action-identifier": { @@ -13,9 +13,11 @@ "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", @@ -25,6 +27,7 @@ }, { "vserver-id" : "fe_vserverid1", + "vm-id" : "vm_id1", "vnfc": { "vnfc-type": "FE", @@ -34,6 +37,7 @@ }, { "vserver-id" : "fe_vserverid2", + "vm-id" : "vm_id1", "vnfc": { "vnfc-type": "FE", @@ -43,6 +47,7 @@ }, { "vserver-id" : "be_vserverid2", + "vm-id" : "vm_id1", "vnfc": { "vnfc-type": "BE", @@ -52,6 +57,7 @@ }, { "vserver-id" : "be_vserverid3", + "vm-id" : "vm_id1", "vnfc": { "vnfc-type": "BE", @@ -61,6 +67,7 @@ }, { "vserver-id" : "smp_vserverid1", + "vm-id" : "vm_id1", "vnfc": { "vnfc-type": "SMP", @@ -70,6 +77,7 @@ }, { "vserver-id" : "smp_vserverid2", + "vm-id" : "vm_id1", "vnfc": { "vnfc-type": "SMP", @@ -79,6 +87,7 @@ }, { "vserver-id" : "be_vserverid4", + "vm-id" : "vm_id1", "vnfc": { "vnfc-type": "BE", @@ -88,6 +97,7 @@ }, { "vserver-id" : "be_vserverid5", + "vm-id" : "vm_id1", "vnfc": { "vnfc-type": "BE", @@ -130,4 +140,4 @@ "vm" : ["Stop", "Start"], "vnfc": ["StopApplication", "StartApplication","HealthCheck"] } -}
\ No newline at end of file +} diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/NoDep-SingleVM.json b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/NoDep-SingleVM.json index e1475ef6c..826603849 100755 --- a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/NoDep-SingleVM.json +++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/NoDep-SingleVM.json @@ -1,6 +1,3 @@ - - - { "request-info": { "action": "Restart", @@ -16,9 +13,11 @@ "vnf-name": "vSCP", "vnf-type": "vSCP", "vnf-version" : "1.0", + "identity-url" : "test_url", "vm": [ { - "vserver-id" : "be_vserverid1" + "vserver-id" : "be_vserverid1", + "vm-id" : "vm_id1" } ] } @@ -35,4 +34,3 @@ } } - 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 984128f9d..07a389f9d 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 @@ -13,9 +13,11 @@ "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", @@ -25,6 +27,7 @@ }, { "vserver-id" : "fe_vserverid1", + "vm-id" : "vm-id1", "vnfc": { "vnfc-type": "FE", @@ -34,6 +37,7 @@ }, { "vserver-id" : "fe_vserverid2", + "vm-id" : "vm-id1", "vnfc": { "vnfc-type": "FE", @@ -43,6 +47,7 @@ }, { "vserver-id" : "be_vserverid2", + "vm-id" : "vm-id1", "vnfc": { "vnfc-type": "BE", @@ -52,6 +57,7 @@ }, { "vserver-id" : "be_vserverid3", + "vm-id" : "vm-id1", "vnfc": { "vnfc-type": "BE", @@ -62,6 +68,7 @@ { "vserver-id" : "be_vserverid4", + "vm-id" : "vm-id1", "vnfc": { "vnfc-type": "BE", @@ -71,6 +78,7 @@ }, { "vserver-id" : "be_vserverid5", + "vm-id" : "vm-id1", "vnfc": { "vnfc-type": "BE", diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/cyclic.json b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/cyclic.json index 312c0f542..9053c16ba 100644 --- a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/cyclic.json +++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/cyclic.json @@ -1,7 +1,5 @@ - - { - "request-info": { +"request-info": { "action": "Start", "action-level": "vnf", "action-identifier": { @@ -15,9 +13,11 @@ "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", @@ -27,6 +27,7 @@ }, { "vserver-id" : "fe_vserverid1", + "vm-id" : "vm_id1", "vnfc": { "vnfc-type": "FE", @@ -36,6 +37,7 @@ }, { "vserver-id" : "fe_vserverid2", + "vm-id" : "vm_id1", "vnfc": { "vnfc-type": "FE", @@ -45,6 +47,7 @@ }, { "vserver-id" : "be_vserverid2", + "vm-id" : "vm_id1", "vnfc": { "vnfc-type": "BE", @@ -54,6 +57,7 @@ }, { "vserver-id" : "be_vserverid3", + "vm-id" : "vm_id1", "vnfc": { "vnfc-type": "BE", @@ -63,6 +67,7 @@ }, { "vserver-id" : "smp_vserverid1", + "vm-id" : "vm_id1", "vnfc": { "vnfc-type": "SMP", @@ -72,6 +77,7 @@ }, { "vserver-id" : "smp_vserverid2", + "vm-id" : "vm_id1", "vnfc": { "vnfc-type": "SMP", @@ -80,6 +86,7 @@ }, { "vserver-id" : "be_vserverid4", + "vm-id" : "vm_id1", "vnfc": { "vnfc-type": "BE", @@ -89,6 +96,7 @@ }, { "vserver-id" : "be_vserverid5", + "vm-id" : "vm_id1", "vnfc": { "vnfc-type": "BE", @@ -137,5 +145,3 @@ "vnfc": ["StopApplication", "StartApplication","HealthCheck"] } } - - diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/missingrequestinfo.json b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/missingrequestinfo.json index 80c9ff501..5f8efc49d 100644 --- a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/missingrequestinfo.json +++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/missingrequestinfo.json @@ -1,15 +1,15 @@ - - { - "inventory-info": { +"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", @@ -19,6 +19,7 @@ }, { "vserver-id" : "fe_vserverid1", + "vm-id" : "vm_id1", "vnfc": { "vnfc-type": "FE", @@ -28,6 +29,7 @@ }, { "vserver-id" : "fe_vserverid2", + "vm-id" : "vm_id2", "vnfc": { "vnfc-type": "FE", @@ -37,6 +39,7 @@ }, { "vserver-id" : "be_vserverid2", + "vm-id" : "vm_id2", "vnfc": { "vnfc-type": "BE", @@ -46,6 +49,7 @@ }, { "vserver-id" : "be_vserverid3", + "vm-id" : "vm_id3", "vnfc": { "vnfc-type": "BE", @@ -55,6 +59,7 @@ }, { "vserver-id" : "smp_vserverid1", + "vm-id" : "vm_id3", "vnfc": { "vnfc-type": "SMP", @@ -64,6 +69,7 @@ }, { "vserver-id" : "smp_vserverid2", + "vm-id" : "vm_id2", "vnfc": { "vnfc-type": "SMP", @@ -72,6 +78,7 @@ }, { "vserver-id" : "be_vserverid4", + "vm-id" : "vm_id4", "vnfc": { "vnfc-type": "BE", @@ -81,6 +88,7 @@ }, { "vserver-id" : "be_vserverid5", + "vm-id" : "vm_id5", "vnfc": { "vnfc-type": "BE", 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 1b5ee9477..4a1975b2f 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,5 +1,3 @@ - - { "request-info": { "action": "Start", @@ -15,9 +13,11 @@ "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", @@ -27,6 +27,7 @@ }, { "vserver-id" : "fe_vserverid1", + "vm-id" : "vm_id1", "vnfc": { "vnfc-type": "FE", @@ -36,6 +37,7 @@ }, { "vserver-id" : "fe_vserverid2", + "vm-id" : "vm_id1", "vnfc": { "vnfc-type": "FE", @@ -45,6 +47,7 @@ }, { "vserver-id" : "be_vserverid2", + "vm-id" : "vm_id1", "vnfc": { "vnfc-type": "BE", @@ -54,6 +57,7 @@ }, { "vserver-id" : "be_vserverid3", + "vm-id" : "vm_id1", "vnfc": { "vnfc-type": "BE", @@ -63,6 +67,7 @@ }, { "vserver-id" : "smp_vserverid1", + "vm-id" : "vm_id1", "vnfc": { "vnfc-type": "SMP", @@ -72,6 +77,7 @@ }, { "vserver-id" : "smp_vserverid2", + "vm-id" : "vm_id1", "vnfc": { "vnfc-type": "SMP", @@ -80,6 +86,7 @@ }, { "vserver-id" : "be_vserverid4", + "vm-id" : "vm_id1", "vnfc": { "vnfc-type": "BE", @@ -89,6 +96,7 @@ }, { "vserver-id" : "be_vserverid5", + "vm-id" : "vm_id1", "vnfc": { "vnfc-type": "BE", @@ -137,5 +145,3 @@ "vnfc": ["StopApplication", "StartApplication","HealthCheck"] } } - - 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 5b44097ff..bd8167202 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 @@ -1,5 +1,3 @@ - - { "request-info": { "action": "Restart", @@ -16,9 +14,11 @@ "vnf-name": "vSCP", "vnf-type": "vSCP", "vnf-version" : "1.0", + "identity-url" : "test_url", "vm": [ { "vserver-id" : "smp_vserverid2", + "vm-id" : "vm_id1", "vnfc": { "vnfc-type": "SMP", @@ -27,6 +27,7 @@ }, { "vserver-id" : "be_vserverid2", + "vm-id" : "vm_id1", "vnfc": { "vnfc-type": "FE", @@ -36,6 +37,7 @@ }, { "vserver-id" : "fe_vserverid2", + "vm-id" : "vm_id1", "vnfc": { "vnfc-type": "BE", @@ -45,6 +47,7 @@ }, { "vserver-id" : "be_vserverid5", + "vm-id" : "vm_id1", "vnfc": { "vnfc-type": "BE", @@ -93,5 +96,3 @@ "vnfc": ["StopApplication", "StartApplication","HealthCheck"] } } - - diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/start-single-vm.json b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/start-single-vm.json index 4e5a9a118..65916bb6d 100644 --- a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/start-single-vm.json +++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/start-single-vm.json @@ -1,56 +1,42 @@ + { - "request-info": - { + "request-info": { "action": "Start", "action-level": "vm", - "action-identifier": - { + "action-identifier": { "vserver-id": "dbgx0001v" }, "payload": "ABC" }, - "inventory-info": - { - "vnf-info": - { + "inventory-info": { + "vnf-info": { "vnf-id" : "abc", - "vnf-name": "vVNF", - "vnf-type": "vVNF", + "vnf-name": "vSCP", + "vnf-type": "vSCP", "vnf-version" : "1.0", - "vm": - [ + "identity-url" : "test_url", + "vm": [ { - "vserver-id" : "vnfc2_vserverid1", + "vserver-id" : "be_vserverid1", + "vm-id" : "vm-id1", "vnfc": { - "vnfc-type": "VNFC2", - "vnfc-name": "VNFC2 - Name" + "vnfc-type": "BE", + "vnfc-name": "BE - Name" } } - ] + ] } }, - "dependency-info": - { + "dependency-info": { }, - "tunable-parameters": - { + "tunable-parameters": { }, - "capabilities" : - { - "vm" : - [ - "Stop", - "Start" - ], - "vnfc": - [ - "StopApplication", - "StartApplication", - "HealthCheck" - ] + "capabilities" : { + "vm" : ["Stop", "Start"], + "vnfc": ["StopApplication", "StartApplication","HealthCheck"] } } diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/start-singleVM-.json b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/start-singleVM-.json index acc6b9c02..65916bb6d 100755 --- a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/start-singleVM-.json +++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/start-singleVM-.json @@ -1,42 +1,43 @@ - { - "request-info": { - "action": "Start", - "action-level": "vm", - "action-identifier": { - "vserver-id": "dbgx0001v" - }, - "payload": "ABC" - }, - "inventory-info": { - "vnf-info": { - "vnf-id" : "abc", - "vnf-name": "vSCP", - "vnf-type": "vSCP", - "vnf-version" : "1.0", - "vm": [ - { - "vserver-id" : "be_vserverid1", - "vnfc": - { - "vnfc-type": "BE", - "vnfc-name": "BE - Name" - } - } - ] - } - }, - "dependency-info": { + "request-info": { + "action": "Start", + "action-level": "vm", + "action-identifier": { + "vserver-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" + } + } + ] + } + }, + "dependency-info": { - }, - "tunable-parameters": { + }, + "tunable-parameters": { - }, - "capabilities" : { - "vm" : ["Stop", "Start"], - "vnfc": ["StopApplication", "StartApplication","HealthCheck"] - } + }, + "capabilities" : { + "vm" : ["Stop", "Start"], + "vnfc": ["StopApplication", "StartApplication","HealthCheck"] + } } diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/start-singleVmPerVnfc-.json b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/start-singleVmPerVnfc-.json index 4ec59c245..b9a93cdd8 100755 --- a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/start-singleVmPerVnfc-.json +++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/start-singleVmPerVnfc-.json @@ -1,51 +1,53 @@ { - "request-info": { - "action": "Start", - "action-level": "vm", - "action-identifier": { - "vserver-id": "dbgx0001v" - }, - "payload": "ABC" - }, - "inventory-info": { - "vnf-info": { - "vnf-id" : "abc", - "vnf-name": "vSCP", - "vnf-type": "vSCP", - "vnf-version" : "1.0", - "vm": [ - { - "vserver-id" : "be_vserverid1", - "vnfc": - { - "vnfc-type": "BE", - "vnfc-name": "BE - Name" - } - }, - { - "vserver-id" : "smp_vserverid1", - "vnfc": - { - "vnfc-type": "SMP", - "vnfc-name": "SMP - Name" - } + "request-info": { + "action": "Start", + "action-level": "vm", + "action-identifier": { + "vserver-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-id", + "vnfc": + { + "vnfc-type": "BE", + "vnfc-name": "BE - Name" + } + }, + { + "vserver-id" : "smp_vserverid1", + "vm-id" : "vm-id", + "vnfc": + { + "vnfc-type": "SMP", + "vnfc-name": "SMP - Name" + } - } - ] - } - }, - "dependency-info": { + } + ] + } + }, + "dependency-info": { - }, - "tunable-parameters": { + }, + "tunable-parameters": { - }, - "capabilities" : { - "vm" : ["Stop", "Start"], - "vnfc": ["StopApplication", "StartApplication","HealthCheck"] - } + }, + "capabilities" : { + "vm" : ["Stop", "Start"], + "vnfc": ["StopApplication", "StartApplication","HealthCheck"] + } } - diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/start-withoutDependency.json b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/start-withoutDependency.json index b1a58e3a1..ea9e7aa6c 100755 --- a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/start-withoutDependency.json +++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/start-withoutDependency.json @@ -1,114 +1,124 @@ { - "request-info": { - "action": "Start", - "action-level": "vm", - "action-identifier": { - "vnf-id": "dbgx0001v" - }, - "payload": "ABC" - }, - "inventory-info": { - "vnf-info": { - "vnf-id" : "abc", - "vnf-name": "vSCP", - "vnf-type": "vSCP", - "vnf-version" : "1.0", - "vm": [ - { - "vserver-id" : "be_vserverid1", - "vnfc": - { - "vnfc-type": "BE", - "vnfc-name": "BE - Name" - } + "request-info": { + "action": "Start", + "action-level": "vm", + "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" + } - }, - { - "vserver-id" : "fe_vserverid1", - "vnfc": - { - "vnfc-type": "FE", - "vnfc-name": "FE - Name" - } + }, + { + "vserver-id" : "fe_vserverid1", + "vm-id" : "vm_id1", + "vnfc": + { + "vnfc-type": "FE", + "vnfc-name": "FE - Name" + } - }, - { - "vserver-id" : "fe_vserverid2", - "vnfc": - { - "vnfc-type": "FE", - "vnfc-name": "FE - Name" - } + }, + { + "vserver-id" : "fe_vserverid2", + "vm-id" : "vm_id1", + "vnfc": + { + "vnfc-type": "FE", + "vnfc-name": "FE - Name" + } - }, - { - "vserver-id" : "be_vserverid2", - "vnfc": - { - "vnfc-type": "BE", - "vnfc-name": "BE - Name" - } + }, + { + "vserver-id" : "be_vserverid2", + "vm-id" : "vm_id1", + "vnfc": + { + "vnfc-type": "BE", + "vnfc-name": "BE - Name" + } - }, - { - "vserver-id" : "be_vserverid3", - "vnfc": - { - "vnfc-type": "BE", - "vnfc-name": "BE - Name" - } + }, + { + "vserver-id" : "be_vserverid3", + "vm-id" : "vm_id1", + "vnfc": + { + "vnfc-type": "BE", + "vnfc-name": "BE - Name" + } - }, - { - "vserver-id" : "smp_vserverid1", - "vnfc": - { - "vnfc-type": "SMP", - "vnfc-name": "SMP - Name" - } + }, + { + "vserver-id" : "smp_vserverid1", + "vm-id" : "vm_id1", + "vnfc": + { + "vnfc-type": "SMP", + "vnfc-name": "SMP - Name" + } - }, - { - "vserver-id" : "smp_vserverid2", - "vnfc": - { - "vnfc-type": "SMP", - "vnfc-name": "SMP - Name" - } - }, - { - "vserver-id" : "be_vserverid4", - "vnfc": - { - "vnfc-type": "BE", - "vnfc-name": "BE - 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" : "be_vserverid5", - "vnfc": - { - "vnfc-type": "BE", - "vnfc-name": "BE - Name" - } + }, + { + "vserver-id" : "be_vserverid5", + "vm-id" : "vm_id1", + "vnfc": + { + "vnfc-type": "BE", + "vnfc-name": "BE - Name" + } - } - ] - } - }, - "dependency-info": { + } + ] + } + }, + "dependency-info": { - }, - "tunable-parameters": { + }, + "tunable-parameters": { - }, - "capabilities" : { - "vm" : ["Stop", "Start"], - "vnfc": ["StopApplication", "StartApplication","HealthCheck"] - } + }, + "capabilities" : { + "vm" : ["Stop", "Start"], + "vnfc": ["StopApplication", "StartApplication","HealthCheck"] + } } diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/start.json b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/start.json index 5dc584d4d..e806cd460 100644 --- a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/start.json +++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/start.json @@ -1,142 +1,149 @@ - { - "request-info": { - "action": "Start", - "action-level": "vnf", - "action-identifier": { - "vnf-id": "dbgx0001v" - }, - "payload": "ABC" + "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", - "vm": [ - { - "vserver-id" : "be_vserverid1", - "vnfc": - { - "vnfc-type": "BE", - "vnfc-name": "BE - Name" - } + }, + "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" + } - }, - { - "vserver-id" : "fe_vserverid1", - "vnfc": - { - "vnfc-type": "FE", - "vnfc-name": "FE - Name" - } + }, + { + "vserver-id" : "fe_vserverid1", + "vm-id" : "vm_id1", + "vnfc": + { + "vnfc-type": "FE", + "vnfc-name": "FE - Name" + } - }, - { - "vserver-id" : "fe_vserverid2", - "vnfc": - { - "vnfc-type": "FE", - "vnfc-name": "FE - Name" - } + }, + { + "vserver-id" : "fe_vserverid2", + "vm-id" : "vm_id1", + "vnfc": + { + "vnfc-type": "FE", + "vnfc-name": "FE - Name" + } - }, - { - "vserver-id" : "be_vserverid2", - "vnfc": - { - "vnfc-type": "BE", - "vnfc-name": "BE - Name" - } + }, + { + "vserver-id" : "be_vserverid2", + "vm-id" : "vm_id1", + "vnfc": + { + "vnfc-type": "BE", + "vnfc-name": "BE - Name" + } - }, - { - "vserver-id" : "be_vserverid3", - "vnfc": - { - "vnfc-type": "BE", - "vnfc-name": "BE - Name" - } + }, + { + "vserver-id" : "be_vserverid3", + "vm-id" : "vm_id1", + "vnfc": + { + "vnfc-type": "BE", + "vnfc-name": "BE - Name" + } - }, - { - "vserver-id" : "smp_vserverid1", - "vnfc": - { - "vnfc-type": "SMP", - "vnfc-name": "SMP - Name" - } + }, + { + "vserver-id" : "smp_vserverid1", + "vm-id" : "vm_id1", + "vnfc": + { + "vnfc-type": "SMP", + "vnfc-name": "SMP - Name" + } - }, - { - "vserver-id" : "smp_vserverid2", - "vnfc": - { - "vnfc-type": "SMP", - "vnfc-name": "SMP - Name" - } - }, - { - "vserver-id" : "be_vserverid4", - "vnfc": - { - "vnfc-type": "BE", - "vnfc-name": "BE - 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" : "be_vserverid5", - "vnfc": - { - "vnfc-type": "BE", - "vnfc-name": "BE - Name" - } + }, + { + "vserver-id" : "be_vserverid5", + "vm-id" : "vm_id1", + "vnfc": + { + "vnfc-type": "BE", + "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" : "FORWARD", - "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" : "FORWARD", + "wait-time": "120", + "retry-count": "5" + }, + "capabilities" : { + "vnf": ["Stop", "Start", "StartApplication","StopApplication"], + "vf-module": ["Stop", "Start"], + "vm" : ["Stop", "Start"], + "vnfc": ["StopApplication", "StartApplication","HealthCheck"] + } } - - diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/stop-WithoutDep.json b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/stop-WithoutDep.json index 137a67c19..3251106e3 100755 --- a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/stop-WithoutDep.json +++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/stop-WithoutDep.json @@ -16,9 +16,11 @@ "vnf-name": "vSCP", "vnf-type": "vSCP", "vnf-version" : "1.0", + "identity-url" : "test", "vm": [ { "vserver-id" : "be_vserverid1", + "vm-id" : "vm-id1", "vnfc": { "vnfc-type": "BE", @@ -28,6 +30,7 @@ }, { "vserver-id" : "fe_vserverid1", + "vm-id" : "vm-id2", "vnfc": { "vnfc-type": "FE", @@ -37,6 +40,7 @@ }, { "vserver-id" : "fe_vserverid2", + "vm-id" : "vm-id3", "vnfc": { "vnfc-type": "FE", @@ -46,6 +50,7 @@ }, { "vserver-id" : "be_vserverid2", + "vm-id" : "vm-id4", "vnfc": { "vnfc-type": "BE", @@ -55,6 +60,7 @@ }, { "vserver-id" : "be_vserverid3", + "vm-id" : "vm-id1", "vnfc": { "vnfc-type": "BE", @@ -64,6 +70,7 @@ }, { "vserver-id" : "smp_vserverid1", + "vm-id" : "vm-id1", "vnfc": { "vnfc-type": "SMP", @@ -73,6 +80,7 @@ }, { "vserver-id" : "smp_vserverid2", + "vm-id" : "vm-id1", "vnfc": { "vnfc-type": "SMP", @@ -81,6 +89,7 @@ }, { "vserver-id" : "be_vserverid4", + "vm-id" : "vm-id1", "vnfc": { "vnfc-type": "BE", @@ -90,6 +99,7 @@ }, { "vserver-id" : "be_vserverid5", + "vm-id" : "vm-id1", "vnfc": { "vnfc-type": "BE", diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/stop-single-vm-per-vnfc.json b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/stop-single-vm-per-vnfc.json index 1d2cfde0e..ed449fe25 100644 --- a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/stop-single-vm-per-vnfc.json +++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/stop-single-vm-per-vnfc.json @@ -1,65 +1,51 @@ + + { - "request-info": - { + "request-info": { "action": "Stop", "action-level": "vm", - "action-identifier": - { + "action-identifier": { "vserver-id": "dbgx0001v" }, "payload": "ABC" }, - "inventory-info": - { - "vnf-info": - { + "inventory-info": { + "vnf-info": { "vnf-id" : "abc", - "vnf-name": "vVNF", - "vnf-type": "vVNF", + "vnf-name": "vSCP", + "vnf-type": "vSCP", "vnf-version" : "1.0", - "vm": - [ + "identity-url" : "test_url", + "vm": [ { - "vserver-id" : "vnfc2_vserverid1", + "vserver-id" : "be_vserverid1", + "vm-id" : "vm_id1", "vnfc": { - "vnfc-type": "VNFC2", - "vnfc-name": "VNFC2 - Name" + "vnfc-type": "BE", + "vnfc-name": "BE - Name" } }, { - "vserver-id" : "vnfc1_vserverid1", + "vserver-id" : "smp_vserverid1", + "vm-id" : "vm_id1", "vnfc": { - "vnfc-type": "VNFC1", - "vnfc-name": "VNFC1 - Name" + "vnfc-type": "SMP", + "vnfc-name": "SMP - Name" } } ] }}, - "dependency-info": - { + "dependency-info": { }, - "tunable-parameters": - { + "tunable-parameters": { }, - "capabilities" : - { - "vm" : - [ - "Stop", - "Start" - ], - "vnfc": - [ - "StopApplication", - "StartApplication", - "HealthCheck" - ] + "capabilities" : { + "vm" : ["Stop", "Start"], + "vnfc": ["StopApplication", "StartApplication","HealthCheck"] } } - - diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/stop-single-vm.json b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/stop-single-vm.json index 99abb7a70..02cd56230 100644 --- a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/stop-single-vm.json +++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/stop-single-vm.json @@ -1,56 +1,43 @@ + + { - "request-info": - { + "request-info": { "action": "Stop", "action-level": "vm", - "action-identifier": - { + "action-identifier": { "vserver-id": "dbgx0001v" }, "payload": "ABC" }, - "inventory-info": - { - "vnf-info": - { + "inventory-info": { + "vnf-info": { "vnf-id" : "abc", - "vnf-name": "vVNF", - "vnf-type": "vVNF", + "vnf-name": "vSCP", + "vnf-type": "vSCP", "vnf-version" : "1.0", - "vm": - [ + "identity-url" : "test-url", + "vm": [ { - "vserver-id" : "vnfc2_vserverid1", + "vserver-id" : "be_vserverid1", + "vm-id" : "vm_id1", "vnfc": { - "vnfc-type": "VNFC2", - "vnfc-name": "VNFC2 - Name" + "vnfc-type": "BE", + "vnfc-name": "BE - Name" } } ] } }, - "dependency-info": - { + "dependency-info": { }, - "tunable-parameters": - { + "tunable-parameters": { }, - "capabilities" : - { - "vm" : - [ - "Stop", - "Start" - ], - "vnfc": - [ - "StopApplication", - "StartApplication", - "HealthCheck" - ] + "capabilities" : { + "vm" : ["Stop", "Start"], + "vnfc": ["StopApplication", "StartApplication","HealthCheck"] } } diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/stop-singleVM.json b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/stop-singleVM.json index 30b936585..6cdd3de20 100755 --- a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/stop-singleVM.json +++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/stop-singleVM.json @@ -1,5 +1,3 @@ - - { "request-info": { "action": "Stop", @@ -15,9 +13,11 @@ "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", @@ -38,5 +38,3 @@ "vnfc": ["StopApplication", "StartApplication","HealthCheck"] } } - - diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/stop-singleVmPerVnfc.json b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/stop-singleVmPerVnfc.json index 61d9630ab..a49b70403 100755 --- a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/stop-singleVmPerVnfc.json +++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/stop-singleVmPerVnfc.json @@ -1,5 +1,3 @@ - - { "request-info": { "action": "Stop", @@ -15,9 +13,11 @@ "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", @@ -26,6 +26,7 @@ }, { "vserver-id" : "smp_vserverid1", + "vm-id" : "vm_id1", "vnfc": { "vnfc-type": "SMP", @@ -46,5 +47,3 @@ "vnfc": ["StopApplication", "StartApplication","HealthCheck"] } } - - diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/stop.json b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/stop.json index 0b7a1a7c1..e52269ec0 100644 --- a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/stop.json +++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/stop.json @@ -16,9 +16,11 @@ "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", @@ -28,6 +30,7 @@ }, { "vserver-id" : "fe_vserverid1", + "vm-id" : "vm_id1", "vnfc": { "vnfc-type": "FE", @@ -37,6 +40,7 @@ }, { "vserver-id" : "fe_vserverid2", + "vm-id" : "vm_id1", "vnfc": { "vnfc-type": "FE", @@ -46,6 +50,7 @@ }, { "vserver-id" : "be_vserverid2", + "vm-id" : "vm_id1", "vnfc": { "vnfc-type": "BE", @@ -55,6 +60,7 @@ }, { "vserver-id" : "be_vserverid3", + "vm-id" : "vm_id1", "vnfc": { "vnfc-type": "BE", @@ -64,6 +70,7 @@ }, { "vserver-id" : "smp_vserverid1", + "vm-id" : "vm_id1", "vnfc": { "vnfc-type": "SMP", @@ -73,6 +80,7 @@ }, { "vserver-id" : "smp_vserverid2", + "vm-id" : "vm_id1", "vnfc": { "vnfc-type": "SMP", @@ -81,6 +89,7 @@ }, { "vserver-id" : "be_vserverid4", + "vm-id" : "vm_id1", "vnfc": { "vnfc-type": "BE", @@ -90,6 +99,7 @@ }, { "vserver-id" : "be_vserverid5", + "vm-id" : "vm_id1", "vnfc": { "vnfc-type": "BE", diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/wrongaction.json b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/wrongaction.json index cd6eaa779..276d550e5 100644 --- a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/wrongaction.json +++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/wrongaction.json @@ -1,141 +1,151 @@ { - "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", - "vm": [ - { - "vserver-id" : "be_vserverid1", - "vnfc": - { - "vnfc-type": "BE", - "vnfc-name": "BE - Name" - } - - }, - { - "vserver-id" : "fe_vserverid1", - "vnfc": - { - "vnfc-type": "FE", - "vnfc-name": "FE - Name" - } - - }, - { - "vserver-id" : "fe_vserverid2", - "vnfc": - { - "vnfc-type": "FE", - "vnfc-name": "FE - Name" - } - - }, - { - "vserver-id" : "be_vserverid2", - "vnfc": - { - "vnfc-type": "BE", - "vnfc-name": "BE - Name" - } - - }, - { - "vserver-id" : "be_vserverid3", - "vnfc": - { - "vnfc-type": "BE", - "vnfc-name": "BE - Name" - } - - }, - { - "vserver-id" : "smp_vserverid1", - "vnfc": - { - "vnfc-type": "SMP", - "vnfc-name": "SMP - Name" - } - - }, - { - "vserver-id" : "smp_vserverid2", - "vnfc": - { - "vnfc-type": "SMP", - "vnfc-name": "SMP - Name" - } - }, - { - "vserver-id" : "be_vserverid4", - "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-name": "BE - Name" + } + + }, + { + "vserver-id" : "fe_vserverid1", + "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-name": "FE - Name" + } + + }, + { + "vserver-id" : "be_vserverid2", + "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-name": "BE - Name" + } + + }, + { + "vserver-id" : "smp_vserverid1", + "vm-id" : "vm_id1", + "vnfc": + { + "vnfc-type": "SMP", + "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" : "be_vserverid5", - "vnfc": - { - "vnfc-type": "BE", - "vnfc-name": "BE - Name" - } + }, + { + "vserver-id" : "be_vserverid5", + "vm-id" : "vm_id1", + "vnfc": + { + "vnfc-type": "BE", + "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" : "FORWARD", - "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" : "FORWARD", + "wait-time": "120", + "retry-count": "5" + }, + "capabilities" : { + "vnf": ["Stop", "Start", "StartApplication","StopApplication"], + "vf-module": ["Stop", "Start"], + "vm" : ["Stop", "Start"], + "vnfc": ["StopApplication", "StartApplication","HealthCheck"] + } } diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/wrongnumber.json b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/wrongnumber.json index ffdaec28a..6c2db0898 100644 --- a/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/wrongnumber.json +++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/test/resources/input/wrongnumber.json @@ -1,141 +1,151 @@ { - "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", - "vm": [ - { - "vserver-id" : "be_vserverid1", - "vnfc": - { - "vnfc-type": "BE", - "vnfc-name": "BE - Name" - } - - }, - { - "vserver-id" : "fe_vserverid1", - "vnfc": - { - "vnfc-type": "FE", - "vnfc-name": "FE - Name" - } - - }, - { - "vserver-id" : "fe_vserverid2", - "vnfc": - { - "vnfc-type": "FE", - "vnfc-name": "FE - Name" - } - - }, - { - "vserver-id" : "be_vserverid2", - "vnfc": - { - "vnfc-type": "BE", - "vnfc-name": "BE - Name" - } - - }, - { - "vserver-id" : "be_vserverid3", - "vnfc": - { - "vnfc-type": "BE", - "vnfc-name": "BE - Name" - } - - }, - { - "vserver-id" : "smp_vserverid1", - "vnfc": - { - "vnfc-type": "SMP", - "vnfc-name": "SMP - Name" - } - - }, - { - "vserver-id" : "smp_vserverid2", - "vnfc": - { - "vnfc-type": "SMP", - "vnfc-name": "SMP - Name" - } - }, - { - "vserver-id" : "be_vserverid4", - "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-name": "BE - Name" + } + + }, + { + "vserver-id" : "fe_vserverid1", + "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-name": "FE - Name" + } + + }, + { + "vserver-id" : "be_vserverid2", + "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-name": "BE - Name" + } + + }, + { + "vserver-id" : "smp_vserverid1", + "vm-id" : "vm_id1", + "vnfc": + { + "vnfc-type": "SMP", + "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" : "be_vserverid5", - "vnfc": - { - "vnfc-type": "BE", - "vnfc-name": "BE - Name" - } + }, + { + "vserver-id" : "be_vserverid5", + "vm-id" : "vm_id1", + "vnfc": + { + "vnfc-type": "BE", + "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" : "FORWARD", - "wait-time": "6a", - "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" : "FORWARD", + "wait-time": "6a", + "retry-count": "5" + }, + "capabilities" : { + "vnf": ["Stop", "Start", "StartApplication","StopApplication"], + "vf-module": ["Stop", "Start"], + "vm" : ["Stop", "Start"], + "vnfc": ["StopApplication", "StartApplication","HealthCheck"] + } } |