X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=descriptor-packages%2Fvnfd%2FVyOS_vnf%2Fsrc%2FVyOS__vnfd.yaml;h=34548c0dbea50cbfca23f267a382900f176aa53b;hb=95c0173af060c3f475fdac79c4480d6ba38bf39b;hp=0ac926f56ff7034033cbcb11df36d577fe3f7130;hpb=2c2374199270b5e71f419369a9a5e111ea0df375;p=osm%2Fdevops.git

diff --git a/descriptor-packages/vnfd/VyOS_vnf/src/VyOS__vnfd.yaml b/descriptor-packages/vnfd/VyOS_vnf/src/VyOS__vnfd.yaml
index 0ac926f5..34548c0d 100644
--- a/descriptor-packages/vnfd/VyOS_vnf/src/VyOS__vnfd.yaml
+++ b/descriptor-packages/vnfd/VyOS_vnf/src/VyOS__vnfd.yaml
@@ -1,4 +1,4 @@
-vnfd:vnfd-catalog:
+vnfd-catalog:
     vnfd:
     -   id: VyOS
         name: VyOS
@@ -6,12 +6,9 @@ vnfd:vnfd-catalog:
         description: VyOS Router
         logo: osm_2x.png
         mgmt-interface:
-            vdu-id: VyOS-VM
+            cp: eth0
         vnf-configuration:
-            config-attributes:
-                config-delay: '0'
-                config-priority: '1'
-            service-primitive:
+            config-primitive:
             -   name: config
                 parameter:
                 -   name: user
@@ -62,37 +59,42 @@ vnfd:vnfd-catalog:
                 storage-gb: '40'
                 vcpu-count: '1'
             mgmt-vpci: 0000:00:0a.0
-            external-interface:
+            interface:
             -   name: eth0
+                type: EXTERNAL
                 virtual-interface:
                     bandwidth: '0'
-                    type: OM-MGMT
+                    type: PARAVIRT
                     vpci: 0000:00:0a.0
-                vnfd-connection-point-ref: eth0
+                external-connection-point-ref: eth0
             -   name: eth1
+                type: EXTERNAL
                 virtual-interface:
                     bandwidth: '0'
-                    type: VIRTIO
+                    type: PARAVIRT
                     vpci: 0000:00:0b.0
-                vnfd-connection-point-ref: eth1
+                external-connection-point-ref: eth1
             -   name: eth2
+                type: EXTERNAL
                 virtual-interface:
                     bandwidth: '0'
-                    type: VIRTIO
+                    type: PARAVIRT
                     vpci: 0000:00:0c.0
-                vnfd-connection-point-ref: eth2
+                external-connection-point-ref: eth2
             -   name: eth3
+                type: EXTERNAL
                 virtual-interface:
                     bandwidth: '0'
-                    type: VIRTIO
+                    type: PARAVIRT
                     vpci: 0000:00:0d.0
-                vnfd-connection-point-ref: eth3
+                external-connection-point-ref: eth3
             -   name: eth4
+                type: EXTERNAL
                 virtual-interface:
                     bandwidth: '0'
-                    type: VIRTIO
+                    type: PARAVIRT
                     vpci: 0000:00:0e.0
-                vnfd-connection-point-ref: eth4
+                external-connection-point-ref: eth4
             guest-epa:
                 cpu-pinning-policy: DEDICATED
                 cpu-thread-pinning-policy: PREFER