Fix additional NS parameter handling

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

3 files changed, 4 insertions, 72 deletions

diff --git a/nokiav2/docs/.gitignore b/nokiav2/docs/.gitignore
index 589cdd01..a96ddfc2 100644
--- a/nokiav2/docs/.gitignore
+++ b/nokiav2/docs/.gitignore
@@ -1,3 +1,3 @@
 _build
 .DS_Store
-
+internal.rst
diff --git a/nokiav2/docs/sampleVnfs/simple/vfc.ns.instantiation.request.json b/nokiav2/docs/sampleVnfs/simple/vfc.ns.instantiation.request.json
index 30efc96e..34d16a47 100644
--- a/nokiav2/docs/sampleVnfs/simple/vfc.ns.instantiation.request.json
+++ b/nokiav2/docs/sampleVnfs/simple/vfc.ns.instantiation.request.json
@@ -1,41 +1,7 @@
 {
-  "nsInstanceId": "e7d79bd8-8e97-48fa-bbb8-fe2e8166b61c",
+  "nsInstanceId": "69c095e8-e24f-4e0b-821e-f6f8d342a929",
   "additionalParamForNs": {
     "location": "Nokia_RegionOne",
-    "vnfs": {
-      "669e8f94-b3a4-47ff-9245-c023c9fd5657": {
-        "computeResourceFlavours": [
-          {
-            "vnfdVirtualComputeDescId": "server_compute",
-            "resourceId": "m1.small"
-          }
-        ],
-        "extVirtualLinks": [
-          {
-            "extCps": [
-              {
-                "cpdId": "comuniversal_ecp"
-              }
-            ],
-            "resourceId": "external"
-          }
-        ],
-        "zones": [
-          {
-            "resourceId": "nova",
-            "id": "zoneInfoId"
-          }
-        ],
-        "flavourId": "scalable",
-        "vimType": "OPENSTACK_V2_INFO",
-        "instantiationLevel": "default",
-        "softwareImages": [
-          {
-            "resourceId": "ubuntu-16.04",
-            "vnfdSoftwareImageId": "server_image"
-          }
-        ]
-      }
-    }
+    "61fbe643-8c92-4b95-a90a-d65f1ba359a9": "{ \"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\" } ] }"
   }
 }
\ No newline at end of file
diff --git a/nokiav2/docs/sampleVnfs/simpleDual/vfc.ns.instantiation.request.json b/nokiav2/docs/sampleVnfs/simpleDual/vfc.ns.instantiation.request.json
index 4b0ce8fd..2e4a3251 100644
--- a/nokiav2/docs/sampleVnfs/simpleDual/vfc.ns.instantiation.request.json
+++ b/nokiav2/docs/sampleVnfs/simpleDual/vfc.ns.instantiation.request.json
@@ -2,40 +2,6 @@
   "nsInstanceId": "b65572a1-4f2e-4787-950d-bb489e970623",
   "additionalParamForNs": {
     "location": "Nokia_RegionOne",
-    "vnfs": {
-      "f85f054f-0928-4fab-ac76-b47b8fba0d6d": {
-        "computeResourceFlavours": [
-          {
-            "vnfdVirtualComputeDescId": "server_compute",
-            "resourceId": "m1.small"
-          }
-        ],
-        "extVirtualLinks": [
-          {
-            "extCps": [
-              {
-                "cpdId": "commisioning_ecp"
-              }
-            ],
-            "resourceId": "pub_net"
-          }
-        ],
-        "zones": [
-          {
-            "resourceId": "compute-a",
-            "id": "zoneInfoId"
-          }
-        ],
-        "flavourId": "scalable",
-        "vimType": "OPENSTACK_V2_INFO",
-        "instantiationLevel": "default",
-        "softwareImages": [
-          {
-            "resourceId": "ubuntu.16.04",
-            "vnfdSoftwareImageId": "server_image"
-          }
-        ]
-      }
-    }
+    "f85f054f-0928-4fab-ac76-b47b8fba0d6d": "{ \"computeResourceFlavours\": [ { \"vnfdVirtualComputeDescId\": \"server_compute\", \"resourceId\": \"m1.small\" } ], \"extVirtualLinks\": [ { \"extCps\": [ { \"cpdId\": \"commisioning_ecp\" } ], \"resourceId\": \"pub_net\" } ], \"zones\": [ { \"resourceId\": \"compute-a\", \"id\": \"zoneInfoId\" } ], \"flavourId\": \"scalable\", \"vimType\": \"OPENSTACK_V2_INFO\", \"instantiationLevel\": \"default\", \"softwareImages\": [ { \"resourceId\": \"ubuntu.16.04\", \"vnfdSoftwareImageId\": \"server_image\" } ] }"
   }
 }
\ No newline at end of file