Merge "- rename pts_ns.yaml"
[osm/devops.git] / src / vnfd / pong_vnf / pong_vnfd.yaml
index 6b2641d..63dbfdd 100644 (file)
 
 vnfd:vnfd-catalog:
     vnfd:vnfd:
-    -   vnfd:connection-point:
+     -  vnfd:id: rift_pong_vnf
+        vnfd:name: pong_vnf
+        vnfd:short-name: pong_vnf
+        vnfd:logo: rift_logo.png
+        vnfd:vendor: RIFT.io
+        vnfd:version: '1.0'
+        vnfd:description: This is an example RIFT.ware VNF
+        vnfd:config-parameter:
+            vnfd:config-parameter-source:
+            -   vnfd:attribute: ../../../mgmt-interface, ip-address
+                vnfd:description: Management IP address
+                vnfd:name: mgmt_ip
+                vnfd:parameter:
+                -   vnfd:config-primitive-name-ref: config
+                    vnfd:config-primitive-parameter-ref: ssh-hostname
+            -   vnfd:description: SSH username
+                vnfd:name: username
+                vnfd:parameter:
+                -   vnfd:config-primitive-name-ref: config
+                    vnfd:config-primitive-parameter-ref: ssh-username
+                vnfd:value: fedora
+            -   vnfd:attribute: ../../../mgmt-interface/ssh-key, private-key-file
+                vnfd:description: SSH private key file
+                vnfd:name: ssh_key
+                vnfd:parameter:
+                -   vnfd:config-primitive-name-ref: config
+                    vnfd:config-primitive-parameter-ref: ssh-private-key
+            -   vnfd:attribute: ../../../connection-point[name='pong_vnfd/cp1'], ip-address
+                vnfd:description: IP on which Pong service is listening
+                vnfd:name: service_ip
+                vnfd:parameter:
+                -   vnfd:config-primitive-name-ref: set-server
+                    vnfd:config-primitive-parameter-ref: server-ip
+            -   vnfd:description: Port on which server listens for incoming data packets
+                vnfd:name: service_port
+                vnfd:parameter:
+                -   vnfd:config-primitive-name-ref: set-server
+                    vnfd:config-primitive-parameter-ref: server-port
+                vnfd:value: '5555'
+        vnfd:connection-point:
         -   vnfd:name: pong_vnfd/cp0
             vnfd:type: VPORT
         -   vnfd:name: pong_vnfd/cp1
             vnfd:type: VPORT
-        vnfd:description: This is an example RIFT.ware VNF
         vnfd:http-endpoint:
         -   vnfd:path: api/v1/pong/stats
             vnfd:polling_interval_secs: '2'
             vnfd:port: '18889'
-        vnfd:id: 875b30d0-8b99-11e6-9664-02b76030c497
-        vnfd:logo: rift_logo.png
         vnfd:mgmt-interface:
             vnfd:dashboard-params:
                 vnfd:path: api/v1/pong/stats
                 vnfd:port: '18889'
             vnfd:port: '18889'
+            vnfd:ssh-key: 'true'
             vnfd:vdu-id: iovdu_0
         vnfd:monitoring-param:
         -   vnfd:description: no of ping requests
@@ -54,20 +91,18 @@ vnfd:vnfd-catalog:
             vnfd:units: packets
             vnfd:value-type: INT
             vnfd:widget-type: COUNTER
-        vnfd:name: pong_vnfd
         vnfd:placement-groups:
         -   vnfd:member-vdus:
             -   vnfd:member-vdu-ref: iovdu_0
             vnfd:name: Weywot
             vnfd:requirement: Place this VM on the Kuiper belt object Weywot
             vnfd:strategy: COLOCATION
-        vnfd:short-name: pong_vnfd
         vnfd:vdu:
         -   vnfd:count: '1'
             vnfd:external-interface:
             -   vnfd:name: eth0
                 vnfd:virtual-interface:
-                    vnfd:type: OM-MGMT
+                    vnfd:type: VIRTIO
                 vnfd:vnfd-connection-point-ref: pong_vnfd/cp0
             -   vnfd:name: eth1
                 vnfd:virtual-interface:
@@ -81,26 +116,37 @@ vnfd:vnfd-catalog:
                 vnfd:memory-mb: '512'
                 vnfd:storage-gb: '4'
                 vnfd:vcpu-count: '1'
-        vnfd:vendor: RIFT.io
-        vnfd:version: '1.0'
         vnfd:vnf-configuration:
-            vnfd:config-attributes:
-                vnfd:config-delay: '60'
-                vnfd:config-priority: '1'
-            vnfd:config-template: "\n#!/bin/bash\n\n# Rest API configuration\npong_mgmt_ip='<rw_mgmt_ip>'\n\
-                pong_mgmt_port=18889\n# username=<rw_username>\n# password=<rw_password>\n\
-                \n# VNF specific configuration\npong_server_ip='<rw_connection_point_name\
-                \ pong_vnfd/cp0>'\nserver_port=5555\n\n# Make Rest API calls to configure\
-                \ VNF\ncurl -D /dev/stdout \\\n    -H \"Accept: application/vnd.yang.data+xml\"\
-                \ \\\n    -H \"Content-Type: application/vnd.yang.data+json\" \\\n\
-                \    -X POST \\\n    -d \"{\\\"ip\\\":\\\"$pong_server_ip\\\", \\\"\
-                port\\\":$server_port}\" \\\n    http://${pong_mgmt_ip}:${pong_mgmt_port}/api/v1/pong/server\n\
-                rc=$?\nif [ $rc -ne 0 ]\nthen\n    echo \"Failed to set server(own)\
-                \ info for pong!\"\n    exit $rc\nfi\n\n\ncurl -D /dev/stdout \\\n\
-                \    -H \"Accept: application/vnd.yang.data+xml\" \\\n    -H \"Content-Type:\
-                \ application/vnd.yang.data+json\" \\\n    -X POST \\\n    -d \"{\\\
-                \"enable\\\":true}\" \\\n    http://${pong_mgmt_ip}:${pong_mgmt_port}/api/v1/pong/adminstatus/state\n\
-                rc=$?\nif [ $rc -ne 0 ]\nthen\n    echo \"Failed to enable pong service!\"\
-                \n    exit $rc\nfi\n\nexit 0\n"
-            vnfd:script:
-                vnfd:script-type: bash
+            vnfd:config-primitive:
+            -   vnfd:name: start
+            -   vnfd:name: stop
+            -   vnfd:name: restart
+            -   vnfd:name: config
+                vnfd:parameter:
+                -   vnfd:data-type: STRING
+                    vnfd:name: ssh-hostname
+                -   vnfd:data-type: STRING
+                    vnfd:name: ssh-username
+                -   vnfd:data-type: STRING
+                    vnfd:name: ssh-private-key
+                -   vnfd:data-type: STRING
+                    vnfd:default-value: pong
+                    vnfd:name: mode
+                    vnfd:read-only: 'true'
+            -   vnfd:name: set-server
+                vnfd:parameter:
+                -   vnfd:data-type: STRING
+                    vnfd:name: server-ip
+                -   vnfd:data-type: INTEGER
+                    vnfd:name: server-port
+            -   vnfd:name: start-traffic
+            -   vnfd:name: stop-traffic
+            vnfd:initial-config-primitive:
+            -   vnfd:config-primitive-ref: config
+                vnfd:seq: '1'
+            -   vnfd:config-primitive-ref: start
+                vnfd:seq: '2'
+            -   vnfd:config-primitive-ref: set-server
+                vnfd:seq: '3'
+            vnfd:juju:
+                vnfd:charm: pingpong