diff --git a/affinity_basic_ns/affinity_basic_nsd.yaml b/affinity_basic_ns/affinity_basic_nsd.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..19cf5b7f8cb0b08fd030c3200de1b36c79fa04ea
--- /dev/null
+++ b/affinity_basic_ns/affinity_basic_nsd.yaml
@@ -0,0 +1,25 @@
+nsd:
+  nsd:
+  - description: Simple NS with a single VNF 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-ns
+    name: affinity_basic-ns
+    version: 1.0
+    virtual-link-desc:
+    - id: mgmtnet
+      mgmt-network: true
+    vnfd-id:
+    - affinity_basic-vnf
diff --git a/affinity_basic_vnf/affinity_basic_vnfd.yaml b/affinity_basic_vnf/affinity_basic_vnfd.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..92eb1b7e2c1ce6dfae9f7bcffc536ee13d74d7da
--- /dev/null
+++ b/affinity_basic_vnf/affinity_basic_vnfd.yaml
@@ -0,0 +1,95 @@
+vnfd:
+  description: A basic VNF descriptor w/ two VDUs and an affinity group
+  df:
+  - id: default-df
+    instantiation-level:
+    - id: default-instantiation-level
+      vdu-level:
+      - number-of-instances: 1
+        vdu-id: affinity_basic-VM-1
+      - number-of-instances: 1
+        vdu-id: affinity_basic-VM-2
+    vdu-profile:
+    - id: affinity_basic-VM-1
+      min-number-of-instances: 1
+      affinity-or-anti-affinity-group: 
+      - id: affinity-group-1
+    - id: affinity_basic-VM-2
+      min-number-of-instances: 1
+      affinity-or-anti-affinity-group: 
+      - id: affinity-group-1
+    affinity-or-anti-affinity-group:
+    - id: affinity-group-1
+      type: affinity
+      scope: nfvi-node
+  ext-cpd:
+  - id: vnf-cp0-ext-1
+    int-cpd:
+      cpd: vdu-eth0-int
+      vdu-id: affinity_basic-VM-1
+  - id: vnf-cp0-ext-2
+    int-cpd:
+      cpd: vdu-eth0-int
+      vdu-id: affinity_basic-VM-2
+  id: affinity_basic-vnf
+  mgmt-cp: vnf-cp0-ext-1
+  product-name: affinity_basic-vnf
+  sw-image-desc:
+  - id: ubuntu20.04
+    image: ubuntu20.04
+    name: ubuntu20.04
+  - id: ubuntu20.04-aws
+    name: ubuntu20.04-aws
+    image: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509
+    vim-type: aws
+  - id: ubuntu20.04-azure
+    name: ubuntu20.04-azure
+    image: Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest
+    vim-type: azure
+  - id: ubuntu20.04-gcp
+    name: ubuntu20.04-gcp
+    image: ubuntu-os-cloud:image-family:ubuntu-2004-lts
+    vim-type: gcp
+  vdu:
+  - id: affinity_basic-VM-1
+    name: affinity_basic-VM-1
+    sw-image-desc: ubuntu20.04
+    alternative-sw-image-desc:
+    - ubuntu20.04-aws
+    - ubuntu20.04-azure
+    - ubuntu20.04-gcp
+    virtual-compute-desc: affinity_basic-VM-compute
+    virtual-storage-desc:
+    - affinity_basic-VM-storage
+    int-cpd:
+    - id: vdu-eth0-int
+      virtual-network-interface-requirement:
+      - name: vdu-eth0
+        virtual-interface:
+          type: PARAVIRT
+  - id: affinity_basic-VM-2
+    name: affinity_basic-VM-2
+    sw-image-desc: ubuntu20.04
+    alternative-sw-image-desc:
+    - ubuntu20.04-aws
+    - ubuntu20.04-azure
+    - ubuntu20.04-gcp
+    virtual-compute-desc: affinity_basic-VM-compute
+    virtual-storage-desc:
+    - affinity_basic-VM-storage
+    int-cpd:
+    - id: vdu-eth0-int
+      virtual-network-interface-requirement:
+      - name: vdu-eth0
+        virtual-interface:
+          type: PARAVIRT
+  version: 1.0
+  virtual-compute-desc:
+  - id: affinity_basic-VM-compute
+    virtual-cpu:
+      num-virtual-cpu: 1
+    virtual-memory:
+      size: 1.0
+  virtual-storage-desc:
+  - id: affinity_basic-VM-storage
+    size-of-storage: 10