Fix template generation for R2

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

3 files changed, 0 insertions, 60 deletions

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