Process VNF property passed instantiation input

Change-Id: Ia4f6eeacb8bf346b5e1f56d8a953ce7691f3c2c7
Signed-off-by: Denes Nemeth <denes.nemeth@nokia.com>
Issue-ID: VFC-728

11 files changed, 46 insertions, 11 deletions

diff --git a/nokiav2/docs/.gitignore b/nokiav2/docs/.gitignore
index a96ddfc2..bd19fff5 100644
--- a/nokiav2/docs/.gitignore
+++ b/nokiav2/docs/.gitignore
@@ -1,3 +1,4 @@
 _build
 .DS_Store
 internal.rst
+ims
diff --git a/nokiav2/docs/sample/vnfm.instantiation.request.json b/nokiav2/docs/sample/vnfm.instantiation.request.json
new file mode 100644
index 00000000..8b111b2b
--- /dev/null
+++ b/nokiav2/docs/sample/vnfm.instantiation.request.json
@@ -0,0 +1,14 @@
+{
+  "vnfInstanceName": "vnfc3bc829b-6057-4001-ad04-7c6",
+  "extVirtualLink": [],
+  "vnfPackageId": "c3bc829b-6057-4001-ad04-7c6bfdf30138",
+  "additionalParam": {
+    "inputs": {
+      "location": "Nokia_RegionOne"
+    },
+    "extVirtualLinks": [],
+    "properties": "{\"etsi_config\": \"{'zones': [{'resourceId': 'compute-a', 'id': 'zoneInfoId'}], 'extVirtualLinks': [{'resourceId': 'pub_net', 'extCps': [{'cpdId': 'universal_ecp'}]}], 'vimType': 'OPENSTACK_V3_INFO', 'instantiationLevel': 'default', 'softwareImages': [{'vnfdSoftwareImageId': 'server_image', 'resourceId': 'ubuntu.16.04'}], 'computeResourceFlavours': [{'resourceId': 'm1.small', 'vnfdVirtualComputeDescId': 'server_compute'}], 'flavourId': 'scalable'}\", \"id\": \"c3bc829b-6057-4001-ad04-7c6bfdf30138\", \"availability_zone_max_count\": \"1\"}",
+    "vimId": "Nokia_RegionOne"
+  },
+  "vnfDescriptorId": "c3bc829b-6057-4001-ad04-7c6bfdf30138"
+}
\ No newline at end of file
diff --git a/nokiav2/docs/sampleVnfs/simple/cbam.instantiation.request.json b/nokiav2/docs/sampleVnfs/simple/cbam.instantiation.request.json
index 5ec6acbc..a85ca0ae 100644
--- a/nokiav2/docs/sampleVnfs/simple/cbam.instantiation.request.json
+++ b/nokiav2/docs/sampleVnfs/simple/cbam.instantiation.request.json
@@ -41,20 +41,20 @@
     "vims": [
         {
             "accessInfo": {
-                "username": "develadm", 
-                "tenant": "devel", 
-                "password": "develpass",
+                "username": "<username>",
+                "tenant": "<tenantName>",
+                "password": "<password>",
                 "region": "RegionOne"
-            }, 
+            },
             "interfaceInfo": {
-                "endpoint": "https://10.41.49.107:5000/v2.0/",
+                "endpoint": "https://<keyStoneIp>:5000/v2.0/",
                 "trustedCertificates": [],
                 "skipCertificateVerification": true,
-                "skipCertificateHostnameCheck": true 
+                "skipCertificateHostnameCheck": true
             },
             "vimInfoType": "OPENSTACK_V2_INFO",
             "id": "vim_id"
         }
-   ],
+    ],
     "instantiationLevelId": "default"
 }
