Adapts PLA to new SOL006 NSD descriptors format

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

diff --git a/osm_pla/test/nsd_unittest3.yaml b/osm_pla/test/nsd_unittest3.yaml
index c66df82..1bfdee9 100644 (file)
--- a/osm_pla/test/nsd_unittest3.yaml
+++ b/osm_pla/test/nsd_unittest3.yaml
@@ -12,55 +12,60 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-nsd:nsd-catalog:
+nsd:
     nsd:
-    -   constituent-vnfd:
-        -   member-vnf-index: one
-            vnfd-id-ref: cirros_vnfd_v2
-        -   member-vnf-index: two
-            vnfd-id-ref: cirros_vnfd_v2
-        -   member-vnf-index: three
-            vnfd-id-ref: cirros_vnfd_v2
-        description: Placement constraints NSD
+    -   vnfd-id:
+        - cirros_vnfd_v2
+
         id: three_vnf_constrained_nsd
+        description: Placement constraints NSD
         name: three_vnf_constrained_nsd
-        short-name: three_vnf_constrained_nsd
-        vendor: ArctosLabs
+        designer: ArctosLabs
         version: '1.0'
-        vld:
+
+        virtual-link-desc:
         -   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: one
-                vnfd-connection-point-ref: vnf-cp0
-                vnfd-id-ref: cirros_vnfd_v2
-            -   member-vnf-index-ref: two
-                vnfd-connection-point-ref: vnf-cp0
-                vnfd-id-ref: cirros_vnfd_v2
+            df:
+            -   id: default-df
+                qos:
+                    latency: 150
+                    packet-delay-variation: 30
         -   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: two
-                vnfd-connection-point-ref: vnf-cp0
-                vnfd-id-ref: cirros_vnfd_v2
-            -   member-vnf-index-ref: three
-                vnfd-connection-point-ref: vnf-cp0
-                vnfd-id-ref: cirros_vnfd_v2
\ No newline at end of file
+            df:
+            -   id: default-df
+                qos:
+                    latency: 90
+                    packet-delay-variation: 30
+
+        df:
+        -   id: default-df
+            vnf-profile:
+            -   id: one
+                virtual-link-connectivity:
+                -   constituent-cpd-id:
+                    -   constituent-base-element-id: one
+                        constituent-cpd-id: vnf-cp0-ext
+                    virtual-link-profile-id: three_vnf_constrained_nsd_vld1
+                vnfd-id: cirros_vnfd_v2
+            -   id: two
+                virtual-link-connectivity:
+                -   constituent-cpd-id:
+                    -   constituent-base-element-id: two
+                        constituent-cpd-id: vnf-cp0-ext
+                    virtual-link-profile-id: three_vnf_constrained_nsd_vld1
+                -   constituent-cpd-id:
+                    -   constituent-base-element-id: two
+                        constituent-cpd-id: vnf-cp0-ext
+                    virtual-link-profile-id: three_vnf_constrained_nsd_vld2
+                vnfd-id: cirros_vnfd_v2
+            -   id: three
+                virtual-link-connectivity:
+                -   constituent-cpd-id:
+                    -   constituent-base-element-id: three
+                        constituent-cpd-id: vnf-cp0-ext
+                    virtual-link-profile-id: three_vnf_constrained_nsd_vld2
+                vnfd-id: cirros_vnfd_v2
+
+