Adapts PLA to new SOL006 NSD descriptors format

[osm/PLA.git] / osm_pla / test / slice_hackfest_middle_nsd.yaml

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