X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=test%2FRO_tests%2Fimage_based_volume%2Fvnfd_additional_disk_based_image.yaml;h=30aafac472d8696b4f425618cecd6e5760c5de72;hb=5db670b68349fd1f00a5efc8c0ccd0ef9d073dca;hp=578983181b9417ebd287ad3458b19ac2c1eb47f1;hpb=eebea06b843c02dc2c456263bbc62c0d796c26ee;p=osm%2FRO.git

diff --git a/test/RO_tests/image_based_volume/vnfd_additional_disk_based_image.yaml b/test/RO_tests/image_based_volume/vnfd_additional_disk_based_image.yaml
index 57898318..30aafac4 100644
--- a/test/RO_tests/image_based_volume/vnfd_additional_disk_based_image.yaml
+++ b/test/RO_tests/image_based_volume/vnfd_additional_disk_based_image.yaml
@@ -1,5 +1,5 @@
 ##
-# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
+# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U.
 # This file is part of openmano
 # All Rights Reserved.
 #
@@ -15,50 +15,44 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 #
-# For those usages not covered by the Apache License, Version 2.0 please
-# contact with: nfvlabs@tid.es
 ##
 ---
-vnf:
-    name: vnf_additional_disk_based_image
-    description: VNF with additional volume based on image
-    # class: parent      # Optional. Used to organize VNFs
-    external-connections:
-    -   name:              mgmt0
-        type:              mgmt        # "mgmt" (autoconnect to management net), "bridge", "data"
-        VNFC:              TEMPLATE-VM # Virtual Machine this interface belongs to
-        local_iface_name:  mgmt0       # interface name inside this Virtual Machine (must be defined in the VNFC section)
-        description:       Management interface
-    VNFC:                              # Virtual machine array 
-    -   name:        TEMPLATE-VM       # name of Virtual Machine
-        description: TEMPLATE description
-        image name: image_name.qcow2
-        # image metadata: {"bus":"ide", "os_type":"windows", "use_incremental": "no" } #Optional
-        # processor:                     #Optional
-        #     model: Intel(R) Xeon(R) CPU E5-4620 0 @ 2.20GHz
-        #     features: ["64b", "iommu", "lps", "tlbps", "hwsv", "dioc", "ht"]
-        # hypervisor:                    #Optional
-        #     type: QEMU-kvm
-        #     version: "10002|12001|2.6.32-358.el6.x86_64"
-        vcpus: 1          # Only for traditional cloud VMs. Number of virtual CPUs (oversubscription is allowed).
-        ram: 1000         # Only for traditional cloud VMs. Memory in MBytes (not from hugepages, oversubscription is allowed)
-        disk: 5          # disk size in GiB, by default 1
-        #numas: 
-        #-   paired-threads: 5          # "cores", "paired-threads", "threads"
-        #    paired-threads-id: [ [0,1], [2,3], [4,5], [6,7], [8,9] ] # By default follows incremental order
-        #    memory: 14                 # GBytes
-        #    interfaces: []
-        bridge-ifaces:
-        -   name:      mgmt0
-            vpci:      "0000:00:0a.0"    # Optional. Virtual PCI address
-            bandwidth: 1 Mbps            # Optional. Informative only
-            # mac_address: '20:33:45:56:77:46' #avoid this option if possible
-            # model:       'virtio'      # ("virtio","e1000","ne2k_pci","pcnet","rtl8139") By default, it is automatically filled by libvirt
-        devices:                       # Optional, order determines device letter asignation (hda, hdb, ...)
-        -   type:      disk            # "disk","cdrom","xml"
-            image name: image_name.qcow2
-            size: 2
-            # image metadata: {"bus":"ide", "os_type":"windows", "use_incremental": "no" }
-            # vpci:      "0000:00:03.0"   # Optional, not for disk or cdrom
-    # Additional Virtual Machines would be included here
-
+vnfd-catalog:
+    vnfd:
+    -   connection-point:
+        -   name: mgmt0
+            type: VPORT
+        name: vnf_additional_disk_based_image
+        description: VNF with additional volume based on image
+        id: additional_disk_based_image
+        # short-name: 2disks
+        vendor: ROtest
+        version: '1.0'
+        mgmt-interface:
+            cp: mgmt0
+        vdu:
+        -   id: VM1
+            name: VM1-name
+            image: US1604
+            alternative-images:
+            -   vim-type: openstack
+                image: cirros
+            -   vim-type: openvim
+                image: cirros034
+            volumes:
+            -   name: vdb
+                device-type: disk
+                image: cirros034
+                # image-checksum: 4a293322f18827af81a9450e3792947c
+                size: 8
+            interface:
+            -   name: iface11
+                type: EXTERNAL
+                virtual-interface:
+                    type: VIRTIO
+                external-connection-point-ref: mgmt0
+                mac-address:   "52:33:44:55:66:77"
+            vm-flavor:
+                memory-mb: '2048'
+                storage-gb: '8'
+                vcpu-count: '1'