Merge branch 'fix-bug-2013' into 'master'

Package for testing bug 2013 in test Basic24 - affinity groups as instantiation parameters

See merge request !192

affinity_2vnfs_ns/affinity_2vnfs_nsd.yaml

+nsd:
+  nsd:
+  - description: Simple NS with two VNFs and a single VL
+    df:
+    - id: default-df
+      vnf-profile:
+      - id: affinity-basic-1
+        virtual-link-connectivity:
+        - constituent-cpd-id:
+          - constituent-base-element-id: affinity-basic-1
+            constituent-cpd-id: vnf-cp0-ext-1
+          virtual-link-profile-id: mgmtnet
+        - constituent-cpd-id:
+          - constituent-base-element-id: affinity-basic-1
+            constituent-cpd-id: vnf-cp0-ext-2
+          virtual-link-profile-id: mgmtnet
+        vnfd-id: affinity_basic-vnf
+      - id: affinity-basic-2
+        virtual-link-connectivity:
+        - constituent-cpd-id:
+          - constituent-base-element-id: affinity-basic-2
+            constituent-cpd-id: vnf-cp0-ext-1
+          virtual-link-profile-id: mgmtnet
+        - constituent-cpd-id:
+          - constituent-base-element-id: affinity-basic-2
+            constituent-cpd-id: vnf-cp0-ext-2
+          virtual-link-profile-id: mgmtnet
+        vnfd-id: affinity_basic-vnf
+    id: affinity_2vnfs-ns
+    name: affinity_2vnfs-ns
+    version: '1.0'
+    virtual-link-desc:
+    - id: mgmtnet
+      mgmt-network: true
+    vnfd-id:
+    - affinity_basic-vnf