13 files changed, 65 insertions, 130 deletions
diff --git a/nokiav2/docs/onboarding.rst b/nokiav2/docs/onboarding.rst
index 80aff0b2..4613777d 100644
--- a/nokiav2/docs/onboarding.rst
+++ b/nokiav2/docs/onboarding.rst
@@ -181,6 +181,8 @@ The following section requires the CSAR and the ETSI configuration of the VNF to
 
         - Select the ETSI configuration file using Browse
 
+          - the name of the file on the local file system must be etsi_config.json
+
         - Click on Done
 
 - Click on Check in
diff --git a/nokiav2/docs/sampleVnfs/simple/cbam.instantiation.request.json b/nokiav2/docs/sampleVnfs/simple/cbam.instantiation.request.json
deleted file mode 100644
index a85ca0ae..00000000
--- a/nokiav2/docs/sampleVnfs/simple/cbam.instantiation.request.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-    "apiVersion":"3.1",
-    "computeResourceFlavours": [
-        {
-            "vnfdVirtualComputeDescId": "server_compute",
-            "resourceId": "m1.small"
-        }
-    ],
-    "extVirtualLinks": [
-        {
-            "extCps": [
-                {
-                    "cpdId": "commisioning_ecp"
-                }
-            ],
-            "resourceId": "pub_net"
-        },
-        {
-            "extCps": [
-                {
-                    "cpdId": "vnftovnf_ecp"
-                }
-            ],
-            "resourceId": "preservedNetwork"
-        }
-    ],
-    "zones": [
-        {
-            "resourceId": "compute-a",
-            "id": "zoneInfoId"
-        }
-    ],
-    "flavourId": "scalable",
-    "grantlessMode": true,
-    "softwareImages": [
-        {
-            "resourceId": "ubuntu.16.04",
-            "vnfdSoftwareImageId": "server_image"
-        }
-    ],
-    "vims": [
-        {
-            "accessInfo": {
-                "username": "<username>",
-                "tenant": "<tenantName>",
-                "password": "<password>",
-                "region": "RegionOne"
-            },
-            "interfaceInfo": {
-                "endpoint": "https://<keyStoneIp>:5000/v2.0/",
-                "trustedCertificates": [],
-                "skipCertificateVerification": true,
-                "skipCertificateHostnameCheck": true
-            },
-            "vimInfoType": "OPENSTACK_V2_INFO",
-            "id": "vim_id"
-        }
-    ],
-    "instantiationLevelId": "default"
-}
diff --git a/nokiav2/docs/sampleVnfs/simple/simple.v1.csar b/nokiav2/docs/sampleVnfs/simple/simple.v1.csar
index bdea8ad8..3f66c11f 100644
--- a/nokiav2/docs/sampleVnfs/simple/simple.v1.csar
+++ b/nokiav2/docs/sampleVnfs/simple/simple.v1.csar
diff --git a/nokiav2/docs/sampleVnfs/simple/simple.v2.csar b/nokiav2/docs/sampleVnfs/simple/simple.v2.csar
new file mode 100644
index 00000000..a7466259
--- /dev/null
+++ b/nokiav2/docs/sampleVnfs/simple/simple.v2.csar
diff --git a/nokiav2/docs/sampleVnfs/simpleDual/cbam.instantiation.request.json b/nokiav2/docs/sampleVnfs/simpleDual/cbam.instantiation.request.json
deleted file mode 100644
index 16fc4d14..00000000
--- a/nokiav2/docs/sampleVnfs/simpleDual/cbam.instantiation.request.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-    "apiVersion":"3.1",
-    "computeResourceFlavours": [
-        {
-            "vnfdVirtualComputeDescId": "server_compute",
-            "resourceId": "m1.small"
-        }
-    ],
-    "extVirtualLinks": [
-        {
-            "extCps": [
-                {
-                    "cpdId": "commisioning_ecp"
-                }
-            ],
-            "resourceId": "pub_net"
-        },
-        {
-            "extCps": [
-                {
-                    "cpdId": "vnftovnf_ecp"
-                }
-            ],
-            "resourceId": "preservedNetwork"
-        }
-    ],
-    "zones": [
-        {
-            "resourceId": "compute-a",
-            "id": "zoneInfoId"
-        }
-    ],
-    "flavourId": "scalable",
-    "grantlessMode": true,
-    "softwareImages": [
-        {
-            "resourceId": "ubuntu.16.04",
-            "vnfdSoftwareImageId": "server_image"
-        }
-    ],
-    "vims": [
-        {
-            "accessInfo": {
-                "username": "<username>",
-                "tenant": "<tenantName>",
-                "password": "<password>",
-                "region": "RegionOne"
-            }, 
-            "interfaceInfo": {
-                "endpoint": "https://<keyStoneIp>:5000/v2.0/",
-                "trustedCertificates": [],
-                "skipCertificateVerification": true,
-                "skipCertificateHostnameCheck": true 
-            },
-            "vimInfoType": "OPENSTACK_V2_INFO",
-            "id": "vim_id"
-        }
-   ],
-    "instantiationLevelId": "default"
-}
diff --git a/nokiav2/docs/sampleVnfs/simpleDual/cbam.package.zip b/nokiav2/docs/sampleVnfs/simpleDual/cbam.package.zip
new file mode 100644
index 00000000..48841624
--- /dev/null
+++ b/nokiav2/docs/sampleVnfs/simpleDual/cbam.package.zip
diff --git a/nokiav2/docs/sampleVnfs/simpleDual/etsi_config.json b/nokiav2/docs/sampleVnfs/simpleDual/etsi_config.json
new file mode 100644
index 00000000..a0cff014
--- /dev/null
+++ b/nokiav2/docs/sampleVnfs/simpleDual/etsi_config.json
@@ -0,0 +1,39 @@
+{
+  "extensions": [
+    {
+      "name": "myNameKey",
+      "value": "myName"
+    }
+  ],
+  "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/simple.dual.v1.csar b/nokiav2/docs/sampleVnfs/simpleDual/simple.dual.v1.csar
new file mode 100644
index 00000000..6f2aeec6
--- /dev/null
+++ b/nokiav2/docs/sampleVnfs/simpleDual/simple.dual.v1.csar
diff --git a/nokiav2/docs/sampleVnfs/simpleDual/simple.dual.v2.csar b/nokiav2/docs/sampleVnfs/simpleDual/simple.dual.v2.csar
new file mode 100644
index 00000000..89c448b7
--- /dev/null
+++ b/nokiav2/docs/sampleVnfs/simpleDual/simple.dual.v2.csar
diff --git a/nokiav2/docs/sampleVnfs/simpleDual/simpleDual.csar b/nokiav2/docs/sampleVnfs/simpleDual/simpleDual.csar
deleted file mode 100644
index 3a43b788..00000000
--- a/nokiav2/docs/sampleVnfs/simpleDual/simpleDual.csar
+++ /dev/null
diff --git a/nokiav2/docs/sampleVnfs/simple_cmcc/simple.v1.csar b/nokiav2/docs/sampleVnfs/simple_cmcc/simple.v1.csar
index bdea8ad8..eb52ccb3 100644
--- a/nokiav2/docs/sampleVnfs/simple_cmcc/simple.v1.csar
+++ b/nokiav2/docs/sampleVnfs/simple_cmcc/simple.v1.csar
diff --git a/nokiav2/docs/sampleVnfs/simple_cmcc/simple.v2.csar b/nokiav2/docs/sampleVnfs/simple_cmcc/simple.v2.csar
index dbb6cdad..e142609d 100644
--- a/nokiav2/docs/sampleVnfs/simple_cmcc/simple.v2.csar
+++ b/nokiav2/docs/sampleVnfs/simple_cmcc/simple.v2.csar
diff --git a/nokiav2/docs/samplevnf.rst b/nokiav2/docs/samplevnf.rst
index dd6efdbe..3228786d 100644
--- a/nokiav2/docs/samplevnf.rst
+++ b/nokiav2/docs/samplevnf.rst
@@ -4,7 +4,13 @@ Sample VNFs
 Simple
 ------
 
-- CSAR: :download:`csar <sampleVnfs/simple/simple.csar>`
+- CSAR R1: :download:`csar <sampleVnfs/simple/simple.v1.csar>`
+
+- CSAR R2: :download:`csar <sampleVnfs/simple/simple.v2.csar>`
+
+- Original CBAM package: :download:`csar <sampleVnfs/simple_cmcc/cbam.package.zip>`
+
+- ETSI configuration: :download:`csar <sampleVnfs/simple/etsi_config.json>`
 
 - NS creation request on VF-C API :download:`create.json <sampleVnfs/simple/vfc.ns.create.request.json>` (several fields must be changed to fit actual environment)
 
@@ -23,7 +29,11 @@ Simple CMCC
 
 The Simple VNF altered to suite the CMCC lab environment (no support for floating IPs)
 
-- CSAR: :download:`csar <sampleVnfs/simple_cmcc/simple.csar>`
+- CSAR R1: :download:`csar <sampleVnfs/simple_cmcc/simple.v1.csar>`
+
+- CSAR R2: :download:`csar <sampleVnfs/simple_cmcc/simple.v2.csar>`
+
+- Original CBAM package: :download:`csar <sampleVnfs/simple_cmcc/cbam.package.zip>`
 
 - ETSI configuration: :download:`csar <sampleVnfs/simple_cmcc/etsi_config.json>`
 
@@ -43,18 +53,22 @@ The Simple VNF altered to suite the CMCC lab environment (no support for floatin
 Simple Dual
 -----------
 
-- CSAR: :download:`csar <sampleVnfs/simpleDual/simpleDual.csar>`
+- CSAR R1: :download:`csar <sampleVnfs/simpleDual/simpleDual.v1.csar>`
 
-- NS creation request on VF-C API :download:`create.json <sampleVnfs/simpleDual/vfc.ns.create.request.json>` (several fields must be changed to fit actual environment)
+- CSAR R2: :download:`csar <sampleVnfs/simpleDual/simpleDual.v2.csar>`
 
-- NS instantiation request on VF-C API :download:`instantiate.json <sampleVnfs/simpleDual/vfc.ns.instantiation.request.json>` (several fields must be changed to fit actual environment)
+- Original CBAM package: :download:`csar <sampleVnfs/simpleDual/cbam.package.zip>`
 
-- NS heal request on VF-C API: :download:`heal.json <sampleVnfs/simpleDual/vfc.ns.heal.request.json>` (several fields must be changed to fit actual environment)
+- ETSI configuration: :download:`csar <sampleVnfs/simple_cmcc/etsi_config.json>`
+
+- NS creation request on VF-C API :download:`create.json <sampleVnfs/simpleDual/vfc.ns.create.request.json>` (several fields must be changed to fit actual environment)
+
+- NS instantiation request on VF-C API :download:`instantiate.json <sampleVnfs/simpleDual/vfc.ns.instantiation.request.direct.json>` (several fields must be changed to fit actual environment)
 
-- VNF scale request on VF-C API: :download:`scale.json <sampleVnfs/simpleDual/vfc.vnf.scale.request.json>` (several fields must be changed to fit actual environment)
+- NS instantiation request on VF-C API when ETSI config is not supplied: download:`instantiate.json <sampleVnfs/simpleDual/vfc.ns.instantiation.request.json>` (several fields must be changed to fit actual environment)
 
+- E2E scaling data: :download:`instantiate.json <sampleVnfs/simpleDual/vfc.ns.instantiation.request.direct.json>` (several fields must be changed to fit actual environment)
 
-VOLTE IMS
----------
+- NS heal request on VF-C API: :download:`heal.json <sampleVnfs/simpleDual/vfc.ns.heal.request.json>` (several fields must be changed to fit actual environment)
 
-- TODO
-\ No newline at end of file
+- VNF scale request on VF-C API: :download:`scale.json <sampleVnfs/simpleDual/vfc.vnf.scale.request.json>` (several fields must be changed to fit actual environment)
+\ No newline at end of file