diff --git a/hackfest_vyos_ns/hackfest_vyos_nsd.yaml b/hackfest_vyos_ns/hackfest_vyos_nsd.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..c37fd891769174cd1ff19f306ca9e211248f90dd
--- /dev/null
+++ b/hackfest_vyos_ns/hackfest_vyos_nsd.yaml
@@ -0,0 +1,41 @@
+nsd:nsd-catalog:
+    nsd:
+    -   id: hackfest_vyos-ns
+        name: hackfest_vyos-ns
+        short-name: hackfest_vyos-ns
+        description: Simple NS with a single VyOS Router VNF
+        version: '1.0'
+        logo: osm.png
+        constituent-vnfd:
+        -   vnfd-id-ref: hackfest_vyos-vnf
+            member-vnf-index: '1'      
+        vld:
+        -   id: mgmtnet
+            name: mgmtnet
+            short-name: mgmtnet
+            type: ELAN
+            mgmt-network: 'true'
+            vim-network-name: osm-ext
+            vnfd-connection-point-ref:
+            -   vnfd-id-ref: hackfest_vyos-vnf
+                member-vnf-index-ref: '1'
+                vnfd-connection-point-ref: vnf-mgmt
+                ip-address: 172.21.250.200
+        -   id: internal
+            name: internal
+            short-name: internal
+            type: ELAN
+            mgmt-network: 'true'
+            vnfd-connection-point-ref:
+            -   vnfd-id-ref: hackfest_vyos-vnf
+                member-vnf-index-ref: '1'
+                vnfd-connection-point-ref: vnf-internal               
+        -   id: external
+            name: external
+            short-name: external
+            type: ELAN
+            mgmt-network: 'true'
+            vnfd-connection-point-ref:
+            -   vnfd-id-ref: hackfest_vyos-vnf
+                member-vnf-index-ref: '1'
+                vnfd-connection-point-ref: vnf-external
diff --git a/hackfest_vyos_vnf/cloud_init/vyos-userdata b/hackfest_vyos_vnf/cloud_init/vyos-userdata
new file mode 100644
index 0000000000000000000000000000000000000000..e888432723fdda1ffbd7a1e129ba0b4bdda5a39d
--- /dev/null
+++ b/hackfest_vyos_vnf/cloud_init/vyos-userdata
@@ -0,0 +1,23 @@
+#!/bin/vbash
+source /opt/vyatta/etc/functions/script-template
+# Interface Config eth0
+set interfaces ethernet eth0 address 172.21.250.200/22
+set interfaces ethernet eth0 description VyOS-eth0
+# Interface Config eth1
+set interfaces ethernet eth1 address 10.0.0.1/24
+set interfaces ethernet eth1 description VyOS-eth1
+# Interface Config eth2
+set interfaces ethernet eth2 address 10.1.0.1/24
+set interfaces ethernet eth2 description VyOS-eth2
+# System config
+set system host-name vyos-osmTest
+set service ssh listen-address 0.0.0.0
+set service ssh port 22
+set system login user osm authentication plaintext-password osm2020
+# SNMP
+set service snmp community public authorization ro
+set service snmp location "OSM Labs"
+set service snmp contact "glavado@whitestack.com"
+# Save
+commit
+save
diff --git a/hackfest_vyos_vnf/hackfest_vyos_vnfd.yaml b/hackfest_vyos_vnf/hackfest_vyos_vnfd.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..53deb60653ad75c2def2ef3848d25520c78ecafa
--- /dev/null
+++ b/hackfest_vyos_vnf/hackfest_vyos_vnfd.yaml
@@ -0,0 +1,50 @@
+vnfd:vnfd-catalog:
+    vnfd:
+    -   id: hackfest_vyos-vnf
+        name: hackfest_vyos-vnf
+        short-name: hackfest_vyos-vnf
+        version: '1.0'
+        description: A basic virtual router
+        connection-point:
+        -   name: vnf-mgmt
+            type: VPORT
+        -   name: vnf-internal
+            type: VPORT
+            port-security-enabled: 'false'                   
+        -   name: vnf-external
+            type: VPORT
+            port-security-enabled: 'false'            
+        vdu:
+        -   id: vyos-VM
+            name: vyos-VM
+            cloud-init-file: vyos-userdata
+            image: vyos-1.1.7
+            count: '1'
+            vm-flavor:
+                vcpu-count: '1'
+                memory-mb: '2048'
+                storage-gb: '10'
+            interface:
+            -   name: vdu-eth0
+                type: EXTERNAL
+                position: 0
+                virtual-interface:
+                    type: PARAVIRT
+                external-connection-point-ref: vnf-mgmt
+            -   name: vdu-eth1
+                type: EXTERNAL
+                position: 1
+                virtual-interface:
+                    type: PARAVIRT
+                external-connection-point-ref: vnf-internal
+            -   name: vdu-eth2
+                type: EXTERNAL
+                position: 2
+                virtual-interface:
+                    type: PARAVIRT
+                external-connection-point-ref: vnf-external
+            supplemental-boot-data:
+              boot-data-drive: true                
+        mgmt-interface:
+            cp: vnf-mgmt
+
diff --git a/hackfest_vyos_vnf/snmp/snmp.yml b/hackfest_vyos_vnf/snmp/snmp.yml
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391