summaryrefslogtreecommitdiffstats
path: root/nokiav2/docs
diff options
context:
space:
mode:
authorDenes Nemeth <denes.nemeth@nokia.com>2018-05-24 07:14:35 +0200
committerDenes Nemeth <denes.nemeth@nokia.com>2018-05-24 07:15:00 +0200
commit1dca0e2ef23d1d51e4d2b2f6675aeaa7320d44f6 (patch)
tree2513baf60800f5ad1208251ffd7f199166503168 /nokiav2/docs
parentd706887a7c2613558116fad9d6d778de9f73437c (diff)
Fix extenstion handling
Signed-off-by: Denes Nemeth <denes.nemeth@nokia.com> Change-Id: I8788eccf9dc3200c277f8dadf04426dc7ef913d1 Issue-ID: VFC-728
Diffstat (limited to 'nokiav2/docs')
-rw-r--r--nokiav2/docs/sampleVnfs/simple/etsi_config.json39
-rw-r--r--nokiav2/docs/sampleVnfs/simple/sdc.json1
-rw-r--r--nokiav2/docs/sampleVnfs/simple/simple.csarbin12123 -> 12133 bytes
-rw-r--r--nokiav2/docs/sampleVnfs/simple_cmcc/etsi_config.json34
-rw-r--r--nokiav2/docs/sampleVnfs/simple_cmcc/sdc.json1
-rw-r--r--nokiav2/docs/sampleVnfs/simple_cmcc/simple.csarbin12047 -> 12133 bytes
6 files changed, 73 insertions, 2 deletions
diff --git a/nokiav2/docs/sampleVnfs/simple/etsi_config.json b/nokiav2/docs/sampleVnfs/simple/etsi_config.json
new file mode 100644
index 00000000..a0cff014
--- /dev/null
+++ b/nokiav2/docs/sampleVnfs/simple/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/simple/sdc.json b/nokiav2/docs/sampleVnfs/simple/sdc.json
deleted file mode 100644
index e6da9e17..00000000
--- a/nokiav2/docs/sampleVnfs/simple/sdc.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "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" } ] }
diff --git a/nokiav2/docs/sampleVnfs/simple/simple.csar b/nokiav2/docs/sampleVnfs/simple/simple.csar
index fc03b56a..a3726c19 100644
--- a/nokiav2/docs/sampleVnfs/simple/simple.csar
+++ b/nokiav2/docs/sampleVnfs/simple/simple.csar
Binary files differ
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
--- a/nokiav2/docs/sampleVnfs/simple_cmcc/simple.csar
+++ b/nokiav2/docs/sampleVnfs/simple_cmcc/simple.csar
Binary files differ