X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Fvnfd%2FVyOS_vnf%2FVyOS__vnfd.yaml;h=79a11e51e0325bfc00a2b99c86bdfd97042425a4;hb=9b9904dc99740fd51e98678a9e1eb6208b985dc1;hp=86fc0f3c5329499f721994fb4e666f4fc5e64d33;hpb=1a029a811eba42f4926b9106ed9c8a9885ad42c7;p=osm%2Fdevops.git

diff --git a/src/vnfd/VyOS_vnf/VyOS__vnfd.yaml b/src/vnfd/VyOS_vnf/VyOS__vnfd.yaml
index 86fc0f3c..79a11e51 100644
--- a/src/vnfd/VyOS_vnf/VyOS__vnfd.yaml
+++ b/src/vnfd/VyOS_vnf/VyOS__vnfd.yaml
@@ -1,39 +1,46 @@
 vnfd:vnfd-catalog:
     vnfd:
     -   id: VyOS
-        name: VyOS Router
-        short-name: VyOS Router
+        name: VyOS
+        short-name: VyOS
         description: VyOS Router
         logo: osm_2x.png
         mgmt-interface:
             vdu-id: VyOS-VM
-            vnf-configuration:
-                config-attributes:
-                    config-delay: '0'
-                    config-priority: '1'
-                config-primitive:
-                -   name: config
-                    parameter:
-                    -   name: user
-                        data-type: STRING
-                        mandatory: 'true'
-                        default-value: vyos
-                    -   name: password
-                        data-type: string
-                        mandatory: 'true'
-                        name: password
-                        default-value: vyos
-                -   name: ping-test
-                    parameter:
-                    -   name: ip-address
-                        data-type: STRING
-                        mandatory: 'true'
-                    -   name: count
-                        data-type: INTEGER
-                        mandatory: 'false'
-                        default-value: 5
-                juju:
-                    charm: VyOS-proxy
+        vnf-configuration:
+            config-attributes:
+                config-delay: '0'
+                config-priority: '1'
+            service-primitive:
+            -   name: config
+                parameter:
+                -   name: user
+                    data-type: STRING
+                    mandatory: 'true'
+                    default-value: vyos
+                -   name: pass
+                    data-type: STRING
+                    mandatory: 'true'
+                    default-value: vyos
+            -   name: ping
+                parameter:
+                -   name: destination
+                    data-type: STRING
+                    mandatory: 'true'
+                -   name: count
+                    data-type: INTEGER
+                    mandatory: 'false'
+                    default-value: 5
+            initial-config-primitive:
+            -   name: config
+                parameter:
+                -   name: hostname
+                    value: <rw_mgmt_ip>
+                -   name: pass
+                    value: vyos
+                seq: '1'
+            juju:
+                charm: VyOS-proxy
         connection-point:
         -   name: eth0
             type: VPORT
@@ -52,7 +59,7 @@ vnfd:vnfd-catalog:
             image: /mnt/powervault/virtualization/osm/VyOS/VyOS-1.1.7-signed-disk1.qcow2
             vm-flavor:
                 memory-mb: '1024'
-                storage-gb: '2'
+                storage-gb: '40'
                 vcpu-count: '1'
             mgmt-vpci: 0000:00:0a.0
             external-interface: