Check vm-capabilites on vnf-level OS requests

[appc.git] / appc-sequence-generator / appc-sequence-generator-bundle / src / test / resources / input / missingrequestinfo.json

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 5f8efc4..cc01378 100644 (file)
--- 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,141 +1,150 @@
+
 {
-"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_id2",
-                                               "vnfc": 
-                                                               {
-                                                                       "vnfc-type": "FE",
-                                                                       "vnfc-name": "FE - Name"
-                                                               }
-                                                               
-                                       },
-                                       {
-                                               "vserver-id" : "be_vserverid2",
-                                               "vm-id" : "vm_id2",
-                                               "vnfc": 
-                                                               {
-                                                                       "vnfc-type": "BE",
-                                                                       "vnfc-name": "BE - Name"
-                                                               }
-                                                               
-                                       },
-                                       {
-                                               "vserver-id" : "be_vserverid3",
-                                               "vm-id" : "vm_id3",
-                                               "vnfc": 
-                                                               {
-                                                                       "vnfc-type": "BE",
-                                                                       "vnfc-name": "BE - Name"
-                                                               }
-                                                               
-                                       },
-                                       {
-                                               "vserver-id" : "smp_vserverid1",
-                                               "vm-id" : "vm_id3",
-                                               "vnfc": 
-                                                               {
-                                                                       "vnfc-type": "SMP",
-                                                                       "vnfc-name": "SMP - Name"
-                                                               }
-                                                               
-                                       },
-                                       {
-                                               "vserver-id" : "smp_vserverid2",
-                                               "vm-id" : "vm_id2",
-                                               "vnfc": 
-                                                               {
-                                                                       "vnfc-type": "SMP",
-                                                                       "vnfc-name": "SMP - Name"
-                                                               }                                                               
-                                       },
-                                       {
-                                               "vserver-id" : "be_vserverid4",
-                                               "vm-id" : "vm_id4",
-                                               "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-function-code": "pld",
+                                    "vnfc-name": "BE - 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_id2",
+                        "vnfc": 
+                                {
+                                    "vnfc-type": "FE",
+                                    "vnfc-function-code": "pld",
+                                    "vnfc-name": "FE - Name"
+                                }
+                                
+                    },
+                    {
+                        "vserver-id" : "be_vserverid2",
+                        "vm-id" : "vm_id2",
+                        "vnfc": 
+                                {
+                                    "vnfc-type": "BE",
+                                    "vnfc-function-code": "pld",
+                                    "vnfc-name": "BE - Name"
+                                }
+                                
+                    },
+                    {
+                        "vserver-id" : "be_vserverid3",
+                        "vm-id" : "vm_id3",
+                        "vnfc": 
+                                {
+                                    "vnfc-type": "BE",
+                                    "vnfc-function-code": "pld",
+                                    "vnfc-name": "BE - Name"
+                                }
+                                
+                    },
+                    {
+                        "vserver-id" : "smp_vserverid1",
+                        "vm-id" : "vm_id3",
+                        "vnfc": 
+                                {
+                                    "vnfc-type": "SMP",
+                                    "vnfc-function-code": "pld",
+                                    "vnfc-name": "SMP - Name"
+                                }
+                                
+                    },
+                    {
+                        "vserver-id" : "smp_vserverid2",
+                        "vm-id" : "vm_id2",
+                        "vnfc": 
+                                {
+                                    "vnfc-type": "SMP",
+                                    "vnfc-function-code": "pld",
+                                    "vnfc-name": "SMP - Name"
+                                }                                
+                    },
+                    {
+                        "vserver-id" : "be_vserverid4",
+                        "vm-id" : "vm_id4",
+                        "vnfc":
+                        {
+                            "vnfc-type": "BE",
+                            "vnfc-function-code": "pld",
+                            "vnfc-name": "BE - Name"
+                        }
 
-                                       },
-                                       {
-                                               "vserver-id" : "be_vserverid5",
-                                               "vm-id" : "vm_id5",
-                                               "vnfc":
-                                               {
-                                                       "vnfc-type": "BE",
-                                                       "vnfc-name": "BE - Name"
-                                               }
+                    },
+                    {
+                        "vserver-id" : "be_vserverid5",
+                        "vm-id" : "vm_id5",
+                        "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" : "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" :["pld", "ssc", "dbo"]}, {"Start" :["pld", "ssc", "dbo"]}, {"Restart" :["pld", "ssc", "dbo"]}],
+        "vnfc": ["StopApplication", "StartApplication","HealthCheck"]
+    }
 }
 
-