X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_pla%2Ftest%2Fslice_hackfest_middle_nsd.yaml;h=7619520cd7827e2def95eaac13fb5b6c30524a10;hb=refs%2Fchanges%2F66%2F10166%2F6;hp=f8fa1027093eb80370fa423430a68daa83271a5b;hpb=31181aa29c6c0489b1629877e25fdafb62e3f4e2;p=osm%2FPLA.git

diff --git a/osm_pla/test/slice_hackfest_middle_nsd.yaml b/osm_pla/test/slice_hackfest_middle_nsd.yaml
index f8fa102..7619520 100644
--- a/osm_pla/test/slice_hackfest_middle_nsd.yaml
+++ b/osm_pla/test/slice_hackfest_middle_nsd.yaml
@@ -11,53 +11,35 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-nsd-catalog:
-    nsd:
-    -   id: slice_hackfest_middle_nsd
-        name: slice_hackfest_middle_nsd
-        short-name: slice_hackfest_middle_ns
-        description: NSD to be used on Slice Session of the 8th hackfest
-        vendor: OSM
-        version: '1.0'
-        logo: osm_2x.png
-
-        constituent-vnfd:
-        -   member-vnf-index: "1"
-            vnfd-id-ref: slice_hackfest_middle_vnfd
-
-        connection-point:
-        -   name: nsd_cp_mgmt
-            vld-id-ref: nsd_vnfd_vld_mgmt
-        -   name: nsd_cp_data1
-            vld-id-ref: nsd_vnfd_vld_data1
-        -   name: nsd_cp_data2
-            vld-id-ref: nsd_vnfd_vld_data2
-
-        vld:
-        -   id: nsd_vnfd_vld_mgmt
-            name: nsd_vnfd_vld_mgmt
-            short-name: nsd_vnfd_vld_mgmt
-            type: ELAN
-            mgmt-network: !!bool True
-            vnfd-connection-point-ref:
-            -   member-vnf-index-ref: "1"
-                vnfd-id-ref: slice_hackfest_middle_vnfd
-                vnfd-connection-point-ref: eth0
-        -   id: nsd_vnfd_vld_data1
-            name: nsd_vnfd_vld_data1
-            short-name: nsd_vnfd_vld_data1
-            type: ELAN
-            mgmt-network: !!bool False
-            vnfd-connection-point-ref:
-            -   member-vnf-index-ref: "1"
-                vnfd-id-ref: slice_hackfest_middle_vnfd
-                vnfd-connection-point-ref: eth1
-        -   id: nsd_vnfd_vld_data2
-            name: nsd_vnfd_vld_data2
-            short-name: nsd_vnfd_vld_data2
-            type: ELAN
-            mgmt-network: !!bool False
-            vnfd-connection-point-ref:
-            -   member-vnf-index-ref: "1"
-                vnfd-id-ref: slice_hackfest_middle_vnfd
-                vnfd-connection-point-ref: eth2
\ No newline at end of file
+nsd:
+  nsd:
+  - description: NSD to be used on Slice Session of the 8th hackfest
+    designer: OSM
+    df:
+    - id: default-df
+      vnf-profile:
+      - id: '1'
+        virtual-link-connectivity:
+        - constituent-cpd-id:
+          - constituent-base-element-id: '1'
+            constituent-cpd-id: eth0-ext
+          virtual-link-profile-id: nsd_vnfd_vld_mgmt
+        - constituent-cpd-id:
+          - constituent-base-element-id: '1'
+            constituent-cpd-id: eth1-ext
+          virtual-link-profile-id: nsd_vnfd_vld_data1
+        - constituent-cpd-id:
+          - constituent-base-element-id: '1'
+            constituent-cpd-id: eth2-ext
+          virtual-link-profile-id: nsd_vnfd_vld_data2
+        vnfd-id: slice_hackfest_middle_vnfd
+    id: slice_hackfest_middle_nsd
+    name: slice_hackfest_middle_nsd
+    version: '1.0'
+    virtual-link-desc:
+    - id: nsd_vnfd_vld_mgmt
+      mgmt-network: true
+    - id: nsd_vnfd_vld_data1
+    - id: nsd_vnfd_vld_data2
+    vnfd-id:
+    - slice_hackfest_middle_vnfd
\ No newline at end of file