Bug 262 fixed

[osm/devops.git] / src / nsd / ping_pong_ns / ping_pong_nsd.yaml

diff --git a/src/nsd/ping_pong_ns/ping_pong_nsd.yaml b/src/nsd/ping_pong_ns/ping_pong_nsd.yaml
index 321c6c3..268504c 100644 (file)
--- a/src/nsd/ping_pong_ns/ping_pong_nsd.yaml
+++ b/src/nsd/ping_pong_ns/ping_pong_nsd.yaml
@@ -20,22 +20,10 @@ nsd:nsd-catalog:
      -  nsd:id: rift_ping_pong_ns
         nsd:logo: rift_logo.png
         nsd:name: ping_pong_ns
+        nsd:short-name: ping_pong_ns
+        nsd:vendor: RIFT.io
+        nsd:version: '1.1'
         nsd:description: RIFT.io sample ping pong network service
-        nsd:config-parameter-map:
-        -   nsd:config-parameter-request:
-                nsd:config-parameter-request-ref: pong_ip
-                nsd:member-vnf-index-ref: '1'
-            nsd:config-parameter-source:
-                nsd:config-parameter-source-ref: service_ip
-                nsd:member-vnf-index-ref: '2'
-            nsd:id: '1'
-        -   nsd:config-parameter-request:
-                nsd:config-parameter-request-ref: pong_port
-                nsd:member-vnf-index-ref: '1'
-            nsd:config-parameter-source:
-                nsd:config-parameter-source-ref: service_port
-                nsd:member-vnf-index-ref: '2'
-            nsd:id: '2'
         nsd:constituent-vnfd:
         -   nsd:member-vnf-index: '1'
             nsd:vnfd-id-ref: rift_ping_vnf
@@ -44,8 +32,12 @@ nsd:nsd-catalog:
         nsd:initial-config-primitive:
         -   nsd:name: start traffic
             nsd:parameter:
-            -   nsd:name: userid
-                nsd:value: rift
+            -   nsd:name: port
+                nsd:value: 5555
+            -   nsd:name: ssh-username
+                nsd:value: fedora
+            -   nsd:name: ssh-password
+                nsd:value: fedora
             nsd:seq: '1'
             nsd:user-defined-script: start_traffic.py
         nsd:input-parameter-xpath:
@@ -77,12 +69,8 @@ nsd:nsd-catalog:
             nsd:name: Quaoar
             nsd:requirement: Place this VM on the Kuiper belt object Quaoar
             nsd:strategy: COLOCATION
-        nsd:short-name: ping_pong_nsd
-        nsd:vendor: RIFT.io
-        nsd:version: '1.0'
         nsd:vld:
         -   nsd:id: mgmt_vl
-            nsd:vim-network-name: mgmt
             nsd:description: Management VL
             nsd:name: mgmt_vl
             nsd:short-name: mgmt_vl