Adapts PLA to new SOL006 NSD descriptors format

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

diff --git a/osm_pla/test/nsd_unittest1.yaml b/osm_pla/test/nsd_unittest1.yaml
index b4832a7..58bbc31 100644 (file)
--- a/osm_pla/test/nsd_unittest1.yaml
+++ b/osm_pla/test/nsd_unittest1.yaml
@@ -12,55 +12,55 @@
 # 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: cirros_vnfd_v2
-        -   member-vnf-index: 2
-            vnfd-id-ref: cirros_vnfd_v2
-        -   member-vnf-index: 3
-            vnfd-id-ref: cirros_vnfd_v2
-        description: Placement constraints NSD
-        id: three_vnf_constrained_nsd
-        name: three_vnf_constrained_nsd
-        short-name: three_vnf_constrained_nsd
-        vendor: ArctosLabs
-        version: '1.0'
-        vld:
-        -   id: three_vnf_constrained_nsd_vld1
-            link-constraint:
-            -   constraint-type: LATENCY
-                value: 150
-            -   constraint-type: JITTER
-                value: 30
-            mgmt-network: !!bool False
-            name: ns_constrained_nsd_vld1
-            short-name: ns_constrained_nsd_vld1
-            type: ELAN
-            vim-network-name: private
-            vnfd-connection-point-ref:
-            -   member-vnf-index-ref: 1
-                vnfd-connection-point-ref: vnf-cp0
-                vnfd-id-ref: cirros_vnfd_v2
-            -   member-vnf-index-ref: 2
-                vnfd-connection-point-ref: vnf-cp0
-                vnfd-id-ref: cirros_vnfd_v2
-        -   id: three_vnf_constrained_nsd_vld2
-            link-constraint:
-            -   constraint-type: LATENCY
-                value: 90
-            -   constraint-type: JITTER
-                value: 30
-            mgmt-network: !!bool False
-            name: ns_constrained_nsd_vld2
-            short-name: ns_constrained_nsd_vld2
-            type: ELAN
-            vim-network-name: private
-            vnfd-connection-point-ref:
-            -   member-vnf-index-ref: 2
-                vnfd-connection-point-ref: vnf-cp0
-                vnfd-id-ref: cirros_vnfd_v2
-            -   member-vnf-index-ref: 3
-                vnfd-connection-point-ref: vnf-cp0
-                vnfd-id-ref: cirros_vnfd_v2
\ No newline at end of file
+nsd:
+  nsd:
+  - description: Placement constraints NSD
+    designer: ArctosLabs
+    df:
+    - id: default-df
+      vnf-profile:
+      - id: '1' # Old member-vnf-index
+        virtual-link-connectivity:
+        - constituent-cpd-id:
+          - constituent-base-element-id: '1'
+            constituent-cpd-id: vnf-cp0-ext
+          virtual-link-profile-id: three_vnf_constrained_nsd_vld1
+        vnfd-id: cirros_vnfd_v2
+      - id: '2'
+        virtual-link-connectivity:
+        - constituent-cpd-id:
+          - constituent-base-element-id: '2'
+            constituent-cpd-id: vnf-cp0-ext
+          virtual-link-profile-id: three_vnf_constrained_nsd_vld1
+        - constituent-cpd-id:
+          - constituent-base-element-id: '2'
+            constituent-cpd-id: vnf-cp0-ext
+          virtual-link-profile-id: three_vnf_constrained_nsd_vld2
+        vnfd-id: cirros_vnfd_v2
+      - id: '3'
+        virtual-link-connectivity:
+        - constituent-cpd-id:
+          - constituent-base-element-id: '3'
+            constituent-cpd-id: vnf-cp0-ext
+          virtual-link-profile-id: three_vnf_constrained_nsd_vld2
+        vnfd-id: cirros_vnfd_v2
+    id: three_vnf_constrained_nsd
+    name: three_vnf_constrained_nsd
+    version: '1.0'
+    virtual-link-desc:
+    - id: three_vnf_constrained_nsd_vld1
+      vim-network-name: private
+      df:
+      - id: default-df
+        qos:
+          latency: 90
+          packet-delay-variation: 30
+    - id: three_vnf_constrained_nsd_vld2
+      vim-network-name: private
+      df:
+      - id: default-df
+        qos:
+          latency: 150
+          packet-delay-variation: 30
+    vnfd-id:
+    - cirros_vnfd_v2