Adapts PLA to new SOL006 NSD descriptors format

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

diff --git a/osm_pla/test/test_five_nsd.yaml b/osm_pla/test/test_five_nsd.yaml
index 0a209d1..c11f313 100644 (file)
--- a/osm_pla/test/test_five_nsd.yaml
+++ b/osm_pla/test/test_five_nsd.yaml
@@ -12,93 +12,93 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-nsd:nsd-catalog:
+nsd:
   nsd:
   - description: Four cirros VNF latency and jitter constrained
+    designer: ArctosLabs
+    df:
+    - id: default-df
+      vnf-profile:
+      - id: '1'
+        virtual-link-connectivity:
+        - constituent-cpd-id:
+          - constituent-base-element-id: '1'
+            constituent-cpd-id: vnf_cp_one_cp-ext
+          virtual-link-profile-id: vl_two_vld
+        - constituent-cpd-id:
+          - constituent-base-element-id: '1'
+            constituent-cpd-id: vnf_cp_two_cp-ext
+          virtual-link-profile-id: vld_vnf_mgmt1
+        - constituent-cpd-id:
+          - constituent-base-element-id: '1'
+            constituent-cpd-id: vnf_cp_two_cp-ext
+          virtual-link-profile-id: vld_vnf_mgmt2
+        vnfd-id: test_one_a_vnfd
+      - id: '2'
+        virtual-link-connectivity:
+        - constituent-cpd-id:
+          - constituent-base-element-id: '2'
+            constituent-cpd-id: vnf_cp_one_cp-ext
+          virtual-link-profile-id: vl_two_vld
+        - constituent-cpd-id:
+          - constituent-base-element-id: '2'
+            constituent-cpd-id: vnf_cp_three_cp-ext
+          virtual-link-profile-id: vl_four_vld
+        - constituent-cpd-id:
+          - constituent-base-element-id: '2'
+            constituent-cpd-id: vnf_cp_two_cp-ext
+          virtual-link-profile-id: vl_five_vld
+        vnfd-id: test_two_vnfd
+      - id: '4'
+        virtual-link-connectivity:
+        - constituent-cpd-id:
+          - constituent-base-element-id: '4'
+            constituent-cpd-id: vnf_cp_one_cp-ext
+          virtual-link-profile-id: vl_four_vld
+        - constituent-cpd-id:
+          - constituent-base-element-id: '4'
+            constituent-cpd-id: vnf_cp_two_cp-ext
+          virtual-link-profile-id: vld_vnf_mgmt2
+        vnfd-id: test_one_a_vnfd
+      - id: '3'
+        virtual-link-connectivity:
+        - constituent-cpd-id:
+          - constituent-base-element-id: '3'
+            constituent-cpd-id: vnf_cp_one_cp-ext
+          virtual-link-profile-id: vl_five_vld
+        - constituent-cpd-id:
+          - constituent-base-element-id: '3'
+            constituent-cpd-id: vnf_cp_two_cp-ext
+          virtual-link-profile-id: vld_vnf_mgmt1
+        vnfd-id: test_one_a_vnfd
     id: test_five_nsd
     name: test_five_nsd
-    short-name: test_five_nsd
-    vendor: ArctosLabs
     version: '1.0'
-    constituent-vnfd:
-    - member-vnf-index: 1
-      vnfd-id-ref: test_one_a_vnfd
-    - member-vnf-index: 2
-      vnfd-id-ref: test_two_vnfd
-    - member-vnf-index: 3
-      vnfd-id-ref: test_one_a_vnfd
-    - member-vnf-index: 4
-      vnfd-id-ref: test_one_a_vnfd
-    vld:
-    - name: vl_two_vld
-      id: vl_two_vld
-      mgmt-network: !!bool False
-      type: ELAN
-      link-constraint:
-      - constraint-type: LATENCY
-        value: 120
-      - constraint-type: JITTER
-        value: 20
-      vnfd-connection-point-ref:
-      - member-vnf-index-ref: '1'
-        vnfd-connection-point-ref: vnf_cp_one_cp
-        vnfd-id-ref: test_one_a_vnfd
-      - member-vnf-index-ref: '2'
-        vnfd-connection-point-ref: vnf_cp_one_cp
-        vnfd-id-ref: test_two_vnfd
-    - name: vl_four_vld
-      id: vl_four_vld
-      mgmt-network: !!bool False
-      type: ELAN
-      link-constraint:
-      - constraint-type: LATENCY
-        value: 50
-      - constraint-type: JITTER
-        value: 10
-      vnfd-connection-point-ref:
-      - member-vnf-index-ref: '2'
-        vnfd-connection-point-ref: vnf_cp_three_cp
-        vnfd-id-ref: test_two_vnfd
-      - member-vnf-index-ref: '4'
-        vnfd-connection-point-ref: vnf_cp_one_cp
-        vnfd-id-ref: test_one_a_vnfd
-    - name: vl_five_vld
-      id: vl_five_vld
-      mgmt-network: !!bool False
-      type: ELAN
-      link-constraint:
-      - constraint-type: LATENCY
-        value: 20
-      - constraint-type: JITTER
-        value: 10
-      vnfd-connection-point-ref:
-      - member-vnf-index-ref: '2'
-        vnfd-connection-point-ref: vnf_cp_two_cp
-        vnfd-id-ref: test_two_vnfd
-      - member-vnf-index-ref: '3'
-        vnfd-connection-point-ref: vnf_cp_one_cp
-        vnfd-id-ref: test_one_a_vnfd
-    - name: vld_vnf_mgmt
-      id: vld_vnf_mgmt1
-      mgmt-network: !!bool True
-      type: ELAN
-      vnfd-connection-point-ref:
-      - member-vnf-index-ref: '1'
-        vnfd-connection-point-ref: vnf_cp_two_cp
-        vnfd-id-ref: test_one_a_vnfd
-      - member-vnf-index-ref: '3'
-        vnfd-connection-point-ref: vnf_cp_two_cp
-        vnfd-id-ref: test_one_a_vnfd
-    - name: vld_vnf_mgmt
-      id: vld_vnf_mgmt2
-      mgmt-network: !!bool True
-      type: ELAN
-      vnfd-connection-point-ref:
-      - member-vnf-index-ref: '1'
-        vnfd-connection-point-ref: vnf_cp_two_cp
-        vnfd-id-ref: test_one_a_vnfd
-      - member-vnf-index-ref: '4'
-        vnfd-connection-point-ref: vnf_cp_two_cp
-        vnfd-id-ref: test_one_a_vnfd
+    virtual-link-desc:
+    - id: vl_two_vld
+      df:
+      - id: default-df
+        qos:
+          latency: 120
+          packet-delay-variation: 20
+    - id: vl_four_vld
+      df:
+      - id: default-df
+        qos:
+          latency: 50
+          packet-delay-variation: 10
+    - id: vl_five_vld
+      df:
+      - id: default-df
+        qos:
+          latency: 20
+          packet-delay-variation: 10
+    - id: vld_vnf_mgmt1
+      mgmt-network: true
+    - id: vld_vnf_mgmt2
+      mgmt-network: true
+    vnfd-id:
+    - test_one_a_vnfd
+    - test_two_vnfd