Adapts PLA to new SOL006 NSD descriptors format

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

diff --git a/osm_pla/test/nsd_unittest4.yaml b/osm_pla/test/nsd_unittest4.yaml
index 68d8f7e..06fe593 100644 (file)
--- a/osm_pla/test/nsd_unittest4.yaml
+++ b/osm_pla/test/nsd_unittest4.yaml
@@ -12,24 +12,26 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-nsd:nsd-catalog:
-    nsd:
-    -   constituent-vnfd:
-        -   member-vnf-index: 1
-            vnfd-id-ref: hackfest-basic_vnfd
-        description: Generated by OSM package generator
-        id: hackfest-basic_nsd
-        name: hackfest-basic_nsd
-        short-name: hackfest-basic_nsd
-        vendor: Abubakr Magzoub, Lancaster University
-        version: '1.0'
-        vld:
-        -   id: hackfest-basic_nsd_vld0
-            mgmt-network: !!bool True
-            name: management
-            short-name: management
-            type: ELAN
-            vnfd-connection-point-ref:
-            -   member-vnf-index-ref: 1
-                vnfd-connection-point-ref: vnf-cp0
-                vnfd-id-ref: hackfest-basic_vnfd
+nsd:
+  nsd:
+  - description: Generated by OSM package generator
+    designer: Abubakr Magzoub, Lancaster University
+    df:
+    - id: default-df
+      vnf-profile:
+      - id: '1'
+        virtual-link-connectivity:
+        - constituent-cpd-id:
+          - constituent-base-element-id: '1'
+            constituent-cpd-id: vnf-cp0-ext
+          virtual-link-profile-id: hackfest-basic_nsd_vld0
+        vnfd-id: hackfest-basic_vnfd
+    id: hackfest-basic_nsd
+    name: hackfest-basic_nsd
+    version: '1.0'
+    virtual-link-desc:
+    - id: hackfest-basic_nsd_vld0
+      mgmt-network: true
+    vnfd-id:
+    - hackfest-basic_vnfd
+