X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Fnsd%2Fping_pong_ns%2Fping_pong_nsd.yaml;h=7f213cd96634d81f4a9ed1d84b99f843c9dfd99f;hb=f08794a5de226cd17cac4d7a077b0940fbcb9425;hp=26908e2bee94cebca8e75f3d4c1220a462bedede;hpb=4f15781b29dbabc1320c1dee475181fbfaa85a85;p=osm%2Fdevops.git

diff --git a/src/nsd/ping_pong_ns/ping_pong_nsd.yaml b/src/nsd/ping_pong_ns/ping_pong_nsd.yaml
index 26908e2b..7f213cd9 100644
--- a/src/nsd/ping_pong_ns/ping_pong_nsd.yaml
+++ b/src/nsd/ping_pong_ns/ping_pong_nsd.yaml
@@ -17,13 +17,29 @@
 
 nsd:nsd-catalog:
     nsd:nsd:
-    -   nsd:constituent-vnfd:
+     -  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:constituent-vnfd:
         -   nsd:member-vnf-index: '1'
-            nsd:vnfd-id-ref: 8759e766-8b99-11e6-9664-02b76030c497
+            nsd:vnfd-id-ref: rift_ping_vnf
         -   nsd:member-vnf-index: '2'
-            nsd:vnfd-id-ref: 875b30d0-8b99-11e6-9664-02b76030c497
-        nsd:description: Toy NS
-        nsd:id: 875b9750-8b99-11e6-9664-02b76030c497
+            nsd:vnfd-id-ref: rift_pong_vnf
+        nsd:initial-config-primitive:
+        -   nsd:name: start traffic
+            nsd:parameter:
+            -   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:
         -   nsd:xpath: /nsd:nsd-catalog/nsd:nsd/nsd:vendor
         nsd:ip-profiles:
@@ -32,55 +48,56 @@ nsd:nsd-catalog:
                 nsd:gateway-address: 31.31.31.210
                 nsd:ip-version: ipv4
                 nsd:subnet-address: 31.31.31.0/24
+                nsd:dhcp-params:
+                  nsd:count: 200
+                  nsd:start-address: 31.31.31.2
             nsd:name: InterVNFLink
-        nsd:logo: rift_logo.png
-        nsd:name: ping_pong_nsd
         nsd:placement-groups:
         -   nsd:member-vnfd:
             -   nsd:member-vnf-index-ref: '1'
-                nsd:vnfd-id-ref: 8759e766-8b99-11e6-9664-02b76030c497
+                nsd:vnfd-id-ref: rift_ping_vnf
             -   nsd:member-vnf-index-ref: '2'
-                nsd:vnfd-id-ref: 875b30d0-8b99-11e6-9664-02b76030c497
+                nsd:vnfd-id-ref: rift_pong_vnf
             nsd:name: Orcus
             nsd:requirement: Place this VM on the Kuiper belt object Orcus
             nsd:strategy: COLOCATION
         -   nsd:member-vnfd:
             -   nsd:member-vnf-index-ref: '1'
-                nsd:vnfd-id-ref: 8759e766-8b99-11e6-9664-02b76030c497
+                nsd:vnfd-id-ref: rift_ping_vnf
             -   nsd:member-vnf-index-ref: '2'
-                nsd:vnfd-id-ref: 875b30d0-8b99-11e6-9664-02b76030c497
+                nsd:vnfd-id-ref: rift_pong_vnf
             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:description: Toy VL
-            nsd:id: ping_pong_mgmt1
-            nsd:name: ping_pong_mgmt
-            nsd:short-name: ping_pong_mgmt
+        -   nsd:id: mgmt_vl
+            nsd:vim-network-name: mgmt
+            nsd:description: Management VL
+            nsd:name: mgmt_vl
+            nsd:short-name: mgmt_vl
             nsd:type: ELAN
             nsd:vendor: RIFT.io
             nsd:version: '1.0'
+            nsd:mgmt-network: 'true'
             nsd:vnfd-connection-point-ref:
             -   nsd:member-vnf-index-ref: '1'
                 nsd:vnfd-connection-point-ref: ping_vnfd/cp0
-                nsd:vnfd-id-ref: 8759e766-8b99-11e6-9664-02b76030c497
+                nsd:vnfd-id-ref: rift_ping_vnf
             -   nsd:member-vnf-index-ref: '2'
                 nsd:vnfd-connection-point-ref: pong_vnfd/cp0
-                nsd:vnfd-id-ref: 875b30d0-8b99-11e6-9664-02b76030c497
-        -   nsd:description: Toy VL
-            nsd:id: ping_pong_vld2
-            nsd:name: ping_pong_vld
-            nsd:short-name: ping_pong_vld
+                nsd:vnfd-id-ref: rift_pong_vnf
+        -   nsd:id: ping_pong_vl1
+            nsd:description: Data VL
+            nsd:ip-profile-ref: InterVNFLink
+            nsd:name: data_vl
+            nsd:short-name: data_vl
             nsd:type: ELAN
             nsd:vendor: RIFT.io
             nsd:version: '1.0'
             nsd:vnfd-connection-point-ref:
             -   nsd:member-vnf-index-ref: '1'
                 nsd:vnfd-connection-point-ref: ping_vnfd/cp1
-                nsd:vnfd-id-ref: 8759e766-8b99-11e6-9664-02b76030c497
+                nsd:vnfd-id-ref: rift_ping_vnf
             -   nsd:member-vnf-index-ref: '2'
                 nsd:vnfd-connection-point-ref: pong_vnfd/cp1
-                nsd:vnfd-id-ref: 875b30d0-8b99-11e6-9664-02b76030c497
+                nsd:vnfd-id-ref: rift_pong_vnf