Merge branch 'Bug1321/Reformat_slices_descriptors' into 'master'

Bug1321/Reformat_slices_descriptors

See merge request !107

slice_basic_middle_ns/slice_basic_middle_nsd.yaml

 nsd:
   nsd:
-  - description: NSD to be used on Slice Testing
+  - id: slice_basic_middle_ns
+    name: slice_basic_middle_ns
+    description: NSD to be used on Slice Testing
     designer: OSM
+    version: '1.0'
+
+    vnfd-id:
+    - slice_basic_middle_vnf
+
+    sapd:
+    - id: nsd_cp_mgmt
+      virtual-link-desc: nsd_vnfd_vld_mgmt
+    - id: nsd_cp_data1
+      virtual-link-desc: nsd_vnfd_vld_data1
+    - id: nsd_cp_data2
+      virtual-link-desc: nsd_vnfd_vld_data2
+
+    virtual-link-desc:
+    - id: nsd_vnfd_vld_mgmt
+      mgmt-network: true
+    - id: nsd_vnfd_vld_data1
+    - id: nsd_vnfd_vld_data2
+
     df:
     - id: default-df
       vnf-profile:
@@ -20,13 +41,3 @@ nsd:
             constituent-cpd-id: eth2-ext
           virtual-link-profile-id: nsd_vnfd_vld_data2
         vnfd-id: slice_basic_middle_vnf
-    id: slice_basic_middle_ns
-    name: slice_basic_middle_ns
-    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_basic_middle_vnf

slice_basic_ns/slice_basic_nsd.yaml

 nsd:
   nsd:
-  - description: NSD to be used on Slice Testing
+  - id: slice_basic_ns
+    name: slice_basic_ns
+    description: NSD to be used on Slice Testing
     designer: OSM
+    version: '1.0'
+
+    vnfd-id:
+    - slice_basic_vnf
+
+    sapd:
+    - id: nsd_cp_mgmt
+      virtual-link-desc: nsd_vnfd_vld_mgmt
+    - id: nsd_cp_data
+      virtual-link-desc: nsd_vnfd_vld_data
+
+    virtual-link-desc:
+    - id: nsd_vnfd_vld_mgmt
+      mgmt-network: true
+    - id: nsd_vnfd_vld_data
+
     df:
     - id: default-df
       vnf-profile:
@@ -16,12 +34,6 @@ nsd:
             constituent-cpd-id: eth1-ext
           virtual-link-profile-id: nsd_vnfd_vld_data
         vnfd-id: slice_basic_vnf
-    id: slice_basic_ns
-    name: slice_basic_ns
-    version: '1.0'
-    virtual-link-desc:
-    - id: nsd_vnfd_vld_mgmt
-      mgmt-network: true
-    - id: nsd_vnfd_vld_data
-    vnfd-id:
-    - slice_basic_vnf
+
+
+