From 1dca0e2ef23d1d51e4d2b2f6675aeaa7320d44f6 Mon Sep 17 00:00:00 2001 From: Denes Nemeth Date: Thu, 24 May 2018 07:14:35 +0200 Subject: Fix extenstion handling Signed-off-by: Denes Nemeth Change-Id: I8788eccf9dc3200c277f8dadf04426dc7ef913d1 Issue-ID: VFC-728 --- .../docs/sampleVnfs/simple_cmcc/etsi_config.json | 34 +++++++++++++++++++++ nokiav2/docs/sampleVnfs/simple_cmcc/sdc.json | 1 - nokiav2/docs/sampleVnfs/simple_cmcc/simple.csar | Bin 12047 -> 12133 bytes 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 nokiav2/docs/sampleVnfs/simple_cmcc/etsi_config.json delete mode 100644 nokiav2/docs/sampleVnfs/simple_cmcc/sdc.json (limited to 'nokiav2/docs/sampleVnfs/simple_cmcc') diff --git a/nokiav2/docs/sampleVnfs/simple_cmcc/etsi_config.json b/nokiav2/docs/sampleVnfs/simple_cmcc/etsi_config.json new file mode 100644 index 00000000..ef3bce5c --- /dev/null +++ b/nokiav2/docs/sampleVnfs/simple_cmcc/etsi_config.json @@ -0,0 +1,34 @@ +{ + "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" + } + ], + "extensions" : [ { "name": "myNameKey", "value": "myName"} ] +} diff --git a/nokiav2/docs/sampleVnfs/simple_cmcc/sdc.json b/nokiav2/docs/sampleVnfs/simple_cmcc/sdc.json deleted file mode 100644 index 16563884..00000000 --- a/nokiav2/docs/sampleVnfs/simple_cmcc/sdc.json +++ /dev/null @@ -1 +0,0 @@ -{ "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/simple.csar b/nokiav2/docs/sampleVnfs/simple_cmcc/simple.csar index da3637fe..48a38b8e 100644 Binary files a/nokiav2/docs/sampleVnfs/simple_cmcc/simple.csar and b/nokiav2/docs/sampleVnfs/simple_cmcc/simple.csar differ -- cgit 1.2.3-korg