From d4ee0c786ca2cc27b35fdfaa7d9d53718fa0bd20 Mon Sep 17 00:00:00 2001 From: Denes Nemeth Date: Thu, 31 May 2018 13:59:34 +0200 Subject: Fix template generation for R2 Change-Id: Ibf53ee4f203f248c930611812f3eb248e3023be8 Signed-off-by: Denes Nemeth Issue-ID: VFC-728 --- .../simple/cbam.instantiation.request.json | 60 --------------------- nokiav2/docs/sampleVnfs/simple/simple.v1.csar | Bin 11484 -> 7668 bytes nokiav2/docs/sampleVnfs/simple/simple.v2.csar | Bin 0 -> 7787 bytes .../simpleDual/cbam.instantiation.request.json | 60 --------------------- .../docs/sampleVnfs/simpleDual/cbam.package.zip | Bin 0 -> 7488 bytes .../docs/sampleVnfs/simpleDual/etsi_config.json | 39 ++++++++++++++ .../docs/sampleVnfs/simpleDual/simple.dual.v1.csar | Bin 0 -> 8334 bytes .../docs/sampleVnfs/simpleDual/simple.dual.v2.csar | Bin 0 -> 8516 bytes nokiav2/docs/sampleVnfs/simpleDual/simpleDual.csar | Bin 12325 -> 0 bytes nokiav2/docs/sampleVnfs/simple_cmcc/simple.v1.csar | Bin 11484 -> 7668 bytes nokiav2/docs/sampleVnfs/simple_cmcc/simple.v2.csar | Bin 7773 -> 7787 bytes 11 files changed, 39 insertions(+), 120 deletions(-) delete mode 100644 nokiav2/docs/sampleVnfs/simple/cbam.instantiation.request.json create mode 100644 nokiav2/docs/sampleVnfs/simple/simple.v2.csar delete mode 100644 nokiav2/docs/sampleVnfs/simpleDual/cbam.instantiation.request.json create mode 100644 nokiav2/docs/sampleVnfs/simpleDual/cbam.package.zip create mode 100644 nokiav2/docs/sampleVnfs/simpleDual/etsi_config.json create mode 100644 nokiav2/docs/sampleVnfs/simpleDual/simple.dual.v1.csar create mode 100644 nokiav2/docs/sampleVnfs/simpleDual/simple.dual.v2.csar delete mode 100644 nokiav2/docs/sampleVnfs/simpleDual/simpleDual.csar (limited to 'nokiav2/docs/sampleVnfs') 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": "", - "tenant": "", - "password": "", - "region": "RegionOne" - }, - "interfaceInfo": { - "endpoint": "https://: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 Binary files a/nokiav2/docs/sampleVnfs/simple/simple.v1.csar and b/nokiav2/docs/sampleVnfs/simple/simple.v1.csar differ 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 Binary files /dev/null and b/nokiav2/docs/sampleVnfs/simple/simple.v2.csar differ 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": "", - "tenant": "", - "password": "", - "region": "RegionOne" - }, - "interfaceInfo": { - "endpoint": "https://: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 Binary files /dev/null and b/nokiav2/docs/sampleVnfs/simpleDual/cbam.package.zip differ 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 Binary files /dev/null and b/nokiav2/docs/sampleVnfs/simpleDual/simple.dual.v1.csar differ 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 Binary files /dev/null and b/nokiav2/docs/sampleVnfs/simpleDual/simple.dual.v2.csar differ diff --git a/nokiav2/docs/sampleVnfs/simpleDual/simpleDual.csar b/nokiav2/docs/sampleVnfs/simpleDual/simpleDual.csar deleted file mode 100644 index 3a43b788..00000000 Binary files a/nokiav2/docs/sampleVnfs/simpleDual/simpleDual.csar and /dev/null differ diff --git a/nokiav2/docs/sampleVnfs/simple_cmcc/simple.v1.csar b/nokiav2/docs/sampleVnfs/simple_cmcc/simple.v1.csar index bdea8ad8..eb52ccb3 100644 Binary files a/nokiav2/docs/sampleVnfs/simple_cmcc/simple.v1.csar and b/nokiav2/docs/sampleVnfs/simple_cmcc/simple.v1.csar differ diff --git a/nokiav2/docs/sampleVnfs/simple_cmcc/simple.v2.csar b/nokiav2/docs/sampleVnfs/simple_cmcc/simple.v2.csar index dbb6cdad..e142609d 100644 Binary files a/nokiav2/docs/sampleVnfs/simple_cmcc/simple.v2.csar and b/nokiav2/docs/sampleVnfs/simple_cmcc/simple.v2.csar differ -- cgit 1.2.3-korg