diff --git a/nokiav2/docs/sampleVnfs/simple/sdc.json b/nokiav2/docs/sampleVnfs/simple/sdc.json
new file mode 100644
index 00000000..e6da9e17
--- /dev/null
+++ b/nokiav2/docs/sampleVnfs/simple/sdc.json
@@ -0,0 +1 @@
+{ "computeResourceFlavours": [ { "vnfdVirtualComputeDescId": "server_compute", "resourceId": "m1.small" } ], "extVirtualLinks": [ { "extCps": [ { "cpdId": "universal_ecp" } ], "resourceId": "pub_net" } ], "zones": [ { "resourceId": "compute-a", "id": "zoneInfoId" } ], "flavourId": "scalable", "vimType": "OPENSTACK_V3_INFO", "instantiationLevel": "default", "softwareImages": [ { "resourceId": "ubuntu.16.04", "vnfdSoftwareImageId": "server_image" } ] }
diff --git a/nokiav2/docs/sampleVnfs/simple/simple.csar b/nokiav2/docs/sampleVnfs/simple/simple.csar
index da3637fe..fc03b56a 100644
--- a/nokiav2/docs/sampleVnfs/simple/simple.csar
+++ b/nokiav2/docs/sampleVnfs/simple/simple.csar
diff --git a/nokiav2/docs/sampleVnfs/simple/vfc.ns.instantiation.request.direct.json b/nokiav2/docs/sampleVnfs/simple/vfc.ns.instantiation.request.direct.json
new file mode 100644
index 00000000..811f13a0
--- /dev/null
+++ b/nokiav2/docs/sampleVnfs/simple/vfc.ns.instantiation.request.direct.json
@@ -0,0 +1,6 @@
+{
+  "nsInstanceId": "23fd3ae5-c261-4662-9fcd-35107d33954f",
+  "additionalParamForNs": {
+    "location": "Nokia_RegionOne"
+  }
+}
\ No newline at end of file
diff --git a/nokiav2/docs/sampleVnfs/simpleDual/cbam.instantiation.request.json b/nokiav2/docs/sampleVnfs/simpleDual/cbam.instantiation.request.json
index 5ec6acbc..16fc4d14 100644
--- a/nokiav2/docs/sampleVnfs/simpleDual/cbam.instantiation.request.json
+++ b/nokiav2/docs/sampleVnfs/simpleDual/cbam.instantiation.request.json
@@ -41,13 +41,13 @@
     "vims": [
         {
             "accessInfo": {
-                "username": "develadm", 
-                "tenant": "devel", 
-                "password": "develpass",
+                "username": "<username>",
+                "tenant": "<tenantName>",
+                "password": "<password>",
                 "region": "RegionOne"
             }, 
             "interfaceInfo": {
-                "endpoint": "https://10.41.49.107:5000/v2.0/",
+                "endpoint": "https://<keyStoneIp>:5000/v2.0/",
                 "trustedCertificates": [],
                 "skipCertificateVerification": true,
                 "skipCertificateHostnameCheck": true 
diff --git a/nokiav2/docs/sampleVnfs/simpleDual/simpleDual.csar b/nokiav2/docs/sampleVnfs/simpleDual/simpleDual.csar
index 7b0b57f0..3a43b788 100644
--- a/nokiav2/docs/sampleVnfs/simpleDual/simpleDual.csar
+++ b/nokiav2/docs/sampleVnfs/simpleDual/simpleDual.csar
diff --git a/nokiav2/docs/sampleVnfs/simpleDual/vfc.ns.instantiation.request.direct.json b/nokiav2/docs/sampleVnfs/simpleDual/vfc.ns.instantiation.request.direct.json
new file mode 100644
index 00000000..452b10bb
--- /dev/null
+++ b/nokiav2/docs/sampleVnfs/simpleDual/vfc.ns.instantiation.request.direct.json
@@ -0,0 +1,6 @@
+{
+  "nsInstanceId": "b65572a1-4f2e-4787-950d-bb489e970623",
+  "additionalParamForNs": {
+    "location": "Nokia_RegionOne"
+  }
+}
\ No newline at end of file
diff --git a/nokiav2/docs/sampleVnfs/simple_cmcc/sdc.json b/nokiav2/docs/sampleVnfs/simple_cmcc/sdc.json
new file mode 100644
index 00000000..16563884
--- /dev/null
+++ b/nokiav2/docs/sampleVnfs/simple_cmcc/sdc.json
@@ -0,0 +1 @@
+{ "computeResourceFlavours": [ { "vnfdVirtualComputeDescId": "server_compute", "resourceId": "m1.small" } ], "extVirtualLinks": [ { "extCps": [ { "cpdId": "universal_ecp" } ], "resourceId": "oam-nokia" } ], "zones": [ { "resourceId": "nova", "id": "zoneInfoId" } ], "flavourId": "scalable", "vimType": "OPENSTACK_V3_INFO", "instantiationLevel": "default", "softwareImages": [ { "resourceId": "ubuntu.16.04", "vnfdSoftwareImageId": "server_image" } ] }
\ No newline at end of file
diff --git a/nokiav2/docs/sampleVnfs/simple_cmcc/vfc.ns.instantiation.request.direct.json b/nokiav2/docs/sampleVnfs/simple_cmcc/vfc.ns.instantiation.request.direct.json
new file mode 100644
index 00000000..41820092
--- /dev/null
+++ b/nokiav2/docs/sampleVnfs/simple_cmcc/vfc.ns.instantiation.request.direct.json
@@ -0,0 +1,6 @@
+{
+  "nsInstanceId": "601f68d2-b1cd-4c47-8af9-1a781eb5fa2a",
+  "additionalParamForNs": {
+    "location": "NokiaNonAdmin_RegionOne"
+  }
+}
\ No newline at end of file