X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=descriptor-packages%2Fvnfd%2FVyOS_vnf%2Fsrc%2FVyOS__vnfd.yaml;h=b49e42bf617db683b5dbb701830f8b56504b1987;hb=84fe31f632166d2fbf566968bd25aa9545e96fdc;hp=0ac926f56ff7034033cbcb11df36d577fe3f7130;hpb=230c540cf52f3fbe05d40d6650a97d1e55327249;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..b49e42bf 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
@@ -43,15 +40,15 @@ vnfd:vnfd-catalog:
                 charm: vyos-proxy
         connection-point:
         -   name: eth0
-            type: VPORT
+
         -   name: eth1
-            type: VPORT
+
         -   name: eth2
-            type: VPORT
+
         -   name: eth3
-            type: VPORT
+
         -   name: eth4
-            type: VPORT
+
         vdu:
         -   id: VyOS-VM
             name: VyOS-VM
@@ -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